347 files changed, 108454 insertions, 10431 deletions

diff --git a/COPYING.LGPL2 b/COPYING.LGPL2
index 9084f4c4ad..eaa2dd9e97 100644
--- a/COPYING.LGPL2
+++ b/COPYING.LGPL2
@@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
-
+
   Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
@@ -111,7 +111,7 @@ modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
-
+
 		  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -158,7 +158,7 @@ Library.
   You may charge a fee for the physical act of transferring a copy,
 and you may at your option offer warranty protection in exchange for a
 fee.
-
+
   2. You may modify your copy or copies of the Library or any portion
 of it, thus forming a work based on the Library, and copy and
 distribute such modifications or work under the terms of Section 1
@@ -216,7 +216,7 @@ instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-
+
   Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -267,7 +267,7 @@ Library will still fall under Section 6.)
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-
+
   6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
@@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-
+
   7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -370,7 +370,7 @@ subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
-
+
   11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -422,7 +422,7 @@ conditions either of that version or of any later version published by
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-
+
   14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -456,7 +456,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
            How to Apply These Terms to Your New Libraries
 
   If you develop a new library, and you want it to be of the greatest
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index eb457da7fa..9c1e553400 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -11,8 +11,8 @@ libecontacteditor_la_CPPFLAGS =				\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
 	-DG_LOG_DOMAIN=\"contact-editor\"		\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libecontacteditor_la_SOURCES = 			\
 	eab-editor.c				\
@@ -35,6 +35,7 @@ libecontacteditor_la_LIBADD =						\
 	$(top_builddir)/addressbook/printing/libecontactprint.la	\
 	$(top_builddir)/widgets/menus/libmenus.la			\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)					\
+	$(EVOLUTION_DATA_SERVER_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)
 
 ui_DATA = 				\
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 96af36fed2..75ac692f3f 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -411,6 +411,7 @@ source_changed (ESourceComboBox *source_combo_box,
 	ESource *source;
 
 	source = e_source_combo_box_get_active (source_combo_box);
+
 	if (source != NULL) {
 		if (qa->source != NULL)
 			g_object_unref (qa->source);
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.h b/addressbook/gui/contact-editor/e-contact-quick-add.h
index a4d06ef12a..861ddba24d 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.h
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.h
@@ -25,16 +25,22 @@
 
 #include <libebook/e-contact.h>
 
-typedef void (*EContactQuickAddCallback) (EContact *new_contact, gpointer closure);
-
-void e_contact_quick_add (const gchar *name, const gchar *email,
-			  EContactQuickAddCallback cb, gpointer closure);
-
-void e_contact_quick_add_free_form (const gchar *text, EContactQuickAddCallback cb, gpointer closure);
-
-void e_contact_quick_add_email (const gchar *email, EContactQuickAddCallback cb, gpointer closure);
-
-void e_contact_quick_add_vcard (const gchar *vcard, EContactQuickAddCallback cb, gpointer closure);
+typedef void	(*EContactQuickAddCallback)	(EContact *new_contact,
+						 gpointer closure);
+
+void		e_contact_quick_add		(const gchar *name,
+						 const gchar *email,
+						 EContactQuickAddCallback cb,
+						 gpointer closure);
+void		e_contact_quick_add_free_form	(const gchar *text,
+						 EContactQuickAddCallback cb,
+						 gpointer closure);
+void		e_contact_quick_add_email	(const gchar *email,
+						 EContactQuickAddCallback cb,
+						 gpointer closure);
+void		e_contact_quick_add_vcard	(const gchar *vcard,
+						 EContactQuickAddCallback cb,
+						 gpointer closure);
 
 #endif /* __E_CONTACT_QUICK_ADD_H__ */
 
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index 657bbf1da9..bcd398955d 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -10,9 +10,8 @@ libecontactlisteditor_la_CPPFLAGS =			\
 	-I$(top_builddir)/shell				\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
 	-DG_LOG_DOMAIN=\"contact-list-editor\"		\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
-	$(CAMEL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libecontactlisteditor_la_SOURCES = 		\
 	e-contact-list-editor.c			\
@@ -29,9 +28,8 @@ libecontactlisteditor_la_LIBADD =				\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)					\
-	$(CAMEL_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)
 
 ui_DATA  = contact-list-editor.ui
 
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 1750f5a686..57d2acde99 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -49,6 +49,10 @@
 #include "e-contact-list-model.h"
 #include "eab-contact-merging.h"
 
+#define E_CONTACT_LIST_EDITOR_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_CONTACT_LIST_EDITOR, EContactListEditorPrivate))
+
 #define CONTACT_LIST_EDITOR_WIDGET(editor, name) \
 	(e_builder_get_widget \
 	(E_CONTACT_LIST_EDITOR (editor)->priv->builder, name))
@@ -776,7 +780,7 @@ contact_list_editor_remove_button_clicked_cb (GtkWidget *widget)
 {
 	EContactListEditor *editor;
 	GtkTreeSelection *selection;
-	GtkTreeRowReference *new_selection;
+	GtkTreeRowReference *new_selection = NULL;
 	GtkTreeModel *model;
 	GtkTreeView *view;
 	GtkTreePath *path;
@@ -1341,6 +1345,76 @@ contact_list_editor_dispose (GObject *object)
 	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
+static void
+contact_list_editor_constructed (GObject *object)
+{
+	EContactListEditor *editor;
+	GtkTreeViewColumn *column;
+	GtkCellRenderer *renderer;
+	GtkTreeView *view;
+	GtkTreeSelection *selection;
+
+	editor = E_CONTACT_LIST_EDITOR (object);
+
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
+
+	editor->priv->editable = TRUE;
+	editor->priv->allows_contact_lists = TRUE;
+
+	editor->priv->builder = gtk_builder_new ();
+	e_load_ui_builder_definition (
+		editor->priv->builder, "contact-list-editor.ui");
+	gtk_builder_connect_signals (editor->priv->builder, NULL);
+
+	/* Embed a pointer to the EContactListEditor in the top-level
+	 * widget.  Signal handlers can then access the pointer from any
+	 * child widget by calling contact_list_editor_extract(widget). */
+	g_object_set_data (G_OBJECT (WIDGET (DIALOG)), TOPLEVEL_KEY, editor);
+
+	view = GTK_TREE_VIEW (WIDGET (TREE_VIEW));
+	editor->priv->model = e_contact_list_model_new ();
+	gtk_tree_view_set_model (view, editor->priv->model);
+
+	selection = gtk_tree_view_get_selection (view);
+	gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
+	g_signal_connect (selection, "changed",
+		G_CALLBACK (contact_list_editor_selection_changed_cb), editor);
+
+	gtk_tree_view_enable_model_drag_dest (view, NULL, 0, GDK_ACTION_LINK);
+	e_drag_dest_add_directory_targets (WIDGET (TREE_VIEW));
+	gtk_drag_dest_add_text_targets (WIDGET (TREE_VIEW));
+
+	column = gtk_tree_view_column_new ();
+	renderer = gtk_cell_renderer_text_new ();
+	g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+	gtk_tree_view_column_pack_start (column, renderer, TRUE);
+	gtk_tree_view_append_column (view, column);
+
+	gtk_tree_view_column_set_cell_data_func (
+		column, renderer, (GtkTreeCellDataFunc)
+		contact_list_editor_render_destination, NULL, NULL);
+
+	editor->priv->name_selector = e_name_selector_new ();
+
+	e_name_selector_model_add_section (
+		e_name_selector_peek_model (editor->priv->name_selector),
+		"Members", _("_Members"), NULL);
+
+	g_signal_connect (
+		editor, "notify::book",
+		G_CALLBACK (contact_list_editor_notify_cb), NULL);
+	g_signal_connect (
+		editor, "notify::editable",
+		G_CALLBACK (contact_list_editor_notify_cb), NULL);
+
+	gtk_widget_show_all (WIDGET (DIALOG));
+
+	setup_custom_widgets (editor);
+
+	e_name_selector_load_books (editor->priv->name_selector);
+}
+
 /**************************** EABEditor Callbacks ****************************/
 
 static void
@@ -1492,6 +1566,7 @@ contact_list_editor_class_init (EContactListEditorClass *class)
 	object_class->set_property = contact_list_editor_set_property;
 	object_class->get_property = contact_list_editor_get_property;
 	object_class->dispose = contact_list_editor_dispose;
+	object_class->constructed = contact_list_editor_constructed;
 
 	editor_class = EAB_EDITOR_CLASS (class);
 	editor_class->show = contact_list_editor_show;
@@ -1550,68 +1625,7 @@ contact_list_editor_class_init (EContactListEditorClass *class)
 static void
 contact_list_editor_init (EContactListEditor *editor)
 {
-	EContactListEditorPrivate *priv;
-	GtkTreeViewColumn *column;
-	GtkCellRenderer *renderer;
-	GtkTreeView *view;
-	GtkTreeSelection *selection;
-
-	editor->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (
-		editor, E_TYPE_CONTACT_LIST_EDITOR, EContactListEditorPrivate);
-
-	priv->editable = TRUE;
-	priv->allows_contact_lists = TRUE;
-
-	priv->builder = gtk_builder_new ();
-	e_load_ui_builder_definition (priv->builder, "contact-list-editor.ui");
-	gtk_builder_connect_signals (priv->builder, NULL);
-
-	/* Embed a pointer to the EContactListEditor in the top-level
-	 * widget.  Signal handlers can then access the pointer from any
-	 * child widget by calling contact_list_editor_extract(widget). */
-	g_object_set_data (G_OBJECT (WIDGET (DIALOG)), TOPLEVEL_KEY, editor);
-
-	view = GTK_TREE_VIEW (WIDGET (TREE_VIEW));
-	priv->model = e_contact_list_model_new ();
-	gtk_tree_view_set_model (view, priv->model);
-
-	selection = gtk_tree_view_get_selection (view);
-	gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
-	g_signal_connect (selection, "changed",
-		G_CALLBACK (contact_list_editor_selection_changed_cb), editor);
-
-	gtk_tree_view_enable_model_drag_dest (view, NULL, 0, GDK_ACTION_LINK);
-	e_drag_dest_add_directory_targets (WIDGET (TREE_VIEW));
-	gtk_drag_dest_add_text_targets (WIDGET (TREE_VIEW));
-
-	column = gtk_tree_view_column_new ();
-	renderer = gtk_cell_renderer_text_new ();
-	g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-	gtk_tree_view_column_pack_start (column, renderer, TRUE);
-	gtk_tree_view_append_column (view, column);
-
-	gtk_tree_view_column_set_cell_data_func (
-		column, renderer, (GtkTreeCellDataFunc)
-		contact_list_editor_render_destination, NULL, NULL);
-
-	priv->name_selector = e_name_selector_new ();
-
-	e_name_selector_model_add_section (
-		e_name_selector_peek_model (priv->name_selector),
-		"Members", _("_Members"), NULL);
-
-	g_signal_connect (
-		editor, "notify::book",
-		G_CALLBACK (contact_list_editor_notify_cb), NULL);
-	g_signal_connect (
-		editor, "notify::editable",
-		G_CALLBACK (contact_list_editor_notify_cb), NULL);
-
-	gtk_widget_show_all (WIDGET (DIALOG));
-
-	setup_custom_widgets (editor);
-
-	e_name_selector_load_books (priv->name_selector);
+	editor->priv = E_CONTACT_LIST_EDITOR_GET_PRIVATE (editor);
 }
 
 /***************************** Public Interface ******************************/
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c
index 6774eee3b7..8236bafea4 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c
@@ -144,7 +144,7 @@ e_contact_list_model_add_destination (EContactListModel *model,
                                       gboolean ignore_conflicts)
 {
 	GtkTreeIter iter;
-	GtkTreePath *path;
+	GtkTreePath *path = NULL;
 
 	g_return_val_if_fail (E_IS_CONTACT_LIST_MODEL (model), NULL);
 	g_return_val_if_fail (E_IS_DESTINATION (destination), NULL);
@@ -160,8 +160,10 @@ e_contact_list_model_add_destination (EContactListModel *model,
 
 		for (dest = dests; dest; dest = dest->next) {
 			path = e_contact_list_model_add_destination (model, dest->data, &iter, ignore_conflicts);
-			if (dest->next && path)
+			if (dest->next && path) {
 				gtk_tree_path_free (path);
+				path = NULL;
+			}
 		}
 
 		/* When the list has no children the remove it. We don't want empty sublists displayed. */
diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am
index 01af6b2534..b1c2b45cf4 100644
--- a/addressbook/gui/merging/Makefile.am
+++ b/addressbook/gui/merging/Makefile.am
@@ -7,8 +7,9 @@ libeabbookmerging_la_CPPFLAGS =				\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/addressbook			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
-	$(GNOME_PLATFORM_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(GNOME_PLATFORM_CFLAGS)			\
+	$(GTKHTML_CFLAGS)
 
 libeabbookmerging_la_SOURCES =			\
 	eab-contact-compare.c			\
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
index a25ad4e403..b936c9810d 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/merging/eab-contact-compare.c
@@ -833,8 +833,8 @@ eab_contact_locate_match_full (EBookClient *book_client,
 		return;
 
 	source = e_source_list_peek_default_source (info->source_list);
-
-	e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL,
+	e_client_utils_open_new (
+		source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL,
 		e_client_utils_authenticate_handler, NULL,
 		book_loaded_cb, info);
 }
diff --git a/addressbook/gui/merging/eab-contact-compare.h b/addressbook/gui/merging/eab-contact-compare.h
index 7ce31eddb9..8c07a56f08 100644
--- a/addressbook/gui/merging/eab-contact-compare.h
+++ b/addressbook/gui/merging/eab-contact-compare.h
@@ -26,8 +26,8 @@
 #ifndef __EAB_CONTACT_COMPARE_H__
 #define __EAB_CONTACT_COMPARE_H__
 
-#include <libebook/e-book-client.h>
 #include <libebook/e-contact.h>
+#include <libebook/e-book-client.h>
 
 typedef enum {
 	EAB_CONTACT_MATCH_NOT_APPLICABLE = 0,
@@ -45,26 +45,56 @@ typedef enum {
 	EAB_CONTACT_MATCH_PART_FAMILY_NAME      = 1 << 3
 } EABContactMatchPart;
 
-typedef void (*EABContactMatchQueryCallback) (EContact *contact, EContact *match, EABContactMatchType type, gpointer closure);
+typedef void	(*EABContactMatchQueryCallback)	(EContact *contact,
+						 EContact *match,
+						 EABContactMatchType type,
+						 gpointer closure);
 
-EABContactMatchType eab_contact_compare_name_to_string      (EContact *contact, const gchar *str);
+EABContactMatchType
+		eab_contact_compare_name_to_string
+						(EContact *contact,
+						 const gchar *str);
 
-EABContactMatchType eab_contact_compare_name_to_string_full (EContact *contact, const gchar *str,
-							     gboolean allow_partial_matches,
-							     gint *matched_parts, EABContactMatchPart *first_matched_part,
-							     gint *matched_character_count);
+EABContactMatchType
+		eab_contact_compare_name_to_string_full
+						(EContact *contact,
+						 const gchar *str,
+						 gboolean allow_partial_matches,
+						 gint *matched_parts,
+						 EABContactMatchPart *first_matched_part,
+						 gint *matched_character_count);
 
-EABContactMatchType eab_contact_compare_file_as   (EContact *contact1, EContact *contact2);
-EABContactMatchType eab_contact_compare_name      (EContact *contact1, EContact *contact2);
-EABContactMatchType eab_contact_compare_nickname  (EContact *contact1, EContact *contact2);
-EABContactMatchType eab_contact_compare_email     (EContact *contact1, EContact *contact2);
-EABContactMatchType eab_contact_compare_address   (EContact *contact1, EContact *contact2);
-EABContactMatchType eab_contact_compare_telephone (EContact *contact1, EContact *contact2);
+EABContactMatchType
+		eab_contact_compare_file_as	(EContact *contact1,
+						 EContact *contact2);
+EABContactMatchType
+		eab_contact_compare_name	(EContact *contact1,
+						 EContact *contact2);
+EABContactMatchType
+		eab_contact_compare_nickname	(EContact *contact1,
+						 EContact *contact2);
+EABContactMatchType
+		eab_contact_compare_email	(EContact *contact1,
+						 EContact *contact2);
+EABContactMatchType
+		eab_contact_compare_address	(EContact *contact1,
+						 EContact *contact2);
+EABContactMatchType
+		eab_contact_compare_telephone	(EContact *contact1,
+						 EContact *contact2);
 
-EABContactMatchType eab_contact_compare           (EContact *contact1, EContact *contact2);
+EABContactMatchType
+		eab_contact_compare		(EContact *contact1,
+						 EContact *contact2);
 
-void                eab_contact_locate_match      (EContact *contact, EABContactMatchQueryCallback cb, gpointer closure);
-void                eab_contact_locate_match_full (EBookClient *book_client, EContact *contact, GList *avoid, EABContactMatchQueryCallback cb, gpointer closure);
+void		eab_contact_locate_match	(EContact *contact,
+						 EABContactMatchQueryCallback cb,
+						 gpointer closure);
+void		eab_contact_locate_match_full	(EBookClient *book_client,
+						 EContact *contact,
+						 GList *avoid,
+						 EABContactMatchQueryCallback cb,
+						 gpointer closure);
 
 #endif /* __E_CONTACT_COMPARE_H__ */
 
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index f791eab114..1e70b97d77 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -73,7 +73,10 @@ add_lookup (EContactMergingLookup *lookup)
 {
 	if (running_merge_requests < SIMULTANEOUS_MERGING_REQUESTS) {
 		running_merge_requests++;
-		eab_contact_locate_match_full (lookup->book_client, lookup->contact, lookup->avoid, match_query_callback, lookup);
+		eab_contact_locate_match_full (
+			lookup->book_client,
+			lookup->contact, lookup->avoid,
+			match_query_callback, lookup);
 	}
 	else {
 		merging_queue = g_list_append (merging_queue, lookup);
@@ -97,8 +100,9 @@ finished_lookup (void)
 
 		running_merge_requests++;
 		eab_contact_locate_match_full (
-			lookup->book_client, lookup->contact,
-			lookup->avoid, match_query_callback, lookup);
+			lookup->book_client,
+			lookup->contact, lookup->avoid,
+			match_query_callback, lookup);
 	}
 }
 
@@ -138,8 +142,8 @@ final_cb_as_id (EBookClient *book_client,
 
 	if (lookup->id_cb)
 		lookup->id_cb (
-			lookup->book_client, error,
-			lookup->contact ?
+			lookup->book_client,
+			error, lookup->contact ?
 				e_contact_get_const (
 				lookup->contact, E_CONTACT_UID) : NULL,
 			lookup->closure);
@@ -566,7 +570,11 @@ match_query_callback (EContact *contact,
 
 	if (lookup->op == E_CONTACT_MERGING_FIND) {
 		if (lookup->c_cb)
-			lookup->c_cb (lookup->book_client, NULL, (gint) type <= (gint) EAB_CONTACT_MATCH_VAGUE ? NULL : match, lookup->closure);
+			lookup->c_cb (
+				lookup->book_client, NULL,
+				(gint) type <= (gint)
+				EAB_CONTACT_MATCH_VAGUE ? NULL : match,
+				lookup->closure);
 
 		free_lookup (lookup);
 		finished_lookup ();
diff --git a/addressbook/gui/merging/eab-contact-merging.h b/addressbook/gui/merging/eab-contact-merging.h
index c8e2ddb3ef..a922d6b9fb 100644
--- a/addressbook/gui/merging/eab-contact-merging.h
+++ b/addressbook/gui/merging/eab-contact-merging.h
@@ -30,9 +30,18 @@
 
 G_BEGIN_DECLS
 
-typedef void (*EABMergingAsyncCallback)		(EBookClient *book_client, const GError *error, gpointer closure);
-typedef void (*EABMergingIdAsyncCallback)	(EBookClient *book_client, const GError *error, const gchar *id, gpointer closure);
-typedef void (*EABMergingContactAsyncCallback)	(EBookClient *book_client, const GError *error, EContact *contact, gpointer closure);
+typedef void	(*EABMergingAsyncCallback)	(EBookClient *book_client,
+						 const GError *error,
+						 gpointer closure);
+typedef void	(*EABMergingIdAsyncCallback)	(EBookClient *book_client,
+						 const GError *error,
+						 const gchar *id,
+						 gpointer closure);
+typedef void	(*EABMergingContactAsyncCallback)
+						(EBookClient *book_client,
+						 const GError *error,
+						 EContact *contact,
+						 gpointer closure);
 
 gboolean	eab_merging_book_add_contact	(EBookClient *book_client,
 						 EContact *contact,
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 40c57650bb..546a218ff2 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -18,9 +18,10 @@ libeabwidgets_la_CPPFLAGS =				\
 	-I$(top_srcdir)/addressbook/util		\
 	-I$(top_srcdir)/widgets/misc			\
 	-I$(top_builddir)/shell				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
-	$(CHAMPLAIN_CFLAGS)
+	$(CHAMPLAIN_CFLAGS)				\
+	$(GTKHTML_CFLAGS)
 
 eabincludedir = $(privincludedir)/addressbook/gui/widgets
 
@@ -71,8 +72,10 @@ libeabwidgets_la_LIBADD =					\
 	$(top_builddir)/widgets/menus/libmenus.la		\
 	$(top_builddir)/a11y/libevolution-a11y.la		\
 	$(top_builddir)/e-util/libeutil.la			\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
-	$(CHAMPLAIN_LIBS)
+	$(CHAMPLAIN_LIBS)					\
+	$(GTKHTML_LIBS)
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index 74e794bd6e..fa61c4e5e2 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -576,7 +576,8 @@ addressbook_model_class_init (EAddressbookModelClass *class)
 			"EBookClient",
 			NULL,
 			E_TYPE_BOOK_CLIENT,
-			G_PARAM_READWRITE));
+			G_PARAM_READWRITE |
+			G_PARAM_STATIC_STRINGS));
 
 	g_object_class_install_property (
 		object_class,
@@ -586,7 +587,8 @@ addressbook_model_class_init (EAddressbookModelClass *class)
 			"Editable",
 			NULL,
 			FALSE,
-			G_PARAM_READWRITE));
+			G_PARAM_READWRITE |
+			G_PARAM_STATIC_STRINGS));
 
 	g_object_class_install_property (
 		object_class,
@@ -597,7 +599,8 @@ addressbook_model_class_init (EAddressbookModelClass *class)
 			NULL,
 			NULL,
 			G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT));
+			G_PARAM_CONSTRUCT |
+			G_PARAM_STATIC_STRINGS));
 
 	signals[WRITABLE_STATUS] =
 		g_signal_new ("writable_status",
diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h
index 13d23e92b0..680352c717 100644
--- a/addressbook/gui/widgets/e-addressbook-model.h
+++ b/addressbook/gui/widgets/e-addressbook-model.h
@@ -104,8 +104,10 @@ gint		e_addressbook_model_find	(EAddressbookModel *model,
 EBookClient *	e_addressbook_model_get_client	(EAddressbookModel *model);
 void		e_addressbook_model_set_client	(EAddressbookModel *model,
 						 EBookClient *book_client);
-gboolean	e_addressbook_model_get_editable (EAddressbookModel *model);
-void		e_addressbook_model_set_editable (EAddressbookModel *model,
+gboolean	e_addressbook_model_get_editable
+						(EAddressbookModel *model);
+void		e_addressbook_model_set_editable
+						(EAddressbookModel *model,
 						 gboolean editable);
 gchar *		e_addressbook_model_get_query	(EAddressbookModel *model);
 void		e_addressbook_model_set_query	(EAddressbookModel *model,
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index 0d2fc85478..71e63867d6 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -625,7 +625,6 @@ e_addressbook_reflow_adapter_new (EAddressbookModel *model)
 	return E_REFLOW_MODEL (et);
 }
 
-
 EContact *
 e_addressbook_reflow_adapter_get_contact (EAddressbookReflowAdapter *adapter,
                                           gint index)
diff --git a/addressbook/gui/widgets/e-addressbook-selector.c b/addressbook/gui/widgets/e-addressbook-selector.c
index b6bfa01537..30bb8899f5 100644
--- a/addressbook/gui/widgets/e-addressbook-selector.c
+++ b/addressbook/gui/widgets/e-addressbook-selector.c
@@ -293,7 +293,8 @@ target_client_open_ready_cb (GObject *source_object,
 	}
 
 	eab_merging_book_add_contact (
-		merge_context->target_client, merge_context->current_contact,
+		merge_context->target_client,
+		merge_context->current_contact,
 		addressbook_selector_merge_next_cb, merge_context);
 }
 
@@ -335,7 +336,8 @@ addressbook_selector_data_dropped (ESourceSelector *selector,
 	merge_context->remove_from_source = remove_from_source;
 	merge_context->pending_adds = TRUE;
 
-	e_client_utils_open_new (destination, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL,
+	e_client_utils_open_new (
+		destination, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL,
 		e_client_utils_authenticate_handler, NULL,
 		target_client_open_ready_cb, merge_context);
 
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index f102b684d7..b579c43dbf 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -168,8 +168,11 @@ addressbook_set_value_at (ETableModel *etc,
 	EAddressbookTableAdapterPrivate *priv = adapter->priv;
 
 	if (e_addressbook_model_get_editable (priv->model)) {
+		EBookClient *book_client;
 		EContact *contact;
 
+		book_client = e_addressbook_model_get_client (priv->model);
+
 		if (col >= COLS || row >= e_addressbook_model_contact_count (priv->model))
 			return;
 
@@ -191,7 +194,7 @@ addressbook_set_value_at (ETableModel *etc,
 
 		e_contact_set (contact, col, (gpointer) val);
 		eab_merging_book_modify_contact (
-			e_addressbook_model_get_client (priv->model),
+			book_client,
 			contact, contact_modified_cb, etc);
 
 		g_object_unref (contact);
@@ -218,6 +221,7 @@ addressbook_append_row (ETableModel *etm,
 {
 	EAddressbookTableAdapter *adapter = EAB_TABLE_ADAPTER (etm);
 	EAddressbookTableAdapterPrivate *priv = adapter->priv;
+	EBookClient *book_client;
 	EContact *contact;
 	EBookClient *book_client;
 	gint col;
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 7f3a7a85b8..9bda90a280 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -1111,7 +1111,7 @@ folder_bar_message (EAddressbookView *view,
 {
 	EShellView *shell_view;
 	EShellSidebar *shell_sidebar;
-	const gchar *name;
+	const gchar *display_name;
 
 	shell_view = e_addressbook_view_get_shell_view (view);
 	shell_sidebar = e_shell_view_get_shell_sidebar (shell_view);
@@ -1119,8 +1119,8 @@ folder_bar_message (EAddressbookView *view,
 	if (view->priv->source == NULL)
 		return;
 
-	name = e_source_peek_name (view->priv->source);
-	e_shell_sidebar_set_primary_text (shell_sidebar, name);
+	display_name = e_source_peek_name (view->priv->source);
+	e_shell_sidebar_set_primary_text (shell_sidebar, display_name);
 	e_shell_sidebar_set_secondary_text (shell_sidebar, message);
 }
 
@@ -1622,7 +1622,8 @@ view_transfer_contacts (EAddressbookView *view,
 		contacts = e_addressbook_view_get_selected (view);
 
 		eab_transfer_contacts (
-			book_client, contacts, delete_from_source, alert_sink);
+			book_client, contacts,
+			delete_from_source, alert_sink);
 	}
 }
 
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 78d98e2cb2..ddfcc1a9f9 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -942,6 +942,7 @@ remodel (EMinicard *e_minicard)
 		gint left_width = -1;
 		gboolean is_list = FALSE;
 		gboolean email_rendered = FALSE;
+		gboolean has_voice = FALSE, has_fax = FALSE;
 
 		if (e_minicard->header_text) {
 			file_as = e_contact_get (e_minicard->contact, E_CONTACT_FILE_AS);
@@ -966,11 +967,14 @@ remodel (EMinicard *e_minicard)
 			EMinicardField *minicard_field = NULL;
 			gboolean is_email = FALSE;
 
-			if (field == E_CONTACT_FAMILY_NAME || field == E_CONTACT_GIVEN_NAME)
+			if (field == E_CONTACT_FAMILY_NAME || field == E_CONTACT_GIVEN_NAME ||
+			    (has_voice && field == E_CONTACT_PHONE_OTHER) ||
+			    (has_fax && field == E_CONTACT_PHONE_OTHER_FAX))
 				continue;
 
 			if (field == E_CONTACT_FULL_NAME && is_list)
 				continue;
+
 			if (field == E_CONTACT_EMAIL_1 || field == E_CONTACT_EMAIL_2 || field == E_CONTACT_EMAIL_3 || field == E_CONTACT_EMAIL_4) {
 				if (email_rendered)
 					continue;
@@ -1019,6 +1023,15 @@ remodel (EMinicard *e_minicard)
 					if (string && *string) {
 						add_field (e_minicard, field, left_width);
 						count++;
+
+						has_voice = has_voice ||
+							    field == E_CONTACT_PHONE_BUSINESS ||
+							    field == E_CONTACT_PHONE_BUSINESS_2 ||
+							    field == E_CONTACT_PHONE_HOME ||
+							    field == E_CONTACT_PHONE_HOME_2;
+						has_fax = has_fax ||
+							  field == E_CONTACT_PHONE_BUSINESS_FAX ||
+							  field == E_CONTACT_PHONE_HOME_FAX;
 					}
 					g_free (string);
 				}
diff --git a/addressbook/gui/widgets/ea-minicard-view.c b/addressbook/gui/widgets/ea-minicard-view.c
index 58d3a5fd2b..6772a0bf80 100644
--- a/addressbook/gui/widgets/ea-minicard-view.c
+++ b/addressbook/gui/widgets/ea-minicard-view.c
@@ -149,7 +149,8 @@ ea_minicard_view_get_name (AtkObject *accessible)
 	gchar *string;
 	EMinicardView *card_view;
 	EBookClient *book_client = NULL;
-	const gchar *source_name;
+	ESource *source;
+	const gchar *display_name;
 
 	g_return_val_if_fail (EA_IS_MINICARD_VIEW (accessible), NULL);
 
@@ -163,13 +164,14 @@ ea_minicard_view_get_name (AtkObject *accessible)
 	card_view = E_MINICARD_VIEW (reflow);
 	g_object_get (card_view->adapter, "client", &book_client, NULL);
 	g_return_val_if_fail (E_IS_BOOK_CLIENT (book_client), NULL);
-	source_name = e_source_peek_name (e_client_get_source (E_CLIENT (book_client)));
-	if (!source_name)
-		source_name="";
+	source = e_client_get_source (E_CLIENT (book_client));
+	display_name = e_source_peek_name (source);
+	if (display_name == NULL)
+		display_name = "";
 
 	string = g_strdup_printf (ngettext ("current address book folder %s has %d card",
 				  "current address book folder %s has %d cards",
-				  reflow->count), source_name, reflow->count);
+				  reflow->count), display_name, reflow->count);
 
 	ATK_OBJECT_CLASS (parent_class)->set_name (accessible, string);
 	g_free (string);
@@ -372,7 +374,9 @@ static void atk_action_interface_init (AtkActionIface *iface)
 	iface->get_name = atk_action_interface_get_name;
 }
 
-static gboolean atk_action_interface_do_action (AtkAction *action, gint i)
+static gboolean
+atk_action_interface_do_action (AtkAction *action,
+                                gint i)
 {
 	gboolean return_value = TRUE;
 	EMinicardView *card_view;
@@ -405,7 +409,8 @@ static gboolean atk_action_interface_do_action (AtkAction *action, gint i)
 	return return_value;
 }
 
-static gint atk_action_interface_get_n_action (AtkAction *iface)
+static gint
+atk_action_interface_get_n_action (AtkAction *iface)
 {
 	return G_N_ELEMENTS (action_name);
 }
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index c951b290c7..09830a94ae 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -34,13 +34,13 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
+#include <libebook/e-destination.h>
 #include <libedataserver/e-data-server-util.h>
 #include <libedataserverui/e-client-utils.h>
 #include <libedataserverui/e-source-selector.h>
 #include <e-util/e-util.h>
 #include "eab-gui-util.h"
 #include "util/eab-book-util.h"
-#include <libebook/e-destination.h>
 #include "e-util/e-alert-dialog.h"
 #include "e-util/e-html-utils.h"
 #include "shell/e-shell.h"
@@ -319,14 +319,18 @@ eab_select_source (ESource *except_source,
 	selector = e_source_selector_new (source_list);
 	e_source_selector_show_selection (E_SOURCE_SELECTOR (selector), FALSE);
 	if (except_source)
-		g_object_set_data (G_OBJECT (ok_button), "except-source", e_source_list_peek_source_by_uid (source_list, e_source_peek_uid (except_source)));
-	g_signal_connect (selector, "primary_selection_changed",
-			  G_CALLBACK (source_selection_changed_cb), ok_button);
+		g_object_set_data (
+			G_OBJECT (ok_button), "except-source",
+			e_source_list_peek_source_by_uid (source_list, e_source_peek_uid (except_source)));
+	g_signal_connect (
+		selector, "primary_selection_changed",
+		G_CALLBACK (source_selection_changed_cb), ok_button);
 
 	if (select_uid) {
 		source = e_source_list_peek_source_by_uid (source_list, select_uid);
 		if (source)
-			e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (selector), source);
+			e_source_selector_set_primary_selection (
+				E_SOURCE_SELECTOR (selector), source);
 	}
 
 	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
@@ -493,7 +497,9 @@ do_copy (gpointer data,
 	book_client = process->destination;
 
 	process->count++;
-	eab_merging_book_add_contact (book_client, contact, contact_added_cb, process);
+	eab_merging_book_add_contact (
+		book_client,
+		contact, contact_added_cb, process);
 }
 
 static void
@@ -533,6 +539,7 @@ eab_transfer_contacts (EBookClient *source_client,
                        gboolean delete_from_source,
                        EAlertSink *alert_sink)
 {
+	ESource *source;
 	ESource *destination;
 	static gchar *last_uid = NULL;
 	ContactCopyProcess *process;
@@ -559,9 +566,10 @@ eab_transfer_contacts (EBookClient *source_client,
 			desc = _("Copy contacts to");
 	}
 
+	source = e_client_get_source (E_CLIENT (source_client));
+
 	destination = eab_select_source (
-		e_client_get_source (E_CLIENT (source_client)),
-		desc, NULL, last_uid, window);
+		source, desc, NULL, last_uid, window);
 
 	if (!destination)
 		return;
@@ -655,7 +663,11 @@ get_locales (void)
 	gchar *dot;
 	gchar **split;
 
+#ifdef LC_ADDRESS
 	locale = g_strdup (setlocale (LC_ADDRESS, NULL));
+#else
+	locale = NULL;
+#endif
 	if (!locale)
 		return NULL;
 
@@ -727,7 +739,7 @@ country_to_ISO (const gchar *country)
 	}
 
 	while (fgets (buffer, length, file) != NULL) {
-		gchar *low;
+		gchar *low = NULL;
 		pair = g_strsplit (buffer, "\t", 2);
 
 		if (pair[0]) {
diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am
index 742f46a334..ea29cdc38b 100644
--- a/addressbook/importers/Makefile.am
+++ b/addressbook/importers/Makefile.am
@@ -9,7 +9,8 @@ libevolution_addressbook_importers_la_CPPFLAGS =	\
 	-I$(top_srcdir)/addressbook			\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)/addressbook			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(GTKHTML_CFLAGS)
 
 libevolution_addressbook_importers_la_SOURCES = \
 	evolution-ldif-importer.c		\
@@ -23,6 +24,7 @@ libevolution_addressbook_importers_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la 				\
 	$(top_builddir)/addressbook/util/libeabutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
-	$(IMPORTERS_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)					\
+	$(GTKHTML_LIBS)
 
 -include $(top_srcdir)/git.mk
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c
index f41a806940..20d0209f4b 100644
--- a/addressbook/importers/evolution-csv-importer.c
+++ b/addressbook/importers/evolution-csv-importer.c
@@ -40,7 +40,7 @@
 
 #include <libebook/e-destination.h>
 
-#include "e-util/e-import.h"
+#include <e-util/e-import.h>
 
 #include "evolution-addressbook-importers.h"
 
@@ -784,9 +784,12 @@ csv_getwidget (EImport *ei,
 	if (primary == NULL) {
 		primary = e_source_list_peek_source_any (source_list);
 		g_object_ref (primary);
-		g_datalist_set_data_full(&target->data, "csv-source", primary, g_object_unref);
+		g_datalist_set_data_full (
+			&target->data, "csv-source", primary,
+			(GDestroyNotify) g_object_unref);
 	}
-	e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (selector), primary);
+	e_source_selector_set_primary_selection (
+		E_SOURCE_SELECTOR (selector), primary);
 	g_object_unref (source_list);
 
 	g_signal_connect (
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index 8eb0c57192..989bb805f4 100644
--- a/addressbook/importers/evolution-ldif-importer.c
+++ b/addressbook/importers/evolution-ldif-importer.c
@@ -47,7 +47,7 @@
 
 #include <libebook/e-destination.h>
 
-#include "e-util/e-import.h"
+#include <e-util/e-import.h>
 
 #include "evolution-addressbook-importers.h"
 
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c
index cf3a429337..b35553943e 100644
--- a/addressbook/importers/evolution-vcard-importer.c
+++ b/addressbook/importers/evolution-vcard-importer.c
@@ -42,9 +42,9 @@
 #include <util/eab-book-util.h>
 #include <libebook/e-destination.h>
 
-#include "e-util/e-import.h"
-#include "e-util/e-datetime-format.h"
-#include "misc/e-web-view-preview.h"
+#include <e-util/e-import.h>
+#include <e-util/e-datetime-format.h>
+#include <misc/e-web-view-preview.h>
 
 #include "evolution-addressbook-importers.h"
 
@@ -351,8 +351,7 @@ guess_vcard_encoding (const gchar *filename)
 		return VCARD_ENCODING_NONE;
 	}
 
-	fgets (line, 4096, handle);
-	if (line == NULL) {
+	if (fgets (line, 4096, handle) == NULL) {
 		fclose (handle);
 		g_print ("\n");
 		return VCARD_ENCODING_NONE;
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index c315b49d0a..edf3cc9795 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -11,8 +11,8 @@ libecontactprint_la_CPPFLAGS =			\
 	-I$(top_srcdir)				\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"	\
 	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"	\
-	$(GNOME_PLATFORM_CFLAGS)		\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
+	$(GNOME_PLATFORM_CFLAGS)
 
 noinst_LTLIBRARIES = libecontactprint.la
 
@@ -22,8 +22,9 @@ libecontactprint_la_SOURCES = 			\
 	e-contact-print.h
 
 libecontactprint_la_LIBADD =					\
-	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
+	$(top_builddir)/e-util/libeutil.la			\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
 noinst_PROGRAMS = contact-print-test
@@ -34,17 +35,17 @@ contact_print_test_CPPFLAGS = \
 	-I$(top_srcdir)/addressbook		\
 	-I$(top_srcdir)				\
 	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"	\
-	$(GNOME_PLATFORM_CFLAGS)		\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
+	$(GNOME_PLATFORM_CFLAGS)
 
 contact_print_test_SOURCES = test-print.c
 
 contact_print_test_LDADD =	\
 	libecontactprint.la					\
 	$(top_builddir)/addressbook/util/libeabutil.la		\
-	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
+	$(top_builddir)/e-util/libeutil.la			\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = 		\
diff --git a/addressbook/tools/Makefile.am b/addressbook/tools/Makefile.am
index 35d742ef3d..26ead07ac5 100644
--- a/addressbook/tools/Makefile.am
+++ b/addressbook/tools/Makefile.am
@@ -16,7 +16,7 @@ evolution_addressbook_export_CPPFLAGS =			\
 	-DLIBDIR=\""$(libdir)"\"			\
 	-I$(top_srcdir)/addressbook			\
 	-I$(top_builddir)/addressbook			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)
 
 evolution_addressbook_export_SOURCES =				\
 	evolution-addressbook-export.c				\
@@ -25,7 +25,7 @@ evolution_addressbook_export_SOURCES =				\
 	evolution-addressbook-export.h
 
 evolution_addressbook_export_LDADD =				\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)
 
 if OS_WIN32
 evolution_addressbook_export_LDFLAGS = -mwindows
diff --git a/addressbook/tools/evolution-addressbook-export.c b/addressbook/tools/evolution-addressbook-export.c
index 5460c5a8bd..33d840ec5e 100644
--- a/addressbook/tools/evolution-addressbook-export.c
+++ b/addressbook/tools/evolution-addressbook-export.c
@@ -55,7 +55,7 @@ static gint opt_file_size = 0;
 static gchar **opt_remaining = NULL;
 
 static GOptionEntry entries[] = {
-	{ "output", '\0', G_OPTION_FLAG_FILENAME,
+	{ "output", '\0', 0,
 	  G_OPTION_ARG_STRING, &opt_output_file,
 	  N_("Specify the output file instead of standard output"),
 	  N_("OUTPUTFILE") },
diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am
index fe45b3d7e2..ea70fbb9ca 100644
--- a/addressbook/util/Makefile.am
+++ b/addressbook/util/Makefile.am
@@ -11,8 +11,8 @@ libeabutil_la_CPPFLAGS =				\
 	-I$(top_builddir)/shell				\
 	-I$(top_srcdir)/shell				\
 	-I$(top_srcdir)/widgets				\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libeabutil_la_SOURCES =					\
 	eab-book-util.c					\
@@ -24,7 +24,7 @@ libeabutil_la_LIBADD =					\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la \
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/shell/libeshell.la		\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)			\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)
 
 dist-hook:
diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c
index 5c8d3350fd..9839e5174f 100644
--- a/addressbook/util/eab-book-util.c
+++ b/addressbook/util/eab-book-util.c
@@ -180,7 +180,7 @@ eab_book_and_contact_list_from_string (const gchar *str,
 	*book_client = e_book_client_new_from_uri (uri, NULL);
 	g_free (uri);
 
-	return *book_client ? TRUE : FALSE;
+	return (*book_client != NULL);
 }
 
 gchar *
@@ -193,11 +193,11 @@ eab_book_and_contact_list_to_string (EBookClient *book_client,
 	if (!s0)
 		s0 = g_strdup ("");
 
-	if (book_client)
+	if (book_client != NULL) {
 		s1 = g_strconcat (
 			"Book: ", e_client_get_uri (
 			E_CLIENT (book_client)), "\r\n", s0, NULL);
-	else
+	} else
 		s1 = g_strdup (s0);
 
 	g_free (s0);
diff --git a/addressbook/util/eab-book-util.h b/addressbook/util/eab-book-util.h
index 602e7bd44b..4376863973 100644
--- a/addressbook/util/eab-book-util.h
+++ b/addressbook/util/eab-book-util.h
@@ -28,14 +28,21 @@
 
 G_BEGIN_DECLS
 
-GSList *	eab_contact_list_from_string		(const gchar *str);
-gchar *		eab_contact_list_to_string		(const GSList *contacts);
-
-gboolean	eab_book_and_contact_list_from_string	(const gchar *str, EBookClient **book_client, GSList **contacts);
-gchar *		eab_book_and_contact_list_to_string	(EBookClient *book_client, const GSList *contacts);
-
-gint		e_utf8_casefold_collate_len		(const gchar *str1, const gchar *str2, gint len);
-gint		e_utf8_casefold_collate			(const gchar *str1, const gchar *str2);
+GSList *	eab_contact_list_from_string	(const gchar *str);
+gchar *		eab_contact_list_to_string	(const GSList *contacts);
+
+gboolean	eab_book_and_contact_list_from_string
+						(const gchar *str,
+						 EBookClient **book_client,
+						 GSList **contacts);
+gchar *		eab_book_and_contact_list_to_string
+						(EBookClient *book_client,
+						 const GSList *contacts);
+gint		e_utf8_casefold_collate_len	(const gchar *str1,
+						 const gchar *str2,
+						 gint len);
+gint		e_utf8_casefold_collate		(const gchar *str1,
+						 const gchar *str2);
 
 G_END_DECLS
 
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 1531bb8d60..ce1f832ba3 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -67,10 +67,10 @@ libevolution_calendar_la_CPPFLAGS =			\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
 	-DPREFIX=\""$(prefix)"\"			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(LIBSOUP_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(CAMEL_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(LIBSOUP_CFLAGS)
 
 etspec_DATA =				\
 	e-calendar-table.etspec		\
@@ -213,10 +213,10 @@ libevolution_calendar_la_LIBADD =					\
 	$(top_builddir)/widgets/table/libetable.la			\
 	$(top_builddir)/filter/libfilter.la				\
 	$(top_builddir)/e-util/libeutil.la				\
-	$(CAMEL_LIBS)							\
-	$(LIBSOUP_LIBS)							\
-	$(EVOLUTION_CALENDAR_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)					\
+	$(GNOME_PLATFORM_LIBS)						\
+	$(GTKHTML_LIBS)							\
+	$(LIBSOUP_LIBS)
 
 libevolution_calendar_la_LDFLAGS = $(NO_UNDEFINED)
 
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index c15181ad9c..82fdeeb77e 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -18,9 +18,9 @@ evolution_alarm_notify_CPPFLAGS = 			\
 	-DEVOLUTION_ICONDIR=\""$(icondir)"\"		\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\"	\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(CAMEL_CFLAGS)					\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
+	$(LIBNOTIFY_CFLAGS)				\
 	$(CANBERRA_CFLAGS)
 
 ui_DATA =		\
@@ -44,10 +44,10 @@ evolution_alarm_notify_SOURCES =	\
 evolution_alarm_notify_LDADD =						\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
-	$(CAMEL_LIBS)							\
-	$(EVOLUTION_CALENDAR_LIBS)					\
-	$(CANBERRA_LIBS)						\
+	$(EVOLUTION_DATA_SERVER_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)						\
+	$(LIBNOTIFY_LIBS)						\
+	$(CANBERRA_LIBS)						\
 	$(EVOLUTIONALARMNOTIFYICON)
 
 if OS_WIN32
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index 3256e39780..3b5402b4a6 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -39,6 +39,8 @@
 
 #define APPLICATION_ID "org.gnome.EvolutionAlarmNotify"
 
+#define APPLICATION_ID "org.gnome.EvolutionAlarmNotify"
+
 struct _AlarmNotifyPrivate {
 	/* Mapping from EUri's to LoadedClient structures */
 	/* FIXME do we need per source type uri hashes? or perhaps we
@@ -55,7 +57,13 @@ typedef struct {
 	GList *removals;
 } ProcessRemovalsData;
 
-G_DEFINE_TYPE (AlarmNotify, alarm_notify, GTK_TYPE_APPLICATION)
+/* Forward Declarations */
+static void	alarm_notify_initable_init	(GInitableIface *interface);
+
+G_DEFINE_TYPE_WITH_CODE (
+	AlarmNotify, alarm_notify, GTK_TYPE_APPLICATION,
+	G_IMPLEMENT_INTERFACE (
+		G_TYPE_INITABLE, alarm_notify_initable_init))
 
 static void
 process_removal_in_hash (const gchar *uri,
@@ -264,6 +272,15 @@ alarm_notify_activate (GApplication *application)
 	 * if there are no handlers connected to this signal. */
 }
 
+static gboolean
+alarm_notify_initable (GInitable *initable,
+                       GCancellable *cancellable,
+                       GError **error)
+{
+	/* XXX Just return TRUE for now.  We'll have use for this soon. */
+	return TRUE;
+}
+
 static void
 alarm_notify_class_init (AlarmNotifyClass *class)
 {
@@ -281,6 +298,13 @@ alarm_notify_class_init (AlarmNotifyClass *class)
 }
 
 static void
+alarm_notify_initable_init (GInitableIface *interface)
+{
+	/* XXX Awkward name since we're missing an 'E' prefix. */
+	interface->init = alarm_notify_initable;
+}
+
+static void
 alarm_notify_init (AlarmNotify *an)
 {
 	gint ii;
@@ -317,10 +341,11 @@ alarm_notify_get_selected_calendars (AlarmNotify *an)
  * Returns: a newly-created #AlarmNotify
  **/
 AlarmNotify *
-alarm_notify_new (void)
+alarm_notify_new (GCancellable *cancellable,
+                  GError **error)
 {
-	return g_object_new (
-		TYPE_ALARM_NOTIFY,
+	return g_initable_new (
+		TYPE_ALARM_NOTIFY, cancellable, error,
 		"application-id", APPLICATION_ID, NULL);
 }
 
diff --git a/calendar/gui/alarm-notify/alarm-notify.h b/calendar/gui/alarm-notify/alarm-notify.h
index 51837d21d5..f95a4d6b33 100644
--- a/calendar/gui/alarm-notify/alarm-notify.h
+++ b/calendar/gui/alarm-notify/alarm-notify.h
@@ -65,7 +65,8 @@ struct _AlarmNotifyClass {
 };
 
 GType		alarm_notify_get_type		(void);
-AlarmNotify *	alarm_notify_new		(void);
+AlarmNotify *	alarm_notify_new		(GCancellable *cancellable,
+						 GError **error);
 void		alarm_notify_add_calendar	(AlarmNotify *an,
 						 ECalClientSourceType source_type,
 						 ESource *source,
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index d7a1346a8e..8a4ae2face 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -970,7 +970,6 @@ query_objects_removed_cb (ECalClientView *view,
 
 	message_push ((Message *) msg);
 }
-
 
 /* Notification functions */
 
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
index 968eb95959..a05498532b 100644
--- a/calendar/gui/alarm-notify/alarm.c
+++ b/calendar/gui/alarm-notify/alarm.c
@@ -36,7 +36,6 @@
 #include "alarm.h"
 #include "config-data.h"
 
-
 
 /* Our glib timeout */
 static guint timeout_id;
@@ -54,8 +53,6 @@ typedef struct {
 
 static void setup_timeout (void);
 
-
-
 /* Removes the head alarm from the queue.  Does not touch the timeout_id. */
 static void
 pop_alarm (void)
@@ -199,8 +196,6 @@ queue_alarm (AlarmRecord *ar)
 	setup_timeout ();
 }
 
-
-
 /**
  * alarm_add:
  * @trigger: Time at which alarm will trigger.
diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h
index 7a14db5d03..54a6e4c720 100644
--- a/calendar/gui/alarm-notify/alarm.h
+++ b/calendar/gui/alarm-notify/alarm.h
@@ -29,7 +29,6 @@
 #include <time.h>
 #include <glib.h>
 
-
 
 typedef void (* AlarmFunction) (gpointer alarm_id, time_t trigger, gpointer data);
 typedef void (* AlarmDestroyNotify) (gpointer alarm_id, gpointer data);
@@ -40,6 +39,4 @@ gpointer alarm_add (time_t trigger, AlarmFunction alarm_fn, gpointer data,
 		    AlarmDestroyNotify destroy_notify_fn);
 void alarm_remove (gpointer alarm);
 
-
-
 #endif
diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c
index aa8755973a..4f30a4e4f3 100644
--- a/calendar/gui/alarm-notify/config-data.c
+++ b/calendar/gui/alarm-notify/config-data.c
@@ -37,8 +37,6 @@ static GConfClient *conf_client = NULL;
 static GSetting *calendar_settings = NULL;
 static ESourceList *calendar_source_list = NULL, *tasks_source_list = NULL;
 
-
-
 /* Copied from ../calendar-config.c; returns whether the locale has 'am' and
  * 'pm' strings defined.
  */
@@ -261,16 +259,25 @@ config_data_set_last_notification_time (ECalClient *cal,
 	if (cal) {
 		ESource *source = e_client_get_source (E_CLIENT (cal));
 		if (source) {
-			GTimeVal tmval = {0};
-			gchar *as_text;
+			const gchar *prop_str;
+			GTimeVal curr_tv = {0};
+
+			prop_str = e_source_get_property (source, "last-notified");
+			if (!prop_str || !g_time_val_from_iso8601 (prop_str, &curr_tv))
+				curr_tv.tv_sec = 0;
 
-			tmval.tv_sec = (glong) t;
-			as_text = g_time_val_to_iso8601 (&tmval);
+			if (t > (time_t) curr_tv.tv_sec || (time_t) curr_tv.tv_sec > now) {
+				GTimeVal tmval = {0};
+				gchar *as_text;
 
-			if (as_text) {
-				e_source_set_property (source, "last-notified", as_text);
-				g_free (as_text);
-				return;
+				tmval.tv_sec = (glong) t;
+				as_text = g_time_val_to_iso8601 (&tmval);
+
+				if (as_text) {
+					e_source_set_property (source, "last-notified", as_text);
+					g_free (as_text);
+					/* pass through, thus the global last notification time is also changed */
+				}
 			}
 		}
 	}
@@ -317,7 +324,6 @@ config_data_get_last_notification_time (ECalClient *cal)
 
 	value = g_settings_get_int (calendar_settings, "last-notification-time");
 	now = time (NULL);
-
 	if (val > now)
 		val = now;
 
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index 225dde4c26..b1775d8d23 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -27,6 +27,7 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
 #include <glib/gi18n.h>
 
 #include "alarm-notify.h"
@@ -50,6 +51,7 @@ main (gint argc,
 {
 	AlarmNotify *alarm_notify_service;
 	gint exit_status;
+	GError *error = NULL;
 #ifdef G_OS_WIN32
 	gchar *path;
 
@@ -87,7 +89,13 @@ main (gint argc,
 		g_warning ("Could not set PATH for Evolution Alarm Notifier");
 #endif
 
-	alarm_notify_service = alarm_notify_new ();
+	alarm_notify_service = alarm_notify_new (NULL, &error);
+
+	if (error != NULL) {
+		g_printerr ("%s\n", error->message);
+		g_error_free (error);
+		exit (EXIT_FAILURE);
+	}
 
 	exit_status = g_application_run (
 		G_APPLICATION (alarm_notify_service), argc, argv);
diff --git a/calendar/gui/calendar-view-factory.c b/calendar/gui/calendar-view-factory.c
index b1d4a4fd72..4c92d6d8fc 100644
--- a/calendar/gui/calendar-view-factory.c
+++ b/calendar/gui/calendar-view-factory.c
@@ -30,7 +30,6 @@
 #include "calendar-view-factory.h"
 #include "calendar-view.h"
 
-
 
 /* Private part of the CalendarViewFactory structure */
 struct _CalendarViewFactoryPrivate {
@@ -38,8 +37,6 @@ struct _CalendarViewFactoryPrivate {
 	GnomeCalendarViewType view_type;
 };
 
-
-
 static void	calendar_view_factory_finalize	(GObject *object);
 static const gchar *
 		calendar_view_factory_get_title	(GalViewFactory *factory);
@@ -99,8 +96,6 @@ calendar_view_factory_finalize (GObject *object)
 	G_OBJECT_CLASS (calendar_view_factory_parent_class)->finalize (object);
 }
 
-
-
 /* get_title method for the calendar view factory */
 static const gchar *
 calendar_view_factory_get_title (GalViewFactory *factory)
@@ -173,8 +168,6 @@ calendar_view_factory_new_view (GalViewFactory *factory,
 	return GAL_VIEW (cal_view);
 }
 
-
-
 /**
  * calendar_view_factory_construct:
  * @cal_view_factory: A calendar view factory.
diff --git a/calendar/gui/calendar-view-factory.h b/calendar/gui/calendar-view-factory.h
index c6022ae657..bad3dcfd1f 100644
--- a/calendar/gui/calendar-view-factory.h
+++ b/calendar/gui/calendar-view-factory.h
@@ -31,8 +31,6 @@
 
 G_BEGIN_DECLS
 
-
-
 #define TYPE_CALENDAR_VIEW_FACTORY            (calendar_view_factory_get_type ())
 #define CALENDAR_VIEW_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CALENDAR_VIEW_FACTORY,  \
 					       CalendarViewFactory))
@@ -62,8 +60,6 @@ GalViewFactory *calendar_view_factory_construct (CalendarViewFactory *cal_view_f
 
 GalViewFactory *calendar_view_factory_new (GnomeCalendarViewType view_type);
 
-
-
 G_END_DECLS
 
 #endif
diff --git a/calendar/gui/calendar-view.c b/calendar/gui/calendar-view.c
index 0931a4b189..d238daf3df 100644
--- a/calendar/gui/calendar-view.c
+++ b/calendar/gui/calendar-view.c
@@ -28,7 +28,6 @@
 
 #include "calendar-view.h"
 
-
 
 /* Private part of the CalendarView structure */
 struct _CalendarViewPrivate {
@@ -39,8 +38,6 @@ struct _CalendarViewPrivate {
 	gchar *title;
 };
 
-
-
 static void calendar_view_finalize (GObject *object);
 
 static void calendar_view_load (GalView *view, const gchar *filename);
@@ -110,8 +107,6 @@ calendar_view_finalize (GObject *object)
 	G_OBJECT_CLASS (calendar_view_parent_class)->finalize (object);
 }
 
-
-
 /* load method of the calendar view */
 static void
 calendar_view_load (GalView *view,
@@ -207,8 +202,6 @@ calendar_view_clone (GalView *view)
 	return GAL_VIEW (new_view);
 }
 
-
-
 /**
  * calendar_view_construct:
  * @cal_view: A calendar view.
diff --git a/calendar/gui/calendar-view.h b/calendar/gui/calendar-view.h
index d2e9a7d649..f3a2a3103b 100644
--- a/calendar/gui/calendar-view.h
+++ b/calendar/gui/calendar-view.h
@@ -31,8 +31,6 @@
 
 G_BEGIN_DECLS
 
-
-
 #define TYPE_CALENDAR_VIEW            (calendar_view_get_type ())
 #define CALENDAR_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CALENDAR_VIEW, CalendarView))
 #define CALENDAR_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CALENDAR_VIEW,	\
@@ -64,8 +62,6 @@ CalendarView *calendar_view_new (GnomeCalendarViewType view_type,
 
 GnomeCalendarViewType calendar_view_get_view_type (CalendarView *cal_view);
 
-
-
 G_END_DECLS
 
 #endif
diff --git a/calendar/gui/caltypes.xml b/calendar/gui/caltypes.xml
index c1997a4fb0..964b623a3e 100644
--- a/calendar/gui/caltypes.xml
+++ b/calendar/gui/caltypes.xml
@@ -168,6 +168,25 @@
   	 </option>
  	 </input>
  	</part>
+
+   <part name="count-occurrences">
+      <_title>Occurs</_title>
+      <input type="optionlist" name="match-type">
+         <option value="less-than">
+            <_title>Less Than</_title>
+            <code>((or (= (occurrences-count?) (- 1)) (&lt; (occurrences-count?) ${count}))</code>
+         </option>
+         <option value="exactly">
+            <_title>Exactly</_title>
+            <code>((or (= (occurrences-count?) (- 1)) (= (occurrences-count?) ${count}))</code>
+         </option>
+         <option value="more-than">
+            <_title>More Than</_title>
+            <code>((or (= (occurrences-count?) (- 1)) (&gt; (occurrences-count?) ${count}))</code>
+         </option>
+      </input>
+      <input type="integer" name="count"/>
+   </part>
   </partset>
 
 <ruleset>
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index 9405f24b5a..8bb5500f23 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -39,7 +39,6 @@
 #include "shell/e-shell-window.h"
 #include "shell/e-shell-view.h"
 
-
 
 /**
  * cal_comp_util_add_exdate:
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 684550990b..b7235ede2a 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -12,11 +12,10 @@ libcal_dialogs_la_CPPFLAGS = 						\
 	-I$(top_srcdir)/widgets/misc					\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"				\
 	-DEVOLUTION_ICONDIR=\""$(icondir)"\"				\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"				\
+	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"			\
 	-DPREFIX=\""$(prefix)"\"					\
-	$(GNOME_PLATFORM_CFLAGS)					\
-	$(EVOLUTION_CALENDAR_CFLAGS)					\
-	$(CAMEL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
+	$(GNOME_PLATFORM_CFLAGS)
 
 ecalendarincludedir = $(privincludedir)/calendar/gui/dialogs
 
@@ -51,7 +50,7 @@ ecalendarinclude_HEADERS =		\
 
 libcal_dialogs_la_LIBADD =					\
 	$(top_builddir)/addressbook/util/libeabutil.la		\
-	$(CAMEL_LIBS)						\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
 libcal_dialogs_la_SOURCES =		\
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index 59cdb4515b..4576f3df6f 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -45,7 +45,6 @@
 #include "comp-editor-util.h"
 #include "alarm-dialog.h"
 
-
 
 typedef struct {
 	GtkBuilder *builder;
diff --git a/calendar/gui/dialogs/alarm-dialog.h b/calendar/gui/dialogs/alarm-dialog.h
index d99d47f15f..42c72d685a 100644
--- a/calendar/gui/dialogs/alarm-dialog.h
+++ b/calendar/gui/dialogs/alarm-dialog.h
@@ -35,7 +35,9 @@
 
 G_BEGIN_DECLS
 
-gboolean alarm_dialog_run (GtkWidget *parent, ECalClient *cal_client, ECalComponentAlarm *alarm);
+gboolean	alarm_dialog_run		(GtkWidget *parent,
+						 ECalClient *cal_client,
+						 ECalComponentAlarm *alarm);
 
 G_END_DECLS
 
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index 48503c1023..4fb5884026 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -42,7 +42,6 @@
 #include "alarm-dialog.h"
 #include "alarm-list-dialog.h"
 
-
 
 typedef struct {
 	GtkBuilder *builder;
diff --git a/calendar/gui/dialogs/alarm-list-dialog.h b/calendar/gui/dialogs/alarm-list-dialog.h
index 163582c556..5746664c1f 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.h
+++ b/calendar/gui/dialogs/alarm-list-dialog.h
@@ -36,9 +36,13 @@
 
 G_BEGIN_DECLS
 
-gboolean alarm_list_dialog_run (GtkWidget *parent, ECalClient *cal_client, EAlarmList *list_store);
-GtkWidget *alarm_list_dialog_peek (ECalClient *cal_client, EAlarmList *list_store);
-void alarm_list_dialog_set_client (GtkWidget *dlg_box, ECalClient *cal_client);
+gboolean	alarm_list_dialog_run		(GtkWidget *parent,
+						 ECalClient *cal_client,
+						 EAlarmList *list_store);
+GtkWidget *	alarm_list_dialog_peek		(ECalClient *cal_client,
+						 EAlarmList *list_store);
+void		alarm_list_dialog_set_client	(GtkWidget *dlg_box,
+						 ECalClient *cal_client);
 
 G_END_DECLS
 
diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index 86663eda97..c5caa9371d 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -31,7 +31,6 @@
 #include "e-util/e-alert-dialog.h"
 #include "cancel-comp.h"
 
-
 
 /* is_past_event:
  *
diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c
index 78928795f6..bc25188f5d 100644
--- a/calendar/gui/dialogs/changed-comp.c
+++ b/calendar/gui/dialogs/changed-comp.c
@@ -29,7 +29,6 @@
 #include <glib/gi18n.h>
 #include "changed-comp.h"
 
-
 
 /**
  * changed_component_dialog:
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index cbc34cb108..2c087bb2f6 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -37,7 +37,6 @@
 #include <shell/e-shell.h>
 #include "comp-editor-util.h"
 
-
 
 /**
  * comp_editor_dates:
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 5efab7920c..033b1323f9 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -36,6 +36,7 @@
 #include <glib/gstdio.h>
 #include <gio/gio.h>
 #include <gdk/gdkkeysyms.h>
+#include <libebackend/e-extensible.h>
 #include <e-util/e-util.h>
 #include <e-util/e-alert-sink.h>
 #include <e-util/e-dialog-utils.h>
@@ -3006,6 +3007,7 @@ attachment_loaded_cb (EAttachment *attachment,
 	GFileInfo *file_info;
 	const gchar *display_name;
 	const gchar *uid;
+	gchar *new_name;
 
 	/* Prior to 2.27.2, attachment files were named:
 	 *
@@ -3036,9 +3038,10 @@ attachment_loaded_cb (EAttachment *attachment,
 	uid = g_object_get_data (G_OBJECT (attachment), "uid");
 
 	if (g_str_has_prefix (display_name, uid)) {
-		g_file_info_set_display_name (
-			file_info, display_name + strlen (uid) + 1);
+		new_name = g_strdup (display_name + strlen (uid) + 1);
+		g_file_info_set_display_name (file_info, new_name);
 		g_object_notify (G_OBJECT (attachment), "file-info");
+		g_free (new_name);
 	}
 
 	e_attachment_load_handle_error (attachment, result, parent);
@@ -3238,6 +3241,7 @@ real_send_comp (CompEditor *editor,
 	g_return_val_if_fail (IS_COMP_EDITOR (editor), FALSE);
 
 	priv = editor->priv;
+
 	flags = comp_editor_get_flags (editor);
 
 	if (priv->mod == CALOBJ_MOD_ALL && e_cal_component_is_instance (priv->comp)) {
diff --git a/calendar/gui/dialogs/copy-source-dialog.h b/calendar/gui/dialogs/copy-source-dialog.h
index d9475f742c..5ac51406de 100644
--- a/calendar/gui/dialogs/copy-source-dialog.h
+++ b/calendar/gui/dialogs/copy-source-dialog.h
@@ -27,10 +27,12 @@
 #define COPY_SOURCE_DIALOG_H
 
 #include <gtk/gtk.h>
-#include <libedataserver/e-source.h>
-#include <libecal/e-cal-client.h>
 #include <libecal/e-cal-util.h>
+#include <libecal/e-cal-client.h>
+#include <libedataserver/e-source.h>
 
-void copy_source_dialog (GtkWindow *parent, ESource *source, ECalClientSourceType type);
+void		copy_source_dialog		(GtkWindow *parent,
+						 ESource *source,
+						 ECalClientSourceType type);
 
-#endif
+#endif /* COPY_SOURCE_DIALOG_H */
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index a28fa00221..44c133afbe 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -30,7 +30,6 @@
 #include "e-util/e-alert-dialog.h"
 #include "delete-comp.h"
 
-
 
 /**
  * delete_component_dialog:
diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c
index a5cc6a1b02..a68fed8e1d 100644
--- a/calendar/gui/dialogs/delete-error.c
+++ b/calendar/gui/dialogs/delete-error.c
@@ -30,7 +30,6 @@
 #include <glib/gi18n.h>
 #include "delete-error.h"
 
-
 
 /**
  * delete_error_dialog:
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index af61f807a8..fc7ae7d121 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -124,7 +124,6 @@ e_delegate_dialog_construct (EDelegateDialog *edd,
 	ENameSelectorModel *name_selector_model;
 	ENameSelectorDialog *name_selector_dialog;
 
-	g_return_val_if_fail (edd != NULL, NULL);
 	g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);
 
 	priv = edd->priv;
@@ -228,8 +227,10 @@ e_delegate_dialog_new (const gchar *name,
 {
 	EDelegateDialog *edd;
 
-	edd = E_DELEGATE_DIALOG (g_object_new (E_TYPE_DELEGATE_DIALOG, NULL));
-	return e_delegate_dialog_construct (E_DELEGATE_DIALOG (edd), name, address);
+	edd = g_object_new (E_TYPE_DELEGATE_DIALOG, NULL);
+
+	return e_delegate_dialog_construct (
+		E_DELEGATE_DIALOG (edd), name, address);
 }
 
 gchar *
diff --git a/calendar/gui/dialogs/e-delegate-dialog.h b/calendar/gui/dialogs/e-delegate-dialog.h
index 032901c8bc..5fb672bd5e 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.h
+++ b/calendar/gui/dialogs/e-delegate-dialog.h
@@ -21,28 +21,38 @@
  *
  */
 
-#ifndef __E_DELEGATE_DIALOG_H__
-#define __E_DELEGATE_DIALOG_H__
+#ifndef E_DELEGATE_DIALOG_H
+#define E_DELEGATE_DIALOG_H
 
 #include <gtk/gtk.h>
 
-
-
-#define E_TYPE_DELEGATE_DIALOG       (e_delegate_dialog_get_type ())
-#define E_DELEGATE_DIALOG(obj)       (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DELEGATE_DIALOG, EDelegateDialog))
-#define E_DELEGATE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_DELEGATE_DIALOG,	\
-				      EDelegateDialogClass))
-#define E_IS_DELEGATE_DIALOG(obj)    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_DELEGATE_DIALOG))
-#define E_IS_DELEGATE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_DELEGATE_DIALOG))
-
-typedef struct _EDelegateDialog		EDelegateDialog;
-typedef struct _EDelegateDialogClass	EDelegateDialogClass;
-typedef struct _EDelegateDialogPrivate	EDelegateDialogPrivate;
+/* Standard GObject macros */
+#define E_TYPE_DELEGATE_DIALOG \
+	(e_delegate_dialog_get_type ())
+#define E_DELEGATE_DIALOG(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_DELEGATE_DIALOG, EDelegateDialog))
+#define E_DELEGATE_DIALOG_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_DELEGATE_DIALOG, EDelegateDialogClass))
+#define E_IS_DELEGATE_DIALOG(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_DELEGATE_DIALOG))
+#define E_IS_DELEGATE_DIALOG_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_DELEGATE_DIALOG))
+#define E_DELEGATE_DIALOG_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_DELEGATE_DIALOG, EDelegateDialogClass))
+
+G_BEGIN_DECLS
+
+typedef struct _EDelegateDialog EDelegateDialog;
+typedef struct _EDelegateDialogClass EDelegateDialogClass;
+typedef struct _EDelegateDialogPrivate EDelegateDialogPrivate;
 
 struct _EDelegateDialog {
 	GObject object;
-
-	/* Private data */
 	EDelegateDialogPrivate *priv;
 };
 
@@ -50,24 +60,21 @@ struct _EDelegateDialogClass {
 	GObjectClass parent_class;
 };
 
-GType            e_delegate_dialog_get_type          (void);
-
-EDelegateDialog * e_delegate_dialog_construct         (EDelegateDialog *etd,
-						      const gchar      *name,
-						      const gchar      *address);
-
-EDelegateDialog * e_delegate_dialog_new               (const gchar      *name,
-						      const gchar      *address);
-
-gchar *            e_delegate_dialog_get_delegate      (EDelegateDialog *etd);
-
-gchar *            e_delegate_dialog_get_delegate_name (EDelegateDialog *etd);
-
-void             e_delegate_dialog_set_delegate      (EDelegateDialog *etd,
-						      const gchar      *address);
-
-GtkWidget *       e_delegate_dialog_get_toplevel      (EDelegateDialog *etd);
-
-
-
-#endif /* __E_DELEGATE_DIALOG_H__ */
+GType		e_delegate_dialog_get_type	(void);
+EDelegateDialog *
+		e_delegate_dialog_construct	(EDelegateDialog *etd,
+						 const gchar *name,
+						 const gchar *address);
+EDelegateDialog *
+		e_delegate_dialog_new		(const gchar *name,
+						 const gchar *address);
+gchar *		e_delegate_dialog_get_delegate	(EDelegateDialog *etd);
+gchar *		e_delegate_dialog_get_delegate_name
+						(EDelegateDialog *etd);
+void		e_delegate_dialog_set_delegate	(EDelegateDialog *etd,
+						 const gchar *address);
+GtkWidget *	e_delegate_dialog_get_toplevel	(EDelegateDialog *etd);
+
+G_END_DECLS
+
+#endif /* E_DELEGATE_DIALOG_H */
diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c
index f8e933574c..780554812d 100644
--- a/calendar/gui/dialogs/e-send-options-utils.c
+++ b/calendar/gui/dialogs/e-send-options-utils.c
@@ -28,6 +28,7 @@
 
 #include "e-send-options-utils.h"
 
+#include <stdlib.h>
 #include <string.h>
 
 void
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index f89b67056d..29352642e7 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -730,8 +730,9 @@ event_editor_send_comp (CompEditor *editor,
 		gboolean result;
 
 		client = e_meeting_store_get_client (priv->model);
-		result = itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp,
-				client, NULL, NULL, NULL, strip_alarms, FALSE);
+		result = itip_send_comp (
+			E_CAL_COMPONENT_METHOD_CANCEL, comp,
+			client, NULL, NULL, NULL, strip_alarms, FALSE);
 		g_object_unref (comp);
 
 		if (!result)
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 653f0215ac..b418898509 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -2916,11 +2916,12 @@ epage_client_opened_cb (GObject *source_object,
 			E_SOURCE_COMBO_BOX (priv->source_selector),
 			e_client_get_source (E_CLIENT (old_client)));
 
-		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-						 _("Unable to open the calendar '%s': %s"),
-						 e_source_peek_name (source),
-						 error ? error->message : _("Unknown error"));
+		dialog = gtk_message_dialog_new (
+			NULL, GTK_DIALOG_MODAL,
+			GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
+			_("Unable to open the calendar '%s': %s"),
+			e_source_peek_name (source),
+			error->message);
 		gtk_dialog_run (GTK_DIALOG (dialog));
 		gtk_widget_destroy (dialog);
 
@@ -2952,7 +2953,8 @@ epage_client_opened_cb (GObject *source_object,
 
 		sensitize_widgets (epage);
 
-		alarm_list_dialog_set_client (priv->alarm_list_dlg_widget, cal_client);
+		alarm_list_dialog_set_client (
+			priv->alarm_list_dlg_widget, cal_client);
 	}
 }
 
@@ -3407,8 +3409,6 @@ init_widgets (EventPage *epage)
 	return TRUE;
 }
 
-
-
 static void
 event_page_select_organizer (EventPage *epage,
                              const gchar *backend_address)
diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c
index e9a941998d..9652553ee3 100644
--- a/calendar/gui/dialogs/recur-comp.c
+++ b/calendar/gui/dialogs/recur-comp.c
@@ -29,7 +29,6 @@
 #include <glib/gi18n.h>
 #include "recur-comp.h"
 
-
 
 gboolean
 recur_component_dialog (ECalClient *client,
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 6f201b596f..54dee77f44 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -189,8 +189,6 @@ struct _RecurrencePagePrivate {
 	GCancellable *cancellable;
 };
 
-
-
 static void recurrence_page_finalize (GObject *object);
 
 static gboolean fill_component (RecurrencePage *rpage, ECalComponent *comp);
@@ -2075,8 +2073,6 @@ recurrence_page_set_dates (CompEditorPage *page,
 	preview_recur (rpage);
 }
 
-
-
 /* Gets the widgets from the XML file and returns if they are all available. */
 static gboolean
 get_widgets (RecurrencePage *rpage)
diff --git a/calendar/gui/dialogs/select-source-dialog.h b/calendar/gui/dialogs/select-source-dialog.h
index 6d64fb825a..2ef8e0e625 100644
--- a/calendar/gui/dialogs/select-source-dialog.h
+++ b/calendar/gui/dialogs/select-source-dialog.h
@@ -30,6 +30,8 @@
 #include <libedataserver/e-source.h>
 #include <libecal/e-cal-client.h>
 
-ESource *select_source_dialog (GtkWindow *parent, ECalClientSourceType type, ESource *except_source);
+ESource *	select_source_dialog		(GtkWindow *parent,
+						 ECalClientSourceType type,
+						 ESource *except_source);
 
 #endif
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index 3752db372b..524f4c8097 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -30,7 +30,6 @@
 #include "e-util/e-alert-dialog.h"
 #include "send-comp.h"
 
-
 
 static gboolean
 component_has_new_attendees (ECalComponent *comp)
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 31593e0a04..1942224f7f 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -472,8 +472,9 @@ task_editor_send_comp (CompEditor *editor,
 		gboolean result;
 
 		client = e_meeting_store_get_client (priv->model);
-		result = itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp,
-				client, NULL, NULL, NULL, strip_alarms, FALSE);
+		result = itip_send_comp (
+			E_CAL_COMPONENT_METHOD_CANCEL, comp,
+			client, NULL, NULL, NULL, strip_alarms, FALSE);
 		g_object_unref (comp);
 
 		if (!result)
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index e0aa030358..a533505a05 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1758,11 +1758,12 @@ tpage_client_opened_cb (GObject *source_object,
 			E_SOURCE_COMBO_BOX (priv->source_selector),
 			e_client_get_source (E_CLIENT (old_client)));
 
-		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
-						 _("Unable to open tasks in '%s': %s"),
-						 e_source_peek_name (source),
-						 error ? error->message : _("Unknown error"));
+		dialog = gtk_message_dialog_new (
+			NULL, GTK_DIALOG_MODAL,
+			GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
+			_("Unable to open tasks in '%s': %s"),
+			e_source_peek_name (source),
+			error->message);
 		gtk_dialog_run (GTK_DIALOG (dialog));
 		gtk_widget_destroy (dialog);
 
@@ -2026,8 +2027,6 @@ init_widgets (TaskPage *tpage)
 	return TRUE;
 }
 
-
-
 static void
 task_page_select_organizer (TaskPage *tpage,
                             const gchar *backend_address)
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c
index 1254a8711b..6a1493f01a 100644
--- a/calendar/gui/e-cal-model-calendar.c
+++ b/calendar/gui/e-cal-model-calendar.c
@@ -369,8 +369,10 @@ ecmc_set_value_at (ETableModel *etm,
 				}
 			}
 
-			itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, send_comp ? send_comp : comp,
-					comp_data->client, NULL, NULL, NULL, strip_alarms, FALSE);
+			itip_send_comp (
+				E_CAL_COMPONENT_METHOD_REQUEST,
+				send_comp ? send_comp : comp, comp_data->client,
+				NULL, NULL, NULL, strip_alarms, FALSE);
 
 			if (send_comp)
 				g_object_unref (send_comp);
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 1ab56926cd..4428d31cbd 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -28,6 +28,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
+#include <libebackend/e-extensible.h>
 #include <libedataserver/e-flag.h>
 #include <libedataserver/e-time-utils.h>
 #include <libecal/e-cal-client-view.h>
@@ -38,7 +39,6 @@
 #include "misc.h"
 #include "e-util/e-util.h"
 #include "e-util/e-account-utils.h"
-#include "e-util/e-extensible.h"
 #include "e-util/e-util-enumtypes.h"
 
 typedef struct {
@@ -1609,6 +1609,7 @@ ecm_get_color_for_component (ECalModel *model,
 	ESource *source;
 	const gchar *color_spec;
 	gint i, first_empty = 0;
+
 	static AssignedColorData assigned_colors[] = {
 		{ "#BECEDD", NULL }, /* 190 206 221     Blue */
 		{ "#E2F0EF", NULL }, /* 226 240 239     Light Blue */
@@ -1650,8 +1651,9 @@ ecm_get_color_for_component (ECalModel *model,
 	}
 
 	/* return the first unused color */
-	assigned_colors[first_empty].uris = g_list_append (assigned_colors[first_empty].uris,
-							   g_strdup (e_client_get_uri (E_CLIENT (comp_data->client))));
+	assigned_colors[first_empty].uris = g_list_append (
+		assigned_colors[first_empty].uris,
+		g_strdup (e_client_get_uri (E_CLIENT (comp_data->client))));
 
 	return assigned_colors[first_empty].color;
 }
@@ -2039,7 +2041,7 @@ e_cal_model_get_client_list (ECalModel *model)
 
 /**
  * e_cal_model_get_client_for_uri:
- * @model: A calendar model.
+ * @model: an #ECalModel
  * @uri: Uri for the client to get.
  */
 ECalClient *
@@ -2123,8 +2125,8 @@ search_by_id_and_client (ECalModelPrivate *priv,
 
 static void
 remove_all_for_id_and_client (ECalModel *model,
-			      ECalClient *client,
-			      const ECalComponentId *id)
+                              ECalClient *client,
+                              const ECalComponentId *id)
 {
 	ECalModelComponent *comp_data;
 
@@ -2883,13 +2885,15 @@ client_opened_cb (GObject *source_object,
 	}
 
 	if (error != NULL) {
-		const gchar *uri;
+		ESource *source;
 
-		uri = e_client_get_uri (E_CLIENT (client));
+		source = e_client_get_source (E_CLIENT (client));
 		e_cal_model_remove_client (model, client);
 		g_warning (
 			"%s: Failed to open '%s': %s",
-			G_STRFUNC, uri, error->message);
+			G_STRFUNC,
+			e_source_peek_name (source),
+			error->message);
 		g_error_free (error);
 		e_cal_model_update_status_message (model, NULL, -1.0);
 		return;
@@ -2958,9 +2962,13 @@ add_new_client (ECalModel *model,
 	if (e_client_is_opened (E_CLIENT (client))) {
 		update_e_cal_view_for_client (model, client_data);
 	} else {
+		ESource *source;
+		const gchar *display_name;
 		gchar *msg;
 
-		msg = g_strdup_printf (_("Opening %s"), e_client_get_uri (E_CLIENT (client)));
+		source = e_client_get_source (E_CLIENT (client));
+		display_name = e_source_peek_name (source);
+		msg = g_strdup_printf (_("Opening %s"), display_name);
 		e_cal_model_update_status_message (model, msg, -1.0);
 		g_free (msg);
 
@@ -3388,6 +3396,91 @@ e_cal_model_create_component_with_defaults (ECalModel *model,
 }
 
 /**
+ * Returns information about attendees in the component.
+ * If there are no attendees, the function returns NULL.
+ *
+ * The information is like "Status: Accepted: X   Declined: Y  ...".
+ *
+ * Free returned pointer with g_free.
+ **/
+gchar *
+e_cal_model_get_attendees_status_info (ECalModel *model,
+                                       ECalComponent *comp,
+                                       ECalClient *cal_client)
+{
+	struct _values {
+		icalparameter_partstat status;
+		const gchar *caption;
+		gint count;
+	} values[] = {
+		{ ICAL_PARTSTAT_ACCEPTED,    N_("Accepted"),     0 },
+		{ ICAL_PARTSTAT_DECLINED,    N_("Declined"),     0 },
+		{ ICAL_PARTSTAT_TENTATIVE,   N_("Tentative"),    0 },
+		{ ICAL_PARTSTAT_DELEGATED,   N_("Delegated"),    0 },
+		{ ICAL_PARTSTAT_NEEDSACTION, N_("Needs action"), 0 },
+		{ ICAL_PARTSTAT_NONE,        N_("Other"),        0 },
+		{ ICAL_PARTSTAT_X,           NULL,              -1 }
+	};
+
+	GSList *attendees = NULL, *a;
+	gboolean have = FALSE;
+	gchar *res = NULL;
+	gint i;
+
+	g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
+
+	if (!comp || !e_cal_component_has_attendees (comp) ||
+	    !itip_organizer_is_user_ex (comp, cal_client, TRUE))
+		return NULL;
+
+	e_cal_component_get_attendee_list (comp, &attendees);
+
+	for (a = attendees; a; a = a->next) {
+		ECalComponentAttendee *att = a->data;
+
+		if (att && att->cutype == ICAL_CUTYPE_INDIVIDUAL &&
+		    (att->role == ICAL_ROLE_CHAIR ||
+		     att->role == ICAL_ROLE_REQPARTICIPANT ||
+		     att->role == ICAL_ROLE_OPTPARTICIPANT)) {
+			have = TRUE;
+
+			for (i = 0; values[i].count != -1; i++) {
+				if (att->status == values[i].status || values[i].status == ICAL_PARTSTAT_NONE) {
+					values[i].count++;
+					break;
+				}
+			}
+		}
+	}
+
+	if (have) {
+		GString *str = g_string_new ("");
+
+		for (i = 0; values[i].count != -1; i++) {
+			if (values[i].count > 0) {
+				if (str->str && *str->str)
+					g_string_append (str, "   ");
+
+				g_string_append_printf (str, "%s: %d", _(values[i].caption), values[i].count);
+			}
+		}
+
+		g_string_prepend (str, ": ");
+
+		/* To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+		 * Status: Accepted: X   Declined: Y   ... */
+		g_string_prepend (str, _("Status"));
+
+		res = g_string_free (str, FALSE);
+	}
+
+	if (attendees)
+		e_cal_component_free_attendee_list (attendees);
+
+	return res;
+}
+
+/**
  * e_cal_model_get_color_for_component
  */
 const gchar *
diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h
index a514c95ab2..6dd04675ed 100644
--- a/calendar/gui/e-cal-model.h
+++ b/calendar/gui/e-cal-model.h
@@ -263,6 +263,10 @@ void		e_cal_model_set_search_query	(ECalModel *model,
 icalcomponent *	e_cal_model_create_component_with_defaults
 						(ECalModel *model,
 						 gboolean all_day);
+gchar *		e_cal_model_get_attendees_status_info
+						(ECalModel *model,
+						 ECalComponent *comp,
+						 ECalClient *cal_client);
 const gchar *	e_cal_model_get_color_for_component
 						(ECalModel *model,
 						 ECalModelComponent *comp_data);
diff --git a/calendar/gui/e-calendar-selector.c b/calendar/gui/e-calendar-selector.c
index c71e3b99aa..989391625b 100644
--- a/calendar/gui/e-calendar-selector.c
+++ b/calendar/gui/e-calendar-selector.c
@@ -26,13 +26,17 @@
 
 #include <libecal/e-cal-client.h>
 #include <libedataserverui/e-client-utils.h>
+
 #include "e-util/e-selection.h"
 
 struct _ECalendarSelectorPrivate {
 	gint dummy_value;
 };
 
-static gpointer parent_class;
+G_DEFINE_TYPE (
+	ECalendarSelector,
+	e_calendar_selector,
+	E_TYPE_SOURCE_SELECTOR)
 
 static gboolean
 calendar_selector_update_single_object (ECalClient *client,
@@ -170,7 +174,8 @@ calendar_selector_data_dropped (ESourceSelector *selector,
 		icalcomponent_set_uid (icalcomp, uid);
 	}
 
-	e_client_utils_open_new (destination, E_CLIENT_SOURCE_TYPE_EVENTS, FALSE, NULL,
+	e_client_utils_open_new (
+		destination, E_CLIENT_SOURCE_TYPE_EVENTS, FALSE, NULL,
 		e_client_utils_authenticate_handler, NULL,
 		client_opened_cb, icalcomp);
 
@@ -187,11 +192,10 @@ exit:
 }
 
 static void
-calendar_selector_class_init (ECalendarSelectorClass *class)
+e_calendar_selector_class_init (ECalendarSelectorClass *class)
 {
 	ESourceSelectorClass *source_selector_class;
 
-	parent_class = g_type_class_peek_parent (class);
 	g_type_class_add_private (class, sizeof (ECalendarSelectorPrivate));
 
 	source_selector_class = E_SOURCE_SELECTOR_CLASS (class);
@@ -199,7 +203,7 @@ calendar_selector_class_init (ECalendarSelectorClass *class)
 }
 
 static void
-calendar_selector_init (ECalendarSelector *selector)
+e_calendar_selector_init (ECalendarSelector *selector)
 {
 	selector->priv = G_TYPE_INSTANCE_GET_PRIVATE (
 		selector, E_TYPE_CALENDAR_SELECTOR, ECalendarSelectorPrivate);
@@ -211,33 +215,6 @@ calendar_selector_init (ECalendarSelector *selector)
 	e_drag_dest_add_calendar_targets (GTK_WIDGET (selector));
 }
 
-GType
-e_calendar_selector_get_type (void)
-{
-	static GType type = 0;
-
-	if (G_UNLIKELY (type == 0)) {
-		const GTypeInfo type_info = {
-			sizeof (ECalendarSelectorClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) calendar_selector_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL,  /* class_data */
-			sizeof (ECalendarSelector),
-			0,     /* n_preallocs */
-			(GInstanceInitFunc) calendar_selector_init,
-			NULL   /* value_table */
-		};
-
-		type = g_type_register_static (
-			E_TYPE_SOURCE_SELECTOR, "ECalendarSelector",
-			&type_info, 0);
-	}
-
-	return type;
-}
-
 GtkWidget *
 e_calendar_selector_new (ESourceList *source_list)
 {
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 82bbea2f79..84046e7aac 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -30,11 +30,11 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
+#include <libebackend/e-extensible.h>
 #include <libedataserver/e-time-utils.h>
 #include <libedataserverui/e-client-utils.h>
 #include <e-util/e-util.h>
 #include <e-util/e-alert-dialog.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-selection.h>
 #include <e-util/e-datetime-format.h>
 #include <e-util/e-dialog-utils.h>
@@ -218,12 +218,15 @@ calendar_view_delete_event (ECalendarView *cal_view,
 		const gchar *uid;
 		gchar *rid = NULL;
 
-		if ((itip_organizer_is_user (comp, event->comp_data->client) || itip_sentby_is_user (comp, event->comp_data->client))
+		if ((itip_organizer_is_user (comp, event->comp_data->client) ||
+		     itip_sentby_is_user (comp, event->comp_data->client))
 		    && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),
 						event->comp_data->client,
 						comp, TRUE))
-			itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp,
-					event->comp_data->client, NULL, NULL, NULL, TRUE, FALSE);
+			itip_send_comp (
+				E_CAL_COMPONENT_METHOD_CANCEL,
+				comp, event->comp_data->client, NULL, NULL,
+				NULL, TRUE, FALSE);
 
 		e_cal_component_get_uid (comp, &uid);
 		if (!uid || !*uid) {
@@ -473,11 +476,14 @@ calendar_view_cut_clipboard (ESelectable *selectable)
 		comp = e_cal_component_new ();
 		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 
-		if ((itip_organizer_is_user (comp, event->comp_data->client) || itip_sentby_is_user (comp, event->comp_data->client))
+		if ((itip_organizer_is_user (comp, event->comp_data->client) ||
+		     itip_sentby_is_user (comp, event->comp_data->client))
 		    && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),
 						event->comp_data->client, comp, TRUE))
-			itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp,
-					event->comp_data->client, NULL, NULL, NULL, TRUE, FALSE);
+			itip_send_comp (
+				E_CAL_COMPONENT_METHOD_CANCEL,
+				comp, event->comp_data->client, NULL, NULL,
+				NULL, TRUE, FALSE);
 
 		e_cal_component_get_uid (comp, &uid);
 		if (e_cal_component_is_instance (comp)) {
@@ -1058,11 +1064,16 @@ e_calendar_view_add_event (ECalendarView *cal_view,
 			g_free (uid);
 		}
 
-		if ((itip_organizer_is_user (comp, client) || itip_sentby_is_user (comp, client)) &&
-		    send_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),
-					   client, comp, TRUE, &strip_alarms, NULL)) {
-			itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp,
-				client, NULL, NULL, NULL, strip_alarms, FALSE);
+		if ((itip_organizer_is_user (comp, client) ||
+		     itip_sentby_is_user (comp, client)) &&
+			send_component_dialog (
+				(GtkWindow *) gtk_widget_get_toplevel (
+					GTK_WIDGET (cal_view)),
+				client, comp, TRUE, &strip_alarms, NULL)) {
+			itip_send_comp (
+				E_CAL_COMPONENT_METHOD_REQUEST,
+				comp, client, NULL, NULL, NULL, strip_alarms,
+				FALSE);
 		}
 	} else {
 		g_message (G_STRLOC ": Could not create the object! %s", error ? error->message : "");
@@ -1339,7 +1350,8 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
 
 		e_cal_component_free_datetime (&dt);
 
-		if ((itip_organizer_is_user (comp, event->comp_data->client) || itip_sentby_is_user (comp, event->comp_data->client))
+		if ((itip_organizer_is_user (comp, event->comp_data->client) ||
+		     itip_sentby_is_user (comp, event->comp_data->client))
 				&& cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),
 					event->comp_data->client,
 					comp, TRUE) && !e_cal_client_check_save_schedules (event->comp_data->client)) {
@@ -1354,7 +1366,11 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
 
 				e_cal_component_free_datetime (&range.datetime);
 			}
-			itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp, event->comp_data->client, NULL, NULL, NULL, TRUE, FALSE);
+
+			itip_send_comp (
+				E_CAL_COMPONENT_METHOD_CANCEL,
+				comp, event->comp_data->client, NULL, NULL,
+				NULL, TRUE, FALSE);
 		}
 
 		if (is_instance)
@@ -1437,8 +1453,14 @@ e_calendar_view_new_appointment_for (ECalendarView *cal_view,
 
 	if (e_client_is_readonly (E_CLIENT (default_client))) {
 		GtkWidget *widget;
+		ESource *source;
+
+		source = e_client_get_source (E_CLIENT (default_client));
 
-		widget = e_alert_dialog_new_for_args (parent, "calendar:prompt-read-only-cal", e_source_peek_name (e_client_get_source (E_CLIENT (default_client))), NULL);
+		widget = e_alert_dialog_new_for_args (
+			parent, "calendar:prompt-read-only-cal",
+			e_source_peek_name (source),
+			NULL);
 
 		g_signal_connect ((GtkDialog *)widget, "response", G_CALLBACK (gtk_widget_destroy),
 				  widget);
@@ -1653,7 +1675,9 @@ e_calendar_view_edit_appointment (ECalendarView *cal_view,
 		ECalComponent *comp = e_cal_component_new ();
 		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (icalcomp));
 		flags |= COMP_EDITOR_MEETING;
-		if (itip_organizer_is_user (comp, client) || itip_sentby_is_user (comp, client) || !e_cal_component_has_attendees (comp))
+		if (itip_organizer_is_user (comp, client) ||
+		    itip_sentby_is_user (comp, client) ||
+		    !e_cal_component_has_attendees (comp))
 			flags |= COMP_EDITOR_USER_ORG;
 		g_object_unref (comp);
 	}
@@ -1662,7 +1686,8 @@ e_calendar_view_edit_appointment (ECalendarView *cal_view,
 }
 
 void
-e_calendar_view_modify_and_send (ECalComponent *comp,
+e_calendar_view_modify_and_send (ECalendarView *cal_view,
+                                 ECalComponent *comp,
                                  ECalClient *client,
                                  CalObjModType mod,
                                  GtkWindow *toplevel,
@@ -1671,12 +1696,15 @@ e_calendar_view_modify_and_send (ECalComponent *comp,
 	gboolean only_new_attendees = FALSE;
 	GError *error = NULL;
 
+	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
+
 	e_cal_component_commit_sequence (comp);
 
 	if (e_cal_client_modify_object_sync (client, e_cal_component_get_icalcomponent (comp), mod, NULL, &error)) {
 		gboolean strip_alarms = TRUE;
 
-		if ((itip_organizer_is_user (comp, client) || itip_sentby_is_user (comp, client)) &&
+		if ((itip_organizer_is_user (comp, client) ||
+		     itip_sentby_is_user (comp, client)) &&
 		    send_component_dialog (toplevel, client, comp, new, &strip_alarms, &only_new_attendees)) {
 			ECalComponent *send_comp = NULL;
 
@@ -1699,7 +1727,10 @@ e_calendar_view_modify_and_send (ECalComponent *comp,
 				}
 			}
 
-			itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, send_comp ? send_comp : comp, client, NULL, NULL, NULL, strip_alarms, only_new_attendees);
+			itip_send_comp (
+				E_CAL_COMPONENT_METHOD_REQUEST,
+				send_comp ? send_comp : comp, client, NULL,
+				NULL, NULL, strip_alarms, only_new_attendees);
 
 			if (send_comp)
 				g_object_unref (send_comp);
@@ -1784,84 +1815,6 @@ e_calendar_view_move_tip (GtkWidget *widget,
 	gtk_widget_show (widget);
 }
 
-/**
- * Returns information about attendees in the component. If no attendees, then returns NULL.
- * The information is like "Status: Accepted: X   Declined: Y  ...".
- * Free returned pointer with g_free.
- **/
-gchar *
-e_calendar_view_get_attendees_status_info (ECalComponent *comp,
-                                           ECalClient *client)
-{
-	struct _values {
-		icalparameter_partstat status;
-		const gchar *caption;
-		gint count;
-	} values[] = {
-		{ ICAL_PARTSTAT_ACCEPTED,    N_("Accepted"),     0 },
-		{ ICAL_PARTSTAT_DECLINED,    N_("Declined"),     0 },
-		{ ICAL_PARTSTAT_TENTATIVE,   N_("Tentative"),    0 },
-		{ ICAL_PARTSTAT_DELEGATED,   N_("Delegated"),    0 },
-		{ ICAL_PARTSTAT_NEEDSACTION, N_("Needs action"), 0 },
-		{ ICAL_PARTSTAT_NONE,        N_("Other"),        0 },
-		{ ICAL_PARTSTAT_X,           NULL,              -1 }
-	};
-
-	GSList *attendees = NULL, *a;
-	gboolean have = FALSE;
-	gchar *res = NULL;
-	gint i;
-
-	if (!comp || !e_cal_component_has_attendees (comp) || !itip_organizer_is_user_ex (comp, client, TRUE))
-		return NULL;
-
-	e_cal_component_get_attendee_list (comp, &attendees);
-
-	for (a = attendees; a; a = a->next) {
-		ECalComponentAttendee *att = a->data;
-
-		if (att && att->cutype == ICAL_CUTYPE_INDIVIDUAL &&
-		    (att->role == ICAL_ROLE_CHAIR ||
-		     att->role == ICAL_ROLE_REQPARTICIPANT ||
-		     att->role == ICAL_ROLE_OPTPARTICIPANT)) {
-			have = TRUE;
-
-			for (i = 0; values[i].count != -1; i++) {
-				if (att->status == values[i].status || values[i].status == ICAL_PARTSTAT_NONE) {
-					values[i].count++;
-					break;
-				}
-			}
-		}
-	}
-
-	if (have) {
-		GString *str = g_string_new ("");
-
-		for (i = 0; values[i].count != -1; i++) {
-			if (values[i].count > 0) {
-				if (str->str && *str->str)
-					g_string_append (str, "   ");
-
-				g_string_append_printf (str, "%s: %d", _(values[i].caption), values[i].count);
-			}
-		}
-
-		g_string_prepend (str, ": ");
-
-		/* To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-		 * Status: Accepted: X   Declined: Y   ... */
-		g_string_prepend (str, _("Status"));
-
-		res = g_string_free (str, FALSE);
-	}
-
-	if (attendees)
-		e_cal_component_free_attendee_list (attendees);
-
-	return res;
-}
-
 /*
  * It is expected to show the tooltips in this below format
  *
@@ -1873,7 +1826,8 @@ e_calendar_view_get_attendees_status_info (ECalComponent *comp,
  */
 
 gboolean
-e_calendar_view_get_tooltips (const ECalendarViewEventData *data)
+e_calendar_view_get_tooltips (ECalendarView *cal_view,
+                              const ECalendarViewEventData *data)
 {
 	GtkWidget *label, *box, *hbox, *ebox, *frame;
 	const gchar *str;
@@ -1888,9 +1842,14 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data)
 	GdkWindow *window;
 	ECalComponent *newcomp = e_cal_component_new ();
 	icaltimezone *zone, *default_zone;
+	ECalModel *model;
 	ECalClient *client = NULL;
 	gboolean free_text = FALSE;
 
+	g_return_val_if_fail (E_IS_CALENDAR_VIEW (cal_view), FALSE);
+
+	model = e_calendar_view_get_model (cal_view);
+
 	/* Delete any stray tooltip if left */
 	if (widget)
 		gtk_widget_destroy (widget);
@@ -2023,7 +1982,8 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data)
 	g_free (tmp2);
 	g_free (tmp1);
 
-	tmp = e_calendar_view_get_attendees_status_info (newcomp, pevent->comp_data->client);
+	tmp = e_cal_model_get_attendees_status_info (
+		model, newcomp, pevent->comp_data->client);
 	if (tmp) {
 		hbox = gtk_hbox_new (FALSE, 0);
 		gtk_box_pack_start ((GtkBox *) hbox, gtk_label_new (tmp), FALSE, FALSE, 0);
diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h
index decfdfffbf..7ebcef7d1c 100644
--- a/calendar/gui/e-calendar-view.h
+++ b/calendar/gui/e-calendar-view.h
@@ -235,18 +235,21 @@ void		e_calendar_view_new_appointment_full
 						 gboolean meeting,
 						 gboolean no_past_date);
 void		e_calendar_view_new_appointment	(ECalendarView *cal_view);
-void		e_calendar_view_edit_appointment (ECalendarView *cal_view,
+void		e_calendar_view_edit_appointment
+						(ECalendarView *cal_view,
 						 ECalClient *client,
 						 icalcomponent *icalcomp,
 						 EEditEventMode mode);
 void		e_calendar_view_open_event	(ECalendarView *cal_view);
-void		e_calendar_view_modify_and_send	(ECalComponent *comp,
+void		e_calendar_view_modify_and_send	(ECalendarView *cal_view,
+						 ECalComponent *comp,
 						 ECalClient *client,
 						 CalObjModType mod,
 						 GtkWindow *toplevel,
 						 gboolean new);
 
-gboolean	e_calendar_view_get_tooltips	(const ECalendarViewEventData *data);
+gboolean	e_calendar_view_get_tooltips	(ECalendarView *cal_view,
+						 const ECalendarViewEventData *data);
 
 void		e_calendar_view_move_tip	(GtkWidget *widget,
 						 gint x,
@@ -256,9 +259,6 @@ const gchar *	e_calendar_view_get_icalcomponent_summary
 						(ECalClient *ecal,
 						 icalcomponent *icalcomp,
 						 gboolean *free_text);
-gchar *		e_calendar_view_get_attendees_status_info
-						(ECalComponent *comp,
-						 ECalClient *client);
 
 void		e_calendar_view_emit_user_created
 						(ECalendarView *cal_view);
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index c379f2aecb..b6cdc967e7 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -185,7 +185,7 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item,
 	gint item_x, item_y, item_w, item_h, bar_y1, bar_y2;
 	GdkColor bg_color;
 	ECalComponent *comp;
-	gint num_icons, icon_x, icon_y, icon_x_inc = 0, icon_y_inc = 0;
+	gint num_icons, icon_x = 0, icon_y, icon_x_inc = 0, icon_y_inc = 0;
 	gint max_icon_w, max_icon_h;
 	gboolean draw_reminder_icon, draw_recurrence_icon, draw_timezone_icon, draw_meeting_icon;
 	gboolean draw_attach_icon;
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index efad7dbc6f..8af5ffb3fa 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -739,7 +739,9 @@ process_component (EDayView *day_view,
 	/* Add the object */
 	add_event_data.day_view = day_view;
 	add_event_data.comp_data = comp_data;
-	e_day_view_add_event (comp, comp_data->instance_start, comp_data->instance_end, &add_event_data);
+	e_day_view_add_event (
+		comp, comp_data->instance_start,
+		comp_data->instance_end, &add_event_data);
 
 	g_object_unref (comp);
 	g_free (rid);
@@ -4225,7 +4227,8 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 
-	if (e_cal_component_has_attendees (comp) && !itip_organizer_is_user (comp, client)) {
+	if (e_cal_component_has_attendees (comp) &&
+	    !itip_organizer_is_user (comp, client)) {
 		g_object_unref (comp);
 		e_day_view_abort_resize (day_view);
 		return;
@@ -4297,7 +4300,10 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
 		mod = CALOBJ_MOD_THIS;
 
 	toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
-	e_calendar_view_modify_and_send (comp, client, mod, toplevel, TRUE);
+
+	e_calendar_view_modify_and_send (
+		E_CALENDAR_VIEW (day_view),
+		comp, client, mod, toplevel, TRUE);
 
  out:
 	day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE;
@@ -4343,7 +4349,8 @@ e_day_view_finish_resize (EDayView *day_view)
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 
-	if (e_cal_component_has_attendees (comp) && !itip_organizer_is_user (comp, client))	{
+	if (e_cal_component_has_attendees (comp) &&
+	    !itip_organizer_is_user (comp, client)) {
 		g_object_unref (comp);
 		e_day_view_abort_resize (day_view);
 		return;
@@ -4413,7 +4420,11 @@ e_day_view_finish_resize (EDayView *day_view)
 	toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
 
 	e_cal_component_commit_sequence (comp);
-	e_calendar_view_modify_and_send (comp, client, mod, toplevel, TRUE);
+
+	e_calendar_view_modify_and_send (
+		E_CALENDAR_VIEW (day_view),
+		comp, client, mod, toplevel, TRUE);
+
  out:
 	g_object_unref (comp);
 }
@@ -4558,7 +4569,9 @@ e_day_view_add_event (ECalComponent *comp,
 						    e_calendar_view_get_timezone (E_CALENDAR_VIEW (add_event_data->day_view))))
 		event.different_timezone = TRUE;
 
-	if (!e_cal_component_has_attendees (comp) || itip_organizer_is_user (comp, event.comp_data->client) || itip_sentby_is_user (comp, event.comp_data->client))
+	if (!e_cal_component_has_attendees (comp) ||
+	    itip_organizer_is_user (comp, event.comp_data->client) ||
+	    itip_sentby_is_user (comp, event.comp_data->client))
 		event.is_editable = TRUE;
 	else
 		event.is_editable = FALSE;
@@ -5099,9 +5112,11 @@ e_day_view_add_new_event_in_selected_range (EDayView *day_view,
 	const gchar *uid;
 	AddEventData add_event_data;
 
-	/* Check if the client is read only */
 	model = e_calendar_view_get_model (E_CALENDAR_VIEW (day_view));
+
 	client = e_cal_model_get_default_client (model);
+
+	/* Check if the client is read only */
 	if (e_client_is_readonly (E_CLIENT (client)))
 		return FALSE;
 
@@ -6488,7 +6503,8 @@ e_day_view_change_event_time (EDayView *day_view,
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 
-	if (e_cal_component_has_attendees (comp) && !itip_organizer_is_user (comp, client))	{
+	if (e_cal_component_has_attendees (comp) &&
+	    !itip_organizer_is_user (comp, client)) {
 		g_object_unref (comp);
 		return;
 	}
@@ -6537,7 +6553,10 @@ e_day_view_change_event_time (EDayView *day_view,
 	toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
 
 	e_cal_component_commit_sequence (comp);
-	e_calendar_view_modify_and_send (comp, client, mod, toplevel, TRUE);
+
+	e_calendar_view_modify_and_send (
+		E_CALENDAR_VIEW (day_view),
+		comp, client, mod, toplevel, TRUE);
 
 out:
 	g_object_unref (comp);
@@ -6861,7 +6880,10 @@ e_day_view_on_editing_stopped (EDayView *day_view,
 
 			/* FIXME When sending here, what exactly should we send? */
 			toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
-			e_calendar_view_modify_and_send (comp, client, mod, toplevel, FALSE);
+
+			e_calendar_view_modify_and_send (
+				E_CALENDAR_VIEW (day_view),
+				comp, client, mod, toplevel, FALSE);
 		}
 
 	}
@@ -7863,13 +7885,13 @@ e_day_view_on_drag_data_get (GtkWidget *widget,
 
 	comp_str = icalcomponent_as_ical_string_r (vcal);
 	if (comp_str) {
-		ESource *source = e_client_get_source (E_CLIENT (event->comp_data->client));
-		const gchar *source_uid = e_source_peek_uid (source);
+		ESource *source;
+		const gchar *source_uid;
 		GdkAtom target;
 		gchar *tmp;
 
-		if (!source_uid)
-			source_uid = "";
+		source = e_client_get_source (E_CLIENT (event->comp_data->client));
+		source_uid = e_source_peek_uid (source);
 
 		tmp = g_strconcat (source_uid, "\n", comp_str, NULL);
 		target = gtk_selection_data_get_target (selection_data);
@@ -7984,7 +8006,8 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget,
 			comp = e_cal_component_new ();
 			e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 
-			if (e_cal_component_has_attendees (comp) && !itip_organizer_is_user (comp, client))	{
+			if (e_cal_component_has_attendees (comp) &&
+			    !itip_organizer_is_user (comp, client)) {
 				g_object_unref (comp);
 				return;
 			}
@@ -8055,7 +8078,10 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget,
 				mod = CALOBJ_MOD_THIS;
 
 			toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
-			e_calendar_view_modify_and_send (comp, client, mod, toplevel, FALSE);
+
+			e_calendar_view_modify_and_send (
+				E_CALENDAR_VIEW (day_view),
+				comp, client, mod, toplevel, FALSE);
 
 			g_object_unref (comp);
 
@@ -8234,7 +8260,8 @@ e_day_view_on_main_canvas_drag_data_received (GtkWidget *widget,
 			comp = e_cal_component_new ();
 			e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 
-			if (e_cal_component_has_attendees (comp) && !itip_organizer_is_user (comp, client))	{
+			if (e_cal_component_has_attendees (comp) &&
+			    !itip_organizer_is_user (comp, client)) {
 				g_object_unref (comp);
 				return;
 			}
@@ -8282,7 +8309,10 @@ e_day_view_on_main_canvas_drag_data_received (GtkWidget *widget,
 				mod = CALOBJ_MOD_THIS;
 
 			toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
-			e_calendar_view_modify_and_send (comp, client, mod, toplevel, FALSE);
+
+			e_calendar_view_modify_and_send (
+				E_CALENDAR_VIEW (day_view),
+				comp, client, mod, toplevel, FALSE);
 
 			g_object_unref (comp);
 
diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c
index e783195ec1..00e3f9d543 100644
--- a/calendar/gui/e-meeting-attendee.c
+++ b/calendar/gui/e-meeting-attendee.c
@@ -158,7 +158,6 @@ e_meeting_attendee_init (EMeetingAttendee *ia)
 	priv->longest_period_in_days = 0;
 }
 
-
 static void
 e_meeting_attendee_finalize (GObject *obj)
 {
diff --git a/calendar/gui/e-meeting-attendee.h b/calendar/gui/e-meeting-attendee.h
index bc2eaa046b..7545a0f52d 100644
--- a/calendar/gui/e-meeting-attendee.h
+++ b/calendar/gui/e-meeting-attendee.h
@@ -36,7 +36,6 @@ G_BEGIN_DECLS
 #define E_IS_MEETING_ATTENDEE(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MEETING_ATTENDEE))
 #define E_IS_MEETING_ATTENDEE_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MEETING_ATTENDEE))
 
-
 typedef struct _EMeetingAttendee         EMeetingAttendee;
 typedef struct _EMeetingAttendeePrivate  EMeetingAttendeePrivate;
 typedef struct _EMeetingAttendeeClass    EMeetingAttendeeClass;
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index 51ce798a8b..833c6a821e 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -31,10 +31,10 @@
 #include <libecal/e-cal-component.h>
 #include <libecal/e-cal-util.h>
 #include <libecal/e-cal-time-util.h>
+#include <libebackend/e-extensible.h>
 #include <libedataserver/e-data-server-util.h>
 #include <libedataserver/e-proxy.h>
 #include <libedataserverui/e-passwords.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-account-utils.h>
 #include <e-util/e-util-enumtypes.h>
 #include "itip-utils.h"
@@ -1984,7 +1984,9 @@ download_with_libsoup (const gchar *uri,
 	g_object_set_data_full (G_OBJECT (msg), "orig-uri", g_strdup (uri), g_free);
 
 	session = soup_session_async_new ();
-	g_signal_connect (session, "authenticate", G_CALLBACK (soup_authenticate), NULL);
+	g_signal_connect (
+		session, "authenticate",
+		G_CALLBACK (soup_authenticate), NULL);
 
 	proxy = e_proxy_new ();
 	e_proxy_setup_proxy (proxy);
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 9afdfd7a22..36e7ad7d42 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -31,15 +31,15 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
-#include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
+#include <libebackend/e-extensible.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 
 #include "misc/e-canvas.h"
 #include "misc/e-canvas-utils.h"
-
 #include "misc/e-dateedit.h"
-#include "e-util/e-extensible.h"
+
 #include "e-util/e-util.h"
 
 #include "e-meeting-utils.h"
diff --git a/calendar/gui/e-meeting-types.h b/calendar/gui/e-meeting-types.h
index 50964f1619..b8f1057962 100644
--- a/calendar/gui/e-meeting-types.h
+++ b/calendar/gui/e-meeting-types.h
@@ -28,8 +28,6 @@
 
 G_BEGIN_DECLS
 
-
-
 typedef struct _EMeetingTime               EMeetingTime;
 typedef struct _EMeetingFreeBusyPeriod     EMeetingFreeBusyPeriod;
 
diff --git a/calendar/gui/e-memo-list-selector.c b/calendar/gui/e-memo-list-selector.c
index 5fff33d188..4484f94298 100644
--- a/calendar/gui/e-memo-list-selector.c
+++ b/calendar/gui/e-memo-list-selector.c
@@ -34,7 +34,10 @@ struct _EMemoListSelectorPrivate {
 	gint dummy_value;
 };
 
-static gpointer parent_class;
+G_DEFINE_TYPE (
+	EMemoListSelector,
+	e_memo_list_selector,
+	E_TYPE_SOURCE_SELECTOR)
 
 static gboolean
 memo_list_selector_update_single_object (ECalClient *client,
@@ -302,11 +305,10 @@ memo_list_selector_data_dropped (ESourceSelector *selector,
 }
 
 static void
-memo_list_selector_class_init (EMemoListSelectorClass *class)
+e_memo_list_selector_class_init (EMemoListSelectorClass *class)
 {
 	ESourceSelectorClass *source_selector_class;
 
-	parent_class = g_type_class_peek_parent (class);
 	g_type_class_add_private (class, sizeof (EMemoListSelectorPrivate));
 
 	source_selector_class = E_SOURCE_SELECTOR_CLASS (class);
@@ -314,7 +316,7 @@ memo_list_selector_class_init (EMemoListSelectorClass *class)
 }
 
 static void
-memo_list_selector_init (EMemoListSelector *selector)
+e_memo_list_selector_init (EMemoListSelector *selector)
 {
 	selector->priv = G_TYPE_INSTANCE_GET_PRIVATE (
 		selector, E_TYPE_MEMO_LIST_SELECTOR, EMemoListSelectorPrivate);
@@ -326,33 +328,6 @@ memo_list_selector_init (EMemoListSelector *selector)
 	e_drag_dest_add_calendar_targets (GTK_WIDGET (selector));
 }
 
-GType
-e_memo_list_selector_get_type (void)
-{
-	static GType type = 0;
-
-	if (G_UNLIKELY (type == 0)) {
-		const GTypeInfo type_info = {
-			sizeof (EMemoListSelectorClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) memo_list_selector_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL,  /* class_data */
-			sizeof (EMemoListSelector),
-			0,     /* n_preallocs */
-			(GInstanceInitFunc) memo_list_selector_init,
-			NULL   /* value_table */
-		};
-
-		type = g_type_register_static (
-			E_TYPE_SOURCE_SELECTOR, "EMemoListSelector",
-			&type_info, 0);
-	}
-
-	return type;
-}
-
 GtkWidget *
 e_memo_list_selector_new (ESourceList *source_list)
 {
diff --git a/calendar/gui/e-task-list-selector.c b/calendar/gui/e-task-list-selector.c
index 7e091599cf..ba210e8c05 100644
--- a/calendar/gui/e-task-list-selector.c
+++ b/calendar/gui/e-task-list-selector.c
@@ -34,7 +34,10 @@ struct _ETaskListSelectorPrivate {
 	gint dummy_value;
 };
 
-static gpointer parent_class;
+G_DEFINE_TYPE (
+	ETaskListSelector,
+	e_task_list_selector,
+	E_TYPE_SOURCE_SELECTOR)
 
 static gboolean
 task_list_selector_update_single_object (ECalClient *client,
@@ -304,11 +307,10 @@ task_list_selector_data_dropped (ESourceSelector *selector,
 }
 
 static void
-task_list_selector_class_init (ETaskListSelectorClass *class)
+e_task_list_selector_class_init (ETaskListSelectorClass *class)
 {
 	ESourceSelectorClass *source_selector_class;
 
-	parent_class = g_type_class_peek_parent (class);
 	g_type_class_add_private (class, sizeof (ETaskListSelectorPrivate));
 
 	source_selector_class = E_SOURCE_SELECTOR_CLASS (class);
@@ -316,7 +318,7 @@ task_list_selector_class_init (ETaskListSelectorClass *class)
 }
 
 static void
-task_list_selector_init (ETaskListSelector *selector)
+e_task_list_selector_init (ETaskListSelector *selector)
 {
 	selector->priv = G_TYPE_INSTANCE_GET_PRIVATE (
 		selector, E_TYPE_TASK_LIST_SELECTOR, ETaskListSelectorPrivate);
@@ -328,33 +330,6 @@ task_list_selector_init (ETaskListSelector *selector)
 	e_drag_dest_add_calendar_targets (GTK_WIDGET (selector));
 }
 
-GType
-e_task_list_selector_get_type (void)
-{
-	static GType type = 0;
-
-	if (G_UNLIKELY (type == 0)) {
-		const GTypeInfo type_info = {
-			sizeof (ETaskListSelectorClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) task_list_selector_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL,  /* class_data */
-			sizeof (ETaskListSelector),
-			0,     /* n_preallocs */
-			(GInstanceInitFunc) task_list_selector_init,
-			NULL   /* value_table */
-		};
-
-		type = g_type_register_static (
-			E_TYPE_SOURCE_SELECTOR, "ETaskListSelector",
-			&type_info, 0);
-	}
-
-	return type;
-}
-
 GtkWidget *
 e_task_list_selector_new (ESourceList *source_list)
 {
diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c
index ec49cd1478..0a38889e2d 100644
--- a/calendar/gui/e-task-table.c
+++ b/calendar/gui/e-task-table.c
@@ -712,6 +712,7 @@ task_table_query_tooltip (GtkWidget *widget,
 
 	model = e_task_table_get_model (task_table);
 	comp_data = e_cal_model_get_component_at (model, row);
+
 	if (!comp_data || !comp_data->icalcomp)
 		return FALSE;
 
@@ -850,8 +851,8 @@ task_table_query_tooltip (GtkWidget *widget,
 	e_cal_component_free_datetime (&dtstart);
 	e_cal_component_free_datetime (&dtdue);
 
-	tmp = e_calendar_view_get_attendees_status_info (
-		new_comp, comp_data->client);
+	tmp = e_cal_model_get_attendees_status_info (
+		model, new_comp, comp_data->client);
 	if (tmp) {
 		l = gtk_label_new (tmp);
 		gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index a98ff42776..036b6192f5 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -3901,7 +3901,10 @@ e_week_view_change_event_time (EWeekView *week_view,
 	toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (week_view)));
 
 	e_cal_component_commit_sequence (comp);
-	e_calendar_view_modify_and_send (comp, client, mod, toplevel, TRUE);
+
+	e_calendar_view_modify_and_send (
+		E_CALENDAR_VIEW (week_view),
+		comp, client, mod, toplevel, TRUE);
 
 out:
 	g_object_unref (comp);
@@ -4112,7 +4115,10 @@ e_week_view_on_editing_stopped (EWeekView *week_view,
 
 			/* FIXME When sending here, what exactly should we send? */
 			toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (week_view)));
-			e_calendar_view_modify_and_send (comp, client, mod, toplevel, FALSE);
+
+			e_calendar_view_modify_and_send (
+				E_CALENDAR_VIEW (week_view),
+				comp, client, mod, toplevel, FALSE);
 		}
 	}
 
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 654eb1898a..66c90fb1c2 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -138,9 +138,9 @@ struct _GnomeCalendarPrivate {
 enum {
 	PROP_0,
 	PROP_DATE_NAVIGATOR,
-	PROP_VIEW,
 	PROP_MEMO_TABLE,
-	PROP_TASK_TABLE
+	PROP_TASK_TABLE,
+	PROP_VIEW
 };
 
 enum {
@@ -341,12 +341,6 @@ gnome_calendar_set_property (GObject *object,
 				g_value_get_object (value));
 			return;
 
-		case PROP_VIEW:
-			gnome_calendar_set_view (
-				GNOME_CALENDAR (object),
-				g_value_get_int (value));
-			return;
-
 		case PROP_MEMO_TABLE:
 			gnome_calendar_set_memo_table (
 				GNOME_CALENDAR (object),
@@ -358,6 +352,12 @@ gnome_calendar_set_property (GObject *object,
 				GNOME_CALENDAR (object),
 				g_value_get_object (value));
 			return;
+
+		case PROP_VIEW:
+			gnome_calendar_set_view (
+				GNOME_CALENDAR (object),
+				g_value_get_int (value));
+			return;
 	}
 
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -376,12 +376,6 @@ gnome_calendar_get_property (GObject *object,
 				GNOME_CALENDAR (object)));
 			return;
 
-		case PROP_VIEW:
-			g_value_set_int (
-				value, gnome_calendar_get_view (
-				GNOME_CALENDAR (object)));
-			return;
-
 		case PROP_MEMO_TABLE:
 			g_value_set_object (
 				value, gnome_calendar_get_memo_table (
@@ -393,6 +387,12 @@ gnome_calendar_get_property (GObject *object,
 				value, gnome_calendar_get_task_table (
 				GNOME_CALENDAR (object)));
 			return;
+
+		case PROP_VIEW:
+			g_value_set_int (
+				value, gnome_calendar_get_view (
+				GNOME_CALENDAR (object)));
+			return;
 	}
 
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -528,18 +528,6 @@ gnome_calendar_class_init (GnomeCalendarClass *class)
 
 	g_object_class_install_property (
 		object_class,
-		PROP_VIEW,
-		g_param_spec_int (
-			"view",
-			"View",
-			NULL,
-			GNOME_CAL_DAY_VIEW,
-			GNOME_CAL_LIST_VIEW,
-			GNOME_CAL_DAY_VIEW,
-			G_PARAM_READWRITE));
-
-	g_object_class_install_property (
-		object_class,
 		PROP_MEMO_TABLE,
 		g_param_spec_object (
 			"memo-table",
@@ -558,6 +546,18 @@ gnome_calendar_class_init (GnomeCalendarClass *class)
 			E_TYPE_TASK_TABLE,
 			G_PARAM_READWRITE));
 
+	g_object_class_install_property (
+		object_class,
+		PROP_VIEW,
+		g_param_spec_int (
+			"view",
+			"View",
+			NULL,
+			GNOME_CAL_DAY_VIEW,
+			GNOME_CAL_LIST_VIEW,
+			GNOME_CAL_DAY_VIEW,
+			G_PARAM_READWRITE));
+
 	signals[DATES_SHOWN_CHANGED] =
 		g_signal_new ("dates_shown_changed",
 				G_TYPE_FROM_CLASS (object_class),
diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c
index f3bacef89b..a3243afa43 100644
--- a/calendar/gui/misc.c
+++ b/calendar/gui/misc.c
@@ -33,8 +33,6 @@
 
 #include "misc.h"
 
-
-
 /**
  * string_is_empty:
  * @value: A string.
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 6d37168fc1..29d6b30264 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -116,8 +116,6 @@ get_font_size (PangoFontDescription *font)
 	return pango_units_to_double (pango_font_description_get_size (font));
 }
 
-
-
 /*
  * Note that most dimensions are in points (1/72 of an inch) since that is
  * what gnome-print uses.
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index d1a9a2835a..a06b249ee5 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -59,8 +59,6 @@ struct _WeekdayPickerPrivate {
 	GnomeCanvasItem *labels[7];
 };
 
-
-
 /* Signal IDs */
 enum {
 	CHANGED,
diff --git a/calendar/gui/weekday-picker.h b/calendar/gui/weekday-picker.h
index 6939e625c8..315fa5bf53 100644
--- a/calendar/gui/weekday-picker.h
+++ b/calendar/gui/weekday-picker.h
@@ -28,8 +28,6 @@
 
 G_BEGIN_DECLS
 
-
-
 #define TYPE_WEEKDAY_PICKER            (weekday_picker_get_type ())
 #define WEEKDAY_PICKER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_WEEKDAY_PICKER, WeekdayPicker))
 #define WEEKDAY_PICKER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_WEEKDAY_PICKER,	\
@@ -67,8 +65,6 @@ guint weekday_picker_get_blocked_days (WeekdayPicker *wp);
 void weekday_picker_set_week_start_day (WeekdayPicker *wp, gint week_start_day);
 gint weekday_picker_get_week_start_day (WeekdayPicker *wp);
 
-
-
 G_END_DECLS
 
 #endif
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
index dc7b0dc89f..b16109978e 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -8,8 +8,9 @@ libevolution_calendar_importers_la_CPPFLAGS = 		\
 	-I$(top_srcdir)/calendar			\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)/calendar			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_CALENDAR_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 libevolution_calendar_importers_la_SOURCES = \
 	evolution-calendar-importer.h	     \
@@ -17,11 +18,12 @@ libevolution_calendar_importers_la_SOURCES = \
 
 libevolution_calendar_importers_la_LDFLAGS = $(NO_UNDEFINED)
 
-libevolution_calendar_importers_la_LIBADD = \
-	$(top_builddir)/e-util/libeutil.la 				\
-	$(top_builddir)/shell/libeshell.la				\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
-	$(EVOLUTION_CALENDAR_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)
+libevolution_calendar_importers_la_LIBADD =			\
+	$(top_builddir)/e-util/libeutil.la 			\
+	$(top_builddir)/shell/libeshell.la			\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)					\
+	$(GTKHTML_LIBS)
 
 -include $(top_srcdir)/git.mk
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index 6083460683..4a7b942ba6 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -335,7 +335,7 @@ ivcal_getwidget (EImport *ei,
 		if (!group)
 			group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (rb));
 		if (first == NULL) {
-			g_datalist_set_data_full(&target->data, "primary-source", g_object_ref(primary), g_object_unref);
+			g_datalist_set_data_full(&target->data, "primary-source", g_object_ref (primary), g_object_unref);
 			g_datalist_set_data(&target->data, "primary-type", GINT_TO_POINTER(import_type_map[i]));
 			first = rb;
 		}
@@ -867,7 +867,8 @@ open_default_source (ICalIntelligentImporter *ici,
 
 	e_import_status (ici->ei, ici->target, _("Opening calendar"), 0);
 
-	e_client_utils_open_new (source, source_type == E_CAL_CLIENT_SOURCE_TYPE_EVENTS ? E_CLIENT_SOURCE_TYPE_EVENTS : E_CLIENT_SOURCE_TYPE_TASKS, FALSE, ici->cancellable,
+	e_client_utils_open_new (
+		source, source_type == E_CAL_CLIENT_SOURCE_TYPE_EVENTS ? E_CLIENT_SOURCE_TYPE_EVENTS : E_CLIENT_SOURCE_TYPE_TASKS, FALSE, ici->cancellable,
 		e_client_utils_authenticate_handler, NULL,
 		default_source_opened_cb, odsd);
 
diff --git a/capplet/Makefile.am b/capplet/Makefile.am
index 14247f1fbb..f5b32eff7c 100644
--- a/capplet/Makefile.am
+++ b/capplet/Makefile.am
@@ -15,8 +15,8 @@ evolution_settings_CPPFLAGS = \
 	-I$(top_srcdir)/shell				\
 	-I$(top_srcdir)/smime/lib			\
 	-I$(top_srcdir)/smime/gui			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(CERT_UI_CFLAGS)				\
 	$(CANBERRA_CFLAGS)				\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
@@ -42,13 +42,12 @@ evolution_settings_LDFLAGS = -mwindows
 endif
 
 evolution_settings_LDADD = 				\
-	$(EVOLUTION_MAIL_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
+	$(GNOME_PLATFORM_LIBS)				\
 	$(CERT_UI_LIBS)					\
 	$(CANBERRA_LIBS)				\
 	$(GTKHTML_LIBS)					\
-	$(E_WIDGETS_LIBS)				\
 	$(SMIME_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)				\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
 	$(top_builddir)/filter/libfilter.la		\
 	$(top_builddir)/mail/libevolution-mail.la	\
diff --git a/capplet/settings/Makefile.am b/capplet/settings/Makefile.am
index dd8c3c9a45..9bd84db94b 100644
--- a/capplet/settings/Makefile.am
+++ b/capplet/settings/Makefile.am
@@ -16,10 +16,11 @@ libevolution_mail_settings_la_CPPFLAGS =		\
 	-I$(top_srcdir)/shell				\
 	-I$(top_srcdir)/smime/lib			\
 	-I$(top_srcdir)/smime/gui			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(CERT_UI_CFLAGS)				\
 	$(CANBERRA_CFLAGS)				\
+	$(GTKHTML_CFLAGS)				\
 	-DANJAL_SETTINGS				\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
@@ -52,13 +53,12 @@ libevolution_mail_settings_la_SOURCES = \
 	mail-guess-servers.h
 
 libevolution_mail_settings_la_LIBADD = 				\
-	$(EVOLUTION_MAIL_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
+	$(GNOME_PLATFORM_LIBS)				\
 	$(CERT_UI_LIBS)					\
 	$(CANBERRA_LIBS)				\
 	$(GTKHTML_LIBS)					\
-	$(E_WIDGETS_LIBS)				\
 	$(SMIME_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)				\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
 	$(top_builddir)/filter/libfilter.la		\
 	$(top_builddir)/mail/libevolution-mail.la	\
diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c
index dba46a804f..91a82b6757 100644
--- a/capplet/settings/mail-capplet-shell.c
+++ b/capplet/settings/mail-capplet-shell.c
@@ -279,7 +279,7 @@ mail_capplet_shell_construct (MailCappletShell *shell,
 	mail_config_init (session);
 	mail_msg_init ();
 	custom_dir = g_build_filename (e_get_user_data_dir (), "mail", NULL);
-	e_mail_store_init (session, custom_dir);
+	e_mail_store_init (shell->priv->backend, custom_dir);
 	g_free (custom_dir);
 
 	if (just_druid) {
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 5cd2eab05c..013d04c8bd 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -37,8 +37,9 @@ libcomposer_la_CPPFLAGS =						\
 	-DEVOLUTION_UIDIR=\"$(uidir)\"					\
 	-DPREFIX=\"$(prefix)\"						\
 	-DG_LOG_DOMAIN=\"composer\"					\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
 	$(GNOME_PLATFORM_CFLAGS)					\
-	$(EVOLUTION_MAIL_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 libcomposer_la_SOURCES = 			\
 	$(libcomposerinclude_HEADERS)		\
@@ -62,8 +63,9 @@ libcomposer_la_LIBADD =					\
 	$(top_builddir)/em-format/libemformat.la	\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la		\
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la	\
-	$(EVOLUTION_MAIL_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
+	$(GNOME_PLATFORM_LIBS)				\
+	$(GTKHTML_LIBS)
 
 ui_DATA = evolution-composer.ui
 
diff --git a/composer/e-composer-from-header.h b/composer/e-composer-from-header.h
index d2603bd664..182a75134b 100644
--- a/composer/e-composer-from-header.h
+++ b/composer/e-composer-from-header.h
@@ -21,13 +21,11 @@
 #ifndef E_COMPOSER_FROM_HEADER_H
 #define E_COMPOSER_FROM_HEADER_H
 
-#include "e-composer-common.h"
-
 #include <libedataserver/e-account.h>
 #include <libedataserver/e-account-list.h>
 
 #include <misc/e-account-combo-box.h>
-#include "e-composer-header.h"
+#include <composer/e-composer-header.h>
 
 /* Standard GObject macros */
 #define E_TYPE_COMPOSER_FROM_HEADER \
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index 7fe1399dbe..2dd94eb875 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -21,7 +21,6 @@
 
 #include "e-composer-header-table.h"
 
-#include <string.h>
 #include <glib/gi18n-lib.h>
 #include <libedataserverui/e-name-selector.h>
 
@@ -81,10 +80,9 @@ g_value_set_destinations (GValue *value,
                           EDestination **destinations)
 {
 	GValueArray *value_array;
-	GValue element;
+	GValue element = G_VALUE_INIT;
 	gint ii;
 
-	memset (&element, 0, sizeof (GValue));
 	g_value_init (&element, E_TYPE_DESTINATION);
 
 	/* Preallocate some reasonable number. */
@@ -122,9 +120,8 @@ g_value_set_string_list (GValue *value,
                          GList *list)
 {
 	GValueArray *value_array;
-	GValue element;
+	GValue element = G_VALUE_INIT;
 
-	memset (&element, 0, sizeof (GValue));
 	g_value_init (&element, G_TYPE_STRING);
 
 	value_array = g_value_array_new (g_list_length (list));
diff --git a/composer/e-composer-header-table.h b/composer/e-composer-header-table.h
index 856a8e2158..f7edec0b14 100644
--- a/composer/e-composer-header-table.h
+++ b/composer/e-composer-header-table.h
@@ -18,8 +18,6 @@
 #ifndef E_COMPOSER_HEADER_TABLE_H
 #define E_COMPOSER_HEADER_TABLE_H
 
-#include "e-composer-common.h"
-
 #include <libedataserver/e-account.h>
 #include <libedataserver/e-account-list.h>
 #include <libebook/e-destination.h>
@@ -27,8 +25,7 @@
 #include <shell/e-shell.h>
 #include <e-util/e-signature.h>
 #include <e-util/e-signature-list.h>
-
-#include "e-composer-header.h"
+#include <composer/e-composer-header.h>
 
 /* Standard GObject macros */
 #define E_TYPE_COMPOSER_HEADER_TABLE \
diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c
index d6a270a73b..29a9a5c790 100644
--- a/composer/e-composer-header.c
+++ b/composer/e-composer-header.c
@@ -26,21 +26,12 @@
 
 #include "e-composer-header.h"
 
-#include <glib/gi18n.h>
-
-enum {
-	PROP_0,
-	PROP_BUTTON,
-	PROP_LABEL,
-	PROP_SENSITIVE,
-	PROP_VISIBLE
-};
+#include <config.h>
+#include <glib/gi18n-lib.h>
 
-enum {
-	CHANGED,
-	CLICKED,
-	LAST_SIGNAL
-};
+#define E_COMPOSER_HEADER_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_COMPOSER_HEADER, EComposerHeaderPrivate))
 
 struct _EComposerHeaderPrivate {
 	gchar *label;
@@ -56,6 +47,20 @@ struct _EComposerHeaderPrivate {
 	guint visible   : 1;
 };
 
+enum {
+	PROP_0,
+	PROP_BUTTON,
+	PROP_LABEL,
+	PROP_SENSITIVE,
+	PROP_VISIBLE
+};
+
+enum {
+	CHANGED,
+	CLICKED,
+	LAST_SIGNAL
+};
+
 static guint signal_ids[LAST_SIGNAL];
 
 G_DEFINE_ABSTRACT_TYPE (
@@ -98,7 +103,8 @@ composer_header_constructor (GType type,
 		label = gtk_bin_get_child (GTK_BIN (widget));
 	} else {
 		widget = gtk_label_new_with_mnemonic (header->priv->label);
-		gtk_label_set_mnemonic_widget (GTK_LABEL (widget), header->input_widget);
+		gtk_label_set_mnemonic_widget (
+			GTK_LABEL (widget), header->input_widget);
 		label = widget;
 	}
 
@@ -227,7 +233,8 @@ e_composer_header_class_init (EComposerHeaderClass *class)
 			NULL,
 			FALSE,
 			G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT_ONLY));
+			G_PARAM_CONSTRUCT_ONLY |
+			G_PARAM_STATIC_STRINGS));
 
 	g_object_class_install_property (
 		object_class,
@@ -238,7 +245,8 @@ e_composer_header_class_init (EComposerHeaderClass *class)
 			NULL,
 			NULL,
 			G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT_ONLY));
+			G_PARAM_CONSTRUCT_ONLY |
+			G_PARAM_STATIC_STRINGS));
 
 	g_object_class_install_property (
 		object_class,
@@ -248,7 +256,8 @@ e_composer_header_class_init (EComposerHeaderClass *class)
 			NULL,
 			NULL,
 			FALSE,
-			G_PARAM_READWRITE));
+			G_PARAM_READWRITE |
+			G_PARAM_STATIC_STRINGS));
 
 	g_object_class_install_property (
 		object_class,
@@ -258,7 +267,8 @@ e_composer_header_class_init (EComposerHeaderClass *class)
 			NULL,
 			NULL,
 			FALSE,
-			G_PARAM_READWRITE));
+			G_PARAM_READWRITE |
+			G_PARAM_STATIC_STRINGS));
 
 	signal_ids[CHANGED] = g_signal_new (
 		"changed",
diff --git a/composer/e-composer-header.h b/composer/e-composer-header.h
index 971b55968c..08db97a2d4 100644
--- a/composer/e-composer-header.h
+++ b/composer/e-composer-header.h
@@ -18,7 +18,7 @@
 #ifndef E_COMPOSER_HEADER_H
 #define E_COMPOSER_HEADER_H
 
-#include "e-composer-common.h"
+#include <composer/e-composer-common.h>
 
 /* Standard GObject macros */
 #define E_TYPE_COMPOSER_HEADER \
diff --git a/composer/e-composer-name-header.c b/composer/e-composer-name-header.c
index a99f1cd949..b17cb4a75a 100644
--- a/composer/e-composer-name-header.c
+++ b/composer/e-composer-name-header.c
@@ -276,11 +276,11 @@ e_composer_name_header_new (const gchar *label,
 {
 	g_return_val_if_fail (E_IS_NAME_SELECTOR (name_selector), NULL);
 
-	return g_object_new (E_TYPE_COMPOSER_NAME_HEADER,
-			     "label", label,
-			     "button", TRUE,
-			     "name-selector", name_selector,
-			     NULL);
+	return g_object_new (
+		E_TYPE_COMPOSER_NAME_HEADER,
+		"label", label, "button", TRUE,
+		"name-selector", name_selector,
+		 NULL);
 }
 
 ENameSelector *
diff --git a/composer/e-composer-name-header.h b/composer/e-composer-name-header.h
index 785f7d11e8..e2f5e0044c 100644
--- a/composer/e-composer-name-header.h
+++ b/composer/e-composer-name-header.h
@@ -18,12 +18,10 @@
 #ifndef E_COMPOSER_NAME_HEADER_H
 #define E_COMPOSER_NAME_HEADER_H
 
-#include "e-composer-common.h"
-
 #include <libebook/e-destination.h>
 #include <libedataserverui/e-name-selector.h>
 
-#include "e-composer-header.h"
+#include <composer/e-composer-header.h>
 
 /* Standard GObject macros */
 #define E_TYPE_COMPOSER_NAME_HEADER \
@@ -62,7 +60,6 @@ struct _EComposerNameHeaderClass {
 GType		e_composer_name_header_get_type	(void);
 EComposerHeader * e_composer_name_header_new	(const gchar *label,
 						 ENameSelector *name_selector);
-
 ENameSelector *	e_composer_name_header_get_name_selector
 						(EComposerNameHeader *header);
 EDestination **	e_composer_name_header_get_destinations
diff --git a/composer/e-composer-post-header.h b/composer/e-composer-post-header.h
index c38bfe2d17..c6fff3e751 100644
--- a/composer/e-composer-post-header.h
+++ b/composer/e-composer-post-header.h
@@ -23,7 +23,7 @@
 
 #include <libedataserver/e-account.h>
 
-#include "e-composer-text-header.h"
+#include <composer/e-composer-text-header.h>
 
 /* Standard GObject macros */
 #define E_TYPE_COMPOSER_POST_HEADER \
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 693fd959f5..bd7b46a4ee 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -198,7 +198,8 @@ e_composer_private_constructed (EMsgComposer *composer)
 		gtk_widget_hide (widget);
 #endif
 		widget = gtkhtml_editor_get_managed_widget (editor, "/main-toolbar");
-		gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_BOTH_HORIZ);
+		gtk_toolbar_set_style (
+			GTK_TOOLBAR (widget), GTK_TOOLBAR_BOTH_HORIZ);
 		gtk_widget_hide (widget);
 
 	}
@@ -318,7 +319,7 @@ e_composer_private_constructed (EMsgComposer *composer)
 	/* Construct the attachment paned. */
 
 	if (small_screen_mode) {
-		/* short attachment bar for Anjal */
+		/* Short attachment bar for Anjal. */
 		e_attachment_paned_set_default_height (75);
 		e_attachment_icon_view_set_default_icon_size (GTK_ICON_SIZE_BUTTON);
 	}
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index 229897756f..35eb26696b 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -33,12 +33,13 @@
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
+#include <libebackend/e-extensible.h>
+
 #include "e-composer-actions.h"
 #include "e-composer-activity.h"
 #include "e-composer-header-table.h"
 #include "e-util/e-alert-sink.h"
 #include "e-util/e-charset.h"
-#include "e-util/e-extensible.h"
 #include "e-util/e-marshal.h"
 #include "e-util/e-mktemp.h"
 #include "e-util/e-plugin-ui.h"
diff --git a/composer/e-composer-text-header.c b/composer/e-composer-text-header.c
index 28df51ec87..39279237ab 100644
--- a/composer/e-composer-text-header.c
+++ b/composer/e-composer-text-header.c
@@ -89,19 +89,19 @@ e_composer_text_header_init (EComposerTextHeader *header)
 EComposerHeader *
 e_composer_text_header_new_label (const gchar *label)
 {
-	return g_object_new (E_TYPE_COMPOSER_TEXT_HEADER,
-			     "label", label,
-			     "button", FALSE,
-			     NULL);
+	return g_object_new (
+		E_TYPE_COMPOSER_TEXT_HEADER,
+		"label", label, "button", FALSE,
+		NULL);
 }
 
 EComposerHeader *
 e_composer_text_header_new_button (const gchar *label)
 {
-	return g_object_new (E_TYPE_COMPOSER_TEXT_HEADER,
-			     "label", label,
-			     "button", TRUE,
-			     NULL);
+	return g_object_new (
+		E_TYPE_COMPOSER_TEXT_HEADER,
+		"label", label, "button", TRUE,
+		NULL);
 }
 
 const gchar *
@@ -112,6 +112,7 @@ e_composer_text_header_get_text (EComposerTextHeader *header)
 	g_return_val_if_fail (E_IS_COMPOSER_TEXT_HEADER (header), NULL);
 
 	entry = E_COMPOSER_TEXT_HEADER_GET_ENTRY (header);
+
 	return gtk_entry_get_text (entry);
 }
 
@@ -124,5 +125,6 @@ e_composer_text_header_set_text (EComposerTextHeader *header,
 	g_return_if_fail (E_IS_COMPOSER_TEXT_HEADER (header));
 
 	entry = E_COMPOSER_TEXT_HEADER_GET_ENTRY (header);
+
 	gtk_entry_set_text (entry, (text != NULL) ? text : "");
 }
diff --git a/composer/e-composer-text-header.h b/composer/e-composer-text-header.h
index 278b2b1116..860fcc3c61 100644
--- a/composer/e-composer-text-header.h
+++ b/composer/e-composer-text-header.h
@@ -21,8 +21,7 @@
 #ifndef E_COMPOSER_TEXT_HEADER_H
 #define E_COMPOSER_TEXT_HEADER_H
 
-#include "e-composer-common.h"
-#include "e-composer-header.h"
+#include <composer/e-composer-header.h>
 
 /* Standard GObject macros */
 #define E_TYPE_COMPOSER_TEXT_HEADER \
@@ -57,13 +56,12 @@ struct _EComposerTextHeaderClass {
 };
 
 GType		e_composer_text_header_get_type	(void);
-
 EComposerHeader *
-e_composer_text_header_new_label (const gchar *label);
-
+		e_composer_text_header_new_label
+						(const gchar *label);
 EComposerHeader *
-e_composer_text_header_new_button (const gchar *label);
-
+		e_composer_text_header_new_button
+						(const gchar *label);
 const gchar *	e_composer_text_header_get_text	(EComposerTextHeader *header);
 void		e_composer_text_header_set_text (EComposerTextHeader *header,
 						 const gchar *text);
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index c41c4019b3..e58fd6fdf4 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -128,6 +128,8 @@ static void	handle_multipart_signed		(EMsgComposer *composer,
 
 static void	e_msg_composer_alert_sink_init	(EAlertSinkInterface *interface);
 
+gboolean 	check_blacklisted_file		(gchar *filename);
+
 G_DEFINE_TYPE_WITH_CODE (
 	EMsgComposer,
 	e_msg_composer,
@@ -522,6 +524,7 @@ build_message_headers (EMsgComposer *composer,
 	if (account != NULL) {
 		CamelMedium *medium;
 		CamelInternetAddress *addr;
+		const gchar *header_name;
 		const gchar *name = account->id->name;
 		const gchar *address = account->id->address;
 		gchar *transport_uid;
@@ -542,18 +545,18 @@ build_message_headers (EMsgComposer *composer,
 		g_object_unref (addr);
 
 		/* X-Evolution-Account */
-		camel_medium_set_header (
-			medium, "X-Evolution-Account", account->uid);
+		header_name = "X-Evolution-Account";
+		camel_medium_set_header (medium, header_name, account->uid);
 
 		/* X-Evolution-Fcc */
-		camel_medium_set_header (
-			medium, "X-Evolution-Fcc", account->sent_folder_uri);
+		header_name = "X-Evolution-Fcc";
+		camel_medium_set_header (medium, header_name, account->sent_folder_uri);
 
 		/* X-Evolution-Transport */
+		header_name = "X-Evolution-Transport";
 		transport_uid = g_strconcat (
 			account->uid, "-transport", NULL);
-		camel_medium_set_header (
-			medium, "X-Evolution-Transport", transport_uid);
+		camel_medium_set_header (medium, header_name, transport_uid);
 		g_free (transport_uid);
 	}
 
@@ -1102,7 +1105,8 @@ composer_build_message (EMsgComposer *composer,
 	/* Disposition-Notification-To */
 	if (flags & COMPOSER_FLAG_REQUEST_READ_RECEIPT) {
 		gchar *mdn_address = account->id->reply_to;
-		if (!mdn_address || !*mdn_address)
+
+		if (mdn_address == NULL || *mdn_address == '\0')
 			mdn_address = account->id->address;
 
 		camel_medium_add_header (
@@ -1501,7 +1505,8 @@ is_top_signature (EMsgComposer *composer)
 	shell = e_msg_composer_get_shell (composer);
 	shell_settings = e_shell_get_shell_settings (shell);
 
-	return e_shell_settings_get_boolean (shell_settings, "composer-top-signature");
+	return e_shell_settings_get_boolean (
+		shell_settings, "composer-top-signature");
 }
 
 static gboolean
@@ -4003,6 +4008,28 @@ merge_always_cc_and_bcc (EComposerHeaderTable *table,
 	e_destination_freev (addrv);
 }
 
+static const gchar *blacklisted_files [] = {".", "etc", ".."};
+
+gboolean check_blacklisted_file (gchar *filename)
+{
+	gboolean blacklisted = FALSE;
+	gint i,j,len;
+	gchar **filename_part;
+
+	filename_part = g_strsplit (filename, G_DIR_SEPARATOR_S, -1);
+	len = g_strv_length(filename_part);
+	for(i = 0; !blacklisted && i < G_N_ELEMENTS(blacklisted_files); i++)
+	{
+		for (j = 0; !blacklisted && j < len;j++)
+			if (g_str_has_prefix (filename_part[j], blacklisted_files[i]))
+				blacklisted = TRUE;
+	}
+
+	g_strfreev(filename_part);
+	
+	return blacklisted;
+}
+
 static void
 handle_mailto (EMsgComposer *composer,
                const gchar *mailto)
@@ -4094,8 +4121,14 @@ handle_mailto (EMsgComposer *composer,
 			} else if (!g_ascii_strcasecmp (header, "attach") ||
 				   !g_ascii_strcasecmp (header, "attachment")) {
 				EAttachment *attachment;
+				gboolean check = FALSE;
 
 				camel_url_decode (content);
+				check = check_blacklisted_file(content);
+				if(check)
+					e_alert_submit (
+		                        	E_ALERT_SINK (composer),
+                			        "mail:blacklisted-file", content, NULL);
 				if (g_ascii_strncasecmp (content, "file:", 5) == 0)
 					attachment = e_attachment_new_for_uri (content);
 				else
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index 296bb35a2f..258d260e3f 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -33,7 +33,7 @@
 #include <misc/e-web-view.h>
 #include <shell/e-shell.h>
 
-#include "e-composer-header-table.h"
+#include <composer/e-composer-header-table.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MSG_COMPOSER \
diff --git a/composer/mail-composer.error.xml b/composer/mail-composer.error.xml
index 7398f17442..0f6f11d429 100644
--- a/composer/mail-composer.error.xml
+++ b/composer/mail-composer.error.xml
@@ -35,7 +35,7 @@
   <button _label="_Send" response="GTK_RESPONSE_YES"/>
  </error>
 
- <error id="exit-unsaved" type="warning" default="GTK_RESPONSE_YES">
+ <error id="exit-unsaved" type="warning" default="GTK_RESPONSE_CANCEL">
   <_primary>Are you sure you want to discard the message, titled '{0}', you are composing?</_primary>
   <_secondary>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.</_secondary>
   <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
diff --git a/configure.ac b/configure.ac
index 4c1780977f..953c70e30b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ dnl Automake 1.11 - Silent Build Rules
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl Required Packages
-m4_define([glib_minimum_version], [2.28])
+m4_define([glib_minimum_version], [2.30])
 m4_define([gtk_minimum_version], [3.0.2])
 m4_define([eds_minimum_version], [evo_version])
 m4_define([gtkhtml_minimum_version], [4.1.2])
@@ -257,11 +257,14 @@ AC_SUBST(GNOME_PLATFORM_CFLAGS)
 AC_SUBST(GNOME_PLATFORM_LIBS)
 
 PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER],
-	[libebook-1.2 >= eds_minimum_version
+	[camel-1.2 >= eds_minimum_version
+	 libebook-1.2 >= eds_minimum_version
 	 libecal-1.2 >= eds_minimum_version
 	 libedataserver-1.2 >= eds_minimum_version
 	 libedataserverui-3.0 >= eds_minimum_version
 	 libebackend-1.2 >= eds_minimum_version])
+AC_SUBST(EVOLUTION_DATA_SERVER_CFLAGS)
+AC_SUBST(EVOLUTION_DATA_SERVER_LIBS)
 
 dnl ******************************
 dnl Canberra / Canberra-GTK Sound
@@ -686,7 +689,9 @@ dnl *************************
 dnl GTKHTML check
 dnl XXX Drop the version from the package name?
 dnl *************************
-PKG_CHECK_MODULES([GTKHTML], [libgtkhtml-4.0 >= gtkhtml_minimum_version])
+PKG_CHECK_MODULES([GTKHTML],
+	[libgtkhtml-4.0 >= gtkhtml_minimum_version
+	 gtkhtml-editor-4.0])
 AC_SUBST(GTKHTML_CFLAGS)
 AC_SUBST(GTKHTML_LIBS)
 
@@ -1195,17 +1200,6 @@ if test "x$enable_nm$enable_connman" = "xyesyes"; then
 fi
 AM_CONDITIONAL([ENABLE_CONNMAN], [test "$enable_connman" = yes])
 
-dnl ******************************
-dnl Camel Flags
-dnl ******************************
-EVO_SET_COMPILE_FLAGS(CAMEL, camel-provider-1.2, $MANUAL_NSS_CFLAGS, $MOXILLA_NSS_CFLAGS)
-AC_SUBST(CAMEL_CFLAGS)
-AC_SUBST(CAMEL_LIBS)
-
-EVO_SET_COMPILE_FLAGS(CAMEL_GROUPWISE, camel-provider-1.2 libedataserver-1.2)
-AC_SUBST(CAMEL_GROUPWISE_CFLAGS)
-AC_SUBST(CAMEL_GROUPWISE_LIBS)
-
 if test "x$mozilla_nss" != "x"; then
 	EVO_SET_COMPILE_FLAGS(MOZILLA_NSS, $mozilla_nss)
 	MOZILLA_L_DIR=`${PKG_CONFIG} --libs-only-L $mozilla_nss`
@@ -1225,64 +1219,11 @@ dnl (which are dragged in through libedataserverui), as both
 dnl gnutls and mozilla-nss have a header called "pkcs12.h" which is
 dnl included in smime/lib/e-pkcs12.c. It wants the Mozilla NSS one.
 dnl
-EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-3.0)
-CERT_UI_CFLAGS="$MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS $CERT_UI_CFLAGS"
-CERT_UI_LIBS="$MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS $CERT_UI_LIBS"
+CERT_UI_CFLAGS="$MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS"
+CERT_UI_LIBS="$MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS"
 AC_SUBST(CERT_UI_CFLAGS)
 AC_SUBST(CERT_UI_LIBS)
 
-dnl ************
-dnl E_UTIL Flags
-dnl ************
-EVO_SET_COMPILE_FLAGS(E_UTIL, libedataserverui-3.0 camel-provider-1.2 $mozilla_nspr, $MANUAL_NSPR_CFLAGS $MANUAL_NSPR_LIBS)
-AC_SUBST(E_UTIL_CFLAGS)
-AC_SUBST(E_UTIL_LIBS)
-
-E_UTIL_LIBS="$E_UTIL_LIBS $MATH_LIB"
-
-dnl **************
-dnl TZDIALOG Flags
-dnl **************
-EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-1.2 camel-1.2)
-AC_SUBST(TZDIALOG_CFLAGS)
-AC_SUBST(TZDIALOG_LIBS)
-
-dnl ***************
-dnl E_WIDGETS Flags
-dnl ***************
-EVO_SET_COMPILE_FLAGS(E_WIDGETS, libedataserverui-3.0 gtkhtml-editor-4.0)
-AC_SUBST(E_WIDGETS_CFLAGS)
-AC_SUBST(E_WIDGETS_LIBS)
-
-dnl ***************
-dnl IMPORTERS Flags
-dnl ***************
-EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-3.0 camel-provider-1.2 libebook-1.2)
-AC_SUBST(IMPORTERS_CFLAGS)
-AC_SUBST(IMPORTERS_LIBS)
-
-dnl ***************
-dnl LIBFILTER Flags
-dnl ***************
-EVO_SET_COMPILE_FLAGS(LIBFILTER, libedataserver-1.2 camel-1.2)
-AC_SUBST(LIBFILTER_CFLAGS)
-AC_SUBST(LIBFILTER_LIBS)
-
-dnl ***********
-dnl Shell Flags
-dnl ***********
-EVO_SET_COMPILE_FLAGS(SHELL, libgtkhtml-4.0 libedataserverui-3.0)
-AC_SUBST(SHELL_CFLAGS)
-AC_SUBST(SHELL_LIBS)
-
-dnl *****************
-dnl Addressbook Flags
-dnl *****************
-EVOLUTION_ADDRESSBOOK_DEPS="libgtkhtml-4.0 libebook-1.2 libedataserverui-3.0 camel-1.2 gtkhtml-editor-4.0"
-EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
-AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
-AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
-
 dnl ***************
 dnl Libnotify Flags
 dnl ***************
@@ -1305,11 +1246,11 @@ fi
 dnl **************
 dnl Calendar Flags
 dnl **************
-EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-gnome-2.4 >= libsoup_minimum_version)
+PKG_CHECK_MODULES([LIBSOUP], [libsoup-gnome-2.4 >= libsoup_minimum_version])
 AC_SUBST(LIBSOUP_CFLAGS)
 AC_SUBST(LIBSOUP_LIBS)
 
-EVO_SET_COMPILE_FLAGS(GDATA, libgdata >= 0.7.0)
+PKG_CHECK_MODULES([GDATA], [libgdata >= 0.7.0])
 AC_SUBST(GDATA_CFLAGS)
 AC_SUBST(GDATA_LIBS)
 
@@ -1317,16 +1258,12 @@ if `$PKG_CONFIG --atleast-version=0.9 libgdata`; then
 	AC_DEFINE(HAVE_LIBGDATA_0_9,1,[libgdata is 0.9 or higher])
 fi
 
-EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgtkhtml-4.0 libebook-1.2 libecal-1.2 libedataserverui-3.0 libebackend-1.2 $libnotify gtkhtml-editor-4.0)
-AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
-AC_SUBST(EVOLUTION_CALENDAR_LIBS)
-
 dnl ****************************
 dnl Check for ical_set_unknown_token_handling_setting function
 dnl ****************************
 AC_MSG_CHECKING([ical_set_unknown_token_handling_setting function])
-save_cflags=$CFLAGS; CFLAGS=$EVOLUTION_CALENDAR_CFLAGS
-save_libs=$LIBS; LIBS="$EVOLUTION_CALENDAR_LIBS"
+save_cflags=$CFLAGS; CFLAGS="$EVOLUTION_DATA_SERVER_CFLAGS"
+save_libs=$LIBS; LIBS="$EVOLUTION_DATA_SERVER_LIBS"
 AC_LINK_IFELSE([AC_LANG_PROGRAM(
 	[[#include <libical/ical.h>]],
 	[[ical_set_unknown_token_handling_setting (ICAL_DISCARD_TOKEN)]])],
@@ -1335,19 +1272,6 @@ CFLAGS=$save_cflags
 LIBS=$save_libs
 AC_MSG_RESULT([$ac_cv_have_iuth])
 
-dnl **********
-dnl Mail Flags
-dnl **********
-EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-1.2 libgtkhtml-4.0 gtkhtml-editor-4.0 $mozilla_nss libebook-1.2 libedataserverui-3.0)
-AC_SUBST(EVOLUTION_MAIL_CFLAGS)
-AC_SUBST(EVOLUTION_MAIL_LIBS)
-
-dnl ***************************
-dnl Evolution-Data-Server Flags
-dnl ***************************
-DATASERVER_EXEC_VERSION=`${PKG_CONFIG} --variable=execversion evolution-data-server-1.2`
-AC_SUBST(DATASERVER_EXEC_VERSION)
-
 dnl *****************
 dnl EggSMClient Flags
 dnl *****************
diff --git a/doc/reference/shell/Makefile.am b/doc/reference/shell/Makefile.am
index 52134aba8f..114b0e2bf5 100644
--- a/doc/reference/shell/Makefile.am
+++ b/doc/reference/shell/Makefile.am
@@ -51,8 +51,8 @@ expand_content_files=
 GTKDOC_CFLAGS= \
 	-I$(top_builddir)						\
 	-I$(top_srcdir)							\
-	$(SHELL_CFLAGS)							\
-	$(EVOLUTION_DATA_SERVER_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
+	$(GTKHTML_CFLAGS)
 GTKDOC_LIBS=								\
 	$(top_builddir)/shell/libeshell.la				\
 	$(top_builddir)/e-util/libeutil.la				\
@@ -61,8 +61,8 @@ GTKDOC_LIBS=								\
 	$(top_builddir)/smclient/libeggdesktopfile.la			\
 	$(top_builddir)/widgets/menus/libmenus.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
-	$(SHELL_LIBS)							\
-	$(EVOLUTION_DATA_SERVER_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)					\
+	$(GTKHTML_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/doc/reference/shell/eshell-docs.sgml b/doc/reference/shell/eshell-docs.sgml
index 5451736723..666da0276e 100644
--- a/doc/reference/shell/eshell-docs.sgml
+++ b/doc/reference/shell/eshell-docs.sgml
@@ -47,13 +47,6 @@
   </chapter>
 
   <chapter>
-    <title>Extending Evolution</title>
-    <xi:include href="xml/e-module.xml"/>
-    <xi:include href="xml/e-extension.xml"/>
-    <xi:include href="xml/e-extensible.xml"/>
-  </chapter>
-
-  <chapter>
     <title>Actions</title>
     <xi:include href="xml/shell-actions.xml"/>
     <xi:include href="xml/action-groups.xml"/>
diff --git a/doc/reference/shell/eshell-sections.txt b/doc/reference/shell/eshell-sections.txt
index 6e23f58f15..131341980e 100644
--- a/doc/reference/shell/eshell-sections.txt
+++ b/doc/reference/shell/eshell-sections.txt
@@ -854,41 +854,6 @@ e_dialog_combo_box_get
 </SECTION>
 
 <SECTION>
-<FILE>e-extensible</FILE>
-<TITLE>EExtensible</TITLE>
-EExtensible
-e_extensible_load_extensions
-e_extensible_list_extensions
-<SUBSECTION Standard>
-E_EXTENSIBLE
-E_IS_EXTENSIBLE
-E_TYPE_EXTENSIBLE
-E_EXTENSIBLE_INTERFACE
-E_IS_EXTENSIBLE_INTERFACE
-E_EXTENSIBLE_GET_INTERFACE
-EExtensibleInterface
-e_extensible_get_type
-</SECTION>
-
-<SECTION>
-<FILE>e-extension</FILE>
-<TITLE>EExtension</TITLE>
-EExtension
-e_extension_get_extensible
-<SUBSECTION Standard>
-E_EXTENSION
-E_IS_EXTENSION
-E_TYPE_EXTENSION
-E_EXTENSION_CLASS
-E_IS_EXTENSION_CLASS
-E_EXTENSION_GET_CLASS
-EExtensionClass
-e_extension_get_type
-<SUBSECTION Private>
-EExtensionPrivate
-</SECTION>
-
-<SECTION>
 <FILE>e-html-utils</FILE>
 <TITLE>Text to HTML Conversion</TITLE>
 E_TEXT_TO_HTML_PRE
@@ -913,26 +878,6 @@ e_icon_factory_create_thumbnail
 </SECTION>
 
 <SECTION>
-<FILE>e-module</FILE>
-<TITLE>EModule</TITLE>
-EModule
-e_module_new
-e_module_get_filename
-e_module_load_all_in_directory
-<SUBSECTION Standard>
-E_MODULE
-E_IS_MODULE
-E_TYPE_MODULE
-E_MODULE_CLASS
-E_IS_MODULE_CLASS
-E_MODULE_GET_CLASS
-EModuleClass
-e_module_get_type
-<SUBSECTION Private>
-EModulePrivate
-</SECTION>
-
-<SECTION>
 <FILE>e-poolv</FILE>
 <TITLE>EPoolv</TITLE>
 EPoolv
@@ -1137,7 +1082,6 @@ e_action_compare_by_label
 e_action_group_remove_all_actions
 e_radio_action_get_current_action
 e_categories_add_change_hook
-e_type_traverse
 e_str_without_underscores
 e_str_compare
 e_str_case_compare
diff --git a/doc/reference/shell/eshell.types b/doc/reference/shell/eshell.types
index 51b7c7693e..4e01f342e8 100644
--- a/doc/reference/shell/eshell.types
+++ b/doc/reference/shell/eshell.types
@@ -1,7 +1,4 @@
 e_bit_array_get_type
-e_extensible_get_type
-e_extension_get_type
-e_module_get_type
 e_signature_get_type
 e_signature_list_get_type
 e_shell_get_type
diff --git a/doc/reference/shell/tmpl/e-attachment-store.sgml b/doc/reference/shell/tmpl/e-attachment-store.sgml
index f0a8b68944..34884eacc5 100644
--- a/doc/reference/shell/tmpl/e-attachment-store.sgml
+++ b/doc/reference/shell/tmpl/e-attachment-store.sgml
@@ -201,6 +201,7 @@ e-attachment-store
 
 @store: 
 @destination: 
+@filename_prefix: 
 @callback: 
 @user_data: 
 
diff --git a/doc/reference/shell/tmpl/e-extensible.sgml b/doc/reference/shell/tmpl/e-extensible.sgml
deleted file mode 100644
index 333d8238fc..0000000000
--- a/doc/reference/shell/tmpl/e-extensible.sgml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-EExtensible
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT EExtensible ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION e_extensible_load_extensions ##### -->
-<para>
-
-</para>
-
-@extensible: 
-
-
-<!-- ##### FUNCTION e_extensible_list_extensions ##### -->
-<para>
-
-</para>
-
-@extensible: 
-@extension_type: 
-@Returns: 
-
-
diff --git a/doc/reference/shell/tmpl/e-extension.sgml b/doc/reference/shell/tmpl/e-extension.sgml
deleted file mode 100644
index 49a3a13b70..0000000000
--- a/doc/reference/shell/tmpl/e-extension.sgml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-EExtension
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT EExtension ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG EExtension:extensible ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION e_extension_get_extensible ##### -->
-<para>
-
-</para>
-
-@extension: 
-@Returns: 
-
-
diff --git a/doc/reference/shell/tmpl/e-module.sgml b/doc/reference/shell/tmpl/e-module.sgml
deleted file mode 100644
index eedd4e4477..0000000000
--- a/doc/reference/shell/tmpl/e-module.sgml
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-EModule
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT EModule ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG EModule:filename ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION e_module_new ##### -->
-<para>
-
-</para>
-
-@filename: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_module_get_filename ##### -->
-<para>
-
-</para>
-
-@module: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_module_load_all_in_directory ##### -->
-<para>
-
-</para>
-
-@dirname: 
-@Returns: 
-
-
diff --git a/doc/reference/shell/tmpl/e-util.sgml b/doc/reference/shell/tmpl/e-util.sgml
index 2cddc59a1c..7adb70cb39 100644
--- a/doc/reference/shell/tmpl/e-util.sgml
+++ b/doc/reference/shell/tmpl/e-util.sgml
@@ -103,16 +103,6 @@ Miscellaneous Utilities
 @object: 
 
 
-<!-- ##### FUNCTION e_type_traverse ##### -->
-<para>
-
-</para>
-
-@parent_type: 
-@func: 
-@user_data: 
-
-
 <!-- ##### FUNCTION e_str_without_underscores ##### -->
 <para>
 
diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml
index bc13bf3a87..21f8c4afcd 100644
--- a/doc/reference/shell/tmpl/eshell-unused.sgml
+++ b/doc/reference/shell/tmpl/eshell-unused.sgml
@@ -26,6 +26,62 @@
 GObject Property Bindings
 
 
+<!-- ##### SECTION ./tmpl/e-extensible.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-extensible.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/e-extensible.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/e-extensible.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-extensible.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-extensible.sgml:Title ##### -->
+EExtensible
+
+
+<!-- ##### SECTION ./tmpl/e-extension.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-extension.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/e-extension.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/e-extension.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-extension.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-extension.sgml:Title ##### -->
+EExtension
+
+
 <!-- ##### SECTION ./tmpl/e-logger.sgml:Image ##### -->
 
 
@@ -54,6 +110,34 @@ GObject Property Bindings
 Error Logging
 
 
+<!-- ##### SECTION ./tmpl/e-module.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-module.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/e-module.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/e-module.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-module.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/e-module.sgml:Title ##### -->
+EModule
+
+
 <!-- ##### SECTION ./tmpl/e-shell-window.sgml.sgml.sgml.sgml:Image ##### -->
 
 
@@ -154,6 +238,24 @@ e-shell-window.sgml
 @user_data: 
 @Returns: 
 
+<!-- ##### STRUCT EExtensible ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT EExtension ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EExtension:extensible ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### USER_FUNCTION ELogFunction ##### -->
 <para>
 
@@ -183,6 +285,18 @@ e-shell-window.sgml
 </para>
 
 
+<!-- ##### STRUCT EModule ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EModule:filename ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### STRUCT EMutualBinding ##### -->
 <para>
 
@@ -437,6 +551,30 @@ e-shell-window.sgml
 
 @binding: 
 
+<!-- ##### FUNCTION e_extensible_list_extensions ##### -->
+<para>
+
+</para>
+
+@extensible: 
+@extension_type: 
+@Returns: 
+
+<!-- ##### FUNCTION e_extensible_load_extensions ##### -->
+<para>
+
+</para>
+
+@extensible: 
+
+<!-- ##### FUNCTION e_extension_get_extensible ##### -->
+<para>
+
+</para>
+
+@extension: 
+@Returns: 
+
 <!-- ##### FUNCTION e_get_gnome2_user_dir ##### -->
 <para>
 
@@ -488,6 +626,30 @@ e-shell-window.sgml
 @name: 
 @Returns: 
 
+<!-- ##### FUNCTION e_module_get_filename ##### -->
+<para>
+
+</para>
+
+@module: 
+@Returns: 
+
+<!-- ##### FUNCTION e_module_load_all_in_directory ##### -->
+<para>
+
+</para>
+
+@dirname: 
+@Returns: 
+
+<!-- ##### FUNCTION e_module_new ##### -->
+<para>
+
+</para>
+
+@filename: 
+@Returns: 
+
 <!-- ##### FUNCTION e_mutual_binding_new ##### -->
 <para>
 
@@ -582,6 +744,15 @@ e-shell-window.sgml
 @key: 
 @Returns: 
 
+<!-- ##### FUNCTION e_type_traverse ##### -->
+<para>
+
+</para>
+
+@parent_type: 
+@func: 
+@user_data: 
+
 <!-- ##### FUNCTION get_font_options ##### -->
 <para>
 
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 53614e3b06..b5d4559cce 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -31,15 +31,12 @@ eutilinclude_HEADERS = 				\
 	e-dialog-utils.h			\
 	e-dialog-widgets.h			\
 	e-event.h				\
-	e-extensible.h				\
-	e-extension.h				\
 	e-file-utils.h				\
 	e-html-utils.h				\
 	e-icon-factory.h			\
 	e-import.h				\
 	e-marshal.h				\
 	e-mktemp.h				\
-	e-module.h				\
 	e-poolv.h				\
 	e-print.h				\
 	e-plugin.h				\
@@ -88,8 +85,8 @@ libeutil_la_CPPFLAGS =							\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"				\
 	-DEVOLUTION_RULEDIR=\"$(ruledir)\"				\
 	-DG_LOG_DOMAIN=\"e-utils\"					\
-	$(GNOME_PLATFORM_CFLAGS)					\
-	$(E_UTIL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libeutil_la_SOURCES =				\
 	$(eutilinclude_HEADERS)			\
@@ -106,15 +103,12 @@ libeutil_la_SOURCES =				\
 	e-dialog-utils.c			\
 	e-dialog-widgets.c			\
 	e-event.c				\
-	e-extensible.c				\
-	e-extension.c				\
 	e-file-utils.c				\
 	e-html-utils.c				\
 	e-icon-factory.c			\
 	e-import.c				\
 	e-marshal.c				\
 	e-mktemp.c				\
-	e-module.c				\
 	e-poolv.c				\
 	e-plugin.c				\
 	e-plugin-ui.c				\
@@ -139,10 +133,10 @@ libeutil_la_SOURCES =				\
 
 libeutil_la_LDFLAGS = $(NO_UNDEFINED)
 
-libeutil_la_LIBADD = 		\
-	$(ICONV_LIBS)		\
-	$(E_UTIL_LIBS)		\
-	$(GNOME_PLATFORM_LIBS)	\
+libeutil_la_LIBADD = 			\
+	$(ICONV_LIBS)			\
+	$(EVOLUTION_DATA_SERVER_LIBS)	\
+	$(GNOME_PLATFORM_LIBS)		\
 	$(INTLLIBS)
 
 error_DATA = e-system.error
diff --git a/e-util/e-alert-dialog.c b/e-util/e-alert-dialog.c
index 8696588ab2..70e53432f3 100644
--- a/e-util/e-alert-dialog.c
+++ b/e-util/e-alert-dialog.c
@@ -120,6 +120,7 @@ alert_dialog_constructed (GObject *object)
 	PangoAttrList *list;
 	GList *actions;
 	const gchar *primary, *secondary;
+	gint default_response;
 	gint min_width = -1, prefer_width = -1;
 	gint height;
 
@@ -129,6 +130,8 @@ alert_dialog_constructed (GObject *object)
 	dialog = E_ALERT_DIALOG (object);
 	alert = e_alert_dialog_get_alert (dialog);
 
+	default_response = e_alert_get_default_response (alert);
+
 	gtk_window_set_title (GTK_WINDOW (dialog), " ");
 
 	action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
@@ -149,15 +152,19 @@ alert_dialog_constructed (GObject *object)
 	actions = e_alert_peek_actions (alert);
 	while (actions != NULL) {
 		GtkWidget *button;
+		gpointer data;
 
 		/* These actions are already wired to trigger an
 		 * EAlert::response signal when activated, which
 		 * will in turn call to gtk_dialog_response(),
 		 * so we can add buttons directly to the action
-		 * area without knowing their response IDs. */
+		 * area without knowing their response IDs.
+		 * (XXX Well, kind of.  See below.) */
 
 		button = gtk_button_new ();
 
+		gtk_widget_set_can_default (button, TRUE);
+
 		gtk_activatable_set_related_action (
 			GTK_ACTIVATABLE (button),
 			GTK_ACTION (actions->data));
@@ -166,14 +173,23 @@ alert_dialog_constructed (GObject *object)
 			GTK_BOX (action_area),
 			button, FALSE, FALSE, 0);
 
+		/* This is set in e_alert_add_action(). */
+		data = g_object_get_data (
+			actions->data, "e-alert-response-id");
+
+		/* Normally GtkDialog sets the initial focus widget to
+		 * the button corresponding to the default response, but
+		 * because the buttons are not directly tied to response
+		 * IDs, we have set both the default widget and the
+		 * initial focus widget ourselves. */
+		if (GPOINTER_TO_INT (data) == default_response) {
+			gtk_widget_grab_default (button);
+			gtk_widget_grab_focus (button);
+		}
+
 		actions = g_list_next (actions);
 	}
 
-	if (e_alert_get_default_response (alert))
-		gtk_dialog_set_default_response (
-			GTK_DIALOG (dialog),
-			e_alert_get_default_response (alert));
-
 	widget = gtk_hbox_new (FALSE, 12);
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
 	gtk_box_pack_start (GTK_BOX (content_area), widget, FALSE, FALSE, 0);
diff --git a/e-util/e-extensible.h b/e-util/e-extensible.h
deleted file mode 100644
index 6dd6294212..0000000000
--- a/e-util/e-extensible.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * e-extensible.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/>
- *
- */
-
-#ifndef E_EXTENSIBLE_H
-#define E_EXTENSIBLE_H
-
-#include <glib-object.h>
-
-/* Standard GObject macros */
-#define E_TYPE_EXTENSIBLE \
-	(e_extensible_get_type ())
-#define E_EXTENSIBLE(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_EXTENSIBLE, EExtensible))
-#define E_EXTENSIBLE_INTERFACE(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_EXTENSIBLE, EExtensibleInterface))
-#define E_IS_EXTENSIBLE(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_EXTENSIBLE))
-#define E_IS_EXTENSIBLE_INTERFACE(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_EXTENSIBLE))
-#define E_EXTENSIBLE_GET_INTERFACE(obj) \
-	(G_TYPE_INSTANCE_GET_INTERFACE \
-	((obj), E_TYPE_EXTENSIBLE, EExtensibleInterface))
-
-G_BEGIN_DECLS
-
-typedef struct _EExtensible EExtensible;
-typedef struct _EExtensibleInterface EExtensibleInterface;
-
-struct _EExtensibleInterface {
-	GTypeInterface parent_interface;
-};
-
-GType		e_extensible_get_type		(void);
-void		e_extensible_load_extensions	(EExtensible *extensible);
-GList *		e_extensible_list_extensions	(EExtensible *extensible,
-						 GType extension_type);
-
-G_END_DECLS
-
-#endif /* E_EXTENSIBLE_H */
diff --git a/e-util/e-marshal.list b/e-util/e-marshal.list
index ce8e393fce..c42078b2df 100644
--- a/e-util/e-marshal.list
+++ b/e-util/e-marshal.list
@@ -6,6 +6,7 @@ BOOLEAN:INT,INT,OBJECT,INT,INT,UINT
 BOOLEAN:INT,POINTER,INT,BOXED
 BOOLEAN:INT,POINTER,INT,OBJECT,INT,INT,UINT
 BOOLEAN:NONE
+BOOLEAN:OBJECT
 BOOLEAN:OBJECT,DOUBLE,DOUBLE,BOOLEAN
 BOOLEAN:POINTER
 BOOLEAN:POINTER,BOOLEAN,POINTER
diff --git a/e-util/e-module.h b/e-util/e-module.h
deleted file mode 100644
index dc96bb34d9..0000000000
--- a/e-util/e-module.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * e-module.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_MODULE_H
-#define E_MODULE_H
-
-#include <gmodule.h>
-#include <glib-object.h>
-
-/* Standard GObject macros */
-#define E_TYPE_MODULE \
-	(e_module_get_type ())
-#define E_MODULE(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_MODULE, EModule))
-#define E_MODULE_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_MODULE, EModuleClass))
-#define E_IS_MODULE(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_MODULE))
-#define E_IS_MODULE_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_MODULE))
-#define E_MODULE_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_MODULE, EModuleClass))
-
-G_BEGIN_DECLS
-
-typedef struct _EModule EModule;
-typedef struct _EModuleClass EModuleClass;
-typedef struct _EModulePrivate EModulePrivate;
-
-/**
- * EModule:
- *
- * Contains only private data that should be read and manipulated using the
- * functions below.
- **/
-struct _EModule {
-	GTypeModule parent;
-	EModulePrivate *priv;
-};
-
-struct _EModuleClass {
-	GTypeModuleClass parent_class;
-};
-
-GType		e_module_get_type		(void);
-EModule *	e_module_new			(const gchar *filename);
-const gchar *	e_module_get_filename		(EModule *module);
-GList *		e_module_load_all_in_directory	(const gchar *dirname);
-
-G_END_DECLS
-
-#endif /* E_MODULE_H */
diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c
index 745a931954..3ac9eb92db 100644
--- a/e-util/e-plugin-ui.c
+++ b/e-util/e-plugin-ui.c
@@ -522,7 +522,8 @@ e_plugin_ui_hook_init (EPluginUIHook *hook)
 		(GDestroyNotify) g_free,
 		(GDestroyNotify) g_free);
 
-	registry = g_hash_table_new (g_direct_hash, g_direct_equal);
+	registry = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+		NULL, (GDestroyNotify) g_hash_table_destroy);
 
 	hook->priv = G_TYPE_INSTANCE_GET_PRIVATE (
 		hook, E_TYPE_PLUGIN_UI_HOOK, EPluginUIHookPrivate);
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index 17650f045a..a19dc879b3 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -27,12 +27,12 @@
 
 #include <gconf/gconf-client.h>
 
+#include <libebackend/e-module.h>
 #include <libedataserver/e-data-server-util.h>
 #include <libedataserver/e-xml-utils.h>
 
 #include "e-plugin.h"
 #include "e-util-private.h"
-#include "e-util.h"
 
 /* plugin debug */
 #define pd(x)
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 8ededeeb9d..cd489849e4 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -489,47 +489,6 @@ e_categories_add_change_hook (GHookFunc func,
 }
 
 /**
- * e_type_traverse:
- * @parent_type: the root #GType to traverse from
- * @func: the function to call for each visited #GType
- * @user_data: user data to pass to the function
- *
- * Calls @func for all instantiable subtypes of @parent_type.
- *
- * This is often useful for extending functionality by way of #EModule.
- * A module may register a subtype of @parent_type in its e_module_load()
- * function.  Then later on the application will call e_type_traverse()
- * to instantiate all registered subtypes of @parent_type.
- **/
-void
-e_type_traverse (GType parent_type,
-                 ETypeFunc func,
-                 gpointer user_data)
-{
-	GType *children;
-	guint n_children, ii;
-
-	g_return_if_fail (func != NULL);
-
-	children = g_type_children (parent_type, &n_children);
-
-	for (ii = 0; ii < n_children; ii++) {
-		GType type = children[ii];
-
-		/* Recurse over the child's children. */
-		e_type_traverse (type, func, user_data);
-
-		/* Skip abstract types. */
-		if (G_TYPE_IS_ABSTRACT (type))
-			continue;
-
-		func (type, user_data);
-	}
-
-	g_free (children);
-}
-
-/**
  * e_str_without_underscores:
  * @string: the string to strip underscores from
  *
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 8463fd4a7b..cb88a90644 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -69,9 +69,6 @@ GtkRadioAction *e_radio_action_get_current_action
 						(GtkRadioAction *radio_action);
 void		e_categories_add_change_hook	(GHookFunc func,
 						 gpointer object);
-void		e_type_traverse			(GType parent_type,
-						 ETypeFunc func,
-						 gpointer user_data);
 
 gchar *		e_str_without_underscores	(const gchar *string);
 gint		e_str_compare			(gconstpointer x,
diff --git a/em-format/Makefile.am b/em-format/Makefile.am
index df052fe915..07ff63cc2a 100644
--- a/em-format/Makefile.am
+++ b/em-format/Makefile.am
@@ -12,8 +12,8 @@ libemformat_la_CPPFLAGS =				\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libemformat_la_SOURCES =				\
 	$(emformatinclude_HEADERS)			\
@@ -27,7 +27,7 @@ libemformat_la_LDFLAGS = $(NO_UNDEFINED)
 libemformat_la_LIBADD =					\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/shell/libeshell.la		\
-	$(EVOLUTION_MAIL_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)
 
 -include $(top_srcdir)/git.mk
diff --git a/evolution-plugin.pc.in b/evolution-plugin.pc.in
index 2f7c48bee4..53603e0216 100644
--- a/evolution-plugin.pc.in
+++ b/evolution-plugin.pc.in
@@ -15,6 +15,6 @@ errordir=@privdatadir@/errors
 Name: evolution-plugin
 Description: libraries needed for Evolution plugin development
 Version: @VERSION@
-Requires: camel-provider-1.2 libxml-2.0 libgtkhtml-4.0 gtkhtml-editor-4.0
+Requires: camel-1.2 libxml-2.0 libgtkhtml-4.0 gtkhtml-editor-4.0
 Libs: -L${privlibdir} -leutil -Wl,-R${privlibdir}
 Cflags: -I${privincludedir}
diff --git a/filter/Makefile.am b/filter/Makefile.am
index c8c978025c..e28014559b 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -8,8 +8,8 @@ libfilter_la_CPPFLAGS = 			\
 	-I $(top_srcdir)/e-util			\
 	-DEVOLUTION_UIDIR=\"$(uidir)\"		\
 	-DG_LOG_DOMAIN=\"filter\"		\
-	$(GNOME_PLATFORM_CFLAGS)		\
-	$(LIBFILTER_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
+	$(GNOME_PLATFORM_CFLAGS)
 
 filterincludedir = $(privincludedir)/filter
 
@@ -57,7 +57,7 @@ libfilter_la_LDFLAGS = $(NO_UNDEFINED)
 
 libfilter_la_LIBADD = 				\
 	$(top_builddir)/e-util/libeutil.la	\
-	$(LIBFILTER_LIBS)			\
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)			\
 	$(REGEX_LIBS)
 
diff --git a/help/C/backup-restore.page b/help/C/backup-restore.page
index bbfdbf5dcd..64e1ff50fc 100644
--- a/help/C/backup-restore.page
+++ b/help/C/backup-restore.page
@@ -7,7 +7,7 @@
     <link type="guide" xref="index#data-migration-and-sync"/>
     <link type="seealso" xref="data-storage"/>
 
-    <revision pkgversion="3.1.5" version="0.2" date="2011-08-05" status="final"/>
+    <revision pkgversion="3.1.5" version="0.3" date="2011-09-29" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -27,8 +27,9 @@
 <list>
 <item><p>Select <guiseq><gui>File</gui><gui>Back up Evolution Data...</gui></guiseq>.</p></item>
 <item><p>Choose a filename and the folder where you want to save the backup file, and click <gui style="button">Save</gui>.</p></item>
-<item><p>You will get asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
+<item><p>You will be asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
 </list>
+<note style="warning"><p>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>.</p></note>
 </section>
 
 <section id="restore">
@@ -36,7 +37,7 @@
 <list>
 <item><p>Select <guiseq><gui>File</gui><gui>Restore Evolution Data...</gui></guiseq>.</p></item>
 <item><p>Choose the file, and click <gui style="button">Open</gui>.</p></item>
-<item><p>You will get asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
+<item><p>You will be asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
 </list>
 <note style="tip"><p>In the <link xref="intro-first-run">first-run assistant</link>, you can restore Evolution data from a backup file.</p></note>
 </section>
diff --git a/help/C/contacts-add-automatically.page b/help/C/contacts-add-automatically.page
index 92f86f275d..909c79a531 100644
--- a/help/C/contacts-add-automatically.page
+++ b/help/C/contacts-add-automatically.page
@@ -24,7 +24,7 @@
 <title>Adding people automatically to my contacts</title>
 
 
-<p>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.</p>
+<p>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 <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 will receive the new contacts.</p>
 <p>From now on, contacts will be automatically created for senders of received mail when you reply to that mail.</p>
 <!-- Location in Preferences is correct only since 3.1.5, as https://bugzilla.gnome.org/show_bug.cgi?id=655492 was fixed -->
 </page>
diff --git a/help/C/contacts-local.page b/help/C/contacts-local.page
index c57a8ebfab..95315b3582 100644
--- a/help/C/contacts-local.page
+++ b/help/C/contacts-local.page
@@ -19,7 +19,7 @@
 
 <title>Adding another local address book</title>
 
-<p>To add another local calendar to Evolution, perform the following steps:</p>
+<p>To add another local address book to Evolution, perform the following steps:</p>
 <steps>
 <item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Address Book</gui></guiseq>.</p></item>
 <item><p>Select the type <gui>On This Computer</gui>.</p></item>
diff --git a/help/C/contacts-usage-add-contact.page b/help/C/contacts-usage-add-contact.page
index 846a2860d1..2c90043d6c 100644
--- a/help/C/contacts-usage-add-contact.page
+++ b/help/C/contacts-usage-add-contact.page
@@ -6,7 +6,7 @@
     
     <link type="guide" xref="contacts-usage" />
 
-    <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+    <revision pkgversion="3.0.2" version="0.2" date="2011-09-29" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -20,7 +20,7 @@
 <title>Adding a Contact</title>
 
 <steps>
-<item><p>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>.</p></item>
+<item><p>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 <gui>New Contact...</gui>, or press <keyseq><key>Shift</key><key>Ctrl</key><key>C</key></keyseq>.</p></item>
 <item><p>Select the address book under <gui>Where:</gui> to which it will be added.</p></item>
 <item><p>Enter the contact information. Note that there are several tabs.</p></item>
 <item><p>You can add a photograph to the contact by clicking the large field (showing a stylized person) next to <gui>Full Name</gui> and <gui>Categories</gui>.</p></item>
diff --git a/help/C/data-storage.page b/help/C/data-storage.page
index 8ea0af392b..8e02401513 100644
--- a/help/C/data-storage.page
+++ b/help/C/data-storage.page
@@ -6,7 +6,7 @@
     
     <link type="guide" xref="index#common-other-problems" />
 
-    <revision pkgversion="2.32.1" version="0.2" date="2011-07-21" status="draft"/>
+    <revision pkgversion="3.1.91" version="0.3" date="2011-09-29" status="draft"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -20,7 +20,7 @@
 <title>Data storage locations</title>
 
 <note style="tip">
-<p>This is only interesting for advanced users that want to debug problems.</p>
+<p>This is only interesting for advanced users who want to debug problems.</p>
 </note>
 
 <p>If you run Evolution 2.32.0 or later, data will be stored according to the <link href="http://www.freedesktop.org/wiki/Specifications/basedir-spec">XDG Base Directory Specification</link>. By default this means:</p>
@@ -28,19 +28,19 @@
 <terms>
 <item>
 <title>The user's data files</title>
-<p>$HOME/.local/share/evolution</p>
+<p><file>$HOME/.local/share/evolution</file></p>
 </item>
 <item>
 <title>Various configuration and state files</title>
-<p>$HOME/.config/evolution</p>
+<p><file>$HOME/.config/evolution</file></p>
 </item>
 <item>
 <title>Disposable data caches</title>
-<p>$HOME/.cache/evolution</p>
+<p><file>$HOME/.cache/evolution</file></p>
 </item>
 <item>
 <title>Configuration settings in GConf</title>
-<p>$HOME/.gconf/apps/evolution</p>
+<p><file>$HOME/.gconf/apps/evolution</file></p>
 </item>
 </terms>
 
diff --git a/help/C/default-browser.page b/help/C/default-browser.page
index ea037d7bd2..0ca980275a 100644
--- a/help/C/default-browser.page
+++ b/help/C/default-browser.page
@@ -6,7 +6,7 @@
     
     <link type="guide" xref="index#common-other-problems" />
 
-    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <revision pkgversion="3.0.2" version="0.3" date="2011-09-29" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -23,5 +23,8 @@
 
 <p>You can set the system-wide default browser in GNOME 3 under <guiseq><gui>Activities</gui><gui>Applications</gui><gui>System Settings</gui><gui>System</gui><gui>System Info</gui><gui>Default Applications</gui></guiseq>.</p>
 <p>If the preferred browser is set as default application but still does not work correctly please contact your distribution via their forum or bug tracker.</p>
+
 <note><p>GNOME 3 users with a technical background can tweak these settings by defining scheme-handlers in <file>$HOME/.local/share/applications/mimeapps.list</file>.</p></note>
+
+<note><p>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>.</p></note>
 </page>
diff --git a/help/C/intro-first-run.page b/help/C/intro-first-run.page
index 2cc9d26f0f..e611ebde0c 100644
--- a/help/C/intro-first-run.page
+++ b/help/C/intro-first-run.page
@@ -29,12 +29,12 @@
 
 <section id="restore">
 <title>Restore from backup</title>
-<p>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.</p>
+<p>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.</p>
 </section>
 
 <section id="receiving">
 <title>Receiving Email</title>
-<p>First, choose the server type from the <gui>Server Type</gui> dropdown-list.</p>
+<p>First, choose the server type from the <gui>Server Type</gui> drop-down list.</p>
 <p>If you are unsure about the type of server to choose, ask your system administrator or Internet Service Provider.</p>
 
 
diff --git a/help/C/mail-access-gmail-imap-account.page b/help/C/mail-access-gmail-imap-account.page
index 810c598161..4dcc311176 100644
--- a/help/C/mail-access-gmail-imap-account.page
+++ b/help/C/mail-access-gmail-imap-account.page
@@ -2,7 +2,7 @@
       type="topic" id="email-access-gmail-imap-account">
 
   <info>
-    <desc>How to set up a GMail IMAP Account.</desc>
+    <desc>How to set up a Gmail IMAP Account.</desc>
     
     <link type="guide" xref="index#common-mail-problems" />
     <link type="guide" xref="google-services"/>
@@ -21,10 +21,10 @@
 
 <!-- Page only exists for the <note>, apart from that nothing special. -->
 
-<title>Access a GMail IMAP Account via Evolution</title>
+<title>Access a Gmail IMAP Account via Evolution</title>
 
 <p>Please refer to the <link xref="mail-account-manage-imap">IMAP mail account settings</link>.</p>
 
-<note><p>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.</p></note>
+<note><p>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.</p></note>
 </page>
 
diff --git a/help/C/mail-access-gmail-pop-account.page b/help/C/mail-access-gmail-pop-account.page
index c624502715..0bb1cfc3ca 100644
--- a/help/C/mail-access-gmail-pop-account.page
+++ b/help/C/mail-access-gmail-pop-account.page
@@ -2,7 +2,7 @@
       type="topic" id="email-access-gmail-pop-account">
 
   <info>
-    <desc>How to set up a GMail POP Account.</desc>
+    <desc>How to set up a Gmail POP Account.</desc>
     
     <link type="guide" xref="index#common-mail-problems" />
     <link type="guide" xref="google-services"/>
@@ -21,12 +21,12 @@
 
 
 
-<title>Access a GMail POP Account via Evolution</title>
+<title>Access a Gmail POP Account via Evolution</title>
 
-<p>Follow these steps to set up your GMail POP Account in Evolution:</p>
+<p>Follow these steps to set up your Gmail POP Account in Evolution:</p>
 
 <steps>
-<item><p>Log in to your gmail account.</p></item>
+<item><p>Log in to your Gmail account.</p></item>
 <item><p>Go to <guiseq><gui>Settings</gui><gui>Forwarding and POP/IMAP</gui></guiseq>. Refer to the POP Download section.</p></item>
 <item><p>Enable the POP download feature by ticking the radio button that corresponds to either of these options:</p>
     <list>
diff --git a/help/C/mail-displaying-character-encodings.page b/help/C/mail-displaying-character-encodings.page
index 56330b8f90..ca56374fea 100644
--- a/help/C/mail-displaying-character-encodings.page
+++ b/help/C/mail-displaying-character-encodings.page
@@ -22,6 +22,6 @@
 <!-- TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=655021 is fixed -->
 
 <p>If the email program of the sender is broken or misconfigured, plain text emails might not include information about the character encoding used. If you receive such messages, choose <guiseq><gui>View</gui><gui>Character Encoding</gui></guiseq> from the main menu and change the currently chosen character encoding to an appropriate one that might be the encoding used by the sender. You have to make this change every time you view the message.</p>
-<p>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>.</p>
+<p>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>.</p>
 
 </page>
diff --git a/help/C/mail-filters.page b/help/C/mail-filters.page
index a22768dca6..816627d7ac 100644
--- a/help/C/mail-filters.page
+++ b/help/C/mail-filters.page
@@ -24,7 +24,7 @@
 
 <p>Message filters apply actions on messages based on conditions that you have defined. You can define filters for both incoming and outgoing emails.</p>
 
-<p>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</gui><gui>Edit</gui><gui>Receiving Options</gui><gui>Options</gui><gui>Apply filters to new messages in Inbox on this server</gui></guiseq>.</p>
+<p>Filters will be automatically applied to incoming messages for local 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>.</p>
 
 <p>To manually apply filters on messages in a folder, select the messages and click <guiseq><gui>Message</gui><gui>Apply Filters</gui></guiseq> or press <keyseq><key>Ctrl</key><key>Y</key></keyseq>.</p>
 <p>You can select all messages in a folder by clicking <guiseq><gui>Edit</gui><gui>Select All</gui></guiseq> or pressing <keyseq><key>Ctrl</key><key>A</key></keyseq>.</p>
diff --git a/help/C/mail-imap-headers.page b/help/C/mail-imap-headers.page
index fd6316bb36..2ab0d39383 100644
--- a/help/C/mail-imap-headers.page
+++ b/help/C/mail-imap-headers.page
@@ -30,7 +30,7 @@
 <list>
 <item><p>Fetch All Headers:</p><p>All available IMAP mail headers for all the messages will be downloaded.</p></item>
 <item><p>Basic Headers (Fastest):</p><p>This will include Date, From, To, CC, Subject, Preferences, In-Reply-To, Message-ID, Mime-Version, and Content-Type. If you want to just fetch and see messages without having to categorically filter messages based on your mailing lists, choose this option. This will make Evolution work faster and is generally recommended for common users.</p></item>
-<item><p>Basic and Mailing List Headers (Default):</p><p>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.</p><p>This is the default Header preference that comes with Evolution. When this option is chosen, Evolution will download a basic set of headers (as described above) along with a set of headers that are needed for client-side filters based on mailing lists. If you do not have any filters on Evolution, it is recommended to switch to the <gui>Basic Headers</gui> option.</p></item>
+<item><p>Basic and Mailing List Headers (Default):</p><p>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 information such as the mailinglist-ID, owner of the mailing list, and so on with which you can create mailing list filters.</p><p>This is the default Header preference that comes with Evolution. When this option is chosen, Evolution will download a basic set of headers (as described above) along with a set of headers that are needed for client-side filters based on mailing lists. If you do not have any filters on Evolution, it is recommended to switch to the <gui>Basic Headers</gui> option.</p></item>
 </list>
 
 <p>To set the IMAP Mail headers:</p>
diff --git a/help/C/mail-received-notification.page b/help/C/mail-received-notification.page
index 7c079719bd..b94aeb2f3f 100644
--- a/help/C/mail-received-notification.page
+++ b/help/C/mail-received-notification.page
@@ -6,7 +6,7 @@
 
     <link type="guide" xref="mail-send-and-receive" />
 
-    <revision pkgversion="3.0.2" version="0.3" date="2011-08-22" status="final"/>
+    <revision pkgversion="3.0.2" version="0.4" date="2011-09-29" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -19,13 +19,13 @@
 
 <title>Getting notified of new mail</title>
 
-<p>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">switcher</link>.</p>
+<p>Evolution always notifies you of new messages by adding a yellow star to the mailer icon in the window <link xref="change-switcher-appearance">switcher</link>.</p>
 <!-- Translators: Please make sure that the screenshot does have the small yellow star in the Mail icon -->
 <media type="image" src="./figures/new-mail-switcher.png" width="256">
   <p>Switcher layout when a new message has arrived</p>
 </media>
 
-<p>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.</p>
+<p>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.</p>
 <media type="image" src="./figures/new-mail-notification.png" width="512">
   <p>Switcher layout when a new message has arrived</p>
 </media>
diff --git a/help/C/mail-send-and-receive-manual.page b/help/C/mail-send-and-receive-manual.page
index a5daf49048..4893ace50b 100644
--- a/help/C/mail-send-and-receive-manual.page
+++ b/help/C/mail-send-and-receive-manual.page
@@ -6,7 +6,7 @@
 
     <link type="guide" xref="mail-send-and-receive" />
 
-    <revision pkgversion="3.0.2" version="0.3" date="2011-08-05" status="final"/>
+    <revision pkgversion="3.0.2" version="0.4" date="2011-09-29" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -17,8 +17,8 @@
 
   </info>
 
-<title>Manually send and receive message</title>
-<p>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.</p>
+<title>Manually send and receive messages</title>
+<p>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.</p>
 <p>To send and receive only for one of your mail accounts, or to only send or only receive, click the small down-arrow next to the <gui style="button">Send / Receive</gui> button and choose the corresponding option.</p>
 <p>If you just want to send messages which are in your Outbox, you can right-click on the Outbox and click <gui>Flush Outbox</gui>.</p>
 
diff --git a/help/C/mail-working-offline.page b/help/C/mail-working-offline.page
index df21f876b4..cd94b3fbf8 100644
--- a/help/C/mail-working-offline.page
+++ b/help/C/mail-working-offline.page
@@ -43,7 +43,7 @@
 
 <section id="network-manager-integration">
 <title>Automatic Network State Handling</title>
-<p>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.</p>
+<p>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 to enable this feature.</p>
 </section>
 
 </page>
diff --git a/help/C/minimize-to-system-tray.page b/help/C/minimize-to-system-tray.page
index f8ec4be7e5..28e7d8d4b8 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 not possible in GNOME 3 anymore.</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/C/problems-reporting-bugs.page b/help/C/problems-reporting-bugs.page
index cfc14ca5bb..677dfc882b 100644
--- a/help/C/problems-reporting-bugs.page
+++ b/help/C/problems-reporting-bugs.page
@@ -20,8 +20,8 @@
 
   <title>How to report bugs</title>
 
-<p>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://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">bug writing guidelines</link> first.</p><p>Also note that GNOME distributions sometimes introduce their own changes in Evolution that are not included in GNOME Evolution. This is hard to recognize for users but if you are aware of it please file a bug report in <link xref="https://live.gnome.org/Bugsquad/TriageGuide/NonGnome#Bug_trackers_for_distributions">the bug tracker of your GNOME distribution</link> instead.</p>
+<p>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://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">bug writing guidelines</link> first.</p><p>Also note that GNOME distributions sometimes introduce their own changes in Evolution that are not included in GNOME Evolution. This is hard to recognize for users but if you are aware of it please file a bug report in <link xref="https://live.gnome.org/Bugsquad/TriageGuide/NonGnome#Bug_trackers_for_distributions">the bug tracker of your GNOME distribution</link> instead.</p>
 
-<p>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.</p>
+<p>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>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.</p>
 
 </page>
diff --git a/help/C/tasks-caldav.page b/help/C/tasks-caldav.page
index b81f119b5b..6a248d58dd 100644
--- a/help/C/tasks-caldav.page
+++ b/help/C/tasks-caldav.page
@@ -25,7 +25,7 @@
 <item><p>Select the type <gui>On the Web</gui>.</p></item>
 <item><p>Enter a name that you prefer.</p></item>
 <item><p>Optionally choose a color that you prefer.</p></item>
-<item><p>Choose if you want to be able to view the content also when being offline.</p></item>
+<item><p>Choose if you want to be able to view the content also while offline.</p></item>
 <item><p>Enter the address of the list in the <gui>URL</gui> field.</p></item>
 <item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
 <item><p>Enter your username and your email address.</p></item>
diff --git a/help/C/tasks-using-several-tasklists.page b/help/C/tasks-using-several-tasklists.page
index cf4257f4cb..aa94841f9c 100644
--- a/help/C/tasks-using-several-tasklists.page
+++ b/help/C/tasks-using-several-tasklists.page
@@ -19,7 +19,7 @@
 
 <title>Using several task lists or memo lists</title>
 
-<p>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 show and hide the corresponding tasks or memos in your view.</p>
+<p>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 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.</p>
 
 <p>Tasks and memos from each task or memo list appear as different colors.</p>
 
diff --git a/help/C/tasks-webdav.page b/help/C/tasks-webdav.page
index 2ca4cb25bc..56ab201f10 100644
--- a/help/C/tasks-webdav.page
+++ b/help/C/tasks-webdav.page
@@ -27,7 +27,7 @@
 <item><p>Select the type <gui>On the Web</gui>.</p></item>
 <item><p>Enter a name that you prefer.</p></item>
 <item><p>Optionally choose a color that you prefer.</p></item>
-<item><p>Choose if you want to be able to view the content also when being offline.</p></item>
+<item><p>Choose if you want to be able to view the content also while offline.</p></item>
 <item><p>Enter the address of the list in the <gui>URL</gui> field.</p></item>
 <item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
 <item><p>Enter your username.</p></item>
diff --git a/help/Makefile.am b/help/Makefile.am
index 584ce50980..ceeb9766bc 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -50,11 +50,13 @@ DOC_PAGES = \
 	calendar-using-several-calendars.page \
 	calendar-weather.page \
 	calendar-webdav.page \
+	change-keyboard-shortcuts.page \
 	change-switcher-appearance.page \
 	contacts-add-automatically.page \
 	contacts-autocompletion.page \
 	contacts-google.page \
 	contacts-ldap.page \
+	contacts-libreoffice.page \
 	contacts-local.page \
 	contacts-organizing.page \
 	contacts-searching.page \
@@ -149,9 +151,6 @@ DOC_PAGES = \
 	mail-encryption.page \
 	mail-encryption-s-mime-manage.page \
 	mail-encryption-s-mime-signing-encrypting.page \
-	mail-error-failed-to-append-to-sent-folder.page \
-	mail-error-folder-mismatch.page \
-	mail-error-no-provider-available.page \
 	mail-filters-actions.page \
 	mail-filters-conditions.page \
 	mail-filters-not-working.page \
@@ -169,6 +168,7 @@ DOC_PAGES = \
 	mail-read-receipts.page \
 	mail-received-notification.page \
 	mail-receiving-options-evolution-exchange.page \
+	mail-receiving-options-exchange-ews.page \
 	mail-receiving-options-exchange-mapi.page \
 	mail-receiving-options-imap.page \
 	mail-receiving-options-imap-plus.page \
diff --git a/help/es/es.po b/help/es/es.po
index bbacbbeb92..b7c591a96b 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -1,15 +1,16 @@
 # translation of evolution-help.master.po to Español

 # translation of evolution manual to spanish

 # 

-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011.
# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2009, 2010, 2011.
-# Jorge González <jorgegonz@svn.gnome.org>, 2011.
+# 

+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011.
Jorge González <jorgegonz@svn.gnome.org>, 2007, 2009, 2010, 2011.
+# Jorge González <jorgegonz@svn.gnome.org>, 2011.
, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-help.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-18 19:18+0000\n"
-"PO-Revision-Date: 2011-09-24 15:03+0200\n"
+"POT-Creation-Date: 2011-09-28 01:15+0000\n"
+"PO-Revision-Date: 2011-09-28 15:55+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"
@@ -1382,7 +1383,6 @@ msgid "Enabling Synchronization"
 msgstr "Activar la sincronización"
 
 #: C/sync-with-other-devices.page:38(p)
-#, fuzzy
 msgid ""
 "If you have not used a handheld device with your computer before, you need "
 "to configure it via <guiseq><gui>Edit</gui><gui>GNOME Pilot "
@@ -1395,16 +1395,16 @@ msgid ""
 "<file>ttyUSB0</file> and <file>ttyUSB1</file>. The second node is the one to "
 "be used in configuring the device."
 msgstr ""
-"Si nunca antes utilizó un dispositivo de mano junto con su equipo, ejecute "
-"la herramienta Centro de control de GNOME pulsando Sistema &gt; Preferencias "
-"y asegúrese de que la configuración de Pilot Link es correcta. Deberá "
-"asegurarse de que dispone de permisos de lectura y escritura sobre el "
-"dispositivo, habitualmente n /dev/pilot. Si esto no funciona, compruebe /dev/"
-"ttyS0 si tiene una conexión serie o /dev/ttyUSB1 en el caso de una conexión "
-"USB. Para ello, inicie una sesión root y añada su nombre de usuario al grupo "
-"que es propietario de este nodo de dispositivo. Para un dispositivo USB se "
-"crean dos nodos de dispositivo, ttyUSB0 y ttyUSB1. El segundo nodo es el que "
-"se debe usar al configurar el dispositivo."
+"Si nunca antes usó un dispositivo de mano en su equipo debe configurarlo a "
+"través de <guiseq><gui>Editar</gui><gui>Sincronización de GNOME Pilot...</"
+"gui></guiseq>. Deberá asegurarse de que dispone de permisos de lectura y "
+"escritura sobre el dispositivo, habitualmente en <file>/dev/pilot</file>. Si "
+"esto no funciona, compruebe <file>/dev/ttyS0</file> si tiene una conexión "
+"serie o <file>/dev/ttyUSB1</file> en el caso de una conexión USB. Para ello, "
+"inicie una sesión root y añada su nombre de usuario al grupo que es "
+"propietario de este nodo de dispositivo. Para un dispositivo USB se crean "
+"dos nodos de dispositivo, <file>ttyUSB0</file> y <file>ttyUSB1</file>. El "
+"segundo nodo es el que se debe usar al configurar el dispositivo."
 
 #: C/sync-with-other-devices.page:41(title)
 msgid "Selecting Conduits"
@@ -1582,6 +1582,13 @@ msgid ""
 "gnome.org/page.cgi?id=bug-writing.html\">Bug Writing Guidelines</link> for "
 "more information."
 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 "
+"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>."
 
 #: C/problems-getting-help.page:5(desc)
 msgid "How to get help for problems."
@@ -1850,6 +1857,7 @@ msgstr ""
 #: C/memos-usage-add-memo.page:41(p)
 msgid "To send a Shared Memo,"
 msgstr "Para enviar una nota compartida,"
+<<<<<<< HEAD
 
 #: C/memos-usage-add-memo.page:43(p)
 msgid ""
@@ -4283,15 +4291,2239 @@ msgid ""
 "message list. You can also use the right square bracket (<key>]</key>) for "
 "the next unread message, and the left square bracket (<key>[</key>) for the "
 "previous unread message."
+=======
+
+#: C/memos-usage-add-memo.page:43(p)
+msgid ""
+"Click <guiseq><gui>File</gui><gui>New</gui><gui>Shared Memo</gui></guiseq>, "
+"or press <keyseq><key>Shift</key><key>Ctrl</key><key>H</key></keyseq>."
+msgstr ""
+"Pulse <guiseq><gui>Archivo</gui><gui>Nuevo</gui><gui>Nota compartida</gui></"
+"guiseq>, o pulse <keyseq><key>Mayús</key><key>Ctrl</key><key>H</key></"
+"keyseq>."
+
+#: C/memos-usage-add-memo.page:44(p)
+msgid ""
+"Select the Organizer's account name from the drop-down list given next to "
+"the Organizer field."
+msgstr ""
+"Seleccione el nombre de la cuenta del Organizador de la lista desplegable "
+"proporcionada junto al campo Organizador."
+
+#: C/memos-usage-add-memo.page:45(p)
+msgid ""
+"In the To field, type a username, then press Enter. Repeat this for "
+"additional users."
+msgstr ""
+"En el campo Para escriba un nombre de usuario, después pulse Intro. Repita "
+"la operación para añadir usuarios adicionales."
+
+#: C/memos-usage-add-memo.page:46(p)
+msgid ""
+"Select the task list (under <gui>List</gui>) in which you would like to "
+"create the entry."
+msgstr ""
+"Seleccione la lista de tareas (bajo <gui>Lista</gui>) en la que quiere crear "
+"la entrada."
+
+#: C/memos-usage-add-memo.page:47(p)
+msgid "Enter a brief summary in the Summary field."
+msgstr "Escriba un breve resumen para la tarea en el campo Resumen."
+
+#: C/memos-usage-add-memo.page:48(p)
+msgid ""
+"In the Start Date field, type the date this shared memo should appear in the "
+"recipients' calendars."
+msgstr ""
+"En el campo Fecha de inicio escriba la fecha en la que esta nota compartida "
+"debería aparecer en los calendarios de los destinatarios."
+
+#: C/memos-searching.page:5(desc)
+msgid "Searching memos."
+msgstr "Buscar notas."
+
+#: C/memos-searching.page:28(title)
+msgid "Searching Memos"
+msgstr "Buscar notas"
+
+#: C/memos-searching.page:31(p)
+msgid ""
+"In the Memos view, you can quickly search for memos either by summary or by "
+"category."
+msgstr ""
+"En la vista de Notas puede buscar rápidamente sus notas tanto por resumen o "
+"por categoría."
+
+#: C/mail-wrong-fonts-in-3-0.page:5(desc)
+msgid "A known problem that is fixed in newer versions."
+msgstr "Un problema conocido solucionado en versiones más actuales."
+
+#: C/mail-wrong-fonts-in-3-0.page:21(title)
+msgid "Message fonts are not the same fonts as in other applications"
+msgstr "La tipografía de las notas no es la misma que en otras aplicaciones"
+
+#: C/mail-wrong-fonts-in-3-0.page:23(p)
+msgid ""
+"In version 3.0 it can happen that <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Mail Preferences</gui><gui>General</gui><gui>Message Fonts</"
+"gui><gui>Use the same fonts as other applications</gui></guiseq> is enabled "
+"but Evolution still uses different fonts than other parts of the system."
+msgstr ""
+"En la versión 3.0 puede suceder que <guiseq><gui>Editar</"
+"gui><gui>Preferencias</gui><gui>Opciones de correo</gui><gui>General</"
+"gui><gui>Tipografías del mensaje</gui><gui>Usar las mismas tipografías que "
+"en otras aplicaciones</gui></guiseq> esté activada pero aún así Evolution "
+"use diferentes tipografías que otras partes del sistema."
+
+#: C/mail-wrong-fonts-in-3-0.page:25(p)
+msgid ""
+"This bug is fixed from Evolution version 3.0.3 (stable series) and 3.1.4 "
+"(unstable development series) onwards. If this is not the case, please add a "
+"comment to the corresponding <link href=\"https://bugzilla.gnome.org/"
+"show_bug.cgi?id=655002\">bug report</link>. Note that from version 3.2 "
+"onwards this setting is located under <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</"
+"gui><gui>Message Display</gui><gui>Use the same fonts as other applications</"
+"gui></guiseq>."
+msgstr ""
+"Este error está solucionado desde la versión 3.0.3 de Evolution (series "
+"estables) y desde la 3.1.4 (series de desarrollo inestables) en adelante. Si "
+"no es el caso, añada un comentario al correspondiente <link href=\"https://"
+"bugzilla.gnome.org/show_bug.cgi?id=655002\">informe de error</link> Note que "
+"desde la versión 3.2 y siguientes este ajuste se encuentra bajo "
+"<guiseq><gui>Editar</gui><gui>Preferencias</gui><gui>Opciones de correo</"
+"gui><gui>General</gui><gui>Mostrado de mensajes</gui><gui>Usar las mismas "
+"tipografías que en otras aplicaciones</gui></guiseq>."
+
+#: C/mail-working-offline.page:5(desc)
+msgid "Work with your mail while not being connected to the network."
+msgstr "Trabajar con su correo mientras no está conectado a la red."
+
+#: C/mail-working-offline.page:23(title)
+msgid "Working Offline"
+msgstr "Trabar desconectado"
+
+#: C/mail-working-offline.page:25(p)
+msgid ""
+"Offline mode helps you communicate with remote mail storage systems like "
+"GroupWise, IMAP or Exchange, in situations where you are not connected to "
+"the network at all times. Evolution keeps a local copy of one or more "
+"folders to allow you to compose messages, storing them in your Outbox to be "
+"sent the next time you connect."
+msgstr ""
+"El modo desconectado le ayuda a comunicarse con sistemas de almacenamiento "
+"de correo remoto tales como GroupWise, IMAP o Exchange en situaciones en las "
+"que no podrá estar siempre conectado a la red local. Evolution guarda copia "
+"de una o más carpetas y le permite crear nuevos mensajes, guardarlos en la "
+"Bandeja de salida y enviarlo en cuanto vuelva a conectarse."
+
+#: C/mail-working-offline.page:27(p)
+msgid ""
+"POP mail downloads all messages to your local system, but other connections "
+"usually download just the headers, and get the rest only when you want to "
+"read the message. Before you go offline, Evolution downloads the unread "
+"messages from the folders you have chosen to store."
+msgstr ""
+"El correo POP descarga todos sus mensajes al sistema local, pero normalmente "
+"otras conexiones sólo descargan las cabeceras y obtienen el resto solamente "
+"cuando quiere leer el mensaje entero. Antes de desconectar, Evolution "
+"descargará todos los mensajes sin leer desde las carpetas que haya elegido "
+"almacenar."
+
+#: C/mail-working-offline.page:30(title)
+msgid "Marking folders for offline usage"
+msgstr "Marcar carpetas para su uso desconectado"
+
+#: C/mail-working-offline.page:31(p)
+msgid "To mark a mail folder for offline use,"
+msgstr "Para marcar una carpeta de correo para su uso desconectado,"
+
+#: C/mail-working-offline.page:33(p)
+msgid "Right-click the folder, then click <gui>Properties</gui>."
+msgstr ""
+"Pulse con el botón derecho del ratón sobre la carpeta, después pulse "
+"<gui>Propiedades</gui>."
+
+#: C/mail-working-offline.page:34(p)
+msgid "Click <gui>Copy folder content locally for offline operation</gui>."
+msgstr ""
+"Pulse <gui>Copiar el contenido de la carpeta localmente para operar "
+"desconectado</gui>."
+
+#: C/mail-working-offline.page:39(title)
+msgid "Syncing messages for offline usage"
+msgstr "Sincronizar mensajes para su uso desconectado"
+
+#: C/mail-working-offline.page:40(p)
+msgid ""
+"Your connection status is shown by the small icon in the lower left corner "
+"of the Evolution main window. When you are online, it displays two connected "
+"cables. When you go offline via clicking the icon or via <guiseq><gui>File</"
+"gui><gui>Work Offline</gui></guiseq>, the cables separate. You will be asked "
+"whether you want to go offline immediately or synchronize folders locally "
+"before you go offline."
+msgstr ""
+"El estado de la conexión lo muestra un icono en la esquina inferior "
+"izquierda de la ventana principal de Evolution. Cuando está conectado "
+"mostrará dos cables enchufados. Cuando esté desconectado los cables estarán "
+"desenchufados. Al desconectarse a través del icono o a través de "
+"<guiseq><gui>Archivo</gui><gui>Trabajar desconectado</gui></guiseq> los "
+"cables se separan. Se le preguntará si quiere desconectarse inmediatamente o "
+"sincronizar sus carpetas localmente antes de desconectarse."
+
+#: C/mail-working-offline.page:41(p)
+msgid ""
+"To download Messages for Offline Operations without immediately going "
+"offline, select <guiseq><gui>File</gui><gui>Download Messages for Offline "
+"Usage</gui></guiseq>."
+msgstr ""
+"Para descargar los mensajes para operaciones en modo desconectado, "
+"seleccione <guiseq><gui>Archivo</gui><gui>Descargar mensajes para trabajar "
+"sin conexión</gui></guiseq>."
+
+#: C/mail-working-offline.page:45(title)
+msgid "Automatic Network State Handling"
+msgstr "Gestión automática del estado de la red"
+
+#: C/mail-working-offline.page:46(p)
+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."
+msgstr ""
+"Evolution entiende automáticamente el estado de la red y actúa en "
+"concordancia. Por ejemplo, Evolution cambia a modo desconectado cuando la "
+"red se cae y cambia automáticamente cuando la red se recupera. Para activar "
+"esta característica, asegúrese de que su sistema tiene instalado Network "
+"Manager."
+
+#: C/mail-word-wrap.page:5(desc)
+msgid "Words are wrapped in outgoing mails at 72 characters."
+msgstr "Las palabras se ajustan en correos salientes a 72 caracteres."
+
+#: C/mail-word-wrap.page:20(title)
+msgid "Words are wrapped in outgoing mails at 72 characters"
+msgstr "Las palabras se ajustan en correos salientes a 72 caracteres"
+
+#: C/mail-word-wrap.page:22(p)
+msgid ""
+"For better readability lines are wrapped after 72 characters. This value is "
+"hardcoded and cannot be changed."
+msgstr ""
+"Las líneas se ajustan a 72 caracteres para una mejor lectura. Este valor "
+"está incrustado y no se puede cambiar."
+
+#: C/mail-word-wrap.page:23(p)
+msgid ""
+"To avoid line breaks within a paragraph, mark the paragraph and choose "
+"<guiseq><gui>Format</gui><gui>Paragraph Style</gui><gui>Preformatted</gui></"
+"guiseq> in the mail composer."
+msgstr ""
+"Para evitar los saltos de línea en un párrafo, marque el párrafo y elija "
+"<guiseq><gui>Formato</gui><gui>Estilo de párrafo</gui><gui>Preformateado</"
+"gui></guiseq> en el editor de correos."
+
+#: C/mail-vertical-view.page:5(desc)
+msgid "Changing the mail view for widescreen displays."
+msgstr "Cambiar la vista de correo para pantallas anchas."
+
+#: C/mail-vertical-view.page:22(title)
+msgid "Vertical view"
+msgstr "Vista vertical"
+
+#: C/mail-vertical-view.page:24(p)
+msgid ""
+"Evolution provides a vertical view in addition to the classical view. In the "
+"vertical view, the message preview pane is located at the right side of the "
+"message list when compared to the classical view where the message preview "
+"pane is placed below the message list. Vertical view enables you to use the "
+"extra width of wide screen monitors."
+msgstr ""
+"Evolution proporciona una vista vertical además de la vista clásica. En la "
+"vista vertical, el panel de vista previa se encuentra situado en el lado "
+"derecho del panel de mensajes en comparación con la vista clásica, donde el "
+"panel de vista previa de mensajes se encuentra bajo la lista de mensajes. La "
+"vista vertical le permite usar la anchura adicional en los monitores de "
+"pantalla panorámica."
+
+#: C/mail-vertical-view.page:26(p)
+msgid ""
+"To switch to vertical view, click <guiseq><gui>View</gui><gui>Preview</"
+"gui><gui>Vertical View</gui></guiseq>."
+msgstr ""
+"Para cambiar a la vista vertical, pulse <guiseq><gui>Ver</gui><gui>Vista "
+"previa</gui><gui>Vista vertical</gui></guiseq>."
+
+#: C/mail-vertical-view.page:28(p)
+msgid ""
+"In vertical view, the message list contains double lines of compressed "
+"headers, which enables you to consume the extra width in the preview column. "
+"The compressed columns have Sender Name and Email, Attachment Icon, Date and "
+"Subject in the second line."
+msgstr ""
+"En la vista vertical, la lista de mensajes predeterminada contiene una línea "
+"doble de cabeceras comprimida, que le permite consumir la anchura extra en "
+"la columna de vista previa. Las columnas comprimidas tienen el nombre y el "
+"correo electrónico del remitente, el icono de adjuntos, la fecha y el asunto "
+"en la segunda línea."
+
+#: C/mail-vertical-view.page:30(p)
+msgid ""
+"To switch back to classical view, click <guiseq><gui>View</gui><gui>Preview</"
+"gui><gui>Classical View</gui></guiseq>."
+msgstr ""
+"Para cambiar a la vista clásica, pulse <guiseq><gui>Ver</gui><gui>Vista "
+"previa</gui><gui>Vista clásica</gui></guiseq>."
+
+#: C/mail-usenet-subscriptions.page:5(desc)
+msgid "Subscribing to Usenet newsgroups."
+msgstr "Suscribirse a grupos de noticias Usenet."
+
+#: C/mail-usenet-subscriptions.page:25(title)
+msgid "Newsgroups Subscriptions"
+msgstr "Suscripciones a grupos de noticias"
+
+#: C/mail-usenet-subscriptions.page:27(p)
+msgid ""
+"When you create a newsgroup account, you are not subscribed to any groups. "
+"To subscribe to a newsgroup:"
+msgstr ""
+"Cuando crea una cuenta de grupo de noticias, no está suscrito a ningún "
+"grupo. Para suscribirse a un grupo de noticias:"
+
+#: C/mail-usenet-subscriptions.page:29(p)
+msgid "Select <guiseq><gui>Folder</gui><gui>Subscriptions</gui></guiseq>."
+msgstr ""
+"Seleccione <guiseq><gui>Carpeta</gui><gui>Suscripciones</gui></guiseq>."
+
+#: C/mail-usenet-subscriptions.page:30(p) C/mail-imap-subscriptions.page:31(p)
+msgid ""
+"If you have accounts on multiple servers, select the server where you want "
+"to manage your subscriptions."
+msgstr ""
+"Si tiene cuentas en varios servidores, seleccione el servidor donde quiere "
+"gestionar sus suscripciones."
+
+#: C/mail-usenet-subscriptions.page:31(p)
+msgid "Click a group's checkbox to add a folder to your subscriptions."
+msgstr ""
+"Pulse sobre la correspondiente casilla de verificación para añadir una "
+"carpeta a sus suscripciones."
+
+#: C/mail-two-trash-folders.page:5(desc)
+msgid ""
+"An explanation for the problem that two trash folders are present in "
+"Evolution."
+msgstr ""
+"Una explicación para el problema de las dos carpetas de Papelera presentes "
+"en Evolution."
+
+#: C/mail-two-trash-folders.page:20(title)
+msgid "Two Trash folders shown for the same account"
+msgstr "Dos carpetas de Papelera mostradas para la misma cuenta"
+
+#: C/mail-two-trash-folders.page:22(p)
+msgid ""
+"You may have created another Trash folder to hold all your deleted email "
+"messages. This can happen when you use another email client together with "
+"Evolution."
+msgstr ""
+"Puede haber creado otra carpeta de Papelera para dejar allí todos sus "
+"correos electrónicos eliminados. Esto puede suceder cuando usa otro cliente "
+"de correo electrónico junto con Evolution."
+
+#: C/mail-two-trash-folders.page:24(p)
+msgid ""
+"Evolution's <gui>Trash</gui> folder is a <link xref=\"mail-search-folders"
+"\">Search folder</link>. It does not really exist but simply displays all "
+"the messages that are marked for deletion in any folders of that account."
+msgstr ""
+"La carpeta de <gui>Papelera</gui> de Evolution es una <link xref=\"mail-"
+"search-folders\">Carpeta de búsqueda</link>. Realmente no existe pero "
+"muestra todos los mensajes marcados para su eliminación en cualquier carpeta "
+"de la cuenta."
+
+#: C/mail-two-trash-folders.page:26(p)
+msgid ""
+"You can easily tell the two Trash folders apart by looking at their icons. "
+"The Evolution <gui>Trash</gui> folder has a special icon whereas the other "
+"physical Trash folder looks like any other folder."
+msgstr ""
+"Puede comparar las dos carpetas de Papelera mirando los iconos. La carpeta "
+"de <gui>Papelera</gui> de Evolution tiene un icono especial mientras que la "
+"otra carpeta física de Papelera es igual a cualquier otra carpeta."
+
+#: C/mail-two-trash-folders.page:29(p)
+msgid ""
+"Note that the <gui>Junk</gui> folder is also a search folder and may also "
+"appear twice."
+msgstr ""
+"Tenga en cuenta que la carpeta <gui>SPAM</gui> es una carpeta de búsqueda y "
+"también puede aparecer dos veces."
+
+#: C/mail-spam-settings.page:5(desc)
+msgid "How to set up handling unwanted junk/spam mail."
+msgstr "Cómo configurar la gestión de correo no deseado y SPAM."
+
+#: C/mail-spam-settings.page:28(title)
+msgid "Junk Mail Settings"
+msgstr "Configuración de SPAM"
+
+#: C/mail-spam-settings.page:30(p)
+msgid ""
+"Evolution lets you check for unwanted junk or spam emails by using the "
+"Bogofilter or SpamAssassin tools. To use these tools, you need to make sure "
+"that they are installed via the software management tool of your "
+"distribution and you need enable their respective plugins."
+msgstr ""
+"Evolution le permite comprobar si hay mensajes SPAM usando las herramientas "
+"Bogofilter o SpamAssasin. Para usar estas herramientas debe asegurarse de "
+"que están instaladas a través de la herramienta de gestión de software de su "
+"distribución y necesita tener instalados sus correspondientes complementos."
+
+#: C/mail-spam-settings.page:31(link)
+msgid "Install bogofilter now."
+msgstr "Instalar «bogofilter» ahora."
+
+#: C/mail-spam-settings.page:32(link)
+msgid "Install spamassassin now."
+msgstr "Instalar «spamassassin» ahora."
+
+#: C/mail-spam-settings.page:34(p)
+msgid "To enable the plugins:"
+msgstr "Para activar los complementos:"
+
+#: C/mail-spam-settings.page:36(p)
+msgid "Click <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>."
+msgstr "Pulse <guiseq><gui>Editar</gui><gui>Complementos</gui></guiseq>."
+
+#: C/mail-spam-settings.page:37(p)
+msgid ""
+"Select the plugins you wish to enable. You can select either Bogofilter or "
+"SpamAssassin, or both."
+msgstr ""
+"Seleccione los complementos que quiere activar. Puede seleccionar tanto "
+"Bogofilter como SpamAssasin, o puede seleccionar los dos."
+
+#: C/mail-spam-settings.page:38(p) C/mail-composer-html-table.page:29(p)
+#: C/mail-composer-html-rule.page:28(p) C/mail-composer-html-link.page:29(p)
+msgid "Click <gui>Close</gui>."
+msgstr "Pulse <gui>Cerrar</gui>."
+
+#: C/mail-spam-settings.page:41(p)
+msgid ""
+"The junk mail options discussed in this page refer only to POP and Local "
+"Delivery. For handling junk mails on IMAP, see the Evolution settings under "
+"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui "
+"style=\"button\">Edit</gui><gui>Receiving Options</gui></guiseq>."
+msgstr ""
+"Las opciones de SPAM comentadas en esta página sólo se refieren al correo "
+"POP y Entrega local. Para gestionar correos SPAM en cuentas IMAP consulte la "
+"configuración de Evolution en <guiseq><gui>Editar</gui><gui>Preferencias</"
+"gui><gui>Cuentas de correo</gui><gui style=\"button\">Editar</"
+"gui><gui>Opciones de recepción</gui></guiseq>."
+
+#: C/mail-spam-settings.page:44(title)
+msgid "Junk Mail Preferences"
+msgstr "Opciones de correo spam"
+
+#: C/mail-spam-settings.page:45(p)
+msgid ""
+"You can modify how Evolution handles junk mail by changing the Junk Mail "
+"Preferences:"
+msgstr ""
+"Puede modificar cómo Evolution gestiona el SPAM cambiando las Opciones de "
+"SPAM:"
+
+#: C/mail-spam-settings.page:47(p)
+msgid ""
+"Click <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> or press "
+"<keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>."
+msgstr ""
+"Pulse <guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq> o pulse "
+"<keyseq><key>Mayús</key><key>Ctrl</key><key>S</key></keyseq>."
+
+#: C/mail-spam-settings.page:48(p)
+msgid "Select <gui>Mail Preferences</gui>."
+msgstr "Seleccione <gui>Opciones de correo</gui>."
+
+#: C/mail-spam-settings.page:49(p)
+msgid "Click on the <gui>Junk</gui> tab. Here, you can specify the following:"
+msgstr ""
+"Pulse en la pestaña <gui>SPAM</gui>. Aquí podrá especificar lo siguiente:"
+
+#: C/mail-spam-settings.page:51(p)
+msgid "Checking incoming mail for junk messages."
+msgstr "Comprobar si el correo entrante es SPAM."
+
+#: C/mail-spam-settings.page:52(p)
+msgid ""
+"Deleting junk messages upon exit, and how often junk messages are to be "
+"deleted."
+msgstr ""
+"Eliminar correo basura al salir y con qué frecuencia se eliminan los correos "
+"basura."
+
+#: C/mail-spam-settings.page:53(p)
+msgid "Checking custom headers for junk."
+msgstr "Comprobar las cabeceras personalizadas contra SPAM."
+
+#: C/mail-spam-settings.page:54(p)
+msgid "Marking messages as not junk if the sender is in the address book."
+msgstr ""
+"Marcar mensajes como no SPAM si el remitente está en la libreta de "
+"direcciones."
+
+#: C/mail-spam-settings.page:55(p)
+msgid "The default junk filter."
+msgstr "El filtro predeterminado para SPAM."
+
+#: C/mail-spam-settings.page:56(p)
+msgid ""
+"Bogofilter and SpamAssassin options. These options are available only if the "
+"plugins are enabled."
+msgstr ""
+"Opciones de Bogofilter y SpamAssassin. Estas opciones están disponibles solo "
+"si los complementos están activados."
+
+#: C/mail-spam.page:5(desc)
+msgid "How to automatically handle unwanted mail."
+msgstr "Cómo automatizar la gestión de correo no deseado."
+
+#: C/mail-spam.page:20(title)
+msgid "Junk and Spam Mail Handling"
+msgstr "Gestión de correo basura"
+
+#: C/mail-spam.page:23(title)
+msgid "Novell Groupwise specific differences"
+msgstr "Diferencias específicas de Novell Groupwise"
+
+#: C/mail-spam-marking.page:5(desc)
+msgid "How to mark unwanted junk and spam mail."
+msgstr "Cómo marcar el correo no deseado y SPAM."
+
+#: C/mail-spam-marking.page:15(name)
+#: C/mail-receiving-options-pop.page:15(name)
+#: C/contacts-add-automatically.page:15(name)
+msgid "Barbara Tobias"
+msgstr "Barbara Tobias"
+
+#: C/mail-spam-marking.page:16(email)
+#: C/mail-receiving-options-pop.page:16(email)
+#: C/intro-main-window.page:18(email)
+#: C/contacts-add-automatically.page:16(email)
+msgid "barbtobias09@gmail.com"
+msgstr "barbtobias09@gmail.com"
+
+#: C/mail-spam-marking.page:27(title)
+msgid "Marking Junk Mail"
+msgstr "Marcar correo como SPAM"
+
+#: C/mail-spam-marking.page:28(p)
+msgid ""
+"Evolution can check for junk mail for you. Evolution uses SpamAssassin and/"
+"or Bogofilter with trainable Bayesian filters to perform the spam check. "
+"When the software detects mail that appears to be junk mail, it will flag it "
+"and hide it from your view. Messages that are flagged as junk mail are "
+"displayed only in the Junk folder."
+msgstr ""
+"Evolution comprueba el correo basura. Evolution usa SpamAssasin y/o "
+"Bogofilter con filtros Bayesianos entrenables para realizar la comprobación "
+"de SPAM. Cuando el software detecta correo que parece ser correo basura, lo "
+"marcará y ocultará de su vista. Los mensajes marcados como correo basura "
+"sólo se muestran en la carpeta SPAM."
+
+#: C/mail-spam-marking.page:29(p)
+msgid ""
+"The junk mail filter can learn which kinds of mail are legitimate and which "
+"are not if you train it by marking as junk incoming mail that you determine "
+"is spam. When you first start using junk mail blocking, check the Junk "
+"folder frequently to be sure that legitimate mail doesn't get flagged as "
+"junk mail."
+msgstr ""
+"El filtro de correo basura puede aprender qué tipos de correo son legítimos "
+"y cuáles no lo son si lo entrena marcando como SPAM el correo no deseado "
+"entrante. LLa primera vez que comienza a usar el bloqueo de correo no "
+"deseado, compruebe frecuentemente la carpeta de SPAM para asegurarse de que "
+"el correo legítimo no se marca como SPAM."
+
+#: C/mail-spam-marking.page:30(p)
+msgid ""
+"If legitimate mail is incorrectly flagged, remove it from the Junk folder by "
+"right-clicking it and selecting <gui>Mark as Not Junk</gui> or pressing "
+"<keyseq><key>Shift</key><key>Ctrl</key><key>J</key></keyseq>. If Evolution "
+"misses junk mail, right-click the message, then click <gui>Mark as Junk</"
+"gui> or press <keyseq><key>Ctrl</key><key>J</key></keyseq>. When you correct "
+"it, the filter can recognize similar messages in the future, and becomes "
+"more accurate as time goes on."
+msgstr ""
+"Si el correo legítimo se marca incorrectamente, quítelo de la carpeta SPAM "
+"pulsando con el botón derecho y seleccionando <gui>Marcar como no SPAM</gui> "
+"o pulsando <keyseq><key>Mayús</key><key>Ctrl</key><key>J</key></keyseq>. Si "
+"Evolution no detetca algún correo basura, pulse con el botón derecho sobre "
+"el mensaje, después pulse <gui>Marcar como SPAM</gui> o <keyseq><key>Ctrl</"
+"key><key>J</key></keyseq>. Cuando lo corrija, el filtro puede reconocer "
+"mensajes similares para el futuro y se hace más preciso a medida que pasa el "
+"tiempo."
+
+#: C/mail-spam-marking.page:31(p)
+msgid ""
+"You can also flag mail as junk by selecting it and clicking the Junk icon in "
+"the menu bar; you can flag mail in the junk folder as \"Not Junk\" by "
+"selecting it and clicking the <gui>Not Junk</gui> icon."
+msgstr ""
+"También puede marcar correo como SPAM seleccionándolo y pulsando el icono de "
+"SPAM en la barra de menú; puede marcar correo en la carpeta de SPAM como «No "
+"es SPAM» seleccionándolo y pulsando el icono <gui>No es SPAM</gui>."
+
+#: C/mail-spam-marking.page:32(p)
+msgid ""
+"Each time you flag a message as Junk, the sender is added to your Spam List; "
+"each time you flag a message as Not Junk, the sender is removed from your "
+"Spam List."
+msgstr ""
+"Cada vez que marca un correo como SPAM se añade el remitente a su lista de "
+"SPAM; cada vez que marca un mensaje como válido, el remitente se quita de su "
+"lista de SPAM."
+
+#: C/mail-spam-groupwise-unmark-message.page:5(desc)
+msgid "How to mark a message in Novell Groupwise as not junk."
+msgstr "Cómo marcar un mensaje en Novell Groupwise como no SPAM."
+
+#: C/mail-spam-groupwise-unmark-message.page:23(title)
+msgid "Marking a Message As Not Junk Mail"
+msgstr "Marcar un mensaje como no spam"
+
+#: C/mail-spam-groupwise-unmark-message.page:26(p)
+msgid "Select the message to mark as not junk in your Junk Mail folder."
+msgstr ""
+"Seleccione el mensaje para marcarlo como no spam en su Carpeta de correo "
+"basura."
+
+#: C/mail-spam-groupwise-unmark-message.page:27(p)
+msgid ""
+"Right-click the message, then click <gui>Mark as Not Junk</gui>, or select "
+"the message and press <keyseq><key>Shift</key><key>Ctrl</key><key>J</key></"
+"keyseq>."
+msgstr ""
+"Pulse con el botón derecho del ratón en el correo, después pulse <gui>Marcar "
+"como no SPAM</gui>, o seleccione el mensaje y pulse <keyseq><key>Mayús</"
+"key><key>Ctrl</key><key>J</key></keyseq>."
+
+#: C/mail-spam-groupwise-unmark-message.page:30(p)
+msgid ""
+"The message is moved to your Mailbox folder and the name is removed from "
+"your junk list."
+msgstr ""
+"El mensaje se moverá a su Bandeja de entrada y el nombre se eliminará de su "
+"lista de correo basura."
+
+#: C/mail-spam-groupwise-remove-from-list.page:5(desc)
+msgid ""
+"How to remove an email address from your junk mail list in Novell Groupwise."
+msgstr ""
+"Cómo quitar una dirección de correo electrónico de su lista de corrreo SPAM "
+"en Novell Groupwise"
+
+#: C/mail-spam-groupwise-remove-from-list.page:23(title)
+msgid "Removing an Email Address from Your Junk List"
+msgstr ""
+"Quitar una dirección de correo electrónico de su lista de correo basura"
+
+#: C/mail-spam-groupwise-remove-from-list.page:26(p)
+msgid "Right-click a message, then click <gui>Junk Mail Settings</gui>."
+msgstr ""
+"Pulse con el botón derecho sobre un correo, después pulse <gui>Opciones de "
+"SPAM</gui>."
+
+#: C/mail-spam-groupwise-remove-from-list.page:27(p)
+msgid "Select the email address to remove, then click <gui>Remove</gui>."
+msgstr ""
+"Seleccione la dirección de correo electrónico que quitar, después pulse "
+"<gui>Quitar</gui>."
+
+#: C/mail-spam-groupwise-mark-message.page:5(desc)
+msgid "How to mark a message in Novell Groupwise as junk."
+msgstr "Cómo marcar un mensaje en Novell Groupwise como SPAM."
+
+#: C/mail-spam-groupwise-mark-message.page:23(title)
+msgid "Marking a Message As Junk Mail"
+msgstr "Marcar un mensaje como spam"
+
+#: C/mail-spam-groupwise-mark-message.page:25(p)
+msgid ""
+"Select the message to mark as junk, then click the <gui>Junk</gui> button or "
+"press <keyseq><key>Ctrl</key><key>J</key></keyseq>."
+msgstr ""
+"Seleccione el mensaje que marcar como spam, después pulse el botón "
+"<gui>SPAM</gui> o pulse <keyseq><key>Ctrl</key><key>J</key></keyseq>."
+
+#: C/mail-spam-groupwise-mark-message.page:26(p)
+msgid ""
+"The message is moved to your Junk Mail folder and the user is added to your "
+"junk list."
+msgstr ""
+"El mensaje se moverá a su carpeta de correo basura y el usuario se añadirá a "
+"su lista de spam."
+
+#: C/mail-spam-groupwise-manage-list.page:5(desc)
+msgid "How to manage your junk mail list in Novell Groupwise."
+msgstr "Cómo gestionar su lista de correo de SPAM en Novell Groupwise."
+
+#: C/mail-spam-groupwise-manage-list.page:27(title)
+msgid "Enabling or Disabling Your Junk Mail List"
+msgstr "Activar o desactivar su lista de correo basura"
+
+#: C/mail-spam-groupwise-manage-list.page:29(p)
+#: C/mail-spam-groupwise-add-to-list.page:29(p)
+msgid ""
+"Right-click on a message and select the <gui>Junk Mail Settings</gui> option."
+msgstr ""
+"Pulse con el botón derecho del ratón sobre el mensaje y seleccione la opción "
+"<gui>Configuración de SPAM</gui>."
+
+#: C/mail-spam-groupwise-manage-list.page:30(p)
+msgid "Specify whether you wish to Enable or Disable junk mail handling."
+msgstr ""
+"Especifique si quiere Activar o Desactivar la gestión del correo basura."
+
+#: C/mail-spam-groupwise-manage-list.page:31(p)
+msgid "Click on the <gui style=\"button\">OK</gui> button."
+msgstr "Pulse el botón <gui style=\"button\">Aceptar</gui>."
+
+#: C/mail-spam-groupwise-add-to-list.page:5(desc)
+msgid "How to add an email address to your junk mail list in Novell Groupwise."
+msgstr ""
+"Cómo añadir una dirección de correo electrónico a su lista de correo de SPAM "
+"en Novell Groupwise."
+
+#: C/mail-spam-groupwise-add-to-list.page:27(title)
+msgid "Adding an Email Address to Your Junk List"
+msgstr "Añadir una dirección de correo electrónico a su lista de correo basura"
+
+#: C/mail-spam-groupwise-add-to-list.page:30(p)
+msgid ""
+"Type in the email address you wish to block in the <gui>Email</gui> field."
+msgstr ""
+"Escriba la dirección de correo electrónico que quiere bloquear en el campo "
+"<gui>Correo-e</gui>."
+
+#: C/mail-spam-groupwise-add-to-list.page:31(p)
+msgid ""
+"Click <gui style=\"button\">Add</gui> and then click on the <gui style="
+"\"button\">OK</gui> button."
+msgstr ""
+"Pulse <gui style=\"button\">Añadir</gui> y después pulse el botón <gui style="
+"\"button\">Aceptar</gui>."
+
+#: C/mail-spam-groupwise-add-to-list.page:34(p)
+msgid ""
+"Remember, when you mark an item as junk in GroupWise, that item is added to "
+"your junk list in the GroupWise system. The settings in the GroupWise system "
+"are applied from computer to computer."
+msgstr ""
+"Recuerde, cuando marca un elemento como basura en GroupWise, ese elemento se "
+"añade a su lista de SPAM en el sistema GroupWise. Debido a que estos ajustes "
+"están en el sistema GroupWise, su lista de SPAM le sigue de equipo en equipo."
+
+#: C/mail-sorting-message-list.page:5(desc)
+msgid "Sorting the message list of a mail folder."
+msgstr "Ordenar la lista de mensajes en una carpeta de correo."
+
+#: C/mail-sorting-message-list.page:28(title)
+msgid "Sorting the message list"
+msgstr "Ordenar la lista de mensajes"
+
+#: C/mail-sorting-message-list.page:30(p)
+msgid "Evolution lets you organize your emails by letting you sort messages."
+msgstr ""
+"Evolution le permite organizar sus correos permitiéndole ordenar sus "
+"mensajes."
+
+#: C/mail-sorting-message-list.page:31(p)
+msgid ""
+"To view the complete headers for a message, click <guiseq><gui>View</"
+"gui><gui>All Message Headers</gui></guiseq>. This will display the complete "
+"header data on the viewing pane."
+msgstr ""
+"Para ver todas las cabeceras de un mensaje, pulse <guiseq><gui>Ver</"
+"gui><gui>Todas las cabeceras del mensaje</gui></guiseq>. Esto mostrará todos "
+"los datos de las cabeceras en el panel de visualización."
+
+#: C/mail-sorting-message-list.page:32(p)
+msgid ""
+"To view the message data, click on <guiseq><gui>View</gui><gui>Message "
+"Source</gui></guiseq> or press <keyseq><key>Ctrl</key><key>U</key></keyseq>. "
+"This will display the message data in a pop-up window."
+msgstr ""
+"Para ver todos los datos del correo pulse en <guiseq><gui>Ver</"
+"gui><gui>Mensaje en bruto</gui></guiseq> o pulse <keyseq><key>Ctrl</"
+"key><key>U</key></keyseq>. Se mostrarán todos los datos del mensaje en una "
+"ventana emergente."
+
+#: C/mail-sorting-message-list.page:35(title)
+msgid "Sorting Mail in Email Threads"
+msgstr "Ordenar los correos por conversaciones"
+
+#: C/mail-sorting-message-list.page:36(p)
+msgid ""
+"You can use a threaded message view to sort emails. To enable this feature, "
+"click on <guiseq><gui>View</gui><gui>Group By Threads</gui></guiseq> or "
+"press <keyseq><key>Ctrl</key><key>T</key></keyseq>."
+msgstr ""
+"Puede usar mensajes por conversaciones para ordenar los correos "
+"electrónicos. Para activar esta opción pulse en <guiseq><gui>Ver</"
+"gui><gui>Agrupar por conversaciones</gui></guiseq> o pulse "
+"<keyseq><key>Ctrl</key><key>T</key></keyseq>."
+
+#: C/mail-sorting-message-list.page:37(p)
+msgid ""
+"This feature, when enabled, groups replies with the original email and "
+"allows you to follow the flow of the conversation from one message to the "
+"next."
+msgstr ""
+"Cuando esta característica está activada, agrupa las respuestas con el "
+"correo original y le permite seguir la conversación de un mensaje al "
+"siguiente."
+
+#: C/mail-sorting-message-list.page:38(p)
+msgid ""
+"When a new message arrives, it will be added below the parent message. "
+"Threads are sorted and displayed based on the date of the most recent "
+"message received."
+msgstr ""
+"Cuando un correo nuevo llega se añadirá debajo del mensaje original. Los "
+"hilos se agrupan y muestran basándose en la fecha del correo más "
+"recientemente recibido."
+
+#: C/mail-sorting-message-list.page:39(p)
+msgid ""
+"For Advanced Users: There is a GConf key that allows you to toggle between "
+"the collapsed and expanded state of the email threads. The collapsed state "
+"is enabled by default and may be modified at /apps/evolution/mail/display/"
+"thread_expand."
+msgstr ""
+"Para usuarios avanzados: existe una clave de GConf que le permite cambiar el "
+"estado de las conversaciones de correo electrónico entre contraídas y "
+"expandidas. El estado contraído está activado de forma predeterminada y se "
+"puede modificar en «/apps/evolution/mail/display/thread_expand»."
+
+#: C/mail-sorting-message-list.page:44(title)
+msgid "Sorting Mail with Column Headers"
+msgstr "Uso de cabeceras para ordenar los mensajes"
+
+#: C/mail-sorting-message-list.page:45(p)
+msgid ""
+"The message list displays columns that indicate whether a message has been "
+"read, whether it has attachments, how important the message is, the sender, "
+"date, and the subject. To change the columns used in the message list, you "
+"can do one of the following:"
+msgstr ""
+"La lista de mensajes tiene columnas para indicar si un mensaje se ha leído, "
+"si tiene adjuntos, su importancia, el remitente, la fecha y el asunto. Para "
+"cambiar las columnas usadas en la lista de mensajes puede hacer una de las "
+"siguientes:"
+
+#: C/mail-sorting-message-list.page:47(p)
+msgid "Drag and drop the column header bars"
+msgstr "Arrastre y suelte las barras de cabeceras de columnas"
+
+#: C/mail-sorting-message-list.page:48(p)
+msgid "Right-click on the header."
+msgstr "Pulse con el botón derecho en el la cabecera."
+
+#: C/mail-sorting-message-list.page:49(p)
+msgid ""
+"Select the <gui>Remove This Column</gui> or <gui>Add a Column</gui> option."
+msgstr ""
+"Seleccione la opción <gui>Quitar esta columna</gui> o <gui>Añadir una "
+"columna</gui>."
+
+#: C/mail-sorting-message-list.page:52(p)
+msgid ""
+"Evolution allows you to sort your messages using these columns. Just click "
+"on the column label to sort the emails. The direction of the arrow next to "
+"the label indicates the direction of the sort."
+msgstr ""
+"Evolution le permite ordenar sus mensajes usando estas columnas. Simplemente "
+"pulse en la etiqueta de la columna para ordenar los mensajes. La dirección "
+"de la flecha junto a la etiqueta indica la dirección de la ordenación."
+
+#: C/mail-sorting-message-list.page:56(title)
+msgid "Using Other Sorting Options"
+msgstr "Usar otras opciones de ordenación"
+
+#: C/mail-sorting-message-list.page:57(p)
+msgid ""
+"Evolution provides other ways for sorting email messages. You can use Sort "
+"By, Sort Ascending, Sort Descending, or Unsort."
+msgstr ""
+"Evolution proporciona otras formas de ordenar mensajes de correo "
+"electrónico. Puede usar Ordenar por, Ordenar ascendentemente, Ordenar "
+"descendentemente o Desordenar."
+
+#: C/mail-sorting-message-list.page:59(title)
+msgid "Sort By"
+msgstr "Ordenar por"
+
+#: C/mail-sorting-message-list.page:60(p)
+msgid "You can also sort email messages using the <gui>Sort By</gui> list."
+msgstr ""
+"También puede ordenar correos electrónicos usando la lista <gui>Ordenar por</"
+"gui>."
+
+#: C/mail-sorting-message-list.page:62(p)
+#: C/mail-sorting-message-list.page:92(p)
+#: C/mail-sorting-message-list.page:101(p)
+#: C/mail-sorting-message-list.page:110(p)
+msgid "Right-click on the message list column headers."
+msgstr ""
+"Pulse con el botón derecho del ratón sobre las cabeceras de las columnas de "
+"la lista de correos."
+
+#: C/mail-sorting-message-list.page:63(p)
+msgid "Select the <gui>Sort By</gui> option."
+msgstr "Seleccione la opción <gui>Ordenar por</gui>."
+
+#: C/mail-sorting-message-list.page:63(p)
+msgid "This brings up this list of criteria for sorting email messages:"
+msgstr ""
+"Esto muestra la lista de criterios para ordenar los mensajes de correo "
+"electrónico:"
+
+#: C/mail-sorting-message-list.page:65(p)
+msgid "Subject - Trimmed"
+msgstr "Asunto recortado"
+
+#: C/mail-sorting-message-list.page:66(p)
+msgid "Labels"
+msgstr "Etiquetas"
+
+#: C/mail-sorting-message-list.page:67(p)
+msgid "Recipients"
+msgstr "Destinatarios"
+
+#: C/mail-sorting-message-list.page:68(p)
+msgid "Sender"
+msgstr "Remitente"
+
+#: C/mail-sorting-message-list.page:69(p)
+msgid "Location"
+msgstr "Lugar"
+
+#: C/mail-sorting-message-list.page:70(p)
+msgid "Due By"
+msgstr "Vence en"
+
+#: C/mail-sorting-message-list.page:71(link)
+msgid "Follow Up Flag"
+msgstr "Marca de seguimiento"
+
+#: C/mail-sorting-message-list.page:72(p)
+msgid "Flag Status"
+msgstr "Marca de estado"
+
+#: C/mail-sorting-message-list.page:73(p)
+msgid "Size"
+msgstr "Tamaño"
+
+#: C/mail-sorting-message-list.page:74(p)
+msgid "To"
+msgstr "Para"
+
+#: C/mail-sorting-message-list.page:75(p)
+msgid "Received"
+msgstr "Recibido"
+
+#: C/mail-sorting-message-list.page:76(p)
+msgid "Date"
+msgstr "Fecha"
+
+#: C/mail-sorting-message-list.page:77(p)
+msgid "Subject"
+msgstr "Asunto"
+
+#: C/mail-sorting-message-list.page:78(p)
+msgid "From"
+msgstr "De"
+
+#: C/mail-sorting-message-list.page:79(p)
+msgid "Attachment"
+msgstr "Adjunto"
+
+#: C/mail-sorting-message-list.page:80(p)
+msgid "Flagged"
+msgstr "Marcado"
+
+#: C/mail-sorting-message-list.page:81(p)
+msgid "Status"
+msgstr "Estado"
+
+#: C/mail-sorting-message-list.page:82(p)
+msgid "Custom"
+msgstr "Personalizado"
+
+#: C/mail-sorting-message-list.page:85(p)
+msgid "Select the option you wish to use in sorting email messages."
+msgstr ""
+"Seleccione la opción que quiere usar para ordenar los mensajes de correo "
+"electrónico."
+
+#: C/mail-sorting-message-list.page:90(title)
+msgid "Sort Ascending"
+msgstr "Orden ascendente"
+
+#: C/mail-sorting-message-list.page:93(p)
+msgid "Select the <gui>Sort Ascending</gui> option."
+msgstr "Seleccione la opción <gui>Ordenar ascendentemente</gui>."
+
+#: C/mail-sorting-message-list.page:95(p)
+msgid "The messages will be displayed with the most recent at the bottom."
+msgstr ""
+"Los mensajes se mostrarán con el correo más reciente en la parte inferior."
+
+#: C/mail-sorting-message-list.page:99(title)
+msgid "Sort Descending"
+msgstr "Orden descendente"
+
+#: C/mail-sorting-message-list.page:102(p)
+msgid "Select the <gui>Sort Descending</gui> option."
+msgstr "Seleccione la opción <gui>Ordenar descendentemente</gui>."
+
+#: C/mail-sorting-message-list.page:104(p)
+msgid "The messages will be displayed with the most recent at the top."
+msgstr ""
+"Los mensajes se mostrarán con el correo más reciente en la parte superior."
+
+#: C/mail-sorting-message-list.page:108(title)
+msgid "Unsort"
+msgstr "Desordenar"
+
+#: C/mail-sorting-message-list.page:111(p)
+msgid "Select the <gui>Unsort</gui> option."
+msgstr "Seleccione la opción <gui>Desordenar</gui>."
+
+#: C/mail-sorting-message-list.page:113(p)
+msgid ""
+"This removes sorting from the column, reverting to the order of messages as "
+"they were added to the folder."
+msgstr ""
+"Esto elimina la ordenación para esta columna, revirtiendo el orden de los "
+"mensajes según se añadieron a la carpeta."
+
+#: C/mail-several-pop-accounts.page:5(desc)
+msgid "How to split and sort mail when using more than one local account."
+msgstr "Cómo partir y ordenar el correo al usar más de una cuenta local."
+
+#: C/mail-several-pop-accounts.page:22(title)
+msgid "Separating POP mail for more than one account"
+msgstr "Separar correo POP de más de una cuenta"
+
+#: C/mail-several-pop-accounts.page:24(p)
+msgid ""
+"It is not possible to have separate accounts in the accounts and folder list "
+"pane. Evolution only has one unique inbox for incoming email."
+msgstr ""
+"No es posible tener cuentas separadas en el panel de cuentas y la lista de "
+"carpetas. Evolution solo tiene una bandeja de entrada única para el correo "
+"entrante."
+
+#: C/mail-several-pop-accounts.page:25(p)
+msgid ""
+"You can either use IMAP instead of POP, or move incoming emails into "
+"different folders by <link xref=\"mail-folders\">creating folders</link> and "
+"<link xref=\"mail-filters\">creating filters</link>: Create a new folder and "
+"create two subfolders (for incoming and for sent mail of that account). Now "
+"set up an incoming filter via <guiseq><gui>Edit</gui><gui>Message Filters..."
+"</gui><gui style=\"button\">Add</gui></guiseq> to move incoming mail to the "
+"incoming folder by filtering on the recipient's address and set up an "
+"outgoing filter to move outgoing mail to the sent folder by filtering on the "
+"sender's address."
+msgstr ""
+"Puede usar UMAP en lugar de POP o mover los correos electrónicos entrantes a "
+"diferentes carpetas <link xref=\"mail-folders\">creando carpetas</link> y "
+"<link xref=\"mail-filters\">creando filtros</link>: cree una carpeta nueva y "
+"cree dos subcarpetas (para correo entrante y para correo enviado para esa "
+"cuenta). Ahora configure un filtro de correo de entrada en "
+"<guiseq><gui>Editar</gui><gui>Filtros de correos...</gui><gui style=\"button"
+"\">Añadir</gui></guiseq> para mover el correo entrante a la carpeta de "
+"correo entrante filtrando la dirección de correo del destinatario y "
+"configure un filtro de salida para mover el correo saliente a la carpeta de "
+"correo saliente filtrando la dirección del remitente."
+
+# #-#-#-#-#  usage-exchange.po  #-#-#-#-#

+# index.docbook:342, index.docbook:514

+#: C/mail-sending-options-smtp.page:5(desc)
+msgid "Sending options for SMTP."
+msgstr "Opciones de envío para SMTP."
+
+#: C/mail-sending-options-smtp.page:27(title)
+msgid "SMTP sending options"
+msgstr "Opciones de envío SMTP"
+
+#: C/mail-sending-options-smtp.page:30(p)
+msgid ""
+"Enter the address of your mail server for sending mail in the <gui>Server</"
+"gui> field and select if the server requires authentication (entering a "
+"username and a password)."
+msgstr ""
+"Introduzca la dirección de su servidor de correo para enviar correo en el "
+"campo <gui>Servidor</gui> y seleccione si el servidor requiere autenticación "
+"(introduciendo un nombre de usuario y una contraseña)."
+
+#: C/mail-sending-options-smtp.page:31(p)
+#: C/mail-receiving-options-usenet-news.page:33(p)
+#: C/mail-receiving-options-pop.page:37(p)
+#: C/mail-receiving-options-pop.page:39(p)
+#: C/mail-receiving-options-imap-plus.page:33(p)
+#: C/mail-receiving-options-imap.page:33(p)
+msgid ""
+"Free webmail providers often supply information about which of these options "
+"can be used. If you are in an organizational environment, you may want to "
+"contact your system administrator for more information."
+msgstr ""
+"Los servidores de correo web gratuitos generalmente proporcionan información "
+"acerca de cuáles de estas opciones se pueden usar. Si está en un "
+"acontecimiento organizado puede que quiera contactar con el administrador de "
+"su sistema para obtener más información."
+
+#: C/mail-sending-options-smtp.page:33(p)
+msgid ""
+"If the server requires authentication, you need to provide the following "
+"information:"
+msgstr ""
+"Si el servidor requiere autenticación debe proporcionar la siguiente "
+"información:"
+
+#: C/mail-sending-options-smtp.page:35(p)
+msgid ""
+"Select the authentication type in the Authentication list, or click "
+"<gui>Check for Supported Types</gui> to have Evolution check. Some servers "
+"do not support this, so clicking this button is not a guarantee that "
+"available mechanisms actually work."
+msgstr ""
+"Seleccione el tipo de autenticación en la lista de Autenticación o pulse "
+"<gui>Comprobar tipos soportados</gui> para que Evolution los compruebe. "
+"Algunos servidores no soportan esto, así que pulsar este botón no garantiza "
+"que los mecanismos disponibles actualmente funcionen."
+
+#. TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage.
+#: C/mail-sending-options-smtp.page:43(p)
+msgid ""
+"If you came to this page from the first-run wizard help page, click <link "
+"xref=\"intro-first-run#account-information\">here</link> to continue with "
+"the next step."
+msgstr ""
+"Si ha llegado a esta página desde la página del asistente de primera "
+"ejecución, pulse <link xref=\"intro-first-run#account-information\">aquí</"
+"link> para continuar con el siguiente paso."
+
+#: C/mail-send-and-receive.page:5(desc)
+msgid "On receiving mail and sending written emails."
+msgstr "Acerca de recibir y enviar correos electrónicos."
+
+#: C/mail-send-and-receive.page:20(title)
+msgid "Sending and receiving mail"
+msgstr "Enviar y recibir correo"
+
+#: C/mail-send-and-receive.page:22(p)
+msgid ""
+"This section refers to receiving mail and sending written emails. For "
+"writing a new message, please refer to the <link xref=\"index#mail-composing"
+"\">Composing mail</link> section."
+msgstr ""
+"Este sección se refiere a la recepción y envío de correos escritos. Para "
+"escribir un correo nuevo, consulte la sección <link xref=\"index#mail-"
+"composing\">Redactar correos</link>."
+
+#: C/mail-send-and-receive-manual.page:5(desc)
+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"
+
+#: 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."
+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</"
+"gui></guiseq> en el menú principal."
+
+#: C/mail-send-and-receive-manual.page:22(p)
+msgid ""
+"To send and receive only for one of your mail accounts, or to only send or "
+"only receive, click the small down-arrow next to the <gui style=\"button"
+"\">Send / Receive</gui> button and choose the corresponding option."
+msgstr ""
+"Para enviar y recibir correo sólo para una de sus cuentas de correo, o solo "
+"para enviar o recibir correo, pulse la pequeña flecha desplegable junto al "
+"botón <gui style=\"button\">Enviar / Recibir</gui> y elija la opción "
+"correspondiente."
+
+#: C/mail-send-and-receive-manual.page:23(p)
+msgid ""
+"If you just want to send messages which are in your Outbox, you can right-"
+"click on the Outbox and click <gui>Flush Outbox</gui>."
+msgstr ""
+"Si simplemente quiere enviar los mensajes en su Bandeja de salida, puede "
+"pulsar con el botón derecho del ratón y <gui>Enviar correos pendientes</gui>."
+
+#: C/mail-send-and-receive-automatically.page:5(desc)
+msgid "Check automatically and regularly for new received mail."
+msgstr "Comprobar automática y regularmente si hay correo nuevo."
+
+#: C/mail-send-and-receive-automatically.page:20(title)
+msgid "Automatically check for new mail"
+msgstr "Comprobar automáticamente si hay correo nuevo"
+
+#: C/mail-send-and-receive-automatically.page:21(p)
+msgid ""
+"If you want Evolution to check automatically for new messages, enable the "
+"option <gui>Check for new messages every ... minutes</gui> in the "
+"<gui>Receiving Email</gui> page of the mail account settings (accessible via "
+"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui "
+"style=\"button\">Edit</gui><gui>Receiving Email</gui></guiseq>) and select "
+"the frequency in minutes."
+msgstr ""
+"Si quiere que Evolution compruebe automáticamente si hay correos nuevos "
+"actíve la opción <gui>Comprobar si hay mensajes nuevos cada ... minutos</"
+"gui> en la página <gui>Recepción de correo</gui> de la configuración de la "
+"cuenta (accesible a través de <guiseq><gui>Editar</gui><gui>Preferencias</"
+"gui><gui>Cuentas de correo</gui><gui style=\"button\">Editar</"
+"gui><gui>Recepción de correo</gui></guiseq>) y seleccione la frecuencia en "
+"minutos."
+
+#: C/mail-searching.page:5(desc)
+msgid "Searching messages."
+msgstr "Buscar mensajes."
+
+#: C/mail-searching.page:28(title)
+msgid "Searching Mail"
+msgstr "Buscar correos"
+
+#: C/mail-searching.page:31(p)
+msgid ""
+"In the mail view, you can quickly search for messages by defining conditions."
+msgstr ""
+"En la vista de correo puede buscar rápidamente mensajes definiendo las "
+"condiciones."
+
+#: C/mail-searching.page:33(p)
+msgid ""
+"Click on the search icon <media type=\"image\" mime=\"image/png\" src="
+"\"figures/search-icon.png\"/> to expand the drop-down list."
+msgstr ""
+"Pulse el icono de búsqueda <media type=\"image\" mime=\"image/png\" src="
+"\"figures/search-icon.png\"/> para expandir la dista desplegable."
+
+#: C/mail-searching.page:35(p)
+msgid "Select the scope from the drop-down list right to the text box."
+msgstr ""
+"Seleccione el rango desde la lista desplegable a la derecha de la caja de "
+"texto."
+
+#: C/mail-searching.page:39(p)
+msgid ""
+"If you start directly from the fourth step, text will be searched in mail's "
+"subjects and addresses and scope will be \"Current folder\"."
+msgstr ""
+"Si comienza directamente desde el cuarto paso, se buscará el texto en el "
+"asunto y direcciones de los correos y el rango será la «Carpeta actual»."
+
+#: C/mail-searching.page:40(p)
+msgid ""
+"If you search for messages that are not in the same folder rather often you "
+"might want to create a search folder instead; see <link xref=\"mail-search-"
+"folders\">Using Search Folders</link> for more detail."
+msgstr ""
+"Si busca correos que, a menudo, no están en la misma carpeta puede querer "
+"crear una carpeta de búsqueda en su lugar; para obtener más detalles "
+"consulte <link xref=\"mail-search-folders\">Usar carpetas de búsqueda</link>."
+
+#: C/mail-searching.page:45(title)
+msgid "Advanced Search:"
+msgstr "Búsqueda avanzada:"
+
+#: C/mail-searching-attachment-type.page:5(desc)
+msgid "Unfortunately this is not possible."
+msgstr "Desafortunadamente no es posible."
+
+#: C/mail-searching-attachment-type.page:21(title)
+msgid "Searching for emails with a specific attachment type"
+msgstr "Buscar correos con un tipo de adjunto específico"
+
+#: C/mail-searching-attachment-type.page:23(p)
+msgid ""
+"There currently is no way to do search for emails with a specific type of "
+"attachment (for example searching for all emails that have a PDF attachment)."
+msgstr ""
+"Actualmente no existe una forma de buscar correos con un tipo específico de "
+"adjunto (por ejemplo, buscando todos los correos que tengan un PDF adjunto)."
+
+#: C/mail-search-folders-refresh.page:5(desc)
+msgid "Ways of updating Search folders."
+msgstr "Formas de actualizar las Carpetas de búsqueda."
+
+#: C/mail-search-folders-refresh.page:24(title)
+msgid "Updating/refreshing Search folders"
+msgstr "Actualizar las Carpetas de búsqueda"
+
+#: C/mail-search-folders-refresh.page:26(p)
+msgid ""
+"It might happen that one of your Search folders has not updated since some "
+"new email arrived or since an email was deleted, for example. This will mean "
+"that the list of emails in the folder is not up-to-date."
+msgstr ""
+"Puede suceder que una de sus carpetas de búsqueda no se ha actualizado desde "
+"que llegó correo nuevo o desde que se eliminó un correo. Esto significa que "
+"la lista de correos electrónicos en la carpeta no está actualizada."
+
+#: C/mail-search-folders-refresh.page:28(p)
+msgid ""
+"You can get an updated view of the search folder either by switching to "
+"another folder and then back again, or by right-clicking on the search "
+"folder and choosing <gui>Refresh</gui>."
+msgstr ""
+"Puede obtener una vista actualizada de la carpeta de búsqueda cambiando a "
+"otra carpeta y volviendo a la misma o pulsando con el botón derecho del "
+"ratón sobre la carpeta de búsqueda y eligiendo <gui>Actualizar</gui>."
+
+#: C/mail-search-folders.page:5(desc)
+msgid ""
+"Use search folders to see messages in one folder while still keeping them in "
+"their original folders."
+msgstr ""
+"Use las carpetas de búsqueda para ver mensajes en una carpeta mientras estos "
+"aún están en sus carpetas originales."
+
+#: C/mail-search-folders.page:22(title)
+msgid "Using Search folders"
+msgstr "Usar Carpetas de búsqueda"
+
+#: C/mail-search-folders.page:24(p)
+msgid ""
+"If <link xref=\"mail-filters\">filters</link> are not flexible enough, or "
+"you find yourself performing the same <link xref=\"mail-searching\">search</"
+"link> again and again, consider a search folder."
+msgstr ""
+"Si los <link xref=\"mail-filters\">filtros</link> no son lo suficientemente "
+"flexibles o se encuentra a si mismo realizando la misma <link xref=\"mail-"
+"searching\">búsqueda</link> una y otra vez, considere crear una carpeta de "
+"búsqueda."
+
+#: C/mail-search-folders.page:26(p)
+msgid ""
+"A search folder looks like a <link xref=\"mail-folders\">folder</link>, it "
+"acts like a <link xref=\"mail-searching\">search</link>, and you set it up "
+"like a <link xref=\"mail-filters\">filter</link>. While a conventional "
+"folder actually contains messages, a search folder is a view of messages "
+"that might be in several different folders. The messages it contains are "
+"determined on the fly using a set of criteria that you have chosen when "
+"setting up the search folder."
+msgstr ""
+"Una carpeta de <link xref=\"mail-folders\">búsqueda</link> es realmente un "
+"híbrido de todas las demás herramientas de organización: es parecido a una "
+"carpeta, opera como una función <link xref=\"mail-searching\">búsqueda</"
+"link> y se configura como un filtro. En otras palabras, mientras una carpeta "
+"convencional contiene mensajes reales, una carpeta virtual es una vista de "
+"mensajes que pueden estar ubicados en carpetas diferentes. Los mensajes "
+"incluidos son identificados al vuelo mediante un conjunto de criterios "
+"elegidos de antemano."
+
+#: C/mail-search-folders.page:28(p)
+msgid ""
+"Evolution automatically updates the search folder contents when new messages "
+"are received or message are deleted."
+msgstr ""
+"Evolution automáticamente actualiza el contenido de la carpeta de búsqueda "
+"cuando se reciben mensajes nuevos o al eliminar mensajes."
+
+#: C/mail-search-folders.page:30(p)
+msgid ""
+"The <gui>Unmatched</gui> search folder is the opposite of other search "
+"folders: it displays all messages that do not appear in other search folders."
+msgstr ""
+"La carpeta de búsqueda <gui>No coincidente</gui> es lo contrario del resto "
+"de carpetas de búsqueda: contiene todos los mensajes que no cumplen los "
+"criterios satisfechos por las demás carpetas de búsqueda."
+
+#: C/mail-search-folders.page:32(p)
+msgid ""
+"If you use remote email storage like IMAP, and have created search folders "
+"to search through them, the <gui>Unmatched</gui> search folder also searches "
+"the remote folders. If you do not create any search folders that search "
+"remote mail stores, the <gui>Unmatched</gui> search folder does not search "
+"in them either."
+msgstr ""
+"Si usa un sistema de almacenamiento remoto como IMAP y ha creado carpetas de "
+"búsqueda en ellos, la carpeta de búsqueda <gui>No coincidente</gui> también "
+"explora las carpetas en ellos. Si no crea ninguna carpeta de búsqueda que "
+"busque en almacenes de correo remotos, la carpeta de búsqueda <gui>No "
+"coincidente</gui> tampoco los buscará."
+
+#: C/mail-search-folders-conditions.page:5(desc)
+msgid "Available conditions for setting up search folders."
+msgstr "Condiciones disponibles para configurar carpetas de búsqueda."
+
+#: C/mail-search-folders-conditions.page:23(title)
+msgid "Available Search folder conditions"
+msgstr "Condiciones disponibles para las Carpetas de búsqueda"
+
+#: C/mail-search-folders-conditions.page:26(p)
+#: C/mail-filters-conditions.page:26(p)
+msgid "Sender:"
+msgstr "Remitente:"
+
+#: C/mail-search-folders-conditions.page:27(p)
+#: C/mail-filters-conditions.page:27(p)
+msgid "The sender's email address or the name of the sender."
+msgstr ""
+"La dirección de correo electrónico del remitente o el nombre del remitente."
+
+#: C/mail-search-folders-conditions.page:29(p)
+#: C/mail-filters-conditions.page:29(p)
+msgid "Recipients:"
+msgstr "Destinatarios:"
+
+# index.docbook:458, index.docbook:949

+#: C/mail-search-folders-conditions.page:30(p)
+#: C/mail-filters-conditions.page:30(p)
+msgid "The recipients of the message."
+msgstr "Los destinatarios del mensaje."
+
+#: C/mail-search-folders-conditions.page:32(p)
+#: C/mail-filters-conditions.page:32(p)
+msgid "CC:"
+msgstr "Cc:"
+
+# index.docbook:458, index.docbook:949

+#: C/mail-search-folders-conditions.page:33(p)
+#: C/mail-filters-conditions.page:33(p)
+msgid "Only the CC recipients of the message."
+msgstr "Sólo los destinatarios Cc del correo."
+
+#: C/mail-search-folders-conditions.page:35(p)
+#: C/mail-filters-conditions.page:35(p)
+msgid "BCC:"
+msgstr "Cco:"
+
+#: C/mail-search-folders-conditions.page:36(p)
+#: C/mail-filters-conditions.page:36(p)
+msgid ""
+"Only the BCC recipients of the message. Obviously this can only be applied "
+"to outgoing filters."
+msgstr ""
+"Sólo los destinatarios con Cco de este mensaje. Obviamente esto sólo se "
+"puede aplicar a filtros salientes."
+
+#: C/mail-search-folders-conditions.page:38(p)
+#: C/mail-filters-conditions.page:38(p)
+msgid "Sender or Recipients:"
+msgstr "Remitente o destinatarios:"
+
+#: C/mail-search-folders-conditions.page:39(p)
+#: C/mail-filters-conditions.page:39(p)
+msgid ""
+"The sender's email address or the name of the sender or the recipients of "
+"the message."
+msgstr ""
+"La dirección de correo electrónico del remitente, el nombre del remitente or "
+"de los destinatarios del correo."
+
+#: C/mail-search-folders-conditions.page:41(p)
+#: C/mail-filters-conditions.page:41(p)
+msgid "Subject:"
+msgstr "Asunto:"
+
+# index.docbook:458, index.docbook:949

+#: C/mail-search-folders-conditions.page:42(p)
+#: C/mail-filters-conditions.page:42(p)
+msgid "The subject line of the message."
+msgstr "La línea asunto del mensaje."
+
+#: C/mail-search-folders-conditions.page:44(p)
+#: C/mail-filters-conditions.page:44(p)
+msgid "Specific Header:"
+msgstr "Cabecera específica:"
+
+#: C/mail-search-folders-conditions.page:45(p)
+#: C/mail-filters-conditions.page:45(p)
+msgid ""
+"Any header including <link xref=\"mail-composer-custom-header-lines\">custom "
+"ones</link>."
+msgstr ""
+"Cualquier cabecera incluyendo las <link xref=\"mail-composer-custom-header-"
+"lines\">personalizadas</link>."
+
+#: C/mail-search-folders-conditions.page:46(p)
+#: C/mail-filters-conditions.page:46(p)
+msgid ""
+"If a message uses a header more than once, Evolution pays attention only to "
+"the first instance, even if the message defines the header differently the "
+"second time. For example, if a message declares the Resent-From: header as "
+"\"engineering@example.com\" and then restates it as \"marketing@example.com"
+"\", Evolution filters as though the second declaration did not occur. To "
+"filter on messages that use headers multiple times, use a regular expression."
+msgstr ""
+"Si en un mensaje aparece más de una vez la misma cabecera, Evolution sólo se "
+"fija en la primera, aunque en la segunda el contenido sea diferente. Por "
+"ejemplo, si un mensaje declara la cabecera Reenviado-De: con "
+"«ingeniero@ejemplo.es» y a continuación la redefine como «marketing@ejemplo."
+"es», Evolution aplicará el filtro como si la segunda declaración no "
+"apareciera. Para filtrar mensajes que utilizan varias cabeceras varias veces "
+"use una expresión regular."
+
+#: C/mail-search-folders-conditions.page:48(p)
+#: C/mail-filters-conditions.page:48(p)
+msgid "Message Body:"
+msgstr "Cuerpo del mensaje:"
+
+# index.docbook:458, index.docbook:949

+#: C/mail-search-folders-conditions.page:49(p)
+#: C/mail-filters-conditions.page:49(p)
+msgid "Searches in the actual text of the message."
+msgstr "Busca en el texto efectivo del mensaje."
+
+#: C/mail-search-folders-conditions.page:51(p)
+#: C/mail-filters-conditions.page:51(p)
+msgid "Expression:"
+msgstr "Expresión:"
+
+#: C/mail-search-folders-conditions.page:52(p)
+#: C/mail-filters-conditions.page:52(p)
+msgid ""
+"(For programmers only) Match a message according to an expression you write "
+"in the Scheme language used to define <link xref=\"mail-filters\">filters</"
+"link> in Evolution."
+msgstr ""
+"(Sólo para programadores) busca un mensaje que corresponda a una expresión "
+"escrita en lenguaje Scheme, usado para definir <link xref=\"mail-filters"
+"\">filtros</link> en Evolution."
+
+#: C/mail-search-folders-conditions.page:54(p)
+#: C/mail-filters-conditions.page:54(p)
+msgid "Date sent:"
+msgstr "Fecha de envío:"
+
+#: C/mail-search-folders-conditions.page:55(p)
+#: C/mail-filters-conditions.page:55(p)
+msgid ""
+"Filters messages according to the date on which they were sent. First, "
+"choose the conditions you want a message to meet, such as before a given "
+"time or after a given time. Then choose the time. The filter compares the "
+"message's time stamp to the system clock when the filter is run, or to a "
+"specific time and date you choose from a calendar. You can also have it look "
+"for a message within a range of time relative to the filter, such as two to "
+"four days ago."
+msgstr ""
+"Filtra los mensajes en función de la fecha de envío. En primer lugar, defina "
+"las condiciones que desea ver cumplidas con un mensaje, tales como antes de "
+"una hora determinada o después de de ella, etc. A continuación, especifique "
+"la fecha y hora. La fecha y hora del mensaje se compara con la hora del "
+"sistema al ejecutarse el filtro, o con una hora y fecha específica elegida "
+"en el calendario. Es posible incluso buscar mensajes dentro de un intervalo "
+"de tiempo relativo, por ejemplo, buscar mensajes en los últimos cuatro días."
+
+#: C/mail-search-folders-conditions.page:57(p)
+#: C/mail-filters-conditions.page:57(p)
+msgid "Date received:"
+msgstr "Fecha de recepción:"
+
+# index.docbook:458, index.docbook:949

+#: C/mail-search-folders-conditions.page:58(p)
+#: C/mail-filters-conditions.page:58(p)
+msgid ""
+"This works the same way as the Date Sent option, except that it compares the "
+"time you received the message with the dates you specify."
+msgstr ""
+"Funciona del mismo modo que la opción Fecha de envío, excepto que compara la "
+"fecha y hora de recepción del mensaje con las fechas especificadas."
+
+#: C/mail-search-folders-conditions.page:60(p)
+#: C/mail-filters-conditions.page:60(p)
+msgid "Label:"
+msgstr "Etiqueta:"
+
+#: C/mail-search-folders-conditions.page:61(p)
+#: C/mail-filters-conditions.page:61(p)
+msgid ""
+"Messages can have <link xref=\"mail-labels\">labels</link> of Important, "
+"Work, Personal, To Do, or Later. You can set labels with other filters or "
+"manually."
+msgstr ""
+"Los mensajes pueden tener las <link xref=\"mail-labels\">labels</link> "
+"Importante, Trabajo, personal, Tareas pendientes o Más tarde. Puede "
+"establecer etiquetas con otros filtros o manualmente."
+
+#: C/mail-search-folders-conditions.page:63(p)
+#: C/mail-filters-conditions.page:63(p)
+msgid "Score:"
+msgstr "Puntuación:"
+
+#: C/mail-search-folders-conditions.page:64(p)
+#: C/mail-filters-conditions.page:64(p)
+msgid ""
+"Sets the message score to any whole number greater than 0. You can have one "
+"filter set or change a message score, and then set up another filter to move "
+"the messages you have scored. A message score is not based on anything in "
+"particular: it is simply a number you can assign to messages so other "
+"filters can process them."
+msgstr ""
+"Establece la puntuación del mensaje con un número entero mayor que 0. Puede "
+"tener un filtro ajustado o cambiar la puntuación de un mensaje, y después "
+"configurar otro filtro par amover los mensajes que ha puntuado. La "
+"puntuación de un mensaje no está basada en nada en particular: es "
+"simplemente un número que puede asignar a mensajes para que otros filtros "
+"puedan procesarlos."
+
+#: C/mail-search-folders-conditions.page:66(p)
+#: C/mail-filters-conditions.page:66(p)
+msgid "Size (kB):"
+msgstr "Tamaño (Kib):"
+
+# index.docbook:458, index.docbook:949

+#: C/mail-search-folders-conditions.page:67(p)
+#: C/mail-filters-conditions.page:67(p)
+msgid "Sorts based on the size of the message in kilobytes."
+msgstr "Ordenación basada en el tamaño del mensaje, en kilobytes."
+
+#: C/mail-search-folders-conditions.page:69(p)
+#: C/mail-filters-conditions.page:69(p)
+msgid "Status:"
+msgstr "Estado:"
+
+#: C/mail-search-folders-conditions.page:70(p)
+#: C/mail-filters-conditions.page:70(p)
+msgid ""
+"Filters according to the status of a message. The status can be Replied To, "
+"Draft, Important, Read, or Junk."
+msgstr ""
+"Filtros de acuerdo al estado de un mensaje. El estado puede ser Respoder a, "
+"Borrador, Importante, Leído o SPAM."
+
+#: C/mail-search-folders-conditions.page:72(p)
+#: C/mail-filters-conditions.page:72(p)
+msgid "Follow Up:"
+msgstr "Seguimiento:"
+
+#: C/mail-search-folders-conditions.page:73(p)
+#: C/mail-filters-conditions.page:73(p)
+msgid ""
+"Checks whether the message is <link xref=\"mail-follow-up-flag\">flagged for "
+"follow-up</link>."
+msgstr ""
+"Comprueba si el mensaje está <link xref=\"mail-follow-up-flag\">marcado para "
+"su seguimiento</link>."
+
+#: C/mail-search-folders-conditions.page:75(p)
+#: C/mail-filters-conditions.page:75(p)
+msgid "Completed On:"
+msgstr "Completado en:"
+
+#: C/mail-search-folders-conditions.page:78(p)
+#: C/mail-filters-conditions.page:78(p)
+msgid "Attachments:"
+msgstr "Adjuntos:"
+
+#: C/mail-search-folders-conditions.page:79(p)
+#: C/mail-filters-conditions.page:79(p)
+msgid "Checks whether there is an attachment for the email."
+msgstr "Comprueba si existe un adjunto para el correo."
+
+#: C/mail-search-folders-conditions.page:81(p)
+#: C/mail-filters-conditions.page:81(p)
+msgid "Mailing List"
+msgstr "Lista de correo"
+
+#: C/mail-search-folders-conditions.page:82(p)
+#: C/mail-filters-conditions.page:82(p)
+msgid ""
+"Filters based on the mailing list the message came from. This filter might "
+"miss messages from some list servers, because it checks for the X-BeenThere "
+"header, which is used to identify mailing lists or other redistributors of "
+"mail. Mail from list servers that do not set X-BeenThere properly are not be "
+"caught by these filters."
+msgstr ""
+"Filtros basados en mensajes que provienen de listas de correo. Este filtro "
+"puede perder mensajes de algunos servidores de listas, porque comprueba la "
+"cabecera X-BeenThere, que se usa para identificar listas de correo u otras "
+"redistribuciones de correo. El correo proveniente de servidores de listas "
+"que no establezca adecuadamente la cabecera X-BeenThere no será filtrado."
+
+#: C/mail-search-folders-conditions.page:84(p)
+#: C/mail-filters-conditions.page:84(p)
+msgid "Regex Match:"
+msgstr "Coincide con la expresión regular:"
+
+#: C/mail-search-folders-conditions.page:85(p)
+#: C/mail-filters-conditions.page:85(p)
+msgid ""
+"(For programmers only) If you know your way around a <link href=\"https://"
+"secure.wikimedia.org/wikipedia/en/wiki/Regular_expression\">regex</link>, or "
+"regular expression, this option allows you to search for complex patterns of "
+"letters, so that you can find, for example, all words that start with a and "
+"end with m, and are between six and fifteen letters long, or all messages "
+"that declare a particular header twice. For information about how to use "
+"regular expressions, check the man page for the grep command."
+msgstr ""
+"(Sólo para programadores) Si sabe lo que se hace con las <link href=\"http://"
+"es.wikipedia.org/wiki/Expresi%C3%B3n_regular\">expresiones regulares</link>, "
+"saque provecho aquí de su poderío, esta opción le permite hacer búsquedas de "
+"patrones complejos de letras de manera que, por ejemplo, podría encontrar "
+"todas las palabras que empiezan o acaban con «m» y tienen entre seis y "
+"quince letras de longitud, o distinguir todos los mensajes que tengan "
+"duplicada una determinada cabecera. Para saber cómo usar las expresiones "
+"regulares examine la página del manual del comando «grep»."
+
+#: C/mail-search-folders-conditions.page:87(p)
+msgid "Message Location:"
+msgstr "Ubicación del mensaje:"
+
+#: C/mail-search-folders-conditions.page:90(p)
+#: C/mail-filters-conditions.page:96(p)
+msgid "Match All:"
+msgstr "Coincidir con todo:"
+
+#: C/mail-search-folders-add.page:5(desc)
+msgid "Setting up a search folder."
+msgstr "Configurar una carpeta de búsqueda."
+
+#: C/mail-search-folders-add.page:23(title)
+msgid "Creating A Search Folder"
+msgstr "Crear una carpeta de búsqueda"
+
+#: C/mail-search-folders-add.page:26(p)
+msgid ""
+"Click <guiseq><gui>Edit</gui><gui>Search Folders</gui></guiseq>, or click "
+"<guiseq><gui>Message</gui><gui>Create Rule</gui></guiseq> and select the "
+"criterion the search folder will be based on, or if you have run a search, "
+"click <guiseq><gui>Search</gui><gui>Create Search Folder From Search...</"
+"gui></guiseq>."
+msgstr ""
+"Pulse <guiseq><gui>Editar</gui><gui>Carpetas de búsqueda</gui></guiseq> o "
+"pulse <guiseq><gui>Mensaje</gui><gui>Crear regla</gui></guiseq> y seleccione "
+"el criterio en el que se basará la carpeta de búsqueda o si ha ejecutado una "
+"búsqueda, pulse <guiseq><gui>Buscar</gui><gui>Crear una carpeta de búsqueda "
+"desde la búsqueda...</gui></guiseq>."
+
+#: C/mail-search-folders-add.page:27(p) C/mail-filters.page:37(p)
+msgid "Click <gui style=\"button\">Add</gui>."
+msgstr "Pulse <gui style=\"button\">Añadir</gui>."
+
+#: C/mail-search-folders-add.page:28(p) C/mail-filters.page:38(p)
+msgid "Enter a name in the <gui>Rule name</gui> field."
+msgstr "Introduzca un nombre en el campo <gui>Nombre de la regla</gui>."
+
+#: C/mail-search-folders-add.page:29(p) C/mail-filters.page:39(p)
+msgid ""
+"Define the conditions for the rule. For each condition, you first select "
+"which part of the message will be checked and then define the comparison."
+msgstr ""
+"Defina las condiciones para la regla. Para cada condición debe seleccionar "
+"primero qué parte del mensaje se comprobará y después definir la comparación."
+
+#: C/mail-search-folders-add.page:29(p)
+msgid ""
+"For more information on the available conditions see <link xref=\"mail-"
+"search-folders-conditions\">Available Search Folder conditions</link>."
+msgstr ""
+"Para obtener más información acerca de las condiciones disponibles, consulte "
+"<link xref=\"mail-search-folders-conditions\">condiciones disponibles para "
+"las carpetas de búsqueda</link>."
+
+#: C/mail-search-folders-add.page:30(p) C/mail-filters.page:40(p)
+msgid ""
+"If you want to define multiple conditions, define under <gui>Find items</"
+"gui> if any or if all conditions have to apply, and click <gui style=\"button"
+"\">Add Condition</gui> and repeat the previous step."
+msgstr ""
+"Si quiere definir varias condiciones, defínalas bajo <gui>Buscar elementos</"
+"gui> si se debe aplicar una o todas las condiciones y pulse <gui style="
+"\"button\">Añadir condición</gui> y repita el paso anterior."
+
+#: C/mail-search-folders-add.page:31(p)
+msgid ""
+"Select which folders will be used for the search folder in the section "
+"<gui>Search Folder Sources</gui>. Options are:"
+msgstr ""
+"Seleccione qué carpetas usará la carpeta de búsqueda en la sección "
+"<gui>Orígenes de las carpetas de búsqueda</gui>. Las opciones son:"
+
+#: C/mail-search-folders-add.page:33(p)
+msgid "All local folders:"
+msgstr "Todas las carpetas locales:"
+
+#: C/mail-search-folders-add.page:34(p)
+msgid ""
+"Uses all local folders for the search folder source in addition to "
+"individual folders that are selected."
+msgstr ""
+"Usa todas las carpetas locales para la fuente de la carpeta de búsqueda, "
+"además de las carpetas individuales seleccionadas."
+
+#: C/mail-search-folders-add.page:36(p)
+msgid "All active remote folders:"
+msgstr "Todas las carpetas remotas activas:"
+
+#: C/mail-search-folders-add.page:37(p)
+msgid ""
+"Remote folders are considered active if you are connected to the server; you "
+"must be connected to your mail server for the search folder to include any "
+"messages from that source in addition to individual folders that are "
+"selected."
+msgstr ""
+"Las carpetas remotas se consideran activas mientras está conectado al "
+"servidor; debe conectarse al servidor de correo de su carpeta de búsqueda "
+"para poder incluir cualquier mensaje de dicho origen además de las carpetas "
+"individuales seleccionadas."
+
+#: C/mail-search-folders-add.page:39(p)
+msgid "All local and active remote folders:"
+msgstr "Todas las carpetas locales y remotas activas:"
+
+#: C/mail-search-folders-add.page:40(p)
+msgid ""
+"Uses all local and active remote folders for the search folder source in "
+"addition to individual folders that are selected."
+msgstr ""
+"Usa todas las carpetas activas remotas y locales para la fuente de la "
+"carpeta de búsqueda, además de las carpetas individuales seleccionadas."
+
+#: C/mail-search-folders-add.page:42(p)
+msgid "Specific folders only:"
+msgstr "Únicamente carpetas especificadas:"
+
+#: C/mail-search-folders-add.page:43(p)
+msgid ""
+"Uses individual folders for the search folder source. In this case, click "
+"the <gui style=\"button\">Add</gui> to select folders."
+msgstr ""
+"Usa carpetas individuales para la fuente de la carpeta de búsqueda. En este "
+"caso, pulse <gui style=\"button\">Añadir</gui> para seleccionar las carpetas."
+
+#: C/mail-refresh-folders.page:5(desc)
+msgid "Ways to update your Evolution folders."
+msgstr "Formas de actualizar sus carpetas de Evolution."
+
+#: C/mail-refresh-folders.page:20(title)
+msgid "Updating/refreshing the folders on the mail server"
+msgstr "Actualizar las carpetas en el servidor de correo"
+
+#: C/mail-refresh-folders.page:22(p)
+msgid ""
+"To make sure that your local email folders are updated, go to "
+"<guiseq><gui>Folder</gui><gui>Refresh</gui></guiseq>. This will ensure that "
+"all of your emails have been downloaded from the mail server onto your "
+"computer so that you can read them all, and that the read status is synced "
+"with the mail server."
+msgstr ""
+"Para asegurarse de que sus carpetas de correo local se actualizan, vaya a "
+"<guiseq><gui>Carpeta</gui><gui>Actualizar</gui></guiseq>. Esto asegurará que "
+"se descarguen todos sus correos del servidor de correo a su equipo para que "
+"pueda leerlos todos y que el estado de lectura se sincroniza con el correo "
+"en el servidor."
+
+#: C/mail-refresh-folders.page:24(p)
+msgid ""
+"You can also double-click on the folder name to refresh it, or press "
+"<key>F5</key>."
+msgstr ""
+"También puede pulsar dos veces en el nombre de la carpeta para actualizarla, "
+"o pulsar <key>F5</key>."
+
+#: C/mail-recognized-thread-related-headers.page:5(desc)
+msgid "Which thread-related headers are recognized by Evolution."
+msgstr "Qué cabeceras relacionadas con conversaciones reconoce Evolution."
+
+#: C/mail-recognized-thread-related-headers.page:20(title)
+msgid "Thread related headers recognized by Evolution"
+msgstr "Cabeceras relacionadas con conversaciones reconocidas por Evolution"
+
+#: C/mail-recognized-thread-related-headers.page:22(p)
+msgid "Evolution supports the following headers:"
+msgstr "Evolution soporta las siguientes cabeceras:"
+
+#: C/mail-recognized-thread-related-headers.page:24(p)
+msgid "References"
+msgstr "Referencias («References»)"
+
+#: C/mail-recognized-thread-related-headers.page:25(p)
+msgid "In-Reply-To"
+msgstr "En respuesta a («In-Reply-To»)"
+
+#: C/mail-recognized-thread-related-headers.page:29(p)
+msgid ""
+"<gui>Thread-*</gui> headers are Microsoft's proprietary headers and not "
+"supported."
+msgstr ""
+"Microsoft es propietaria de las cabeceras <gui>Thread-*</gui> y no están "
+"soportadas."
+
+#: C/mail-receiving-options-usenet-news.page:5(desc)
+msgid "Receiving options for Usenet news accounts."
+msgstr "Opciones de recepción para cuentas de noticias de Usenet."
+
+#: C/mail-receiving-options-usenet-news.page:23(title)
+msgid "Usenet news receiving options"
+msgstr "Opciones de recepción de noticias de Usenet"
+
+#: C/mail-receiving-options-usenet-news.page:26(title)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:23(title)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:23(title)
+#: C/mail-receiving-options-pop.page:30(title)
+#: C/mail-receiving-options-novell-groupwise.page:27(title)
+#: C/mail-receiving-options-mh-format-directories.page:23(title)
+#: C/mail-receiving-options-maildir-format-directories.page:23(title)
+#: C/mail-receiving-options-local-delivery.page:23(title)
+#: 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-evolution-exchange.page:26(title)
+#: C/intro-first-run.page:36(title)
+msgid "Receiving Email"
+msgstr "Recepción de correo"
+
+#: C/mail-receiving-options-usenet-news.page:28(p)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:25(p)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:25(p)
+#: C/mail-receiving-options-pop.page:32(p)
+#: C/mail-receiving-options-novell-groupwise.page:29(p)
+#: C/mail-receiving-options-mh-format-directories.page:25(p)
+#: C/mail-receiving-options-maildir-format-directories.page:25(p)
+#: C/mail-receiving-options-local-delivery.page:25(p)
+#: 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-evolution-exchange.page:28(p)
+msgid ""
+"On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style=\"button"
+"\">Edit</gui><gui>Receiving Email</gui></guiseq>):"
+msgstr ""
+"En la página <gui>Recepción de correo</gui> (accesible a través de "
+"<guiseq><gui>Editar</gui><gui>Preferencias</gui><gui>Cuentas de correo</"
+"gui><gui style=\"button\">Editar</gui><gui>Recepción de correo</gui></"
+"guiseq>):"
+
+#: C/mail-receiving-options-usenet-news.page:31(p)
+#: C/mail-receiving-options-pop.page:35(p)
+#: C/mail-receiving-options-novell-groupwise.page:32(p)
+#: C/mail-receiving-options-imap-plus.page:31(p)
+#: C/mail-receiving-options-imap.page:31(p)
+#: C/mail-receiving-options-exchange-mapi.page:28(p)
+msgid ""
+"Enter the address of the email server in the <gui>Server</gui> field and "
+"enter your username for that server."
+msgstr ""
+"Introduzca la dirección del servidor de correo electrónico en el campo "
+"<gui>Servidor</gui> e introduzca su nombre de usuario para ese servidor."
+
+#: C/mail-receiving-options-usenet-news.page:32(p)
+#: C/mail-receiving-options-pop.page:36(p)
+#: C/mail-receiving-options-novell-groupwise.page:33(p)
+#: C/mail-receiving-options-imap-plus.page:32(p)
+#: C/mail-receiving-options-imap.page:32(p)
+#: C/mail-receiving-options-exchange-mapi.page:32(p)
+msgid "Select if you want to use a secure connection (SSL or TLS)."
+msgstr "Seleccione su quiere usar una conexión segura (SSL o TLS)."
+
+#: C/mail-receiving-options-usenet-news.page:32(p)
+#: C/mail-receiving-options-pop.page:36(p)
+#: C/mail-receiving-options-novell-groupwise.page:33(p)
+#: C/mail-receiving-options-imap-plus.page:32(p)
+#: C/mail-receiving-options-imap.page:32(p)
+msgid "You should enable this option if your server supports it."
+msgstr "Debería activar esta opción si su servidor la soporta."
+
+#: C/mail-receiving-options-usenet-news.page:34(p)
+#: C/mail-receiving-options-pop.page:38(p)
+#: C/mail-receiving-options-novell-groupwise.page:35(p)
+#: 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-evolution-exchange.page:35(p)
+msgid ""
+"Select your authentication type in the Authentication list, or click <gui "
+"style=\"button\">Check for Supported Types</gui> to have Evolution check for "
+"supported authentication mechanisms. Some servers do not announce the "
+"authentication mechanisms they support, so clicking this button is not a "
+"guarantee that available mechanisms actually work."
+msgstr ""
+"Seleccione el tipo de autenticación en la lista de Autenticación o pulse "
+"<gui style=\"button\">Comprobar tipos soportados</gui> para que Evolution "
+"compruebe qué tipos están soportados. Algunos servidores no informan de qué "
+"mecanismos de autenticación soportan esto, así que pulsar este botón no "
+"garantiza que los mecanismos disponibles actualmente funcionen."
+
+#: C/mail-receiving-options-usenet-news.page:35(p)
+#: C/mail-receiving-options-pop.page:40(p)
+#: C/mail-receiving-options-novell-groupwise.page:36(p)
+#: C/mail-receiving-options-imap-plus.page:35(p)
+#: C/mail-receiving-options-imap.page:35(p)
+msgid "Select if you want Evolution to remember your password."
+msgstr "Marque si quiere que Evolution recuerde su contraseña."
+
+#: C/mail-receiving-options-usenet-news.page:41(title)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:34(title)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:34(title)
+#: C/mail-receiving-options-pop.page:46(title)
+#: C/mail-receiving-options-novell-groupwise.page:42(title)
+#: C/mail-receiving-options-mh-format-directories.page:34(title)
+#: C/mail-receiving-options-maildir-format-directories.page:34(title)
+#: C/mail-receiving-options-local-delivery.page:34(title)
+#: 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-evolution-exchange.page:42(title)
+msgid "Receiving Options"
+msgstr "Opciones de recepción"
+
+#: C/mail-receiving-options-usenet-news.page:43(p)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:36(p)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:36(p)
+#: C/mail-receiving-options-pop.page:48(p)
+#: C/mail-receiving-options-novell-groupwise.page:44(p)
+#: C/mail-receiving-options-mh-format-directories.page:36(p)
+#: C/mail-receiving-options-maildir-format-directories.page:36(p)
+#: C/mail-receiving-options-local-delivery.page:36(p)
+#: 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-evolution-exchange.page:44(p)
+msgid ""
+"On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style=\"button"
+"\">Edit</gui><gui>Receiving Options</gui></guiseq>):"
+msgstr ""
+"En la página <gui>Recepción de correo</gui> (accesible a través de "
+"<guiseq><gui>Editar</gui><gui>Preferencias</gui><gui>Cuentas de correo</"
+"gui><gui style=\"button\">Editar</gui><gui>Recepción de correo</gui></"
+"guiseq>):"
+
+#: C/mail-receiving-options-usenet-news.page:46(p)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:39(p)
+#: C/mail-receiving-options-pop.page:51(p)
+#: C/mail-receiving-options-novell-groupwise.page:47(p)
+#: C/mail-receiving-options-mh-format-directories.page:39(p)
+#: C/mail-receiving-options-maildir-format-directories.page:39(p)
+#: C/mail-receiving-options-local-delivery.page:39(p)
+#: 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-evolution-exchange.page:47(p)
+msgid ""
+"If you want Evolution to check automatically for new messages, click the "
+"<gui>Check for new messages every ... minutes</gui> option and select the "
+"frequency in minutes."
+msgstr ""
+"Si quiere que Evolution compruebe automáticamente si hay correo nuevo, "
+"seleccione la opción <gui>Comprobar si hay mensajes nuevos cada ... minutos</"
+"gui> y seleccione la frecuencia en minutos."
+
+#: C/mail-receiving-options-usenet-news.page:47(p)
+msgid "Select if you want to show folders in short notation."
+msgstr "Seleccione si quiere mostrar las carpetas en notación corta."
+
+#: C/mail-receiving-options-usenet-news.page:48(p)
+msgid "For example, comp.os.linux would appear as c.o.linux."
+msgstr "Por ejemplo, com.os.linux aparecería como c.o.linux."
+
+#: C/mail-receiving-options-usenet-news.page:49(p)
+msgid ""
+"Select if you want to show relative folder names in the <link xref=\"mail-"
+"imap-subscriptions\">subscriptions window</link>."
+msgstr ""
+"Seleccione si quiere mostrar los nombres de carpetas relativos en la <link "
+"xref=\"mail-imap-subscriptions\">ventana de suscripciones</link>."
+
+#: C/mail-receiving-options-usenet-news.page:50(p)
+msgid ""
+"If you select to show relative folder names, only the name of the folder is "
+"displayed. For example the folder evolution.mail would appear as evolution."
+msgstr ""
+"Si selecciona mostrar nombres de carpetas relativos sólo se muestra el "
+"nombre de la carpeta. Por ejemplo, la carpeta evolution.mail aparecería como "
+"evolution."
+
+#. TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage.
+#: C/mail-receiving-options-usenet-news.page:57(p)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:47(p)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:46(p)
+#: C/mail-receiving-options-pop.page:60(p)
+#: C/mail-receiving-options-novell-groupwise.page:56(p)
+#: C/mail-receiving-options-mh-format-directories.page:46(p)
+#: C/mail-receiving-options-maildir-format-directories.page:47(p)
+#: C/mail-receiving-options-local-delivery.page:46(p)
+#: 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-evolution-exchange.page:58(p)
+msgid ""
+"If you came to this page from the first-run wizard help page, click <link "
+"xref=\"intro-first-run#sending\">here</link> to continue with the next step."
+msgstr ""
+"Si ha llegado a esta página desde la página del asistente de primera "
+"ejecución, pulse <link xref=\"intro-first-run#sending\">aquí</link> para "
+"continuar con el siguiente paso."
+
+#: C/mail-receiving-options-unix-mbox-spool-file.page:5(desc)
+msgid "Receiving options for standard Unix mbox spool file accounts."
+msgstr "Opciones de recepción para el archivo spool mbox estándar de Unix."
+
+#: C/mail-receiving-options-unix-mbox-spool-file.page:20(title)
+msgid "Standard Unix mbox spool file receiving options"
+msgstr "Opciones de recepción para el archivo spool mbox estándar de Unix"
+
+#: C/mail-receiving-options-unix-mbox-spool-file.page:28(p)
+#: C/mail-receiving-options-local-delivery.page:28(p)
+msgid ""
+"Choose the file by clicking on the button next to <gui>File</gui> in the "
+"<gui>Configuration</gui> section. This will open a file chooser window."
+msgstr ""
+"Elija el campo pulsando en el botón junto a <gui>Ruta</gui> en la sección "
+"<gui>Configuración</gui>. Esto abrirá una ventana del selector de archivos."
+
+#: C/mail-receiving-options-unix-mbox-spool-file.page:40(p)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:39(p)
+#: C/mail-receiving-options-maildir-format-directories.page:40(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</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-unix-mbox-spool-directory.page:5(desc)
+msgid "Receiving options for standard Unix mbox spool directory accounts."
+msgstr ""
+"Opciones de recepción para las cuentas de carpetas spool mbox estándar de "
+"Unix."
+
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:20(title)
+msgid "Standard Unix mbox spool directory receiving options"
+msgstr ""
+"Opciones de recepción para directorios de correo mbox en formato estándar de "
+"Unix"
+
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:28(p)
+#: C/mail-receiving-options-mh-format-directories.page:28(p)
+#: C/mail-receiving-options-maildir-format-directories.page:28(p)
+msgid ""
+"Choose the directory by clicking on the button next to <gui>Path</gui> in "
+"the <gui>Configuration</gui> section. Some default folders are available in "
+"the list. If the directory is not among those folders, choose the last "
+"option <gui>Other...</gui>. This will open a directory chooser window."
+msgstr ""
+"Elija el directorio pulsando el botón junto a <gui>Ruta</gui> en la sección "
+"<gui>Configuración</gui>. Existen algunas carpetas predeterminadas en la "
+"lista. Si el directorio no está entre esas carpetas, elija la última opción "
+"<gui>Otras...</gui>. Esto abrirá una ventana de selección de directorio."
+
+#: C/mail-receiving-options-pop.page:5(desc)
+msgid "Receiving options for POP accounts."
+msgstr "Opciones de recepción para cuentas POP."
+
+#: C/mail-receiving-options-pop.page:27(title)
+msgid "POP receiving options"
+msgstr "Opciones de recepción POP"
+
+#: C/mail-receiving-options-pop.page:52(p)
+msgid ""
+"If you want the messages to remain on the server for a period of time, click "
+"the <gui>Leave messages on server</gui> option and the <gui>Delete after ... "
+"days</gui> option and select the number of days to allow messages to remain "
+"on the server."
+msgstr ""
+"Si quiere dejar los mensajes en el servidor por un periodo de tiempo, marque "
+"la opciones <gui>Dejar mensajes en el servidor</gui> y <gui>Eliminar después "
+"de ... días</gui> y seleccione el número de días que los mensajes se "
+"almacenarán en el servidor."
+
+#: C/mail-receiving-options-pop.page:53(p)
+msgid ""
+"The option <gui>Disable support for all POP3 extensions</gui> is only useful "
+"when accessing old or misconfigured mail servers. <link href=\"https://tools."
+"ietf.org/html/rfc2449\">POP3 extensions</link> provide enhanced "
+"functionality, however only some servers support them. In case of problems "
+"with receiving mail, enabling this setting might help."
+msgstr ""
+"La opción <gui>Desactivar soporte para todas las extensiones POP3</gui> sólo "
+"es útil al acceder a servidores de correo mal configurados o antiguos. Las "
+"<link href=\"https://tools.ietf.org/html/rfc2449\">extensiones POP3</link> "
+"proporcionan funcionalidades extendidas, no obstante sólo algunos servidores "
+"las soportan. Puede que si tiene problemas al recibir correo, activar esta "
+"opción le ayude."
+
+#: C/mail-receiving-options.page:5(desc)
+msgid "Available mail receiving options for several server types."
+msgstr "Opciones de recepción de correo para diversos tipos de servidores."
+
+#: C/mail-receiving-options.page:18(title)
+msgid "Mail Receiving Options"
+msgstr "Opciones de recepción de correo"
+
+#: C/mail-receiving-options.page:21(title) C/intro-first-run.page:42(title)
+msgid "Common server types"
+msgstr "Tipos comunes de servidor"
+
+#: C/mail-receiving-options.page:24(title) C/intro-first-run.page:55(title)
+msgid "Corporate server types"
+msgstr "Tipos de servidor corporativos"
+
+#: C/mail-receiving-options.page:27(title) C/intro-first-run.page:70(title)
+msgid "Local account server types"
+msgstr "Tipos de servidor de cuentas locales"
+
+#: C/mail-receiving-options-novell-groupwise.page:5(desc)
+msgid "Receiving options for Novell Groupwise accounts."
+msgstr "Opciones de recepción para cuentas Novell Groupwise."
+
+#: C/mail-receiving-options-novell-groupwise.page:24(title)
+msgid "Novell Groupwise receiving options"
+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-evolution-exchange.page:34(p)
+msgid ""
+"If you are in an organizational environment, you may want to contact your "
+"system administrator for more information."
+msgstr ""
+"Si está en un acontecimiento organizado puede que quiera contactar con el "
+"administrador de su sistema para obtener más información."
+
+#: C/mail-receiving-options-novell-groupwise.page:48(p)
+msgid "Enter the Post Office Agent SOAP port."
+msgstr "Introduzca el puerto del Agente SOAP de Oficina de correos."
+
+#: C/mail-receiving-options-novell-groupwise.page:49(p)
+msgid ""
+"If you are unsure what your Post Office Agent SOAP port is, contact your "
+"system administrator."
 msgstr ""
-"Navegue por la lista de mensajes usando las teclas de flechas en el teclado. "
-"Para ir al siguiente mensaje no leído o al anterior, pulse el punto (.) o la "
-"coma (,) respectivamente. En muchos teclados estas teclas también están "
-"marcadas con los símbolos &gt; y &lt;, una manera conveniente de recordarle "
-"que se mueve adelante y atrás en la lista de mensajes. También puede usar el "
-"corchete derecho (]) para el siguiente mensaje no leído y el corchete "
-"izquierdo ([) para el mensaje anterior no leído."
+"Si no está seguro de qué puerto es para su Agente SOAP de Oficina de "
+"Correos, contacte con su administrador de sistemas."
 
+#: C/mail-receiving-options-mh-format-directories.page:5(desc)
+msgid "Receiving options for MH-format mail directories accounts."
+>>>>>>> master
+msgstr ""
+"Opciones de recepción para las cuentas de directorios de correo en formato "
+"MH."
+
+<<<<<<< HEAD
 #: C/mail-reading-keyboard-shortcuts.page:47(title)
 msgid "Navigating in unread mail across folders"
 msgstr "Navegar por el correo sin leer en las carpetas"
@@ -4312,13 +6544,49 @@ msgstr ""
 "siguiente manera:"
 
 #: C/mail-reading-keyboard-shortcuts.page:53(p)
+=======
+#: C/mail-receiving-options-mh-format-directories.page:20(title)
+msgid "MH-format mail directories receiving options"
+msgstr "Opciones de recepción para directorios de correo en formato MH"
+
+#: C/mail-receiving-options-maildir-format-directories.page:5(desc)
+msgid "Receiving options for Maildir-format mail directories accounts."
+msgstr ""
+"Opciones de recepción para cuentas de directorios de correo en formato "
+"Maildir."
+
+#: C/mail-receiving-options-maildir-format-directories.page:20(title)
+msgid "Maildir-format mail directories receiving options"
+msgstr "Opciones de recepción para directorios de correo en formato Maildir"
+
+#: C/mail-receiving-options-local-delivery.page:5(desc)
+msgid "Receiving options for Local delivery accounts."
+msgstr "Opciones de recepción para cuentas de envío de correo local."
+
+#: C/mail-receiving-options-local-delivery.page:20(title)
+msgid "Local delivery receiving options"
+msgstr "Opciones de recepción para envío local"
+
+#: C/mail-receiving-options-imap-plus.page:5(desc)
+msgid "Receiving options for IMAP+ accounts."
+msgstr "Opciones de recepción para cuentas IMAP+."
+
+#: C/mail-receiving-options-imap-plus.page:23(title)
+msgid "IMAP+ receiving options"
+msgstr "Opciones de recepción IMAP+"
+
+#: C/mail-receiving-options-imap-plus.page:47(p)
+>>>>>>> master
 msgid ""
-"When you press the Spacebar for the first time, it takes you to the next "
-"unread message."
+"Select \"Use Quick Resync\" if the IMAP server supports <link href=\"http://"
+"tools.ietf.org/html/rfc5162\">IMAP4 Extensions for Quick Mailbox "
+"Resynchronization</link>."
 msgstr ""
-"Al pulsar la barra espaciadora la primera vez, le llevará al siguiente "
-"correo no leído."
+"Seleccione «Usar resincronización rápida si el servidor lo soporta» <link "
+"href=\"http://tools.ietf.org/html/rfc5162\">Extensiones IMAP4 para "
+"resincronización rápida de buzón de correo</link>."
 
+<<<<<<< HEAD
 #: C/mail-reading-keyboard-shortcuts.page:54(p)
 msgid ""
 "If the message is more than one screen long, the Spacebar works as <key>Page "
@@ -4328,32 +6596,52 @@ msgstr ""
 "como <key>Avanzar Página</key>."
 
 #: C/mail-reading-keyboard-shortcuts.page:55(p)
+=======
+#: C/mail-receiving-options-imap-plus.page:48(p)
+#: C/mail-receiving-options-imap.page:47(p)
 msgid ""
-"If you press the Spacebar after you reach the bottom of the page, it takes "
-"you to the next unread message."
+"You can also define if Evolution checks for new messages in all folders, or "
+"only in subscribed folders."
 msgstr ""
-"Si pulsa la barra espaciadora cuando ha llegado al final de la página, le "
-"lleva al siguiente mensaje no leído."
+"También puede definir si Evolution debe comprobar si existe correo nuevo en "
+"todas sus carpetas o solo en las carpetas suscritas."
+
+#: C/mail-receiving-options-imap-plus.page:49(p)
+#: C/mail-receiving-options-imap.page:48(p)
+>>>>>>> master
+msgid ""
+"Select if you want Evolution to use custom commands to connect to the IMAP "
+"server."
+msgstr ""
+"Seleccione si quiere que Evolution use comandos personalizados para "
+"conectarse al servidor IMAP."
 
+<<<<<<< HEAD
 #: C/mail-reading-keyboard-shortcuts.page:56(p)
+=======
+#: C/mail-receiving-options-imap-plus.page:50(p)
+#: C/mail-receiving-options-imap.page:49(p)
+>>>>>>> master
 msgid ""
-"If there are no more unread messages in the mailbox, pressing the Spacebar "
-"takes you to the next unread message in the next folder."
+"Select if you want Evolution to show only <link xref=\"mail-imap-"
+"subscriptions\">subscribed folders</link>."
 msgstr ""
-"Si no hay más mensajes sin leer en el buzón de correo, la barra espaciadora "
-"le lleva al siguiente mensaje sin leer en la siguiente carpeta."
+"Seleccione si quiere que Evolution sólo muestre las <link xref=\"mail-imap-"
+"subscriptions\">carpetas suscritas</link>."
 
+<<<<<<< HEAD
 #: C/mail-reading-keyboard-shortcuts.page:57(p)
+=======
+#: C/mail-receiving-options-imap-plus.page:51(p)
+#: C/mail-receiving-options-imap.page:50(p)
+>>>>>>> master
 msgid ""
-"If new messages arrive in a number of folders, the Spacebar toggles between "
-"those folders. This feature allows you to switch to the next unread message "
-"in a different folder without clicking the folder."
+"Select if you want Evolution to override server-supplied folder namespaces."
 msgstr ""
-"Si tiene correo nuevo en varias carpetas diferentes, la barra espaciadora "
-"conmuta entre esas carpetas. Esta característica le permite cambiar al "
-"siguiente mensaje no leído en una carpeta diferente sin tener que pulsar "
-"sobre la carpeta."
+"Marque si quiere que Evolution no haga caso de los espacios de nombres de "
+"carpetas suministrados por el servidor."
 
+<<<<<<< HEAD
 #: C/mail-organizing.page:5(desc)
 msgid "On folders, sorting, searching, filters, search folders, and labels."
 msgstr ""
@@ -6424,6 +8712,1983 @@ msgstr ""
 "cómo enviar mensajes a más de una persona."
 
 #: C/mail-composer-write-new-message.page:29(p)
+=======
+#: C/mail-receiving-options-imap.page:5(desc)
+msgid "Receiving options for IMAP accounts."
+msgstr "Opciones de recepción para cuentas IMAP."
+
+#: C/mail-receiving-options-imap.page:23(title)
+msgid "IMAP receiving options"
+msgstr "Opciones de recepción IMAP"
+
+#: C/mail-receiving-options-exchange-mapi.page:5(desc)
+msgid "Receiving options for Exchange MAPI accounts."
+msgstr "Opciones de recepción para cuentas Exchange MAPI."
+
+#: C/mail-receiving-options-exchange-mapi.page:20(title)
+msgid "Exchange MAPI receiving options"
+msgstr "Opciones de recepción Exchange MAPI"
+
+#: C/mail-receiving-options-exchange-mapi.page:29(p)
+msgid "Enter the Domain name for that server."
+msgstr "Introduzca el nombre de dominio para ese servidor."
+
+#: C/mail-receiving-options-exchange-mapi.page:33(p)
+#: C/mail-receiving-options-evolution-exchange.page:36(p)
+msgid "Click <gui style=\"button\">Authenticate</gui> and enter your password."
+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-evolution-exchange.page:48(p)
+msgid ""
+"You can also define if Evolution checks for new messages in all folders."
+msgstr ""
+"También puede definir si quiere que Evolution compruebe si hay mensajes "
+"nuevos en todas las carpetas."
+
+#: 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."
+
+#: C/mail-receiving-options-evolution-exchange.page:23(title)
+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."
+
+#: C/mail-receiving-options-evolution-exchange.page:33(p)
+msgid ""
+"Select if the mailbox name is different from the username. If it is, enter "
+"the mailbox name."
+msgstr ""
+"Seleccione si el nombre del buzón de correo es diferente del nombre de "
+"usuario. De serlo, introduzca el nombre del buzón."
+
+#: C/mail-receiving-options-evolution-exchange.page:49(p)
+msgid ""
+"In the section <gui>Global Address List/Active Directory</gui>, specify the "
+"name of the Global Catalog server. The Global Catalog Server contains the "
+"user information for users."
+msgstr ""
+"En la sección <gui>Lista de acceso global/Directorio Activo</gui> "
+"especifique el nombre del servidor del catálogo global. El servidor del "
+"catálogo global contiene la información de los usuarios."
+
+#: C/mail-receiving-options-evolution-exchange.page:50(p)
+msgid ""
+"Select if you want to limit the number of Global Address List (GAL) "
+"responses as this may increase speed. The GAL contains a list of all email "
+"addresses."
+msgstr ""
+"Seleccione si quiere limitar el número de respuestas de Listas de "
+"direcciones globales (GAL) ya puede aumentar la velocidad. Las GAL contienen "
+"una lista de todas las direcciones de correo-e."
+
+#: C/mail-receiving-options-evolution-exchange.page:51(p)
+msgid ""
+"You also have to define the Authentication type, and whether you want groups "
+"of contacts in GAL to be represented in the Evolution address book by <link "
+"xref=\"contacts-using-contact-lists\">contact lists</link>."
+msgstr ""
+"También tiene que definir el tipo de Autenticación y si quiere que los "
+"grupos de contactos en GAL se muestren en la libreta de direcciones de "
+"Evolution a través de <link xref=\"contacts-using-contact-lists\">listas de "
+"contactos</link>."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/mail-received-notification.page:24(None)
+msgid ""
+"@@image: './figures/new-mail-switcher.png'; "
+"md5=be4dbdb5f6e3dcbd5111b87169cae268"
+msgstr ""
+"@@image: './figures/new-mail-switcher.png'; "
+"md5=be4dbdb5f6e3dcbd5111b87169cae268"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/mail-received-notification.page:29(None)
+msgid ""
+"@@image: './figures/new-mail-notification.png'; "
+"md5=25a4373da392793406910cd883f0c21c"
+msgstr ""
+"@@image: './figures/new-mail-notification.png'; "
+"md5=25a4373da392793406910cd883f0c21c"
+
+#: C/mail-received-notification.page:5(desc)
+msgid "Options on notifications of newly received mail."
+msgstr "Opciones de notificación para el nuevo correo recibido."
+
+#: C/mail-received-notification.page:20(title)
+msgid "Getting notified of new mail"
+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"
+"\">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>."
+
+#: C/mail-received-notification.page:25(p)
+#: C/mail-received-notification.page:30(p)
+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 "
+"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."
+msgstr ""
+"Asegúrese de que <guiseq><gui>Editar</gui><gui>Complementos</"
+"gui><gui>Notificación de correo</gui></guiseq> está activada y de que ha "
+"configurado sus opciones preferidas en la pestaña <gui>Configuración</gui> "
+"para obtener notificaciones también para los mensajes nuevos en el área de "
+"Notificación de GNOME en la parte inferior de la pantalla."
+
+#: C/mail-read-receipts.page:5(desc)
+msgid "How to enable requesting read receipts."
+msgstr "Cómo activar la solicitud de confirmación de lectura."
+
+#: C/mail-read-receipts.page:33(title)
+msgid "Read receipts for emails"
+msgstr "Confirmación de lectura para correos"
+
+#: C/mail-read-receipts.page:35(p)
+msgid ""
+"Read receipts are a way for people to acknowledge that they have received "
+"your email. The recipient can normally choose whether to acknowledge the "
+"receipt or not, so they are not a completely reliable way of checking if "
+"your emails have been received by someone."
+msgstr ""
+"Las confirmaciones de lectura son una forma para que la gente confirme que "
+"ha recibido su correo. El destinatario puede, por lo general, elegir si "
+"quiere confirmar la lectura o no, de tal forma que no es una forma "
+"completamente segura de saber si alguien ha recibido sus correos."
+
+#: C/mail-read-receipts.page:37(p)
+msgid ""
+"You can request read receipts by enabling this option in the email "
+"composer's menu. To do so, go to <guiseq><gui>Options</gui><gui>Request Read "
+"Receipt</gui></guiseq>."
+msgstr ""
+"Puede solicitar confirmación de lectura activando esta opción en el menú del "
+"editor de correos. Para ello, vaya a <guiseq><gui>Opciones</"
+"gui><gui>Solicitar confirmación de lectura</gui></guiseq>."
+
+#: C/mail-read-receipts.page:39(p)
+msgid ""
+"For read receipts that you receive you can define Evolution's behavior by "
+"going to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
+"gui><gui style=\"button\">Edit</gui><gui>Defaults</gui><gui>Message "
+"Receipts</gui></guiseq>."
+msgstr ""
+"Para las confirmaciones de lectura que reciba puede definir el "
+"comportamiento de Evolution en <guiseq><gui>Editar</gui><gui>Preferencias</"
+"gui><gui>Cuentas de correo</gui><gui style=\"button\">Editar</"
+"gui><gui>Predeterminados</gui><gui>Destinatarios del mensaje</gui></guiseq>."
+
+#: C/mail-reading-keyboard-shortcuts.page:5(desc)
+msgid "Keyboard shortcuts that can save you some time when reading mail."
+msgstr "Atajos de teclado que le pueden ahorrar cierto tiempo al leer correos."
+
+#: C/mail-reading-keyboard-shortcuts.page:24(title)
+msgid "Using shortcut keys to read mail"
+msgstr "Usar atajos de teclado para leer el correo"
+
+#: C/mail-reading-keyboard-shortcuts.page:27(title)
+msgid "Viewing an email"
+msgstr "Ver un correo"
+
+#: C/mail-reading-keyboard-shortcuts.page:28(p)
+msgid ""
+"In the Mail window you read a message by selecting it in the message list. "
+"If you would like to see the message in its own window, either double-click "
+"it, press <key>Enter</key>, or press <keyseq><key>Ctrl</key><key>O</key></"
+"keyseq>."
+msgstr ""
+"Puede leer un correo seleccionándolo en la ventana de la lista de correos. "
+"Si quiere ver el correo en su propia ventana puede pulsar dos veces sobre el "
+"correo, pulsar <key>Intro</key> o pulsar <keyseq><key>Ctrl</key><key>O</"
+"key></keyseq>."
+
+#: C/mail-reading-keyboard-shortcuts.page:32(title)
+msgid "Navigating in a message"
+msgstr "Navegar en un correo"
+
+#: C/mail-reading-keyboard-shortcuts.page:33(p)
+msgid ""
+"To read mail with the keyboard, you can click the <key>Spacebar</key> to "
+"page down and press <key>Backspace</key> to page up while reading an email. "
+"Ensure that you use the keys when the message list is focused."
+msgstr ""
+"Para leer correo con el teclado puede pulsar la <key>barra espaciadora</key> "
+"para avanzar una página y pulsar <key>Retroceso</key> para retroceder una "
+"página mientras lee un correo-e. Asegúrese de que usa las teclas cuando la "
+"lista de mensajes está activada."
+
+#: C/mail-reading-keyboard-shortcuts.page:37(title)
+msgid "Navigating in a folder in the message list"
+msgstr "Navegar en una carpeta en la lista de mensajes"
+
+#: C/mail-reading-keyboard-shortcuts.page:38(p)
+msgid "Navigate in the message list by using the arrow keys on the keyboard."
+msgstr ""
+"Navegar por la lista de mensajes usando las teclas de flecha del teclado."
+
+#: C/mail-reading-keyboard-shortcuts.page:42(title)
+msgid "Navigating in a folder's unread mail in the message list"
+msgstr "Navegar en el correo no leído en una carpeta en la lista de mensajes"
+
+#: C/mail-reading-keyboard-shortcuts.page:43(p)
+msgid ""
+"To go to the next or previous unread messages, press the period (<key>.</"
+"key>) or comma (<key>,</key>) keys. On some keyboards, these keys are also "
+"marked with the <key>&gt;</key> and <key>&lt;</key> symbols, which is a "
+"convenient way to remember that they move you forward and backward in your "
+"message list. You can also use the right square bracket (<key>]</key>) for "
+"the next unread message, and the left square bracket (<key>[</key>) for the "
+"previous unread message."
+msgstr ""
+"Para ir al siguiente mensaje no leído o al anterior, pulse el punto (<key>.</"
+"key>) o la coma (<key>,</key>) respectivamente. En muchos teclados estas "
+"teclas también están marcadas con los símbolos <key>&gt;</key> y <key>&lt;</"
+"key>, una manera conveniente de recordarle que se mueve adelante y atrás en "
+"la lista de mensajes. También puede usar el corchete derecho (<key>]</key>) "
+"para el siguiente mensaje no leído y el corchete izquierdo (<key>[</key>) "
+"para el mensaje anterior no leído."
+
+#: C/mail-reading-keyboard-shortcuts.page:47(title)
+msgid "Navigating in unread mail across folders"
+msgstr "Navegar por el correo sin leer en las carpetas"
+
+#: C/mail-reading-keyboard-shortcuts.page:49(p)
+msgid ""
+"You can easily read the unread messages in all the mail folders by using the "
+"<key>Spacebar</key>."
+msgstr ""
+"Puede ver fácilmente los correos sin leer de todas las carpetas de correo "
+"usando la <key>Barra espaciadora</key>."
+
+#: C/mail-reading-keyboard-shortcuts.page:51(p)
+msgid ""
+"When you are in the Mail window, the Spacebar has the following behavior:"
+msgstr ""
+"Cuando esté en la vista de Correo, la barra espaciadora se comportará de la "
+"siguiente manera:"
+
+#: C/mail-reading-keyboard-shortcuts.page:53(p)
+msgid ""
+"When you press the Spacebar for the first time, it takes you to the next "
+"unread message."
+msgstr ""
+"Al pulsar la barra espaciadora la primera vez, le llevará al siguiente "
+"correo no leído."
+
+#: C/mail-reading-keyboard-shortcuts.page:54(p)
+msgid ""
+"If the message is more than one screen long, the Spacebar works as <key>Page "
+"Down</key>."
+msgstr ""
+"Si el mensaje es más largo que la pantalla, la barra espaciadora funciona "
+"como <key>Avanzar Página</key>."
+
+#: C/mail-reading-keyboard-shortcuts.page:55(p)
+msgid ""
+"If you press the Spacebar after you reach the bottom of the page, it takes "
+"you to the next unread message."
+msgstr ""
+"Si pulsa la barra espaciadora cuando ha llegado al final de la página, le "
+"lleva al siguiente mensaje no leído."
+
+#: C/mail-reading-keyboard-shortcuts.page:56(p)
+msgid ""
+"If there are no more unread messages in the mailbox, pressing the Spacebar "
+"takes you to the next unread message in the next folder."
+msgstr ""
+"Si no hay más mensajes sin leer en el buzón de correo, la barra espaciadora "
+"le lleva al siguiente mensaje sin leer en la siguiente carpeta."
+
+#: C/mail-reading-keyboard-shortcuts.page:57(p)
+msgid ""
+"If new messages arrive in a number of folders, the Spacebar toggles between "
+"those folders. This feature allows you to switch to the next unread message "
+"in a different folder without clicking the folder."
+msgstr ""
+"Si tiene correo nuevo en varias carpetas diferentes, la barra espaciadora "
+"conmuta entre esas carpetas. Esta característica le permite cambiar al "
+"siguiente mensaje no leído en una carpeta diferente sin tener que pulsar "
+"sobre la carpeta."
+
+#: C/mail-organizing.page:5(desc)
+msgid "On folders, sorting, searching, filters, search folders, and labels."
+msgstr ""
+"Acerca de las carpetas, ordenar, buscar, filtros, carpetas de búsqueda y "
+"etiquetas."
+
+#: C/mail-organizing.page:21(title)
+msgid "Sorting and organizing mail"
+msgstr "Ordenar y orgranizar el correo"
+
+#: C/mail-organizing.page:23(p)
+msgid ""
+"Evolution provides several options to organize your mail according to your "
+"needs."
+msgstr ""
+"Evolution proporciona varias opciones para gestionar su correo según sus "
+"necesidades."
+
+#: C/mail-organizing.page:26(title)
+msgid "Advanced Options"
+msgstr "Opciones avanzadas"
+
+#: C/mail-not-sent.page:5(desc)
+msgid "Possible reasons why emails are not sent."
+msgstr "Posibles motivos por los que los correos no se envían."
+
+#: C/mail-not-sent.page:20(title)
+msgid "Mail is not sent"
+msgstr "El correo no se ha enviado"
+
+#: C/mail-not-sent.page:22(p)
+msgid "There can be several reasons why emails are not sent:"
+msgstr "Puede haber varias razones por las que los correos no se envían:"
+
+#: C/mail-not-sent.page:25(p)
+msgid ""
+"Invalid email address. Check if all the addresses listed as mail recipients "
+"are correct. If the message contains a wrong or invalid email address, the "
+"message will not be sent."
+msgstr ""
+"Dirección de correo-e no válida. Compruebe si todas las direcciones listadas "
+"como destinatarios del correo son correctas. Si el correo contiene una "
+"dirección errónea o no válida no se enviará el mensaje."
+
+#: C/mail-not-sent.page:26(p)
+msgid ""
+"Incorrect SMTP settings. Verify if the settings used for outgoing messages "
+"is correct. Using the incorrect server address or authentication method may "
+"prevent emails from being sent"
+msgstr ""
+"Configuración SMTP incorrecta. Compruebe si la configuración usada para los "
+"correos salientes es correcta. Usar una dirección de servidor o un método "
+"incorrecto hará que no se puedan enviar correos."
+
+#: C/mail-not-sent.page:27(p)
+msgid ""
+"Offline status. Evolution may be offline. Check on the <gui style=\"button"
+"\">Send and Receive</gui> button; if it is greyed out, then you are offline. "
+"To go online, go to <guiseq><gui>File</gui><gui>Work online</gui></guiseq>. "
+"You should now be able to use the <gui style=\"button\">Send and Receive</"
+"gui> button."
+msgstr ""
+"Estado desconectado. Evolution puede estar desconectado. Compruebe el botón "
+"<gui style=\"button\">Enviar y recibir</gui>; si está en gris es que está "
+"desconectado. Para conectarse, vaya a <guiseq><gui>Archivo</"
+"gui><gui>Trabajar conectado</gui></guiseq>. Ahora debería poder usar el "
+"botón <gui style=\"button\">Enviar y recibir</gui>."
+
+#: C/mail-moving-emails.page:5(desc)
+msgid "Moving emails from one folder to another."
+msgstr "Mover correos de una carpeta a otra."
+
+#: C/mail-moving-emails.page:24(title)
+msgid "Moved emails are still shown in the original folder"
+msgstr "Los correos movidos aún se muestran en la carpeta original"
+
+#: C/mail-moving-emails.page:26(p)
+msgid ""
+"IMAP has no \"move\" feature. Evolution \"moves\" messages by copying and "
+"deleting emails. Deleting means \"marking messages for deletion\" so all the "
+"original messages are retained until you Expunge the emails marked for "
+"deletion."
+msgstr ""
+"IMAP no dispone de la característica «mover». Evolution «mueve» los mensajes "
+"copiando y eliminando correos. Eliminar significa «marcar correos para "
+"eliminar» de tal forma que los correos originales se mantienen hasta que "
+"purgue los correos marcados para eliminar."
+
+#: C/mail-moving-emails.page:28(p)
+msgid ""
+"See the topic on <link xref=\"mail-delete-and-undelete\">deleting emails</"
+"link> for instructions on how to expunge email messages. Note that this "
+"applies to other types of accounts as well."
+msgstr ""
+"Para obtener instrucciones acerca de cómo purgar mensajes de correo "
+"electrónico, consulte el tema <link xref=\"mail-delete-and-undelete"
+"\">eliminar correos</link>. Note que esto también se aplica a otros tipos de "
+"cuenta."
+
+#: C/mail-layout-changing.page:5(desc)
+msgid ""
+"Changing the display of the mail window (message list columns and "
+"widescreen)."
+msgstr ""
+"Cambiar la visualización de la ventana de correo (lista de mensajes, "
+"columnas y pantalla ancha)."
+
+#: C/mail-layout-changing.page:20(title)
+msgid "Changing the mail window layout"
+msgstr "Cambiar la distribución de la ventana"
+
+#: C/mail-labels.page:5(desc)
+msgid "Use labels to categorize your mail while keeping it in their folders."
+msgstr ""
+"Use las etiquetas para categorizar su correo mientras este se mantiene en su "
+"carpeta correspondiente."
+
+#: C/mail-labels.page:21(title)
+msgid "Using Labels"
+msgstr "Usar etiquetas"
+
+#: C/mail-labels.page:23(p)
+msgid ""
+"You can add colored labels to emails in order to categorize them. This is "
+"similar to <link xref=\"using-categories\">Categories</link> in the other "
+"Evolution windows."
+msgstr ""
+"Puede añadir etiquetas coloreadas a correos para categorizarlos. Es similar "
+"a <link xref=\"using-categories\">Categorías</link> en las otras ventanas de "
+"Evolution."
+
+#: C/mail-labels.page:25(p)
+msgid ""
+"You can search for messages with specific labels by using the <link xref="
+"\"mail-searching\">quick search dropdown</link>. Also, <link xref=\"mail-"
+"search-folders\">search folders</link> can be created based on labels."
+msgstr ""
+"También puede buscar correos por etiquetas específicas usando el <link xref="
+"\"mail-searching\">desplegable de búsqueda rápida</link>. También se pueden "
+"crear <link xref=\"mail-search-folders\">carpetas de búsqueda</link> basadas "
+"en etiquetas."
+
+# index.docbook:41, index.docbook:293

+#: C/mail-labels.page:28(title)
+msgid "Adding a label to a message"
+msgstr "Añadir una etiqueta a un correo"
+
+#: C/mail-labels.page:29(p)
+msgid ""
+"To assign a label to a message, right-click the message, click <gui>Label</"
+"gui>, and choose the label to apply."
+msgstr ""
+"Para asignar una etiqueta a un mensaje, pulse con el botón derecho del ratón "
+"sobre el mensaje, seleccione <gui>Etiqueta</gui> y elija la etiqueta que "
+"quiere aplicar."
+
+#: C/mail-labels.page:30(p)
+msgid "You can also quickly add a new label by choosing <gui>New Label</gui>."
+msgstr ""
+"También puede añadir rápidamente una etiqueta nueva eligiendo <gui>Etiqueta "
+"nueva</gui>."
+
+#: C/mail-labels.page:34(title)
+msgid "Managing labels"
+msgstr "Gestionar las etiquetas"
+
+#: C/mail-labels.page:35(p)
+msgid ""
+"You can add, edit and delete all labels under <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Labels</gui></"
+"guiseq>. Note that you cannot remove the default labels."
+msgstr ""
+"Puede añadir, editar y eliminar etiquetas bajo <guiseq><gui>Editar</"
+"gui><gui>Preferencias</gui><gui>Opciones de correo</gui><gui>Etiquetas</"
+"gui></guiseq>. Note que no puede quitar las etiquetas predeterminadas."
+
+#: C/mail-imap-subscriptions.page:5(desc)
+msgid "IMAP folder subscriptions."
+msgstr "Carpeta IMAP para suscripciones."
+
+#: C/mail-imap-subscriptions.page:26(title)
+msgid "IMAP Subscriptions"
+msgstr "Suscripciones IMAP"
+
+#: C/mail-imap-subscriptions.page:28(p)
+msgid ""
+"As opening many IMAP folders on the server takes time you can define which "
+"IMAP folders to check and display in Evolution, and which ones to ignore for "
+"the time being, via the <gui>IMAP Subscriptions Manager</gui>."
+msgstr ""
+"Ya que abrir muchas carpetas IMAP en el servidor lleva mucho tiempo, puede "
+"definir qué carpetas IMAP comprobar y mostrar en Evolution y cuáles ignorar "
+"por el momento, a través del <gui>Gestor de suscripciones IMAP</gui>."
+
+#: C/mail-imap-subscriptions.page:30(p)
+msgid ""
+"Select <guiseq><gui>Folder</gui><gui>Subscriptions</gui></guiseq>, or right-"
+"click on the top level node of an email account in the folder list and click "
+"<gui>Manage subscriptions</gui>."
+msgstr ""
+"Seleccione <guiseq><gui>Carpeta</gui><gui>Subscripciones</gui></guiseq> o "
+"pulse con el botón derecho del ratón sobre el nodo de nivel superior de una "
+"cuenta de correo-e en la lista de carpetas y pulse <gui>Gestionar "
+"subscripciones</gui>."
+
+#: C/mail-imap-subscriptions.page:32(p)
+msgid ""
+"Evolution displays a list of files and folders available on the IMAP server."
+msgstr ""
+"Evolution mostrará la lista de archivos y carpetas disponibles en el "
+"servidor IMAP."
+
+#: C/mail-imap-subscriptions.page:33(p)
+msgid "Select a file or folder by clicking it."
+msgstr "Seleccione un archivo o carpeta pulsando sobre él."
+
+#: C/mail-imap-subscriptions.page:34(p)
+msgid ""
+"You should select at least the Inbox folder. Depending upon the way your "
+"IMAP server is configured, the list of available files might include non-"
+"mail folders. If it does, you can ignore them."
+msgstr ""
+"Necesitará seleccionar, al menos, la carpeta Bandeja de entrada. En función "
+"de cómo esté configurado su servidor IMAP la lista de archivos disponibles "
+"puede incluir carpetas que no son de correo, que puede ignorar sin mayor "
+"problema."
+
+#: C/mail-imap-subscriptions.page:35(p)
+msgid "Click a folder's checkbox to add a folder to your subscriptions."
+msgstr ""
+"Active la correspondiente casilla de verificación de carpeta para añadir una "
+"carpeta a sus suscripciones."
+
+#: C/mail-imap-headers.page:5(desc)
+msgid "Define which mail headers to download when using IMAP."
+msgstr "Defina qué cabeceras de correo descargar cuando use IMAP."
+
+#: C/mail-imap-headers.page:25(title)
+#: C/mail-account-manage-imap.page:51(title)
+msgid "IMAP Headers"
+msgstr "Cabeceras IMAP"
+
+#: C/mail-imap-headers.page:27(p)
+msgid ""
+"The <gui>IMAP Headers</gui> tab is only displayed in the <gui>Account "
+"Editor</gui> if <guiseq><gui>Edit</gui><gui>Plugins</gui><gui>IMAP Features</"
+"gui></guiseq> is enabled."
+msgstr ""
+"La pestaña <gui>Cabeceras IMAP</gui> sólo se muestra en el <gui>Editor de "
+"cuentas</gui> si <guiseq><gui>Editar</gui><gui>Complementos</"
+"gui><gui>Cabeceras IMAP</gui></guiseq> está activada."
+
+#: C/mail-imap-headers.page:29(p)
+msgid ""
+"Evolution allows you for IMAP accounts to choose the headers that you want "
+"to download so that you can reduce the download time and filter or move your "
+"mail around the way you like it. The IMAP Mail header options are as follows:"
+msgstr ""
+"Evolution le permite elegir para las cuentas IMAP las cabeceras que quiere "
+"descargar para reducir el tiempo de descarga y filtrar o mover sus correos "
+"de la manera que quiera. Las opciones de las cabeceras de correo IMAP son "
+"las siguientes:"
+
+#: C/mail-imap-headers.page:31(p)
+msgid "Fetch All Headers:"
+msgstr "Obtener todas las cabeceras:"
+
+#: C/mail-imap-headers.page:31(p)
+msgid ""
+"All available IMAP mail headers for all the messages will be downloaded."
+msgstr ""
+"Se descargarán todas las cabeceras IMAP disponibles para todos los mensajes."
+
+#: C/mail-imap-headers.page:32(p)
+msgid "Basic Headers (Fastest):"
+msgstr "Cabeceras básicas (lo más rápido):"
+
+#: C/mail-imap-headers.page:32(p)
+msgid ""
+"This will include Date, From, To, CC, Subject, Preferences, In-Reply-To, "
+"Message-ID, Mime-Version, and Content-Type. If you want to just fetch and "
+"see messages without having to categorically filter messages based on your "
+"mailing lists, choose this option. This will make Evolution work faster and "
+"is generally recommended for common users."
+msgstr ""
+"Esto incluirá Fecha, De, Para, Cc, Asunto, Preferencias, Responder a, Id del "
+"mensaje, Versión MIME y Tipo de contenido. Si sólo quiere obtener el correo "
+"y ver los correos sin tener que filtrar los correos por categorías basados "
+"en sus listas de correo, elija esta opción. Esto hará que Evolution trabaje "
+"más rápido y generalmente se recomienda para usuarios normales."
+
+#: C/mail-imap-headers.page:33(p)
+msgid "Basic and Mailing List Headers (Default):"
+msgstr "Cabeceras básicas y de listas de correo (predeterminadas):"
+
+#: C/mail-imap-headers.page:33(p)
+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."
+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 "
+"también las cabeceras que correspondan a listas de correo. Las cabeceras de "
+"las listas de correo contendrán información tal como el ID de la lista de "
+"correo, el propietario de la lista de correo y demás, con lo que puede crear "
+"un filtro para listas de correo."
+
+#: C/mail-imap-headers.page:33(p)
+msgid ""
+"This is the default Header preference that comes with Evolution. When this "
+"option is chosen, Evolution will download a basic set of headers (as "
+"described above) along with a set of headers that are needed for client-side "
+"filters based on mailing lists. If you do not have any filters on Evolution, "
+"it is recommended to switch to the <gui>Basic Headers</gui> option."
+msgstr ""
+"Estas son las preferencias predeterminadas en Evolution para las Cabeceras. "
+"Cuando se elige esta opción, Evolution descargará un juego básico de "
+"cabeceras (como se describió anteriormente) junto con las cabeceras "
+"necesarias para los filtros de correo del cliente, basados en listas de "
+"correo. Si no tiene ningún filtro en Evolution, se recomienda que cambie a "
+"la opción <gui>Cabeceras básicas</gui>."
+
+#: C/mail-imap-headers.page:36(p)
+msgid "To set the IMAP Mail headers:"
+msgstr "Para establecer las cabeceras de correo IMAP:"
+
+#: C/mail-imap-headers.page:38(p)
+#: C/mail-encryption-s-mime-signing-encrypting.page:28(p)
+#: C/mail-encryption-gpg-signing-encrypting.page:30(p)
+#: C/mail-encryption-gpg-set-up.page:29(p)
+msgid ""
+"Select <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
+"gui></guiseq>."
+msgstr ""
+"Seleccione <guiseq><gui>Editar</gui><gui>Preferencias</gui><gui>Cuentas de "
+"correo</gui></guiseq>."
+
+#: C/mail-imap-headers.page:39(p)
+msgid "Select the IMAP account."
+msgstr "Seleccione la cuenta IMAP."
+
+#: C/mail-imap-headers.page:40(p)
+msgid "Click <gui>Edit</gui>."
+msgstr "Pulse <gui>Editar</gui>."
+
+#: C/mail-imap-headers.page:41(p)
+msgid "Click the <gui>IMAP Headers</gui> tab."
+msgstr "Pulse en le pestaña <gui>Cabeceras IMAP</gui>."
+
+#: C/mail-imap-headers.page:42(p)
+msgid ""
+"Optionally: If you want to define extra headers to download you can add "
+"these in the <gui>Custom Headers</gui> section."
+msgstr ""
+"Opcionalmente: si quiere definir cabeceras adicionales para descargar puede "
+"añadirlas en la sección <gui>Cabeceras personalizadas</gui>."
+
+#: C/mail-imap-headers.page:45(p)
+msgid ""
+"The option to define IMAP Headers is currently only available for IMAP "
+"accounts, but not for IMAP+ accounts."
+msgstr ""
+"Actualmente la opción para definir las cabeceras IMAP sólo está disponible "
+"para cuentas IMAP, pero no para cuentas IMAP+."
+
+#: C/mail-follow-up-flag.page:5(desc)
+msgid "Using flags to remind you of actions."
+msgstr "Usar marcadores para recordarle acciones."
+
+#: C/mail-follow-up-flag.page:23(title)
+msgid "Follow up flags for emails"
+msgstr "Marcas para seguimiento de correos"
+
+#: C/mail-follow-up-flag.page:25(p)
+msgid ""
+"To make sure you do not forget about a message, you can use the follow-up "
+"feature."
+msgstr ""
+"Para asegurarse de que no se olvida de un correo, puede usar la "
+"característica Marca de seguimiento."
+
+#: C/mail-follow-up-flag.page:27(p)
+msgid "Select one or more messages."
+msgstr "Seleccione uno o más mensajes."
+
+#: C/mail-follow-up-flag.page:28(p)
+msgid "Right-click one of the messages."
+msgstr "Pulse con el botón derecho sobre uno de los mensajes."
+
+#: C/mail-follow-up-flag.page:29(p)
+msgid "Click <gui>Mark for Follow Up...</gui>."
+msgstr "Pulse <gui>Marca para seguimiento...</gui>."
+
+#: C/mail-follow-up-flag.page:31(p)
+msgid ""
+"You can also do this by selecting the message(s) and clicking "
+"<guiseq><gui>Message</gui><gui>Mark as</gui><gui>Follow Up...</gui></guiseq> "
+"or by pressing <keyseq><key>Shift</key><key>Ctrl</key><key>G</key></keyseq>."
+msgstr ""
+"También puede hacerlo seleccionando el o los mensajes y pulsando "
+"<guiseq><gui>Mensaje</gui><gui>Marcar como</gui><gui>Seguimiento...</gui></"
+"guiseq> o pulsando <keyseq><key>Mayús</key><key>Ctrl</key><key>G</key></"
+"keyseq>."
+
+#: C/mail-follow-up-flag.page:33(p)
+msgid "A window opens to allow you to set the type of flag and the due date."
+msgstr ""
+"Se abrirá una ventana para permitirle establecer el tipo de marca y la fecha "
+"de vencimiento."
+
+#: C/mail-follow-up-flag.page:35(p)
+msgid ""
+"The flag itself is the action you want to remind yourself about, such as "
+"Call, Forward and Reply."
+msgstr ""
+"La marca en si es la acción que quiere que recordarse a si mismo, como "
+"Llamar, Reenviar y Responder."
+
+#: C/mail-follow-up-flag.page:37(p)
+msgid ""
+"After you have added a flag, you can mark it as complete or remove it "
+"entirely by right-clicking the message and clicking either <gui>Flag "
+"Completed</gui> or <gui>Clear Flag</gui>."
+msgstr ""
+"Una vez que ha añadido una marca, puede remarcar el mensaje como terminado o "
+"eliminar la marca pinchando con el botón derecho sobre el mensaje y "
+"eligiendo <gui>Marcar como terminado</gui> o <gui>Quitar marca</gui>."
+
+#: C/mail-follow-up-flag.page:39(p)
+msgid ""
+"When you read a flagged message, its flag status is displayed at the top, "
+"before the message headers. An overdue message might tell you \"Overdue: "
+"Call by April 07, 2012, 5:00 PM.\""
+msgstr ""
+"Cuando lea un mensaje marcado con una bandera, se mostrará su estado en la "
+"parte superior derecha del mismo, antes de la cabecera del mensaje. Al ver "
+"un mensaje atrasado podrá decirle algo como «Atrasado: Llamar antes del 7 de "
+"abril de 2003 a las 17:00»."
+
+#: C/mail-follow-up-flag.page:41(p)
+msgid ""
+"Flags can help you organize your work in a number of ways. For example, you "
+"might <link xref=\"mail-change-columns-in-message-list\">add a Flag Status "
+"column</link> to your message list and sort that way. Alternately, you could "
+"create a <link xref=\"mail-search-folders\">search folder</link> that "
+"displays all your flagged messages, then clear the flags when you're done, "
+"so the search folder contains only messages with upcoming deadlines."
+msgstr ""
+"Las marcas le pueden ayudar a organizar su correo de varias maneras. Por "
+"ejemplo, puede <link xref=\"mail-change-columns-in-message-list\">añadir una "
+"columna de Marca de seguimiento</link> a la lista de mensajes y poder "
+"ordenarlos por ese campo. También puede crear una <link xref=\"mail-search-"
+"folders\">carpeta de búsqueda</link> que muestre todos los mensajes marcados "
+"que tiene y quitarles las marcas cuando haya acabado, de manera que la "
+"carpeta sólo contenga mensajes pendientes."
+
+#: C/mail-follow-up-flag.page:43(p)
+msgid ""
+"If you prefer a simpler way to remind yourself about messages, you can mark "
+"them as important by right-clicking the message, then click <gui>Mark as "
+"Important</gui>, or by selecting <guiseq><gui>Message</gui><gui>Mark as</"
+"gui><gui>Important</gui></guiseq> from the menubar."
+msgstr ""
+"Si prefiere una forma más sencilla de recordarse a sí mismo los mensajes, "
+"puede marcarlos como importantes pulsando con el botón derecho del ratón "
+"sobre el mensaje y después pulsando <gui>Marcar como importante</gui> o "
+"seleccionar <guiseq><gui>Mensaje</gui><gui>Marcar como</gui><gui>Importante</"
+"gui></guiseq> desde la barra de menú."
+
+#: C/mail-folders.page:5(desc)
+msgid "Use folders to organize your mail."
+msgstr "Use carpetas para orgranizar su correo."
+
+#: C/mail-folders.page:28(title)
+msgid "Using Folders"
+msgstr "Usar las carpetas"
+
+#: C/mail-folders.page:30(p)
+msgid ""
+"Evolution, like most mail systems, uses folders to store email messages. You "
+"start out with a few mail folders such as the Inbox, Outbox, and Drafts. You "
+"can, however, create more folders if required."
+msgstr ""
+"Evolution, al igual que muchos otros sistemas de correo, almacena el correo "
+"en carpetas. Al comenzar a usar Evolution existen unas pocas carpetas, como "
+"la Bandeja de entrada y la carpeta Borradores, pero puede crear tantas como "
+"desee."
+
+#: C/mail-folders.page:33(title)
+msgid "Creating A Folder"
+msgstr "Crear una carpeta"
+
+#: C/mail-folders.page:34(p)
+msgid "To create a folder:"
+msgstr "Para crear una carpeta:"
+
+#: C/mail-folders.page:36(p)
+msgid ""
+"Click on <gui>Folder</gui> and select <gui>New</gui>. You can also right-"
+"click anywhere on the folder list and select the <gui>New Folder</gui> "
+"option."
+msgstr ""
+"Pulse en <gui>Carpeta</gui> y seleccione <gui>Nuevo</gui>. También puede "
+"pulsar con el botón derecho del ratón en cualquier parte de la lista de "
+"carpetas y seleccionar la opción <gui>Carpeta nueva</gui>."
+
+#: C/mail-folders.page:37(p)
+msgid "Specify the name and the location of the folder."
+msgstr "Especificque el nombre y la ubicación de la carpeta nueva."
+
+#: C/mail-folders.page:38(p)
+msgid "Click on the <gui>Create</gui> button."
+msgstr "Pulse el botón <gui>Crear</gui>."
+
+#: C/mail-folders.page:40(p)
+msgid ""
+"The new folder will be shown in the folder view. You can then move messages "
+"into the folder."
+msgstr ""
+"La carpeta nueva se mostrará en la vista de carpetas. Entonces podrá mover "
+"mensajes dentro de la carpeta."
+
+#: C/mail-folders.page:43(p)
+msgid ""
+"The Inbox folders on most IMAP servers cannot contain both messages and "
+"subfolders. When creating additional folders on your IMAP mail server, "
+"branch the folders from the root of the IMAP account and not from the Inbox. "
+"Creating subfolders in your Inbox may prevent you from reading messages that "
+"exist in the Inbox. If this happens, move the folders to the IMAP account."
+msgstr ""
+"El Buzón de entrada de la mayoría de los servidores IMAP no puede contener a "
+"la vez subcarpetas y mensajes. Cuando crea carpetas adicionales en su "
+"servidor de correo IMAP, debe hacerlas partir de la raíz del árbol de "
+"carpetas de cuentas IMAP, y no desde el buzón de entrada. Si crea "
+"subcarpetas en el buzón de entrada es posible que no pueda leer los mensajes "
+"que existen en esta carpeta. Si esto sucede, mueva las carpetas a la cuenta "
+"IMAP."
+
+#: C/mail-folders.page:49(title)
+msgid "Moving Messages to New Folders"
+msgstr "Mover mensajes a carpetas nuevas"
+
+#: C/mail-folders.page:50(p)
+msgid ""
+"You can move messages into folders by using one of the following methods:"
+msgstr ""
+"Puede mover mensajes en las carpetas usando uno de los siguientes métodos:"
+
+#: C/mail-folders.page:52(p)
+msgid "Drag and drop the messages into the folder."
+msgstr "Arrastre y suelte los mensajes en la carpeta."
+
+#: C/mail-folders.page:53(p)
+msgid ""
+"Right-click on the message and select the <gui>Move to Folder</gui> option."
+msgstr ""
+"Pulse con el botón derecho del ratón sobre el mensaje y seleccione la opción "
+"<gui>Mover a la carpeta...</gui>."
+
+#: C/mail-folders.page:54(p)
+msgid ""
+"Select a message and press <keyseq><key>Shift</key><key>Ctrl</key><key>V</"
+"key></keyseq>."
+msgstr ""
+"Seleccione un correo y pulse <keyseq><key>Mayús</key><key>Ctrl</key><key>V</"
+"key></keyseq>."
+
+#: C/mail-folders.page:55(p)
+msgid ""
+"Select a message and click on <guiseq><gui>Message</gui><gui>Move to Folder</"
+"gui></guiseq>."
+msgstr ""
+"Seleccione un correo y pulse <guiseq><gui>Mensaje</gui><gui>Mover a la "
+"carpeta</gui></guiseq>."
+
+#: C/mail-folders.page:58(p)
+msgid "The steps for copying are similar."
+msgstr "Los pasos para copiar son similares."
+
+#: C/mail-folders.page:60(p)
+msgid ""
+"Moving files can be done automatically by setting up <link xref=\"mail-"
+"filters\">filters</link>."
+msgstr ""
+"Mover archivos se puede hacer automáticamente configurando <link xref=\"mail-"
+"filters\">filtros</link>."
+
+#: C/mail-filters.page:5(desc)
+msgid "Use filter rules to sort your mail automatically into folders."
+msgstr ""
+"Use las reglas de filtrado para ordenar su correo automáticamente en "
+"carpetas."
+
+#: C/mail-filters.page:23(title)
+msgid "Using Filters"
+msgstr "Usar filtros"
+
+#: C/mail-filters.page:25(p)
+msgid ""
+"Message filters apply actions on messages based on conditions that you have "
+"defined. You can define filters for both incoming and outgoing emails."
+msgstr ""
+"Los filtros de correos aplican acciones sobre correos basándose en "
+"condiciones que usted ha definido. Puede definir filtros tanto para correo "
+"entrante como para correo saliente."
+
+#: 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</"
+"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 "
+"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</"
+"gui><gui>Cuentas de correo</gui><gui>Editar</gui><gui>Opciones de recepción</"
+"gui><gui>Opciones</gui><gui>Aplicar filtros en mensajes nuevos en la Bandeja "
+"de entrada en este servidor</gui></guiseq>."
+
+#: C/mail-filters.page:29(p)
+msgid ""
+"To manually apply filters on messages in a folder, select the messages and "
+"click <guiseq><gui>Message</gui><gui>Apply Filters</gui></guiseq> or press "
+"<keyseq><key>Ctrl</key><key>Y</key></keyseq>."
+msgstr ""
+"Para aplicar manualmente filtros sobre correos en una carpeta, seleccione "
+"los mensajes y pulse <guiseq><gui>Mensaje</gui><gui>Aplicar filtros</gui></"
+"guiseq> o pulse <keyseq><key>Ctrl</key><key>Y</key></keyseq>."
+
+#: C/mail-filters.page:30(p) C/exporting-data-mail.page:25(p)
+msgid ""
+"You can select all messages in a folder by clicking <guiseq><gui>Edit</"
+"gui><gui>Select All</gui></guiseq> or pressing <keyseq><key>Ctrl</"
+"key><key>A</key></keyseq>."
+msgstr ""
+"Puede seleccionar todos los correos en su carpeta pulsando "
+"<guiseq><gui>Editar</gui><gui>Seleccionar todos</gui></guiseq> o pulsando "
+"<keyseq><key>Ctrl</key><key>A</key></keyseq>."
+
+#: C/mail-filters.page:33(title)
+msgid "Creating a Filter"
+msgstr "Crear un filtro"
+
+#: C/mail-filters.page:36(p)
+msgid ""
+"Click <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>, or click "
+"<guiseq><gui>Message</gui><gui>Create Rule</gui></guiseq> and select the "
+"criterion the filter will be based on."
+msgstr ""
+"Pulse <guiseq><gui>Editar</gui><gui>Filtros de mensajes</gui></guiseq> o "
+"pulse <guiseq><gui>Mensaje</gui><gui>Crear regla</gui></guiseq> y elija el "
+"criterio en que se basará el filtro."
+
+#: C/mail-filters.page:39(p)
+msgid ""
+"For more information on the available conditions see <link xref=\"mail-"
+"filters-conditions\">Available Filter conditions</link>."
+msgstr ""
+"Para obtener más información acerca de las condiciones disponibles, consulte "
+"<link xref=\"mail-filters-conditions\">condiciones disponibles para filtros</"
+"link>."
+
+#: C/mail-filters.page:42(p)
+msgid "Select the Actions for the Filter in the <gui>Then</gui> section."
+msgstr ""
+"Seleccione las Acciones para el filtro en la sección <gui>Entonces</gui>:"
+
+#: C/mail-filters.page:42(p)
+msgid ""
+"For more information on the available actions see <link xref=\"mail-filters-"
+"actions\">Available Filter actions</link>."
+msgstr ""
+"Para obtener más información acerca de las acciones disponibles, consulte "
+"<link linkend=\"bshly4v\">Acciones disponibles para filtros</link>."
+
+#: C/mail-filters.page:44(p) C/mail-filters-not-working.page:29(p)
+msgid ""
+"Note that the order of filters is very important. They are applied to the "
+"original message in sequence, like a recipe."
+msgstr ""
+"Note que el orden de los filtros es muy importante. Se aplican sobre el "
+"correo original en secuencia, como una receta."
+
+#: C/mail-filters.page:45(p) C/mail-filters-not-working.page:30(p)
+msgid ""
+"If your first filter has a <gui>Stop Processing</gui> rule, then all the "
+"email messages that match this filter will ignore all the succeeding filters."
+msgstr ""
+"Si su primer filtro tiene una regla <gui>Parar de procesar</gui>, entonces "
+"todos los mensajes de correo que coincidan con este filtro ignorarán los "
+"siguientes filtros."
+
+#: C/mail-filters.page:46(p) C/mail-filters-not-working.page:31(p)
+msgid ""
+"When you move a message to another folder, \"moving\" actually means "
+"appending a copy of the message to the destination folder and marking the "
+"original message for deletion. So any subsequent filter rules will be "
+"applied to the original message that is now marked for deletion. Therefore "
+"moving a message should usually appear last in a sequence of filter rules."
+msgstr ""
+"Cuando mueve un correo a otra carpeta, «mover» realmente significa crear una "
+"copia del mensaje en la carpeta de destino y marcar el correo original para "
+"su eliminación. De tal forma que cualquier subsiguiente regla se aplicará al "
+"correo original que ahora está marcado para su eliminación. Por ello, mover "
+"un correo debería ser la última regla en un filtro."
+
+#: C/mail-filters.page:49(p)
+msgid ""
+"If you want to define multiple actions, click <gui style=\"button\">Add "
+"Action</gui> and repeat the previous step. For example, if you want no other "
+"existing filters to be applied choose <gui>Stop Processing</gui> as the "
+"second action in the list."
+msgstr ""
+"Si quiere definir múltiples acciones pulse <gui style=\"button\">Añadir "
+"acción</gui> y repita el paso anterior. Por ejemplo, si quiere que no se "
+"aplique ningún otro filtro existente elija <gui>Parar de procesar</gui> como "
+"la segunda acción en la lista."
+
+#: C/mail-filters.page:56(title)
+msgid "Editing Filters"
+msgstr "Editar de filtros"
+
+#: C/mail-filters.page:58(p) C/mail-filters.page:68(p)
+msgid "Click <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>."
+msgstr ""
+"Pulse <guiseq><gui>Editar</gui><gui>Filtros de mensajes</gui></guiseq>."
+
+#: C/mail-filters.page:59(p) C/mail-filters.page:69(p)
+msgid "Select the filter."
+msgstr "Seleccione el filtro."
+
+#: C/mail-filters.page:60(p)
+#: C/mail-encryption-s-mime-signing-encrypting.page:30(p)
+#: C/mail-encryption-gpg-signing-encrypting.page:32(p)
+msgid "Click <gui style=\"button\">Edit</gui>."
+msgstr "Pulse <gui style=\"button\">Editar</gui>."
+
+#: C/mail-filters.page:61(p)
+msgid ""
+"Make the desired corrections, then click <gui style=\"button\">OK</gui> "
+"twice."
+msgstr ""
+"Haga las correcciones que quiera, después pulse <gui style=\"button"
+"\">Aceptar</gui> dos veces."
+
+#: C/mail-filters.page:66(title)
+msgid "Deleting Filters"
+msgstr "Borrar filtros"
+
+#: C/mail-filters.page:70(p)
+msgid "Click <gui style=\"button\">Remove</gui>."
+msgstr "Pulse <gui style=\"button\">Quitar</gui>."
+
+#: C/mail-filters-not-working.page:5(desc)
+msgid ""
+"Fix problems with mail filters that do not sort and organize mail as "
+"expected."
+msgstr ""
+"Solucionar problems con los filtros de correo que no ordenan ni organizan el "
+"correo como se espera."
+
+#: C/mail-filters-not-working.page:25(title)
+msgid "Mail filters are not working"
+msgstr "Los filtros de correo no funcionan"
+
+#: C/mail-filters-not-working.page:26(p)
+msgid ""
+"Your mail filters are probably working, however, they could be ordered in an "
+"inefficient way. This will make your filters run slowly, so it may seem like "
+"they are not working."
+msgstr ""
+"Probablemente sus filtros de correo están funcionando, no obstante pueden "
+"estar ordenados de una forma no eficiente. Esto hará que sus filtros se "
+"ejecuten lentamente, de tal forma que parece que no funcionan."
+
+#: C/mail-filters-not-working.page:32(p)
+msgid ""
+"To check the rules and their order of an existing filter, review its actions "
+"in the <gui>Then</gui> section by <link xref=\"mail-filters#editing"
+"\">editing the filter</link>."
+msgstr ""
+"Para comprobar las reglas y su orden en un filtro ya existente, revise sus "
+"acciones en la sección <gui>Después</gui> <link xref=\"mail-filters#editing"
+"\">editando el filtro</link>."
+
+#: C/mail-filters-not-working.page:35(p)
+msgid ""
+"Another thing you have to keep in mind is that filters depend on the \"new\" "
+"flag that is set when a particular email message is initially fetched from "
+"the server. If you use another email client aside from Evolution, your "
+"filters may not work automatically."
+msgstr ""
+"También debe tener en cuenta que los filtros dependen del estado de «nuevo» "
+"que se establece cuando un correo en particular se obtiene del servidor. "
+"Puede que sus filtros no funcionen correctamente si usa otro cliente de "
+"correo además de Evolution."
+
+#: C/mail-filters-not-working.page:38(p)
+msgid ""
+"Applying the <gui>Stop Processing</gui> rule to an email message will cause "
+"all succeeding filters to ignore that message."
+msgstr ""
+"Aplicar la regla <gui>Parar de procesar</gui> sobre un mensaje de correo "
+"hará que todos los sucesivos filtors ignoren ese correo."
+
+#: C/mail-filters-conditions.page:5(desc)
+msgid "Available conditions for setting up filtering."
+msgstr "Condiciones disponibles para configurar un filtro."
+
+#: C/mail-filters-conditions.page:23(title)
+msgid "Available Filter conditions"
+msgstr "Condiciones disponibles para filtros"
+
+#: C/mail-filters-conditions.page:87(p)
+msgid "Source Account:"
+msgstr "Cuenta de origen:"
+
+#: C/mail-filters-conditions.page:88(p)
+msgid ""
+"Filters messages according the server you got them from. This is most useful "
+"if you use multiple POP mail accounts."
+msgstr ""
+"Filtros de mensajes de acuerdo con el servidor de las que las recibió. Esto "
+"es útil cuando tiene múltiples cuentas de correo POP."
+
+#: C/mail-filters-conditions.page:90(p) C/mail-filters-actions.page:65(p)
+msgid "Pipe to Program:"
+msgstr "Encauzar al programa:"
+
+#: C/mail-filters-conditions.page:91(p)
+msgid ""
+"Evolution can use an external command to process a message, then process it "
+"based on the return value. Commands used in this way must return an integer. "
+"This is most commonly used to add an external junk mail filter."
+msgstr ""
+"Evolution puede usar un comando externo para procesar un mensaje y después "
+"procesarlo basándose en el valor devuelto. Los comandos que se suelen usar "
+"deben devolver un entero. Generalmente esto se suele usar para añadir un "
+"filtro de correo spam."
+
+#: C/mail-filters-conditions.page:93(p)
+msgid "Junk Test:"
+msgstr "Detección de spam:"
+
+# index.docbook:458, index.docbook:949

+#: C/mail-filters-conditions.page:94(p)
+msgid ""
+"Filters based on the results of the <link xref=\"mail-spam\">junk mail</"
+"link> test."
+msgstr ""
+"Filtros basados en los resultados de las <link xref=\"mail-spam\">pruebas de "
+"spam</link>."
+
+#: C/mail-filters-actions.page:5(desc)
+msgid "Available actions for setting up filtering."
+msgstr "Acciones disponibles para configurar un filtro."
+
+#: C/mail-filters-actions.page:23(title)
+msgid "Available Filter actions"
+msgstr "Acciones disponibles para filtros"
+
+#: C/mail-filters-actions.page:26(p)
+msgid "Move to Folder:"
+msgstr "Mover a la carpeta:"
+
+#: C/mail-filters-actions.page:27(p)
+msgid "Moves the message into a folder you specify."
+msgstr "Mueve el mensaje dentro de la carpeta que especifique."
+
+#: C/mail-filters-actions.page:29(p)
+msgid "Copy to Folder:"
+msgstr "Copar a la carpeta:"
+
+#: C/mail-filters-actions.page:30(p)
+msgid "Puts a copy of the message into a folder you specify."
+msgstr "Pone una copia del mensaje en la carpeta que especifique."
+
+#: C/mail-filters-actions.page:32(p)
+msgid "Delete:"
+msgstr "Borrar:"
+
+#: C/mail-filters-actions.page:33(p)
+msgid ""
+"Marks the message for deletion. The message can be undeleted until you "
+"expunge or empty the trash."
+msgstr ""
+"Marca el mensaje para borrarlo. Sigue siendo posible recuperar el mensaje de "
+"nuevo, al menos hasta que seleccione Purgar el correo."
+
+#: C/mail-filters-actions.page:35(p)
+msgid "Stop Processing:"
+msgstr "Parar de procesar:"
+
+#: C/mail-filters-actions.page:36(p)
+msgid ""
+"Select this if you want to all other filters ignore this message. Note that "
+"only filters listed after this particular rule will be ignored."
+msgstr ""
+"Seleccione esto si quiere que el resto de filtros pasen por alto este "
+"mensaje. Note que sólo los filtros listados después de esta regla en "
+"particular, se ignorarán."
+
+#: C/mail-filters-actions.page:38(p)
+msgid "Set Label:"
+msgstr "Establecer etiqueta:"
+
+# index.docbook:41, index.docbook:293

+#: C/mail-filters-actions.page:39(p)
+msgid "Adds a label to a message."
+msgstr "Añade una etiqueta al correo."
+
+#: C/mail-filters-actions.page:41(p)
+msgid "Assign Color:"
+msgstr "Asignar color:"
+
+#: C/mail-filters-actions.page:42(p)
+msgid "Marks the message with a color of your choice."
+msgstr "Marca el mensaje con un color de su elección."
+
+#: C/mail-filters-actions.page:44(p)
+msgid "Assign Score:"
+msgstr "Asignar puntuación:"
+
+#: C/mail-filters-actions.page:45(p)
+msgid "Assigns the message a numeric score."
+msgstr "Asigna al mensaje una puntuación numérica."
+
+#: C/mail-filters-actions.page:47(p)
+msgid "Adjust Score:"
+msgstr "Ajustar puntuación:"
+
+#: C/mail-filters-actions.page:48(p)
+msgid "Changes the numeric score by the amount you set."
+msgstr "Cambia la puntuación numérica por la cantidad que establezca."
+
+#: C/mail-filters-actions.page:50(p)
+msgid "Set Status:"
+msgstr "Poner estado:"
+
+#: C/mail-filters-actions.page:51(p)
+msgid ""
+"Sets the status of the message. The status can be Replied To, Draft, "
+"Important, Read, or Junk."
+msgstr ""
+"Establece el estado del mensaje. El estado puede ser Respondió a, Borrador, "
+"Importante, Leído, o SPAM."
+
+#: C/mail-filters-actions.page:53(p)
+msgid "Unset Status:"
+msgstr "Quitar estado:"
+
+#: C/mail-filters-actions.page:54(p)
+msgid ""
+"If the message has a status value, unsets it. If a status value is not set, "
+"it does nothing."
+msgstr ""
+"Si el mensaje tiene un estado, lo elimina. Si no tiene establecido un "
+"estado, no hace nada."
+
+#: C/mail-filters-actions.page:56(p)
+msgid "Beep:"
+msgstr "Pitar:"
+
+#: C/mail-filters-actions.page:57(p)
+msgid "Makes the system beep."
+msgstr "Hace que el sistema pite."
+
+#: C/mail-filters-actions.page:59(p)
+msgid "Play Sound:"
+msgstr "Reproducir un sonido:"
+
+#: C/mail-filters-actions.page:60(p)
+msgid "Select a sound file for Evolution to play."
+msgstr "Seleccione un archivo de sonido para que Evolution lo reproduzca."
+
+#: C/mail-filters-actions.page:62(p)
+msgid "Run Program:"
+msgstr "Ejecutar programa:"
+
+#: C/mail-filters-actions.page:63(p)
+msgid "Evolution runs an application."
+msgstr "Evolution ejecutar una aplicación."
+
+#: C/mail-filters-actions.page:66(p)
+msgid ""
+"Sends the message to a program of your choice. No return value is expected. "
+"This feature can be used to create automatic Web postings from email "
+"messages or to perform additional message post processing not supported by "
+"Evolution."
+msgstr ""
+"Envía el mensaje al programa que elija. No se espera ningún valor devuelto. "
+"Esta característica se puede usar para crear entradas automáticas en una web "
+"desde mensajes de correo o para realizar procesados posteriores adicionales "
+"que no estén soportados por Evolution."
+
+#: C/mail-filters-actions.page:68(p)
+msgid "Forward to:"
+msgstr "Reenviar a:"
+
+#: C/mail-filters-actions.page:69(p)
+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."
+
+#: C/mail-encryption-s-mime-signing-encrypting.page:23(title)
+#: C/mail-encryption-gpg-signing-encrypting.page:23(title)
+msgid "Signing or encrypting messages"
+msgstr "Firmar o cifrar correos"
+
+#: C/mail-encryption-s-mime-signing-encrypting.page:25(p)
+msgid ""
+"After you have <link xref=\"mail-encryption-s-mime-manage\">added your "
+"certificate</link>, you can sign or encrypt a message by clicking "
+"<guiseq><gui>Options</gui><gui>S/MIME Sign</gui></guiseq> or <gui>S/MIME "
+"Encrypt</gui> from the message composer menu."
+msgstr ""
+"Después de que haya <link xref=\"mail-encryption-s-mime-manage\">añadido su "
+"certificado</link>, puede firmar o cifrar un correo pulsando "
+"<guiseq><gui>Opciones</gui><gui>Firma S/MIME</gui></guiseq> o <gui>Cifrado S/"
+"MIME</gui> en el editor de mensajes."
+
+#: C/mail-encryption-s-mime-signing-encrypting.page:26(p)
+#: C/mail-encryption-gpg-signing-encrypting.page:28(p)
+msgid "To have every message signed or encrypted:"
+msgstr "Para enviar cada mensaje cifrado o firmado:"
+
+#: C/mail-encryption-s-mime-signing-encrypting.page:29(p)
+#: C/mail-encryption-gpg-signing-encrypting.page:31(p)
+msgid "Select the mail account to encrypt the messages in."
+msgstr "Seleccione la cuenta en la que cifrar mensajes."
+
+#: C/mail-encryption-s-mime-signing-encrypting.page:31(p)
+#: C/mail-encryption-gpg-signing-encrypting.page:33(p)
+#: C/mail-encryption-gpg-set-up.page:31(p)
+msgid "Click the <gui>Security</gui> tab."
+msgstr "Pulse en la pestaña <gui>Seguridad</gui>."
+
+#: C/mail-encryption-s-mime-signing-encrypting.page:32(p)
+msgid ""
+"In the <gui>Secure MIME (S/MIME)</gui> section, click <gui style=\"button"
+"\">Select</gui> next to <gui>Signing Certificate</gui> and specify the path "
+"to your signing certificate, or click <gui style=\"button\">Select</gui> "
+"next to <gui>Encryption Certificate</gui> and specify the path to your "
+"encryption certificate."
+msgstr ""
+"En la sección <gui>MIME seguro (S/MIME)</gui> pulse <gui style=\"button"
+"\">Seleccionar</gui> junto a <gui>Certificado de firma</gui> y especifique "
+"la ruta a su certificado de firma o pulse <gui style=\"button\">Seleccionar</"
+"gui> junto a <gui>Certificado de cifrado</gui> y especifique la ruta a su "
+"certificado de cifrado."
+
+#: C/mail-encryption-s-mime-signing-encrypting.page:33(p)
+msgid "Select the appropriate options."
+msgstr "Seleccione las opciones apropiadas."
+
+#: C/mail-encryption-s-mime-signing-encrypting.page:36(p)
+#: C/mail-encryption-gpg-signing-encrypting.page:26(p)
+msgid ""
+"The Subject line of the message will not be encrypted and should not be used "
+"for sensitive information."
+msgstr ""
+"La línea del Asunto del mensaje no se cifrará y no se debería usar para "
+"contener información sensible."
+
+#: C/mail-encryption-s-mime-manage.page:5(desc)
+msgid "Adding, editing, viewing and deleting S/MIME certificates."
+msgstr "Añadir, editar, ver y eliminar certificados S/MIME."
+
+#: C/mail-encryption-s-mime-manage.page:23(title)
+msgid "Managing S/MIME certificates"
+msgstr "Gestionar certificados S/MIME"
+
+#: C/mail-encryption-s-mime-manage.page:25(p)
+msgid ""
+"Certificates allow you to communicate with others securely over an encrypted "
+"connection, or sign a message confirming your identity to the contact. These "
+"settings only apply to S/MIME encryption."
+msgstr ""
+"Los certificados le permiten comunicarse con otros de una forma segura bajo "
+"una conexión cifrada o firmar un mensaje confirmando su identidad al "
+"contacto. Estos ajustes sólo se aplican al cifrado S/MIME."
+
+#: C/mail-encryption-s-mime-manage.page:26(p)
+msgid ""
+"You can import, view, edit (except for your own certificates), and delete "
+"your certificates under <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Certificates</gui></guiseq>."
+msgstr ""
+"Puede importar, ver, editar (excepto sus propios certificados), y eliminar "
+"sus certificados bajo <guiseq><gui>Editar</gui><gui>Preferencias</"
+"gui><gui>Certificados</gui></guiseq>."
+
+#: C/mail-encryption-s-mime-manage.page:27(p)
+msgid ""
+"<gui>Your Certificates</gui> displays a list of certificates that you own. "
+"To add a signing certificate, click <gui style=\"button\">Import</gui>, "
+"select the file to import, then click <gui style=\"button\">Open</gui> and "
+"enter a password."
+msgstr ""
+"<gui>Sus certificados</gui> muestra la lista de certificados que posee. Para "
+"añadir un certificado de firma pulse <gui style=\"button\">Importar</gui>, "
+"seleccione el archivo que importar, después pulse <gui style=\"button"
+"\">Abrir</gui> e introduzca una contraseña."
+
+#: C/mail-encryption-s-mime-manage.page:28(p)
+msgid ""
+"<gui>Contact Certificates</gui> displays a list of certificates that you "
+"have for contacts. These certificates allow you to decrypt messages as well "
+"verify signed messages."
+msgstr ""
+"Pulse sobre la pestaña <gui>Certificados de contactos</gui> para mostrar una "
+"lista de los certificados que posee de sus contactos. Estos certificados le "
+"permiten descifrar mensajes así como verificar los mensajes firmados."
+
+#: C/mail-encryption-s-mime-manage.page:29(p)
+msgid ""
+"<gui>Authorities</gui> displays a list of trusted certificate authorities "
+"who verify that your own certificate is valid."
+msgstr ""
+"<gui>Autoridades</gui> muestra una lista de las autoridades de certificados "
+"de confianza quienes verifican que el certificado que tiene es válido."
+
+#: C/mail-encryption.page:5(desc)
+msgid "Sending and receiving encrypted mail."
+msgstr "Enviar y recibir correo cifrado."
+
+#: C/mail-encryption.page:34(title)
+msgid "Mail encryption and certificates"
+msgstr "Cifrado de correo y certificados"
+
+#: C/mail-encryption.page:36(p)
+msgid ""
+"Evolution offers GPG Encryption and S/MIME Encryption for signing and "
+"encrypting email messages. S/MIME is used most often in corporate "
+"environments."
+msgstr ""
+"Evolution ofrece cifrado GPG y S/MIME para firmar y cifrar mensajes de "
+"correo electrónico. En entornos corporativos S/MIME se usa más."
+
+#: C/mail-encryption.page:39(title)
+msgid "GPG"
+msgstr "GPG"
+
+#: C/mail-encryption.page:43(title)
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: C/mail-encryption-gpg-signing-encrypting.page:5(desc)
+#: C/mail-encryption-gpg-create-key.page:5(desc)
+msgid "Signing or encrypting messages via GPG that you send."
+msgstr "Firmar o cifrarlos correos que envía usando GPG."
+
+#: C/mail-encryption-gpg-signing-encrypting.page:25(p)
+msgid ""
+"After you have <link xref=\"mail-encryption-gpg-set-up\">set up your GPG "
+"key</link>, you can sign or encrypt a message by clicking "
+"<guiseq><gui>Options</gui><gui>PGP Sign</gui></guiseq> or <gui>PGP Encrypt</"
+"gui> from the message composer menu."
+msgstr ""
+"Después de que haya <link xref=\"mail-encryption-gpg-set-up\">configurado su "
+"clave GPG</link> puede firmar o cifrar un correo pulsando "
+"<guiseq><gui>Opciones</gui><gui>Firma PGP</gui></guiseq> o <gui>Cifrado PGP</"
+"gui> en el editor de mensajes."
+
+#: C/mail-encryption-gpg-signing-encrypting.page:34(p)
+msgid ""
+"Select <gui>Always sign outgoing messages when using this account</gui>."
+msgstr ""
+"Seleccione <gui>Firmar siempre los mensajes salientes cuando se use esta "
+"cuenta</gui>."
+
+#: C/mail-encryption-gpg-signing-encrypting.page:36(p)
+#: C/mail-encryption-gpg-set-up.page:36(p)
+msgid "Click <gui style=\"button\">Close</gui>."
+msgstr "Pulse <gui style=\"button\">Cerrar</gui>."
+
+#: C/mail-encryption-gpg-set-up.page:5(desc)
+msgid ""
+"Setting up GPG for your mail account to sign and/or encrypt and decrypt "
+"messages."
+msgstr ""
+"Configurar GPG para su cuenta de correo para poder firmar, cifrar y "
+"descifrar correos."
+
+#: C/mail-encryption-gpg-set-up.page:23(title)
+msgid "Setting up GPG for your mail account"
+msgstr "Configurar el cifrado GPG para su cuenta de correo"
+
+#: C/mail-encryption-gpg-set-up.page:26(p)
+msgid ""
+"You need a GPG key to do this. If you do not have one yet, please refer to "
+"<link xref=\"mail-encryption-gpg-create-key\">Creating a GPG key</link>."
+msgstr ""
+"Necesita una clave GPG para esto. Si aún no tiene una, consulte <link xref="
+"\"mail-encryption-gpg-create-key\">Crear una clave GPG</link>."
+
+#: C/mail-encryption-gpg-set-up.page:30(p)
+msgid ""
+"Select the account you want to use securely, then click <gui style=\"button"
+"\">Edit</gui>."
+msgstr ""
+"Seleccione la cuenta que quiere usar de forma segura, después pulse <gui "
+"style=\"button\">Editar</gui>."
+
+#: C/mail-encryption-gpg-set-up.page:32(p)
+msgid "Specify your key ID in the <gui>PGP/GPG Key ID</gui> field."
+msgstr ""
+"Especifique el ID de su clave en el campo <gui>ID de la clave GPG/PGP</gui>."
+
+#: C/mail-encryption-gpg-set-up.page:33(p)
+msgid ""
+"Below the field you can choose whether to always sign outgoing messages when "
+"using this account, and other options."
+msgstr ""
+"Debajo del campo puede seleccionar si quiere firmar siempre los correos "
+"salientes al usar esta cuenta y otras opciones."
+
+#: C/mail-encryption-gpg-set-up.page:38(p)
+msgid ""
+"Evolution requires that you know your key ID. If you do not remember it, you "
+"can find it by typing <code>gpg --list-keys</code> in a terminal window. "
+"Your key ID is an eight-character string with random numbers and letters."
+msgstr ""
+"Evolution necesita que usted sepa su identificador (ID) de clave. Si no lo "
+"recuerda puede encontrarlo con el comando <code>gpg --list-keys</code> en "
+"una terminal. El identificador de su clave es una cadena de 8 caracteres con "
+"números y letras aleatorios."
+
+#: C/mail-encryption-gpg-getting-keys.page:5(desc)
+msgid "Getting and Using GPG Public Keys."
+msgstr "Obtener y usar claves GPG públicas."
+
+#: C/mail-encryption-gpg-getting-keys.page:23(title)
+msgid "Getting and using GPG public keys"
+msgstr "Obtener y usar claves GPG públicas"
+
+#. TODO:POST-3-2: Update and rewrite using Seahorse. Needs a complete rewrite once https://bugzilla.gnome.org/show_bug.cgi?id=508744 is fixed.
+#: C/mail-encryption-gpg-getting-keys.page:26(p)
+msgid ""
+"To send an encrypted message, you need to use the recipient's public key in "
+"combination with your private key. Evolution handles the encryption, but you "
+"need to get the public key and add it to your keyring."
+msgstr ""
+"Para cifrar un mensaje para quien sea, necesitará usar su clave pública en "
+"combinación con su clave privada. Evolution lo hace por usted, pero con todo "
+"necesitará obtener su clave y añadirla a su depósito de claves."
+
+#: C/mail-encryption-gpg-getting-keys.page:28(p)
+msgid ""
+"To get public keys from a public key server, enter the command <code>gpg --"
+"recv-keys --keyserver wwwkeys.pgp.net keyid</code>, substituting "
+"<code>keyid</code> by your recipient's ID. You need to enter your password, "
+"and the ID is automatically added to your keyring."
+msgstr ""
+"Para obtener claves públicas desde un servidor de claves públicas escriba el "
+"comando <code> gpg --recv-keys --keyserver wwwkeys.pgp.net keyid</code>, "
+"sustituyendo <code>keyid</code> por el identificador del destinatario. "
+"Necesitará escribir su contraseña y se añadirá automáticamente su "
+"identificador a su depósito de claves."
+
+#: C/mail-encryption-gpg-getting-keys.page:30(p)
+msgid ""
+"If someone sends you a public key directly, save it as a plain text file and "
+"enter the command <code>gpg --import</code> to add it to your keyring."
+msgstr ""
+"Si alguien le envía directamente su clave pública, guárdela como un archivo "
+"de texto plano e introduzca el comando <code>gpg --import</code> para "
+"añadirla a su depósito de claves."
+
+#: C/mail-encryption-gpg-decrypting.page:5(desc)
+msgid "Decrypting and checking the signature of received GPG messages."
+msgstr "Descifrar y comprobar la firma de correos GPG recibidos."
+
+#: C/mail-encryption-gpg-decrypting.page:23(title)
+msgid "Receiving messages encrypted or signed via GPG"
+msgstr "Recibir mensajes cifrados o firmados con GPG"
+
+#: C/mail-encryption-gpg-decrypting.page:26(title)
+msgid "Decrypting a received message"
+msgstr "Descifrar un mensaje recibido"
+
+#: C/mail-encryption-gpg-decrypting.page:27(p)
+msgid ""
+"If you receive an encrypted message, you need to decrypt it before you can "
+"read it."
+msgstr ""
+"Si recibe un mensaje cifrado necesita descifrarlo antes de poder leerlo."
+
+#: C/mail-encryption-gpg-decrypting.page:28(p)
+msgid ""
+"When you view the message, Evolution prompts you for your PGP password. "
+"Enter it, and the unencrypted message is displayed."
+msgstr ""
+"Cuando vea el mensaje, Evolution le pedirá que escriba su contraseña PGP. "
+"Escríbala y el mensaje se mostrará apropiadamente."
+
+#: C/mail-encryption-gpg-decrypting.page:29(p)
+msgid ""
+"Senders must have your GPG public key before they can send you an encrypted "
+"message."
+msgstr ""
+"Los remitentes deben tener su clave GPG pública antes de poder enviarle "
+"correos cifrados."
+
+#: C/mail-encryption-gpg-decrypting.page:33(title)
+msgid "Checking the signature of a received message"
+msgstr "Comprobar la firma de un correo recibido"
+
+#: C/mail-encryption-gpg-decrypting.page:34(p)
+msgid ""
+"To check the sender's signature of a received message, scroll down to the "
+"bottom of the message and click the logo. Evolution will display "
+"<gui>Security Information</gui> for the message."
+msgstr ""
+"Para comprobar la forma del remitente de un correo recibido, desplácese "
+"hacia abajo hasta la parte inferior del mensaje y pulse en el logotipo. "
+"Evolution mostrará la <gui>Información de seguridad</gui> para ese correo."
+
+# index.docbook:41, index.docbook:293

+#: C/mail-encryption-gpg-create-key.page:23(title)
+msgid "Creating a GPG key"
+msgstr "Crear una clave GPG"
+
+#: C/mail-encryption-gpg-create-key.page:25(p)
+msgid ""
+"These steps are very technical. For average users we nowadays recommend "
+"using the Seahorse application for managing GPG keys."
+msgstr ""
+"Estos pasos son muy técnicos. Se recomienda, para el usuario medio de hoy en "
+"día, usar la aplicación Seahorse para gestionar claves GPG."
+
+#. TODO:POST-3-2: Update and rewrite using Seahorse. Needs a complete rewrite once https://bugzilla.gnome.org/show_bug.cgi?id=508744 is fixed.
+#: C/mail-encryption-gpg-create-key.page:28(p)
+msgid ""
+"Before you can get or send GPG encrypted mail, you need to generate your "
+"public and private keys with GPG."
+msgstr ""
+"Antes de que pueda obtener o enviar correo cifrado con GPG debe generar sus "
+"claves pública y privada con GPG."
+
+#: C/mail-encryption-gpg-create-key.page:30(p)
+msgid "Open a terminal window and enter <code>gpg --gen-key</code>."
+msgstr "Abra una terminal e introduzca <command>gpg --gen-key</command>."
+
+#: C/mail-encryption-gpg-create-key.page:31(p)
+msgid "Select an algorithm, then press Enter."
+msgstr "Seleccione un algoritmo, después pulse Intro."
+
+#: C/mail-encryption-gpg-create-key.page:32(p)
+msgid "Select a key length, then press Enter."
+msgstr "Seleccione una longitud de clave, después pulse Intro."
+
+#: C/mail-encryption-gpg-create-key.page:33(p)
+msgid "Enter how long your key should be valid for."
+msgstr "Introduzca el tiempo para la cual su clave deberá ser válida."
+
+#: C/mail-encryption-gpg-create-key.page:34(p)
+msgid "Type your real name, then press Enter."
+msgstr "Escriba su nombre real, después pulse Intro."
+
+#: C/mail-encryption-gpg-create-key.page:35(p)
+msgid "Type your email address, then press Enter."
+msgstr "Escriba su dirección de correo-e, después pulse Intro."
+
+#: C/mail-encryption-gpg-create-key.page:36(p)
+msgid "(Optional) Type a comment, then press Enter."
+msgstr "(Opcional) Escriba un comentario, después pulse Intro."
+
+#: C/mail-encryption-gpg-create-key.page:37(p)
+msgid "Review your selected user ID. If it is correct, press O."
+msgstr ""
+"Compruebe el ID de usuario que ha seleccionado. Si es correcto pulse O."
+
+#: C/mail-encryption-gpg-create-key.page:38(p)
+msgid "Type a passphrase, then press Enter."
+msgstr "Escriba una frase de paso, después pulse Intro."
+
+#: C/mail-encryption-gpg-create-key.page:39(p)
+msgid "Move your mouse randomly to generate the keys."
+msgstr "Mueva su ratón aleatoriamente para generar las claves."
+
+#: C/mail-encryption-gpg-create-key.page:42(p)
+msgid ""
+"After the keys are generated, you can view your key information by entering "
+"<code>gpg --list-keys</code>. You should see something similar to this: "
+"<code> /home/you/.gnupg/pubring.gpg ----------------------------  pub "
+"1024D/32j38dk2 2001-06-20 you &lt;you@example.com&gt;  sub 1024g/289sklj3 "
+"2011-06-20 [expires: 2012-11-14]</code>"
+msgstr ""
+"Después de que se hayan generado estas claves, puede ver su información "
+"introduciendo <command>gpg --list-keys</command>. Debería ver algo similar a "
+"esto: <code> /home/usuario/.gnupg/pubring.gpg ----------------------------  "
+"pub 1024D/32j38dk2 2001-06-20 usuario &lt;usuario@ejemplo.com&gt;  sub "
+"1024g/289sklj3 2011-06-20 [expires: 2012-11-14]</code>"
+
+#: C/mail-encryption-gpg-create-key.page:43(p)
+msgid ""
+"GPG creates one list, or keyring, for your public keys and one for your "
+"private keys. All the public keys you know are stored in the file <file>~/."
+"gnupg/pubring.gpg</file>. If you want to give other people your key, send "
+"them that file."
+msgstr ""
+"GPG creará una lista, o depósito de claves, con todas las claves públicas "
+"que tenga y otra para las privadas. Todas las claves públicas que conoce "
+"están guardadas en el archivo <file>~/.gnupg/pubring.gpg</file>. Si quiere "
+"darle a alguien su clave, envíele éste archivo."
+
+#: C/mail-encryption-gpg-create-key.page:44(p)
+msgid "If you want, you can upload your keys to a key server:"
+msgstr "Si quiere puede subir sus claves a un servidor de claves:"
+
+#: C/mail-encryption-gpg-create-key.page:46(p)
+msgid ""
+"Check your public key ID with <code>gpg --list-keys</code>. It is the string "
+"after <code>1024D</code> on the line beginning with <code>pub</code>. In the "
+"example above, it is <code>32j38dk2</code>."
+msgstr ""
+"Compruebe su identificador de clave pública con <code>gpg --list-keys</"
+"code>. Es la cadena que está detrás de <code>1024D</code> en la línea que "
+"empieza con <code>pub</code>. En este ejemplo es <code>32j38dk2</code>."
+
+#: C/mail-encryption-gpg-create-key.page:47(p)
+msgid ""
+"Enter the command <code>gpg --send-keys --keyserver wwwkeys.pgp.net "
+"32j38dk2</code>. Substitute your key ID for <code>32j38dk2</code>. You need "
+"your password to do this."
+msgstr ""
+"Escriba el comando <code>gpg --send-keys --keyserver wwwkeys.pgp.net "
+"32j38dk2</code>. Sustituya el identificador de su clave por <code>32j38dk2</"
+"code>. Necesitará su contraseña para poder hacerlo."
+
+#: C/mail-encryption-gpg-create-key.page:50(p)
+>>>>>>> master
 msgid ""
 "After you have written your message, click <gui>Send</gui> or press "
 "<keyseq><key>Ctrl</key><key>Return</key></keyseq>."
@@ -6443,6 +10708,7 @@ msgstr "Comprobación de ortografía"
 msgid "Prerequirements"
 msgstr "Prerrequisitos"
 
+<<<<<<< HEAD
 #: C/mail-composer-spellcheck.page:26(p)
 msgid ""
 "To use spell checking for the emails that you write you first need to make "
@@ -13319,6 +17585,7570 @@ msgstr ""
 #~ msgstr "_Añadir adjunto…"
 
 #, fuzzy
+=======
+#: C/mail-encryption-gpg-create-key.page:51(p)
+msgid ""
+"If you don't have a key to unlock or encrypt a message, you can set your "
+"encryption tool to look it up automatically. If it cannot find the key, an "
+"error message appears."
+msgstr ""
+"Si no tiene una clave para desbloquear un mensaje cifrado puede ajustar su "
+"herramienta de cifrado para buscarla automáticamente. Si no puede encontrar "
+"la clave se mostrará un mensaje de error."
+
+#: C/mail-duplicates.page:5(desc)
+msgid "How to handle duplicated email messages"
+msgstr "Cómo gestionar mensajes de correo duplicados"
+
+#: C/mail-duplicates.page:24(title)
+msgid "Duplicate emails get downloaded"
+msgstr "Se descargan correos duplicados"
+
+#: C/mail-duplicates.page:27(title)
+msgid "Removing duplicate emails"
+msgstr "Quitar mensajes duplicados"
+
+#: C/mail-duplicates.page:28(p)
+msgid ""
+"To remove duplicate emails in a folder, select multiple messages (or select "
+"all messages in a folder by clicking <guiseq><gui>Edit</gui><gui>Select All</"
+"gui></guiseq> or pressing <keyseq><key>Ctrl</key><key>A</key></keyseq>) and "
+"click <guiseq><gui>Message</gui><gui>Remove Duplicate Messages</gui></"
+"guiseq>."
+msgstr ""
+"Para quitar correos duplicados en una carpeta seleccione varios mensajes (o "
+"seleccione todos los mensajes en una carpeta pulsando <guiseq><gui>Editar</"
+"gui><gui>Seleccionar todo</gui></guiseq> o pulsando <keyseq><key>Ctrl</"
+"key><key>A</key></keyseq>) y pulse <guiseq><gui>Mensaje</gui><gui>Quitar "
+"correos duplicados</gui></guiseq>."
+
+#: C/mail-duplicates.page:33(title)
+msgid "Reasons"
+msgstr "Motivos"
+
+#: C/mail-duplicates.page:34(p)
+msgid ""
+"Downloading duplicate emails may be due to one of the following reasons:"
+msgstr ""
+"La descarga de correos duplicados puede suceder debido a uno de estos "
+"motivos:"
+
+#: C/mail-duplicates.page:36(p)
+msgid "There are several copies of the same message in the mailbox"
+msgstr "Existen diversas copias del mismo mensaje en el buzón de correo"
+
+#: C/mail-duplicates.page:37(p)
+msgid "Evolution is having a problem with the UIDL extension."
+msgstr "Evolution está sufriendo un problema con la extensión UIDL."
+
+#: C/mail-duplicates.page:38(p)
+msgid ""
+"The cache files located at <file>$HOME/.local/share/evolution/mail/pop/</"
+"file> are not writable."
+msgstr ""
+"Los archivo de la cache se encuentran en <file>$HOME/.local/share/evolution/"
+"mail/pop/</file> y no se puede escribir en ellos."
+
+#: C/mail-displaying-sender-photograph.page:5(desc)
+msgid "Display a picture of the sender in the message header area."
+msgstr "Mostrar la foto del remitente en el panel de lectura de mensajes."
+
+#: C/mail-displaying-sender-photograph.page:23(title)
+msgid "Photograph Message Headers"
+msgstr "Cabecera de mensaje con fotografía"
+
+#. TODO: Check and describe whether this requires enabling <guiseq><gui>Edit</gui><gui>Plugins</gui><gui>Face</gui></guiseq>!
+#: C/mail-displaying-sender-photograph.page:27(p)
+msgid ""
+"The photograph of the sender of an email can be shown at the right side of "
+"the message preview if the sender is in one of your address books and has a "
+"photograph."
+msgstr ""
+"Se puede mostrar la fotografía del remitente en la parte derecha de la vista "
+"previa del correo, si el remitente está en alguna de sus libretas de "
+"direcciones y tiene una fotografía."
+
+#: C/mail-displaying-sender-photograph.page:29(p)
+msgid ""
+"To enable this functionality, select <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Headers</"
+"gui><gui>Show the photograph of sender in the message preview</gui></guiseq>."
+msgstr ""
+"Para activar esta característica, seleccione <guiseq><gui>Editar</"
+"gui><gui>Preferencias</gui><gui>Opciones de correo</gui><gui>Cabeceras</"
+"gui><gui>Mostrar la foto del remitente en la vista preliminar del mensaje</"
+"gui></guiseq>."
+
+#: C/mail-displaying-sender-photograph.page:31(p)
+msgid ""
+"By default only local address books are used for searching the photograph as "
+"accessing remote address books can cause delays. You can disable this by "
+"deselecting the option <gui>Search for sender photograph only in local "
+"address books</gui>."
+msgstr ""
+"De forma predeterminada sólo se usan las libretas de direcciones locales "
+"para buscar las fotografías ya que acceder a libretas de direcciones remotas "
+"puede causar retrasos. Puede desactivarlo deseleccionando la opción "
+"<gui>Buscar la foto del remitente sólo en libretas de direcciones locales</"
+"gui>."
+
+#: C/mail-displaying-sender-photograph.page:33(p)
+msgid ""
+"If there are multiple matches for a contact, the first one is always used."
+msgstr ""
+"Se usará siempre la primera coincidencia si existen múltiples coincidencias "
+"para un contacto."
+
+#: C/mail-displaying-no-css.page:5(desc)
+msgid "When a received message looks weird or is hard to read."
+msgstr "Al recibir un correo parece extraño o difícil de leer."
+
+#: C/mail-displaying-no-css.page:21(title)
+msgid "HTML emails are not correctly displayed"
+msgstr "Los correos en HTML no se muestran correctamente"
+
+#: C/mail-displaying-no-css.page:23(p)
+msgid ""
+"If an HTML message is not correctly displayed in Evolution it might be that "
+"the formatting of the message is specified as <link href=\"http://en."
+"wikipedia.org/wiki/Cascading_Style_Sheets\">CSS</link>. CSS is currently not "
+"supported by gtkhtml (the part that is used to display HTML)."
+msgstr ""
+"Si un correo HTML no se muestra correctamente en Evolution puede que el "
+"formato del correo esté especificado como <link href=\"http://es.wikipedia."
+"org/wiki/CSS\">CSS</link>. Actualmente gtkhtml (la parte que se usa para "
+"mostrar HTML) no soporta CSS."
+
+#: C/mail-displaying-no-css.page:24(p)
+msgid "This will likely be fixed in version 3.4."
+msgstr "Esto probablemente se solucione en la versión 3.4."
+
+#: C/mail-displaying-no-css.page:25(p)
+msgid ""
+"For developers only: In future versions, Evolution will use WebKit instead "
+"of gtkhtml for displaying HTML. There is a branch named \"<link href="
+"\"http://git.gnome.org/browse/evolution?h=webkit\">webkit</link>\" in "
+"Evolution's code repository to test."
+msgstr ""
+"Sólo para desarrolladores: en versiones futuras, Evolution usará WebKit en "
+"lugar de gtkhtml para mostrar HTML. Hay una rama llamada «<link href="
+"\"http://git.gnome.org/browse/evolution?h=webkit\">webkit</link>» en el "
+"repositorio de código de Evolution para pruebas."
+
+#: C/mail-displaying-no-css.page:27(p)
+msgid ""
+"For missing characters in emails, see <link xref=\"mail-displaying-character-"
+"encodings\">Character Encodings and Sets</link>."
+msgstr ""
+"Consulte <link xref=\"mail-displaying-character-encodings\">Codificación y "
+"conjuntos de caracteres</link> cuando tenga problemas con caracteres que "
+"faltan."
+
+#: C/mail-displaying-message.page:5(desc)
+msgid "Rendering an email and handling its attachments."
+msgstr "Renderizar un correo y gestionar sus adjuntos."
+
+#: C/mail-displaying-message.page:20(title)
+msgid "Display of a message"
+msgstr "Mostrado de un correo"
+
+#: C/mail-displaying-images-in-html.page:5(desc)
+msgid "On embedded pictures in received HTML messages."
+msgstr "Acerca de imágenes empotradas en correos HTML recibidos."
+
+#: C/mail-displaying-images-in-html.page:28(title)
+msgid "Images in HTML messages"
+msgstr "Imágenes en mensajes HTML"
+
+#: C/mail-displaying-images-in-html.page:30(p)
+msgid ""
+"When someone sends you HTML mail that includes an image in the body of the "
+"message (for example, the welcome message in your Inbox), Evolution displays "
+"the image inside the message."
+msgstr ""
+"Cuando alguien le envía un mensaje HTML que una imagen en su interior (por "
+"ejemplo el mensaje de bienvenida que encontrará en la Bandeja de entrada) "
+"Evolution mostrará la imagen dentro del mensaje."
+
+#: C/mail-displaying-images-in-html.page:33(title)
+msgid "Loading images"
+msgstr "Cargar imágenes"
+
+#: C/mail-displaying-images-in-html.page:34(p)
+msgid ""
+"Some images are links in a message, rather than being part of the message. "
+"Evolution can download those images from the Internet, but does not do so "
+"unless you request it. This is because remotely hosted images can be slow to "
+"load and display, and can even be used by spammers to track who reads the "
+"email. Not automatically loading images helps protect your privacy."
+msgstr ""
+"Algunas imágenes son enlaces dentro de un mensaje, más que una parte del "
+"mensaje. Evolution puede descargar esas imágenes desde internet, pero no lo "
+"hace a menos que se lo pida explícitamente. Esto es porque las imágenes "
+"servidas remotamente pueden ser muy lentas al cargarse y mostrarse, e "
+"incluso pueden ser usadas por «spammers» para llevar un seguimiento de quién "
+"lee los mensajes. No cargar automáticamente las imágenes ayuda a proteger su "
+"privacidad."
+
+#: C/mail-displaying-images-in-html.page:36(p)
+msgid ""
+"To load the images for one message, click <guiseq><gui>View</gui><gui>Load "
+"Images</gui></guiseq> or press <keyseq><key>Ctrl</key><key>I</key></keyseq>."
+msgstr ""
+"Para cargar las imágenes en un correo electrónico pulse <guiseq><gui>Ver</"
+"gui><gui>Cargar imágenes</gui></guiseq> o pulse <keyseq><key>Ctrl</"
+"key><key>I</key></keyseq>."
+
+#: C/mail-displaying-images-in-html.page:38(p)
+msgid ""
+"To set the default action for loading images, go to <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>HTML Messages</"
+"gui><gui>Loading Images</gui></guiseq>."
+msgstr ""
+"Para establecer la acción predeterminada para cargar imágenes vaya a "
+"<guiseq><gui>Editar</gui><gui>Preferencias</gui><gui>Opciones de correo</"
+"gui><gui>Mensajes HTML</gui><gui>Cargar imágenes</gui></guiseq>."
+
+#: C/mail-displaying-images-in-html.page:42(title)
+msgid "Automatically download images in emails from people you know"
+msgstr ""
+"Automáticamente descargar imágenes en correos electrónicos de personas que "
+"conoce"
+
+#: C/mail-displaying-images-in-html.page:44(p)
+msgid ""
+"You can download images from emails sent by your contacts. To do this, go to "
+"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</"
+"gui><gui>HTML Messages</gui><gui>Loading Images</gui></guiseq>. Enable the "
+"<gui>Load images only in messages from contacts</gui> option."
+msgstr ""
+"Puede descargar las imágenes de correos electrónicos enviados por sus "
+"correos. Para ello, vaya a <guiseq><gui>Editar</gui><gui>Preferencias</"
+"gui><gui>Opciones de correo</gui><gui>Mensajes HTML</gui><gui>Cargando "
+"imágenes</gui></guiseq>. Actíve la opción <gui>Cargar imágenes en los "
+"mensajes de mis contactos</gui>."
+
+#: C/mail-displaying-images-in-html.page:46(p)
+msgid ""
+"Next, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Contacts</"
+"gui><gui>Autocompletion</gui></guiseq>. Enable autocompletion by ticking the "
+"<gui>Always show address of the autocompleted contact</gui> checkbox."
+msgstr ""
+"Después, vaya a <guiseq><gui>Editar</gui><gui>Preferencias</"
+"gui><gui>Contactos</gui><gui>Autocompletado</gui></guiseq>. Actíve el "
+"autocompletado marcando la casilla <gui>Siempre mostrar la dirección del "
+"contacto autocompletado</gui>."
+
+#: C/mail-displaying-images-in-html.page:50(title)
+msgid "Saving images"
+msgstr "Guardar imágenes"
+
+#: C/mail-displaying-images-in-html.page:51(p)
+msgid ""
+"To save an image that is embedded in an HTML email, right-click on the image "
+"and click <gui>Save Image...</gui>."
+msgstr ""
+"Para guardar una imagen empotrada en un correo HTML, pulse con el botón "
+"derecho del ratón sobre la imagen y seleccione <gui>Guardar imagen...</gui>."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/mail-displaying-collapsible-headers.page:27(None)
+msgid ""
+"@@image: './figures/plus-icon.png'; md5=57bf83c4ab8585c30897a6cf89c5949c"
+msgstr ""
+"@@image: './figures/plus-icon.png'; md5=57bf83c4ab8585c30897a6cf89c5949c"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/mail-displaying-collapsible-headers.page:29(None)
+msgid ""
+"@@image: './figures/minus-icon.png'; md5=7cef9df0f691c8d6ce67cad29ebceac9"
+msgstr ""
+"@@image: './figures/minus-icon.png'; md5=7cef9df0f691c8d6ce67cad29ebceac9"
+
+# index.docbook:458, index.docbook:949

+#: C/mail-displaying-collapsible-headers.page:5(desc)
+msgid "Display less email recipients of a specific message."
+msgstr "Mostrar menos destinatarios de un correo específico."
+
+#: C/mail-displaying-collapsible-headers.page:23(title)
+msgid "Collapsible Message Headers"
+msgstr "Cabeceras de mensajes contraíbles"
+
+#: C/mail-displaying-collapsible-headers.page:25(p)
+msgid ""
+"Evolution compresses the To, Cc and Bcc headers of received mail and shows "
+"only five addresses in the message preview."
+msgstr ""
+"Evolution comprime las cabeceras Para, Cc, Cco recibidas en los correos y "
+"muestra sólo direcciones limitadas."
+
+#: C/mail-displaying-collapsible-headers.page:27(p)
+msgid ""
+"To see all recipients, click the <media type=\"image\" src=\"./figures/plus-"
+"icon.png\"/> icon next to the <gui>To:</gui> or <gui>Cc:</gui> line, or "
+"click the ellipsis (...) at the end of the five displayed addresses."
+msgstr ""
+"Para ver todos los destinatarios pulse el icono <media type=\"image\" src="
+"\"./figures/plus-icon.png\"/> junto a las líneas <gui>Para:</gui> o <gui>CC:"
+"</gui> o pulse la elipsis (...) al final de las cinco direcciones de correo "
+"mostradas."
+
+#: C/mail-displaying-collapsible-headers.page:29(p)
+msgid ""
+"To collapse all of the message headers and just display the subject and "
+"sender in one line, click the icon <media type=\"image\" src=\"./figures/"
+"minus-icon.png\"/> next to the <gui>From:</gui> line. This is helpful on "
+"small screens."
+msgstr ""
+"Para contraer todos las cabeceras de correo y mostrar solo el asunto y el "
+"remitente en una línea pulse el icono <media type=\"image\" src=\"./figures/"
+"minus-icon.png\"/> junto a la línea <gui>De:</gui>. Es útil en pantallas "
+"pequeñas."
+
+#: C/mail-displaying-character-encodings.page:5(desc)
+msgid "When characters in an email are not shown correctly or missing."
+msgstr ""
+"Cuando existen caracteres en un correo que no se muestran correctamente o "
+"que faltan."
+
+#: C/mail-displaying-character-encodings.page:20(title)
+msgid "Character Encodings and Sets"
+msgstr "Codificación y conjuntos de caracteres"
+
+#. TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=655021 is fixed
+#: C/mail-displaying-character-encodings.page:24(p)
+msgid ""
+"If the email program of the sender is broken or misconfigured, plain text "
+"emails might not include information about the character encoding used. If "
+"you receive such messages, choose <guiseq><gui>View</gui><gui>Character "
+"Encoding</gui></guiseq> from the main menu and change the currently chosen "
+"character encoding to an appropriate one that might be the encoding used by "
+"the sender. You have to make this change every time you view the message."
+msgstr ""
+"Los correos en texto plano pueden no incluir información acerca de la "
+"codificación de caracteres usada si el programa de correo electrónico del "
+"remitente está roto o mal configurado. Si recibe tales mensajes, elija "
+"<guiseq><gui>Ver</gui><gui>Codificación de caracteres</gui></guiseq> del "
+"menú principal y cambie el conjunto de caracteres actual a uno apropiado que "
+"el remitente pueda haber usado. Debe hacer este cambio cada vez que quiera "
+"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>."
+msgstr ""
+"Para cambiar constantemente este ajuste 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>."
+
+#: C/mail-delete-and-undelete.page:5(desc)
+msgid "Deleting, expunging, and undeleting mail."
+msgstr "Eliminar, purgar y recuperar correo."
+
+#: C/mail-delete-and-undelete.page:25(title)
+msgid "Deleting and undeleting messages"
+msgstr "Eliminar y recuperar mensajes"
+
+#: C/mail-delete-and-undelete.page:28(title)
+msgid "Deleting Messages"
+msgstr "Eliminar mensajes"
+
+#: C/mail-delete-and-undelete.page:30(p)
+msgid ""
+"To delete a message, select it and press the <key>Delete</key> key, or click "
+"the <gui style=\"button\">Delete</gui> button in the toolbar, or press "
+"<keyseq><key>Ctrl</key><key>D</key></keyseq>, or right-click the message and "
+"click <gui>Delete</gui>."
+msgstr ""
+"Para eliminar un correo, selecciónelo y pulse la tecla <key>Supr</key>, "
+"pulse el botón <gui style=\"button\">Eliminar</gui> en la barra de "
+"herramientas, pulse <keyseq><key>Ctrl</key><key>D</key></keyseq>, o pulse "
+"con el botón derecho sobre el mensaje y elija <gui>Eliminar</gui>."
+
+#: C/mail-delete-and-undelete.page:32(p)
+msgid ""
+"When you press Delete or click the Trash folder, your mail is not actually "
+"deleted, but is marked for deletion. You can see all message marked for "
+"deletion in the Trash folder. To show deleted messages, click "
+"<guiseq><gui>View</gui><gui>Show Deleted Messages</gui></guiseq>. You can "
+"view the messages striken off for later deletion."
+msgstr ""
+"Cuando pulsa Eliminar o pulsa en el la carpeta de la Papelera, su correo no "
+"se borra realmente sino que se marca para ser eliminado. Puede ver los "
+"mensajes marcados para ser eliminados en la carpeta Papelera. Para mostrar "
+"los mensajes eliminados, pulse <guiseq><gui>Ver</gui><gui>Mostrar mensajes "
+"eliminados</gui></guiseq>. Puede ver los mensajes marcados para ser "
+"eliminados más tarde."
+
+#: C/mail-delete-and-undelete.page:34(p)
+msgid ""
+"To permanently erase all the deleted messages in a folder, click "
+"<guiseq><gui>Folder</gui><gui>Expunge</gui></guiseq> or press "
+"<keyseq><key>Ctrl</key><key>E</key></keyseq>."
+msgstr ""
+"Para borrar permanentemente todos los mensajes borrados en una carpeta, "
+"pulse <guiseq><gui>Carpeta</gui><gui>Purgar</gui></guiseq> o pulse "
+"<keyseq><key>Ctrl</key><key>E</key></keyseq>."
+
+#: C/mail-delete-and-undelete.page:38(title)
+msgid "Undeleting Messages"
+msgstr "Recuperar mensajes"
+
+#: C/mail-delete-and-undelete.page:40(p)
+msgid ""
+"You can undelete a message that has been deleted but not expunged yet. To "
+"undelete a message, select the message, click <guiseq><gui>Edit</"
+"gui><gui>Undelete message</gui></guiseq>. Note that <guiseq><gui>View</"
+"gui><gui>Show Deleted Messages</gui></guiseq> must be enabled for this."
+msgstr ""
+"Puede recuperar un mensaje que se ha eliminado pero no ha sido purgado "
+"todavía. Para recuperar un mensaje, seleccione el mensaje, pulse "
+"<guiseq><gui>Editar</gui><gui>Recuperar mensaje</gui></guiseq>. Tenga en "
+"cuenta que que <guiseq><gui>Ver</gui><gui>Mostrar mensajes eliminados</gui></"
+"guiseq> debe estar activado para esto."
+
+#: C/mail-delete-and-undelete.page:42(p)
+msgid ""
+"If you have marked a message for deletion, undeleting it unmarks it, and the "
+"message is not shown anymore in the Trash folder."
+msgstr ""
+"Si ha marcado un mensaje para su eliminación, recuperándolo eliminará la "
+"marca y el mensaje ya no será visible en la carpeta Papelera."
+
+#: C/mail-default-folder-locations.page:5(desc)
+msgid "Changing the location of the Draft folder and Sent folder."
+msgstr "Cambiar la ubicación de las carpetas Borradores y Enviados."
+
+#: C/mail-default-folder-locations.page:32(title)
+msgid "Mail folder locations"
+msgstr "Ubicaciones de las carpetas de correo"
+
+#: C/mail-default-folder-locations.page:34(p)
+msgid ""
+"You can set a different place where to store messages in your Draft folder "
+"and Sent folder in the <gui>Defaults</gui> section of the mail account "
+"editor (<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
+"gui><gui style=\"button\">Edit</gui><gui>Defaults</gui></guiseq>)."
+msgstr ""
+"Puede establecer un lugar diferente para almacenar sus correos en la carpeta "
+"Borradores y Enviados en la sección <gui>Predeterminados</gui> del editor de "
+"la cuenta de correo (<guiseq><gui>Editar</gui><gui>Preferencias</"
+"gui><gui>Cuentas de correo</gui><gui style=\"button\">Editar</"
+"gui><gui>Predeterminados</gui></guiseq>)."
+
+#: C/mail-default-folder-locations.page:35(p)
+msgid ""
+"For remote account types (accounts such as IMAP) you can also set a Trash "
+"folder and Junk folder on the mail server so Evolution's local virtual "
+"folders will not be used for it, but folders on the mail server."
+msgstr ""
+"Para tipos de cuenta remota (tales como IMAP) también puede establecer una "
+"carpeta de Papelera y de SPAM en el servidor de correo, de tal forma que no "
+"se usarán las carpetas virtuales locales de Evolution para ello, sino las "
+"del servidor de correo en su lugar."
+
+#: C/mail-default-CC-and-BCC.page:5(desc)
+msgid "Make somebody always receive copies of your sent mail."
+msgstr "Hacer que alguien siempre reciba copias de los correos que envía."
+
+#: C/mail-default-CC-and-BCC.page:32(title)
+msgid "Default CC and BCC"
+msgstr "Cc y Cco predeterminadas"
+
+#: C/mail-default-CC-and-BCC.page:34(p)
+msgid ""
+"You can set email addresses that should always receive copies of your sent "
+"mail (either as CC visible for all recipients, or BCC not visible for other "
+"recipients) in the <gui>Defaults</gui> section of the mail account editor "
+"(<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui "
+"style=\"button\">Edit</gui><gui>Defaults</gui></guiseq>)."
+msgstr ""
+"Puede configurar que ciertas direcciones de correo electrónico siempre "
+"reciban copias del correo que envía (ya sea como Cc visible para todos los "
+"destinatarios o como Cco no visible para el resto de destinatarios) en la "
+"sección <gui>Predeterminados</gui> del editor de cuentas "
+"(<guiseq><gui>Editar</gui><gui>Preferencias</gui><gui>Cuentas de correo</"
+"gui><gui style=\"button\">Editar</gui><gui>Predeterminados</gui></guiseq>)."
+
+#: C/mail-composer-write-new-message.page:5(desc)
+msgid "Writing a new email to send to a recipient."
+msgstr "Escribir un nuevo correo para enviarlo a un destinatario."
+
+#: C/mail-composer-write-new-message.page:23(title)
+msgid "Composing a new message"
+msgstr "Redactar un mensaje de correo nuevo"
+
+#: C/mail-composer-write-new-message.page:25(p)
+msgid ""
+"You can start writing a new email message by clicking <guiseq><gui>File</"
+"gui><gui>New</gui><gui>Mail Message</gui></guiseq>, by pressing "
+"<keyseq><key>Shift</key><key>Ctrl</key><key>M</key></keyseq>, or by clicking "
+"<gui>New</gui> in the toolbar."
+msgstr ""
+"Puede comenzar a escribir un nuevo mensaje de correo-e pulsando "
+"<guiseq><gui>Archivo</gui><gui>Nuevo</gui><gui>Mensajes de correo</gui></"
+"guiseq>, <keyseq><key>Mayús</key><key>Ctrl</key><key>M</key></keyseq> o "
+"pulsando <gui>Nuevo</gui> en la barra de herramientas."
+
+#: C/mail-composer-write-new-message.page:27(p)
+msgid ""
+"Enter an email address in the <gui>To:</gui> field. If you want to enter "
+"multiple addresses, separate them by commas. See <link xref=\"mail-composer-"
+"several-recipients\"/> for more information on sending messages to more than "
+"one person."
+msgstr ""
+"Introduzca una dirección de correo-e en el campo <gui>To:</gui>. Si quiere "
+"introducir varias direcciones, sepárelas con comas. Consulte la <link xref="
+"\"mail-composer-several-recipients\"/> para obtener más información sobre "
+"cómo enviar mensajes a más de una persona."
+
+#: C/mail-composer-write-new-message.page:29(p)
+msgid ""
+"After you have written your message, click <gui>Send</gui> or press "
+"<keyseq><key>Ctrl</key><key>Return</key></keyseq>."
+msgstr ""
+"Después de que haya escrito su correo, pulse <gui>Enviar</gui> o pulse "
+"<keyseq><key>Ctrl</key><key>Intro</key></keyseq>."
+
+#: C/mail-composer-spellcheck.page:5(desc)
+msgid "On spell checking your mail in the composer."
+msgstr "Acerca de la comprobación de ortografía en el editor."
+
+#: C/mail-composer-spellcheck.page:20(title)
+msgid "Spell checking"
+msgstr "Comprobación de ortografía"
+
+#: C/mail-composer-spellcheck.page:25(title)
+msgid "Prerequirements"
+msgstr "Prerrequisitos"
+
+#: C/mail-composer-spellcheck.page:26(p)
+msgid ""
+"To use spell checking for the emails that you write you first need to make "
+"sure that the <em>hunspell</em> package for your specific language and the "
+"<em>enchant</em> package are installed via the software management tool of "
+"your distribution."
+msgstr ""
+"Para usar corrección ortográfica para los correos que escribe primero debe "
+"asegurarse de que tiene instalados, a través de la herramienta de gestión de "
+"software de su distribución, los paquetes <em>hunspell</em> y <em>enchant</"
+"em> específicos para su idioma."
+
+#: C/mail-composer-spellcheck.page:27(link)
+msgid "Install hunspell now."
+msgstr "Instalar «hunspell» ahora."
+
+#: C/mail-composer-spellcheck.page:28(link)
+msgid "Install enchant now."
+msgstr "Instalar «enchant» ahora."
+
+#: C/mail-composer-spellcheck.page:32(title)
+msgid "Global Preferences"
+msgstr "Preferencias globales"
+
+#: C/mail-composer-spellcheck.page:34(p)
+msgid ""
+"Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer "
+"Preferences</gui><gui>Spell Checking</gui><gui>Options</gui></guiseq> you "
+"can define whether your spelling is checked while you type and which color "
+"is used for underlining words that are misspelled."
+msgstr ""
+"Bajo <guiseq><gui>Editar</gui><gui>Preferencias</gui><gui>Preferencias del "
+"editor</gui><gui>Ortografía</gui><gui>Opciones</gui></guiseq> puede definir "
+"si quiere que se compruebe la ortografía según escribe y qué color se usa "
+"para subrayar las palabras mal escritas."
+
+#: C/mail-composer-spellcheck.page:36(p)
+msgid ""
+"You can also define which installed languages are used for spell checking in "
+"the list available under <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Composer Preferences</gui><gui>Spell Checking</gui><gui>Languages</"
+"gui></guiseq>."
+msgstr ""
+"También puede definir qué idiomas instalados se usan para la corrección "
+"ortográfica en la lista disponible bajo <guiseq><gui>Editar</"
+"gui><gui>Preferencias</gui><gui>Preferencias del editor</"
+"gui><gui>Ortografía</gui><gui>Idiomas</gui></guiseq>."
+
+#: C/mail-composer-spellcheck.page:40(title)
+msgid "Manual spell checking in the composer"
+msgstr "Comprobación de ortografía manual en el editor"
+
+#: C/mail-composer-spellcheck.page:41(p)
+msgid ""
+"If you do not have <gui>Checking spelling while I type</gui> enabled in the "
+"<link xref=\"#global-preferences\">Composer Preferences</link> you can run a "
+"spell check in the email composer by clicking <guiseq><gui>Edit</"
+"gui><gui>Spell Checking</gui></guiseq> or by pressing <key>F7</key>."
+msgstr ""
+"Si no tiene activada <gui>Comprobar ortografía mientras se escribe</gui> en "
+"las <link xref=\"#global-preferences\">Preferencias del editor</link> puede "
+"ejecutar una comprobación de ortografía en el editor de correos pulando "
+"<guiseq><gui>Editar</gui><gui>Ortografía</gui></guiseq> o pulsando <key>F7</"
+"key>."
+
+#: C/mail-composer-several-recipients.page:5(desc)
+msgid "Sending to more than one person and using CC or BCC."
+msgstr "Enviar a más de una persona y usar Cc o Cco."
+
+#: C/mail-composer-several-recipients.page:26(title)
+msgid "Sending a message to several recipients"
+msgstr "Enviar un correo a varios destinatarios"
+
+#: C/mail-composer-several-recipients.page:28(p)
+msgid ""
+"To send a message to more than one person, enter the addresses in the "
+"composer by separating them with commas or semicolons."
+msgstr ""
+"Para enviar un correo electrónico a más de una persona, introduzca las "
+"direcciones en el editor separándolas por comas o puntos y comas."
+
+#: C/mail-composer-several-recipients.page:30(p)
+msgid ""
+"If you frequently write email to the same groups of people, you can create "
+"<link xref=\"contacts-using-contact-lists\">contact lists</link> to send "
+"them mail as though they have a single address."
+msgstr ""
+"Si escribe con frecuencia a los mismos grupos de personas, puede crear <link "
+"xref=\"contacts-using-contact-lists\">listas de contactos</link> para "
+"enviarles correos como si tuvieran una única dirección de correo."
+
+#: C/mail-composer-several-recipients.page:33(title)
+msgid "Recipient types"
+msgstr "Tipos de destinatarios"
+
+#: C/mail-composer-several-recipients.page:34(p)
+msgid ""
+"Email messages can have three different types of recipients. The simplest "
+"way is to put the email address or addresses in the <gui>To:</gui> text "
+"field. The <gui>Cc:</gui> text field is used for recipients that are meant "
+"to receive a copy of your message but are not the primary recipients."
+msgstr ""
+"Los mensajes de correo pueden tener tres tipos diferentes de destinatarios. "
+"El más sencillo es poner la dirección de correo en el campo de texto "
+"<gui>Para:</gui>. El campo de texto <gui>CC:</gui> se usa para destinatarios "
+"a los que quiere que le llegue una copia pero no son los destinatarios "
+"principales."
+
+#: C/mail-composer-several-recipients.page:36(p)
+msgid ""
+"Addresses in the <gui>Bcc:</gui> text field are hidden from the other "
+"recipients of the message. It can be used to send mail to large groups of "
+"people, especially if they do not know each other or if privacy is a "
+"concern. If the <gui>Bcc:</gui> text field is not shown, click "
+"<guiseq><gui>View</gui><gui>Bcc Field</gui></guiseq>."
+msgstr ""
+"Las direcciones en la lista <gui>Cco:</gui> están ocultas a los otros "
+"destinatarios del mensaje. Puede usarlo para enviar correos a grandes grupos "
+"de personas especialmente si no se conocen entre sí o si es importante "
+"mantener la privacidad. Si el campo <gui>Cco:</gui> no está a la vista pulse "
+"<guiseq><gui>Ver</gui><gui>Campo Cco</gui></guiseq>."
+
+#: C/mail-composer-several-recipients.page:40(title)
+msgid "Autocompletion"
+msgstr "Autocompletado"
+
+#: C/mail-composer-several-recipients.page:41(p)
+msgid ""
+"It is recommended to use the <link xref=\"contacts-autocompletion"
+"\">Autocompletion</link> feature of the Evolution address book for entering "
+"addresses. By using this you avoid typos and save time."
+msgstr ""
+"Se recomienda usar la característica <link xref=\"contacts-autocompletion"
+"\">Autocompletado</link> de la libreta de direcciones de Evolution para "
+"escribir direcciones. Al usar esto se evitan errores y se ahorra tiempo."
+
+#: C/mail-composer-several-recipients.page:45(title)
+msgid "Using the buttons"
+msgstr "Usar los botones"
+
+#: C/mail-composer-several-recipients.page:47(p)
+msgid ""
+"Instead of typing the recipients' names you can also click the <gui style="
+"\"button\">To:</gui>, <gui style=\"button\">Cc:</gui>, or <gui style=\"button"
+"\">Bcc:</gui> buttons to get a list of the email addresses in your address "
+"books. Select the addresses and click the arrow buttons to move them into "
+"the appropriate address columns (To:, Cc:, Bcc:)."
+msgstr ""
+"En vez de escribir los nombres de los destinatarios, puede pulsar los "
+"botones <gui style=\"button\">Para:</gui>, <gui style=\"button\">Cc:</gui>, "
+"o <gui style=\"button\">CCo:</gui> para obtener una lista de las direcciones "
+"de corre-e en sus libretas de direcciones. Seleccione las direcciones y "
+"pulse los botones de flechas para moverlas a las columnas de direcciones "
+"adecuadas (Para:, Cc:, CCo:)."
+
+#: C/mail-composer-search.page:5(desc)
+msgid "Searching for text in the mail composer."
+msgstr "Buscar texto en el editor de correo."
+
+#: C/mail-composer-search.page:21(title)
+msgid "Searching in the mail composer"
+msgstr "Buscar y en el editor de mensajes"
+
+#: C/mail-composer-search.page:23(p)
+msgid ""
+"Under the <gui>Edit</gui> menu in the message composer there are several "
+"text searching features available."
+msgstr ""
+"Bajo el menú <gui>Editar</gui> en el editor de mensajes existen diversas "
+"características de búsqueda de texto disponibles."
+
+#: C/mail-composer-search.page:26(p)
+msgid "<gui>Find</gui>:"
+msgstr "<gui>Buscar</gui>:"
+
+#: C/mail-composer-search.page:27(p)
+msgid "Enter a word or phrase, and Evolution finds it in your message."
+msgstr "Escriba una palabra o frase y Evolution la encontrará en el mensaje."
+
+#: C/mail-composer-search.page:30(p)
+msgid "<gui>Find Again</gui>:"
+msgstr "<gui>Buscar de nuevo</gui>:"
+
+#: C/mail-composer-search.page:31(p)
+msgid "Select this item to repeat the last search you performed."
+msgstr ""
+"Seleccione este elemento para repetir la última búsqueda que haya realizado."
+
+#: C/mail-composer-search.page:34(p)
+msgid "<gui>Replace</gui>:"
+msgstr "<gui>Reemplazar</gui>:"
+
+#: C/mail-composer-search.page:35(p)
+msgid "Find a word or phrase, and replace it with something else."
+msgstr "Buscar una palabra o una frase y sustituirla por otra cosa."
+
+#: C/mail-composer-search.page:39(p)
+msgid ""
+"For all of these menu items you can choose whether to search backwards in "
+"the document from the point where your cursor is. You can also determine "
+"whether the search is to be case sensitive in determining a match"
+msgstr ""
+"Para todos estos elementos de menú puede elegir si quiere o no buscar hacia "
+"atrás en el documento desde el punto en el que se encuentra el cursor. "
+"También puede determinar si quiere que la búsqueda sea sensible a mayúsculas "
+"o no."
+
+#: C/mail-composer-search.page:40(p)
+msgid ""
+"If you have a technical background you can also select the option to use "
+"<link href=\"https://secure.wikimedia.org/wikipedia/en/wiki/"
+"Regular_expression\">Regular expressions</link> for searching."
+msgstr ""
+"Si tiene conocimientos técnicos, puede usar la opción <link href=\"https://"
+"secure.wikimedia.org/wikipedia/en/wiki/Regular_expression\">Expresiones "
+"regulares</link> para buscar."
+
+#: C/mail-composer-reply.page:5(desc)
+msgid "Answering a received email."
+msgstr "Responder a un correo recibido."
+
+#: C/mail-composer-reply.page:23(title)
+msgid "Replying to a message"
+msgstr "Responder un correo"
+
+#: C/mail-composer-reply.page:26(title)
+msgid "Replying to Email Messages"
+msgstr "Responder a mensajes de correo-e"
+
+#: C/mail-composer-reply.page:27(p)
+msgid ""
+"To reply to a message, select the message to reply to in the message list "
+"and click the Reply button in the toolbar, or right-click within the message "
+"and select Reply to Sender. This opens the message composer. The <gui>To:</"
+"gui> and <gui>Subject:</gui> fields are already filled, although you can "
+"alter them if you prefer. In addition, the full text of the old message is "
+"inserted into the new message, either in grey with a blue line on one side "
+"(for HTML display) or with the &gt; character before each line (in plain "
+"text mode), to indicate that it is part of the previous message."
+msgstr ""
+"Para responder a un mensaje, seleccione el mensaje al que responder en la "
+"lista de mensajes y pulse el botón Responder en la barra de tareas, o pulse "
+"con el botón derecho en el mensaje y seleccione Responder al remitente. Esto "
+"abrirá el editor de mensajes. Los campos <gui>Para:</gui> y <gui>Asunto:</"
+"gui> ya estarán rellenados, aunque puede cambiarlos si quiere. Además se "
+"insertará el texto completo del mensaje antiguo en el nuevo mensaje, en gris "
+"o bien con una línea azul a un lado (sólo para correos en HTML) o con el "
+"carácter &gt; antes de cada línea (para el modo texto plano), para indicar "
+"que es parte del mensaje anterior."
+
+#: C/mail-composer-reply.page:28(p)
+msgid ""
+"If you are reading a message with several recipients, you can use <gui>Reply "
+"to All</gui> instead of <gui>Reply</gui>. If there are large numbers of "
+"people in the <gui>Cc:</gui> or <gui>To:</gui> fields, this can save "
+"substantial amounts of time."
+msgstr ""
+"Si está leyendo un mensaje que tiene varios destinatarios puede usar "
+"<gui>Responder a todos</gui> en lugar de <gui>Responder</gui>. Si hay un "
+"gran número de personas en los campos <gui>Para:</gui> o <gui>Cc:</gui> esto "
+"puede ahorrar mucho tiempo."
+
+#: C/mail-composer-reply.page:32(title)
+msgid "Using the Reply To All Feature"
+msgstr "Uso de la característica de Responder a todos"
+
+#: C/mail-composer-reply.page:33(p)
+msgid ""
+"Susan sends an email to a client and sends copies to Tim and to an internal "
+"company mailing list of co-workers. If Tim wants to make a comment for all "
+"of them to read, he uses <gui>Reply to All</gui>, but if he just wants to "
+"tell Susan that he agrees with her, he uses <gui>Reply</gui>. His reply does "
+"not reach anyone that Susan put on her Bcc list, because that list is not "
+"shared with anyone."
+msgstr ""
+"Susana envía un mensaje a un cliente y añade una copia para Tomás y a una "
+"lista de correo interna de la compañía para sus compañeros de trabajo. Si "
+"Tomás quiere mandar un comentario para que lo lean todos sus compañeros, él "
+"pulsará en <gui>Responder a todos</gui> pero si lo que quiere es solamente "
+"decirle a Susana que está de acuerdo con ella, usará <gui>Responder</gui>. "
+"Su la recibirá nadie a quien Susana haya incluido en la lista de Cco porque "
+"tal lista no se ha compartido con nadie."
+
+#: C/mail-composer-reply.page:34(p)
+msgid ""
+"If you subscribe to a mailing list, and want your reply to go just to the "
+"list rather than to the sender, select <gui>Reply to List</gui> instead of "
+"<gui>Reply</gui> or <gui>Reply to All</gui>."
+msgstr ""
+"Si se suscribe a una lista de correo y quiere que su respuesta sólo vaya a "
+"la lista en lugar de al remitente pulse en <gui>Responder a la lista</gui> "
+"en lugar de <gui>Responder</gui> o <gui>Responder a todos</gui>."
+
+#: C/mail-composer-reply.page:38(title)
+msgid "Keyboard shortcuts"
+msgstr "Atajos de teclado"
+
+#: C/mail-composer-reply.page:41(p)
+msgid "Action"
+msgstr "Acción"
+
+#: C/mail-composer-reply.page:41(p)
+msgid "Shortcut keys"
+msgstr "Atajos de teclado"
+
+#: C/mail-composer-reply.page:43(p)
+msgid "Reply to Sender"
+msgstr "Responder al remitente"
+
+#: C/mail-composer-reply.page:43(key) C/mail-composer-reply.page:45(key)
+#: C/mail-composer-reply.page:47(key)
+msgid "Ctrl"
+msgstr "Ctrl"
+
+#: C/mail-composer-reply.page:43(key) C/mail-composer-reply.page:47(key)
+msgid "R"
+msgstr "R"
+
+#: C/mail-composer-reply.page:45(p)
+msgid "Reply to Mailing List"
+msgstr "Responder a una lista de correo"
+
+#: C/mail-composer-reply.page:45(key)
+msgid "L"
+msgstr "L"
+
+#: C/mail-composer-reply.page:47(p)
+msgid "Reply to All"
+msgstr "Responder a todos"
+
+#: C/mail-composer-reply.page:47(key)
+msgid "Shift"
+msgstr "Mayús"
+
+# index.docbook:29, index.docbook:30

+#: C/mail-composer-reply.page:53(title) C/mail-composer-forward.page:40(title)
+msgid "Default settings"
+msgstr "Ajustes predeterminados"
+
+#: C/mail-composer-reply.page:54(p) C/mail-composer-forward.page:41(p)
+msgid ""
+"The default settings for replying and forwarding can be changed under "
+"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</"
+"gui><gui>General</gui><gui>Replies and Forwards</gui><gui>Forward style</"
+"gui></guiseq>."
+msgstr ""
+"La configuración predeterminada para responder y reenviar se puede cambiar "
+"en <guiseq><gui>Editar</gui><gui>Preferencias</gui><gui>Preferencias del "
+"editor</gui><gui>General</gui><gui>Respuestas y reenvíos</gui><gui>Estilo de "
+"reenvío</gui></guiseq>."
+
+#: C/mail-composer-priority.page:5(desc)
+msgid "Setting a priority for messages to be sent."
+msgstr "Establecer una prioridad en los mensajes que enviar."
+
+#: C/mail-composer-priority.page:23(title)
+msgid "Prioritizing outgoing messages"
+msgstr "Priorizar mensajes salientes"
+
+#: C/mail-composer-priority.page:25(p)
+msgid ""
+"You can prioritize a message to be sent, so that the recipient sees its "
+"relative importance. To prioritize a message, click <guiseq><gui>Insert</"
+"gui><gui>Prioritize Message</gui></guiseq> in the composer window."
+msgstr ""
+"Puede priorizar un mensaje que enviar, para que el destinatario vea su "
+"importancia relativa. Para priorizar un mensaje, pulse "
+"<guiseq><gui>Insertar</gui><gui>Priorizar mensaje</gui></guiseq> en la "
+"ventana del editor."
+
+#: C/mail-composer-priority.page:27(p)
+msgid ""
+"Evolution will ignore the message priority of incoming messages because the "
+"recipient should decide whether the message is important or not. You can set "
+"the \"Important\" flag for any messages."
+msgstr ""
+"Evolution ignorará la prioridad de los mensajes entrantes porque asume que "
+"el destinatario debería decidir si el mensaje es importante o no. Puede "
+"establecer la opción de «importante» para cualquier mensaje."
+
+#: C/mail-composer-message-templates.page:5(desc)
+msgid "Message templates to reuse in the composer."
+msgstr "Plantillas de correos para reusar en el editor."
+
+#: C/mail-composer-message-templates.page:23(title)
+msgid "Message Templates"
+msgstr "Plantillas de correo"
+
+#: C/mail-composer-message-templates.page:24(p)
+msgid ""
+"A message template is a standard message that you can use at any time to "
+"send mail with the same pattern."
+msgstr ""
+"Una plantilla de mensaje es un mensaje estándar que puede usar en cualquier "
+"momento para enviar correos con el mismo patrón."
+
+#: C/mail-composer-message-templates.page:25(p)
+msgid ""
+"To enable the Message Template Plugin, click <guiseq><gui>Edit</"
+"gui><gui>Plugins</gui></guiseq> and enable <gui>Templates</gui>."
+msgstr ""
+"Para activar el complemento de plantillas de correo pulse "
+"<guiseq><gui>Editar</gui><gui>Complementos</gui></guiseq> y actíve "
+"<gui>Plantillas</gui>."
+
+#: C/mail-composer-message-templates.page:31(title)
+msgid "Creating a Message Template from an existing Message"
+msgstr "Crear una plantilla de correo desde un mensaje existente"
+
+#: C/mail-composer-message-templates.page:33(p)
+msgid "Select the message."
+msgstr "Seleccione el mensaje."
+
+#: C/mail-composer-message-templates.page:34(p)
+msgid ""
+"Right-click the message and choose <gui>Move to folder</gui> or <gui>Copy to "
+"folder</gui>."
+msgstr ""
+"Pulse con el botón derecho del ratón y seleccione <gui>Mover a la carpeta</"
+"gui> o <gui>Copiar a la carpeta</gui>."
+
+#: C/mail-composer-message-templates.page:35(p)
+msgid ""
+"Select the <gui>Templates</gui> folder under <gui>On This Computer</gui>."
+msgstr ""
+"Seleccione la carpeta <gui>Plantillas</gui> bajo <gui>En este equipo</gui>."
+
+#: C/mail-composer-message-templates.page:37(p)
+msgid "You can also edit an existing message and save it as a template:"
+msgstr ""
+"También puede editar un correo existente y guardarlo como una plantilla:"
+
+#: C/mail-composer-message-templates.page:39(p)
+msgid "Open the message and click <gui>Reply</gui>."
+msgstr "Abra el correo y pulse <gui>Responder</gui>."
+
+#: C/mail-composer-message-templates.page:40(p)
+msgid "Edit the message body or the addresses according to your requirements."
+msgstr ""
+"Edite el cuerpo del mensaje o las direcciones de acuerdo con sus necesidades."
+
+#: C/mail-composer-message-templates.page:41(p)
+#: C/mail-composer-message-templates.page:52(p)
+msgid "Select <guiseq><gui>File</gui><gui>Save as Template</gui></guiseq>."
+msgstr ""
+"Seleccione <guiseq><gui>Archivo</gui><gui>Guardar como plantilla</gui></"
+"guiseq>."
+
+#: C/mail-composer-message-templates.page:46(title)
+msgid "Saving a New Message as a Template"
+msgstr "Guardar un mensaje nuevo como plantilla"
+
+#: C/mail-composer-message-templates.page:49(p)
+msgid ""
+"Click <gui>New</gui> and enter in the composer window what you need for the "
+"template."
+msgstr ""
+"Pulse <gui>Nuevo</gui> para entrar en la ventana del editor que necesita "
+"para la plantilla."
+
+#: C/mail-composer-message-templates.page:58(title)
+msgid "Using a Message Template as a Reply"
+msgstr "Usar una plantilla de mensaje como respuesta"
+
+#: C/mail-composer-message-templates.page:61(p)
+msgid ""
+"Right-click the message you are replying to, then click <gui>Templates</gui>."
+msgstr ""
+"Pulse con el botón derecho del ratón sobre el correo al que está "
+"respondiendo, después pulse <gui>Plantillas</gui>."
+
+#: C/mail-composer-message-templates.page:62(p)
+msgid ""
+"This option lists all the message templates in the <gui>Templates</gui> "
+"folder."
+msgstr ""
+"Esta opción lista todas las plantillas de mensajes en la carpeta "
+"<gui>Plantillas</gui>."
+
+#: C/mail-composer-message-templates.page:65(p)
+msgid ""
+"Select the message template of your choice. Make changes if required in the "
+"email composer window that will open."
+msgstr ""
+"Seleccione un mensaje de plantilla a su elección. Realice los cambios que "
+"quiera en la ventana del editor de mensajes que se abrirá."
+
+#: C/mail-composer-message-templates.page:68(p)
+msgid "Click <gui>Send</gui>."
+msgstr "Pulse <gui>Enviar</gui>."
+
+#: C/mail-composer-message-templates.page:69(p)
+msgid ""
+"When you select a message template for replying, the subject of the reply is "
+"preserved."
+msgstr ""
+"Al seleccionar una plantilla de mensaje para responder, el asunto de la "
+"respuesta se mantiene."
+
+#: C/mail-composer-message-templates.page:75(title)
+msgid "Configuring Message Templates"
+msgstr "Configurar plantillas de mensajes"
+
+#: C/mail-composer-message-templates.page:77(p)
+#: C/mail-composer-custom-header-lines.page:31(p)
+#: C/mail-attachments-sending.page:46(p)
+msgid "Select <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>."
+msgstr "Seleccione <guiseq><gui>Editar</gui><gui>Complementos</gui></guiseq>."
+
+#: C/mail-composer-message-templates.page:78(p)
+msgid "Click <gui>Templates</gui>."
+msgstr "Pulse <gui>Plantilas</gui>."
+
+#: C/mail-composer-message-templates.page:79(p)
+#: C/mail-composer-custom-header-lines.page:33(p)
+#: C/mail-attachments-sending.page:48(p)
+msgid "Click the <gui>Configuration</gui> tab."
+msgstr "Pulse la pestaña <gui>Configuración</gui>."
+
+#: C/mail-composer-message-templates.page:80(p)
+msgid ""
+"You can add, edit or remove the key-value pairs. You can specify any number "
+"of key-value pairs."
+msgstr ""
+"Puede añadir, editar o quitar los pares de claves y valores. Puede "
+"especificar cualquier número de pares de claves y valores."
+
+#: C/mail-composer-message-templates.page:82(p)
+msgid ""
+"In any template, the occurrence of every $key is replaced by the value it "
+"has in the configuration. For example, if you set the key to Manager and the "
+"value to Harry, any occurrence of $Manager is replaced by Harry in the "
+"message."
+msgstr ""
+"La aparición de la cada $key en cualquier plantilla se reemplaza con el "
+"valor que tiene en la configuración. Por ejemplo, si establece la clave a "
+"Director y el valor a Tomás, cualquier aparición de $Director se reemplaza "
+"con Tomás en el mensaje."
+
+#: C/mail-composer-message-templates.page:83(p)
+msgid ""
+"Assume that you have 1000 message templates with your current manager's name "
+"in them. When the current manager is replaced by a new one, it is not easy "
+"for you to manually replace the manager's name in all the 1000 messages. If "
+"the messages have a $Manager key value, you can reset the value in the "
+"Configuration tab of this plugin."
+msgstr ""
+"Asuma que tiene 1.000 plantillas de mensajes con el nombre actual de su jefe "
+"como referencia en ellas. Cuando el jefe actual cambia, no es fácil "
+"reemplazar manualmente el nombre del jefe en las 1.000 plantillas. Si los "
+"mensajes tienen un valor de clave $Jefe, puede cambiar el valor en la "
+"pestaña Configuración de este complemento."
+
+#: C/mail-composer-message-templates.page:84(p)
+msgid ""
+"By default, the entire environment variables are used as a key-value pair. "
+"An occurrence of $env_variable is replaced by the value it carries. For "
+"example, an occurrence of $PATH in your template is replaced by its value "
+"when the template is used."
+msgstr ""
+"De forma predeterminada todas las variables de entorno se usan como pares de "
+"claves-valores. Una aparición de $env_variable se reemplaza por el valor que "
+"lleva. Por ejemplo, una aparición de $PATH en su plantilla se reemplaza por "
+"su valor al usar la plantilla."
+
+#: C/mail-composer-message-templates.page:85(p)
+msgid "The replacement process uses the following order of precedence:"
+msgstr "El proceso de reemplazo usa el siguiente orden de precedencia:"
+
+#: C/mail-composer-message-templates.page:88(p)
+msgid ""
+"$key is replaced by the value set for it in the Configuration tab of the "
+"Templates plugin."
+msgstr ""
+"$key se reemplaza por el valor ajustado para ello en la pestaña "
+"Configuración del complemento Plantillas."
+
+#: C/mail-composer-message-templates.page:91(p)
+msgid ""
+"If the key is not found, it is then replaced with the value of its "
+"environment variable."
+msgstr ""
+"Si no se encuentra la clave, se reemplaza con el valor de su variable de "
+"entorno."
+
+#: C/mail-composer-message-templates.page:94(p)
+msgid ""
+"If key is neither a configuration option nor an environment variable, no "
+"changes are made."
+msgstr ""
+"Si la clave no es una opción de configuración ni una variable de entorno, "
+"entonces no se hacen cambios."
+
+#: C/mail-composer-mail-signatures-per-account.page:5(desc)
+msgid "Setting a default signature for an email account."
+msgstr ""
+"Configurar una firma predeterminada para una cuenta de correo electrónico."
+
+#: C/mail-composer-mail-signatures-per-account.page:32(title)
+msgid "Default account signature"
+msgstr "Firma de la cuenta predeterminada"
+
+#: C/mail-composer-mail-signatures-per-account.page:34(p)
+msgid ""
+"You can define a default <link xref=\"mail-composer-mail-signatures"
+"\">signature</link> for each of your mail accounts. This can be edited under "
+"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
+"gui><gui>Edit</gui><gui>Identity</gui><gui>Optional Information</gui></"
+"guiseq>."
+msgstr ""
+"Puede definir una <link xref=\"mail-composer-mail-signatures\">firma</link> "
+"predeterminada para cada una de sus cuentas de correo. Se puede editar bajo "
+"<guiseq><gui>Editar</gui><gui>Preferencias</gui><gui>Cuentas de correo</"
+"gui><gui>Editar</gui><gui>Identidad</gui><gui>Información opcional</gui></"
+"guiseq>."
+
+#: C/mail-composer-mail-signatures-per-account.page:36(p)
+msgid ""
+"If you have a signature for your account defined but exceptionally do not "
+"want to use it for one message, or want to use a different signature, you "
+"can change it via the dropdown menu in the right upper corner in the email "
+"composer window."
+msgstr ""
+"Si tiene una firma definida para su cuenta pero excepcionalmente no quiere "
+"usar para un mensaje o quiere usar una firma diferente, puede cambiarla a "
+"través del menú desplegable en la esquina superior derecha en la ventana del "
+"editor de correos electrónicos."
+
+#: C/mail-composer-mail-signatures.page:5(desc)
+msgid "Using email signatures at the bottom of a message you send."
+msgstr "Usar firmas de correo al final de los mensajes que envía."
+
+#: C/mail-composer-mail-signatures.page:21(title)
+msgid "Working with email signatures"
+msgstr "Uso de firmas en los correos"
+
+#: C/mail-composer-mail-signatures.page:23(p)
+msgid ""
+"A signature consists of one or more lines of text (or even a picture) that "
+"will be added at the end of an email that you send. It can contain contact "
+"information or other things. A signature always begins with two dashes and a "
+"space (<code>-- </code>)."
+msgstr ""
+"Una firma consiste en una o más líneas de texto (o incluso una imagen) que "
+"se añadirá al final de un correo que escriba. Puede contener información de "
+"contacto u otras cosas. Una firma siempre empieza por dos guiones y un "
+"espacio (<code>-- </code>)."
+
+#: C/mail-composer-mail-signatures.page:24(p)
+msgid ""
+"The term \"signature\" is also differently used in terms of <link xref="
+"\"mail-encryption\">encryption</link>."
+msgstr ""
+"El término «firma» también se usa de forma diferente en el argot de <link "
+"xref=\"mail-encryption\">cifrado</link>."
+
+#: C/mail-composer-mail-signatures-manage.page:5(desc)
+msgid "Add, change, edit or delete email signatures."
+msgstr "Añadir, cambiar, editar o eliminar firmas de correo."
+
+#: C/mail-composer-mail-signatures-manage.page:20(title)
+msgid "Managing signatures"
+msgstr "Gestionar firmas"
+
+#: C/mail-composer-mail-signatures-manage.page:22(p)
+msgid ""
+"You can add, edit and delete all your signatures under <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Composer preferences</gui><gui>Signatures</"
+"gui></guiseq>."
+msgstr ""
+"Puede añadir, editar y eliminar todas sus firmas bajo <guiseq><gui>Editar</"
+"gui><gui>Preferencias</gui><gui>Preferencias del editor</gui><gui>Firmas</"
+"gui></guiseq>."
+
+#: C/mail-composer-mail-signatures-manage.page:23(p)
+msgid ""
+"Assigning a default signature to an email account has to be done in the "
+"<link xref=\"mail-composer-mail-signatures-per-account\">account settings</"
+"link>."
+msgstr ""
+"Añadir una firma predeterminada a una cuenta de correo electrónico se debe "
+"hacer en la <link xref=\"mail-composer-mail-signatures-per-account"
+"\">configuración de cuenta</link>."
+
+#: C/mail-composer-html-text.page:5(desc)
+msgid "Format Text in the mail composer."
+msgstr "Formatear texto en el editor de correo."
+
+#: C/mail-composer-html-text.page:21(title)
+msgid "Formatting Text in HTML"
+msgstr "Formatear texto en HTML"
+
+#. TODO: These instructions are partially WRONG in 3.0.2 as the tool bar has been split into two. Needs an update. Maybe we also need a way to describe the non-HTML-only functions for plain text mail somewhere.
+#: C/mail-composer-html-text.page:25(p)
+msgid ""
+"HTML formatting tools are located in the two tool bars just above the area "
+"where you actually write the message. They also appear in the <gui>Insert</"
+"gui> and <gui>Format</gui> menus."
+msgstr ""
+"Las herramientas de formateo HTML se encuentran en la barra de herramientas "
+"justo encima del espacio en el que realmente compone su mensaje y también "
+"aparecen en los menús <gui>Insertar</gui> y <gui>Formato</gui>."
+
+#: C/mail-composer-html-text.page:26(p)
+msgid ""
+"The icons in the tool bar are explained in tooltips which appear when you "
+"hold your mouse pointer over the buttons. The buttons fall into five "
+"categories:"
+msgstr ""
+"Los iconos de la barra de herramientas se explican con consejos que aparecen "
+"cuando mantiene el ratón sobre los botones. Estos se clasifican en cinco "
+"categorías:"
+
+#: C/mail-composer-html-text.page:29(title)
+msgid "Headers and Lists:"
+msgstr "Cabeceras y listas:"
+
+#: C/mail-composer-html-text.page:30(p)
+msgid ""
+"At the left of the upper tool bar, you can choose <gui>Normal</gui> for a "
+"default text style or <gui>Header 1</gui> through <gui>Header 6</gui> for "
+"varying sizes of header from large (1) to tiny (6). Other styles include "
+"<gui>Preformat</gui>, to use the HTML tag for preformatted blocks of text, "
+"and three types of bullet points for lists."
+msgstr ""
+"En la parte izquierda de la barra superior puede elegir el estilo de texto "
+"predeterminado, <gui>Normal</gui> <gui>Cabecera 1</gui> hasta <gui>Cabecera "
+"6</gui> para tamaños variables de la cabecera, desde grande (1) hasta "
+"pequeño (6). Otros estilos incluyen el <gui>Preformato</gui>, para usar la "
+"etiqueta de HTML para bloques de texto preformateados, y tres tipos de topos "
+"para las listas."
+
+#: C/mail-composer-html-text.page:31(p)
+msgid ""
+"For instance, instead of using asterisks to mark a bulleted list, you can "
+"use the <gui>Bulleted List</gui> style from the style dropdown list. "
+"Evolution uses different bullet styles, and handles word wrap and multiple "
+"levels of indentation."
+msgstr ""
+"Por ejemplo, en lugar de usar asteriscos para marcar una lista de puntos, "
+"puede usar el estilo <gui>Lista de topos</gui> desde el menú desplegable de "
+"estilos. Evolution distintos estilos para las listas de topos y maneja "
+"varios niveles de sangría y de ajuste para las palabras."
+
+#: C/mail-composer-html-text.page:35(title)
+msgid "Alignment:"
+msgstr "Alineación:"
+
+#: C/mail-composer-html-text.page:36(p)
+msgid ""
+"Located next to the Headers and Lists dropdown, the three paragraph icons "
+"should be familiar to users of most word processing software. The left-most "
+"button aligns your text to the left, the center button centers text, and the "
+"right button aligns the text to the right."
+msgstr ""
+"Situado junto a la lista desplegable de Cabeceras y Listas, los tres iconos "
+"de párrafo deberían ser familiares para los usuarios de procesadores de "
+"textos. El que está más a la izquierda alinea el texto a la izquierda, el "
+"del centro, lo centra y el de la derecha lo alinea hacia el lado derecho."
+
+#: C/mail-composer-html-text.page:40(title)
+msgid "Indentation Rules:"
+msgstr "Reglas de sangrado:"
+
+#: C/mail-composer-html-text.page:41(p)
+msgid ""
+"The button with the arrow pointing left decreases a paragraph's indentation, "
+"and the right arrow increases its indentation."
+msgstr ""
+"El botón con la flecha que apunta a la izquierda reducirá la sangría de un "
+"párrafo y el de la derecha la aumentará."
+
+#: C/mail-composer-html-text.page:45(title)
+msgid "Text Styles:"
+msgstr "Estilos de texto:"
+
+#: C/mail-composer-html-text.page:46(p)
+msgid ""
+"Use these buttons in the lower tool bar to determine the way your email "
+"looks. If you have text selected, the style applies to the selected text. If "
+"you do not have text selected, the style applies to whatever you type next."
+msgstr ""
+"Use estos botones de la barra de herramientas inferior para fijar la "
+"apariencia de su mensaje. Si tiene seleccionado un texto, el estilo se "
+"aplicará sobre él. Si no, el estilo se aplicará a lo próximo que escriba."
+
+#: C/mail-composer-html-text.page:50(p)
+msgid "Button"
+msgstr "Botón"
+
+#: C/mail-composer-html-text.page:51(p)
+msgid "Description"
+msgstr "Descripción"
+
+#: C/mail-composer-html-text.page:54(p)
+msgid "TT"
+msgstr "TT"
+
+#: C/mail-composer-html-text.page:55(p)
+msgid "Typewriter text, which is similar to a monospace font."
+msgstr ""
+"Texto de máquina de escribir, es aproximadamente igual a la tipografía "
+"monoespaciadia."
+
+#: C/mail-composer-html-text.page:58(p)
+msgid "Bold A"
+msgstr "A en negrita"
+
+#: C/mail-composer-html-text.page:59(p)
+msgid "Bolds the text."
+msgstr "Pone el texto en negrita."
+
+#: C/mail-composer-html-text.page:62(p)
+msgid "Italic A"
+msgstr "A en cursiva"
+
+#: C/mail-composer-html-text.page:63(p)
+msgid "Italicizes the text."
+msgstr "Pone el texto en cursiva."
+
+#: C/mail-composer-html-text.page:66(p)
+msgid "Underlined A"
+msgstr "A subrayada"
+
+#: C/mail-composer-html-text.page:67(p)
+msgid "Underlines the text."
+msgstr "Subraya el texto."
+
+#: C/mail-composer-html-text.page:70(p)
+msgid "Strike through A"
+msgstr "A tachada"
+
+#: C/mail-composer-html-text.page:71(p)
+msgid "Marks a line through the text."
+msgstr "Tacha el texto."
+
+#: C/mail-composer-html-text.page:77(title)
+msgid "Color Selection:"
+msgstr "Selección de color:"
+
+#: C/mail-composer-html-text.page:78(p)
+msgid ""
+"At the left in the lower tool bar is the color section tool, where a box "
+"displays the current text color. To choose a new color, click the arrow "
+"button to the right. If you have text selected, the color applies to the "
+"selected text. If you do not have text selected, the color applies to "
+"whatever you type next. You can select a background color or image by right-"
+"clicking the message background, then selecting <guiseq><gui>Style</"
+"gui><gui>Page Style</gui></guiseq>."
+msgstr ""
+"En parte izquierda de la barra inferior está la herramienta de selección del "
+"color, donde una caja muestra el color actual del texto. Para elegir uno "
+"nuevo pulse sobre el botón de la flecha que está a su derecha. Si tiene un "
+"texto seleccionado el color se aplicará al mismo. Si no, el color se "
+"aplicará a lo que escriba después. Puede seleccionar un color o imagen de "
+"fondo pulsando con el botón derecho del ratón sobre el fondo del mensaje, "
+"para después seleccionar <guiseq><gui>Estilo</gui><gui>Estilo de la página</"
+"gui></guiseq>."
+
+#: C/mail-composer-html-table.page:5(desc)
+msgid "Insert a table in the mail composer."
+msgstr "Insertar una tabla en el editor de correo."
+
+#: C/mail-composer-html-table.page:21(title)
+msgid "Inserting a Table in HTML"
+msgstr "Insertar una tabla en HTML"
+
+#: C/mail-composer-html-table.page:23(p)
+msgid ""
+"You can insert a table into the email (at the current position of the "
+"cursor):"
+msgstr ""
+"Puede insertar una tabla en el correo (en la posición actual del cursor):"
+
+#: C/mail-composer-html-table.page:25(p)
+msgid ""
+"Click <guiseq><gui>Insert</gui><gui>Table...</gui></guiseq> in the menubar."
+msgstr ""
+"Pulse <guiseq><gui>Insertar</gui><gui>Tabla...</gui></guiseq> en la barra de "
+"menú."
+
+#: C/mail-composer-html-table.page:26(p)
+msgid "Select the number of rows and columns."
+msgstr "Seleccione el número de filas y columnas."
+
+#: C/mail-composer-html-table.page:27(p)
+msgid "Define the type of layout for the table."
+msgstr "Defina el tipo de distribución de la tabla."
+
+#: C/mail-composer-html-table.page:28(p)
+msgid "Optionally: Select a background color or image for the table."
+msgstr "Opcional: seleccione un color de fondo o una imagen para la tabla."
+
+#: C/mail-composer-html-rule.page:5(desc)
+msgid "Insert a horizontal line in the mail composer."
+msgstr "Insertar una línea horizontal en el editor de correo."
+
+#: C/mail-composer-html-rule.page:21(title)
+msgid "Inserting a Rule in HTML"
+msgstr "Insertar una regla en HTML"
+
+#: C/mail-composer-html-rule.page:23(p)
+msgid ""
+"You can insert a horizontal line into the email (at the current position of "
+"the cursor) to help divide two sections:"
+msgstr ""
+"Puede insertar una línea horizontal en el correo (en la posición actual del "
+"cursor) para ayudarle a dividir dos secciones:"
+
+#: C/mail-composer-html-rule.page:25(p)
+msgid ""
+"Click <guiseq><gui>Insert</gui><gui>Rule...</gui></guiseq> in the menubar."
+msgstr ""
+"Pulse <guiseq><gui>Insertar</gui><gui>Regla...</gui></guiseq> en la barra de "
+"menú."
+
+#: C/mail-composer-html-rule.page:26(p)
+msgid "Select width, size, and alignment."
+msgstr "Seleccione la anchura, tamaño y la alineación."
+
+#: C/mail-composer-html-rule.page:27(p)
+msgid "Select <gui>Shaded</gui> if wanted."
+msgstr "Seleccione <gui>Enrollada</gui> si lo desea."
+
+#: C/mail-composer-html.page:5(desc)
+msgid "Format emails by using HTML instead of plain text."
+msgstr "Formatee correos electrónicos usando HTML en lugar de texto plano."
+
+#: C/mail-composer-html.page:21(title)
+msgid "Using HTML format to enhance emails"
+msgstr "Usar HTML para mejorar el formato de los correos"
+
+#: C/mail-composer-html.page:23(p)
+msgid ""
+"Normally, you cannot set text styles or insert pictures in email. However, "
+"most newer email programs can display images and text styles in addition to "
+"basic alignment and paragraph formatting. They do this with HTML, just like "
+"web pages do."
+msgstr ""
+"Normalmente no se pueden aplicar estilos o insertar imágenes en mensajes de "
+"correo electrónico. Sin embargo la mayoría de los clientes de correo moderno "
+"son capaces de mostrar imágenes y estilos en el texto, además del alineado "
+"básico y formateo de párrafos. Esto es posible al usar HTML al igual que las "
+"páginas web."
+
+#: C/mail-composer-html.page:25(p)
+msgid ""
+"Some people do not have HTML-capable mail clients, or prefer not to receive "
+"HTML-enhanced mail because it is slower to download and display. Because of "
+"this, Evolution sends plain text unless you explicitly ask for HTML."
+msgstr ""
+"Algunas personas no tienen clientes de correo capaces de leer HTML o "
+"prefieren no recibir mensajes enriquecidos con HTML porque son más lentos de "
+"descargar y de mostrar en pantalla. Por ello Evolution envía mensajes de "
+"texto plano a menos que le pida explícitamenteque los componga con HTML."
+
+#: C/mail-composer-html.page:27(p)
+msgid ""
+"You can change the format of an email message from plain text to HTML by "
+"choosing <guiseq><gui>Format</gui><gui>HTML</gui></guiseq> from the menu bar."
+msgstr ""
+"Puede cambiar el formato de un mensaje de correo electrónico de texto plano "
+"a HTML eligiendo <guiseq><gui>Formato</gui><gui>HTML</gui></guiseq> desde la "
+"barra de menú."
+
+#: C/mail-composer-html.page:28(p)
+msgid ""
+"To send all your mail as HTML by default, enable <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Default "
+"Behavior</gui><gui>Format messages in HTML</gui></guiseq>."
+msgstr ""
+"Para enviar todos sus correos en HTML de forma predeterminada actíve "
+"<guiseq><gui>Editar</gui><gui>Preferencias</gui><gui>Preferencias del "
+"editor</gui><gui>Comportamiento predeterminado</gui><gui>Dar formato HTML a "
+"los mensajes</gui></guiseq>."
+
+#: C/mail-composer-html.page:31(title)
+msgid "HTML Formatting Options"
+msgstr "Opciones de formateo HTML"
+
+#: C/mail-composer-html-link.page:5(desc)
+msgid "Insert a link to a website in the mail composer."
+msgstr "Insertar un enlace a una página web en el editor."
+
+#: C/mail-composer-html-link.page:21(title)
+msgid "Inserting a Link in HTML"
+msgstr "Insertar un enlace en HTML"
+
+#: C/mail-composer-html-link.page:24(p)
+msgid "You can insert links into the email:"
+msgstr "Puede insertar enlaces en el correo:"
+
+#: C/mail-composer-html-link.page:26(p)
+msgid "Select the text that you want to turn into a link."
+msgstr "Seleccione el texto en el que quiere poner en el enlace."
+
+#: C/mail-composer-html-link.page:27(p)
+msgid ""
+"Either click <guiseq><gui>Insert</gui><gui>Link...</gui></guiseq> in the "
+"menubar, or right-click on the selected text and click <gui>Insert Link</"
+"gui>."
+msgstr ""
+"Pulse <guiseq><gui>Insertar</gui><gui>Enlace...</gui></guiseq> en la barra "
+"de menú o pulse con el botón derecho del ratón sobre el texto seleccionado y "
+"pulse <gui>Insertar enlace</gui>."
+
+#: C/mail-composer-html-link.page:28(p)
+msgid "Enter the address in the <gui>URL</gui> field."
+msgstr "Escriba la dirección en el campo <gui>URL</gui>."
+
+#: C/mail-composer-html-link.page:32(p)
+msgid ""
+"If you do not want a special link text you can just enter the address of the "
+"link directly. It will be automatically recognized as a link."
+msgstr ""
+"Si no quiere escribir ningún texto en particular sólo tiene que escribir la "
+"dirección directamente. Evolution la reconocerá como un enlace."
+
+#: C/mail-composer-html-image.page:5(desc)
+msgid "Embed a picture in the mail composer."
+msgstr "Empotrar una imagen en el editor."
+
+#: C/mail-composer-html-image.page:21(title)
+msgid "Inserting an Image in HTML"
+msgstr "Insertar una imagen en HTML"
+
+#: C/mail-composer-html-image.page:23(p)
+msgid ""
+"You can insert an image into the email (at the current position of the "
+"cursor):"
+msgstr ""
+"Puede insertar una imagen en el correo electrónico (en la posición actual "
+"del cursor):"
+
+#: C/mail-composer-html-image.page:25(p)
+msgid ""
+"Click <guiseq><gui>Insert</gui><gui>Image...</gui></guiseq> in the menubar."
+msgstr ""
+"Pulse <guiseq><gui>Insertar</gui><gui>Imagen...</gui></guiseq> en la barra "
+"de menú."
+
+#: C/mail-composer-html-image.page:26(p)
+msgid "Browse to and select the file."
+msgstr "Navegue y seleccione el archivo."
+
+#: C/mail-composer-html-image.page:27(p)
+msgid "Click <gui>Open</gui>."
+msgstr "Pulse <gui>Abrir</gui>."
+
+#: C/mail-composer-html-image.page:30(p)
+msgid ""
+"Alternately, you can also drag an image into the text area of the message "
+"composer."
+msgstr ""
+"Alternativamente también puede arrastrar una imagen al área de texto del "
+"editor de mensajes."
+
+#: C/mail-composer-forward.page:5(desc)
+msgid "Forwarding a received email to somebody."
+msgstr "Reenvía a alguien el mensaje seleccionado."
+
+#: C/mail-composer-forward.page:23(title)
+msgid "Forwarding a message"
+msgstr "Reenviar un mensaje"
+
+#: C/mail-composer-forward.page:25(p)
+msgid ""
+"When you receive an email, you can forward it to other individuals or groups "
+"that might be interested."
+msgstr ""
+"Cuando recibe un correo, puede reenviarlo a otros individuos o grupos que "
+"puedan estar interesados."
+
+#: C/mail-composer-forward.page:26(p)
+msgid ""
+"You can forward a message as an attachment to a new message (this is the "
+"default setting, see <link xref=\"#default-settings\">Default settings</"
+"link>), inline (in your message without the &gt; character before each "
+"line), or quoted (with &gt; character before each line)."
+msgstr ""
+"Puede reenviar un correo como un adjunto en un correo nuevo (es la "
+"configuración predeterminada, consulte <link xref=\"#default-settings"
+"\">Ajustes predeterminados</link>), en línea (en su mensaje, sin el carácter "
+"«&gt;» antes de cada línea) o citado (con el carácter «&gt;» antes de cada "
+"línea)."
+
+#: C/mail-composer-forward.page:27(p)
+msgid ""
+"Attachment forwarding is best if you want to send the full, unaltered "
+"message to someone else. Inline or Quoted forwarding is best if you want to "
+"send portions of a message, or if you have a large number of comments on "
+"different sections of the message you are forwarding."
+msgstr ""
+"El reenvío como adjunto es la mejor opción si quiere enviar a una persona el "
+"correo completo sin modificaciones. El reenvío En línea o Citado es lo mejor "
+"si quiere enviar partes de un correo o si quiere hacer un gran número de "
+"comentarios en diferentes secciones del mensaje que está reenviando."
+
+#: C/mail-composer-forward.page:29(p)
+msgid "To forward a message that you are reading:"
+msgstr "Para reenviar un mensaje que está leyendo:"
+
+#: C/mail-composer-forward.page:31(p)
+msgid ""
+"Click <guiseq><gui>Message</gui><gui>Forward</gui></guiseq>, the "
+"<gui>Forward</gui> button in the toolbar, or press <keyseq><key>Ctrl</"
+"key><key>F</key></keyseq> to use the default forwarding method. In case you "
+"want to use a different forward method, click <guiseq><gui>Message</"
+"gui><gui>Forward as</gui></guiseq> or the small dropdown arrow next to the "
+"<gui>Forward</gui> button in the toolbar to choose the method."
+msgstr ""
+"Pulse <guiseq><gui>Mensaje</gui><gui>Reenviar</gui></guiseq>, el botón "
+"<gui>Reenviar</gui> en la barra de herramientas o pulse <keyseq><key>Ctrl</"
+"key><key>F</key></keyseq> para usar el método de reenvío predeterminado. En "
+"caso de que quiera usar un método de reenvío diferente, pulse "
+"<guiseq><gui>Mensaje</gui><gui>Reenviar como</gui></guiseq> o la pequeña "
+"flecha de desplegable en el botón <gui>Reenviar</gui> en la barra de "
+"herramientas para seleccionar el método."
+
+#: C/mail-composer-forward.page:32(p)
+msgid ""
+"Select a recipient for the message. The subject is already entered, although "
+"you can alter it if you want."
+msgstr ""
+"Seleccione un destinatario para el mensaje. El asunto ya está introducido, "
+"aunque puede cambiarlo si quiere."
+
+#: C/mail-composer-forward.page:33(p)
+msgid "Add your comments on the message in the text field."
+msgstr "Añada sus comentarios en el correo en el campo de texto."
+
+#: C/mail-composer-forward.page:34(p)
+msgid ""
+"Click <gui style=\"button\">Send</gui> or press <keyseq><key>Ctrl</"
+"key><key>Return</key></keyseq>."
+msgstr ""
+"Pulse <gui style=\"button\">Enviar</gui> o <keyseq><key>Ctrl</"
+"key><key>Intro</key></keyseq>."
+
+#: C/mail-composer-forward.page:37(p)
+msgid ""
+"Attachments to a message you are forwarding are forwarded only when you send "
+"the original message as an attachment. Inline messages do not forward any "
+"attachments."
+msgstr ""
+"Los adjuntos de un mensaje que está reenviado se reenvían sólo cuando envía "
+"el mensaje original como un adjunto. Los mensajes incluidos no reenvían "
+"ningún adjunto."
+
+#: C/mail-composer-forward-as-attachment.page:5(desc)
+msgid "How to forward a message with its attachments."
+msgstr "Cómo reenviar un mensaje con sus adjuntos."
+
+#: C/mail-composer-forward-as-attachment.page:21(title)
+msgid "Forwarding a message with its attachments"
+msgstr "Reenviar un mensaje con sus adjuntos"
+
+#: C/mail-composer-forward-as-attachment.page:23(p)
+msgid ""
+"Click <guiseq><gui>Message</gui><gui>Forward as...</gui></guiseq> and choose "
+"<gui>Attachment</gui>, so the forwarded email and also its attachments get "
+"attached to the email you want to send."
+msgstr ""
+"Pulse <guiseq><gui>Mensaje</gui><gui>Reenviar como...</gui></guiseq> y elija "
+"<gui>Adjunto</gui> para que el correo reenviado y sus adjuntos se adjunten "
+"al correo que quiere enviar."
+
+#: C/mail-composer-forward-as-attachment.page:26(p)
+msgid ""
+"If you want to have this setting by default, set <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Forward Style</"
+"gui></guiseq> to <gui>Attachment</gui>."
+msgstr ""
+"Si quiere que esta opción esté activada de forma predeterminada cambie "
+"<guiseq><gui>Editar</gui><gui>Preferencias</gui><gui>Preferencias del "
+"editor</gui><gui>Estilo de reenvío</gui></guiseq> a <gui>Adjunto</gui>."
+
+#: C/mail-composer-custom-header-lines.page:5(desc)
+msgid "Using custom fields in the header of composed messages"
+msgstr "Usar campos personalizados en la cabecera de la edición de correos"
+
+#: C/mail-composer-custom-header-lines.page:23(title)
+msgid "Custom Header Lines"
+msgstr "Cabeceras personalizadas"
+
+#: C/mail-composer-custom-header-lines.page:25(p)
+msgid "You can add arbitrary header lines to outgoing emails."
+msgstr "Puede añadir líneas de cabeceras arbitrarias en los correos salientes."
+
+#: C/mail-composer-custom-header-lines.page:28(title)
+msgid "Enabling and managing custom headers"
+msgstr "Activar y gestionar cabeceras personalizadas"
+
+#: C/mail-composer-custom-header-lines.page:29(p)
+msgid "To set up the Custom Header plugin:"
+msgstr "Para configurar el complemento Cabecera personalizada:"
+
+#: C/mail-composer-custom-header-lines.page:32(p)
+msgid "Enable <gui>Custom Header</gui>."
+msgstr "Actíve <gui>Cabecera personalizada</gui>."
+
+#: C/mail-composer-custom-header-lines.page:34(p)
+msgid ""
+"You can add, edit, or remove the header fields. For every header field you "
+"add, you can specify the keys and values. The key is used as the title of "
+"the Custom Header. You can enter multiple values for the keys. You must use "
+"a semicolon to separate every value you enter."
+msgstr ""
+"Puede añadir, editar o quitar los campos de cabeceras. Para cada campo de "
+"cabecera que añada puede especificar las claves y los valores. La clave se "
+"usa como el título de la cabecera personalizada. Puede introducir múltiples "
+"valores para las claves. Debe usar un punto y coma para separar cada valor "
+"que introduzca."
+
+#: C/mail-composer-custom-header-lines.page:39(title)
+msgid "Inserting custom headers in a message"
+msgstr "Insertar cabeceras personalizadas en un correo"
+
+#: C/mail-composer-custom-header-lines.page:41(p)
+msgid ""
+"Click <guiseq><gui>New</gui><gui>Mail Message</gui></guiseq> or press "
+"<keyseq><key>Shift</key><key>Ctrl</key><key>M</key></keyseq> to open the "
+"message composer window."
+msgstr ""
+"Pulse <guiseq><gui>Nuevo</gui><gui>Mensaje de correo</gui></guiseq> o pulse "
+"<keyseq><key>Mayús</key><key>Ctrl</key><key>M</key></keyseq> para abrir la "
+"ventana del editor de correos."
+
+#: C/mail-composer-custom-header-lines.page:42(p)
+msgid "Select <guiseq><gui>Insert</gui><gui>Custom Header</gui></guiseq>."
+msgstr ""
+"Seleccione <guiseq><gui>Insertar</gui><gui>Cabeceras personalizadas</gui></"
+"guiseq>."
+
+#: C/mail-composer-custom-header-lines.page:43(p)
+msgid ""
+"In the <gui>Email Custom Header</gui> window, you can view all the defined "
+"header fields and values."
+msgstr ""
+"En la ventana <gui>Cabeceras personalizadas del correo-e</gui> puede ver "
+"todos campos de cabeceras y valores que puede añadir."
+
+#: C/mail-composer-custom-header-lines.page:44(p)
+msgid "Set the values for the header fields by using the dropdown list."
+msgstr ""
+"Establezca los valores para los campos de cabecera usando la lista "
+"desplegable."
+
+#: C/mail-composer-change-quotation-string.page:5(desc)
+msgid ""
+"It is not possible to change the quotation introduction added when answering "
+"mail."
+msgstr "No es posible cambiar la cita introducida al responder un correo."
+
+#: C/mail-composer-change-quotation-string.page:22(title)
+msgid "Changing the \"On <em>date, person</em> wrote:\" string when replying"
+msgstr "Cambiar la cadena «El <em>fecha, persona</em> escribió:» al responder"
+
+#: C/mail-composer-change-quotation-string.page:24(p)
+msgid ""
+"Advanced users can change this string by editing the gconf key <file>/apps/"
+"evolution/mail/composer/message_attribution</file> via gconf-editor."
+msgstr ""
+"Los usuarios avanzados pueden cambiar esta cadena editando la clave de gconf "
+"<file>/apps/evolution/mail/composer/message_attribution</file> a través de "
+"gconf-editor."
+
+#: C/mail-change-time-format.page:5(desc)
+msgid "Changing the date and time format in the message list."
+msgstr "Cambiar el formato de la fecha y la hora en la lista de mensajes."
+
+#: C/mail-change-time-format.page:19(title)
+msgid "Format of dates and time"
+msgstr "Formatos de fechas y hora"
+
+#: C/mail-change-time-format.page:20(p)
+msgid ""
+"You can change the format of the <gui>Date</gui> column by setting your "
+"preferred format under <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Mail Preferences</gui><gui>Headers</gui><gui>Date/Time format</"
+"gui></guiseq>."
+msgstr ""
+"Puede cambiar el formato de la columna <gui>Fecha</gui> estableciendo su "
+"formato preferido en <guiseq><gui>Editar</gui><gui>Preferencias</"
+"gui><gui>Opciones de correo</gui><gui>Cabeceras</gui><gui>Formato de la "
+"fecha y hora</gui></guiseq>."
+
+#: C/mail-change-time-format.page:21(p)
+#: C/calendar-layout-appointment-display.page:50(p)
+msgid ""
+"The placeholders in the format expression are strftime formats. For a "
+"complete list of available strftime formats, run <code>date --help</code> in "
+"a terminal window."
+msgstr ""
+"Los marcadores de posición en la expresión de formato son formatos de "
+"strftime. Para obtener una lista completa de formatos de strftime, ejecute "
+"<code>date --help</code> en una ventana de la terminal."
+
+#: C/mail-change-columns-in-message-list.page:5(desc)
+msgid "Editing the columns displayed in the list of messages."
+msgstr "Editar las columnas mostradas en la lista de correos."
+
+#: C/mail-change-columns-in-message-list.page:20(title)
+msgid "Changing the message list columns"
+msgstr "Cambiar la lista de columnas del correo"
+
+#: C/mail-change-columns-in-message-list.page:22(p)
+msgid ""
+"If you want to change the columns in the mail message list, right-click on "
+"the column headers and choose either <gui>Add a Column...</gui> or "
+"<gui>Remove This Column</gui>."
+msgstr ""
+"Si quiere cambiar las columnas de la lista de mensajes, pulse con el botón "
+"derecho del ratón en las cabeceras de las columnas y elija <gui>Añadir una "
+"columna...</gui> o <gui>Quitar esta columna</gui>."
+
+#: C/mail-change-columns-in-message-list.page:23(p)
+msgid ""
+"If you have a small display, you can replace the <gui>Subject</gui> column "
+"by the <gui>Subject - Trimmed</gui> which will remove prefixes such as \"Re:"
+"\", or you can replace the <gui>From</gui> column which displays the "
+"sender's name and email address by the <gui>Sender</gui> column which will "
+"only display the sender's name."
+msgstr ""
+"Si tiene una pantalla pequeña puede reemplazar la columna <gui>Asunto</gui> "
+"por <gui>Asunto recortado</gui> que eliminará prefijos como «Re:» o puede "
+"reemplazar la columna <gui>De</gui>, que muestra el nombre y dirección de "
+"correo del remitente por la columna <gui>Remitente</gui> que sólo mostrará "
+"el nombre del remitente."
+
+#: C/mail-cannot-see.page:5(desc)
+msgid "If you received or sent an email, but you cannot find it anywhere."
+msgstr "Si recibió o envió un correo pero ya no puede encontrarlo."
+
+#: C/mail-cannot-see.page:11(name) C/index.page:10(name) C/credits.page:34(p)
+msgid "Phil Bull"
+msgstr "Phil Bull"
+
+#: C/mail-cannot-see.page:12(email) C/index.page:11(email)
+msgid "philbull@gmail.com"
+msgstr "philbull@gmail.com"
+
+#: C/mail-cannot-see.page:20(title)
+msgid "I cannot see some emails, where are they?"
+msgstr "No puedo ver algunos correos, ¿dónde están?"
+
+#: C/mail-cannot-see.page:24(p)
+msgid ""
+"Check whether you are using filters on incoming (or outgoing) messages. "
+"These could be automatically moving your messages to another destination."
+msgstr ""
+"Compruebe si está usando filtros en los correos entrantes (o salientes). "
+"Esto podría estar moviendo automáticamente sus correos a otro destino."
+
+#: C/mail-cannot-see.page:27(p)
+msgid ""
+"Check your search view in the search bar right above the message list. "
+"Perhaps the <gui>Show</gui> dropdown list is set to a filter like <gui>Read "
+"Messages</gui>, or the text input filed contains some value. Click the broom "
+"icon to clear the search field."
+msgstr ""
+"Compruebe su vista de búsqueda en la barra de búsqueda justo encima de la "
+"lista de correos. Quizá la lista desplegable <gui>Mostrar</gui> está "
+"configurada para filtrar por <gui>Mensajes leídos</gui> o el campo de "
+"entrada de texto contiene algún valor. Pulse el icono de la escoba para "
+"limpiar el campo de búsqueda."
+
+#: C/mail-cannot-see.page:30(p)
+msgid ""
+"If you cannot see any emails at all in a folder, check that you have not "
+"maximized the message preview (so the message list pane is hidden). To do "
+"this, click <guiseq><gui>View</gui><gui>Preview</gui><gui>Show Message "
+"Preview</gui></guiseq>."
+msgstr ""
+"Si no puede ver ningún correo en ninguna carpeta compruebe que no ha "
+"maximizado la vista previa de correos (de tal forma que el panel de la lista "
+"de correos está oculta). Para ello, pulse <guiseq><gui>Ver</gui><gui>Vista "
+"previa</gui><gui>Mostrar vista previa del correo</gui></guiseq>."
+
+#: C/mail-cannot-see.page:33(p)
+msgid ""
+"Look in the <gui>Junk</gui> folder. Messages that are marked as Junk "
+"disappear from the original folder and are moved to the Junk folder."
+msgstr ""
+"Mire en la carpeta <gui>SPAM</gui>. Los correos marcados como SPAM "
+"desaparecen de la carpeta original y se mueven a la carpeta de SPAM."
+
+#: C/mail-cannot-see.page:38(p)
+msgid ""
+"Click <guiseq><gui>Edit</gui><gui>Show Hidden Messages</gui></guiseq> to "
+"make sure all messages are visible."
+msgstr ""
+"Pulse <guiseq><gui>Editar</gui><gui>Mostrar mensajes ocultos</gui></guiseq> "
+"para asegurarse de que se muestran todos los mensajes."
+
+#: C/mail-cannot-see.page:41(p)
+msgid ""
+"Check your default folder under <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Email Accounts</gui><gui>Edit</gui><gui>Defaults</gui></guiseq>. "
+"Perhaps it is set to some other folder than the folder you thought of."
+msgstr ""
+"Compruebe su carpeta predeterminada en <guiseq><gui>Editar</"
+"gui><gui>Preferencias</gui><gui>Cuentas de correo-e</gui><gui>Editar</"
+"gui><gui>Predeterminados</gui></guiseq>. Posiblemente esté establecida una "
+"carpeta distinta de la que cree."
+
+#: C/mail-calendar-sending-invitations.page:5(desc)
+msgid "Sending invitations for appointments to contacts via email."
+msgstr ""
+"Enviar invitaciones a contactos para citas a través de correo electrónico."
+
+# #-#-#-#-#  usage-exchange.po  #-#-#-#-#

+# index.docbook:342, index.docbook:514

+#: C/mail-calendar-sending-invitations.page:21(title)
+msgid "Sending invitations by email"
+msgstr "Enviar invitaciones por correo-e"
+
+#: C/mail-calendar-sending-invitations.page:23(p)
+msgid ""
+"If you create an event in the calendar component, you can then send "
+"invitations to the attendee list through the Evolution email tool. The "
+"invitation card is sent as an attachment in iCal format."
+msgstr ""
+"Al crear un acontecimiento en la agenda puede enviar invitaciones por correo "
+"electrónico la lista de invitados a través de la herramienta de correo de "
+"Evolution. La tarjeta de invitación se envía como archivo adjunto en formato "
+"iCal."
+
+#: C/mail-calendar-sending-invitations.page:25(p)
+msgid ""
+"To send an invitation, right-click on the entry in the calendar and choose "
+"<gui>Forward as iCalendar</gui>."
+msgstr ""
+"Para enviar una invitación pulse con el botón derecho sobre la entrada en el "
+"calendario y elija <gui>Reenviar como iCalendar</gui>."
+
+#: C/mail-calendar-sending-invitations.page:27(p)
+msgid "When you receive an invitation, you have several options:"
+msgstr "Cuando reciba una invitación, tiene varias opciones:"
+
+#: C/mail-calendar-sending-invitations.page:30(p)
+msgid "Accept:"
+msgstr "Aceptar:"
+
+#: C/mail-calendar-sending-invitations.page:31(p)
+msgid ""
+"Indicates you will attend the meeting. When you click the OK button, the "
+"meeting is entered into your calendar."
+msgstr ""
+"Indica que asistirá a la reunión. Cuando pulse el botón Aceptar, la reunión "
+"se apuntará en su agenda."
+
+#: C/mail-calendar-sending-invitations.page:33(p)
+msgid "Tentatively Accept:"
+msgstr "Aceptado provisionalmente:"
+
+#: C/mail-calendar-sending-invitations.page:34(p)
+msgid ""
+"Indicates you will probably attend the meeting. When you click the OK "
+"button, the meeting is entered into your calendar, but is marked as "
+"tentative."
+msgstr ""
+"Indica que es probable que asista a la reunión. Cuando pulse el botón "
+"Aceptar la reunión se apuntará en su agenda, pero marcada como provisional."
+
+#: C/mail-calendar-sending-invitations.page:36(p)
+msgid "Decline:"
+msgstr "Rehusar:"
+
+#: C/mail-calendar-sending-invitations.page:37(p)
+msgid ""
+"Indicates you are unable to attend the meeting. The meeting is not entered "
+"into your calendar when you click OK, although your response is sent to the "
+"meeting host if you have selected the Send reply to sender option."
+msgstr ""
+"Indica que no puede asistir a la reunión. La reunión no se introduce en su "
+"calendario al pulsar Aceptar, aunque su respuesta se envía al organizador de "
+"la reunión si ha seleccionado la opción Responder al remitente."
+
+#: C/mail-calendar-sending-invitations.page:39(p)
+msgid "Send reply to sender:"
+msgstr "Responder al remitente:"
+
+#: C/mail-calendar-sending-invitations.page:40(p)
+msgid ""
+"Select this option if you want your response sent to the meeting organizers."
+msgstr ""
+"Marque esta casilla si quiere que su respuesta llegue a los organizadores de "
+"la reunión."
+
+#: C/mail-attachments-sending.page:5(desc)
+msgid "Attaching files to emails you want to send."
+msgstr "Añadir archivos a los correos que quiere enviar."
+
+#: C/mail-attachments-sending.page:24(title)
+msgid "Adding attachments to an email"
+msgstr "Añadir adjuntos a un correo-e"
+
+#: C/mail-attachments-sending.page:27(title)
+msgid "Attaching files"
+msgstr "Adjuntar archivos"
+
+#: C/mail-attachments-sending.page:28(p)
+msgid "To attach a file to your email in the composer:"
+msgstr "Para adjuntar un archivo a su correo en el editor:"
+
+#: C/mail-attachments-sending.page:30(p)
+msgid ""
+"Click <gui>Add Attachment...</gui>, or click <guiseq><gui>Insert</"
+"gui><gui>Attachment</gui></guiseq>, or press <keyseq><key>Ctrl</key><key>M</"
+"key></keyseq>."
+msgstr ""
+"Pulse <gui>Añadir adjunto...</gui>, <guiseq><gui>Insertar</gui><gui>Adjunto</"
+"gui></guiseq> o pulse <keyseq><key>Ctrl</key><key>M</key></keyseq>."
+
+#: C/mail-attachments-sending.page:31(p)
+msgid "Select the file you want to attach."
+msgstr "Seleccione el archivo que quiere adjuntar."
+
+#: C/mail-attachments-sending.page:34(p)
+msgid "You can also drag a file to the attachment bar of the composer window."
+msgstr ""
+"También puede arrastrar un archivo a la barra de adjuntos de la ventana del "
+"editor."
+
+#: C/mail-attachments-sending.page:36(p)
+msgid ""
+"When you send the message, a copy of the attached file goes with it. Be "
+"aware that large attachments can take a long time to send and receive."
+msgstr ""
+"Cuando mande el mensaje irá con él una copia del archivo adjuntado. Tenga "
+"presente que los adjuntos de gran tamaño pueden tomar mucho tiempo al ser "
+"enviados y recibidos."
+
+#: C/mail-attachments-sending.page:40(title)
+msgid "Attachment Reminder"
+msgstr "Recuerdo de adjuntos"
+
+#: C/mail-attachments-sending.page:42(p)
+msgid ""
+"Evolution has an Attachment Reminder plugin you can use to remind yourself "
+"to attach a file to an email. If it determines that you have not attached "
+"the file, it displays a reminder window before the email is sent."
+msgstr ""
+"Evolution tiene un complemento de Recuerdo de adjuntos que puede usar para "
+"recordarle que adjunte un archivo en un correo-e. Si determina que el "
+"archivo no está adjuntado, muestra una ventana de recordatorio antes de "
+"enviar el mensaje."
+
+#: C/mail-attachments-sending.page:44(p)
+msgid "To enable the Attachment Reminder:"
+msgstr "Para activar el Recuerdo de adjuntos:"
+
+#: C/mail-attachments-sending.page:47(p)
+msgid "Enable <gui>Attachment Reminder</gui>."
+msgstr "Actíve <gui>Recuerdo de adjuntos</gui>."
+
+#: C/mail-attachments-sending.page:49(p)
+msgid ""
+"Click <gui style=\"button\">Add</gui>, then enter keywords in your language "
+"such as \"Attach\" or \"enclosed\"."
+msgstr ""
+"Pulse <gui style=\"button\">Añadir</gui>, después introduzca las palabras "
+"claves en su idioma tales como «adjuntar» o «adjunto»."
+
+#: C/mail-attachments-sending.page:51(p)
+msgid ""
+"Based on the keywords you have added, Evolution searches the text of every "
+"mail you are going to send. If it finds any of the keywords in your email "
+"and there is no actual attached file, the reminder window is displayed."
+msgstr ""
+"Evolution busca cada correo electrónico que esté enviando basándose en las "
+"palabras clave que haya añadido. Si encuentra cualquiera de las palabras "
+"clave en su correo y no hay un archivo adjunto, se muestra la ventana de "
+"recordatorio."
+
+#: C/mail-attachments-received.page:5(desc)
+msgid "Saving and opening files that are attached to received emails."
+msgstr "Guardar y abrir archivos adjuntos a correos recibidos."
+
+#: C/mail-attachments-received.page:24(title)
+msgid "Handling attachments in received mail"
+msgstr "Gestionar adjuntos en correos recibidos"
+
+#: C/mail-attachments-received.page:26(p)
+msgid ""
+"If you receive an email message with one or more file attachments, Evolution "
+"displays the number of attachments and a <gui style=\"button\">Save</gui> or "
+"<gui style=\"button\">Save All</gui> button between the email header and the "
+"content of the email."
+msgstr ""
+"Evolution muestra el número de adjuntos si recibe un mensaje de correo con "
+"uno o más adjuntos así como un botón <gui style=\"button\">Guardar</gui> o "
+"<gui style=\"button\">Guardar todo</gui> entre la cabecera del correo y el "
+"contenido del mismo."
+
+#: C/mail-attachments-received.page:28(p)
+msgid "A list of attachments is also available at the bottom of the email."
+msgstr ""
+"También existe una lista de adjuntos disponible en la parte inferior del "
+"correo."
+
+#: C/mail-attachments-received.page:29(p)
+msgid ""
+"To save an attachment to disk, click the down-arrow next to the attachment "
+"icon and click <gui>Save As</gui>."
+msgstr ""
+"Para guardar un adjunto al disco, pulse sobre la flecha hacia abajo junto al "
+"icono de adjunto y seleccione <gui>Guardar como</gui>."
+
+#: C/mail-attachments-received.page:30(p)
+msgid ""
+"To open an attachment in another application, click the down-arrow next to "
+"the attachment icon and choose one of the available applications."
+msgstr ""
+"Para abrir un adjunto en otra aplicación, pulse la flecha hacia abajo junto "
+"al icono del adjunto y elija una de las aplicaciones disponibles."
+
+#: C/mail-attachments-received.page:32(p)
+msgid ""
+"The options available for an attachment vary depending on the type of "
+"attachment and the applications that are installed on your system. For "
+"example, image files can be opened in the <gui>Image Viewer</gui> "
+"application or in the <gui>GIMP</gui> graphics editor."
+msgstr ""
+"Las opciones disponibles para los adjuntos varían dependiendo del tipo de "
+"adjunto y de las aplicaciones instaladas en su sistema. Por ejemplo, los "
+"archivos de imágenes se pueden abrir con el <gui>Visor de imágenes</gui> o "
+"en el editor de gráficos <gui>GIMP</gui>."
+
+#: C/mail-attachments.page:5(desc)
+msgid "Handling of file attachments for writing and reading mail"
+msgstr "Gestión de los adjuntos de correos para escribibr y leer correos"
+
+#: C/mail-attachments.page:18(title)
+msgid "Managing attachments"
+msgstr "Gestionar adjuntos"
+
+#: C/mail-account-manage-usenet-news.page:5(desc)
+msgid "Add and edit a Usenet news account in Evolution."
+msgstr "Añadir y editar una cuenta de noticias de Usenet en Evolution."
+
+#: C/mail-account-manage-usenet-news.page:20(title)
+msgid "Usenet news account settings"
+msgstr "Configuración de cuenta de noticias de Usenet"
+
+#: C/mail-account-manage-usenet-news.page:23(title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:23(title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:23(title)
+#: C/mail-account-manage-pop.page:23(title)
+#: C/mail-account-manage-novell-groupwise.page:24(title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:23(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:23(title)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:23(title)
+#: C/mail-account-manage-mh-format-directories.page:23(title)
+#: C/mail-account-manage-maildir-format-directories.page:23(title)
+#: C/mail-account-manage-local-delivery.page:23(title)
+#: C/mail-account-manage-imap-plus.page:23(title)
+#: C/mail-account-manage-imap.page:23(title)
+msgid "Account Editor"
+msgstr "Editor de cuentas"
+
+#: C/mail-account-manage-usenet-news.page:24(p)
+#: C/mail-account-manage-unix-mbox-spool-file.page:24(p)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:24(p)
+#: C/mail-account-manage-pop.page:24(p)
+#: C/mail-account-manage-novell-groupwise.page:25(p)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:25(p)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:25(p)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:25(p)
+#: C/mail-account-manage-mh-format-directories.page:24(p)
+#: C/mail-account-manage-maildir-format-directories.page:24(p)
+#: C/mail-account-manage-local-delivery.page:24(p)
+#: C/mail-account-manage-imap-plus.page:24(p)
+#: C/mail-account-manage-imap.page:24(p)
+msgid ""
+"Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Mail Accounts</gui><gui style=\"button\">Add</gui></guiseq>. The "
+"steps are mostly the same as for the <link xref=\"intro-first-run\">First-"
+"Run Assistant</link>, except for not getting asked whether to import data "
+"from other applications or to restore from a backup file."
+msgstr ""
+"Se pueden añadir cuentas de correo en <guiseq><gui>Editar</"
+"gui><gui>Preferencias</gui><gui>Cuentas de correo</gui><gui style=\"button"
+"\">Añadir</gui></guiseq>. Los pasos son los prácticamente los mismos que "
+"para el <link xref=\"intro-first-run\">Asistente de primera ejecución</"
+"link>, excepto que no se le preguntará si quiere importar datos de otras "
+"aplicaciones o restaurarlos desde un archivo de respaldo."
+
+#: C/mail-account-manage-usenet-news.page:25(p)
+#: C/mail-account-manage-unix-mbox-spool-file.page:25(p)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:25(p)
+#: C/mail-account-manage-pop.page:25(p)
+#: C/mail-account-manage-novell-groupwise.page:26(p)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:26(p)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:26(p)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:26(p)
+#: C/mail-account-manage-mh-format-directories.page:25(p)
+#: C/mail-account-manage-local-delivery.page:25(p)
+#: C/mail-account-manage-imap-plus.page:25(p)
+#: C/mail-account-manage-imap.page:25(p)
+msgid ""
+"Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Mail Accounts</gui><gui style=\"button\">Edit</gui></guiseq>. The "
+"following settings are available when editing an existing account:"
+msgstr ""
+"Las cuentas de correo se pueden editar en <guiseq><gui>Editar</"
+"gui><gui>Preferencias</gui><gui>Cuentas de correo</gui><gui style=\"button"
+"\">Editar</gui></guiseq>. La siguiente configuración está disponible al "
+"editar una cuenta existente:"
+
+#: C/mail-account-manage-usenet-news.page:28(title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:28(title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:28(title)
+#: C/mail-account-manage-pop.page:28(title)
+#: C/mail-account-manage-novell-groupwise.page:29(title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:29(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:29(title)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:29(title)
+#: C/mail-account-manage-mh-format-directories.page:28(title)
+#: C/mail-account-manage-maildir-format-directories.page:28(title)
+#: C/mail-account-manage-local-delivery.page:28(title)
+#: C/mail-account-manage-imap-plus.page:28(title)
+#: C/mail-account-manage-imap.page:28(title) C/intro-first-run.page:25(title)
+msgid "Identity"
+msgstr "Identidad"
+
+#. TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866
+#: C/mail-account-manage-usenet-news.page:30(p)
+#: C/mail-account-manage-unix-mbox-spool-file.page:30(p)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:30(p)
+#: C/mail-account-manage-pop.page:30(p)
+#: C/mail-account-manage-novell-groupwise.page:31(p)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:31(p)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:31(p)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:31(p)
+#: C/mail-account-manage-mh-format-directories.page:30(p)
+#: C/mail-account-manage-maildir-format-directories.page:30(p)
+#: C/mail-account-manage-local-delivery.page:30(p)
+#: C/mail-account-manage-imap-plus.page:30(p)
+#: C/mail-account-manage-imap.page:30(p) C/intro-first-run.page:26(p)
+msgid "Here you define your name and your email address."
+msgstr "Introduzca aquí su nombre y su dorección de correo electrónico."
+
+#: C/mail-account-manage-usenet-news.page:31(p)
+#: C/mail-account-manage-unix-mbox-spool-file.page:31(p)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:31(p)
+#: C/mail-account-manage-pop.page:31(p)
+#: C/mail-account-manage-novell-groupwise.page:32(p)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:32(p)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:32(p)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:32(p)
+#: C/mail-account-manage-mh-format-directories.page:31(p)
+#: C/mail-account-manage-maildir-format-directories.page:31(p)
+#: C/mail-account-manage-local-delivery.page:31(p)
+#: C/mail-account-manage-imap-plus.page:31(p)
+#: C/mail-account-manage-imap.page:31(p) C/intro-first-run.page:27(p)
+msgid ""
+"Optionally you can make this account your default account (e.g. when writing "
+"emails), set a Reply-To email address (if you want replies to messages sent "
+"to a different address), and set an organization (the company where you "
+"work, or the organization you represent when you send email from this "
+"account)."
+msgstr ""
+"Opcionalmente puede hacer que esta cuenta sea su cuenta predeterminada (ej. "
+"al escribir correos), establezca una dirección para «Responder a» (si quiere "
+"que se envíen los correos de respuestas a una dirección diferente) y escriba "
+"una organización (el nombre de la empresa para la que trabaja, o la "
+"organización a la que representa cuando envía correo desde esta cuenta)."
+
+#: C/mail-account-manage-usenet-news.page:35(title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:35(title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:35(title)
+#: C/mail-account-manage-pop.page:35(title)
+#: C/mail-account-manage-novell-groupwise.page:36(title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:36(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:36(title)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:36(title)
+#: C/mail-account-manage-mh-format-directories.page:35(title)
+#: C/mail-account-manage-maildir-format-directories.page:35(title)
+#: C/mail-account-manage-local-delivery.page:35(title)
+#: C/mail-account-manage-imap-plus.page:35(title)
+#: C/mail-account-manage-imap.page:35(title)
+msgid "Receiving Email and Receiving options"
+msgstr "Recibir correo y opciones de recepción"
+
+#: C/mail-account-manage-usenet-news.page:39(title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:39(title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:39(title)
+#: C/mail-account-manage-pop.page:39(title)
+#: C/mail-account-manage-mh-format-directories.page:39(title)
+#: C/mail-account-manage-maildir-format-directories.page:39(title)
+#: C/mail-account-manage-local-delivery.page:39(title)
+#: C/mail-account-manage-imap-plus.page:39(title)
+#: C/mail-account-manage-imap.page:39(title)
+msgid "Sending Email"
+msgstr "Envío de correo"
+
+#: C/mail-account-manage-usenet-news.page:43(title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:43(title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:43(title)
+#: C/mail-account-manage-pop.page:43(title)
+#: C/mail-account-manage-novell-groupwise.page:40(title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:40(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:40(title)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:40(title)
+#: C/mail-account-manage-mh-format-directories.page:43(title)
+#: C/mail-account-manage-maildir-format-directories.page:43(title)
+#: C/mail-account-manage-local-delivery.page:43(title)
+#: C/mail-account-manage-imap-plus.page:43(title)
+#: C/mail-account-manage-imap.page:43(title)
+msgid "Defaults"
+msgstr "Predeterminados"
+
+#: C/mail-account-manage-usenet-news.page:47(title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:47(title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:47(title)
+#: C/mail-account-manage-pop.page:47(title)
+#: C/mail-account-manage-novell-groupwise.page:45(title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:49(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:49(title)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:44(title)
+#: C/mail-account-manage-mh-format-directories.page:47(title)
+#: C/mail-account-manage-maildir-format-directories.page:47(title)
+#: C/mail-account-manage-local-delivery.page:47(title)
+#: C/mail-account-manage-imap-plus.page:47(title)
+#: C/mail-account-manage-imap.page:47(title)
+msgid "Security"
+msgstr "Seguridad"
+
+#: C/mail-account-manage-usenet-news.page:53(title)
+#: C/mail-account-manage-imap-plus.page:55(title)
+#: C/mail-account-manage-imap.page:57(title)
+msgid "Other settings"
+msgstr "Otros ajustes"
+
+#: C/mail-account-manage-usenet-news.page:54(p)
+#: C/mail-account-manage-imap-plus.page:56(p)
+#: C/mail-account-manage-imap.page:58(p)
+msgid ""
+"Other account related settings that are not located in the <gui>Account "
+"Editor</gui>:"
+msgstr "Otros ajustes "
+
+#: C/mail-account-manage-unix-mbox-spool-file.page:5(desc)
+msgid "Add and edit a Standard Unix mbox Spool File account in Evolution."
+msgstr "Añadir y editar una cuenta de Archivo spool mbox estándar de Unix."
+
+#: C/mail-account-manage-unix-mbox-spool-file.page:20(title)
+msgid "Standard Unix mbox Spool File account settings"
+msgstr "Configuración de cuenta de Archivo spool mbox estándar de Unix"
+
+#: C/mail-account-manage-unix-mbox-spool-directory.page:5(desc)
+msgid "Add and edit a Standard Unix mbox Spool Directory account in Evolution."
+msgstr ""
+"Añadir y editar una cuenta de Archivo spool mbox estándar de Unix en "
+"Evolution."
+
+#: C/mail-account-manage-unix-mbox-spool-directory.page:20(title)
+msgid "Standard Unix mbox Spool Directory account settings"
+msgstr ""
+"Configuración de cuenta de directorios de correo mbox en formato estándar de "
+"Unix"
+
+#: C/mail-account-manage-pop.page:5(desc)
+msgid "Add and edit a POP mail account in Evolution."
+msgstr "Añadir y editar una cuenta de correo POP en Evolution."
+
+#: C/mail-account-manage-pop.page:20(title)
+msgid "POP mail account settings"
+msgstr "Configuración de cuenta de correo POP"
+
+#: C/mail-account-manage-novell-groupwise.page:5(desc)
+msgid "Add and edit a Novell Groupwise account in Evolution."
+msgstr "Añadir y editar una cuenta de Novell Groupwise en Evolution"
+
+#: C/mail-account-manage-novell-groupwise.page:21(title)
+msgid "Novell Groupwise account settings"
+msgstr "Configuración de cuenta para Novell Groupwise"
+
+#: C/mail-account-manage-novell-groupwise.page:49(title)
+msgid "Proxy"
+msgstr "Proxy"
+
+#: C/mail-account-manage-novell-groupwise.page:50(p)
+msgid "Settings for having somebody else handle your account."
+msgstr "Ajustes para que otra persona gestione su cuenta."
+
+#: C/mail-account-manage-microsoft-exchange.page:5(desc)
+msgid "Add and edit a Microsoft Exchange account in Evolution."
+msgstr "Añadir y editar una cuenta de Microsoft Exchange en Evolution."
+
+#: C/mail-account-manage-microsoft-exchange.page:21(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:20(title)
+msgid "Microsoft Exchange account settings"
+msgstr "Configuración de cuenta para Microsoft Exchange"
+
+#: C/mail-account-manage-microsoft-exchange.page:23(p)
+msgid ""
+"Please first read <link xref=\"exchange-connectors-overview\">Choosing the "
+"right connector</link> to find out about the right Exchange account type for "
+"you."
+msgstr ""
+"Lea primero <link xref=\"exchange-connectors-overview\">Elegir el conector "
+"adecuado</link> para saber el tipo de cuenta Exchange para usted."
+
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:5(desc)
+msgid "Add and edit a Microsoft Exchange 2007 account in Evolution."
+msgstr "Añadir y editar una cuenta de Microsoft Exchange 2007 en Evolution."
+
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:20(title)
+msgid "Exchange MAPI account settings"
+msgstr "Configuración de cuenta para Exchange MAPI"
+
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:44(title)
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:44(title)
+msgid "Exchange Settings"
+msgstr "Configuracio�n de Exchange"
+
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:45(p)
+msgid "In this section you can view the size of all Exchange folders."
+msgstr "En esta sección puede ver el tamaño de todas sus carpetas Exchange."
+
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:5(desc)
+msgid "Add and edit a Microsoft Exchange 2000/2003 account in Evolution."
+msgstr ""
+"Añadir y editar una cuenta de Microsoft Exchange 2000/2003 en Evolution."
+
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:45(p)
+msgid ""
+"In this section you can define your \"Out of Office\" status, change the "
+"password for your Exchange account, and manage the delegation settings."
+msgstr ""
+"En esta sección puede definir su estado «Fuera de la oficina», cambiar la "
+"contraseña de su cuenta Exchange y gestionar la configuración de delegación."
+
+#: C/mail-account-manage-microsoft-exchange-evo-exchange.page:45(p)
+msgid "You can also view the size of all Exchange folders."
+msgstr "También puede ver el tamaño de todas sus carpetas Exchange."
+
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:5(desc)
+msgid "Add and edit a Microsoft Exchange 2010 account in Evolution."
+msgstr "Añadir y editar una cuenta de Microsoft Exchange 2010 en Evolution."
+
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:20(title)
+msgid "Exchange Web Services account settings"
+msgstr "Configuración de cuenta para Exchange Web Services"
+
+#: C/mail-account-manage-mh-format-directories.page:5(desc)
+msgid "Add and edit a MH Format Mail Directories account in Evolution."
+msgstr ""
+"Añadir y editar una cuenta de directorios de correo en formato MH en "
+"Evolution."
+
+#: C/mail-account-manage-mh-format-directories.page:20(title)
+msgid "MH Format Mail Directories account settings"
+msgstr "Configuración de cuenta para directorios de correo en formato MH"
+
+#: C/mail-account-management.page:5(desc)
+msgid "Adding, editing and managing mail accounts."
+msgstr "Añadir, editar y gestionar cuentas de correo."
+
+#: C/mail-account-management.page:20(title)
+msgid "Account Management"
+msgstr "Gestión de la cuenta"
+
+#: C/mail-account-management.page:23(title)
+msgid "Common Account Types"
+msgstr "Tipos comunes de cuentas"
+
+#: C/mail-account-management.page:27(title)
+msgid "Local Account Types"
+msgstr "Tipos de cuenta locales"
+
+#: C/mail-account-management.page:31(title)
+msgid "Corporate Account Types"
+msgstr "Tipos de cuenta corporativos"
+
+#: C/mail-account-manage-maildir-format-directories.page:5(desc)
+msgid "Add and edit a Maildir Format Mail Directories account in Evolution."
+msgstr ""
+"Añadir y editar una cuenta de directorios de correo en formato Maildir en "
+"Evolution."
+
+#: C/mail-account-manage-maildir-format-directories.page:20(title)
+msgid "Maildir Format Mail Directories account settings"
+msgstr "Configuración de cuenta para directorios de correo en formato Maildir"
+
+#: C/mail-account-manage-maildir-format-directories.page:25(p)
+msgid ""
+"Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Mail Accounts</gui><gui>Edit</gui></guiseq>. The following settings "
+"are available when editing an existing account:"
+msgstr ""
+"Las cuentas de correo se pueden editar en <guiseq><gui>Editar</"
+"gui><gui>Preferencias</gui><gui>Cuentas de correo</gui><gui>Editar</gui></"
+"guiseq>. La siguiente configuración está disponible al editar una cuenta "
+"existente:"
+
+#: C/mail-account-manage-local-delivery.page:5(desc)
+msgid "Add and edit a Local Delivery account in Evolution."
+msgstr "Añadir y editar una cuenta de envío local en Evolution."
+
+#: C/mail-account-manage-local-delivery.page:20(title)
+msgid "Local Delivery account settings"
+msgstr "Configuración de cuenta de envío local"
+
+#: C/mail-account-manage-imap-plus.page:5(desc)
+msgid "Add and edit an IMAP+ mail account in Evolution."
+msgstr "Añadir y editar una cuenta de correo IMAP+ en Evolution."
+
+#: C/mail-account-manage-imap-plus.page:20(title)
+msgid "IMAP+ mail account settings"
+msgstr "Configuración de cuenta de correo IMAP+"
+
+#: C/mail-account-manage-imap.page:5(desc)
+msgid "Add and edit an IMAP mail account in Evolution."
+msgstr "Añadir y editar una cuenta de correo IMAP en Evolution."
+
+#: C/mail-account-manage-imap.page:20(title)
+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."
+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"
+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:"
+msgstr ""
+"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."
+msgstr "Inicie sesión en su cuenta de GMail."
+
+#: C/mail-access-gmail-pop-account.page:30(p)
+msgid ""
+"Go to <guiseq><gui>Settings</gui><gui>Forwarding and POP/IMAP</gui></"
+"guiseq>. Refer to the POP Download section."
+msgstr ""
+"Vaya a <guiseq><gui>Configuración</gui><gui>Reenvío y correo POP/IMAP</gui></"
+"guiseq>. Consulte la sección Descarga de correo POP."
+
+#: C/mail-access-gmail-pop-account.page:31(p)
+msgid ""
+"Enable the POP download feature by ticking the radio button that corresponds "
+"to either of these options:"
+msgstr ""
+"Active la caracerística de descarga de correo POP seleccionando uno de los "
+"botones de radio que corresponde con una de estas opciones:"
+
+#: C/mail-access-gmail-pop-account.page:33(p)
+msgid "Enable POP for all mail (even mail that's already been downloaded)"
+msgstr ""
+"Habilitar POP para todos los mensajes (incluso si ya se han descargado)"
+
+#: C/mail-access-gmail-pop-account.page:34(p)
+msgid "Enable POP for mail that arrives from now on"
+msgstr "Habilitar POP para los mensajes que se reciban a partir de ahora"
+
+#: C/mail-access-gmail-pop-account.page:37(p)
+msgid "Specify the other required settings for this Gmail feature."
+msgstr ""
+"Especifique los otros ajustes requeridos por esta característica de GMail."
+
+#: C/mail-access-gmail-pop-account.page:38(p)
+msgid ""
+"To know the Gmail Account settings, click on <guiseq><gui>Configuration "
+"instructions</gui><gui>Other</gui><gui>Standard Instructions</gui></guiseq>."
+msgstr ""
+"Para saber la configuración de la cuenta de Gmail pulse en "
+"<guiseq><gui>Instrucciones de configuración</gui><gui>Otras</"
+"gui><gui>Instrucciones estándar</gui></guiseq>."
+
+#: C/mail-access-gmail-pop-account.page:39(p)
+msgid ""
+"On your Evolution client, go to <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Mail Accounts</gui></guiseq>. Click <gui style=\"button\">Add</gui>."
+msgstr ""
+"En su cliente de Evolution, vaya a <guiseq><gui>Editar</"
+"gui><gui>Preferencias</gui><gui>Cuentas de correo</gui></guiseq>. Pulse <gui "
+"style=\"button\">Añadir</gui>."
+
+#: C/mail-access-gmail-pop-account.page:40(p)
+msgid ""
+"Provide the required information. For the account settings, refer to Step 5"
+msgstr ""
+"Proporcione la información requerida. Para la configuración de la cuenta, "
+"vaya al paso 5."
+
+#: C/mail-access-gmail-imap-account.page:5(desc)
+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"
+msgstr "Acceder a una cuenta IMAP de GMail a través de Evolution"
+
+#: C/mail-access-gmail-imap-account.page:26(p)
+msgid ""
+"Please refer to the <link xref=\"mail-account-manage-imap\">IMAP mail "
+"account settings</link>."
+msgstr ""
+"Consulte la <link xref=\"mail-account-manage-imap\">configuración de cuenta "
+"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."
+msgstr ""
+"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."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:37(None)
+msgid ""
+"@@image: './figures/window-overview-layers.png'; "
+"md5=3156497ff1c51756838f9ddfbce9baee"
+msgstr ""
+"@@image: './figures/window-overview-layers.png'; "
+"md5=3156497ff1c51756838f9ddfbce9baee"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:44(None) C/intro-main-window.page:93(None)
+#: C/intro-main-window.page:139(None)
+msgid ""
+"@@image: './figures/color-c4a000.png'; md5=9db17d2d5e9013501aeab2e165c6a6c9"
+msgstr ""
+"@@image: './figures/color-c4a000.png'; md5=9db17d2d5e9013501aeab2e165c6a6c9"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:47(None) C/intro-main-window.page:96(None)
+#: C/intro-main-window.page:142(None)
+msgid ""
+"@@image: './figures/color-ce5c00.png'; md5=19dae9650e3936312e09198973372a24"
+msgstr ""
+"@@image: './figures/color-ce5c00.png'; md5=19dae9650e3936312e09198973372a24"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:50(None) C/intro-main-window.page:99(None)
+#: C/intro-main-window.page:145(None)
+msgid ""
+"@@image: './figures/color-8f5902.png'; md5=ff5ccb859fe04a004cd67e1c22621dc6"
+msgstr ""
+"@@image: './figures/color-8f5902.png'; md5=ff5ccb859fe04a004cd67e1c22621dc6"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:51(None) C/intro-main-window.page:100(None)
+#: C/intro-main-window.page:146(None)
+msgid ""
+"@@image: './figures/color-4e9a06.png'; md5=b2c2e7b66fb470344c804db396b48b98"
+msgstr ""
+"@@image: './figures/color-4e9a06.png'; md5=b2c2e7b66fb470344c804db396b48b98"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:54(None) C/intro-main-window.page:103(None)
+#: C/intro-main-window.page:149(None)
+msgid ""
+"@@image: './figures/color-204a87.png'; md5=511497260cc4caab69d67814b1ee3b8b"
+msgstr ""
+"@@image: './figures/color-204a87.png'; md5=511497260cc4caab69d67814b1ee3b8b"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:57(None) C/intro-main-window.page:111(None)
+#: C/intro-main-window.page:152(None)
+msgid ""
+"@@image: './figures/color-a40000.png'; md5=19195da020e059dab33aa37788763a97"
+msgstr ""
+"@@image: './figures/color-a40000.png'; md5=19195da020e059dab33aa37788763a97"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:58(None) C/intro-main-window.page:153(None)
+msgid ""
+"@@image: './figures/color-5c3566.png'; md5=7c001a57237acc2ff61ee61e05ad3168"
+msgstr ""
+"@@image: './figures/color-5c3566.png'; md5=7c001a57237acc2ff61ee61e05ad3168"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/intro-main-window.page:61(None) C/intro-main-window.page:114(None)
+#: C/intro-main-window.page:156(None)
+msgid ""
+"@@image: './figures/color-2e3436.png'; md5=3c796c7aed3044e59f131bea364e8598"
+msgstr ""
+"@@image: './figures/color-2e3436.png'; md5=3c796c7aed3044e59f131bea364e8598"
+
+#: C/intro-main-window.page:5(desc)
+msgid "An explanation of the areas shown in the Evolution window."
+msgstr "Una explicación de las áreas mostradas en la ventana de Evolution."
+
+#: C/intro-main-window.page:17(name) C/credits.page:31(p)
+msgid "Barbara M. Tobias"
+msgstr "Barbara M. Tobias"
+
+#: C/intro-main-window.page:29(title)
+msgid "The <em>Evolution</em> main window"
+msgstr "La ventana principal de <em>Evolution</em>"
+
+#. This section fixes https://bugzilla.gnome.org/show_bug.cgi?id=657028
+#: C/intro-main-window.page:32(p)
+msgid ""
+"Evolution provides functionality for E-Mail, Calendar, Contacts, Tasks, and "
+"Memos. You can switch to another functionality by using the \"Switcher\" "
+"buttons in the lower left corner. Depending on the displayed functionality "
+"also the displayed elements in the window differ."
+msgstr ""
+"Evolution proporciona funcionalidades para Correo-e, Calendario, Contactos, "
+"Tareas y Notas. Puede cambiar a otra funcionalidad usando los botones del "
+"«Selector» en la esquina inferior izquierda. Dependiendo de la funcionalidad "
+"mostrada los elementos en la ventana pueden ser diferentes."
+
+#: C/intro-main-window.page:35(title)
+msgid "E-Mail"
+msgstr "Correo-e"
+
+#: C/intro-main-window.page:38(p)
+msgid "The Evolution mail main window"
+msgstr "La ventana principal de correo de Evolution"
+
+#: C/intro-main-window.page:41(p)
+msgid "Corresponding elements in the mail main window:"
+msgstr "Elementos correspondientes en la ventana principal de correo:"
+
+#: C/intro-main-window.page:44(p)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-c4a000.png\" "
+"width=\"10\"/> Menu bar"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-c4a000.png\" "
+"width=\"10\"/> Barra de menú"
+
+#: C/intro-main-window.page:47(p)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-ce5c00.png\" "
+"width=\"10\"/> Tool bar"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-ce5c00.png\" "
+"width=\"10\"/> Barra de herramientas"
+
+#: C/intro-main-window.page:50(p)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-8f5902.png\" "
+"width=\"10\"/> Folder list"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-8f5902.png\" "
+"width=\"10\"/> Lista de carpetas"
+
+#: C/intro-main-window.page:51(p)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-4e9a06.png\" "
+"width=\"10\"/> Search bar"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-4e9a06.png\" "
+"width=\"10\"/> Barra de búsqueda"
+
+#: C/intro-main-window.page:54(p)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-204a87.png\" "
+"width=\"10\"/> Message list"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-204a87.png\" "
+"width=\"10\"/> Lista de mensajes"
+
+#: C/intro-main-window.page:57(p)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-a40000.png\" "
+"width=\"10\"/> Switcher"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-a40000.png\" "
+"width=\"10\"/> Selector"
+
+#: C/intro-main-window.page:58(p)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-5c3566.png\" "
+"width=\"10\"/> Preview pane"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-5c3566.png\" "
+"width=\"10\"/> Panel de vista previa"
+
+#: C/intro-main-window.page:61(p)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-2e3436.png\" "
+"width=\"10\"/> Status bar"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-2e3436.png\" "
+"width=\"10\"/> Barra de estado"
+
+#: C/intro-main-window.page:67(title)
+msgid "Folder list"
+msgstr "Lista de carpetas"
+
+#: C/intro-main-window.page:68(p)
+msgid ""
+"The folder list gives you a list of the available folders for each account. "
+"To see the contents of a folder, click the folder name and its contents are "
+"displayed in the message list."
+msgstr ""
+"La lista de carpetas le proporciona una lista de las carpetas disponibles "
+"para cada cuenta. Para ver el contenido de una carpeta, pulse el nombre de "
+"la carpeta y el contenido se mostrará en la lista de correo-e."
+
+#: C/intro-main-window.page:69(p)
+msgid ""
+"For more information see <link xref=\"mail-folders\">Using Folders</link>."
+msgstr ""
+"Para obtener información adicional consulte <link xref=\"mail-folders\">Usar "
+"carpetas</link>."
+
+#: C/intro-main-window.page:72(title)
+msgid "Message List"
+msgstr "Lista de mensajes"
+
+#: C/intro-main-window.page:73(p)
+msgid ""
+"The message list displays all the read and unread messages that you have in "
+"the chosen folder. To view an email in the preview pane, click the message "
+"in the message list."
+msgstr ""
+"La lista de mensajes muestra todos los mensajes leídos y sin leer que tiene "
+"en la carpeta seleccionada. Para ver un correo-e en el panel de vista "
+"previa, pulse en correo-e en la lista de mensajes."
+
+#: C/intro-main-window.page:76(title)
+msgid "Switcher"
+msgstr "Selector"
+
+#: C/intro-main-window.page:77(p)
+msgid ""
+"The switcher at the bottom of the side bar lets you switch between the "
+"Evolution tools: Mail, Contacts, Calendars, Memos and Tasks."
+msgstr ""
+"El selector en la parte inferior de la barra lateral le permite cambiar "
+"entre las herramientas de Evolution: correo, contactos, calendarios, notas y "
+"tareas."
+
+#: C/intro-main-window.page:77(p)
+msgid ""
+"For more information see <link xref=\"change-switcher-appearance\">Changing "
+"the Switcher appearance</link>."
+msgstr ""
+"Para obtener más información consulte <link xref=\"change-switcher-appearance"
+"\">Cambiar la apariencia del selector</link>."
+
+#: C/intro-main-window.page:78(p)
+msgid ""
+"You can disable the folder list and the switcher side bar by toggling "
+"<guiseq><gui>View</gui><gui>Layout</gui><gui>Show Side Bar</gui></guiseq>."
+msgstr ""
+"Puede desactivar la lista de carpetas y la barra lateral del selector "
+"cambiando <guiseq><gui>Ver</gui><gui>Distribución</gui><gui>Mostrar barra "
+"lateral</gui></guiseq>."
+
+#: C/intro-main-window.page:81(title)
+msgid "Preview Pane"
+msgstr "Panel de vista previa"
+
+#: C/intro-main-window.page:82(p)
+msgid ""
+"The preview pane displays the message that is currently chosen in the "
+"message list."
+msgstr ""
+"El panel de vista previa muestra el mensaje actualmente seleccionado en la "
+"lista de mensajes."
+
+#: C/intro-main-window.page:83(p)
+msgid ""
+"You can disable the preview pane by toggling <guiseq><gui>View</"
+"gui><gui>Preview</gui><gui>Show Message Preview</gui></guiseq>."
+msgstr ""
+"Puede desactivar el panel de vista previa cambiando <guiseq><gui>Ver</"
+"gui><gui>Vista previa</gui><gui>Mostrar vista previa del correo</gui></"
+"guiseq>."
+
+#: C/intro-main-window.page:89(title)
+#: C/import-supported-file-formats.page:46(title)
+msgid "Calendar"
+msgstr "Calendario"
+
+#: C/intro-main-window.page:90(p)
+msgid "Elements in the calendar main window:"
+msgstr "Elementos en la ventana principal del calendario:"
+
+#: C/intro-main-window.page:93(p) C/intro-main-window.page:139(p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-c4a000.png\" width=\"10\"/> Menu "
+"bar"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-c4a000.png\" width=\"10\"/> "
+"Barra de menú"
+
+#: C/intro-main-window.page:96(p) C/intro-main-window.page:142(p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-ce5c00.png\" width=\"10\"/> Tool "
+"bar"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-ce5c00.png\" width=\"10\"/> "
+"Barra de herramientas"
+
+#: C/intro-main-window.page:99(p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
+"Calendar list"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
+"Lista de calendarios"
+
+#: C/intro-main-window.page:100(p) C/intro-main-window.page:146(p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-4e9a06.png\" width=\"10\"/> "
+"Search bar"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-4e9a06.png\" width=\"10\"/> "
+"Barra de búsqueda"
+
+#: C/intro-main-window.page:103(p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
+"Appointment list"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
+"Lista de citas"
+
+#: C/intro-main-window.page:104(p)
+msgid "Task list"
+msgstr "Lista de tareas"
+
+#: C/intro-main-window.page:107(p)
+msgid "Month pane"
+msgstr "Panel del mes"
+
+#: C/intro-main-window.page:108(p)
+msgid "Memo list"
+msgstr "Lista de notas"
+
+#: C/intro-main-window.page:111(p) C/intro-main-window.page:152(p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-a40000.png\" width=\"10\"/> "
+"Switcher"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-a40000.png\" width=\"10\"/> "
+"Selector"
+
+#: C/intro-main-window.page:114(p) C/intro-main-window.page:156(p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-2e3436.png\" width=\"10\"/> "
+"Status bar"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-2e3436.png\" width=\"10\"/> "
+"Barra de estado"
+
+#: C/intro-main-window.page:119(title)
+msgid "Appointment List"
+msgstr "Lista de citas"
+
+#: C/intro-main-window.page:120(p)
+msgid ""
+"The appointment list displays all your scheduled appointments in the time "
+"frame selected."
+msgstr ""
+"La lista de citas muestra todas sus citas programadas en el espacio de "
+"tiempo seleccionado."
+
+#: C/intro-main-window.page:123(title)
+msgid "Month Pane"
+msgstr "Panel del mes"
+
+#: C/intro-main-window.page:124(p)
+msgid ""
+"The month pane is a small view of a calendar month. To display additional "
+"months, drag the column border to the right. You can also select a range of "
+"days in the month pane to display a custom range of days in the appointment "
+"list."
+msgstr ""
+"En el panel del mes se muestra una pequeña vista mensual de su calendario. "
+"Para ver más meses arrastre hacia la derecha el borde. Puede seleccionar un "
+"rango de días en el panel del mes para mostrar un rango de días en la lista "
+"de citas."
+
+#: C/intro-main-window.page:127(title)
+msgid "Task list and Memo list"
+msgstr "Lista de tareas y notas"
+
+#: C/intro-main-window.page:128(p)
+msgid ""
+"Tasks and memos are just displayed for your convience and are not associated "
+"to any appointments. Use the <gui>switcher</gui> to go to their main windows."
+msgstr ""
+"Para su comodidad, las tareas y las notas se muestran y no están asociadas "
+"con ninguna cita. Use el <gui>Selector</gui> para ir a sus ventanas "
+"principales."
+
+#: C/intro-main-window.page:135(title)
+#: C/import-supported-file-formats.page:60(title)
+msgid "Contacts"
+msgstr "Contactos"
+
+#: C/intro-main-window.page:136(p)
+msgid "Elements in the contacts main window:"
+msgstr "Elementos en la ventana principal de contactos:"
+
+#: C/intro-main-window.page:145(p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
+"Address book list"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
+"Lista de libretas de direcciones"
+
+#: C/intro-main-window.page:149(p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
+"Contacts list"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
+"Lista de contactos"
+
+#: C/intro-main-window.page:153(p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-5c3566.png\" width=\"10\"/> "
+"Contact preview"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-5c3566.png\" width=\"10\"/> "
+"Vista previa del contacto"
+
+#: C/intro-main-window.page:159(p)
+msgid ""
+"You can disable the contact preview by toggling <guiseq><gui>View</"
+"gui><gui>Preview</gui><gui>Contact Preview</gui></guiseq>."
+msgstr ""
+"Puede desactivar la vista previa de los contactos cambiando "
+"<guiseq><gui>Ver</gui><gui>Vista previa</gui><gui>Vista previa de contactos</"
+"gui></guiseq>."
+
+#: C/intro-first-run.page:5(desc)
+msgid "Running Evolution for the very first time."
+msgstr "Inicio de Evolution por primera vez."
+
+#: C/intro-first-run.page:20(title)
+msgid "Starting <em>Evolution</em> for the first time"
+msgstr "Inicio de <em>Evolution</em> por primera vez"
+
+#: C/intro-first-run.page:22(p)
+msgid ""
+"The first time you run Evolution, it opens the First-Run Assistant to help "
+"you set up email accounts and <link xref=\"import-data\">import data from "
+"other applications.</link>"
+msgstr ""
+"La primera vez que ejecuta Evolution se abre el Asistente de primera "
+"ejecución que le ayuda a configurar sus cuentas de correo electrónico e "
+"<link xref=\"import-data\">importar datos de otras aplicaciones</link>."
+
+#: C/intro-first-run.page:31(title)
+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."
+msgstr ""
+"Se le preguntará si quiere estaurar 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."
+msgstr ""
+"Primero, elija el tipo de servidor en la lista desplegable <gui>Tipo de "
+"servidor</gui>."
+
+#: C/intro-first-run.page:38(p)
+msgid ""
+"If you are unsure about the type of server to choose, ask your system "
+"administrator or Internet Service Provider."
+msgstr ""
+"Si no está seguro del tipo de servidor que elegir, pregúntele a su "
+"administrador de sistemas o a su proveedor de servicios de Internet."
+
+#: C/intro-first-run.page:43(p)
+msgid "The most common available server types for normal users are:"
+msgstr "Los tipos más comunes de servidores disponibles son:"
+
+#: C/intro-first-run.page:45(p)
+msgid "None: If you do not plan to use Evolution for receiving email."
+msgstr "Ninguno: si no tiene intención de usar Evolution para recibir correo."
+
+#: C/intro-first-run.page:45(p)
+msgid "Continue <link xref=\"#sending\">here</link> for configuration."
+msgstr "Continúe <link xref=\"#sending\">aquí</link> para la configuración."
+
+#: C/intro-first-run.page:46(p)
+msgid ""
+"IMAP: Keeps the mail on the server so you can access your mail from multiple "
+"systems."
+msgstr ""
+"IMAP: conserva su correo-e en el servidor para que pueda acceder a él de "
+"diversas formas."
+
+#: C/intro-first-run.page:46(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-imap\">here</link> for "
+"configuration."
+msgstr ""
+"Continue <link xref=\"mail-receiving-options-imap\">aquí</link> para la "
+"configuración."
+
+#: C/intro-first-run.page:48(p)
+msgid ""
+"IMAP+: Keeps the mail on the server so you can access your mail from "
+"multiple systems."
+msgstr ""
+"IMAP+: conserva su correo-e en el servidor para que pueda acceder a él de "
+"diversas formas."
+
+#: C/intro-first-run.page:48(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-imap-plus\">here</link> for "
+"configuration."
+msgstr ""
+"Continue <link xref=\"mail-receiving-options-imap-plus\">aquí</link> para la "
+"configuración."
+
+#: C/intro-first-run.page:49(p)
+msgid "POP: Downloads your email to your hard disk."
+msgstr "POP: descarga su corre-e a su disco duro"
+
+#: C/intro-first-run.page:49(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-pop\">here</link> for "
+"configuration."
+msgstr ""
+"Continue <link xref=\"mail-receiving-options-pop\">aquí</link> para la "
+"configuración."
+
+#: C/intro-first-run.page:50(p)
+msgid ""
+"USENET News: Connects to a news server and downloads a list of available "
+"news digests."
+msgstr ""
+"Noticias USENET: conecta con un servidor de noticias y descarga una lista de "
+"los compendios de noticias disponibles."
+
+#: C/intro-first-run.page:50(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-usenet-news\">here</link> for "
+"configuration."
+msgstr ""
+"Continue <link xref=\"mail-receiving-options-usenet-news\">aquí</link> para "
+"la configuración."
+
+#: C/intro-first-run.page:56(p)
+msgid "Available server types for corporate users are:"
+msgstr "Los servidores disponibles para usuarios corporativos son:"
+
+#: C/intro-first-run.page:59(p)
+msgid ""
+"Exchange MAPI: For connecting to a Microsoft Exchange 2007/2010 or "
+"OpenChange server."
+msgstr ""
+"Exchange MAPI: para conectar con servidores Microsoft Exchange 2007/2010 u "
+"OpenChange."
+
+#: C/intro-first-run.page:59(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-exchange-mapi\">here</link> for "
+"configuration."
+msgstr ""
+"Continue <link xref=\"mail-receiving-options-exchange-mapi\">aquí</link> "
+"para la configuración."
+
+#: C/intro-first-run.page:60(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>"
+msgstr ""
+"Esto requiere tener instalado el paquete «evolution-mapi». <link action="
+"\"install:evolution-mapi\" href=\"http://ftp.gnome.org/pub/gnome/sources/"
+"evolution-mapi/\">Instalar evolution-mapi ahora.</link>"
+
+#: C/intro-first-run.page:62(p)
+msgid ""
+"Microsoft Exchange: For connecting to a Microsoft Exchange 2000 or 2003 "
+"server."
+msgstr ""
+"Microsoft Exchange: para conectarse con un servidor Microsoft Exchange 2000 "
+"o 2003."
+
+#: C/intro-first-run.page:62(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-evolution-exchange\">here</"
+"link> for configuration."
+msgstr ""
+"Continue <link xref=\"mail-receiving-options-evolution-exchange\">aquí</"
+"link> para la configuración."
+
+#: C/intro-first-run.page:63(p)
+msgid ""
+"This requires having the evolution-exchange package installed. <link action="
+"\"install:evolution-exchange\" href=\"http://ftp.gnome.org/pub/gnome/sources/"
+"evolution-exchange/\">Install evolution-exchange now.</link>"
+msgstr ""
+"Esto requiere tener instalado el paquete «evolution-exchange». <link action="
+"\"install:evolution-exchange\" href=\"http://ftp.gnome.org/pub/gnome/sources/"
+"evolution-exchange/\">Instalar evolution-exchange ahora.</link>"
+
+#: C/intro-first-run.page:65(p)
+msgid "Novell Groupwise: For connecting to a Novell GroupWise server."
+msgstr "Novell Groupwise: para conectarse con un servidor Novell GroupWise"
+
+#: C/intro-first-run.page:65(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-novell-groupwise\">here</link> "
+"for configuration."
+msgstr ""
+"Continue <link xref=\"mail-receiving-options-novell-groupwise\">aquí</link> "
+"para la configuración."
+
+#: C/intro-first-run.page:71(p)
+msgid "Available local account server types for advanced users are:"
+msgstr ""
+"Los tipos de servidor para cuentas locales disponibles para usuarios "
+"avanzados son:"
+
+#: C/intro-first-run.page:73(p)
+msgid ""
+"Local delivery: If you want to move email from the spool (the location where "
+"mail waits for delivery) and store it in your home directory. You need to "
+"provide the path to the mail spool you want to use. If you want to leave "
+"email in your system's spool files, choose the <gui>Standard Unix Mbox "
+"Spool</gui> option instead."
+msgstr ""
+"Elija esta opciones si quiere mover el correo desde el buzón local a su "
+"carpeta personal. Necesita proporcionar la ruta al buzón de correo que "
+"quiere usar, Si quiere dejar el correo en los archivos de spools del "
+"sistema, elija la opción «Mbox estándar de Unix»."
+
+#: C/intro-first-run.page:73(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-local-delivery\">here</link> "
+"for configuration."
+msgstr ""
+"Continue <link xref=\"mail-receiving-options-local-delivery\">aquí</link> "
+"para la configuración."
+
+#: C/intro-first-run.page:75(p)
+msgid ""
+"MH-Format Mail Directories: For downloading email using MH or another MH-"
+"style program."
+msgstr ""
+"Directorios de correo en formato MH: para descargar correo electrónico "
+"usando MH u otro programa de estilo MH."
+
+#: C/intro-first-run.page:75(p) C/intro-first-run.page:77(p)
+#: C/intro-first-run.page:81(p)
+msgid "You need to provide the path to the directory you want to use."
+msgstr "Debe proporcionar la ruta al directorio de correo que quiere usar."
+
+#: C/intro-first-run.page:75(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-mh-format-directories\">here</"
+"link> for configuration."
+msgstr ""
+"Continue <link xref=\"mail-receiving-options-mh-format-directories\">aquí</"
+"link> para la configuración."
+
+#: C/intro-first-run.page:77(p)
+msgid ""
+"Maildir-Format Mail Directories: For downloading your email using Qmail or "
+"another Maildir-style program."
+msgstr ""
+"Directorios de correo en formato Maildir: para descargar correo electrónico "
+"usando Qmail u otro programa de estilo Maildir."
+
+#: C/intro-first-run.page:77(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-maildir-format-directories"
+"\">here</link> for configuration."
+msgstr ""
+"Continue <link xref=\"mail-receiving-options-maildir-format-directories"
+"\">aquí</link> para la configuración."
+
+#: C/intro-first-run.page:79(p)
+msgid ""
+"Standard Unix mbox spool file: For reading and storing email in the mail "
+"spool file on your local system."
+msgstr ""
+"Archivo spool mbox estándar de Unix: para leer y almacenar correo en el "
+"archivo de correo spool de su sistema local."
+
+#: C/intro-first-run.page:79(p)
+msgid "You need to provide the path to the mail spool file you want to use."
+msgstr "Debe proporcionar la ruta la carpeta de correo que quiere usar."
+
+#: C/intro-first-run.page:79(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-unix-mbox-spool-file\">here</"
+"link> for configuration."
+msgstr ""
+"Continue <link xref=\"mail-receiving-options-unix-mbox-spool-file\">aquí</"
+"link> para la configuración."
+
+#: C/intro-first-run.page:81(p)
+msgid ""
+"Standard Unix mbox spool directory: For reading and storing email in the "
+"mail spool directory on your local system."
+msgstr ""
+"Directorios de correo mbox en formato estándar de Unix: para leer y "
+"almacenar correo electrónico en el directorio de correo spool en su sistema "
+"local."
+
+#: C/intro-first-run.page:81(p)
+msgid ""
+"Continue <link xref=\"mail-receiving-options-unix-mbox-spool-directory"
+"\">here</link> for configuration."
+msgstr ""
+"Continue <link xref=\"mail-receiving-options-unix-mbox-spool-directory"
+"\">aquí</link> para la configuración."
+
+#: C/intro-first-run.page:84(p)
+msgid ""
+"Later on, if you want to change an account, or if you want to create another "
+"one, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
+"gui></guiseq>. Select the account you want to change, then click <gui style="
+"\"button\">Edit</gui>. Alternately, add a new account by clicking <gui style="
+"\"button\">Add</gui>."
+msgstr ""
+"Más tarde, si quiere cambiar esta cuenta, o si quiere crear una nueva, pulse "
+"<guiseq><gui>Editar</gui><gui>Preferencias</gui><gui>Cuentas de correo</"
+"gui></guiseq>. Seleccione la cuenta que quiera cambiar y pulse <gui style="
+"\"button\">Editar</gui>. Alternativamente, añada una cuenta nueva pulsando "
+"<gui style=\"button\">Añadir</gui>."
+
+#. Do not rename, we link to it from the subpages
+#: C/intro-first-run.page:90(title)
+msgid "Sending mail"
+msgstr "Envío de correo"
+
+#: C/intro-first-run.page:91(p)
+msgid "Available server types are:"
+msgstr "Los tipos de servidor disponibles son:"
+
+#: C/intro-first-run.page:93(p)
+msgid ""
+"SMTP: Sends mail using an outbound mail server. This is the most common "
+"choice for sending mail."
+msgstr ""
+"SMTP: envía correo usando un servidor de correo saliente. Esta es la opción "
+"más común para enviar correo."
+
+#: C/intro-first-run.page:93(p)
+msgid ""
+"Continue <link xref=\"mail-sending-options-smtp\">here</link> for "
+"configuration."
+msgstr ""
+"Continue <link xref=\"mail-sending-options-smtp\">aquí</link> para la "
+"configuración."
+
+#: C/intro-first-run.page:94(p)
+msgid ""
+"Sendmail: Uses the Sendmail program to send mail from your system. It is not "
+"easy to configure, so you should select this option only if you know how to "
+"set up a Sendmail service."
+msgstr ""
+"Sendmail: utiliza el programa Sendmail para enviar el correo desde su "
+"sistema. No es fácil de configurar por lo que sólo debería elegir esta "
+"opción si sabe cómo poner en marcha un servicio Sendmail."
+
+#: C/intro-first-run.page:99(title)
+msgid "Account Information"
+msgstr "Información de la cuenta"
+
+#: C/intro-first-run.page:100(p)
+msgid "Give the account any name you prefer."
+msgstr "Dé a la cuenta el nombre que prefiera."
+
+#: C/intro-first-run.page:104(title)
+msgid "Importing Mail (Optional)"
+msgstr "Importar correo (opcional)"
+
+#: C/intro-first-run.page:105(p)
+msgid ""
+"Continue with <link xref=\"import-data\">Importing data from another "
+"application</link>."
+msgstr ""
+"Continúe con <link xref=\"import-data\">Importa datos de otros programas</"
+"link>."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/index.page:6(None) C/index.page:24(None)
+msgid ""
+"@@image: 'figures/evolutionlogo.png'; md5=4bf469aaba7c368937309e931ba9bdcc"
+msgstr ""
+"@@image: 'figures/evolutionlogo.png'; md5=4bf469aaba7c368937309e931ba9bdcc"
+
+#: C/index.page:5(desc)
+msgid "Evolution"
+msgstr "Evolution"
+
+#: C/index.page:7(title)
+msgid "Evolution Mail and Calendar"
+msgstr "Correo y calendario de Evolution"
+
+#: C/index.page:23(title)
+msgid ""
+"<media type=\"image\" src=\"figures/evolutionlogo.png\"> Evolution logo </"
+"media> Evolution Mail and Calendar"
+msgstr ""
+"<media type=\"image\" src=\"figures/evolutionlogo.png\">Logotipo de "
+"Evolution</media> Correo y calendario de Evolution"
+
+#: C/index.page:31(title)
+msgid "Getting Started"
+msgstr "Inicio"
+
+#: C/index.page:35(title)
+msgid "Mail Management"
+msgstr "Gestión del correo"
+
+#: C/index.page:37(title)
+msgid "Advanced Mail Management"
+msgstr "Gestión avanzada del correo"
+
+#: C/index.page:39(title)
+msgid "IMAP"
+msgstr "IMAP"
+
+#: C/index.page:45(title)
+msgid "Mail Composing"
+msgstr "Edición de correo"
+
+#: C/index.page:47(title)
+msgid "Advanced Mail Composing"
+msgstr "Edición avanzada de correos"
+
+#: C/index.page:52(title)
+msgid "Calendar Management"
+msgstr "Gestión del calendario"
+
+#: C/index.page:54(title)
+msgid "Advanced Calendar Management"
+msgstr "Gestión avanzada de calendarios"
+
+#: C/index.page:59(title)
+msgid "Contacts Management"
+msgstr "Gestión de contactos"
+
+#: C/index.page:63(title)
+msgid "Memos and Tasks Management"
+msgstr "Gestión de notas y tareas"
+
+#: C/index.page:67(title)
+msgid "Data Migration and Synchronization"
+msgstr "Migración de datos y sincronización"
+
+#: C/index.page:71(title)
+msgid "Corporate Environments"
+msgstr "Entornos corporativos"
+
+#: C/index.page:73(title)
+msgid "Microsoft Exchange"
+msgstr "Microsoft Exchange"
+
+#: C/index.page:76(title)
+msgid "Novell Groupwise"
+msgstr "Novell GroupWise"
+
+#: C/index.page:81(title)
+msgid "Tracking down Problems"
+msgstr "Localizar problemas"
+
+#: C/index.page:85(title)
+msgid "Common Mail Questions and Problems"
+msgstr "Preguntas y problemas comunes"
+
+#: C/index.page:89(title)
+msgid "Common Other Questions and Problems"
+msgstr "Otras preguntas y problemas comunes"
+
+#: C/index.page:93(title)
+msgid "Further reading"
+msgstr "Lecturas recomendadas"
+
+#: C/import-supported-file-formats.page:5(desc)
+msgid "Supported file formats for importing data."
+msgstr "Tipos de formatos de archivo soportados para importar datos."
+
+#: C/import-supported-file-formats.page:23(title)
+msgid "Supported file formats"
+msgstr "Formatos de archivo soportados"
+
+#: C/import-supported-file-formats.page:25(p)
+msgid "Evolution can import the following types of files:"
+msgstr "Evolution puede importar los siguientes tipos de archivos:"
+
+#: C/import-supported-file-formats.page:28(title)
+msgid "Mail"
+msgstr "Correo"
+
+#: C/import-supported-file-formats.page:30(p)
+msgid "Berkeley Mailbox (.mbox or no extension):"
+msgstr "Berkley Mailbox (.mbox o sin extensión):"
+
+#: C/import-supported-file-formats.page:32(p)
+msgid ""
+"The email format used by Mozilla, Netscape, Evolution (for local folders "
+"until version 2.32), Eudora, and many other email clients."
+msgstr ""
+"El formato correo-e utilizado por Mozilla, Netscape, Evolution (para "
+"carpetas locales hasta la versión 2.32), Eudora y muchos otros clientes de "
+"correo-e."
+
+#: C/import-supported-file-formats.page:34(p)
+msgid "Maildir (no extension):"
+msgstr "Maildir (sin extensión):"
+
+#: C/import-supported-file-formats.page:36(p)
+msgid ""
+"The format used by Evolution (for local folders since version 3.0). There is "
+"no need to import Maildir files as you can <link xref=\"mail-account-manage-"
+"maildir-format-directories\">configure a Maildir account</link> in Evolution "
+"and point to the folder where the Maildir files are stored."
+msgstr ""
+"El formato usado por Evolution (para carpetas locales desde la versión 3.0). "
+"No existe necesidad de importar archivos Maildir ya que puede <link xref="
+"\"mail-account-manage-maildir-format-directories\">configurar una cuenta "
+"Maildir</link> en Evolution y que apunte a la carepta donde los archivos "
+"Maildir están almacenados."
+
+#: C/import-supported-file-formats.page:38(p)
+msgid "Outlook Express 5/6 Personal Folders (.dbx):"
+msgstr "Carpetas personales de Outlook Express 5/6 (.dbx):"
+
+#: C/import-supported-file-formats.page:40(p)
+msgid ""
+"The email file format used by Microsoft Outlook Express 5/6. For newer "
+"versions PST import is recommended."
+msgstr ""
+"El formato de los archivos de correo-e usado por Microsoft Outlook Express "
+"5/6. Para versiones más modernas se recomienda la importación de PST."
+
+#: C/import-supported-file-formats.page:48(p)
+msgid "vCalendar (.vcs):"
+msgstr "vCalendar (.vcs):"
+
+#: C/import-supported-file-formats.page:50(p)
+msgid ""
+"A format for storing calendar files, which is generally used by Evolution, "
+"Microsoft Outlook, Sunbird, and Korganizer."
+msgstr ""
+"Un formato para almacenar archivos de calendario, generalmente usado por "
+"Evolution, Microsoft Outlook, Sunbird y Korganizer."
+
+#: C/import-supported-file-formats.page:52(p)
+msgid "iCalendar or iCal (.ics):"
+msgstr "iCalendar o iCal (.ics):"
+
+#: C/import-supported-file-formats.page:54(p)
+msgid ""
+"A format for storing calendar files. iCalendar is used by Evolution, "
+"Microsoft Outlook, Palm OS handhelds, and others."
+msgstr ""
+"Un formato para almacenar archivos de calendario. iCalendar lo usan por "
+"Evolution, Microsoft Outlook, los dispositivos de mano Palm OS y otros."
+
+#: C/import-supported-file-formats.page:62(p)
+msgid "LDAP Data Interchange Format (.ldif):"
+msgstr "Formato de intercambio de datos LDAP (.ldif):"
+
+#: C/import-supported-file-formats.page:64(p)
+msgid "A standard data format for contact cards."
+msgstr "Un formato de datos estándar para tarjetas de visita."
+
+#: C/import-supported-file-formats.page:66(p)
+msgid "vCard (.vcf, .gcrd):"
+msgstr "vCard (.vcf, .gcrd):"
+
+#: C/import-supported-file-formats.page:68(p)
+msgid ""
+"The address book format used by the GNOME, KDE, and many other contact "
+"management applications. You should be able to export to vCard format from "
+"any address book application."
+msgstr ""
+"El formato de libreta utilizado por los programas GNOME, KDE así como "
+"numerosas aplicaciones de administración de contactos. Será necesario poder "
+"exportar la libreta de direcciones de su otra aplicación al formato vCard."
+
+#: C/import-supported-file-formats.page:74(title)
+msgid "Miscellaneous"
+msgstr "Información variada"
+
+#: C/import-supported-file-formats.page:76(p)
+msgid "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
+msgstr "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
+
+#: C/import-supported-file-formats.page:78(p)
+msgid ""
+"CSV (Comma-separated values) or Tabulator files saved by using Evolution, "
+"Microsoft Outlook and Mozilla."
+msgstr ""
+"Archivos CSV (archivos separados por comas) o Tab guardados al usar "
+"Evolution, Microsoft Outlook y Mozilla."
+
+#: C/import-supported-file-formats.page:80(p)
+msgid "Personal Storage Table (.pst):"
+msgstr "Tabla de almacenamiento personal (.pst):"
+
+#: C/import-supported-file-formats.page:82(p)
+msgid ""
+"A file format used to store local copies of messages, calendar events, and "
+"other items within Microsoft software such as Microsoft Exchange Client, "
+"Windows Messaging, and Microsoft Outlook."
+msgstr ""
+"Un formato de archivo usado para almacenar copias locales de mensajes, "
+"acontecimientos de calendario y otros elementos del software Microsoft "
+"Exchange Client, Windows Messaging y Microsoft Outlook."
+
+#: C/import-single-files.page:5(desc)
+msgid "Importing single files."
+msgstr "Importar archivos individuales."
+
+#: C/import-single-files.page:20(title)
+msgid "Importing single files"
+msgstr "Importar archivos individuales"
+
+#: C/import-single-files.page:22(p)
+msgid "To import single files (mail, calendar data or contacts):"
+msgstr ""
+"Para importar archivos individuales (correo, datos de calendario o "
+"contactos):"
+
+#: C/import-single-files.page:24(p) C/import-apps-outlook.page:60(p)
+#: C/import-apps-mozilla.page:24(p)
+msgid "Click <guiseq><gui>File</gui><gui>Import</gui></guiseq>."
+msgstr "Pulse <guiseq><gui>Archivo</gui><gui>Importar</gui></guiseq>."
+
+#: C/import-single-files.page:25(p) C/import-apps-outlook.page:61(p)
+#: C/import-apps-mozilla.page:25(p)
+msgid ""
+"In the <gui>Importer Type</gui> tab, click <gui>Import a single file</gui>."
+msgstr ""
+"En la pestaña <gui>Tipo de importador</gui> pulse <gui>Importar un único "
+"archivo</gui>."
+
+#: C/import-single-files.page:26(p)
+msgid "Choose the file."
+msgstr "Elija el archivo."
+
+#: C/import-single-files.page:26(p) C/import-apps-outlook.page:62(p)
+#: C/import-apps-mozilla.page:26(p)
+msgid "The file type will be automatically determined."
+msgstr "Se determinará automáticamente el tipo de archivo."
+
+#: C/import-single-files.page:27(p) C/import-apps-outlook.page:65(p)
+#: C/import-apps-mozilla.page:27(p)
+msgid ""
+"Choose the destination (e.g. the folder in Evolution) for the imported data."
+msgstr ""
+"Elija el destino (ej. la carpeta en Evolution) para los datos importados."
+
+#: C/import-single-files.page:30(p)
+msgid ""
+"You can also import contacts that you have received as a vCard attachment of "
+"an email from its attachment menu."
+msgstr ""
+"También puede importar contactos que haya recibido como un adjunto vCard en "
+"un correo desde su menú de adjunto."
+
+#: C/import-data.page:5(desc)
+msgid "Importing data from another application."
+msgstr "Importar datos desde otra aplicación."
+
+#: C/import-data.page:20(title)
+msgid "Importing data from another application"
+msgstr "Importar datos desde otra aplicación"
+
+#: C/import-data.page:23(title)
+msgid "Applications"
+msgstr "Aplicaciones"
+
+#: C/import-apps-outlook.page:5(desc)
+msgid "Importing data from Microsoft Outlook."
+msgstr "Importar datos desde otro Microsoft Outlook."
+
+#: C/import-apps-outlook.page:23(title)
+msgid "Outlook"
+msgstr "Outlook"
+
+#. "Import data and settings from older programs" cannot recognize Outlook, as there obviously is no default storage location for Outlook *under Linux*
+#: C/import-apps-outlook.page:26(p)
+msgid ""
+"These steps refer to locally stored data such as POP accounts. For remote "
+"data (like IMAP) this is not necessary, since the data is still on the "
+"server and does not need to be manually transfered. You can set up the "
+"corresponding account in Evolution and the data will be downloaded."
+msgstr ""
+"Estos pasos hablan sobre datos almacenados localmente tales como cuentas "
+"POP. Esto no es necesario para los datos remotos (como IMAP), ya que los "
+"datos están en el servidor y no se necesita su transferencia manual. Puede "
+"configurar la cuenta correspondiente en Evolution y se descargarán los datos."
+
+#: C/import-apps-outlook.page:29(title)
+msgid "Prerequisites under Windows"
+msgstr "Prerequisitos bajo Windows"
+
+#: C/import-apps-outlook.page:30(p)
+msgid "First, while using Microsoft Windows, prepare your messages for import:"
+msgstr ""
+"Primero, mientras usa Microsoft Windows, prepare sus mensajes para "
+"importarlos:"
+
+#: C/import-apps-outlook.page:32(p)
+msgid ""
+"Find your Outlook files (they normally have the file ending <file>.pst</"
+"file> or <file>.ost</file>):"
+msgstr ""
+"Busque sus archivos de Outlook (generalmente tienen una terminación <file>."
+"pst</file> o <file>.ost</file>):"
+
+#: C/import-apps-outlook.page:35(p)
+msgid "Windows 7, Windows Vista"
+msgstr "Windows 7, Windows Vista"
+
+#: C/import-apps-outlook.page:35(p)
+msgid "Windows XP"
+msgstr "Windows XP"
+
+#: C/import-apps-outlook.page:38(p)
+msgid "Outlook 2010"
+msgstr "Outlook 2010"
+
+#: C/import-apps-outlook.page:38(file)
+msgid "C:\\Users\\username\\My Documents\\Outlook Files"
+msgstr "C:\\Users\\username\\My Documents\\Outlook Files"
+
+#: C/import-apps-outlook.page:38(file)
+msgid "C:\\Documents and Settings\\username\\My Documents\\Outlook Files"
+msgstr ""
+"C:\\Documents and Settings\\nombre_de_usuario\\My Documents\\Outlook Files"
+
+#: C/import-apps-outlook.page:41(p)
+msgid "Outlook 2007 and earlier"
+msgstr " Outlook 2007 y anteriores"
+
+#: C/import-apps-outlook.page:41(file)
+msgid "C:\\Users\\username\\AppData\\Local\\Microsoft\\Outlook"
+msgstr "C:\\Users\\nombre_de_usuario\\AppData\\Local\\Microsoft\\Outlook"
+
+#: C/import-apps-outlook.page:41(file)
+msgid ""
+"C:\\Documents and Settings\\username\\AppData\\Local\\Microsoft\\Outlook"
+msgstr ""
+"C:\\Documents and Settings\\nombre_de_usuario\\AppData\\Local\\Microsoft"
+"\\Outlook"
+
+#: C/import-apps-outlook.page:44(p)
+msgid "(Replace \"username\" by your username.)"
+msgstr "(Reemplace «nombre_de_usuario» por su nombre de usuario.)"
+
+#: C/import-apps-outlook.page:47(p)
+msgid ""
+"Copy the Outlook files to the system or partition that Evolution is "
+"installed on."
+msgstr ""
+"Copie los archivos de Outlook al sistema o a la partición en la que esté "
+"instalado Evolution."
+
+#: C/import-apps-outlook.page:48(p)
+msgid ""
+"As your Windows hard drive is probably in the NTFS format, some Linux "
+"systems cannot read it without additional software. You might find it "
+"simpler to copy the mail folders to a USB drive or to burn a CD."
+msgstr ""
+"Probablemente su disco duro está en formato NTFS algunos sistemas Linux no "
+"pueden leer sin software adicional. Quizá encuentre más fácil copiar las "
+"carpetas de correo a una unidad diferente o grabar un CD."
+
+#: C/import-apps-outlook.page:53(title)
+msgid "Importing into Evolution"
+msgstr "Importar en Evolution"
+
+#: C/import-apps-outlook.page:55(p)
+msgid ""
+"Depending on your last step, either plug in the disk or USB drive with the "
+"data and wait until the file manager window opens, or mount your Windows "
+"drive."
+msgstr ""
+"Dependiendo de su último paso, conecte el disco o la unidad USB con los "
+"datos y espere hasta que se abra la ventana del gestor de archivos o monte "
+"su unidad Windows."
+
+#: C/import-apps-outlook.page:56(p)
+msgid ""
+"Copy all the mail files into your home directory or another convenient place."
+msgstr ""
+"Copie todos los archivos de correo en su carpeta personal o cualquier otro "
+"lugar conveniente."
+
+#: C/import-apps-outlook.page:57(p)
+msgid "Start Evolution."
+msgstr "Inicie Evolution."
+
+#: C/import-apps-outlook.page:58(p)
+msgid ""
+"Optionally select <guiseq><gui>File</gui><gui>New</gui><gui>Mail Folder</"
+"gui></guiseq> to create the <link xref=\"mail-folders\">folders</link> you "
+"want."
+msgstr ""
+"opcionalmente, seleccione <guiseq><gui>Archivo</gui><gui>Nuevo</"
+"gui><gui>Carpeta de correo</gui></guiseq> para crear las <link xref=\"mail-"
+"folders\">carpetas</link> que quiera."
+
+#: C/import-apps-outlook.page:62(p)
+msgid ""
+"Choose the Outlook personal folders (.pst) file that you would like to "
+"import."
+msgstr ""
+"Seleccione el archivo de carpetas personales de Outlook (.pst) que quiere "
+"importar."
+
+#: C/import-apps-outlook.page:63(p)
+msgid ""
+"If the option to import Outlook personal folders (.pst files) is not "
+"available under <guiseq><gui>File</gui><gui>Import</gui><gui>Import single "
+"file</gui><gui>File type</gui></guiseq>, your distribution might have not "
+"enabled this functionality."
+msgstr ""
+"Si la opción para importar carpetas personales de Outlook (archivos .pst) no "
+"está disponible en <guiseq><gui>Archivo</gui><gui>Importar</"
+"gui><gui>Importar un único archivo</gui><gui>Tipo de archivo</gui></guiseq>, "
+"es posible que su distribución tenga activada esta funcionalidad."
+
+#: C/import-apps-outlook.page:66(p) C/import-apps-mozilla.page:28(p)
+msgid "Repeat the import steps until you have imported all your data."
+msgstr ""
+"Repita los pasos de importación hasta que haya importado todos sus datos."
+
+#: C/import-apps-mozilla.page:5(desc)
+msgid "Importing data from Mozilla Thunderbird."
+msgstr "Importar datos de Mozilla Thunderbird."
+
+#: C/import-apps-mozilla.page:20(title)
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: C/import-apps-mozilla.page:26(p)
+msgid "Choose the Thunderbird files that you would like to import."
+msgstr "Seleccione los archivos de Thunderbird que quiere importar."
+
+#: C/groupwise-placeholder.page:5(desc) C/groupwise-placeholder.page:20(title)
+msgid "Connecting to GroupWise"
+msgstr "Conexión a GroupWise"
+
+#: C/groupwise-placeholder.page:22(p)
+msgid ""
+"For topics not covered here please refer to the <link href=\"http://library."
+"gnome.org/users/evolution/2.32/usage-groupwise.html.en\">old Evolution "
+"manual</link>."
+msgstr ""
+"Para consultar temas no tratados aquí, diríjase al <link href=\"http://"
+"library.gnome.org/users/evolution/2.32/usage-groupwise.html.en\">antiguo "
+"manual de Evolution</link>."
+
+#: C/google-services.page:5(desc)
+msgid "Using Google services."
+msgstr "Usar servicios de Google."
+
+#: C/google-services.page:18(title)
+msgid "Using Google services"
+msgstr "Usar servicios de Google"
+
+#: C/express-mode.page:5(desc)
+msgid "What to do when using a small screen or netbook."
+msgstr "Qué hacer si se usa una pantalla pequeña o un «netbook»:"
+
+#: C/express-mode.page:20(title)
+msgid "Some windows are too large for small screens."
+msgstr "Algunas ventanas son demasiado grandes para las pantallas pequeñas."
+
+#: C/express-mode.page:22(p)
+msgid ""
+"This is a known problem and hard to solve for a complex application with "
+"many settings such as Evolution."
+msgstr ""
+"Es un problema conocido y es muy difícil solucionarlo para una aplicación "
+"complja con tantos ajustes como Evolution."
+
+#: C/express-mode.page:23(p)
+msgid ""
+"You can use the Express version which is targeted for mobile and small-"
+"screen devices. This is available from version 2.30 on and can be enabled by "
+"starting <code>evolution --express</code> from the terminal window."
+msgstr ""
+"Puede usar la versión Express que está pensada para dispositivos móviles y "
+"con pantallas pequeñas. Está disponible desde la versión 2.30 en adelante y "
+"se puede activar iniciando <code>evolution --express</code> desde la ventana "
+"de la terminal."
+
+#: C/express-mode.page:25(p)
+msgid ""
+"You can also explicitly open Evolution in a specific component. For the "
+"calendar, use <code>evolution --express --component=calendar</code>."
+msgstr ""
+"También puede abrir explícitamente un componente específico de Evolution. "
+"Para el calendario, use <code>evolution --express --component=calendar</"
+"code>."
+
+#: C/exporting-data.page:5(desc)
+msgid "How to export data from <em>Evolution</em>."
+msgstr "Cómo exportar datos de <em>Evolution</em>."
+
+#: C/exporting-data.page:20(title)
+msgid "Exporting data from <em>Evolution</em>"
+msgstr "Exportar datos de <em>Evolution</em>"
+
+#: C/exporting-data-mail.page:5(desc)
+msgid "How to export mail data from <em>Evolution</em>."
+msgstr "Cómo exportar datos del correo de <em>Evolution</em>."
+
+#: C/exporting-data-mail.page:20(title)
+msgid "Exporting mail data"
+msgstr "Exportar datos de correos"
+
+#: C/exporting-data-mail.page:22(p)
+msgid ""
+"To save an email to a file in <link href=\"https://secure.wikimedia.org/"
+"wikipedia/en/wiki/Mbox\">mbox</link> format, select an email and click "
+"<guiseq><gui>File</gui><gui>Save as mbox...</gui></guiseq> or right-click on "
+"the message and click <gui>Save as mbox...</gui>."
+msgstr ""
+"Para guardar un correo en un arachivo en formato <link href=\"http://es."
+"wikipedia.org/wiki/Mbox\">mbox</link>, seleccione un correo y pulse "
+"<guiseq><gui>Archivo</gui><gui>Guardar como mbox...</gui></guiseq> o pulse "
+"con el botón derecho del ratón sobre el correo y pulse <gui>Guardar como "
+"mbox...</gui>."
+
+#: C/exporting-data-mail.page:24(p)
+msgid ""
+"The same steps apply to save a complete mail folder, but you have to mark "
+"all messages in it first."
+msgstr ""
+"Los mismos pasos se aplican al guardar una carpeta de correo completa, pero "
+"antes debe marcar todos los correos en ella."
+
+#: C/exporting-data-contacts.page:5(desc)
+msgid "How to export contacts data from <em>Evolution</em>."
+msgstr "Cómo exportar los datos de contactos de <em>Evolution</em>."
+
+#: C/exporting-data-contacts.page:23(title)
+msgid "Exporting contacts data"
+msgstr "Exportar datos de los contactos"
+
+#: C/exporting-data-contacts.page:25(p)
+msgid ""
+"Contacts files are stored in a database, but can be saved as a vCard file."
+msgstr ""
+"Los archivos de contactos se almacenan en una base de datos, pero se pueden "
+"guardar como un archivo vCard."
+
+#: C/exporting-data-contacts.page:26(p)
+msgid ""
+"To export a complete address book, click <guiseq><gui>File</gui><gui>Save "
+"Address Book As vCard</gui></guiseq>."
+msgstr ""
+"Para exportar una libreta de direcciones completa pulse "
+"<guiseq><gui>Archivo</gui><gui>Guardar la libreta de direcciones como vCard</"
+"gui></guiseq>."
+
+#: C/exporting-data-contacts.page:27(p)
+msgid ""
+"If you want to export only one contact, click <guiseq><gui>File</"
+"gui><gui>Save as vCard</gui></guiseq> or right-click on the contact and "
+"click <gui>Save as vCard</gui>."
+msgstr ""
+"Si quiere exportar un sólo contacto pulse <guiseq><gui>Archivo</"
+"gui><gui>Guardar como vCard</gui></guiseq> o pulse con el botón derecho del "
+"ratón sobre el contacto y pulse <gui>Guardar como vCard</gui>."
+
+#: C/exporting-data-calendar.page:5(desc)
+msgid "How to export calendar data from <em>Evolution</em>."
+msgstr "Cómo exportar los datos del calendario de <em>Evolution</em>."
+
+#: C/exporting-data-calendar.page:20(title)
+msgid "Exporting calendar data"
+msgstr "Exportar datos del calendario"
+
+#: C/exporting-data-calendar.page:22(p)
+msgid ""
+"To export a complete calendar, right-click on the calendar in the list of "
+"calendars and click <gui>Save as</gui>. Available formats are iCalendar "
+"format (ICS, recommended), comma separated values (CSV), and RDF format."
+msgstr ""
+"Para exportar un calendario completo, pulse con el botón derecho del ratón "
+"sobre el calendario en la lista de calendarios y pulse <gui>Guardar como</"
+"gui>. Los formatos disponibles son el formato iCalendar (ICS, recomendado), "
+"valores separados por comas (CSV) y formato RDF."
+
+#: C/exporting-data-calendar.page:23(p)
+msgid ""
+"If you want to export only one appointment, right-click on the appointment "
+"and click <gui>Save as iCalendar...</gui>."
+msgstr ""
+"Si sólo quiere exportar una cita, pulse con el botón derecho del ratón sobre "
+"la cita y seleccione <gui>Guardar como iCalendar...</gui>."
+
+#: C/exchange-placeholder.page:5(desc) C/exchange-placeholder.page:20(title)
+msgid "Connecting to Exchange Servers"
+msgstr "Conexión a servidores Exchange"
+
+#: C/exchange-placeholder.page:22(p)
+msgid ""
+"For topics not covered here please refer to the <link href=\"http://library."
+"gnome.org/users/evolution/2.32/usage-exchange.html.en\">old Evolution "
+"manual</link>."
+msgstr ""
+"Consulte el <link href=\"http://library.gnome.org/users/evolution/2.32/usage-"
+"exchange.html.en\">antiguo manual de Evolution</link> para temas que no "
+"estén cubiertos aquí."
+
+#: C/exchange-connectors-overview.page:5(desc)
+msgid ""
+"Which additional package to install in order to connect to an Exchange "
+"server."
+msgstr ""
+"Qué paquete adicional instalar para poder conectar Evolution con un servidor "
+"Exchange."
+
+#: C/exchange-connectors-overview.page:20(title)
+msgid "Choosing the right connector"
+msgstr "Elegir el conector adecuado"
+
+#: C/exchange-connectors-overview.page:22(p)
+msgid ""
+"Depending on the version of the Microsoft Exchange server that you would "
+"like to connect to it is required to make sure that an additional package is "
+"installed that provides this functionality."
+msgstr ""
+"Dependiendo de la versión del servidor Microsoft Exchange al que se quiera "
+"conectar, es necesario que se asegure de que tiene instalado un paquete que "
+"proporciona esta funcionalidad."
+
+#: C/exchange-connectors-overview.page:24(p)
+msgid ""
+"For Microsoft Exchange 2000 and 2003 (and possibly earlier versions of "
+"Exchange that use Outlook Web Access) it is recommended to use the package "
+"evolution-exchange. <link action=\"install:evolution-exchange\" href="
+"\"http://projects.gnome.org/evolution/download\">Install evolution-exchange "
+"now.</link>"
+msgstr ""
+"Para Microsoft Exchange 2000 y 2003 (y, posiblemente, versiones anteriores "
+"de Exchange que usan Acceso web a Outlook) se recomienda usar el paquete "
+"evolution-exchange. <link action=\"install:evolution-exchange\" href="
+"\"http://projects.gnome.org/evolution/download\">Instalar evolution-exchange "
+"ahora.</link>"
+
+#: C/exchange-connectors-overview.page:26(p)
+msgid ""
+"For Microsoft Exchange 2007 and 2010 (and possibly earlier versions that "
+"support MAPI) it is recommended to use the package evolution-mapi. <link "
+"action=\"install:evolution-mapi\" href=\"http://projects.gnome.org/evolution/"
+"download\">Install evolution-mapi now.</link>"
+msgstr ""
+"Para Microsoft Exchange 2007 y 2010 (y, posiblemente, versiones anteriores "
+"que soporten MAPI) se recomienda usar el paquete evolution-mapi. <link "
+"action=\"install:evolution-mapi\" href=\"http://projects.gnome.org/evolution/"
+"download\">Instalar evolution-mapi ahora</link>."
+
+#: C/exchange-connectors-overview.page:27(p)
+msgid ""
+"For Microsoft Exchange 2007 and 2010 the package evolution-ews is currently "
+"under development and will replace evolution-mapi in the future. It might "
+"not be available yet for your distribution. <link action=\"install:evolution-"
+"ews\" href=\"http://projects.gnome.org/evolution/download\">Install "
+"evolution-ews now.</link>"
+msgstr ""
+"Para Microsoft Exchange 2007 y 2010 el paquete «evolution-ews» está "
+"actualmente en desarrollo, y sustituirá a  «evolution-mapi» en el futuro. "
+"Puede que todavía no esté disponible para su distribución. <link action="
+"\"install:evolution-ews\" href=\"http://projects.gnome.org/evolution/download"
+"\">Instalar evolution-ews ahora</link>."
+
+#: C/exchange-connectors-overview.page:29(p)
+msgid ""
+"If you are unsure which Microsoft Exchange server version is used, you may "
+"want to contact your system administrator for more information."
+msgstr ""
+"Si no está seguro de que versión del servidor Microsoft Exchange se usa, "
+"puede querer contactar con su administrador del sistema para obtener más "
+"información."
+
+#: C/deleting-to-free-disk-space.page:5(desc)
+msgid ""
+"Deleting emails and calendar entries to reduce the size of the files used by "
+"Evolution."
+msgstr ""
+"Eliminar correos y entradas del calendario para reducir el tamaño de los "
+"archivos que usa Evolution."
+
+#: C/deleting-to-free-disk-space.page:20(title)
+msgid "Freeing disk space by deleting items"
+msgstr "Liberar espacio en disco eliminando elementos"
+
+#: C/deleting-emails.page:5(desc)
+msgid "Deleting emails or attachments to reduce the size of the mailbox."
+msgstr ""
+"Eliminando correos o adjuntos para reducir el tamaño del buzón de correo."
+
+#: C/deleting-emails.page:25(title)
+msgid "Deleting emails or attachments permanently"
+msgstr "Eliminar permanentemente correos o adjuntos"
+
+#: C/deleting-emails.page:28(title)
+msgid "Emails"
+msgstr "Correos-e"
+
+#: C/deleting-emails.page:29(p)
+msgid ""
+"Evolution deletes emails on IMAP servers by <em>marking</em> the messages "
+"for deletion; space is not freed until you <em>expunge</em> the marked "
+"emails."
+msgstr ""
+"Evolution elimina correos electrónicos en servidores IMAP <em>marcándolos</"
+"em> para su eliminación; el espacio no se libera hasta que <em>purga</em> "
+"los correos marcados."
+
+#: C/deleting-emails.page:31(p)
+msgid ""
+"To Expunge a specific folder, go to <guiseq><gui>Folder</gui><gui>Expunge</"
+"gui></guiseq> or press <keyseq><key>Ctrl</key><key>E</key></keyseq>. To "
+"Expunge all folders, go to <guiseq><gui>File</gui><gui>Empty Trash</gui></"
+"guiseq>. This applies to other types of accounts as well."
+msgstr ""
+"Para purgar una carpeta específica, vaya a <guiseq><gui>Carpeta</"
+"gui><gui>Purgar</gui></guiseq> o pulse <keyseq><key>Ctrl</key><key>E</key></"
+"keyseq>. Para purgar todas las carpetas, vaya a <guiseq><gui>Archivo</"
+"gui><gui>Vaciar papelera</gui></guiseq>. Esto también se aplica a otros "
+"tipos de cuentas."
+
+#: C/deleting-emails.page:35(title)
+msgid "Attachments"
+msgstr "Adjuntos"
+
+#: C/deleting-emails.page:36(p)
+msgid ""
+"To delete the attachments of an email, select the message and click "
+"<guiseq><gui>Message</gui><gui>Remove Attachments</gui></guiseq>."
+msgstr ""
+"Para eliminar los adjuntos de un correo, seleccione el mensaje y pulse "
+"<guiseq><gui>Mensaje</gui><gui>Quitar adjuntos</gui></guiseq>."
+
+#: C/deleting-appointments.page:5(desc)
+msgid "Deleting calendar entries to reduce the size of the mailbox."
+msgstr "Eliminar entradas del calendario reduce el tamaño del buzón de correo."
+
+#: C/deleting-appointments.page:20(title)
+msgid "Deleting old appointments permanently"
+msgstr "Eliminar permanentemente citas antiguas"
+
+#: C/deleting-appointments.page:22(p)
+msgid ""
+"To Purge old entries in a calendar, go to <guiseq><gui>Actions</"
+"gui><gui>Purge</gui></guiseq> in the Calendar view. You will be asked how "
+"many days old the events to remove from the calendar should be. The action "
+"will be applied to the currently opened calendar (selected in the list of "
+"calendars on the left); other calendars remain unchanged."
+msgstr ""
+"Para purgar entradas antiguas en un calendario vaya a <guiseq><gui>Acciones</"
+"gui><gui>Purgar</gui></guiseq> en la vista del Calendario. Se le preguntará "
+"cuántos días de antigüedad deben tener los acontecimientos del calendario "
+"que se deben quitar. La acción se aplicará sobre el calendario actualmente "
+"abierto (sieleccionado en la lista de calendarios a la izquierda); no se "
+"verán afectados los otros calendarios."
+
+#: C/default-browser.page:5(desc)
+msgid "How to define the default browser to open links with."
+msgstr "Cómo definir el navegador predeterminado con el que abrir los enlaces."
+
+#: C/default-browser.page:20(title)
+msgid "Setting the default browser"
+msgstr "Establecer el navegador predeterminado"
+
+#. For GNOME2 the steps are to define the gconf keys /desktop/gnome/url-handlers/http and /https
+#: C/default-browser.page:24(p)
+msgid ""
+"You can set the system-wide default browser in GNOME 3 under "
+"<guiseq><gui>Activities</gui><gui>Applications</gui><gui>System Settings</"
+"gui><gui>System</gui><gui>System Info</gui><gui>Default Applications</gui></"
+"guiseq>."
+msgstr ""
+"En GNOME 3 puede configurar el navegador predeterminado del sistema bajo "
+"<guiseq><gui>Actividades</gui><gui>Aplicaciones</gui><gui>Configuración del "
+"sistema</gui><gui>Sistema</gui><gui>Información del sistema</"
+"gui><gui>Aplicaciones predeterminadas</gui></guiseq>."
+
+#: C/default-browser.page:25(p)
+msgid ""
+"If the preferred browser is set as default application but still does not "
+"work correctly please contact your distribution via their forum or bug "
+"tracker."
+msgstr ""
+"Si el navegador preferido esté establecido como la aplicación predeterminada "
+"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)
+msgid ""
+"GNOME 3 users with a technical background can tweak these settings by "
+"defining scheme-handlers in <file>$HOME/.local/share/applications/mimeapps."
+"list</file>."
+msgstr ""
+"Los usuarios de GNOME 3 con conocimientos técnicos puede ajustar estas "
+"configuraciones definiendo manejadores de esquemas en <file>$HOME/.local/"
+"share/applications/mimeapps.list</file>."
+
+#: 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?"
+
+#: C/data-storage.page:20(title)
+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."
+msgstr ""
+"Esto sólo es interesante para usuarios avanzados que quieren depurar "
+"problemas."
+
+#: C/data-storage.page:26(p)
+msgid ""
+"If you run Evolution 2.32.0 or later, data will be stored according to the "
+"<link href=\"http://www.freedesktop.org/wiki/Specifications/basedir-spec"
+"\">XDG Base Directory Specification</link>. By default this means:"
+msgstr ""
+"Si ejecuta Evolution 2.32.0 o posterior se almacenarán sus datos según la "
+"<link href=\"http://www.freedesktop.org/wiki/Specifications/basedir-spec"
+"\">Especificación de directorios base XDG</link>. De forma predeterminada "
+"significa que:"
+
+#: C/data-storage.page:30(title)
+msgid "The user's data files"
+msgstr "Los archivos de datos del usuario"
+
+#: C/data-storage.page:31(p)
+msgid "$HOME/.local/share/evolution"
+msgstr "$HOME/.local/share/evolution"
+
+#: C/data-storage.page:34(title)
+msgid "Various configuration and state files"
+msgstr "Varios archivos de configuración y estado"
+
+#: C/data-storage.page:35(p)
+msgid "$HOME/.config/evolution"
+msgstr "$HOME/.config/evolution"
+
+#: C/data-storage.page:38(title)
+msgid "Disposable data caches"
+msgstr "Cachés de datos desechables"
+
+#: C/data-storage.page:39(p)
+msgid "$HOME/.cache/evolution"
+msgstr "$HOME/.cache/evolution"
+
+#: C/data-storage.page:42(title)
+msgid "Configuration settings in GConf"
+msgstr "Ajustes de configuración en GConf"
+
+#: C/data-storage.page:43(p)
+msgid "$HOME/.gconf/apps/evolution"
+msgstr "$HOME/.gconf/apps/evolution"
+
+#: C/credits.page:5(desc)
+msgid "Credits and Acknowledgment."
+msgstr "Créditos y reconocimientos."
+
+#: C/credits.page:20(title)
+msgid "Credits and Acknowledgment"
+msgstr "Créditos y reconocimientos"
+
+#: C/credits.page:23(title)
+msgid "Authors of the Evolution User Documentation"
+msgstr "Autores de la documentación del usuario de Evolution"
+
+#: C/credits.page:25(p) C/credits.page:49(p)
+msgid "André Klapper"
+msgstr "André Klapper"
+
+#: C/credits.page:28(p)
+msgid "April Gonzalez"
+msgstr "April Gonzalez"
+
+#: C/credits.page:41(title)
+msgid "Authors of the previous version"
+msgstr "Autores de la versión anterior"
+
+#: C/credits.page:43(p)
+msgid "Aaron Weber"
+msgstr "Aaron Weber"
+
+#: C/credits.page:46(p)
+msgid "Akhil Laddha"
+msgstr "Akhil Laddha"
+
+#: C/credits.page:52(p)
+msgid "Duncan Mak"
+msgstr "Duncan Mak"
+
+#: C/credits.page:55(p)
+msgid "Ettore Perazzoli"
+msgstr "Ettore Perazzoli"
+
+#: C/credits.page:58(p)
+msgid "Francisco Javier F. Serrador"
+msgstr "Francisco Javier F. Serrador"
+
+#: C/credits.page:61(p)
+msgid "Jessica Prabhakar"
+msgstr "Jessica Prabhakar"
+
+#: C/credits.page:64(p)
+msgid "Kevin Breit"
+msgstr "Kevin Breit"
+
+#: C/credits.page:67(p)
+msgid "Mark Moulder"
+msgstr "Mark Moulder"
+
+#: C/credits.page:70(p)
+msgid "Novell, Inc."
+msgstr "Novell, Inc."
+
+#: C/credits.page:73(p)
+msgid "Radhika Nair"
+msgstr "Radhika Nair"
+
+#: C/credits.page:76(p)
+msgid "Srinivasa Ragavan"
+msgstr "Srinivasa Ragavan"
+
+#: C/credits.page:83(title)
+msgid "Contact information"
+msgstr "Información de contacto"
+
+#: C/credits.page:84(p)
+msgid "The GNOME Documentation Project:"
+msgstr "Proyecto de Documentacio�n GNOME:"
+
+#: C/credits.page:87(link)
+msgid "Website"
+msgstr "Sitio web"
+
+#: C/credits.page:90(link)
+msgid "Mailing list"
+msgstr "Lista de correo"
+
+#: C/contacts-using-several-addressbooks.page:5(desc)
+msgid "Adding and using more than one address book and different types."
+msgstr "Añadir y usar más de una libreta de direcciones y de diferentes tipos."
+
+#: C/contacts-using-several-addressbooks.page:20(title)
+msgid "Using several address books"
+msgstr "Usar varias libretas de direcciones"
+
+#: C/contacts-using-several-addressbooks.page:22(p)
+msgid ""
+"You can have multiple address books. For example, you might have one address "
+"book for work related contacts and one for private contacts. The side bar "
+"lists those address books, and you can select which address book is shown."
+msgstr ""
+"Puede tener varias libretas de direcciones. Por ejemplo, puede tener una "
+"libreta de direcciones para contactos relacionados con el trabajo y otra "
+"para contactos privados. La barra lateral muestra estas libretas de "
+"direcciones, y puede seleccionar cuál de ellas se muestra."
+
+#: C/contacts-using-several-addressbooks.page:24(p)
+msgid ""
+"You can also use address books that are not on your computer, such as on the "
+"internet (e.g. Google) or in a local network (e.g. LDAP)."
+msgstr ""
+"También puede usar las libretas de direcciones que no están en su equipo, "
+"tales como en Internet (ej. Google) o en su red local (ej. LDAP)."
+
+#: C/contacts-using-contact-lists.page:5(desc)
+msgid "Using contact lists for grouping contacts."
+msgstr "Usar listas de contactos para agrupar contactos."
+
+#: C/contacts-using-contact-lists.page:23(title)
+msgid "Using Contact Lists"
+msgstr "Usar listas de contactos"
+
+#: C/contacts-using-contact-lists.page:25(p)
+msgid ""
+"A contact list is a set of contacts with a single nickname that you create. "
+"When you send mail to this nickname it is actually sent to every member of "
+"the list. This differs from a \"real\" mailing list in that it exists only "
+"on your computer as a convenience to you, rather than as an actual email "
+"address managed by a mailing list application on a server."
+msgstr ""
+"Una lista de contactos es un conjunto de contactos que crea con un solo "
+"apodo. Cuando envía correos electrónicos a este apodo, se envían a cada "
+"miembro de la lista. Esto es diferente a una lista de correo «real» que "
+"existe sólo en su equipo para su conveniencia, en lugar de ser una dirección "
+"de correo real gestionada por una aplicación para listas de correo en un "
+"servidor."
+
+#: C/contacts-using-contact-lists.page:27(p)
+msgid ""
+"For example, you could create one contact for each family member, then add "
+"those contacts to a contact list called \"Family\". Then, instead of "
+"entering each person's email address individually, you can send emails to "
+"\"Family\" and the messages would go to all of them."
+msgstr ""
+"Por ejemplo, puede crear una tarjeta para cada miembro de su familia, "
+"después añadir esas tarjetas a una lista de contactos llamada «Familia». "
+"Después, en lugar de introducir cada dirección de correo electrónico de cada "
+"persona individualmente, puede enviar un correo electrónico a «Familia» y el "
+"mensaje se enviará a todos ellos."
+
+#: C/contacts-using-contact-lists.page:30(title)
+msgid "Creating a contact list"
+msgstr "Crear una lista de contactos"
+
+#: C/contacts-using-contact-lists.page:32(p)
+msgid ""
+"Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact List</gui></guiseq>."
+msgstr ""
+"Pulse <guiseq><gui>Archivo</gui><gui>Nuevo</gui><gui>Lista de contactos</"
+"gui></guiseq>."
+
+#: C/contacts-using-contact-lists.page:34(p)
+#: C/contacts-usage-add-contact.page:24(p)
+msgid ""
+"Select the address book under <gui>Where:</gui> to which it will be added."
+msgstr ""
+"Selecciones la libreta de direcciones bajo <gui>Dónde:</gui> en la que "
+"quiere añadirlo."
+
+#: C/contacts-using-contact-lists.page:35(p)
+msgid ""
+"Specify the list members by either entering the names or email addresses of "
+"contacts (the text field supports autocompletion), or by dragging contacts "
+"from the Contacts window into the list, or by using the <gui style=\"button"
+"\">Select...</gui> button."
+msgstr ""
+"Especifique los miembros de la lista introduciendo sus nombres o direcciones "
+"de correo electrónicos de los contactos (el campo de texto soporta "
+"autocompletado) o arrastrando contactos desde la ventana de Contactos a la "
+"lista o usando el botón <gui style=\"button\">Seleccionar...</gui>."
+
+#: C/contacts-using-contact-lists.page:36(p)
+msgid ""
+"Choose whether you want to hide the email addresses when you send a message "
+"to the list."
+msgstr ""
+"Elija si quiere ocultar las direcciones de los correos-e cuando envíe un "
+"mensaje a la lista."
+
+#: C/contacts-using-contact-lists.page:36(p)
+msgid ""
+"Unless it is a very small list, it is recommended that you leave the "
+"addresses hidden. This is the same thing as using the “Bcc:� feature "
+"discussed in <link xref=\"mail-composer-several-recipients\">Sending a "
+"message to several recipients</link>."
+msgstr ""
+"A no ser que sea una lista muy pequeña, es recomendable que oculte las "
+"direcciones. Este funcionamiento es similar al de la característica «Cco:», "
+"comentada en <link xref=\"mail-composer-several-recipients\">Especificar "
+"destinatarios adicionales para correo electrónico</link>."
+
+#: C/contacts-using-contact-lists.page:40(p)
+msgid "The contact list will be added to the chosen address book in Evolution."
+msgstr ""
+"La libreta de direcciones se añadirá a la libreta de direcciones "
+"seleccionada en Evolution."
+
+#: C/contacts-using-contact-lists.page:44(title)
+msgid "Sending messages to a contact list"
+msgstr "Enviar mensajes a listas de contactos"
+
+#: C/contacts-using-contact-lists.page:45(p)
+msgid ""
+"To send a message to the contact list, enter the name that you chose for the "
+"contact list as the recipient in the mail composer. You can also right-click "
+"the contact list in your address book and select <gui>Send Message to List</"
+"gui>."
+msgstr ""
+"Para enviar un correo a la lista de contactos, introduzca el nombre que "
+"eligió para la lista de contactos como el destinatario del correo en el "
+"editor. También puede pulsar con el botón derecho en la lista de contactos "
+"en su libreta de direcciones y seleccionar <gui>Enviar un mensaje a la "
+"lista</gui>."
+
+#: C/contacts-usage.page:5(desc)
+msgid "On adding, editing, and deleting contacts in address books."
+msgstr ""
+"Acerca de añadir, editar y eliminar contactos en libretas de direcciones."
+
+#: C/contacts-usage.page:20(title)
+msgid "Add, Edit, and Delete Contacts"
+msgstr "Añadir, editar y eliminar contactos"
+
+#: C/contacts-usage-edit-contact.page:5(desc)
+msgid "Editing a contact in your address book."
+msgstr "Editar un contacto en su libreta de direcciones."
+
+#: C/contacts-usage-edit-contact.page:20(title)
+msgid "Editing a Contact"
+msgstr "Editar un contacto"
+
+#: C/contacts-usage-edit-contact.page:22(p)
+msgid ""
+"If you want to change a contact that already exists in your address books,"
+msgstr ""
+"Si quiere editar un contacto que ya existe en su libreta de direcciones,"
+
+#: C/contacts-usage-edit-contact.page:25(p)
+msgid ""
+"Double-click on the contact that you want to edit in the list of contacts, "
+"or select the contact and press <key>Enter</key>."
+msgstr ""
+"Pulse dos veces sobre el contacto que quiere editar en la lista de "
+"contactos, o seleccione el contacto y pulse <key>Intro</key>."
+
+#: C/contacts-usage-edit-contact.page:26(p)
+msgid "Edit the contact information."
+msgstr "Edite la información del contacto."
+
+#: C/contacts-usage-delete-contact.page:5(desc)
+msgid "Deleting a contact from your address book."
+msgstr "Eliminar un contacto de su libreta de direcciones."
+
+#: C/contacts-usage-delete-contact.page:20(title)
+msgid "Deleting a Contact"
+msgstr "Eliminar un contacto"
+
+#: C/contacts-usage-delete-contact.page:22(p)
+msgid ""
+"If you want to delete a contact in your address books, right-click on the "
+"contact and select <gui>Delete</gui>, or click on the contact and click "
+"<gui>Delete</gui> in the tool bar or press <keyseq><key>Ctrl</key><key>D</"
+"key></keyseq>, or click <guiseq><gui>Edit</gui><gui>Delete Contact</gui></"
+"guiseq>."
+msgstr ""
+"Si quiere eliminar un contacto de sus libretas de direcciones, pulse con el "
+"botón derecho y elija <gui>Eliminar</gui>, pulse sobre el contacto y elija "
+"<gui>Eliminar</gui> en la barra de herramientas, pulse <keyseq><key>Ctrl</"
+"key><key>D</key></keyseq>, o pulse <guiseq><gui>Editar</gui><gui>Eliminar "
+"contacto</gui></guiseq>."
+
+#: C/contacts-usage-add-contact.page:5(desc)
+msgid "Adding a contact to your address book."
+msgstr "Añadir un contacto a su libreta de direcciones."
+
+#: C/contacts-usage-add-contact.page:20(title)
+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>."
+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</"
+"key><key>Ctrl</key><key>C</key></keyseq>."
+
+#: C/contacts-usage-add-contact.page:25(p)
+msgid "Enter the contact information. Note that there are several tabs."
+msgstr ""
+"Introduzca la información del contacto. Note que existen diversas pestañas."
+
+#: C/contacts-usage-add-contact.page:26(p)
+msgid ""
+"You can add a photograph to the contact by clicking the large field (showing "
+"a stylized person) next to <gui>Full Name</gui> and <gui>Categories</gui>."
+msgstr ""
+"Puede añadir una fotografía del contacto pulsando en el campo grande (que "
+"muestra una persona estilizada) junto a <gui>Nombre completo</gui> y "
+"<gui>Categorías</gui>."
+
+#: C/contacts-usage-add-contact.page:31(title)
+msgid "Contact Quick-Add from the Email Window"
+msgstr "Añadir contacto rápidamente desde la ventana Correo electrónico"
+
+#: C/contacts-usage-add-contact.page:33(p)
+msgid "You can also add a contact directly from an email."
+msgstr ""
+"También puede añadir un contacto directamente desde un correo electrónico."
+
+#: C/contacts-usage-add-contact.page:35(p)
+msgid "Right-click on the email address in the message header."
+msgstr ""
+"Pulse con el botón derecho en la dirección de correo electrónico en la "
+"cabecera del mensaje."
+
+#: C/contacts-usage-add-contact.page:36(p)
+msgid "Select <gui>Add to Address Book...</gui>."
+msgstr "Seleccione <gui>Añadir a la libreta de direcciones…</gui>."
+
+#: C/contacts-usage-add-contact.page:37(p)
+msgid ""
+"Either press <gui style=\"button\">Edit Full</gui> to bring up the full "
+"<gui>Contact Editor</gui>, or click <gui style=\"button\">OK</gui> to "
+"directly add the contact to the chosen address book."
+msgstr ""
+"Pulse <gui style=\"button\">Editar todo</gui> para mostrar el <gui>Editor de "
+"contactos</gui> completo o pulse <gui style=\"button\">Aceptar</gui> para "
+"añadir directamente el contacto a la libreta seleccionada."
+
+#: C/contacts-searching.page:5(desc)
+msgid "Searching contacts."
+msgstr "Buscar contactos."
+
+#: C/contacts-searching.page:28(title)
+msgid "Searching Contacts"
+msgstr "Buscar contactos"
+
+#: C/contacts-searching.page:31(p)
+msgid ""
+"In the Calendar view, you can quickly search for contacts either by category "
+"or by contact's info."
+msgstr ""
+"En la vista de Calendario puede buscar rápidamente los contactos tanto por "
+"categoría o por la información del contacto."
+
+#: C/contacts-searching.page:32(p)
+msgid "Searching by contact's info:"
+msgstr "Buscar por la información del contacto:"
+
+#: C/contacts-organizing.page:5(desc)
+msgid "On address books, searching, contact lists, and categories."
+msgstr ""
+"Acerca de libretas de direcciones, buscar, listas de contactos y categorías."
+
+#: C/contacts-organizing.page:21(title)
+msgid "Sorting, organizing and grouping contacts"
+msgstr "Ordenar, orgranizar y agrupar contactos"
+
+#: C/contacts-organizing.page:23(p)
+msgid ""
+"There are several ways how to organize your contacts. You can use several "
+"addressbooks and categories, and for conveniently sending messages to a "
+"group of people contact lists are available."
+msgstr ""
+"Existen diversas formas de ornagizar sus contactos. Puede usar diversas "
+"libretas de direcciones y categorías y, para enviar correctamente correos a "
+"un grupo de personas, también están disponibles las listas de contactos."
+
+#: C/contacts-local.page:5(desc)
+msgid "Adding another local address book."
+msgstr "Añadir otra libreta de direcciones local."
+
+#: C/contacts-local.page:20(title)
+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)
+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/contacts-local.page:24(p) C/contacts-ldap.page:31(p)
+#: C/contacts-google.page:25(p)
+msgid ""
+"Click <guiseq><gui>File</gui><gui>New</gui><gui>Address Book</gui></guiseq>."
+msgstr ""
+"Pulse <guiseq><gui>Archivo</gui><gui>Nuevo</gui><gui>Libreta de direcciones</"
+"gui></guiseq>."
+
+#: C/contacts-local.page:30(p) C/contacts-google.page:34(p)
+msgid ""
+"The address book will be added to the list of address books in Evolution."
+msgstr ""
+"La libreta de direcciones se añadirá a la lista de libretas de direcciones "
+"en Evolution."
+
+#: 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."
+
+#: C/contacts-ldap.page:23(title)
+msgid "Adding LDAP access"
+msgstr "Añadir acceso LDAP"
+
+#: C/contacts-ldap.page:25(p)
+msgid ""
+"The LDAP protocol was created to let users share contact information over a "
+"network by sharing access to a central directory. LDAP allows a company to "
+"maintain a shared set of contact information. Many companies keep a common "
+"LDAP address book for all their employees or for client contacts."
+msgstr ""
+"El protocolo LDAP se creó para permitir a los usuarios compartir información "
+"de contactos en red, mediante accesos compartidos a un directorio central. "
+"LDAP permite a una empresa mantener un conjunto de información de contactos. "
+"Muchas empresas mantienen una libreta de direcciones LDAP para todos sus "
+"empleados o para sus clientes."
+
+#: C/contacts-ldap.page:28(title)
+msgid "Adding an LDAP address book"
+msgstr "Añadir una libreta de direcciones LDAP"
+
+#: C/contacts-ldap.page:32(p)
+msgid ""
+"In the <gui>General</gui> tab, select the type <gui>On LDAP Servers</gui>."
+msgstr ""
+"En la pestaña <gui>General</gui> seleccione el tipo de <gui>En servidores "
+"LDAP</gui>"
+
+#: C/contacts-ldap.page:34(p)
+msgid ""
+"Enter the address of the server, the port number (the default number is 389) "
+"and whether you want to connect securely."
+msgstr ""
+"Introduzca la dirección del servidor, el número del puerto (el número "
+"predeterminado es 3899 y si quiere conectar de forma segura."
+
+#: C/contacts-ldap.page:35(p)
+msgid "Define the login method and your user name."
+msgstr "Defina el método de registro y su nombre de usuario."
+
+#: C/contacts-ldap.page:37(p)
+msgid "In the <gui>Details</gui> tab you can define the following settings:"
+msgstr ""
+"En la pestaña <gui>Detalles</gui> puede definir los siguientes ajustes:"
+
+#: C/contacts-ldap.page:39(p)
+msgid ""
+"Search Base: The search base is the starting point for a directory search. "
+"Contact your system administrator for information about the correct settings."
+msgstr ""
+"Base de búsqueda: la base de búsqueda es el punto de partida usado para las "
+"búsquedas en directorios. Consulte a su administrador para obtener "
+"información acerca de la configuración adecuada."
+
+#: C/contacts-ldap.page:40(p)
+msgid ""
+"Search Scope: The search scope is the breadth of a given search. The "
+"following options are available:"
+msgstr ""
+"Rango de búsqueda: es la extensión de una búsqueda dada. Están disponibles "
+"las siguientes:"
+
+#: C/contacts-ldap.page:42(p)
+msgid "One: Searches the Search Base and one entry below it."
+msgstr "Una: busca dentro de la raíz y un nivel de subdirectorios debajo."
+
+#: C/contacts-ldap.page:43(p)
+msgid "Sub: Searches the Search Base and all entries below it."
+msgstr ""
+"Sub: busca dentro de la búsqueda base y en todas las entradas bajo ésta."
+
+#: C/contacts-ldap.page:46(p)
+msgid ""
+"Search Filter: The search filter can be set here for all the LDAP queries. "
+"For example:"
+msgstr ""
+"Filtro de búsqueda: se puede establecer aquí el filtro de búsqueda para "
+"todas las consultas LDAP. Por ejemplo:"
+
+#: C/contacts-ldap.page:48(p)
+msgid "<code>ObjectClass=*</code>: Lists all the objects from the server."
+msgstr "<code>ObjectClass=*</code>: lista todos los objetos del servidor."
+
+#: C/contacts-ldap.page:49(p)
+msgid "<code>ObjectClass=User</code>: Lists only the users."
+msgstr "<code>ObjectClass=User</code>: solo lista los usuarios."
+
+#: C/contacts-ldap.page:50(p)
+msgid ""
+"<code>Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))</code>: "
+"Retrieves the User and Contact List objects."
+msgstr ""
+"<code>Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))</code>: obtiene "
+"los objetos de listas de usuario y contactos."
+
+#: C/contacts-ldap.page:51(p)
+msgid ""
+"<code>(&amp;(mail=*)(ObjectClass=*))</code>: Lists the objects associated "
+"with the email addresses."
+msgstr ""
+"<code>(&amp;(mail=*)(ObjectClass=*))</code>: lista los objetos asociados con "
+"las direcciones de correo electrónico."
+
+#: C/contacts-ldap.page:54(p)
+msgid ""
+"Timeout (minutes): The maximum time Evolution attempts to download data from "
+"the server before giving up."
+msgstr ""
+"Tiempo de expiración (minutos): es el tiempo de espera máximo de Evolution "
+"para descargar los datos del servidor, antes de abandonar."
+
+#: C/contacts-ldap.page:55(p)
+msgid ""
+"Download Limit: The maximum number of results for a given search. Most "
+"servers refuse to send more than 500 contacts, but you can set the number "
+"lower if you want to shorten downloads for very broad searches."
+msgstr ""
+"Límite de descarga: el número máximo de resultados para una búsqueda dada. "
+"Muchos servidores no aceptan enviar más de 500 respuestas, pero puede fijar "
+"un número inferior para reducir el volumen de descargas, en caso de "
+"búsquedas muy amplias."
+
+#: C/contacts-ldap.page:60(p)
+msgid "If you are unsure about some settings, ask your system administrator."
+msgstr ""
+"Si no está seguro acerca de algunos ajutes, pregunta al administrador de su "
+"sistema."
+
+#: C/contacts-ldap.page:65(title)
+msgid "Differences to local address books"
+msgstr "Diferencias con las libretas de direcciones locales"
+
+#: C/contacts-ldap.page:67(p)
+msgid ""
+"LDAP address books work like local address books on your computer, with the "
+"following exceptions:"
+msgstr ""
+"Las libretas de direcciones LDAP funcionan igual que las libretas de "
+"direcciones locales en su equipo, con las siguientes excepciones:"
+
+#: C/contacts-ldap.page:69(p)
+msgid ""
+"Network folders are only available when you are connected to the network. If "
+"you use a laptop or have a modem connection, you might want to copy or cache "
+"some of the network directory. You do this by dragging and dropping your "
+"desired contacts into the local address books."
+msgstr ""
+"Las carpetas de red sólo están disponibles cuando se conecta a la red. Si "
+"usa un equipo portátil o una conexión telefónica, conviene hacer una copia "
+"de la carpeta de red o colocar en caché algún directorio de red. Para ello, "
+"arrastre los contactos deseados dentro de la lista de contactos local."
+
+#: C/contacts-ldap.page:70(p)
+msgid ""
+"You can also mark the network folder for offline usage. To mark the folder, "
+"right-click the folder, click Properties and select Copy Folder Content "
+"Locally for Offline Operation."
+msgstr ""
+"También puede marcar la carpeta de red para su uso desconectado. Para marcar "
+"la carpeta, pulse con el botón derecho sobre la carpeta, después pulse "
+"Propiedades y seleccione Copiar el contenido de la carpeta localmente para "
+"operación desconectada."
+
+#: C/contacts-ldap.page:71(p)
+msgid ""
+"To prevent excess network traffic, Evolution does not normally load data "
+"from the LDAP server upon opening."
+msgstr ""
+"Para prevenir exceso de tráfico en la red, Evolution no descarga los datos "
+"del servidor LDAP de una forma normal al iniciarse."
+
+#: C/contacts-ldap.page:72(p)
+msgid ""
+"Depending on your server settings, you might not be able to edit all the "
+"fields in a contact stored on an LDAP server. Some servers prohibit some or "
+"all changes, and others use a smaller set of fields than Evolution allows. "
+"Check with your system administrator if you need different settings."
+msgstr ""
+"Dependiendo de la configuración de su servidor, quizá no pueda editar todos "
+"los campos de un contacto almacenado en un servidor LDAP. Algunos servidores "
+"prohíben algunas modificaciones y otros usan una menor cantidad de campos de "
+"la que Evolution proporciona. Compruebe con su administrador de su sistema "
+"si necesita una configuración diferente."
+
+#: C/contacts-google.page:5(desc)
+msgid "Use the online address book of your Google account."
+msgstr "USar la libreta de direcciones en línea de su cuenta de Google."
+
+#: C/contacts-google.page:21(title)
+msgid "Using a Google addressbook"
+msgstr "Usar una libreta de direcciones de Google"
+
+#: C/contacts-google.page:23(p)
+msgid "To add such an address book to Evolution, perform the following steps:"
+msgstr ""
+"Para añadir una libreta de direcciones a Evolution, realice los siguientes "
+"pasos:"
+
+#: C/contacts-google.page:26(p) C/calendar-google.page:29(p)
+msgid "Select the type <gui>Google</gui>."
+msgstr "Seleccione el tipo <gui>Google</gui>."
+
+#: 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."
+
+#: C/contacts-autocompletion.page:5(desc)
+msgid ""
+"Autocompletion of names and email addresses entered in the mail composer."
+msgstr ""
+"Autocompletado de nombres y direcciones de correo introducidas en el editor "
+"de correo."
+
+#: C/contacts-autocompletion.page:27(title)
+msgid "Autocompletion of mail recipients"
+msgstr "Autocompletado de destinatarios de correo"
+
+#: C/contacts-autocompletion.page:29(p)
+msgid ""
+"You can enter the first three letters of names and email addresses in the "
+"recipients text field and Evolution will present you with a list of matches "
+"from your address books."
+msgstr ""
+"Puede introducir las primeras tres letras de nombres y direcciones de "
+"correos electrónicos en el campo de destinatarios del correo y Evolution le "
+"presentará una lista con las coincidencias de sus libretas de direcciones."
+
+#: C/contacts-autocompletion.page:30(p)
+msgid ""
+"To enable autocompletion, go to <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui><gui>Contacts</gui><gui>Autocompletion</gui></guiseq> and choose the "
+"address books from the list that Evolution should look in for matches."
+msgstr ""
+"Para activar el autocompletado vaya a <guiseq><gui>Editar</"
+"gui><gui>Preferencias</gui><gui>Contactos</gui><gui>Autocompletado</gui></"
+"guiseq> y elija las libretas de direcciones de la lista desde las que "
+"Evolution debería buscar coincidencias."
+
+#: C/contacts-autocompletion.page:32(p)
+msgid ""
+"Select <gui>Always show address of the autocompleted contact</gui> to also "
+"show the email address along with the name. This can be helpful to "
+"distinguish if a contact has several email addresses."
+msgstr ""
+"Seleccione la casilla de verificación <gui>Siempre mostrar la dirección del "
+"contacto autocompletado</gui> para mostrar la dirección del correo-e junto "
+"con el nombre de usuario. Esto puede ser útil para distinguir si un contacto "
+"tiene varias direcciones de correo-e."
+
+#: C/contacts-autocompletion.page:34(p)
+msgid ""
+"Alternately, you can click the <gui>To:</gui>, <gui>Cc:</gui>, or <gui>Bcc:</"
+"gui> buttons to get a list of the email addresses in your contacts. Select "
+"addresses and click the arrow buttons to move them into the appropriate "
+"address columns."
+msgstr ""
+"Alternativamente, puede pulsar los botones <gui>Para:</gui>, <gui>Cc:</gui>, "
+"<gui>Cco:</gui>, para obtener una lista de las direcciones de correo-e en su "
+"lista de contactos. Seleccione las direcciones y pulse las flechas para "
+"moverlas entre las columnas de direcciones apropiadas."
+
+#: C/contacts-add-automatically.page:5(desc)
+msgid ""
+"Automatically add senders of mail that you have received to your contacts."
+msgstr ""
+"Añadir automáticamente a sus contactos los remitentes de los correos que ha "
+"recibido."
+
+#: C/contacts-add-automatically.page:24(title)
+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."
+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><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 "
+"contactos, en el campo desplegable de debajo."
+
+#: C/contacts-add-automatically.page:28(p)
+msgid ""
+"From now on, contacts will be automatically created for senders of received "
+"mail when you reply to that mail."
+msgstr ""
+"Desde ahora se crearán automáticamente los contactos para los remitentes de "
+"correo recibido cuando responda a esos correos."
+
+#: C/change-switcher-appearance.page:5(desc)
+msgid "Changing the display of the window buttons in the lower left corner."
+msgstr ""
+"Cambiar la visualización de los botones de la ventana en la esquina inferior "
+"izquierda."
+
+#: C/change-switcher-appearance.page:19(title)
+msgid "Changing the Switcher appearance"
+msgstr "Cambiar la apariencia del selector"
+
+#: C/change-switcher-appearance.page:21(p)
+msgid ""
+"The display of the window buttons in the lower left corner (Mail, Contacts, "
+"Calendar, Tasks and Memos) can be changed via <guiseq><gui>View</"
+"gui><gui>Switcher Appearance</gui></guiseq>. This can be helpful if you have "
+"a small display. You can also completely hide them."
+msgstr ""
+"Se puede cambiar el mostrado de los botones en la esquina inferior izquierda "
+"(Correo, Contactos, Calendario, Tareas y Notas) en <guiseq><gui>Ver</"
+"gui><gui>Apariencia del selector<gui></guiseq>. Puede ser útil si tiene una "
+"pantalla pequeña. También puede ocultarlos completamente."
+
+#: C/change-switcher-appearance.page:22(p)
+msgid "The available options are:"
+msgstr "Las opciones disponibles son:"
+
+#: C/change-switcher-appearance.page:24(p)
+msgid "Icons and Text"
+msgstr "Iconos y texto"
+
+#: C/change-switcher-appearance.page:27(p)
+msgid "Icons Only"
+msgstr "Sólo iconos"
+
+#: C/change-switcher-appearance.page:30(p)
+msgid "Text Only"
+msgstr "Sólo texto"
+
+#: C/change-switcher-appearance.page:33(p)
+msgid "Toolbar Style"
+msgstr "Estilo de la barra de herramientas"
+
+#: C/change-switcher-appearance.page:36(p)
+msgid "Show Buttons"
+msgstr "Mostrar botones"
+
+#: C/calendar-webdav.page:5(desc)
+msgid "Using an online Webcal/WebDAV calendar."
+msgstr "Usar un calendario en línea Webcal-WebDAV."
+
+#: C/calendar-webdav.page:20(title)
+msgid "Using a WebDAV calendar"
+msgstr "Usar un calendario WebDAV"
+
+#: C/calendar-webdav.page:22(p) C/calendar-weather.page:22(p)
+msgid "Calendars of this type are read-only."
+msgstr "Calendarios de este tipo son de solo lectura."
+
+#: C/calendar-webdav.page:24(p) C/calendar-weather.page:24(p)
+#: C/calendar-google.page:26(p) C/calendar-caldav.page:25(p)
+msgid "To add such a calendar to Evolution, perform the following steps:"
+msgstr "Para añadir tal calendario a Evolution, realice los siguientes pasos:"
+
+#: C/calendar-webdav.page:26(p) C/calendar-weather.page:26(p)
+#: C/calendar-local.page:24(p) C/calendar-google.page:28(p)
+#: C/calendar-caldav.page:27(p)
+msgid ""
+"Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>."
+msgstr ""
+"Pulse <guiseq><gui>Archivo</gui><gui>Nuevo</gui><gui>Calendario</gui></"
+"guiseq>."
+
+#: C/calendar-webdav.page:31(p) C/calendar-caldav.page:32(p)
+msgid "Enter the address of the calendar in the <gui>URL</gui> field."
+msgstr "Introduzca la dirección del calendario en el campo <gui>URL</gui>."
+
+#: C/calendar-webdav.page:37(p) C/calendar-weather.page:37(p)
+#: C/calendar-local.page:31(p) C/calendar-google.page:38(p)
+#: C/calendar-caldav.page:38(p)
+msgid "The calendar will be added to the list of calendars in Evolution."
+msgstr "Se añadirá el calendario a la lista de calendarios de Evolution."
+
+#: C/calendar-weather.page:5(desc)
+msgid "Display the weather in the calendar."
+msgstr "Mostrar la meteorología en el calendario."
+
+#: C/calendar-weather.page:20(title)
+msgid "Using a weather calendar"
+msgstr "Usar un calendario meteorológico"
+
+#: C/calendar-weather.page:27(p)
+msgid "Select the type <gui>Weather</gui>."
+msgstr "Seleccione el tipo <gui>Meteorología</gui>."
+
+#: C/calendar-weather.page:31(p)
+msgid "Choose a location by selecting continent, country and city."
+msgstr "Elija una ubicación seleccionando por continente, país y ciudad."
+
+#: C/calendar-weather.page:33(p)
+msgid "Choose the temperature unit."
+msgstr "Elija la unidad para la temperatura."
+
+#: C/calendar-using-several-calendars.page:5(desc)
+msgid "Adding and using more than one calendar and different types."
+msgstr "Añadir y usar más de un calendario y diferentes tipos de calendarios."
+
+#: C/calendar-using-several-calendars.page:23(title)
+msgid "Using several calendars"
+msgstr "Usar varios calendarios"
+
+#: C/calendar-using-several-calendars.page:25(p)
+msgid ""
+"You can have multiple calendars and overlay them one over the next. For "
+"example, you might have a schedule of events for work, one for home, and one "
+"for your favorite sports team. The side bar lists those calendars, and you "
+"can select or deselect the boxes next to them to show and hide the "
+"appointments in your calendar view. By hiding and showing different sets of "
+"appointments, you can be sure to avoid conflicts, while keeping a minimum of "
+"clutter in your view."
+msgstr ""
+"Puede mantener múltiples calendarios y solaparlos entre ellos. Por ejemplo, "
+"puede tener un horario de acontecimientos del trabajo, uno para casa y uno "
+"para su equipo de deporte favorito. La barra lateral lista esos calendarios "
+"y puede seleccionar o deseleccionar las cajas junto a ellos para mostrar y "
+"ocultar las citas en la vista de calendario. Ocultando y mostrando "
+"diferentes juegos de citas, puede asegurarse de evitar conflictos, "
+"reduciendo la carga en la vista."
+
+#: C/calendar-using-several-calendars.page:27(p)
+msgid "Appointments for each calendar appear as a different color."
+msgstr "Las citas para cada calendario aparecen con un color diferente."
+
+#: C/calendar-using-several-calendars.page:29(p)
+msgid ""
+"You can also use calendars that are not on your computer, such as on the "
+"internet or in a local network."
+msgstr ""
+"También puede usar calendarios que no estén en su equipo, tales como "
+"calendarios en Internet o en una red local."
+
+#: C/calendar-using-several-calendars.page:31(p)
+msgid ""
+"For example, the <link href=\"http://icalshare.com\">icalshare.com website</"
+"link> has an extensive list of shared online calendars, including national "
+"and religious holidays, phases of the moon, sports, and local and regional "
+"events."
+msgstr ""
+"Por ejemplo, la <ulink url=\"http://icalshare.com\">página web de icalshare."
+"com</ulink> tiene una extensa lista de calendarios compartidos en línea, "
+"incluyendo fiestas nacionales y religiosas, fases de la luna, deportes y "
+"acontecimientos locales y regionales."
+
+#: C/calendar-usage.page:5(desc)
+msgid "On adding, editing, and deleting appointments."
+msgstr "Acerca de añadir, editar y eliminar citas."
+
+#: C/calendar-usage.page:21(title)
+msgid "Add, Edit, and Delete Appointments"
+msgstr "Añadir, editar y eliminar citas"
+
+#: C/calendar-usage-edit-appointment.page:5(desc)
+msgid "Editing in appointment in your calendar."
+msgstr "Editar una cita en su calendario."
+
+#: C/calendar-usage-edit-appointment.page:20(title)
+msgid "Editing an Appointment"
+msgstr "Editar una cita"
+
+#: C/calendar-usage-edit-appointment.page:22(p)
+msgid ""
+"If you want to change an appointment that already exists in your calendars,"
+msgstr "Si quiere cambiar una cita que ya existe en sus calendarios,"
+
+#: C/calendar-usage-edit-appointment.page:25(p)
+msgid "Double-click on the appointment that you want to edit in the calendar."
+msgstr "Pulse dos veces en la cita que quiera editar en el calendario."
+
+#: C/calendar-usage-edit-appointment.page:26(p)
+msgid ""
+"Edit the appointment (see <link xref=\"calendar-usage-add-appointment"
+"\">Adding an Appointment</link> for the list of available options)."
+msgstr ""
+"Edite la cita (consulte <link xref=\"calendar-usage-add-appointment\">Añadir "
+"una cita</link> para la lista de opciones disponibles)."
+
+#: C/calendar-usage-delete-appointment.page:5(desc)
+msgid "Deleting in appointment in your calendar."
+msgstr "Eliminar una cita de su calendario."
+
+#: C/calendar-usage-delete-appointment.page:20(title)
+msgid "Deleting an Appointment"
+msgstr "Eliminar una cita"
+
+#: C/calendar-usage-delete-appointment.page:22(p)
+msgid ""
+"If you want to delete an appointment in your calendars, right-click on the "
+"appointment in the calendar and select <gui>Delete Appointment</gui>, or "
+"click on the appointment and click <gui>Delete</gui> in the tool bar or "
+"press <keyseq><key>Ctrl</key><key>D</key></keyseq>. If you are in the <link "
+"xref=\"calendar-layout-views\">list view</link> you can also use "
+"<guiseq><gui>Edit</gui><gui>Delete Appointment</gui></guiseq>."
+msgstr ""
+"Si quiere eliminar una cita de sus calendarios, pulse con el botón derecho "
+"sobre la cita en el calendario y seleccione <gui>Eliminar cita</gui>, pulse "
+"sobre la cita y pulse <gui>Eliminar</gui> en la barra de herramientas, o "
+"pulse <keyseq><key>Ctrl</key><key>D</key></keyseq>. Si está en la <link xref="
+"\"calendar-layout-views\">vista de lista</link> también puede usar "
+"<guiseq><gui>Editar</gui><gui>Eliminar cita</gui></guiseq>."
+
+#: C/calendar-usage-add-appointment.page:5(desc)
+msgid "Adding an appointment."
+msgstr "Añadir una cita."
+
+#: C/calendar-usage-add-appointment.page:20(title)
+msgid "Adding an Appointment"
+msgstr "Añadir una cita"
+
+#: C/calendar-usage-add-appointment.page:23(p)
+msgid ""
+"Click <guiseq><gui>File</gui><gui>New</gui><gui>Appointment</gui></guiseq>, "
+"or double-click in a blank space in the calendar to open the Appointment "
+"dialog. The particular time on the calendar view against which you have "
+"double clicked on will be suggested for the new appointment. You can also "
+"directly write in the calendar and then adjust the duration by dragging it "
+"with the mouse."
+msgstr ""
+"Pulse <guiseq><gui>Archivo</gui><gui>Nuevo</gui><gui>Cita</gui></guiseq> o "
+"pulse dos veces en un espacio vacío en el calendario para abrir el cuadro de "
+"diálogo Cita. Se creará la cita para esa hora en particular en la vista del "
+"calendario sobre la que haya pulsado dos veces. También puede escribir "
+"directamente en el calendario y después ajustar la duración arrastrando con "
+"el ratón."
+
+#: C/calendar-usage-add-appointment.page:24(p)
+msgid "If you use the Appointment dialog:"
+msgstr "Si usa el diálogo de Cita:"
+
+#: C/calendar-usage-add-appointment.page:25(p)
+#: C/calendar-meetings-sending-invitation.page:33(p)
+msgid "Select a calendar in the <gui>Calendar</gui> drop-down list."
+msgstr ""
+"Seleccione un calendario en la lista desplegable <gui>Calendario</gui>."
+
+#: C/calendar-usage-add-appointment.page:26(p)
+#: C/calendar-meetings-sending-invitation.page:36(p)
+msgid "Enter a brief summary in the <gui>Summary</gui> field."
+msgstr "Escriba un breve resumen en el campo <gui>Resumen</gui>."
+
+#: C/calendar-usage-add-appointment.page:27(p)
+#: C/calendar-meetings-sending-invitation.page:37(p)
+msgid "(Optional) Type a location in the <gui>Location</gui> field."
+msgstr "(Opcional) Escriba una ubicación en el campo <gui>Lugar</gui>."
+
+#: C/calendar-usage-add-appointment.page:28(p)
+#: C/calendar-meetings-sending-invitation.page:38(p)
+msgid ""
+"To select this event as an all day event, click <guiseq><gui>Options</"
+"gui><gui>All Day Event</gui></guiseq>, or click the <gui>All Day Event</gui> "
+"button on the toolbar."
+msgstr ""
+"Para seleccionar esta cita como un Acontecimiento para todo el día, pulse "
+"<guiseq><gui>Opciones</gui><gui>Acontecimiento para todo el día</gui></"
+"guiseq> o pulse el botón <gui>Acontecimiento para todo el día</gui> en la "
+"barra de herramientas."
+
+#: C/calendar-usage-add-appointment.page:29(p)
+#: C/calendar-meetings-sending-invitation.page:39(p)
+msgid "Select the date and time."
+msgstr "Seleccione la fecha y la hora."
+
+#: C/calendar-usage-add-appointment.page:30(p)
+#: C/calendar-meetings-sending-invitation.page:40(p)
+msgid ""
+"If the event is not an all day event, select either <gui>For</gui> to "
+"specify the duration, or select <gui>Until</gui> to specify the ending time "
+"of the event."
+msgstr ""
+"Si el evento no dura todo el día, seleccione <gui>Durante</gui> para "
+"especificar la duración o <gui>Hasta</gui> para especificar la finalización "
+"del evento."
+
+#: C/calendar-usage-add-appointment.page:31(p)
+#: C/calendar-meetings-sending-invitation.page:41(p)
+msgid "(Optional) Enter a description in the <gui>Description</gui> field."
+msgstr "(Opcional) Escriba una descripción en el campo <gui>Descripción</gui>."
+
+#: C/calendar-usage-add-appointment.page:32(p)
+msgid ""
+"To show the time as <link xref=\"calendar-free-busy\">busy</link> to others, "
+"click <guiseq><gui>Options</gui><gui>Show Time as Busy</gui></guiseq>."
+msgstr ""
+"Para mostrar la hora como <link xref=\"calendar-free-busy\">ocupalda</link> "
+"pulse <guiseq><gui>Opciones</gui><gui>Mostrar hora como ocupada</gui></"
+"guiseq>."
+
+#: C/calendar-usage-add-appointment.page:34(p)
+#: C/calendar-meetings-sending-invitation.page:48(p)
+msgid ""
+"You can also define a <link xref=\"calendar-timezones\">time zone</link>, a "
+"<link xref=\"using-categories\">category</link>, a <link xref=\"calendar-"
+"alarms-and-reminders\">reminder</link>, a <link xref=\"calendar-recurrence"
+"\">recurrence</link>, or a <link xref=\"calendar-classifications"
+"\">classification</link> for the event, or add an attachment."
+msgstr ""
+"También puede definir una <link xref=\"calendar-timezones\">zona horaria</"
+"link>, una <link xref=\"using-categories\">categoría</link>, un <link xref="
+"\"calendar-alarms-and-reminders\">recordatorio</link>, una <link xref="
+"\"calendar-recurrence\">repetición</link> o una <link xref=\"calendar-"
+"classifications\">clasificación</link> para el acontecimiento o añadir un "
+"adjunto."
+
+#: C/calendar-timezones.page:5(desc)
+msgid "Using time zones in the calendar."
+msgstr "Usar zonas horarias en el calendario."
+
+#: C/calendar-timezones.page:23(title)
+msgid "Using time zones"
+msgstr "Usar zonas horarias"
+
+#: C/calendar-timezones.page:25(p)
+msgid "Evolution supports using multiple time zones."
+msgstr "Evolution soporta el uso de varias zonas horarias."
+
+#: C/calendar-timezones.page:28(title)
+msgid "Setting your global timezone(s)"
+msgstr "Establecer sus zonas horarias globales"
+
+#: C/calendar-timezones.page:30(p)
+msgid ""
+"By default Evolution uses the system-wide time zone. This can be changed "
+"under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</"
+"gui><gui>General</gui><gui>Time</gui><gui>Time zone</gui></guiseq>."
+msgstr ""
+"De forma predeterminada Evolution usa la hora del sistema. Se puede cambiar "
+"bajo <guiseq><gui>Editar</gui><gui>Preferencias</gui><gui>Calendario y "
+"tareas</gui><gui>General</gui><gui>Hora</gui><gui>Zona horaria</gui></"
+"guiseq>."
+
+#: C/calendar-timezones.page:32(p)
+msgid ""
+"If you deal a lot with people in another specific time zone you can display "
+"that second time zone in the day view of the calendar. You can set a second "
+"time zone under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar "
+"and Tasks</gui><gui>General</gui><gui>Time</gui><gui>Second zone</gui></"
+"guiseq>."
+msgstr ""
+"Si trata con mucha gente en otro huso horario específico puede mostrar ese "
+"segundo huso horario en la vista de día de su calendario. Puede configurar "
+"una segunda zona horaria bajo <guiseq><gui>Editar</gui><gui>Preferencias</"
+"gui><gui>Calendario y tareas</gui><gui>General</gui><gui>Hora</gui><gui>Zona "
+"secundaria</gui></guiseq>."
+
+#: C/calendar-timezones.page:36(title)
+msgid "Setting a timezone for an appointment"
+msgstr "Configurar una zona horaria para una cita"
+
+#: C/calendar-timezones.page:38(p)
+msgid ""
+"You can also configure time zone information specific to each appointment. "
+"To do that, <link xref=\"calendar-usage\">add a new or edit an existing "
+"appointment</link> and click the globe button to customize the time zone "
+"that the time exists in. For example, if you live in New York but have a "
+"telephone meeting set for noon with someone in California, you need to make "
+"sure that your schedules are coordinated. Setting time zones on a per-"
+"appointment basis helps avoid that potential confusion."
+msgstr ""
+"También puede configurar información específica de la zona horaria para cada "
+"cita. Para ello <link xref=\"calendar-usage\">añada una cita nueva o edite "
+"una ya existente</link> y pulse sobre el botón del globo terráqueo para "
+"personalizar la zona horaria existente. Por ejemplo, si vive en Madrid, "
+"España, y tiene una reunión telefónica para la tarde con alguien en "
+"California, debe asegurarse que las citas están coordinadas. Usar las zonas "
+"horarias adecuadas en cada cita ayuda a evitar esa confusión potencial."
+
+#: C/calendar-sharing-information.page:5(desc)
+msgid ""
+"Make your information (appointments and free/busy times) available to others."
+msgstr ""
+"Hacer que su información (citas y disponibilidad) esté disponible para otros."
+
+#: C/calendar-sharing-information.page:20(title)
+msgid "Sharing your calendar information"
+msgstr "Compartir la información de su calendario"
+
+#: C/calendar-searching.page:5(desc)
+msgid "Searching appointments and meetings."
+msgstr "Buscar citas y reuniones."
+
+#: C/calendar-searching.page:28(title)
+msgid "Searching for Calendar Items"
+msgstr "Buscar elementos del calendario"
+
+#: C/calendar-searching.page:31(p)
+msgid ""
+"In the Calendar view, you can quickly search for appointments and meetings "
+"either by summary or by category."
+msgstr ""
+"En la vista del Calendario puede buscar citas y reuniones rápidamente por su "
+"resumen o categoría."
+
+#: C/calendar-recurrence.page:5(desc)
+msgid "Repeating appointments."
+msgstr "Citas recurrentes."
+
+#: C/calendar-recurrence.page:23(title)
+msgid "Using Recurrence"
+msgstr "Repetición"
+
+#: C/calendar-recurrence.page:25(p)
+msgid ""
+"If you have an appointment that takes place regularly, you can define its "
+"recurrence by clicking the <gui>Recurrence</gui> button in the "
+"<gui>Appointment Editor</gui> or by clicking <guiseq><gui>Options</"
+"gui><gui>Recurrence</gui></guiseq>. You can then choose a time and date when "
+"the appointment stops recurring, and, under <gui>Exceptions</gui>, pick "
+"individual days when the appointment does not recur. Make your selections "
+"from left to right, and you form a sentence: \"Every two weeks on Monday and "
+"Friday until January 3, 2015\" or \"Every month on the first Friday for 12 "
+"occurrences.\""
+msgstr ""
+"Si tiene una cita que se repite habitualmente puede definir su recurrencia "
+"pulsando el botón <gui>Repetición</gui> en el <gui>Editor de citas</gui> o "
+"pulsando <guiseq><gui>Opciones</gui><gui>Repetición</gui></guiseq>. Puede "
+"elegir una hora y una fecha a la que quiere que la cita deje de ser "
+"periódica y, en la sección <gui>Excepciones</gui>, elegir días individuales "
+"en los que la cita no tendrá lugar. Haga su selección de izquierda a derecha "
+"y podrá construir una frase: «cada dos semanas en lunes y viernes hasta el 3 "
+"de enero de 2015« o «de cada mes el primer viernes en 12 ocasiones»."
+
+#: C/calendar-publishing.page:5(desc)
+msgid "Post your calendar content in public."
+msgstr "Publicar el contenido de sus calendarios en línea."
+
+#: C/calendar-publishing.page:23(title)
+msgid "Calendar Publishing"
+msgstr "Publicar el calendario"
+
+#: C/calendar-publishing.page:24(p)
+msgid ""
+"In order to make one of your calendars available to the public, you can "
+"define calendars to be uploaded to a web server under <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Publishing "
+"Information</gui><gui>Locations</gui><gui style=\"button\">Add</gui></"
+"guiseq>."
+msgstr ""
+"Para poder hacer público uno de sus calendarios debe definir qué calendarios "
+"subir a un servidor web bajo: <guiseq><gui>Editar</gui><gui>Preferencias</"
+"gui><gui>Calendario y tareas</gui><gui>Información de publicación</"
+"gui><gui>Lugares</gui><guiseq>Añadir<gui></guiseq>."
+
+#. This is the location since 3.1.5, see bug https://bugzilla.gnome.org/show_bug.cgi?id=655666
+#: C/calendar-publishing.page:27(p)
+msgid ""
+"You can specify the online location, the frequency of publishing, which "
+"calendar(s) to publish, and authentication information for uploading."
+msgstr ""
+"Puede especificar la ubicación de la publicación, la frecuencia de "
+"publicación, qué calendario o calendarios publicará y cómo qué persona "
+"autenticarse."
+
+#: C/calendar-publishing.page:29(p) C/calendar-free-busy.page:42(p)
+msgid ""
+"You can publish Calendar and Free/Busy information to a WebDAV server, FTP "
+"server, a remote machine through SSH or to any other web server with HTTP "
+"PUT support."
+msgstr ""
+"Puede publicar la información de Disponibilidad y el Calendario a un WebDAV, "
+"servidor FTP o a una máquina remota a traes de SSH u otro servidor web con "
+"soporte HTTP PUT."
+
+#: C/calendar-publishing.page:31(p)
+msgid ""
+"To immediately publish calendar information, click <guiseq><gui>Actions</"
+"gui><gui>Publish Calendar Information</gui></guiseq> in the calendar."
+msgstr ""
+"Para publicar inmediatamente la información del calendario, pulse "
+"<guiseq><gui>Acciones</gui><gui>Publicar información del calendario</gui></"
+"guiseq> en el calendario."
+
+#: C/calendar-organizing.page:5(desc)
+msgid "On using several calendars, searching, and categories."
+msgstr "Sobre usar varios calendarios, búsquedas y categorías."
+
+#: C/calendar-organizing.page:21(title)
+msgid "Sorting and organizing calendars"
+msgstr "Ordenar y orgranizar calendarios"
+
+#: C/calendar-meetings-sending-invitation.page:5(desc)
+msgid "Sending a Meeting Invitation."
+msgstr "Enviar una invitación para reunión."
+
+#: C/calendar-meetings-sending-invitation.page:23(title)
+msgid "Sending a Meeting Invitation"
+msgstr "Enviar una invitación para reunión"
+
+#: C/calendar-meetings-sending-invitation.page:25(p)
+msgid ""
+"When you create a meeting (group appointment), you can specify the attendees "
+"in several categories, such as \"chair\" or \"required\". When you save the "
+"meeting listing, each attendee is sent an email with the meeting "
+"information, which also gives them the option to respond."
+msgstr ""
+"Al crear una reunión o una cita en grupo puede especificar a los asistentes "
+"en varias categorías como «presidencia» o «participante requerido». Cuando "
+"guarde su lista, cada invitado recibirá un mensaje con los datos de la cita "
+"y tendrán la opción de responder."
+
+#: C/calendar-meetings-sending-invitation.page:26(p)
+msgid ""
+"If you do not need to collect attendance information when you're scheduling "
+"an event, and would rather just announce the event, right-click the meeting "
+"and select <gui>Forward as iCalendar</gui>. This opens a new email message "
+"with the event notification attached as an announcement. Recipients can add "
+"the event to their calendars with one click, but it will not automatically "
+"send you email about whether they plan to attend."
+msgstr ""
+"Si no necesita recibir confirmaciones de asistencia al planificar un "
+"acontecimiento y sólo necesita anunciarlo, pulse con el botón derecho sobre "
+"la reunión y seleccione <gui>Reenviar como iCalendar</gui>. Esto abrirá un "
+"nuevo mensaje de correo con una notificación del acontecimiento adjunta. Los "
+"destinatarios podrán incluir el acontecimiento en sus calendarios con una "
+"pulsación, pero no le enviarán una respuesta automática acerca de si "
+"asistirán o no."
+
+#: C/calendar-meetings-sending-invitation.page:28(p)
+msgid "To schedule a meeting:"
+msgstr "Para planificar una reunión:"
+
+#: C/calendar-meetings-sending-invitation.page:31(p)
+#: C/calendar-free-busy.page:31(p)
+msgid "Click <guiseq><gui>File</gui><gui>New</gui><gui>Meeting</gui></guiseq>."
+msgstr ""
+"Pulse <guiseq><gui>Archivo</gui><gui>Nuevo</gui><gui>Reunión</gui></guiseq>."
+
+#: C/calendar-meetings-sending-invitation.page:32(p)
+msgid ""
+"If you have multiple email accounts, select the one to use by selecting an "
+"item in the <gui>Organizer</gui> field."
+msgstr ""
+"Si tiene múltiples cuentas de correo seleccione la que quiere usar "
+"seleccionando un elemento en el campo <gui>Organizador</gui>."
+
+#: C/calendar-meetings-sending-invitation.page:34(p)
+#: C/calendar-free-busy.page:32(p)
+msgid ""
+"Click <gui style=\"button\">Add</gui> to add the email addresses of people "
+"you want to invite."
+msgstr ""
+"Pulse <gui style=\"button\">Añadir</gui> para añadir las direcciones de "
+"correo-e de las personas a las que quiere invitar."
+
+#: C/calendar-meetings-sending-invitation.page:35(p)
+msgid ""
+"Click <gui>View</gui> in the menu bar to show or hide the <gui>Type</gui>, "
+"<gui>Role</gui>, <gui>Status</gui>, and <gui>RSVP</gui> fields."
+msgstr ""
+"Pulse <gui>Ver</gui> en la barra de menú para ver u ocultar los campos "
+"<gui>Tipo</gui>, <gui>Rol</gui>, <gui>Estado</gui> y <gui>RSVP</gui>."
+
+#: C/calendar-meetings-sending-invitation.page:42(p)
+msgid ""
+"To query <link xref=\"calendar-free-busy\">free/busy</link> information for "
+"the attendees, click the <gui>Free/Busy</gui> button on the toolbar, or "
+"click <guiseq><gui>Options</gui><gui>Free/Busy</gui></guiseq>."
+msgstr ""
+"Para preguntar la información de <link xref=\"calendar-free-busy"
+"\">Disponibilidad</link> de los asistentes, pulse el botón "
+"<gui>Disponibilidad</gui> en la barra de herramientas, o pulse "
+"<guiseq><gui>Opciones</gui><gui>Disponibilidad</gui></guiseq>."
+
+#: C/calendar-meetings-sending-invitation.page:43(p)
+msgid "Click <gui>Save</gui> to save the meeting."
+msgstr "Pulse <gui>Guardar</gui> para guardar la reunión."
+
+#: C/calendar-meetings-sending-invitation.page:46(p)
+msgid ""
+"An email is sent out to all the recipients, inviting them to your event."
+msgstr ""
+"Se enviará un correo-e a todos los destinatarios, invitándoles a su "
+"acontecimiento."
+
+#: C/calendar-meetings-sending-invitation.page:50(p)
+msgid ""
+"In Evolution, a meeting can have only one organizer, and only the organizer "
+"can add participants to that meeting. Though it is possible to change the "
+"organizer of a meeting, this is not recommended as a means to invite "
+"additional participants to meetings. If you want to invite additional people "
+"to a meeting and are not that meeting's organizer, it is recommended that "
+"you forward the invitation message you received from the original meeting "
+"organiser to additional participants."
+msgstr ""
+"Una reunión sólo puede tener un organizador, y sólo el organizador puede "
+"añadir participantes a esa reunión. Aunque se puede cambiar el organizador "
+"de una reunión, no se recomienda porque puede provocar confusión en el "
+"proceso de planificación. Si desea invitar a personas adicionales y no son "
+"los que ha invitado el organizador, es recomendable que reenvíe el mensaje "
+"de invitación que recibió del organizador original a los asistentes."
+
+#: C/calendar-meetings-replying-to-invitation.page:5(desc)
+msgid "Accepting and replying to a meeting invitation."
+msgstr "Aceptar y responder a una solicitud de reunión."
+
+#: C/calendar-meetings-replying-to-invitation.page:23(title)
+msgid "Replying to a Meeting Request"
+msgstr "Responder a una solicitud de reunión"
+
+#: C/calendar-meetings-replying-to-invitation.page:24(p)
+msgid ""
+"Meeting requests are sent as attachments and displayed as the body of an "
+"email. All the details about the event are shown, including time and dates."
+msgstr ""
+"Las solicitudes de reuniones se envían como adjuntos y se muestran como el "
+"cuerpo de un correo electrónico. Se muestran todos los detalles acerca del "
+"acontecimiento, incluyendo fechas y horas."
+
+#: C/calendar-meetings-replying-to-invitation.page:25(p)
+msgid ""
+"You can choose whether and how to reply to the invitation and add a personal "
+"comment to your reply. Available options are to <gui>Decline</gui>, "
+"Tentatively Accept (<gui>Tentative</gui>), or <gui>Accept</gui>. You can "
+"also decide whether the time of the meeting will still be shown as free in "
+"your calendar."
+msgstr ""
+"Puede elegir cómo responder a una invitación y añadir un comentario personal "
+"a su respuesta. Las opciones disponibles son <gui>Rechazar</gui>, aceptar "
+"provisionalmente (<gui>Provisional</gui>) o <gui>Aceptar</gui>. También "
+"puede decidir si quiere que la hora de la reunión se siga mostrando como "
+"libre en su calendario."
+
+#: C/calendar-meetings-replying-to-invitation.page:27(p)
+msgid ""
+"If the meeting request already includes a <link xref=\"calendar-alarms-and-"
+"reminders\">reminder</link> you can import the reminder to your calendar by "
+"enabling <gui>Inherit reminder</gui>."
+msgstr ""
+"Si la solicitud de reunión ya incluye un <link xref=\"calendar-alarms-and-"
+"reminders\">recordatorio</link> puede importar el recordatorio a su "
+"calendario activando <gui>Heredar recordatorio</gui>."
+
+#: C/calendar-meetings-replying-to-invitation.page:29(p)
+msgid ""
+"If you click <gui>Accept</gui> the event is added automatically to the "
+"calendar that you have chosen."
+msgstr ""
+"Si pulsa <gui>Aceptar</gui> el acontecimiento se añadirá automáticamente al "
+"calendario que haya elegido."
+
+#: C/calendar-meetings-replying-to-invitation.page:30(p)
+msgid ""
+"After you have added the meeting to your calendar, you can make changes to "
+"the meeting, but if the original organizer sends out an update, your changes "
+"might be overwritten."
+msgstr ""
+"Después de que haya añadido la reunión a su calendario puede hacer cambios "
+"en la reunión, pero si el organizador original envía otra actualización, sus "
+"cambios se sobreescribirán."
+
+#: C/calendar-meetings-replying-to-invitation.page:32(p)
+msgid ""
+"Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</"
+"gui><gui>Meeting Invitations</gui><gui>Conflict Search</gui></guiseq> you "
+"can define which calendars are used for warning you of meeting conflicts."
+msgstr ""
+"Bajo <guiseq><gui>Editar</gui><gui>Preferencias</gui><gui>Calendario y "
+"tareas</gui><gui>Invitaciones a reuniones</gui><gui>Búsqueda de conflictos</"
+"gui></guiseq> puede definir qué calendarios se usan para avisarle de sus "
+"conflictos en reuniones."
+
+#: C/calendar-meetings.page:5(desc)
+msgid "Using meetings in the calendar."
+msgstr "Usar reuniones en el calendario."
+
+#: C/calendar-meetings.page:20(title)
+msgid "Meetings"
+msgstr "Reuniones"
+
+#: C/calendar-meetings-delegating.page:5(desc)
+msgid "Ask somebody else to run the meeting."
+msgstr "Pregunte a alquien para que lleve la reunión."
+
+#: C/calendar-meetings-delegating.page:25(title)
+msgid "Delegating Meetings"
+msgstr "Eliminar reuniones"
+
+#: C/calendar-meetings-delegating.page:26(p)
+msgid "Only attendees of a meeting can delegate a meeting."
+msgstr "Sólo los asistentes a una reunión pueden delegar una reunión."
+
+#: C/calendar-meetings-delegating.page:29(p)
+msgid "Right-click on the meeting that you want to delegate."
+msgstr "Pulse con el botón derecho en la reunión que quiere delegar."
+
+#: C/calendar-meetings-delegating.page:32(p)
+msgid "Click <gui>Delegate Meeting</gui>."
+msgstr "Pulse<gui>Delegar reunión</gui>."
+
+#: C/calendar-meetings-delegating.page:35(p)
+msgid "Select the contacts you want to delegate the meeting to."
+msgstr "Seleccione los contactos a los que quiere delegar la reunión."
+
+#: C/calendar-meetings-delegating.page:41(p)
+msgid "Each contact receives a copy of the meeting invitation."
+msgstr "Cada contacto recibe una copia de la invitación a la reunión."
+
+#: C/calendar-marcus-bains-line.page:5(desc)
+msgid "The red \"Marcus Bains\" line displays the current time."
+msgstr "La línea roja «Marcus Bains» muestra el elemento actual."
+
+#: C/calendar-marcus-bains-line.page:19(title)
+msgid "Time display in the Day view"
+msgstr "Mostrado de la hora en la vista de Día"
+
+#: C/calendar-marcus-bains-line.page:21(p)
+msgid ""
+"The red Marcus Bains Line in the Day view of the calendar is a marker to "
+"show the current date and time."
+msgstr ""
+"La línea Marcus Bains en la vista de Día es un marcador para mostrar la "
+"fecha y hora actuales."
+
+#: C/calendar-local.page:5(desc)
+msgid "Adding another local calendar."
+msgstr "Añadir otro calendario local."
+
+#: C/calendar-local.page:20(title)
+msgid "Adding another local calendar"
+msgstr "Añadir otro calendario local"
+
+#: 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."
+
+#: C/calendar-layout-views.page:23(title)
+msgid "Available views"
+msgstr "Vistas disponibles"
+
+#: C/calendar-layout-views.page:25(p)
+msgid "Evolution offers five different views of your calendar data:"
+msgstr ""
+"Evolution ofrece cinco vistas diferentes de los datos de su calendario:"
+
+#: C/calendar-layout-views.page:27(p)
+msgid "Day (<keyseq><key>Ctrl</key><key>Y</key></keyseq>)"
+msgstr "Día (<keyseq><key>Ctrl</key><key>Y</key></keyseq>)"
+
+#: C/calendar-layout-views.page:28(p)
+msgid "Work Week (<keyseq><key>Ctrl</key><key>J</key></keyseq>)"
+msgstr "Semana laboral (<keyseq><key>Ctrl</key><key>J</key></keyseq>)"
+
+#: C/calendar-layout-views.page:29(p)
+msgid "Week (<keyseq><key>Ctrl</key><key>K</key></keyseq>)"
+msgstr "Semana (<keyseq><key>Ctrl</key><key>K</key></keyseq>)"
+
+#: C/calendar-layout-views.page:30(p)
+msgid "Month (<keyseq><key>Ctrl</key><key>M</key></keyseq>)"
+msgstr "Mes (<keyseq><key>Ctrl</key><key>M</key></keyseq>)"
+
+#: C/calendar-layout-views.page:31(p)
+msgid "List (<keyseq><key>Ctrl</key><key>L</key></keyseq>)"
+msgstr "Lista (<keyseq><key>Ctrl</key><key>L</key></keyseq>)"
+
+#: C/calendar-layout-views.page:34(p)
+msgid ""
+"You can switch the view by either using the buttons in the toolbar, or by "
+"clicking <guiseq><gui>View</gui><gui>Current View</gui></guiseq>."
+msgstr ""
+"Puede cambiar la vista usando los botones en la barra de herramientas o "
+"pulsando <guiseq><gui>Ver</gui><gui>Vista actual</gui></guiseq>."
+
+#: C/calendar-layout-views.page:36(p)
+msgid ""
+"You can also select an arbitrary range of days in the small calendar in the "
+"side bar. To do this, select the days that you want to view in your calendar."
+msgstr ""
+"Puede elegir cualquier rango de días en el calendario pequeño en la barra "
+"lateral. Para ello seleccione los días que quiere ver en el calendario."
+
+#: C/calendar-layout-views.page:38(p)
+msgid ""
+"The Previous and Next buttons move you forward and back in your calendar "
+"pages. If you are using a week or month view, you can move by week or month. "
+"To return to today's listing, click the <gui>Select today</gui> button "
+"between the two arrow buttons in the toolbar."
+msgstr ""
+"Los botones Anterior y Siguiente sirven para desplazarse adelante y atrás "
+"por las páginas del calendario. Si está usando la vista de semana o mes, "
+"puede desplazarse una semana o un mes. Para volver al día de hoy pulse el "
+"botón <gui>Seleccionar hoy</gui> en la barra de tareas."
+
+#: C/calendar-layout-views.page:40(p)
+msgid ""
+"To visit calendar entries for a specific date, click the <gui>Select a "
+"specific date</gui> button in the toolbar."
+msgstr ""
+"Para ver las entradas del calendario para una fecha específica, pulse el "
+"botón <gui>Seleccionar una fecha específica</gui> en la barra de "
+"herramientas."
+
+#: C/calendar-layout.page:5(desc)
+msgid "Adjusting the display and views of the calendar."
+msgstr "Ajustar el mostrado y vistas del calendario."
+
+#: C/calendar-layout.page:20(title)
+msgid "Changing the calendar layout"
+msgstr "Cambiar la distribución del calendario"
+
+#: C/calendar-layout-general-formatting.page:5(desc)
+msgid "General formatting options for the calendar."
+msgstr "Opciones generales de formato para el calendario."
+
+#: C/calendar-layout-general-formatting.page:25(title)
+msgid "General formatting options"
+msgstr "Opciones de formateo general"
+
+#: C/calendar-layout-general-formatting.page:27(p)
+msgid ""
+"The following options are available under <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>General</gui></"
+"guiseq>."
+msgstr ""
+"Las siguientes opciones están disponibles bajo <guiseq><gui>Editar</"
+"gui><gui>Preferencias</gui><gui>Calendario y tareas</gui><gui>General</gui></"
+"guiseq>."
+
+#: C/calendar-layout-general-formatting.page:29(title)
+msgid "Time"
+msgstr "Hora"
+
+#: C/calendar-layout-general-formatting.page:31(p)
+msgid "Time format:"
+msgstr "Formato de la hora:"
+
+#: C/calendar-layout-general-formatting.page:32(p)
+msgid "Choose between twelve-hour (AM/PM) and twenty-four-hour time formats."
+msgstr "Elija entre el formato de doce horas (AM/PM) o de veinticuatro horas."
+
+#: C/calendar-layout-general-formatting.page:33(p)
+msgid "<link xref=\"calendar-timezones\">Time zone</link> and Second zone:"
+msgstr ""
+"<link xref=\"calendar-timezones\">Zona horaria</link> y una segunda zona:"
+
+#: C/calendar-layout-general-formatting.page:34(p)
+msgid "The city you are located in, and optionally a second city."
+msgstr "La ciudad en la que se encuentra, y opcionalmente una segunda ciudad."
+
+#: C/calendar-layout-general-formatting.page:39(title)
+msgid "Work Week"
+msgstr "Semana laboral"
+
+#: C/calendar-layout-general-formatting.page:41(p)
+msgid "Week starts on:"
+msgstr "La semana empieza en:"
+
+#: C/calendar-layout-general-formatting.page:42(p)
+msgid "Select the day to display as the first in each week."
+msgstr "Seleccione el día a mostrar como el primer día de cada semana."
+
+#: C/calendar-layout-general-formatting.page:43(p)
+msgid "Work days:"
+msgstr "Días laborables:"
+
+#: C/calendar-layout-general-formatting.page:44(p)
+msgid "Define which week days are work days."
+msgstr "Definir qué días de la semana son laborables."
+
+#: C/calendar-layout-general-formatting.page:45(p)
+msgid "Day begins:"
+msgstr "El día comienza:"
+
+#: C/calendar-layout-general-formatting.page:46(p)
+msgid "Define at which time your work day begins."
+msgstr "Definir a qué hora comienza su día laboral."
+
+#: C/calendar-layout-general-formatting.page:47(p)
+msgid "Day ends:"
+msgstr "El día finaliza:"
+
+#: C/calendar-layout-general-formatting.page:48(p)
+msgid "Define at which time your work day ends."
+msgstr "Defina a qué hora finaliza su horario de trabajo."
+
+#: C/calendar-layout-general-formatting.page:53(title)
+msgid "Alerts"
+msgstr "Alertas"
+
+#: C/calendar-layout-general-formatting.page:54(p)
+msgid ""
+"If you want to be warned before you delete any appointment, select this "
+"option."
+msgstr ""
+"Seleccione esta opción si quiere que se le avise antes de eliminar cualquier "
+"cita."
+
+#: C/calendar-layout-appointment-display.page:5(desc)
+msgid "Define the displaying of appointments in the calendar."
+msgstr "Definir el mostrado de citas en el calendario."
+
+#: C/calendar-layout-appointment-display.page:23(title)
+msgid "Appearance of Appointments"
+msgstr "Apariencia de las citas"
+
+#. TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=657233 is fixed, as the current UI is a huge mess.
+#: C/calendar-layout-appointment-display.page:29(p)
+msgid ""
+"The following calendar-related options are available under "
+"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</"
+"gui><gui>Display</gui></guiseq>."
+msgstr ""
+"Las siguientes opciones relacionadas con el calendario están disponibles "
+"bajo <guiseq><gui>Editar</gui><gui>Preferencias</gui><gui>Calendario y "
+"tareas</gui><gui>Mostrar</gui></guiseq>."
+
+#: C/calendar-layout-appointment-display.page:32(title)
+msgid "General"
+msgstr "General"
+
+#: C/calendar-layout-appointment-display.page:34(p)
+msgid "Time Divisions:"
+msgstr "Divisiones de horas:"
+
+#: C/calendar-layout-appointment-display.page:35(p)
+msgid ""
+"Sets the time increments shown as fine lines on the daily view in the "
+"calendar."
+msgstr ""
+"Establece el incremento de tiempo mostrado como líneas finas en la vista "
+"diaria del calendario."
+
+#: C/calendar-layout-appointment-display.page:36(p)
+msgid "Show appointment end times in week and month views:"
+msgstr ""
+"Mostrar la hora del final de las citas en las vistas semanales y mensuales:"
+
+#: C/calendar-layout-appointment-display.page:37(p)
+msgid ""
+"If there is space, Evolution shows the end times in the week and month views "
+"for each appointment."
+msgstr ""
+"Si hay espacio suficiente, el cliente Evolution mostrará las horas finales "
+"en las vistas semanales y mensajes para cada cita."
+
+#: C/calendar-layout-appointment-display.page:38(p)
+msgid "Compress weekends in month view:"
+msgstr "Comprimir fines de semana en la vista mensual:"
+
+#: C/calendar-layout-appointment-display.page:39(p)
+msgid ""
+"Select this option to display weekends in one box instead of two in the "
+"month view."
+msgstr ""
+"Seleccione esta opción para mostrar los fines de semana en una caja en lugar "
+"de dos en la vista mensual."
+
+#: C/calendar-layout-appointment-display.page:40(p)
+msgid "Show week numbers:"
+msgstr "Muestra los números de las semanas:"
+
+#: C/calendar-layout-appointment-display.page:41(p)
+msgid "Shows the week numbers next to the respective weeks in the calendar."
+msgstr ""
+"Muestra los números de la semana junto a las respectivas semanas en el "
+"calendario."
+
+#: C/calendar-layout-appointment-display.page:42(p)
+msgid "Show recurring events in italic in bottom left calendar"
+msgstr ""
+"Mostrar acontecimientos recurrentes en cursiva en el calendario inferior "
+"izquierdo"
+
+#: C/calendar-layout-appointment-display.page:43(p)
+msgid "Scroll Month View by a week"
+msgstr "Desplazar la vista mensual una semana"
+
+#: C/calendar-layout-appointment-display.page:48(title)
+msgid "Date/Time Format"
+msgstr "Formato de la fecha y hora"
+
+#: C/calendar-layout-appointment-display.page:49(p)
+msgid ""
+"You can change the format of the <gui>Date</gui> column by setting your "
+"preferred format."
+msgstr ""
+"Puede cambiar el formato de la columna <gui>Fecha</gui> configurando su "
+"formato preferido."
+
+#: C/calendar-google.page:5(desc)
+msgid "Using the online calendar of your Google account."
+msgstr "Usar el calendario en línea de su cuenta de Google."
+
+#: C/calendar-google.page:24(title)
+msgid "Using a Google calendar"
+msgstr "Usar un calendario de Google"
+
+#: C/calendar-google.page:34(p)
+msgid "If you have more than one Google calendar, define which of them to use."
+msgstr "Si tiene maś de un calendario de Google, defina cuál quiere usar."
+
+#: C/calendar-free-busy.page:5(desc)
+msgid "Using the Free/Busy view for setting up meetings."
+msgstr "Usar la vista de disponibilidad para concertar reuniones."
+
+#: C/calendar-free-busy.page:23(title)
+msgid "Free/Busy information"
+msgstr "Información de disponibilidad"
+
+#: C/calendar-free-busy.page:25(p)
+msgid ""
+"You can use the Free/Busy search for meetings to determine the availability "
+"of invitees."
+msgstr ""
+"Puede usar la búsqueda de Disponibilidad para reuniones y determinar la "
+"disponibilidad de los invitados."
+
+#: C/calendar-free-busy.page:27(p)
+msgid ""
+"In addition to the standard meeting scheduling tools, you can use the Free/"
+"Busy view to check whether people are available in advance. The Free/Busy "
+"feature is normally a function of dedicated groupware servers such as "
+"Microsoft Exchange and Novell GroupWise. However, you can also publish Free/"
+"Busy information online, and access Free/Busy information published "
+"elsewhere. If not everyone you collaborate with publishes Free/Busy data, "
+"you can still use <link xref=\"calendar-meetings-sending-invitation"
+"\">meeting invitations</link> to coordinate schedules with other people."
+msgstr ""
+"Además de las herramientas estándar de planificación de reuniones puede usar "
+"la vista de disponibilidad para comprobar de antemano si la gente estará "
+"ocupada o no. La característica de disponibilidad es una función dedicada a "
+"servidores GruopWare tales como Microsoft Exchange y Novell GroupWise. Sin "
+"embargo puede publicar la información de la disponibilidad en línea y "
+"acceder a la información publicada en cualquier sitio. Si no todas las "
+"personas con las que colabora publican su información de disponibilidad, "
+"todavía puede usar los acontecimientos iCal en forma de <link xref="
+"\"calendar-meetings-sending-invitation\">invitaciones</link> para coordinar "
+"las agendas con otras personas."
+
+#: C/calendar-free-busy.page:29(p)
+msgid "To access the free/busy view:"
+msgstr "Para acceder a la vista de disponibilidad:"
+
+#: C/calendar-free-busy.page:33(p)
+msgid ""
+"Click the <gui>Free/Busy</gui> button on the toolbar, or click "
+"<guiseq><gui>Options</gui><gui>Free/Busy</gui></guiseq>."
+msgstr ""
+"Pulse el botón <gui>Disponibilidad</gui> en la barra de herramientas o pulse "
+"<guiseq><gui>Opciones</gui><gui>Disponibilidad</gui></guiseq>."
+
+#: C/calendar-free-busy.page:34(p)
+msgid ""
+"Adjust the meeting time, either by dragging the meeting borders or by using "
+"the <gui>Autopick</gui> buttons to choose a time automatically, then click "
+"<gui style=\"button\">Close</gui>. Attendees on an Exchange server have the "
+"appointment updated automatically; others receive email notification of any "
+"change in plans."
+msgstr ""
+"Ajuste la hora de reunión, arrastrando los bordes de la reunión o pulsando "
+"en <gui>Autoseleccionar</gui> para hacer una elección automática, después "
+"pulse <gui style=\"button\">Cerrar</gui>. Los asistentes en un servidor "
+"Exchange tendrán sus datos actualizados automáticamente, el resto recibirá "
+"una notificación por correo electrónico de cualquier cambio en los planes."
+
+#: C/calendar-free-busy.page:38(p)
+msgid "Attendee List:"
+msgstr "Lista de asistentes:"
+
+#: C/calendar-free-busy.page:38(p)
+msgid ""
+"The Attendee List shows the people who have been invited to the appointment."
+msgstr ""
+"La Lista de asistentes muestra a las personas que han sido invitadas a la "
+"reunión."
+
+#: C/calendar-free-busy.page:39(p)
+msgid "Schedule Grid:"
+msgstr "Cuadrícula de planificación:"
+
+#: C/calendar-free-busy.page:39(p)
+msgid ""
+"The Schedule Grid shows the published Free/Busy information for the people "
+"you have invited. This is where you compare schedules to find free time to "
+"schedule the appointment. Individuals have visible scheduling information "
+"only if they use the same Novell GroupWise or Microsoft Exchange server you "
+"do (that is, if they are in the same organization as you), or if they "
+"publish free/busy information at a URL you can reach and you have entered "
+"that URL into their contact cards using the contact editor."
+msgstr ""
+"La rejilla del horario muestra la información de Disponibilidad publicada "
+"para las personas que ha invitado. Aquí es donde puede comparar los horarios "
+"para encontrar una hora libre para planificar una cita. Los individuos "
+"tienen su información de planificación visible sólo si usan el mismo "
+"servidor Novell GruopWise o Microsoft Exchange que usted (esto es, si están "
+"en la misma compañía) o si han publicado su información de Disponibilidad en "
+"un URL y ha introducido ese URL en la tarjeta del contacto usando el editor "
+"de contactos."
+
+#: C/calendar-free-busy.page:43(p)
+msgid ""
+"The default server can be defined under <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Publishing "
+"Information</gui><gui>Default Free/Busy Server</gui></guiseq>."
+msgstr ""
+"El servidor predeterminado se puede definir en <guiseq><gui>Editar</"
+"gui><gui>Preferencias</gui><gui>Calendario y tareas</gui><gui>Información de "
+"publicación</gui><gui>Servidor de disponibilidad predeterminado</gui></"
+"guiseq>."
+
+#: C/calendar-free-busy.page:47(title)
+msgid "Accessing Free/Busy Data Without a Groupware Server"
+msgstr "Acceder a datos de Disponibilidad sin un servidor Groupware"
+
+#: C/calendar-free-busy.page:49(p)
+msgid ""
+"If individuals give you a URL for Free/Busy data or for their web calendar, "
+"you can add the URL under <guiseq><gui>Personal Information</gui><gui>Web "
+"Addresses</gui></guiseq> in the <link xref=\"contacts-usage-edit-contact"
+"\">Contact Editor</link>. Then, when you schedule a meeting with them, "
+"Evolution looks up the schedule and displays it in the Free/Busy data."
+msgstr ""
+"Si personas individuales de proporcionan sus datos de Disponibilidad en un "
+"URL o sus calendarios Web, puede añadir el URL bajo <guiseq><gui>Información "
+"personal</gui><gui>Dirección web</gui></guiseq> en el <link xref=\"contacts-"
+"usage-edit-contact\">Editor de contactos</link>. Después, cuando planifique "
+"una reunión con ellos, Evolution comprueba los horarios y los muestra en los "
+"datos de Disponibilidad."
+
+#: C/calendar-classifications.page:5(desc)
+msgid "Classifying appointments and tasks on groupware servers."
+msgstr "Clasificar citas y tareas en servidores de grupos."
+
+#: C/calendar-classifications.page:23(title)
+msgid "Using Classifications"
+msgstr "Usar clasificaciones"
+
+#: C/calendar-classifications.page:25(p)
+msgid ""
+"If you are using a calendar on a Novell GroupWise or Microsoft Exchange "
+"server, you can select a classification to determine who can view it."
+msgstr ""
+"Si usa un calendario en servidor Novell GroupWise o Microsoft Exchange, "
+"puede seleccionar una clasificación para determinar quién puede verlo."
+
+#: C/calendar-classifications.page:26(p)
+msgid ""
+"To set a classification for an appointment or a task, click "
+"<guiseq><gui>Options</gui><gui>Classifications</gui></guiseq> and select a "
+"classification in the editor. <gui>Public</gui> is the default category, and "
+"a public appointment can be viewed by anyone on the calendar-sharing "
+"network. <gui>Private</gui> denotes one level of security, and "
+"<gui>Confidential</gui> an even higher level."
+msgstr ""
+"Para establecer una clasificación para una cita o tarea, pulse "
+"<guiseq><gui>Opciones</gui><gui>Clasificación</gui></guiseq> y seleccione "
+"una clasificación en el editor. <gui>Público</gui> es la categoría "
+"predeterminada y una cita pública la puede ver cualquiera en la red "
+"compartida de calendarios. <gui>Privado</gui> denota un nivel de seguridad y "
+"<gui>Confidencial</gui> un nivel incluso superior."
+
+#: C/calendar-classifications.page:27(p)
+msgid ""
+"The different levels vary depending on your server settings; check with your "
+"system administrator or adjust your delegation settings."
+msgstr ""
+"Los diferentes niveles varían dependiendo de la configuración de su "
+"servidor; compruebe con el administrador de su sistema o ajuste su "
+"configuración de delegación."
+
+#: C/calendar-caldav.page:5(desc)
+msgid "Using an online CalDAV calendar."
+msgstr "Usar un calendario en línea CalDAV."
+
+#: C/calendar-caldav.page:23(title)
+msgid "Using a CalDAV calendar"
+msgstr "Usar un calendario CalDAV"
+
+#: C/calendar-caldav.page:28(p)
+msgid "Select the type <gui>CalDAV</gui>."
+msgstr "Seleccione el tipo <gui>CalDAV</gui>."
+
+#: C/calendar-alarms-and-reminders.page:5(desc)
+msgid "Setting up reminder notifications for appointments."
+msgstr "Establecer notificaciones de recordatorios para citas."
+
+#: C/calendar-alarms-and-reminders.page:23(title)
+msgid "Reminders for appointments"
+msgstr "Recordatorios para citas"
+
+# index.docbook:29, index.docbook:30

+#: C/calendar-alarms-and-reminders.page:26(title)
+msgid "General Settings"
+msgstr "Configuración general"
+
+#: C/calendar-alarms-and-reminders.page:28(p)
+msgid ""
+"Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</"
+"gui><gui>Reminders</gui></guiseq> you can select those calendars for which "
+"you want to receive reminder notifications. If you do not select a calendar, "
+"you will not receive reminders for any events in this calendar. You can also "
+"define whether to show a reminder for every appointment and for every "
+"birthday and anniversary."
+msgstr ""
+"Bajo <guiseq><gui>Editar</gui><gui>Preferencias</gui><gui>Calendario y "
+"tareas</gui><gui>Recordatorios</gui></guiseq> puede seleccionar esos "
+"calendarios para los que quiere recibir notificaciones de recordatorios. Si "
+"no selecciona un calendario no recibirá recordatorios para ningún evento en "
+"ese calendario. También puede definir si quiere mostrar un recordatorio para "
+"cada cita  para cada cumpleaños y aniversario."
+
+#: C/calendar-alarms-and-reminders.page:33(title)
+msgid "Manual Reminders"
+msgstr "Recordatorios manuales"
+
+#: C/calendar-alarms-and-reminders.page:35(p)
+msgid ""
+"Apart from the general settings you can also set up reminders in the "
+"appointment editor for certain appointments only:"
+msgstr ""
+"Además de la configuración general, también puede establecer recordatorios "
+"manuales en el editor de citas, solo para cierto tipo de citas:"
+
+#: C/calendar-alarms-and-reminders.page:37(p)
+msgid ""
+"Click <guiseq><gui>Options</gui><gui>Reminders</gui></guiseq> or press the "
+"Reminder button in the toolbar."
+msgstr ""
+"Pulse <guiseq><gui>Opciones</gui><gui>Recordatorios</gui></guiseq> o pulse "
+"el botón Recordatorio en la barra de herramientas."
+
+#: C/calendar-alarms-and-reminders.page:38(p)
+msgid ""
+"From the dropdown menu, choose either one of the available default options "
+"when to show a notification reminder, or choose <gui>Customize</gui>."
+msgstr ""
+"Del menú desplegable, elija una de las opciones predeterminadas disponibles "
+"para mostrar un recordatorio de notificación, o elija <gui>Personalizar</"
+"gui>."
+
+#: C/calendar-alarms-and-reminders.page:40(p)
+msgid ""
+"In case of <gui>Customize</gui>, the reminder can be a popup, a sound "
+"played, or a program ran. You can also define whether the reminder should be "
+"repeated."
+msgstr ""
+"En caso de <gui>Personalizar</gui>, el recordatorio puede ser una ventana "
+"emergente, la reproducción de un sonido o la ejecución de un programa. "
+"También puede definir si se debe repetir el recordatorio."
+
+#: C/backup-restore.page:5(desc)
+msgid "Back up and restore your Evolution data and settings."
+msgstr "Respaldar y restaurar los datos y la configuración de Evolution"
+
+#: C/backup-restore.page:21(title)
+msgid "Back up and restore"
+msgstr "Respaldar y restaurar"
+
+#: C/backup-restore.page:23(p)
+msgid ""
+"You can back up your Evolution data. The backup saves your settings, mail, "
+"contacts, tasks, memos and calendars. It will be stored in a gzip-compressed "
+"tar archive file."
+msgstr ""
+"Puede respaldar sus datos de Evolution. El respaldo guarda sus ajustes, "
+"correos, contactos, tareas, notas y calendarios. Se almacenará en formato "
+"comprimido gzip, dentro de un archivador tar."
+
+#: C/backup-restore.page:26(title)
+msgid "Backing up"
+msgstr "Respaldos"
+
+#: C/backup-restore.page:28(p)
+msgid ""
+"Select <guiseq><gui>File</gui><gui>Back up Evolution Data...</gui></guiseq>."
+msgstr ""
+"Seleccione <guiseq><gui>Archivo</gui><gui>Respaldar datos de Evolution…</"
+"gui></guiseq>."
+
+#: C/backup-restore.page:29(p)
+msgid ""
+"Choose a filename and the folder where you want to save the backup file, and "
+"click <gui style=\"button\">Save</gui>."
+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)
+msgid ""
+"You will get 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)
+msgid "Restoring"
+msgstr "Restaurar"
+
+#: C/backup-restore.page:37(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)
+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)
+msgid ""
+"In the <link xref=\"intro-first-run\">first-run assistant</link>, you can "
+"restore Evolution data from a backup file."
+msgstr ""
+"En el <link xref=\"intro-first-run\">asistente de primera ejecución</link> "
+"puede restaurar Evolution desde un archivo de respaldo."
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: C/index.page:0(None)
+msgid "translator-credits"
+msgstr ""
+"Daniel Mustieles <daniel.mustieles@gmail.com>, 2011\n"
+"Jorge González <jorgegonz@svn.gnome.org>, 2007-2011\n"
+"Francisco Javier F. Serrador <serrador@openshine.com>, 2005, 2006"
+
+#~ msgid ""
+#~ "This documentation section will be added once the currently developed "
+#~ "evolution-ews has become stable and mature."
+#~ msgstr ""
+#~ "Esta sección de la documentación se añadirá una vez que evolution-ews, "
+#~ "actualmente en desarrollo, sea estable y maduro."
+
+#~ msgid "How to report bugs."
+#~ msgstr "Cómo informar de un error."
+
+#~ msgid "Mount your Windows drive or the disk where you saved the mail files."
+#~ msgstr ""
+#~ "Monte su unidad Windows o el disco donde tenga guardados los archivos de "
+#~ "correo."
+
+#~ msgid "To check if a filter has a <gui>Stop Processing</gui> rule:"
+#~ msgstr ""
+#~ "Para comprobar si un filtro tiene una regla <gui>Parar de procesar</gui>:"
+
+#~ msgid ""
+#~ "Select the filter and refer to the list of actions for that particular "
+#~ "filter."
+#~ msgstr ""
+#~ "Seleccione el filtro y vaya a la lista de acciones para ese filtro en "
+#~ "particular."
+
+#~ msgid ""
+#~ "Meeting requests are sent as attachments. To view or respond to one, "
+#~ "click the attachment icon and view it in the mail window. All the details "
+#~ "about the event are shown, including time and dates. Then you can choose "
+#~ "how to reply to the invitation - the options are to <gui>Accept</gui>, "
+#~ "<gui>Tentatively Accept</gui>, or <gui>Decline</gui>."
+#~ msgstr ""
+#~ "Las peticiones de reunión se envían como adjuntos. Para ver o responder a "
+#~ "una, pulse el icono del adjunto y véalo en línea en la ventana del "
+#~ "correo. Se mostrarán todos tos detalles acerca del acontecimiento, "
+#~ "incluyendo hora y fechas. Después puede elegir cómo responder a la "
+#~ "invitación. Sus opciones son: <gui>Aceptar</gui>, <gui>Aceptar "
+#~ "provisionalmente</gui> o <gui>Rechazar</gui>."
+
+#~ msgid ""
+#~ "Click <gui style=\"button\">OK</gui> to send your answer per email to the "
+#~ "organizer. The event is also added automatically to your calendar if you "
+#~ "accept."
+#~ msgstr ""
+#~ "Pulse <gui style=\"button\">Aceptar</gui> para enviar un correo-e con su "
+#~ "respuesta al organizador. Si acepta el acontecimiento también se añadirá "
+#~ "a su calendario."
+
+#~ msgid "Click <gui>Security</gui>."
+#~ msgstr "Pulse en <gui>Seguridad</gui>."
+
+#~ msgid "<placeholder-1/>."
+#~ msgstr "<placeholder-1/>."
+
+#, fuzzy
+#~ msgid "<placeholder-1/><placeholder-2/>S <placeholder-3/>"
+#~ msgstr ""
+#~ "Pulse el botón Correo enviado para abrir la ventana de selección de "
+#~ "carpeta."
+
+#, fuzzy
+#~ msgid "Categories..."
+#~ msgstr "Ca_tegorías…"
+
+#, fuzzy
+#~ msgid "View"
+#~ msgstr "Ver:"
+
+#~ msgid "Categories"
+#~ msgstr "Categorías"
+
+#~ msgid "Edit"
+#~ msgstr "Editar"
+
+#, fuzzy
+#~ msgid "Available Categories"
+#~ msgstr "Categorías _disponibles:"
+
+#~ msgid "OK"
+#~ msgstr "Aceptar"
+
+#, fuzzy
+#~ msgid "Click <placeholder-1/>."
+#~ msgstr "gpg <placeholder-1/>"
+
+#~ msgid "Categories Editor"
+#~ msgstr "Editor de categorías"
+
+#~ msgid "Delete"
+#~ msgstr "Eliminar"
+
+#, fuzzy
+#~ msgid "search"
+#~ msgstr "Buscar:"
+
+#, fuzzy
+#~ msgid "File"
+#~ msgstr "Archivo:"
+
+#~ msgid "New"
+#~ msgstr "Nuevo"
+
+#~ msgid "Task List"
+#~ msgstr "Lista de tareas"
+
+#~ msgid "Memo List"
+#~ msgstr "Lista de notas"
+
+#, fuzzy
+#~ msgid "On the Web"
+#~ msgstr "en el futuro"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#, fuzzy
+#~ msgid "Use secure connection"
+#~ msgstr "Usar _conexión segura"
+
+#, fuzzy
+#~ msgid "Open Task"
+#~ msgstr "_Abrir tarea"
+
+#~ msgid "Save"
+#~ msgstr "Guardar"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "Delete Task"
+#~ msgstr "Eliminar tarea"
+
+#~ msgid "Task"
+#~ msgstr "Tarea"
+
+#~ msgid "T"
+#~ msgstr "T"
+
+#~ msgid "List"
+#~ msgstr "Lista"
+
+#, fuzzy
+#~ msgid "time zone"
+#~ msgstr "Zona horaria:"
+
+#, fuzzy
+#~ msgid "category"
+#~ msgstr "Categoría"
+
+#, fuzzy
+#~ msgid "classification"
+#~ msgstr "Clasificación"
+
+#, fuzzy
+#~ msgid "meetings"
+#~ msgstr "Reunión"
+
+#, fuzzy
+#~ msgid "This is similar to <placeholder-1/>."
+#~ msgstr "gpg <placeholder-1/>"
+
+#, fuzzy
+#~ msgid "Assigned Task"
+#~ msgstr "Tareas asignadas"
+
+# #En conflicto con _Mensaje

+#~ msgid "Show"
+#~ msgstr "Mostrar"
+
+#~ msgid "Search"
+#~ msgstr "Buscar"
+
+#, fuzzy
+#~ msgid "Add Condition"
+#~ msgstr "Añadir a_cción"
+
+# Conflicto con _Ver del menú principal

+#, fuzzy
+#~ msgid "Clear"
+#~ msgstr "_Vaciar"
+
+#~ msgid "Q"
+#~ msgstr "Q"
+
+#~ msgid "Save Search"
+#~ msgstr "Guardar búsqueda"
+
+#, fuzzy
+#~ msgid "Edit Saved Searches"
+#~ msgstr "Editar búsquedas guardadas:"
+
+#~ msgid "Edit Rule"
+#~ msgstr "Editar regla"
+
+#~ msgid "On This Computer"
+#~ msgstr "En este equipo"
+
+#, fuzzy
+#~ msgid "Preferences"
+#~ msgstr "Prefere_ncias"
+
+#~ msgid "Calendar and Tasks"
+#~ msgstr "Calendario y tareas"
+
+#~ msgid "Display"
+#~ msgstr "Mostrar"
+
+#, fuzzy
+#~ msgid "SyncEvolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "SyncML"
+#~ msgstr "HotSync"
+
+#, fuzzy
+#~ msgid "GNOME Pilot Synchronization..."
+#~ msgstr "_sincronización de GNOME Pilot…"
+
+#~ msgid "/dev/pilot"
+#~ msgstr "/dev/pilot"
+
+#~ msgid "/dev/ttyS0"
+#~ msgstr "/dev/ttyS0"
+
+#~ msgid "/dev/ttyUSB1"
+#~ msgstr "/dev/ttyUSB1"
+
+#~ msgid "ttyUSB0"
+#~ msgstr "ttyUSB0"
+
+#~ msgid "ttyUSB1"
+#~ msgstr "ttyUSB1"
+
+#, fuzzy
+#~ msgid "Pilot Conduits"
+#~ msgstr "Seleccionar un conducto"
+
+#~ msgid "EAddress"
+#~ msgstr "EAddress"
+
+#~ msgid "ECalendar"
+#~ msgstr "ECalendar"
+
+#~ msgid "ETodo"
+#~ msgstr "ETodo"
+
+#, fuzzy
+#~ msgid "Enable"
+#~ msgstr "Activado"
+
+#~ msgid "Settings"
+#~ msgstr "Ajustes"
+
+#, fuzzy
+#~ msgid "Disabled"
+#~ msgstr "Deshabilitado:"
+
+#, fuzzy
+#~ msgid "Synchronize"
+#~ msgstr "Sincronizar:"
+
+#, fuzzy
+#~ msgid "Copy From Pilot"
+#~ msgstr "Copiar desde Pilot:"
+
+#, fuzzy
+#~ msgid "Copy To Pilot"
+#~ msgstr "Copiar hacia Pilot:"
+
+#~ msgid ".local/share/evolution"
+#~ msgstr ".local/share/evolution"
+
+#~ msgid "HotSync"
+#~ msgstr "HotSync"
+
+#, fuzzy
+#~ msgid "Evolution mailing list"
+#~ msgstr "Lista de correo %s"
+
+#, fuzzy
+#~ msgid "Evolution project website"
+#~ msgstr "Página web de Evolution"
+
+#, fuzzy
+#~ msgid "notification area"
+#~ msgstr "Mostrar icono en el área de _notificación"
+
+#, fuzzy
+#~ msgid "Open Memo"
+#~ msgstr "_Abrir nota"
+
+#~ msgid "Delete Memo"
+#~ msgstr "Eliminar nota"
+
+#~ msgid "Memo"
+#~ msgstr "Nota"
+
+#~ msgid "O"
+#~ msgstr "O"
+
+#, fuzzy
+#~ msgid "Shared Memo"
+#~ msgstr "Nota _compartida"
+
+#~ msgid "H"
+#~ msgstr "H"
+
+#~ msgid "Mail Preferences"
+#~ msgstr "Opciones de correo"
+
+#~ msgid "Message Fonts"
+#~ msgstr "Tipografías del mensaje"
+
+#, fuzzy
+#~ msgid "Use the same fonts as other applications"
+#~ msgstr "_Usar las mismas tipografías que en otras aplicaciones"
+
+#, fuzzy
+#~ msgid "bug report"
+#~ msgstr "Envía un informe de fallos"
+
+#, fuzzy
+#~ msgid "Properties"
+#~ msgstr "Propiedades:"
+
+#~ msgid "Work Offline"
+#~ msgstr "Trabajar desconectado"
+
+#, fuzzy
+#~ msgid "Download Messages for Offline Usage"
+#~ msgstr "_Descargar correos para trabajar sin conexión"
+
+#, fuzzy
+#~ msgid "Format"
+#~ msgstr "Formato:"
+
+#, fuzzy
+#~ msgid "Paragraph Style"
+#~ msgstr "Paraguay"
+
+#, fuzzy
+#~ msgid "Preformatted"
+#~ msgstr "Ver _sin formato"
+
+#~ msgid "Preview"
+#~ msgstr "Vista previa"
+
+#, fuzzy
+#~ msgid "Vertical View"
+#~ msgstr "Vista vertical:"
+
+#, fuzzy
+#~ msgid "Classical View"
+#~ msgstr "Vista clásica:"
+
+#~ msgid "Folder"
+#~ msgstr "Carpeta"
+
+#, fuzzy
+#~ msgid "Subscriptions"
+#~ msgstr "_Suscripciones…"
+
+#~ msgid "Trash"
+#~ msgstr "Papelera"
+
+#, fuzzy
+#~ msgid "Search folder"
+#~ msgstr "carpeta de búsqueda"
+
+#~ msgid "Junk"
+#~ msgstr "SPAM"
+
+#, fuzzy
+#~ msgid "Plugins"
+#~ msgstr "Com_plementos"
+
+#, fuzzy
+#~ msgid "Close"
+#~ msgstr "_Cerrar"
+
+#~ msgid "S"
+#~ msgstr "S"
+
+#, fuzzy
+#~ msgid "Select <placeholder-1/>."
+#~ msgstr "gpg <placeholder-1/>"
+
+#~ msgid "Mail Accounts"
+#~ msgstr "Cuentas de correo"
+
+#, fuzzy
+#~ msgid "Mark as Not Junk"
+#~ msgstr "Marcar como no _SPAM"
+
+#~ msgid "J"
+#~ msgstr "J"
+
+#~ msgid "Not Junk"
+#~ msgstr "No es SPAM"
+
+#, fuzzy
+#~ msgid "Remove"
+#~ msgstr "_Quitar"
+
+#~ msgid "Email"
+#~ msgstr "Correo-e"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "_Añadir"
+
+#, fuzzy
+#~ msgid "All Message Headers"
+#~ msgstr "_Todas las cabeceras del mensaje"
+
+#, fuzzy
+#~ msgid "Message Source"
+#~ msgstr "Me_nsaje en bruto"
+
+#~ msgid "U"
+#~ msgstr "U"
+
+#, fuzzy
+#~ msgid "Group By Threads"
+#~ msgstr "A_grupar por conversaciones"
+
+#, fuzzy
+#~ msgid "Remove This Column"
+#~ msgstr "Quitar esta c_olumna"
+
+#~ msgid "Add a Column"
+#~ msgstr "Añadir una columna"
+
+#, fuzzy
+#~ msgid "creating folders"
+#~ msgstr "Creando carpeta «%s»"
+
+#, fuzzy
+#~ msgid "creating filters"
+#~ msgstr "Borrar filtros"
+
+#, fuzzy
+#~ msgid "Message Filters..."
+#~ msgstr "Filtros de mensajes"
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#, fuzzy
+#~ msgid "Check for Supported Types"
+#~ msgstr "C_omprobar tipos soportados"
+
+#, fuzzy
+#~ msgid "here"
+#~ msgstr "Dónde:"
+
+#, fuzzy
+#~ msgid "Composing mail"
+#~ msgstr "Importando buzón de correo"
+
+#~ msgid "Send / Receive"
+#~ msgstr "Enviar / Recibir"
+
+#~ msgid "F9"
+#~ msgstr "F9"
+
+#, fuzzy
+#~ msgid "Check for new messages every ... minutes"
+#~ msgstr "Comprobar los mensajes nuevos cada x minutos"
+
+#~ msgid "Using Search Folders"
+#~ msgstr "Usar las carpetas de búsqueda"
+
+#, fuzzy
+#~ msgid "Refresh"
+#~ msgstr "Actualizar"
+
+#, fuzzy
+#~ msgid "filters"
+#~ msgstr "filtro"
+
+#, fuzzy
+#~ msgid "folder"
+#~ msgstr "Carpeta:"
+
+#~ msgid "filter"
+#~ msgstr "filtro"
+
+#~ msgid "Unmatched"
+#~ msgstr "No coincidente"
+
+#, fuzzy
+#~ msgid "custom ones"
+#~ msgstr "Usar tipografía personalizada"
+
+#, fuzzy
+#~ msgid "Any header including <placeholder-1/>."
+#~ msgstr "Cualquier cabecera, incluyendo las personalizadas."
+
+#, fuzzy
+#~ msgid "labels"
+#~ msgstr "Etiquetas"
+
+#, fuzzy
+#~ msgid "flagged for follow-up"
+#~ msgstr "Marcar los mensajes seleccionados para seguimiento"
+
+#, fuzzy
+#~ msgid "Checks whether the message is <placeholder-1/>."
+#~ msgstr "Comprueba si el mensaje está marcado para seguimiento."
+
+#~ msgid "Search Folders"
+#~ msgstr "Carpetas de búsqueda"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "Mensaje"
+
+#, fuzzy
+#~ msgid "Create Rule"
+#~ msgstr "Crear _regla"
+
+#, fuzzy
+#~ msgid "Create Search Folder From Search..."
+#~ msgstr "_Crear una carpeta de búsqueda desde la búsqueda…"
+
+#~ msgid "Rule name"
+#~ msgstr "Nombre de la regla"
+
+#, fuzzy
+#~ msgid "Available Search Folder conditions"
+#~ msgstr "Activar las Carpetas de _búsqueda"
+
+#, fuzzy
+#~ msgid "Find items"
+#~ msgstr "_Buscar elementos:"
+
+#~ msgid "Search Folder Sources"
+#~ msgstr "Orígenes de las carpetas de búsqueda"
+
+#~ msgid "F5"
+#~ msgstr "F5"
+
+#, fuzzy
+#~ msgid "Thread-*"
+#~ msgstr "_Conversación siguiente"
+
+#, fuzzy
+#~ msgid "subscriptions window"
+#~ msgstr "Anchura de la ventana «Suscripciones de carpetas»"
+
+#, fuzzy
+#~ msgid "Path"
+#~ msgstr "R_uta:"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#, fuzzy
+#~ msgid "Filters"
+#~ msgstr "filtro"
+
+#, fuzzy
+#~ msgid "Apply filters to new messages in INBOX"
+#~ msgstr ""
+#~ "Aplicar filtros en mensajes nuevos en la Bandeja de entrada en este "
+#~ "servidor"
+
+#~ msgid "Other..."
+#~ msgstr "Otro…"
+
+#, fuzzy
+#~ msgid "Leave messages on server"
+#~ msgstr "¿Borrar los mensajes en la carpeta de búsqueda?"
+
+#, fuzzy
+#~ msgid "subscribed folders"
+#~ msgstr "Desuscribirse de carpetas"
+
+#, fuzzy
+#~ msgid "Authenticate"
+#~ msgstr "A_utenticar"
+
+#, fuzzy
+#~ msgid "Global Address List/Active Directory"
+#~ msgstr "Lista de direcciones global"
+
+#, fuzzy
+#~ msgid "contact lists"
+#~ msgstr "Lista de contactos"
+
+#~ msgid "switcher"
+#~ msgstr "selector"
+
+#~ msgid "Mail Notification"
+#~ msgstr "Notificación de correo"
+
+#~ msgid "Options"
+#~ msgstr "Opciones"
+
+#, fuzzy
+#~ msgid "Request Read Receipt"
+#~ msgstr "_Solicitar confirmación de lectura"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Destinatarios del mensaje"
+
+#, fuzzy
+#~ msgid "Backspace"
+#~ msgstr "_Respaldo"
+
+#~ msgid "."
+#~ msgstr "."
+
+#~ msgid ","
+#~ msgstr ","
+
+#~ msgid "&gt;"
+#~ msgstr "&gt;"
+
+#~ msgid "&lt;"
+#~ msgstr "&lt;"
+
+#~ msgid "]"
+#~ msgstr "]"
+
+#~ msgid "["
+#~ msgstr "["
+
+#, fuzzy
+#~ msgid "Page Down"
+#~ msgstr "Página %d"
+
+#, fuzzy
+#~ msgid "Send and Receive"
+#~ msgstr "Enviar / Recibir"
+
+#, fuzzy
+#~ msgid "Work online"
+#~ msgstr "_Trabajar conectado"
+
+#, fuzzy
+#~ msgid "deleting emails"
+#~ msgstr "Borrado de correo"
+
+#, fuzzy
+#~ msgid "search folders"
+#~ msgstr "carpeta de búsqueda"
+
+#~ msgid "Label"
+#~ msgstr "Etiqueta"
+
+#, fuzzy
+#~ msgid "New Label"
+#~ msgstr "Etiqueta n_ueva"
+
+#~ msgid "IMAP Subscriptions Manager"
+#~ msgstr "Gestor de suscripciones IMAP"
+
+#~ msgid "IMAP Features"
+#~ msgstr "Características IMAP"
+
+#, fuzzy
+#~ msgid "Basic Headers"
+#~ msgstr "Cabeceras básicas:"
+
+#~ msgid "Custom Headers"
+#~ msgstr "Cabeceras personalizadas"
+
+#, fuzzy
+#~ msgid "Mark for Follow Up..."
+#~ msgstr "Marcar para se_guimiento…"
+
+#, fuzzy
+#~ msgid "Click <placeholder-1/>"
+#~ msgstr "gpg <placeholder-1/>"
+
+#, fuzzy
+#~ msgid "Mark as"
+#~ msgstr "Marcar como _SPAM"
+
+#, fuzzy
+#~ msgid "Follow Up..."
+#~ msgstr "Se_guimiento…"
+
+#~ msgid "G"
+#~ msgstr "G"
+
+#, fuzzy
+#~ msgid "Flag Completed"
+#~ msgstr "Ma_rcar como terminado"
+
+#, fuzzy
+#~ msgid "Clear Flag"
+#~ msgstr "_Quitar marca"
+
+#, fuzzy
+#~ msgid "add a Flag Status column"
+#~ msgstr "Marca de estado"
+
+#~ msgid "search folder"
+#~ msgstr "carpeta de búsqueda"
+
+#, fuzzy
+#~ msgid "Mark as Important"
+#~ msgstr "Marcar como imp_ortante"
+
+#~ msgid "Important"
+#~ msgstr "Importante"
+
+#, fuzzy
+#~ msgid "New Folder"
+#~ msgstr "Carpeta nueva:"
+
+#, fuzzy
+#~ msgid "Create"
+#~ msgstr "Creado"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Mover a la carpeta"
+
+#~ msgid "V"
+#~ msgstr "V"
+
+#~ msgid "Apply filters to new messages in Inbox on this server"
+#~ msgstr ""
+#~ "Aplicar filtros en mensajes nuevos en la Bandeja de entrada en este "
+#~ "servidor"
+
+# Colisión en la A

+#, fuzzy
+#~ msgid "Apply Filters"
+#~ msgstr "Aplicar _filtros"
+
+#~ msgid "Y"
+#~ msgstr "Y"
+
+#~ msgid "Select All"
+#~ msgstr "Seleccionar todo"
+
+#~ msgid "A"
+#~ msgstr "A"
+
+#~ msgid "Message Filters"
+#~ msgstr "Filtros de mensajes"
+
+#~ msgid "Then"
+#~ msgstr "Luego"
+
+#, fuzzy
+#~ msgid "Add Action"
+#~ msgstr "Añadir a_cción"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Parar de procesar"
+
+#, fuzzy
+#~ msgid "Actions"
+#~ msgstr "A_cciones"
+
+#~ msgid "filters.xml"
+#~ msgstr "filters.xml"
+
+#, fuzzy
+#~ msgid ""
+#~ "If the error message: <placeholder-1/> pops up, perform the following "
+#~ "steps:"
+#~ msgstr "Para ordenar los mensajes, realice el siguiente procedimiento:"
+
+#~ msgid "~/.evolution/mail/local/"
+#~ msgstr "~/.evolution/mail/local/"
+
+#~ msgid "~/.local/share/evolution/mail/local/"
+#~ msgstr "~/.local/share/evolution/mail/local/"
+
+#~ msgid "evolution --force-shutdown"
+#~ msgstr "evolution --force-shutdown"
+
+#, fuzzy
+#~ msgid "Go"
+#~ msgstr "G"
+
+#, fuzzy
+#~ msgid "Location..."
+#~ msgstr "Lugar"
+
+#, fuzzy
+#~ msgid "Folder for sent messages"
+#~ msgstr "Seleccione uno o más mensajes."
+
+#, fuzzy
+#~ msgid "added your certificate"
+#~ msgstr "Falló al importar el certificado"
+
+#, fuzzy
+#~ msgid "S/MIME Sign"
+#~ msgstr "Fi_rmar con S/MIME"
+
+#, fuzzy
+#~ msgid "S/MIME Encrypt"
+#~ msgstr "C_ifrar con S/MIME"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "MIME seguro (S/MIME)"
+
+#, fuzzy
+#~ msgid "Select"
+#~ msgstr "Seleccionar…"
+
+#, fuzzy
+#~ msgid "Signing Certificate"
+#~ msgstr "Certificado de _firma:"
+
+#, fuzzy
+#~ msgid "Encryption Certificate"
+#~ msgstr "Certificado de ci_frado:"
+
+#~ msgid "Certificates"
+#~ msgstr "Certificados"
+
+#~ msgid "Your Certificates"
+#~ msgstr "Sus certificados"
+
+#~ msgid "Import"
+#~ msgstr "Importar"
+
+#~ msgid "Open"
+#~ msgstr "Abrir"
+
+#~ msgid "Contact Certificates"
+#~ msgstr "Certificados de contactos"
+
+#~ msgid "Authorities"
+#~ msgstr "Autoridades"
+
+#, fuzzy
+#~ msgid "PGP Sign"
+#~ msgstr "_Firmar con PGP"
+
+#, fuzzy
+#~ msgid "PGP Encrypt"
+#~ msgstr "Cif_rar con PGP"
+
+#, fuzzy
+#~ msgid "PGP/GPG Key ID"
+#~ msgstr "ID de c_lave GPG/PGP:"
+
+#~ msgid "gpg --list-keys"
+#~ msgstr "gpg --list-keys"
+
+#~ msgid "gpg --recv-keys --keyserver wwwkeys.pgp.net keyid"
+#~ msgstr "gpg --recv-keys --keyserver wwwkeys.pgp.net keyid"
+
+#~ msgid "keyid"
+#~ msgstr "keyid"
+
+#~ msgid "Security Information"
+#~ msgstr "Información de seguridad"
+
+#~ msgid "gpg --gen-key"
+#~ msgstr "gpg --gen-key"
+
+#~ msgid ""
+#~ "/home/you/.gnupg/pubring.gpg ---------------------------- pub "
+#~ "1024D/32j38dk2 2001-06-20 you &lt;you@example.com&gt; sub 1024g/289sklj3 "
+#~ "2011-06-20 [expires: 2012-11-14]"
+#~ msgstr ""
+#~ "/home/you/.gnupg/pubring.gpg ---------------------------- pub "
+#~ "1024D/32j38dk2 2001-06-20 you &lt;you@example.com&gt; sub 1024g/289sklj3 "
+#~ "2011-06-20 [expires: 2012-11-14]"
+
+#~ msgid "~/.gnupg/pubring.gpg"
+#~ msgstr "~/.gnupg/pubring.gpg"
+
+#~ msgid "1024D"
+#~ msgstr "1024D"
+
+#~ msgid "pub"
+#~ msgstr "pub"
+
+#~ msgid "32j38dk2"
+#~ msgstr "32j38dk2"
+
+#~ msgid "gpg --send-keys --keyserver wwwkeys.pgp.net <placeholder-1/>"
+#~ msgstr "gpg --send-keys --keyserver wwwkeys.pgp.net <placeholder-1/>"
+
+#, fuzzy
+#~ msgid "Remove Duplicate Messages"
+#~ msgstr "Quitar correos _duplicados"
+
+#~ msgid "$HOME/.local/share/evolution/mail/pop/"
+#~ msgstr "$HOME/.local/share/evolution/mail/pop/"
+
+#~ msgid "Headers"
+#~ msgstr "Cabeceras"
+
+#, fuzzy
+#~ msgid "Show the photograph of sender in the message preview"
+#~ msgstr "_Mostrar la foto del remitente en la vista previa del mensaje"
+
+#, fuzzy
+#~ msgid "Search for sender photograph only in local address books"
+#~ msgstr ""
+#~ "Bu_scar la foto del remitente sólo en libretas de direcciones locales"
+
+#, fuzzy
+#~ msgid "Load Images"
+#~ msgstr "Cargar _imágenes"
+
+#~ msgid "I"
+#~ msgstr "I"
+
+#~ msgid "HTML Messages"
+#~ msgstr "Mensajes HTML"
+
+#~ msgid "Loading Images"
+#~ msgstr "Cargando imágenes"
+
+#, fuzzy
+#~ msgid "Load images only in messages from contacts"
+#~ msgstr "Cargar i_mágenes en los mensajes de mis contactos"
+
+#, fuzzy
+#~ msgid "Always show address of the autocompleted contact"
+#~ msgstr "_Siempre mostrar la dirección del contacto autocompletado"
+
+#, fuzzy
+#~ msgid "To:"
+#~ msgstr "_Para:"
+
+#, fuzzy
+#~ msgid "Cc:"
+#~ msgstr "_Cc:"
+
+#~ msgid "From:"
+#~ msgstr "De:"
+
+#~ msgid "Character Encoding"
+#~ msgstr "Codificación de caracteres"
+
+#~ msgid "Message Display"
+#~ msgstr "Mostrado de mensajes"
+
+#, fuzzy
+#~ msgid "Default character encoding"
+#~ msgstr "_Codificación de caracteres predeterminada:"
+
+#, fuzzy
+#~ msgid "Show Deleted Messages"
+#~ msgstr "Mostrar los mensajes _eliminados"
+
+#, fuzzy
+#~ msgid "Expunge"
+#~ msgstr "_Purgar"
+
+#~ msgid "E"
+#~ msgstr "E"
+
+#, fuzzy
+#~ msgid "Undelete message"
+#~ msgstr "_Recuperar mensaje"
+
+#, fuzzy
+#~ msgid "Mail Message"
+#~ msgstr "_Mensaje de correo"
+
+#~ msgid "M"
+#~ msgstr "M"
+
+#, fuzzy
+#~ msgid "Send"
+#~ msgstr "_Enviar"
+
+#, fuzzy
+#~ msgid "Return"
+#~ msgstr "devuelve"
+
+#~ msgid "Composer Preferences"
+#~ msgstr "Editor de correo"
+
+#~ msgid "Spell Checking"
+#~ msgstr "Ortografía"
+
+#, fuzzy
+#~ msgid "Languages"
+#~ msgstr "_Idiomas"
+
+#, fuzzy
+#~ msgid "Checking spelling while I type"
+#~ msgstr "Comprobar orto_grafía mientras se escribe"
+
+#~ msgid "F7"
+#~ msgstr "F7"
+
+#, fuzzy
+#~ msgid "Bcc:"
+#~ msgstr "Cc_o:"
+
+#, fuzzy
+#~ msgid "Bcc Field"
+#~ msgstr "Campo «Cc_o»"
+
+#, fuzzy
+#~ msgid "Find"
+#~ msgstr "Buscar:"
+
+#, fuzzy
+#~ msgid "<placeholder-1/>:"
+#~ msgstr "gpg <placeholder-1/>"
+
+#, fuzzy
+#~ msgid "Replace"
+#~ msgstr "Reemplazar:"
+
+#, fuzzy
+#~ msgid "Regular expressions"
+#~ msgstr "expresión regular"
+
+#~ msgid "Reply"
+#~ msgstr "Responder"
+
+#~ msgid "Reply to List"
+#~ msgstr "Responder a la lista"
+
+#~ msgid "Replies and Forwards"
+#~ msgstr "Respuestas y reenvíos"
+
+#, fuzzy
+#~ msgid "Forward style"
+#~ msgstr "_Estilo de reenvío:"
+
+#, fuzzy
+#~ msgid "Insert"
+#~ msgstr "_Insertar"
+
+#, fuzzy
+#~ msgid "Prioritize Message"
+#~ msgstr "Priorizar mensaje:"
+
+#~ msgid "Templates"
+#~ msgstr "Plantillas"
+
+#, fuzzy
+#~ msgid "Move to folder"
+#~ msgstr "Mover a la carpeta"
+
+#, fuzzy
+#~ msgid "Copy to folder"
+#~ msgstr "Copiar a la carpeta"
+
+#~ msgid "Save as Template"
+#~ msgstr "Guardar como plantilla"
+
+#~ msgid "signature"
+#~ msgstr "firma"
+
+#~ msgid "Optional Information"
+#~ msgstr "Información opcional"
+
+#~ msgid "--"
+#~ msgstr "--"
+
+#, fuzzy
+#~ msgid "encryption"
+#~ msgstr "Cifrado"
+
+#, fuzzy
+#~ msgid "Composer preferences"
+#~ msgstr "Editor de correo"
+
+#~ msgid "Signatures"
+#~ msgstr "Firmas"
+
+#, fuzzy
+#~ msgid "account settings"
+#~ msgstr "Configuración de la cuenta de Yahoo:"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#, fuzzy
+#~ msgid "Header 1"
+#~ msgstr "Cabecera"
+
+#, fuzzy
+#~ msgid "Header 6"
+#~ msgstr "Cabecera"
+
+#, fuzzy
+#~ msgid "Preformat"
+#~ msgstr "Formato de la hora:"
+
+#, fuzzy
+#~ msgid "Bulleted List"
+#~ msgstr "Eli_minar la lista de notas"
+
+#, fuzzy
+#~ msgid "Style"
+#~ msgstr "Nombre del estilo:"
+
+#, fuzzy
+#~ msgid "Page Style"
+#~ msgstr "Configuración de la página:"
+
+#, fuzzy
+#~ msgid "Table..."
+#~ msgstr "Tabla"
+
+#, fuzzy
+#~ msgid "Rule..."
+#~ msgstr "_Nombre completo…"
+
+#~ msgid "HTML"
+#~ msgstr "HTML"
+
+#~ msgid "Default Behavior"
+#~ msgstr "Comportamiento predeterminado"
+
+#, fuzzy
+#~ msgid "Format messages in HTML"
+#~ msgstr "Dar formato _HTML a los mensajes"
+
+#, fuzzy
+#~ msgid "Insert Link"
+#~ msgstr "Insertar un enlace"
+
+#, fuzzy
+#~ msgid "Image..."
+#~ msgstr "Imagen"
+
+# #-#-#-#-#  usage-exchange.po  #-#-#-#-#

+# index.docbook:342, index.docbook:514

+#~ msgid "Forward"
+#~ msgstr "Reenviar"
+
+#~ msgid "F"
+#~ msgstr "F"
+
+#, fuzzy
+#~ msgid "Forward as"
+#~ msgstr "Reenviar _como"
+
+#, fuzzy
+#~ msgid "Forward as..."
+#~ msgstr "_Reenviar contacto…"
+
+#, fuzzy
+#~ msgid "Forward Style"
+#~ msgstr "_Estilo de reenvío:"
+
+#~ msgid "Custom Header"
+#~ msgstr "Cabecera personalizada"
+
+#, fuzzy
+#~ msgid "Enable <placeholder-1/>."
+#~ msgstr "gpg <placeholder-1/>"
+
+#~ msgid "/apps/evolution/mail/composer/message_attribution"
+#~ msgstr "/apps/evolution/mail/composer/message_attribution"
+
+#, fuzzy
+#~ msgid "Date/Time format"
+#~ msgstr "Formato de la fecha y hora"
+
+#, fuzzy
+#~ msgid "Add a Column..."
+#~ msgstr "Añadir una c_olumna…"
+
+#~ msgid "Read Messages"
+#~ msgstr "Mensajes leídos"
+
+#, fuzzy
+#~ msgid "Show Message Preview"
+#~ msgstr "Mostrar vista _previa del correo"
+
+#, fuzzy
+#~ msgid "Show Hidden Messages"
+#~ msgstr "_Mostrar mensajes ocultos"
+
+#~ msgid "Email Accounts"
+#~ msgstr "Cuentas de correo-e"
+
+#, fuzzy
+#~ msgid "Forward as iCalendar"
+#~ msgstr "Reenviar como i_Calendar…"
+
+#, fuzzy
+#~ msgid "Add Attachment..."
+#~ msgstr "_Añadir adjunto…"
+
+#, fuzzy
+>>>>>>> master
 #~ msgid "Save All"
 #~ msgstr "Guardar _todo"
 
diff --git a/libgnomecanvas/gnome-canvas-pixbuf.c b/libgnomecanvas/gnome-canvas-pixbuf.c
index 091db2a72a..71c7d95906 100644
--- a/libgnomecanvas/gnome-canvas-pixbuf.c
+++ b/libgnomecanvas/gnome-canvas-pixbuf.c
@@ -67,7 +67,6 @@ static void gnome_canvas_pixbuf_bounds (GnomeCanvasItem *item,
 
 G_DEFINE_TYPE (GnomeCanvasPixbuf, gnome_canvas_pixbuf, GNOME_TYPE_CANVAS_ITEM)
 
-
 
 /* Class initialization function for the pixbuf canvas item */
 static void
@@ -128,8 +127,6 @@ gnome_canvas_pixbuf_dispose (GnomeCanvasItem *object)
 		GNOME_CANVAS_ITEM_CLASS (gnome_canvas_pixbuf_parent_class)->dispose (object);
 }
 
-
-
 /* Set_property handler for the pixbuf canvas item */
 static void
 gnome_canvas_pixbuf_set_property (GObject *object,
@@ -195,8 +192,6 @@ gnome_canvas_pixbuf_get_property (GObject *object,
 	}
 }
 
-
-
 /* Bounds and utilities */
 
 /* Recomputes the bounding box of a pixbuf canvas item.  The horizontal and
@@ -233,8 +228,6 @@ recompute_bounding_box (GnomeCanvasPixbuf *gcp)
 	item->y2 = ceil (y2);
 }
 
-
-
 /* Update sequence */
 
 /* Update handler for the pixbuf canvas item */
@@ -259,8 +252,6 @@ gnome_canvas_pixbuf_update (GnomeCanvasItem *item,
 		item->canvas, item->x1, item->y1, item->x2, item->y2);
 }
 
-
-
 /* Draw handler for the pixbuf canvas item */
 static void
 gnome_canvas_pixbuf_draw (GnomeCanvasItem *item,
@@ -290,8 +281,6 @@ gnome_canvas_pixbuf_draw (GnomeCanvasItem *item,
 	cairo_restore (cr);
 }
 
-
-
 /* Point handler for the pixbuf canvas item */
 static GnomeCanvasItem *
 gnome_canvas_pixbuf_point (GnomeCanvasItem *item,
@@ -333,8 +322,6 @@ gnome_canvas_pixbuf_point (GnomeCanvasItem *item,
 		return item;
 }
 
-
-
 /* Bounds handler for the pixbuf canvas item */
 static void
 gnome_canvas_pixbuf_bounds (GnomeCanvasItem *item,
diff --git a/libgnomecanvas/gnome-canvas-pixbuf.h b/libgnomecanvas/gnome-canvas-pixbuf.h
index 3c4141da72..3fe4980691 100644
--- a/libgnomecanvas/gnome-canvas-pixbuf.h
+++ b/libgnomecanvas/gnome-canvas-pixbuf.h
@@ -27,8 +27,6 @@
 
 G_BEGIN_DECLS
 
-
-
 #define GNOME_TYPE_CANVAS_PIXBUF            (gnome_canvas_pixbuf_get_type ())
 #define GNOME_CANVAS_PIXBUF(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_CANVAS_PIXBUF, GnomeCanvasPixbuf))
 #define GNOME_CANVAS_PIXBUF_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_CANVAS_PIXBUF, GnomeCanvasPixbufClass))
@@ -53,8 +51,6 @@ struct _GnomeCanvasPixbufClass {
 
 GType gnome_canvas_pixbuf_get_type (void) G_GNUC_CONST;
 
-
-
 G_END_DECLS
 
 #endif
diff --git a/libgnomecanvas/gnome-canvas-text.c b/libgnomecanvas/gnome-canvas-text.c
index 70b7142ac0..8f921a0d3c 100644
--- a/libgnomecanvas/gnome-canvas-text.c
+++ b/libgnomecanvas/gnome-canvas-text.c
@@ -46,7 +46,6 @@
 #include "gnome-canvas-util.h"
 #include "gnome-canvas-i18n.h"
 
-
 
 /* Object argument IDs */
 enum {
@@ -135,8 +134,6 @@ static void add_attr (PangoAttrList  *attr_list,
 
 static GnomeCanvasItemClass *parent_class;
 
-
-
 /**
  * gnome_canvas_text_get_type:
  * @void:
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 97a2fe39a4..1ddbec649c 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -25,16 +25,17 @@ libevolution_mail_la_CPPFLAGS =				\
 	-I$(top_srcdir)/shell				\
 	-I$(top_srcdir)/smime/lib			\
 	-I$(top_srcdir)/smime/gui			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(CERT_UI_CFLAGS)				\
 	$(CANBERRA_CFLAGS)				\
 	$(CLUTTER_CFLAGS)				\
+	$(GTKHTML_CFLAGS)				\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
 	-DEVOLUTION_ICONDIR=\""$(icondir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"		\
+	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
 	-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\"	\
 	-DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\"	\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
@@ -209,14 +210,13 @@ libevolution_mail_la_LIBADD =				\
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
 	$(top_builddir)/em-format/libemformat.la	\
 	$(top_builddir)/filter/libfilter.la		\
-	$(EVOLUTION_MAIL_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
+	$(GNOME_PLATFORM_LIBS)				\
 	$(CERT_UI_LIBS)					\
 	$(CANBERRA_LIBS)				\
 	$(CLUTTER_LIBS)					\
 	$(GTKHTML_LIBS)					\
-	$(E_WIDGETS_LIBS)				\
-	$(SMIME_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)
+	$(SMIME_LIBS)
 
 libevolution_mail_la_LDFLAGS = $(NO_UNDEFINED)
 
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index ff37b7a93a..56f2dc67b3 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -171,7 +171,7 @@ mail_backend_prepare_for_offline_cb (EShell *shell,
 	}
 
 	e_mail_store_foreach (
-		session, (GFunc) mail_store_prepare_for_offline_cb, activity);
+		backend, (GFunc) mail_store_prepare_for_offline_cb, activity);
 }
 
 /* Helper for mail_backend_prepare_for_online_cb() */
@@ -197,7 +197,7 @@ mail_backend_prepare_for_online_cb (EShell *shell,
 	camel_session_set_online (CAMEL_SESSION (session), TRUE);
 
 	e_mail_store_foreach (
-		session, (GFunc) mail_store_prepare_for_online_cb, activity);
+		backend, (GFunc) mail_store_prepare_for_online_cb, activity);
 }
 
 /* Helper for mail_backend_prepare_for_quit_cb() */
@@ -298,13 +298,13 @@ mail_backend_prepare_for_quit_cb (EShell *shell,
 
 	if (delete_junk)
 		e_mail_store_foreach (
-			session, (GFunc) mail_backend_delete_junk, backend);
+			backend, (GFunc) mail_backend_delete_junk, backend);
 
 	sync_data.activity = activity;
 	sync_data.empty_trash = empty_trash;
 
 	e_mail_store_foreach (
-		session, (GFunc) mail_backend_final_sync, &sync_data);
+		backend, (GFunc) mail_backend_final_sync, &sync_data);
 
 	/* Now we poll until all activities are actually cancelled or finished.
 	 * Reffing the activity delays quitting; the reference count
@@ -572,14 +572,15 @@ mail_backend_folder_changed_cb (MailFolderCache *folder_cache,
 	folder_type = (flags & CAMEL_FOLDER_TYPE_MASK);
 	target->is_inbox = (folder_type == CAMEL_FOLDER_TYPE_INBOX);
 
-	model = em_folder_tree_model_get_default (mail_backend);
+	model = em_folder_tree_model_get_default ();
 	target->display_name = em_folder_tree_model_get_folder_name (
 		model, store, folder_name);
 
 	if (target->new > 0)
 		e_shell_event (e_shell_backend_get_shell (E_SHELL_BACKEND (mail_backend)), "mail-icon", (gpointer) "mail-unread");
 
-	/** @Event: folder.changed
+	/**
+	 * @Event: folder.changed
 	 * @Title: Folder changed
 	 * @Target: EMEventTargetFolder
 	 *
@@ -773,8 +774,12 @@ mail_backend_constructed (GObject *object)
 	e_account_combo_box_set_session (CAMEL_SESSION (priv->session));
 
 	/* FIXME EMailBackend should own the default EMFolderTreeModel. */
-	folder_tree_model = em_folder_tree_model_get_default (E_MAIL_BACKEND (shell_backend));
-	em_folder_tree_model_set_session (folder_tree_model, priv->session);
+	folder_tree_model = em_folder_tree_model_get_default ();
+
+	/* FIXME This is creating a circular reference.  Perhaps the
+	 *       should only hold a weak pointer to EMailBackend? */
+	em_folder_tree_model_set_backend (
+		folder_tree_model, E_MAIL_BACKEND (object));
 
 	g_signal_connect (
 		shell, "prepare-for-offline",
diff --git a/mail/e-mail-folder-utils.c b/mail/e-mail-folder-utils.c
index 7c84957f6a..77a9708e5f 100644
--- a/mail/e-mail-folder-utils.c
+++ b/mail/e-mail-folder-utils.c
@@ -1630,3 +1630,51 @@ e_mail_folder_uri_from_folder (CamelFolder *folder)
 
 	return e_mail_folder_uri_build (store, folder_name);
 }
+
+/**
+ * e_mail_folder_uri_to_markup:
+ * @session: a #CamelSession
+ * @folder_uri: a folder URI
+ * @error: return location for a #GError, or %NULL
+ *
+ * Converts @folder_uri to a markup string suitable for displaying to users.
+ * The string consists of the #CamelStore display name (in bold), followed
+ * by the folder path.  If the URI is malformed or no corresponding store
+ * exists, the function sets @error and returns %NULL.  Free the returned
+ * string with g_free().
+ *
+ * Returns: a newly-allocated markup string, or %NULL
+ **/
+gchar *
+e_mail_folder_uri_to_markup (CamelSession *session,
+                             const gchar *folder_uri,
+                             GError **error)
+{
+	CamelStore *store = NULL;
+	const gchar *display_name;
+	gchar *folder_name = NULL;
+	gchar *markup;
+	gboolean success;
+
+	g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);
+	g_return_val_if_fail (folder_uri != NULL, NULL);
+
+	success = e_mail_folder_uri_parse (
+		session, folder_uri, &store, &folder_name, error);
+
+	if (!success)
+		return NULL;
+
+	g_return_val_if_fail (CAMEL_IS_STORE (store), NULL);
+	g_return_val_if_fail (folder_name != NULL, NULL);
+
+	display_name = camel_service_get_display_name (CAMEL_SERVICE (store));
+
+	markup = g_markup_printf_escaped (
+		"<b>%s</b> : %s", display_name, folder_name);
+
+	g_object_unref (store);
+	g_free (folder_name);
+
+	return markup;
+}
diff --git a/mail/e-mail-folder-utils.h b/mail/e-mail-folder-utils.h
index c82d806d7a..9e8dd0f050 100644
--- a/mail/e-mail-folder-utils.h
+++ b/mail/e-mail-folder-utils.h
@@ -155,6 +155,9 @@ gboolean	e_mail_folder_uri_equal		(CamelSession *session,
 						 const gchar *folder_uri_a,
 						 const gchar *folder_uri_b);
 gchar *		e_mail_folder_uri_from_folder	(CamelFolder *folder);
+gchar *		e_mail_folder_uri_to_markup	(CamelSession *session,
+						 const gchar *folder_uri,
+						 GError **error);
 
 G_END_DECLS
 
diff --git a/mail/e-mail-junk-filter.h b/mail/e-mail-junk-filter.h
index 34d95e56c7..74a7840c2d 100644
--- a/mail/e-mail-junk-filter.h
+++ b/mail/e-mail-junk-filter.h
@@ -20,7 +20,7 @@
 #define E_MAIL_JUNK_FILTER_H
 
 #include <gtk/gtk.h>
-#include <e-util/e-extension.h>
+#include <libebackend/e-extension.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_JUNK_FILTER \
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 07b2a8bb2c..10afa58e04 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -701,7 +701,6 @@ migrate_to_db (EShellBackend *shell_backend)
 	EMMigrateSession *session;
 	EAccountList *accounts;
 	EMailBackend *mail_backend;
-	EMailSession *mail_session;
 	EIterator *iter;
 	gint i = 0, len;
 	CamelStore *store = NULL;
@@ -713,11 +712,10 @@ migrate_to_db (EShellBackend *shell_backend)
 		return;
 
 	mail_backend = E_MAIL_BACKEND (shell_backend);
-	mail_session = e_mail_backend_get_session (mail_backend);
 	data_dir = e_shell_backend_get_data_dir (shell_backend);
 
 	/* Initialize the mail stores early so we can add a new one. */
-	e_mail_store_init (mail_session, data_dir);
+	e_mail_store_init (mail_backend, data_dir);
 
 	iter = e_list_get_iterator ((EList *) accounts);
 	len = e_list_length ((EList *) accounts);
@@ -772,7 +770,7 @@ migrate_to_db (EShellBackend *shell_backend)
 		    && strncmp (service->url, "mbox:", 5) != 0) {
 
 			store = e_mail_store_add_by_account (
-				mail_session, account);
+				mail_backend, account);
 
 			info = camel_store_get_folder_info_sync (
 				store, NULL,
@@ -1020,7 +1018,6 @@ create_mbox_account (EShellBackend *shell_backend,
                      EMMigrateSession *session)
 {
 	EMailBackend *mail_backend;
-	EMailSession *mail_session;
 	CamelStore *store;
 	CamelURL *url;
 	EAccountList *accounts;
@@ -1029,11 +1026,10 @@ create_mbox_account (EShellBackend *shell_backend,
 	gchar *name, *id, *temp, *uri, *folder_uri;
 
 	mail_backend = E_MAIL_BACKEND (shell_backend);
-	mail_session = e_mail_backend_get_session (mail_backend);
 	data_dir = e_shell_backend_get_data_dir (shell_backend);
 
 	/* Initialize the mail stores early so we can add a new one. */
-	e_mail_store_init (mail_session, data_dir);
+	e_mail_store_init (mail_backend, data_dir);
 
 	account = e_account_new ();
 	account->enabled = TRUE;
@@ -1067,7 +1063,7 @@ create_mbox_account (EShellBackend *shell_backend,
 	}
 
 	e_account_list_add (accounts, account);
-	store = e_mail_store_add_by_account (mail_session, account);
+	store = e_mail_store_add_by_account (mail_backend, account);
 
 	folder_uri = e_mail_folder_uri_build (store, "Sent");
 	e_account_set_string (
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 4cc9465c7d..725a0c6d7c 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -287,7 +287,6 @@ e_mail_reader_mark_as_read (EMailReader *reader,
                             const gchar *uid)
 {
 	EMailBackend *backend;
-	EMailSession *session;
 	EMFormatHTML *formatter;
 	CamelFolder *folder;
 	guint32 mask, set;
@@ -300,15 +299,13 @@ e_mail_reader_mark_as_read (EMailReader *reader,
 	backend = e_mail_reader_get_backend (reader);
 	formatter = e_mail_reader_get_formatter (reader);
 
-	session = e_mail_backend_get_session (backend);
-
 	flags = camel_folder_get_message_flags (folder, uid);
 
 	if (!(flags & CAMEL_MESSAGE_SEEN)) {
 		CamelMimeMessage *message;
 
 		message = EM_FORMAT (formatter)->message;
-		em_utils_handle_receipt (session, folder, uid, message);
+		em_utils_handle_receipt (backend, folder, uid, message);
 	}
 
 	mask = CAMEL_MESSAGE_SEEN;
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index a8e3899ace..76502314ab 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -300,7 +300,7 @@ action_mail_copy_cb (GtkAction *action,
 	window = e_mail_reader_get_window (reader);
 	uids = e_mail_reader_get_selected_uids (reader);
 
-	model = em_folder_tree_model_get_default (backend);
+	model = em_folder_tree_model_get_default ();
 
 	dialog = em_folder_selector_new (
 		window, backend, model,
@@ -479,8 +479,8 @@ action_mail_flag_for_followup_cb (GtkAction *action,
 	em_utils_flag_for_followup (reader, folder, uids);
 }
 
-static void
-check_close_browser_reader (EMailReader *reader)
+static gboolean
+get_close_browser_reader (EMailReader *reader)
 {
 	GConfClient *client;
 	const gchar *key;
@@ -489,7 +489,7 @@ check_close_browser_reader (EMailReader *reader)
 
 	/* only allow closing of a mail browser and nothing else */
 	if (!E_IS_MAIL_BROWSER (reader))
-		return;
+		return FALSE;
 
 	client = gconf_client_get_default ();
 
@@ -529,11 +529,16 @@ check_close_browser_reader (EMailReader *reader)
 	}
 
 	g_free (value);
+	g_object_unref (client);
 
-	if (close_it)
-		gtk_widget_destroy (GTK_WIDGET (reader));
+	return close_it;
+}
 
-	g_object_unref (client);
+static void
+check_close_browser_reader (EMailReader *reader)
+{
+	if (get_close_browser_reader (reader))
+		gtk_widget_destroy (GTK_WIDGET (reader));
 }
 
 static void
@@ -543,11 +548,13 @@ action_mail_forward_cb (GtkAction *action,
 	CamelFolder *folder;
 	GtkWindow *window;
 	GPtrArray *uids;
+	gboolean close_reader;
 
 	folder = e_mail_reader_get_folder (reader);
 	window = e_mail_reader_get_window (reader);
 	uids = e_mail_reader_get_selected_uids (reader);
 	g_return_if_fail (uids != NULL);
+	close_reader = get_close_browser_reader (reader);
 
 	/* XXX Either e_mail_reader_get_selected_uids()
 	 *     or MessageList should do this itself. */
@@ -556,11 +563,10 @@ action_mail_forward_cb (GtkAction *action,
 	if (em_utils_ask_open_many (window, uids->len))
 		em_utils_forward_messages (
 			reader, folder, uids,
-			e_mail_reader_get_forward_style (reader));
+			e_mail_reader_get_forward_style (reader),
+			close_reader ? GTK_WIDGET (reader) : NULL);
 
 	g_ptr_array_unref (uids);
-
-	check_close_browser_reader (reader);
 }
 
 static void
@@ -570,11 +576,13 @@ action_mail_forward_attached_cb (GtkAction *action,
 	CamelFolder *folder;
 	GtkWindow *window;
 	GPtrArray *uids;
+	gboolean close_reader;
 
 	folder = e_mail_reader_get_folder (reader);
 	window = e_mail_reader_get_window (reader);
 	uids = e_mail_reader_get_selected_uids (reader);
 	g_return_if_fail (uids != NULL);
+	close_reader = get_close_browser_reader (reader);
 
 	/* XXX Either e_mail_reader_get_selected_uids()
 	 *     or MessageList should do this itself. */
@@ -583,11 +591,10 @@ action_mail_forward_attached_cb (GtkAction *action,
 	if (em_utils_ask_open_many (window, uids->len))
 		em_utils_forward_messages (
 			reader, folder, uids,
-			E_MAIL_FORWARD_STYLE_ATTACHED);
+			E_MAIL_FORWARD_STYLE_ATTACHED,
+			close_reader ? GTK_WIDGET (reader) : NULL);
 
 	g_ptr_array_unref (uids);
-
-	check_close_browser_reader (reader);
 }
 
 static void
@@ -597,11 +604,13 @@ action_mail_forward_inline_cb (GtkAction *action,
 	CamelFolder *folder;
 	GtkWindow *window;
 	GPtrArray *uids;
+	gboolean close_reader;
 
 	folder = e_mail_reader_get_folder (reader);
 	window = e_mail_reader_get_window (reader);
 	uids = e_mail_reader_get_selected_uids (reader);
 	g_return_if_fail (uids != NULL);
+	close_reader = get_close_browser_reader (reader);
 
 	/* XXX Either e_mail_reader_get_selected_uids()
 	 *     or MessageList should do this itself. */
@@ -610,11 +619,10 @@ action_mail_forward_inline_cb (GtkAction *action,
 	if (em_utils_ask_open_many (window, uids->len))
 		em_utils_forward_messages (
 			reader, folder, uids,
-			E_MAIL_FORWARD_STYLE_INLINE);
+			E_MAIL_FORWARD_STYLE_INLINE,
+			close_reader ? GTK_WIDGET (reader) : NULL);
 
 	g_ptr_array_unref (uids);
-
-	check_close_browser_reader (reader);
 }
 
 static void
@@ -624,11 +632,16 @@ action_mail_forward_quoted_cb (GtkAction *action,
 	CamelFolder *folder;
 	GtkWindow *window;
 	GPtrArray *uids;
+<<<<<<< HEAD
+=======
+	gboolean close_reader;
+>>>>>>> master
 
 	folder = e_mail_reader_get_folder (reader);
 	window = e_mail_reader_get_window (reader);
 	uids = e_mail_reader_get_selected_uids (reader);
 	g_return_if_fail (uids != NULL);
+	close_reader = get_close_browser_reader (reader);
 
 	/* XXX Either e_mail_reader_get_selected_uids()
 	 *     or MessageList should do this itself. */
@@ -637,11 +650,16 @@ action_mail_forward_quoted_cb (GtkAction *action,
 	if (em_utils_ask_open_many (window, uids->len))
 		em_utils_forward_messages (
 			reader, folder, uids,
+<<<<<<< HEAD
 			E_MAIL_FORWARD_STYLE_QUOTED);
 
 	g_ptr_array_unref (uids);
+=======
+			E_MAIL_FORWARD_STYLE_QUOTED,
+			close_reader ? GTK_WIDGET (reader) : NULL);
+>>>>>>> master
 
-	check_close_browser_reader (reader);
+	g_ptr_array_unref (uids);
 }
 
 static void
@@ -732,7 +750,11 @@ action_mail_mark_unread_cb (GtkAction *action,
 
 	/* Notify the tree model that the user has marked messages as
 	 * unread so it doesn't mistake the event as new mail arriving. */
+<<<<<<< HEAD
 	model = em_folder_tree_model_get_default (e_mail_reader_get_backend (reader));
+=======
+	model = em_folder_tree_model_get_default ();
+>>>>>>> master
 	folder = e_mail_reader_get_folder (reader);
 	em_folder_tree_model_user_marked_unread (model, folder, n_marked);
 }
@@ -752,10 +774,17 @@ action_mail_message_edit_cb (GtkAction *action,
 	/* XXX Either e_mail_reader_get_selected_uids()
 	 *     or MessageList should do this itself. */
 	g_ptr_array_set_free_func (uids, (GDestroyNotify) g_free);
+<<<<<<< HEAD
+
+	replace = em_utils_folder_is_drafts (folder);
+	em_utils_edit_messages (reader, folder, uids, replace);
+
+=======
 
 	replace = em_utils_folder_is_drafts (folder);
 	em_utils_edit_messages (reader, folder, uids, replace);
 
+>>>>>>> master
 	g_ptr_array_unref (uids);
 }
 
@@ -806,7 +835,11 @@ action_mail_move_cb (GtkAction *action,
 	uids = e_mail_reader_get_selected_uids (reader);
 	window = e_mail_reader_get_window (reader);
 
+<<<<<<< HEAD
 	model = em_folder_tree_model_get_default (backend);
+=======
+	model = em_folder_tree_model_get_default ();
+>>>>>>> master
 
 	dialog = em_folder_selector_new (
 		window, backend, model,
@@ -1126,11 +1159,19 @@ action_mail_reply_all_check (CamelFolder *folder,
 	gint recip_count = 0;
 	EMailReplyType type = E_MAIL_REPLY_TO_ALL;
 	GError *error = NULL;
+<<<<<<< HEAD
+
+	alert_sink = e_activity_get_alert_sink (closure->activity);
+
+	message = camel_folder_get_message_finish (folder, result, &error);
+
+=======
 
 	alert_sink = e_activity_get_alert_sink (closure->activity);
 
 	message = camel_folder_get_message_finish (folder, result, &error);
 
+>>>>>>> master
 	if (e_activity_handle_cancellation (closure->activity, error)) {
 		g_warn_if_fail (message == NULL);
 		mail_reader_closure_free (closure);
@@ -1311,6 +1352,17 @@ action_mail_reply_sender_check (CamelFolder *folder,
 	GError *error = NULL;
 
 	alert_sink = e_activity_get_alert_sink (closure->activity);
+<<<<<<< HEAD
+
+	message = camel_folder_get_message_finish (folder, result, &error);
+
+	if (e_activity_handle_cancellation (closure->activity, error)) {
+		g_warn_if_fail (message == NULL);
+		mail_reader_closure_free (closure);
+		g_error_free (error);
+		return;
+
+=======
 
 	message = camel_folder_get_message_finish (folder, result, &error);
 
@@ -1320,6 +1372,7 @@ action_mail_reply_sender_check (CamelFolder *folder,
 		g_error_free (error);
 		return;
 
+>>>>>>> master
 	} else if (error != NULL) {
 		g_warn_if_fail (message == NULL);
 		e_alert_submit (
diff --git a/mail/e-mail-session-utils.c b/mail/e-mail-session-utils.c
index 55221249c4..217e7e2e8e 100644
--- a/mail/e-mail-session-utils.c
+++ b/mail/e-mail-session-utils.c
@@ -695,14 +695,14 @@ e_mail_session_send_to (EMailSession *session,
 		sent_folder_uri = g_strdup (account->sent_folder_uri);
 	}
 
-	string = camel_header_raw_find (&xev, "X-Evolution-Transport", NULL);
-	if (transport_uid == NULL && string != NULL)
-		transport_uid = g_strstrip (g_strdup (string));
-
 	string = camel_header_raw_find (&xev, "X-Evolution-Fcc", NULL);
 	if (sent_folder_uri == NULL && string != NULL)
 		sent_folder_uri = g_strstrip (g_strdup (string));
 
+	string = camel_header_raw_find (&xev, "X-Evolution-Transport", NULL);
+	if (transport_uid == NULL && string != NULL)
+		transport_uid = g_strstrip (g_strdup (string));
+
 	post_to_uris = g_ptr_array_new ();
 	for (header = xev; header != NULL; header = header->next) {
 		gchar *folder_uri;
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
index 7ed8720e75..109e49826d 100644
--- a/mail/e-mail-session.c
+++ b/mail/e-mail-session.c
@@ -44,8 +44,10 @@
 #include <canberra-gtk.h>
 #endif
 
-#include <libedataserverui/e-passwords.h>
 #include <libedataserver/e-flag.h>
+#include <libedataserver/e-proxy.h>
+#include <libebackend/e-extensible.h>
+#include <libedataserverui/e-passwords.h>
 
 #include "e-util/e-util.h"
 #include "e-util/e-account-utils.h"
@@ -73,7 +75,6 @@
 	((obj), E_TYPE_MAIL_SESSION, EMailSessionPrivate))
 
 static guint session_check_junk_notify_id;
-static guint session_gconf_proxy_id;
 
 typedef struct _AsyncContext AsyncContext;
 
@@ -82,6 +83,7 @@ struct _EMailSessionPrivate {
 
 	FILE *filter_logfile;
 	GHashTable *junk_filters;
+	EProxy *proxy;
 };
 
 struct _AsyncContext {
@@ -398,10 +400,17 @@ static guint preparing_flush = 0;
 static gboolean
 forward_to_flush_outbox_cb (EMailSession *session)
 {
+	EShell *shell;
+	EShellBackend *shell_backend;
+
 	g_return_val_if_fail (preparing_flush != 0, FALSE);
 
+	shell = e_shell_get_default ();
+	shell_backend = e_shell_get_backend_by_name (shell, "mail");
+	g_return_val_if_fail (E_IS_MAIL_BACKEND (shell_backend), FALSE);
+
 	preparing_flush = 0;
-	mail_send (session);
+	mail_send (E_MAIL_BACKEND (shell_backend));
 
 	return FALSE;
 }
@@ -433,73 +442,6 @@ ms_forward_to_cb (CamelFolder *folder,
 	g_object_unref (client);
 }
 
-/* Support for SOCKS proxy ***************************************************/
-
-static GSettings *proxy_settings = NULL, *proxy_socks_settings = NULL;
-
-static void
-set_socks_proxy_from_gsettings (CamelSession *session)
-{
-	gchar *mode, *host;
-	gint port;
-
-	g_return_if_fail (proxy_settings != NULL);
-	g_return_if_fail (proxy_socks_settings != NULL);
-
-	mode = g_settings_get_string (proxy_settings, "mode");
-	if (g_strcmp0 (mode, "manual") == 0) {
-		host = g_settings_get_string (proxy_socks_settings, "host");
-		port = g_settings_get_int (proxy_socks_settings, "port");
-		camel_session_set_socks_proxy (session, host, port);
-		g_free (host);
-	}
-	g_free (mode);
-}
-
-static void
-proxy_gsettings_changed_cb (GSettings *settings,
-			    const gchar *key,
-			    CamelSession *session)
-{
-	set_socks_proxy_from_gsettings (session);
-}
-
-static void
-set_socks_proxy_gsettings_watch (CamelSession *session)
-{
-	g_return_if_fail (proxy_settings != NULL);
-	g_return_if_fail (proxy_socks_settings != NULL);
-
-	g_signal_connect (
-		proxy_settings, "changed::mode",
-		G_CALLBACK (proxy_gsettings_changed_cb), session);
-
-	g_signal_connect (
-		proxy_socks_settings, "changed",
-		G_CALLBACK (proxy_gsettings_changed_cb), session);
-}
-
-static void
-init_socks_proxy (CamelSession *session)
-{
-	g_return_if_fail (CAMEL_IS_SESSION (session));
-
-	if (!proxy_settings) {
-		proxy_settings = g_settings_new ("org.gnome.system.proxy");
-		proxy_socks_settings = g_settings_get_child (proxy_settings, "socks");
-		g_object_weak_ref (G_OBJECT (proxy_settings), (GWeakNotify) g_nullify_pointer, &proxy_settings);
-		g_object_weak_ref (G_OBJECT (proxy_socks_settings), (GWeakNotify) g_nullify_pointer, &proxy_socks_settings);
-	} else {
-		g_object_ref (proxy_settings);
-		g_object_ref (proxy_socks_settings);
-	}
-
-	set_socks_proxy_gsettings_watch (session);
-	set_socks_proxy_from_gsettings (session);
-}
-
-/*****************************************************************************/
-
 static void
 async_context_free (AsyncContext *context)
 {
@@ -521,7 +463,7 @@ mail_session_make_key (CamelService *service,
 	if (service != NULL)
 		key = camel_url_to_string (
 			camel_service_get_camel_url (service),
-			CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS);
+			CAMEL_URL_HIDE_PARAMS);
 	else
 		key = g_strdup (item);
 
@@ -677,6 +619,7 @@ mail_session_finalize (GObject *object)
 	priv = E_MAIL_SESSION_GET_PRIVATE (object);
 
 	g_hash_table_destroy (priv->junk_filters);
+	g_object_unref (priv->proxy);
 
 	client = gconf_client_get_default ();
 
@@ -685,11 +628,6 @@ mail_session_finalize (GObject *object)
 		session_check_junk_notify_id = 0;
 	}
 
-	if (session_gconf_proxy_id != 0) {
-		gconf_client_notify_remove (client, session_gconf_proxy_id);
-		session_gconf_proxy_id = 0;
-	}
-
 	g_object_unref (client);
 
 	g_free (mail_data_dir);
@@ -1134,6 +1072,42 @@ mail_session_forward_to (CamelSession *session,
 }
 
 static void
+mail_session_get_socks_proxy (CamelSession *session,
+			      const gchar *for_host,
+			      gchar **host_ret,
+			      gint *port_ret)
+{
+	EMailSession *mail_session;
+	gchar *uri;
+
+	g_return_if_fail (session != NULL);
+	g_return_if_fail (for_host != NULL);
+	g_return_if_fail (host_ret != NULL);
+	g_return_if_fail (port_ret != NULL);
+
+	mail_session = E_MAIL_SESSION (session);
+	g_return_if_fail (mail_session != NULL);
+	g_return_if_fail (mail_session->priv != NULL);
+
+	*host_ret = NULL;
+	*port_ret = 0;
+
+	uri = g_strconcat ("socks://", for_host, NULL);
+
+	if (e_proxy_require_proxy_for_uri (mail_session->priv->proxy, uri)) {
+		SoupURI *suri;
+
+		suri = e_proxy_peek_uri_for (mail_session->priv->proxy, uri);
+		if (suri) {
+			*host_ret = g_strdup (suri->host);
+			*port_ret = suri->port;
+		}
+	}
+
+	g_free (uri);
+}
+
+static void
 e_mail_session_class_init (EMailSessionClass *class)
 {
 	GObjectClass *object_class;
@@ -1157,6 +1131,7 @@ e_mail_session_class_init (EMailSessionClass *class)
 	session_class->get_filter_driver = mail_session_get_filter_driver;
 	session_class->lookup_addressbook = mail_session_lookup_addressbook;
 	session_class->forward_to = mail_session_forward_to;
+	session_class->get_socks_proxy = mail_session_get_socks_proxy;
 
 	g_object_class_install_property (
 		object_class,
@@ -1193,6 +1168,7 @@ e_mail_session_init (EMailSession *session)
 	session->priv->folder_cache = mail_folder_cache_new ();
 	session->priv->junk_filters = g_hash_table_new (
 		(GHashFunc) g_str_hash, (GEqualFunc) g_str_equal);
+	session->priv->proxy = e_proxy_new ();
 
 	/* Initialize the EAccount setup. */
 	e_account_writable (NULL, E_ACCOUNT_SOURCE_SAVE_PASSWD);
@@ -1212,7 +1188,7 @@ e_mail_session_init (EMailSession *session)
 
 	mail_config_reload_junk_headers (session);
 
-	init_socks_proxy (CAMEL_SESSION (session));
+	e_proxy_setup_proxy (session->priv->proxy);
 
 	g_object_unref (client);
 }
diff --git a/mail/e-mail-sidebar.c b/mail/e-mail-sidebar.c
index 6a971ea51f..35048f8293 100644
--- a/mail/e-mail-sidebar.c
+++ b/mail/e-mail-sidebar.c
@@ -471,7 +471,7 @@ e_mail_sidebar_new (EMailBackend *backend,
 	g_return_val_if_fail (E_IS_MAIL_BACKEND (backend), NULL);
 	g_return_val_if_fail (E_IS_ALERT_SINK (alert_sink), NULL);
 
-	model = em_folder_tree_model_get_default (backend);
+	model = em_folder_tree_model_get_default ();
 
 	return g_object_new (
 		E_TYPE_MAIL_SIDEBAR,
diff --git a/mail/e-mail-store.c b/mail/e-mail-store.c
index 7b7774399d..f93856a8f4 100644
--- a/mail/e-mail-store.c
+++ b/mail/e-mail-store.c
@@ -182,10 +182,11 @@ special_mail_store_is_enabled (CamelStore *store)
 }
 
 static void
-mail_store_add (EMailSession *session,
+mail_store_add (EMailBackend *backend,
                 CamelStore *store,
                 AddStoreCallback callback)
 {
+	EMailSession *session;
 	EMFolderTreeModel *default_model;
 	MailFolderCache *folder_cache;
 	StoreInfo *store_info;
@@ -194,7 +195,8 @@ mail_store_add (EMailSession *session,
 	g_return_if_fail (store != NULL);
 	g_return_if_fail (CAMEL_IS_STORE (store));
 
-	default_model = em_folder_tree_model_get_default (NULL);
+	session = e_mail_backend_get_session (backend);
+	default_model = em_folder_tree_model_get_default ();
 	folder_cache = e_mail_session_get_folder_cache (session);
 
 	store_info = store_info_new (store);
@@ -228,23 +230,26 @@ mail_store_add_local_done_cb (MailFolderCache *folder_cache,
 }
 
 static void
-mail_store_load_accounts (EMailSession *session,
+mail_store_load_accounts (EMailBackend *backend,
                           const gchar *data_dir)
 {
 	CamelStore *local_store;
+	EMailSession *session;
 	EAccountList *account_list;
 	EIterator *iter;
 
-	/* Set up the local store. */
+	session = e_mail_backend_get_session (backend);
+
+	/* Add the local store. */
 
 	e_mail_local_init (session, data_dir);
 	local_store = e_mail_local_get_store ();
 
 	mail_store_add (
-		session, local_store, (AddStoreCallback)
+		backend, local_store, (AddStoreCallback)
 		mail_store_add_local_done_cb);
 
-	/* Set up remote stores. */
+	/* Add mail accounts.. */
 
 	account_list = e_get_account_list ();
 
@@ -257,19 +262,19 @@ mail_store_load_accounts (EMailSession *session,
 		if (!account->enabled)
 			continue;
 
-		e_mail_store_add_by_account (session, account);
+		e_mail_store_add_by_account (backend, account);
 	}
 
 	g_object_unref (iter);
 }
 
 void
-e_mail_store_init (EMailSession *session,
+e_mail_store_init (EMailBackend *backend,
                    const gchar *data_dir)
 {
 	static gboolean initialized = FALSE;
 
-	g_return_if_fail (E_IS_MAIL_SESSION (session));
+	g_return_if_fail (E_IS_MAIL_BACKEND (backend));
 
 	/* This function is idempotent because mail
 	 * migration code may need to call it early. */
@@ -283,34 +288,37 @@ e_mail_store_init (EMailSession *session,
 		(GDestroyNotify) NULL,
 		(GDestroyNotify) store_table_free);
 
-	mail_store_load_accounts (session, data_dir);
+	mail_store_load_accounts (backend, data_dir);
 
 	initialized = TRUE;
 }
 
 void
-e_mail_store_add (EMailSession *session,
+e_mail_store_add (EMailBackend *backend,
                   CamelStore *store)
 {
-	g_return_if_fail (E_IS_MAIL_SESSION (session));
+	g_return_if_fail (E_IS_MAIL_BACKEND (backend));
 	g_return_if_fail (CAMEL_IS_STORE (store));
 
-	mail_store_add (session, store, NULL);
+	mail_store_add (backend, store, NULL);
 }
 
 CamelStore *
-e_mail_store_add_by_account (EMailSession *session,
+e_mail_store_add_by_account (EMailBackend *backend,
                              EAccount *account)
 {
+	EMailSession *session;
 	CamelService *service = NULL;
 	CamelProvider *provider;
 	CamelURL *url;
-	gboolean skip, transport_only;
+	gboolean skip = FALSE, transport_only;
 	GError *error = NULL;
 
-	g_return_val_if_fail (E_IS_MAIL_SESSION (session), NULL);
+	g_return_val_if_fail (E_IS_MAIL_BACKEND (backend), NULL);
 	g_return_val_if_fail (E_IS_ACCOUNT (account), NULL);
 
+	session = e_mail_backend_get_session (backend);
+
 	/* check whether it's transport-only accounts */
 	transport_only = !account->source || !account->source->url || !*account->source->url;
 	if (transport_only)
@@ -376,7 +384,7 @@ handle_transport:
 	}
 
 	if (!skip && (provider->flags & CAMEL_PROVIDER_IS_STORAGE))
-		e_mail_store_add (session, CAMEL_STORE (service));
+		e_mail_store_add (backend, CAMEL_STORE (service));
 
 	return CAMEL_STORE (service);
 
@@ -392,16 +400,19 @@ fail:
 }
 
 void
-e_mail_store_remove (EMailSession *session,
+e_mail_store_remove (EMailBackend *backend,
                      CamelStore *store)
 {
+	EMailSession *session;
 	MailFolderCache *folder_cache;
 	EMFolderTreeModel *default_model;
 
-	g_return_if_fail (E_IS_MAIL_SESSION (session));
+	g_return_if_fail (E_IS_MAIL_BACKEND (backend));
 	g_return_if_fail (CAMEL_IS_STORE (store));
 	g_return_if_fail (store_table != NULL);
 
+	session = e_mail_backend_get_session (backend);
+
 	/* Because the store table holds a reference to each store used
 	 * as a key in it, none of them will ever be gc'ed, meaning any
 	 * call to camel_session_get_{service,store} with the same URL
@@ -426,43 +437,48 @@ e_mail_store_remove (EMailSession *session,
 }
 
 void
-e_mail_store_remove_by_account (EMailSession *session,
+e_mail_store_remove_by_account (EMailBackend *backend,
                                 EAccount *account)
 {
+	EMailSession *session;
 	CamelService *service;
 	CamelProvider *provider;
+	const gchar *uid;
 
-	g_return_if_fail (E_IS_MAIL_SESSION (session));
+	g_return_if_fail (E_IS_MAIL_BACKEND (backend));
 	g_return_if_fail (E_IS_ACCOUNT (account));
 
-	provider = camel_provider_get (account->source->url, NULL);
-	if (provider == NULL)
-		return;
+	uid = account->uid;
+	session = e_mail_backend_get_session (backend);
 
-	if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
-		return;
+	service = camel_session_get_service (CAMEL_SESSION (session), uid);
+	g_return_if_fail (CAMEL_IS_STORE (service));
 
-	service = camel_session_get_service (
-		CAMEL_SESSION (session), account->uid);
+	provider = camel_service_get_provider (service);
+	g_return_if_fail (provider != NULL);
 
-	g_return_if_fail (CAMEL_IS_STORE (service));
+	if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
+		return;
 
-	e_mail_store_remove (session, CAMEL_STORE (service));
+	e_mail_store_remove (backend, CAMEL_STORE (service));
 }
 
 void
-e_mail_store_foreach (EMailSession *session,
+e_mail_store_foreach (EMailBackend *backend,
                       GFunc func,
                       gpointer user_data)
 {
+	EMailSession *session;
 	GList *list, *link;
 
 	/* XXX This is a silly convenience function.
 	 *     Could probably just get rid of it. */
 
-	g_return_if_fail (E_IS_MAIL_SESSION (session));
+	g_return_if_fail (E_IS_MAIL_BACKEND (backend));
 	g_return_if_fail (func != NULL);
 
+	session = e_mail_backend_get_session (backend);
+
 	list = camel_session_list_services (CAMEL_SESSION (session));
 
 	for (link = list; link != NULL; link = g_list_next (link)) {
diff --git a/mail/e-mail-store.h b/mail/e-mail-store.h
index 5dca416e09..2c676d4fc4 100644
--- a/mail/e-mail-store.h
+++ b/mail/e-mail-store.h
@@ -23,22 +23,22 @@
 #define E_MAIL_STORE_H
 
 #include <camel/camel.h>
-#include <mail/e-mail-session.h>
+#include <mail/e-mail-backend.h>
 #include <libedataserver/e-account.h>
 
 G_BEGIN_DECLS
 
-void		e_mail_store_init		(EMailSession *session,
+void		e_mail_store_init		(EMailBackend *backend,
 						 const gchar *data_dir);
-void		e_mail_store_add		(EMailSession *session,
+void		e_mail_store_add		(EMailBackend *backend,
 						 CamelStore *store);
-CamelStore *	e_mail_store_add_by_account	(EMailSession *session,
+CamelStore *	e_mail_store_add_by_account	(EMailBackend *backend,
 						 EAccount *account);
-void		e_mail_store_remove		(EMailSession *session,
+void		e_mail_store_remove		(EMailBackend *backend,
 						 CamelStore *store);
-void		e_mail_store_remove_by_account	(EMailSession *session,
+void		e_mail_store_remove_by_account	(EMailBackend *backend,
 						 EAccount *account);
-void		e_mail_store_foreach		(EMailSession *session,
+void		e_mail_store_foreach		(EMailBackend *backend,
 						 GFunc func,
 						 gpointer user_data);
 
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index b9589d51c3..8ec881b1f0 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -4045,7 +4045,7 @@ forget_password_if_needed (EAccount *original_account,
 		if (!url)
 			return;
 
-		url_str = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS);
+		url_str = camel_url_to_string (url, CAMEL_URL_HIDE_PARAMS);
 		if (url_str)
 			e_passwords_forget_password (NULL, url_str);
 
@@ -4108,11 +4108,9 @@ emae_commit (EConfig *ec,
 		    && emae->priv->source.provider
 		    && (emae->priv->source.provider->flags & CAMEL_PROVIDER_IS_STORAGE)) {
 			EMailBackend *backend;
-			EMailSession *session;
 
 			backend = em_account_editor_get_backend (emae);
-			session = e_mail_backend_get_session (backend);
-			e_mail_store_add_by_account (session, account);
+			e_mail_store_add_by_account (backend, account);
 		}
 	}
 
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index e42559ab3b..837cc31f62 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -85,6 +85,7 @@ struct _AsyncContext {
 	gchar *folder_uri;
 	gchar *message_uid;
 	gboolean replace;
+	GtkWidget *destroy_when_done;
 };
 
 struct _ForwardData {
@@ -112,6 +113,9 @@ async_context_free (AsyncContext *context)
 	if (context->ptr_array != NULL)
 		g_ptr_array_unref (context->ptr_array);
 
+	if (context->destroy_when_done != NULL)
+		gtk_widget_destroy (context->destroy_when_done);
+
 	g_free (context->folder_uri);
 	g_free (context->message_uid);
 
@@ -1680,6 +1684,7 @@ forward_got_messages_cb (CamelFolder *folder,
 
 	if (e_activity_handle_cancellation (context->activity, error)) {
 		g_warn_if_fail (hash_table == NULL);
+		context->destroy_when_done = NULL;
 		async_context_free (context);
 		g_error_free (error);
 		return;
@@ -1690,6 +1695,7 @@ forward_got_messages_cb (CamelFolder *folder,
 			alert_sink,
 			"mail:get-multiple-messages",
 			error->message, NULL);
+		context->destroy_when_done = NULL;
 		async_context_free (context);
 		g_error_free (error);
 		return;
@@ -1721,6 +1727,7 @@ forward_got_messages_cb (CamelFolder *folder,
  * @folder: folder containing messages to forward
  * @uids: uids of messages to forward
  * @style: the forward style to use
+ * @destroy_when_done: a #GtkWidget to destroy with gtk_widget_destroy() when done; can be NULL
  *
  * Forwards a group of messages in the given style.
  *
@@ -1742,7 +1749,8 @@ void
 em_utils_forward_messages (EMailReader *reader,
                            CamelFolder *folder,
                            GPtrArray *uids,
-                           EMailForwardStyle style)
+                           EMailForwardStyle style,
+                           GtkWidget *destroy_when_done)
 {
 	EActivity *activity;
 	AsyncContext *context;
@@ -1760,6 +1768,7 @@ em_utils_forward_messages (EMailReader *reader,
 	context->reader = g_object_ref (reader);
 	context->ptr_array = g_ptr_array_ref (uids);
 	context->style = style;
+	context->destroy_when_done = destroy_when_done;
 
 	switch (style) {
 		case E_MAIL_FORWARD_STYLE_ATTACHED:
@@ -1837,7 +1846,7 @@ em_utils_redirect_message (EShell *shell,
 
 /* Message disposition notifications, rfc 2298 */
 void
-em_utils_handle_receipt (EMailSession *session,
+em_utils_handle_receipt (EMailBackend *backend,
                          CamelFolder *folder,
                          const gchar *message_uid,
                          CamelMimeMessage *message)
@@ -1846,7 +1855,7 @@ em_utils_handle_receipt (EMailSession *session,
 	const gchar *addr;
 	CamelMessageInfo *info;
 
-	g_return_if_fail (E_IS_MAIL_SESSION (session));
+	g_return_if_fail (E_IS_MAIL_BACKEND (backend));
 	g_return_if_fail (CAMEL_IS_FOLDER (folder));
 	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
 
@@ -1902,23 +1911,23 @@ em_utils_handle_receipt (EMailSession *session,
 			return;
 	}
 
-	em_utils_send_receipt (session, folder, message);
+	em_utils_send_receipt (backend, folder, message);
 }
 
 static void
 em_utils_receipt_done (CamelFolder *folder,
                        GAsyncResult *result,
-                       EMailSession *session)
+                       EMailBackend *backend)
 {
 	/* FIXME Poor error handling. */
 	if (!e_mail_folder_append_message_finish (folder, result, NULL, NULL))
 		return;
 
-	mail_send (session);
+	mail_send (backend);
 }
 
 void
-em_utils_send_receipt (EMailSession *session,
+em_utils_send_receipt (EMailBackend *backend,
                        CamelFolder *folder,
                        CamelMimeMessage *message)
 {
@@ -2093,7 +2102,7 @@ em_utils_send_receipt (EMailSession *session,
 	/* FIXME Pass a GCancellable. */
 	e_mail_folder_append_message (
 		out_folder, receipt, info, G_PRIORITY_DEFAULT, NULL,
-		(GAsyncReadyCallback) em_utils_receipt_done, session);
+		(GAsyncReadyCallback) em_utils_receipt_done, backend);
 
 	camel_message_info_free (info);
 }
@@ -2476,18 +2485,24 @@ concat_unique_addrs (CamelInternetAddress *dest,
 	}
 }
 
-static void
-get_reply_all (CamelMimeMessage *message,
-               CamelInternetAddress *to,
-               CamelInternetAddress *cc,
-               CamelNNTPAddress *postto)
+void
+em_utils_get_reply_all (CamelMimeMessage *message,
+                        CamelInternetAddress *to,
+                        CamelInternetAddress *cc,
+                        CamelNNTPAddress *postto)
 {
-	CamelInternetAddress *reply_to, *to_addrs, *cc_addrs;
+	CamelInternetAddress *reply_to;
+	CamelInternetAddress *to_addrs;
+	CamelInternetAddress *cc_addrs;
 	CamelMedium *medium;
 	const gchar *name, *addr;
 	const gchar *posthdr = NULL;
 	GHashTable *rcpt_hash;
 
+	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
+	g_return_if_fail (CAMEL_IS_INTERNET_ADDRESS (to));
+	g_return_if_fail (CAMEL_IS_INTERNET_ADDRESS (cc));
+
 	medium = CAMEL_MEDIUM (message);
 
 	/* check whether there is a 'Newsgroups: ' header in there */
@@ -2503,8 +2518,10 @@ get_reply_all (CamelMimeMessage *message,
 	rcpt_hash = em_utils_generate_account_hash ();
 
 	reply_to = get_reply_to (message);
-	to_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO);
-	cc_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC);
+	to_addrs = camel_mime_message_get_recipients (
+		message, CAMEL_RECIPIENT_TYPE_TO);
+	cc_addrs = camel_mime_message_get_recipients (
+		message, CAMEL_RECIPIENT_TYPE_CC);
 
 	if (reply_to != NULL) {
 		gint ii = 0;
@@ -2547,15 +2564,6 @@ get_reply_all (CamelMimeMessage *message,
 	g_hash_table_destroy (rcpt_hash);
 }
 
-void
-em_utils_get_reply_all (CamelMimeMessage *message,
-                        CamelInternetAddress *to,
-                        CamelInternetAddress *cc,
-                        CamelNNTPAddress *postto)
-{
-	get_reply_all (message, to, cc, postto);
-}
-
 enum {
 	ATTRIB_UNKNOWN,
 	ATTRIB_CUSTOM,
@@ -2938,7 +2946,7 @@ em_utils_reply_to_message (EShell *shell,
 		if (folder)
 			postto = camel_nntp_address_new ();
 
-		get_reply_all (message, to, cc, postto);
+		em_utils_get_reply_all (message, to, cc, postto);
 		break;
 	}
 
@@ -2989,7 +2997,7 @@ post_header_clicked_cb (EComposerPostHeader *header,
 	shell_backend = e_shell_get_backend_by_name (shell, "mail");
 
 	/* FIXME Limit the folder tree to the NNTP account? */
-	model = em_folder_tree_model_get_default (E_MAIL_BACKEND (shell_backend));
+	model = em_folder_tree_model_get_default ();
 
 	dialog = em_folder_selector_new (
 		GTK_WINDOW (composer),
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index e651186afc..bd6eb7cffd 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -25,9 +25,9 @@
 #define EM_COMPOSER_UTILS_H
 
 #include <em-format/em-format.h>
+#include <mail/e-mail-backend.h>
 #include <mail/e-mail-enums.h>
 #include <mail/e-mail-reader.h>
-#include <mail/e-mail-session.h>
 #include <composer/e-msg-composer.h>
 
 G_BEGIN_DECLS
@@ -54,14 +54,15 @@ EMsgComposer *	em_utils_forward_message	(EShell *shell,
 void		em_utils_forward_messages	(EMailReader *reader,
 						 CamelFolder *folder,
 						 GPtrArray *uids,
-						 EMailForwardStyle style);
+						 EMailForwardStyle style,
+						 GtkWidget *destroy_when_done);
 void		em_utils_redirect_message	(EShell *shell,
 						 CamelMimeMessage *message);
-void		em_utils_handle_receipt		(EMailSession *session,
+void		em_utils_handle_receipt		(EMailBackend *backend,
 						 CamelFolder *folder,
 						 const gchar *message_uid,
 						 CamelMimeMessage *message);
-void		em_utils_send_receipt		(EMailSession *session,
+void		em_utils_send_receipt		(EMailBackend *backend,
 						 CamelFolder *folder,
 						 CamelMimeMessage *message);
 gchar *		em_utils_construct_composer_text
diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c
index 26a3c9c2b0..9aa198fa8e 100644
--- a/mail/em-folder-selection-button.c
+++ b/mail/em-folder-selection-button.c
@@ -268,17 +268,13 @@ folder_selection_button_clicked (GtkButton *button)
 	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	if (priv->store != NULL) {
-		EMailSession *session;
-
-		session = e_mail_backend_get_session (priv->backend);
-
-		model = em_folder_tree_model_new (priv->backend);
-		em_folder_tree_model_set_session (model, session);
+		model = em_folder_tree_model_new ();
+		em_folder_tree_model_set_backend (model, priv->backend);
 		em_folder_tree_model_add_store (model, priv->store);
 	}
 
 	if (model == NULL)
-		model = g_object_ref (em_folder_tree_model_get_default (priv->backend));
+		model = g_object_ref (em_folder_tree_model_get_default ());
 
 	dialog = em_folder_selector_new (
 		parent, priv->backend, model,
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 2116faf854..cc674cd792 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -34,11 +34,11 @@
 #include <errno.h>
 #include <sys/stat.h>
 
+#include <glib/gi18n.h>
+
 #include "e-util/e-util.h"
 #include "e-util/e-account-utils.h"
 
-#include <glib/gi18n.h>
-
 #include "mail-tools.h"
 #include "mail-mt.h"
 #include "mail-ops.h"
@@ -68,7 +68,6 @@ struct _EMFolderTreeModelPrivate {
 	GtkTreeSelection *selection;  /* weak reference */
 
 	EAccountList *accounts;
-	EMailSession *session;
 	EMailBackend *backend;
 
 	/* CamelStore -> EMFolderTreeStoreInfo */
@@ -85,7 +84,6 @@ struct _EMFolderTreeModelPrivate {
 enum {
 	PROP_0,
 	PROP_SELECTION,
-	PROP_SESSION,
 	PROP_BACKEND
 };
 
@@ -124,9 +122,10 @@ static gint
 folder_tree_model_sort (GtkTreeModel *model,
                         GtkTreeIter *a,
                         GtkTreeIter *b,
-                        gpointer user_data)
+                        gpointer unused)
 {
-	EShell *shell = user_data;
+	EMFolderTreeModel *folder_tree_model;
+	EMailBackend *backend;
 	gchar *aname, *bname;
 	CamelStore *store;
 	gboolean is_store;
@@ -134,6 +133,10 @@ folder_tree_model_sort (GtkTreeModel *model,
 	guint asortorder, bsortorder;
 	gint rv = -2;
 
+	folder_tree_model = EM_FOLDER_TREE_MODEL (model);
+	backend = em_folder_tree_model_get_backend (folder_tree_model);
+	g_return_val_if_fail (backend != NULL, -1);
+
 	gtk_tree_model_get (
 		model, a,
 		COL_BOOL_IS_STORE, &is_store,
@@ -151,7 +154,16 @@ folder_tree_model_sort (GtkTreeModel *model,
 		-1);
 
 	if (is_store) {
-		if (e_shell_settings_get_boolean (e_shell_get_shell_settings (shell), "mail-sort-accounts-alpha")) {
+		EShell *shell;
+		EShellBackend *shell_backend;
+		EShellSettings *shell_settings;
+
+		shell_backend = E_SHELL_BACKEND (backend);
+		shell = e_shell_backend_get_shell (shell_backend);
+		shell_settings = e_shell_get_shell_settings (shell);
+
+		if (e_shell_settings_get_boolean (
+			shell_settings, "mail-sort-accounts-alpha")) {
 			const gchar *on_this_computer = _("On This Computer");
 			const gchar *search_folders = _("Search Folders");
 
@@ -226,10 +238,12 @@ account_changed_cb (EAccountList *accounts,
                     EAccount *account,
                     EMFolderTreeModel *model)
 {
+	EMailBackend *backend;
 	EMailSession *session;
 	CamelService *service;
 
-	session = em_folder_tree_model_get_session (model);
+	backend = em_folder_tree_model_get_backend (model);
+	session = e_mail_backend_get_session (backend);
 
 	service = camel_session_get_service (
 		CAMEL_SESSION (session), account->uid);
@@ -251,10 +265,12 @@ account_removed_cb (EAccountList *accounts,
                     EAccount *account,
                     EMFolderTreeModel *model)
 {
+	EMailBackend *backend;
 	EMailSession *session;
 	CamelService *service;
 
-	session = em_folder_tree_model_get_session (model);
+	backend = em_folder_tree_model_get_backend (model);
+	session = e_mail_backend_get_session (backend);
 
 	service = camel_session_get_service (
 		CAMEL_SESSION (session), account->uid);
@@ -271,17 +287,17 @@ account_added_cb (EAccountList *accounts,
                   EAccount *account,
                   EMFolderTreeModel *model)
 {
-	EMailSession *session;
+	EMailBackend *backend;
+
+	backend = em_folder_tree_model_get_backend (model);
 
-	session = em_folder_tree_model_get_session (model);
-	e_mail_store_add_by_account (session, account);
+	e_mail_store_add_by_account (backend, account);
 }
 
 static void
 folder_tree_model_sort_changed (EMFolderTreeModel *tree_model)
 {
 	GtkTreeModel *model;
-	EShellBackend *shell_backend;
 
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (EM_IS_FOLDER_TREE_MODEL (tree_model));
@@ -290,12 +306,10 @@ folder_tree_model_sort_changed (EMFolderTreeModel *tree_model)
 	if (!model)
 		return;
 
-	shell_backend = E_SHELL_BACKEND (em_folder_tree_model_get_backend (tree_model));
-
 	/* this invokes also sort on a GtkTreeStore */
 	gtk_tree_sortable_set_default_sort_func (
 		GTK_TREE_SORTABLE (model),
-		folder_tree_model_sort, e_shell_backend_get_shell (shell_backend), NULL);
+		folder_tree_model_sort, NULL, NULL);
 }
 
 static void
@@ -339,14 +353,19 @@ account_sort_order_changed_cb (EMFolderTreeModel *folder_tree_model)
 }
 
 static void
-add_remove_special_folder (EMFolderTreeModel *model, const gchar *account_uid, gboolean add)
+add_remove_special_folder (EMFolderTreeModel *model,
+                           const gchar *account_uid,
+                           gboolean add)
 {
+	EMailBackend *backend;
 	EMailSession *session;
 	CamelService *service;
 
-	session = em_folder_tree_model_get_session (model);
+	backend = em_folder_tree_model_get_backend (model);
+	session = e_mail_backend_get_session (backend);
 
-	service = camel_session_get_service (CAMEL_SESSION (session), account_uid);
+	service = camel_session_get_service (
+		CAMEL_SESSION (session), account_uid);
 
 	if (!CAMEL_IS_STORE (service))
 		return;
@@ -358,7 +377,9 @@ add_remove_special_folder (EMFolderTreeModel *model, const gchar *account_uid, g
 }
 
 static void
-enable_local_folders_changed_cb (EMFolderTreeModel *model, GParamSpec *spec, EShellSettings *shell_settings)
+enable_local_folders_changed_cb (EMFolderTreeModel *model,
+                                 GParamSpec *spec,
+                                 EShellSettings *shell_settings)
 {
 	g_return_if_fail (model != NULL);
 	g_return_if_fail (shell_settings != NULL);
@@ -368,7 +389,9 @@ enable_local_folders_changed_cb (EMFolderTreeModel *model, GParamSpec *spec, ESh
 }
 
 static void
-enable_search_folders_changed_cb (EMFolderTreeModel *model, GParamSpec *spec, EShellSettings *shell_settings)
+enable_search_folders_changed_cb (EMFolderTreeModel *model,
+                                  GParamSpec *spec,
+                                  EShellSettings *shell_settings)
 {
 	g_return_if_fail (model != NULL);
 	g_return_if_fail (shell_settings != NULL);
@@ -398,8 +421,8 @@ folder_tree_model_set_property (GObject *object,
 				g_value_get_object (value));
 			return;
 
-		case PROP_SESSION:
-			em_folder_tree_model_set_session (
+		case PROP_BACKEND:
+			em_folder_tree_model_set_backend (
 				EM_FOLDER_TREE_MODEL (object),
 				g_value_get_object (value));
 			return;
@@ -427,10 +450,10 @@ folder_tree_model_get_property (GObject *object,
 				EM_FOLDER_TREE_MODEL (object)));
 			return;
 
-		case PROP_SESSION:
+		case PROP_BACKEND:
 			g_value_set_object (
 				value,
-				em_folder_tree_model_get_session (
+				em_folder_tree_model_get_backend (
 				EM_FOLDER_TREE_MODEL (object)));
 			return;
 		case PROP_BACKEND:
@@ -515,9 +538,26 @@ folder_tree_model_dispose (GObject *object)
 		priv->selection = NULL;
 	}
 
-	if (priv->session != NULL) {
-		g_object_unref (priv->session);
-		priv->session = NULL;
+	if (priv->backend != NULL) {
+		EShell *shell;
+		EShellBackend *shell_backend;
+		EShellSettings *shell_settings;
+
+		shell_backend = E_SHELL_BACKEND (priv->backend);
+		shell = e_shell_backend_get_shell (shell_backend);
+		shell_settings = e_shell_get_shell_settings (shell);
+
+		g_signal_handlers_disconnect_by_func (
+			priv->backend, account_sort_order_changed_cb, object);
+		g_signal_handlers_disconnect_by_func (
+			shell_settings, account_sort_order_changed_cb, object);
+		g_signal_handlers_disconnect_by_func (
+			shell_settings, enable_local_folders_changed_cb, object);
+		g_signal_handlers_disconnect_by_func (
+			shell_settings, enable_search_folders_changed_cb, object);
+
+		g_object_unref (priv->backend);
+		priv->backend = NULL;
 	}
 
 	if (priv->backend) {
@@ -564,6 +604,54 @@ folder_tree_model_finalize (GObject *object)
 }
 
 static void
+folder_tree_model_constructed (GObject *object)
+{
+	EMFolderTreeModelPrivate *priv;
+
+	GType col_types[] = {
+		G_TYPE_STRING,   /* display name */
+		G_TYPE_POINTER,  /* store object */
+		G_TYPE_STRING,   /* full name */
+		G_TYPE_STRING,   /* icon name */
+		G_TYPE_STRING,   /* uri */
+		G_TYPE_UINT,     /* unread count */
+		G_TYPE_UINT,     /* flags */
+		G_TYPE_BOOLEAN,  /* is a store node */
+		G_TYPE_BOOLEAN,  /* is a folder node */
+		G_TYPE_BOOLEAN,  /* has not-yet-loaded subfolders */
+		G_TYPE_UINT,     /* last known unread count */
+		G_TYPE_BOOLEAN,  /* folder is a draft folder */
+		G_TYPE_UINT	 /* user's sortorder */
+	};
+
+	priv = EM_FOLDER_TREE_MODEL_GET_PRIVATE (object);
+
+	gtk_tree_store_set_column_types (
+		GTK_TREE_STORE (object), NUM_COLUMNS, col_types);
+	gtk_tree_sortable_set_default_sort_func (
+		GTK_TREE_SORTABLE (object),
+		folder_tree_model_sort, NULL, NULL);
+	gtk_tree_sortable_set_sort_column_id (
+		GTK_TREE_SORTABLE (object),
+		GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
+		GTK_SORT_ASCENDING);
+
+	priv->accounts = e_get_account_list ();
+	priv->account_changed_id = g_signal_connect (
+		priv->accounts, "account-changed",
+		G_CALLBACK (account_changed_cb), object);
+	priv->account_removed_id = g_signal_connect (
+		priv->accounts, "account-removed",
+		G_CALLBACK (account_removed_cb), object);
+	priv->account_added_id = g_signal_connect (
+		priv->accounts, "account-added",
+		G_CALLBACK (account_added_cb), object);
+
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
+}
+
+static void
 em_folder_tree_model_class_init (EMFolderTreeModelClass *class)
 {
 	GObjectClass *object_class;
@@ -577,25 +665,26 @@ em_folder_tree_model_class_init (EMFolderTreeModelClass *class)
 	object_class->constructed = folder_tree_model_constructed;
 	object_class->dispose = folder_tree_model_dispose;
 	object_class->finalize = folder_tree_model_finalize;
+	object_class->constructed = folder_tree_model_constructed;
 
 	g_object_class_install_property (
 		object_class,
-		PROP_SELECTION,
+		PROP_BACKEND,
 		g_param_spec_object (
-			"selection",
-			"Selection",
+			"backend",
 			NULL,
-			GTK_TYPE_TREE_SELECTION,
+			NULL,
+			E_TYPE_MAIL_BACKEND,
 			G_PARAM_READWRITE));
 
 	g_object_class_install_property (
 		object_class,
-		PROP_SESSION,
+		PROP_SELECTION,
 		g_param_spec_object (
-			"session",
-			NULL,
+			"selection",
+			"Selection",
 			NULL,
-			E_TYPE_MAIL_SESSION,
+			GTK_TYPE_TREE_SELECTION,
 			G_PARAM_READWRITE));
 
 	g_object_class_install_property (
@@ -766,45 +855,68 @@ em_folder_tree_model_set_selection (EMFolderTreeModel *model,
 	g_object_notify (G_OBJECT (model), "selection");
 }
 
-EMailSession *
-em_folder_tree_model_get_session (EMFolderTreeModel *model)
+EMailBackend *
+em_folder_tree_model_get_backend (EMFolderTreeModel *model)
 {
 	g_return_val_if_fail (EM_IS_FOLDER_TREE_MODEL (model), NULL);
 
-	return model->priv->session;
+	return model->priv->backend;
 }
 
 void
-em_folder_tree_model_set_session (EMFolderTreeModel *model,
-                                  EMailSession *session)
+em_folder_tree_model_set_backend (EMFolderTreeModel *model,
+                                  EMailBackend *backend)
 {
 	g_return_if_fail (EM_IS_FOLDER_TREE_MODEL (model));
 
-	if (session != NULL) {
-		g_return_if_fail (E_IS_MAIL_SESSION (session));
-		g_object_ref (session);
+	if (backend != NULL) {
+		g_return_if_fail (E_IS_MAIL_BACKEND (backend));
+		g_object_ref (backend);
 	}
 
-	if (model->priv->session != NULL)
-		g_object_unref (model->priv->session);
+	if (model->priv->backend != NULL)
+		g_object_unref (model->priv->backend);
 
-	model->priv->session = session;
+	model->priv->backend = backend;
 
 	/* FIXME Technically we should be disconnecting this signal
-	 *       when replacing an old session with a new session,
+	 *       when replacing an old backend with a new backend,
 	 *       but at present this function is only called once. */
-	if (session != NULL) {
+	if (backend != NULL) {
 		MailFolderCache *folder_cache;
+		EMailSession *session;
+		EShell *shell;
+		EShellBackend *shell_backend;
+		EShellSettings *shell_settings;
+
+		shell_backend = E_SHELL_BACKEND (backend);
+		shell = e_shell_backend_get_shell (shell_backend);
+		shell_settings = e_shell_get_shell_settings (shell);
 
+		session = e_mail_backend_get_session (backend);
 		folder_cache = e_mail_session_get_folder_cache (session);
 
 		g_signal_connect_swapped (
+			backend, "account-sort-order-changed",
+			G_CALLBACK (account_sort_order_changed_cb), model);
+
+		g_signal_connect_swapped (
+			shell_settings, "notify::mail-sort-accounts-alpha",
+			G_CALLBACK (account_sort_order_changed_cb), model);
+		g_signal_connect_swapped (
+			shell_settings, "notify::mail-enable-local-folders",
+			G_CALLBACK (enable_local_folders_changed_cb), model);
+		g_signal_connect_swapped (
+			shell_settings, "notify::mail-enable-search-folders",
+			G_CALLBACK (enable_search_folders_changed_cb), model);
+
+		g_signal_connect_swapped (
 			folder_cache, "folder-unread-updated",
 			G_CALLBACK (folder_tree_model_set_unread_count),
 			model);
 	}
 
-	g_object_notify (G_OBJECT (model), "session");
+	g_object_notify (G_OBJECT (model), "backend");
 }
 
 EMailBackend *
@@ -844,6 +956,7 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
 	GtkTreeRowReference *uri_row, *path_row;
 	GtkTreeStore *tree_store;
 	MailFolderCache *folder_cache;
+	EMailBackend *backend;
 	EMailSession *session;
 	EAccount *account;
 	guint unread;
@@ -868,7 +981,8 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
 
 	tree_store = GTK_TREE_STORE (model);
 
-	session = em_folder_tree_model_get_session (model);
+	backend = em_folder_tree_model_get_backend (model);
+	session = e_mail_backend_get_session (backend);
 	folder_cache = e_mail_session_get_folder_cache (session);
 
 	uid = camel_service_get_uid (CAMEL_SERVICE (si->store));
diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h
index 3765cfea11..0188753942 100644
--- a/mail/em-folder-tree-model.h
+++ b/mail/em-folder-tree-model.h
@@ -120,11 +120,6 @@ GtkTreeSelection *
 void		em_folder_tree_model_set_selection
 					(EMFolderTreeModel *model,
 					 GtkTreeSelection *selection);
-EMailSession *	em_folder_tree_model_get_session
-					(EMFolderTreeModel *model);
-void		em_folder_tree_model_set_session
-					(EMFolderTreeModel *model,
-					 EMailSession *session);
 EMailBackend *	em_folder_tree_model_get_backend
 					(EMFolderTreeModel *model);
 void		em_folder_tree_model_set_backend
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 6212f8a8ca..1d831cc4e4 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -1770,7 +1770,7 @@ em_folder_tree_new (EMailBackend *backend,
 	g_return_val_if_fail (E_IS_MAIL_BACKEND (backend), NULL);
 	g_return_val_if_fail (E_IS_ALERT_SINK (alert_sink), NULL);
 
-	model = em_folder_tree_model_get_default (backend);
+	model = em_folder_tree_model_get_default ();
 
 	return em_folder_tree_new_with_model (backend, alert_sink, model);
 }
@@ -1780,17 +1780,15 @@ em_folder_tree_new_with_model (EMailBackend *backend,
                                EAlertSink *alert_sink,
                                EMFolderTreeModel *model)
 {
-	EMailSession *session;
 	const gchar *data_dir;
 
 	g_return_val_if_fail (E_IS_MAIL_BACKEND (backend), NULL);
 	g_return_val_if_fail (E_IS_ALERT_SINK (alert_sink), NULL);
 	g_return_val_if_fail (EM_IS_FOLDER_TREE_MODEL (model), NULL);
 
-	session = e_mail_backend_get_session (backend);
 	data_dir = e_shell_backend_get_data_dir (E_SHELL_BACKEND (backend));
 
-	e_mail_store_init (session, data_dir);
+	e_mail_store_init (backend, data_dir);
 
 	return g_object_new (
 		EM_TYPE_FOLDER_TREE,
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 54586ad763..e72b8014ad 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -487,7 +487,7 @@ em_folder_utils_copy_folder (GtkWindow *parent,
 	label = delete ? _("_Move") : _("C_opy");
 	title = delete ? _("Move Folder To") : _("Copy Folder To");
 
-	model = em_folder_tree_model_get_default (backend);
+	model = em_folder_tree_model_get_default ();
 
 	dialog = em_folder_selector_new (
 		parent, backend, model,
@@ -565,10 +565,10 @@ em_folder_utils_create_folder (GtkWindow *parent,
 	shell = e_shell_backend_get_shell (E_SHELL_BACKEND (backend));
 	shell_settings = e_shell_get_shell_settings (shell);
 
-	model = em_folder_tree_model_new (backend);
-	session = e_mail_backend_get_session (backend);
-	em_folder_tree_model_set_session (model, session);
+	model = em_folder_tree_model_new ();
+	em_folder_tree_model_set_backend (model, backend);
 
+	session = e_mail_backend_get_session (backend);
 	list = camel_session_list_services (CAMEL_SESSION (session));
 
 	for (link = list; link != NULL; link = g_list_next (link)) {
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index a1be319390..f3209b8b89 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -40,13 +40,14 @@
 #undef interface
 #endif
 
-#include <libedataserver/e-data-server-util.h>	/* for e_utf8_strftime, what about e_time_format_time? */
+#include <libebackend/e-extensible.h>
 #include <libedataserver/e-time-utils.h>
+#include <libedataserver/e-data-server-util.h>	/* for e_utf8_strftime, what about e_time_format_time? */
+
 #include "e-util/e-datetime-format.h"
 #include "e-util/e-icon-factory.h"
 #include "e-util/e-util-private.h"
 #include "e-util/e-util.h"
-#include "e-util/e-extensible.h"
 #include "misc/e-web-view.h"
 
 #include <shell/e-shell.h>
@@ -1511,6 +1512,43 @@ emfh_getpuri (struct _EMFormatHTMLJob *job,
 }
 
 static void
+emfh_configure_stream_for_proxy (CamelHttpStream *stream,
+                                 const gchar *uri)
+{
+	EProxy *proxy;
+	SoupURI *proxy_uri;
+	gchar *basic;
+	gchar *basic64;
+	const gchar *user = "";
+	const gchar *password = "";
+
+	proxy = em_utils_get_proxy ();
+
+	if (!e_proxy_require_proxy_for_uri (proxy, uri))
+		return;
+
+	proxy_uri = e_proxy_peek_uri_for (proxy, uri);
+
+	if (proxy_uri == NULL)
+		return;
+
+	if (proxy_uri->user != NULL)
+		user = proxy_uri->user;
+
+	if (proxy_uri->password != NULL)
+		password = proxy_uri->password;
+
+	if (*user == '\0' && *password == '\0')
+		return;
+
+	basic = g_strdup_printf ("%s:%s", user, password);
+	basic64 = g_base64_encode ((guchar *) basic, strlen (basic));
+	camel_http_stream_set_proxy_authpass (stream, basic64);
+	g_free (basic64);
+	g_free (basic);
+}
+
+static void
 emfh_gethttp (struct _EMFormatHTMLJob *job,
               GCancellable *cancellable)
 {
@@ -1533,7 +1571,6 @@ emfh_gethttp (struct _EMFormatHTMLJob *job,
 
 	if (instream == NULL) {
 		EMailImageLoadingPolicy policy;
-		gchar *proxy;
 
 		policy = em_format_html_get_image_loading_policy (job->format);
 
@@ -1552,12 +1589,9 @@ emfh_gethttp (struct _EMFormatHTMLJob *job,
 		}
 
 		instream = camel_http_stream_new (CAMEL_HTTP_METHOD_GET, ((EMFormat *) job->format)->session, url);
-		camel_http_stream_set_user_agent((CamelHttpStream *)instream, "CamelHttpStream/1.0 Evolution/" VERSION);
-		proxy = em_utils_get_proxy_uri (job->u.uri);
-		if (proxy) {
-			camel_http_stream_set_proxy ((CamelHttpStream *) instream, proxy);
-			g_free (proxy);
-		}
+		camel_http_stream_set_user_agent((CamelHttpStream *) instream, "CamelHttpStream/1.0 Evolution/" VERSION);
+		emfh_configure_stream_for_proxy ((CamelHttpStream *) instream, job->u.uri);
+
 		camel_operation_push_message (
 			cancellable, _("Retrieving '%s'"), job->u.uri);
 		tmp_stream = (CamelHttpStream *) instream;
diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c
index 2dca93b51a..09b74bcb3c 100644
--- a/mail/em-subscription-editor.c
+++ b/mail/em-subscription-editor.c
@@ -51,7 +51,7 @@ typedef struct _AsyncContext AsyncContext;
 typedef struct _StoreData StoreData;
 
 struct _EMSubscriptionEditorPrivate {
-	CamelSession *session;
+	EMailBackend *backend;
 	CamelStore *initial_store;
 
 	GtkWidget *combo_box;		/* not referenced */
@@ -95,7 +95,7 @@ struct _StoreData {
 
 enum {
 	PROP_0,
-	PROP_SESSION,
+	PROP_BACKEND,
 	PROP_STORE
 };
 
@@ -932,13 +932,13 @@ subscription_editor_set_store (EMSubscriptionEditor *editor,
 }
 
 static void
-subscription_editor_set_session (EMSubscriptionEditor *editor,
-                                 CamelSession *session)
+subscription_editor_set_backend (EMSubscriptionEditor *editor,
+                                 EMailBackend *backend)
 {
-	g_return_if_fail (CAMEL_IS_SESSION (session));
-	g_return_if_fail (editor->priv->session == NULL);
+	g_return_if_fail (E_IS_MAIL_BACKEND (backend));
+	g_return_if_fail (editor->priv->backend == NULL);
 
-	editor->priv->session = g_object_ref (session);
+	editor->priv->backend = g_object_ref (backend);
 }
 
 static void
@@ -948,8 +948,8 @@ subscription_editor_set_property (GObject *object,
                                   GParamSpec *pspec)
 {
 	switch (property_id) {
-		case PROP_SESSION:
-			subscription_editor_set_session (
+		case PROP_BACKEND:
+			subscription_editor_set_backend (
 				EM_SUBSCRIPTION_EDITOR (object),
 				g_value_get_object (value));
 			return;
@@ -971,10 +971,10 @@ subscription_editor_get_property (GObject *object,
                                   GParamSpec *pspec)
 {
 	switch (property_id) {
-		case PROP_SESSION:
+		case PROP_BACKEND:
 			g_value_set_object (
 				value,
-				em_subscription_editor_get_session (
+				em_subscription_editor_get_backend (
 				EM_SUBSCRIPTION_EDITOR (object)));
 			return;
 
@@ -996,9 +996,9 @@ subscription_editor_dispose (GObject *object)
 
 	priv = EM_SUBSCRIPTION_EDITOR_GET_PRIVATE (object);
 
-	if (priv->session != NULL) {
-		g_object_unref (priv->session);
-		priv->session = NULL;
+	if (priv->backend != NULL) {
+		g_object_unref (priv->backend);
+		priv->backend = NULL;
 	}
 
 	if (priv->initial_store != NULL) {
@@ -1044,14 +1044,17 @@ subscription_editor_constructed (GObject *object)
 	if (editor->priv->initial_store == NULL) {
 		EAccount *account;
 		CamelService *service;
-		CamelSession *session;
-		const gchar *uid;
+		EMailBackend *backend;
+		EMailSession *session;
 
 		account = e_get_default_account ();
-		uid = account->uid;
 
-		session = em_subscription_editor_get_session (editor);
-		service = camel_session_get_service (session, uid);
+		backend = em_subscription_editor_get_backend (editor);
+		session = e_mail_backend_get_session (backend);
+
+		service = camel_session_get_service (
+			CAMEL_SESSION (session),
+			account->uid);
 
 		if (CAMEL_IS_SUBSCRIBABLE (service))
 			editor->priv->initial_store = g_object_ref (service);
@@ -1077,7 +1080,7 @@ subscription_editor_realize (GtkWidget *widget)
 
 	/* Find stores to display, and watch for the initial store. */
 
-	model = em_folder_tree_model_get_default (NULL);
+	model = em_folder_tree_model_get_default ();
 	list = em_folder_tree_model_list_stores (model);
 
 	for (link = list; link != NULL; link = g_list_next (link)) {
@@ -1122,12 +1125,12 @@ em_subscription_editor_class_init (EMSubscriptionEditorClass *class)
 
 	g_object_class_install_property (
 		object_class,
-		PROP_SESSION,
+		PROP_BACKEND,
 		g_param_spec_object (
-			"session",
+			"backend",
 			NULL,
 			NULL,
-			CAMEL_TYPE_SESSION,
+			E_TYPE_MAIL_BACKEND,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT_ONLY |
 			G_PARAM_STATIC_STRINGS));
@@ -1343,26 +1346,26 @@ em_subscription_editor_init (EMSubscriptionEditor *editor)
 
 GtkWidget *
 em_subscription_editor_new (GtkWindow *parent,
-                            CamelSession *session,
+                            EMailBackend *backend,
                             CamelStore *initial_store)
 {
 	g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL);
-	g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);
+	g_return_val_if_fail (E_IS_MAIL_BACKEND (backend), NULL);
 
 	return g_object_new (
 		EM_TYPE_SUBSCRIPTION_EDITOR,
-		"session", session,
+		"backend", backend,
 		"store", initial_store,
 		"transient-for", parent,
 		NULL);
 }
 
-CamelSession *
-em_subscription_editor_get_session (EMSubscriptionEditor *editor)
+EMailBackend *
+em_subscription_editor_get_backend (EMSubscriptionEditor *editor)
 {
 	g_return_val_if_fail (EM_IS_SUBSCRIPTION_EDITOR (editor), NULL);
 
-	return editor->priv->session;
+	return editor->priv->backend;
 }
 
 CamelStore *
diff --git a/mail/em-subscription-editor.h b/mail/em-subscription-editor.h
index d75347760b..1b297f44ed 100644
--- a/mail/em-subscription-editor.h
+++ b/mail/em-subscription-editor.h
@@ -21,6 +21,7 @@
 
 #include <gtk/gtk.h>
 #include <camel/camel.h>
+#include <mail/e-mail-backend.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_SUBSCRIPTION_EDITOR \
@@ -58,9 +59,11 @@ struct _EMSubscriptionEditorClass {
 
 GType		em_subscription_editor_get_type	(void);
 GtkWidget *	em_subscription_editor_new	(GtkWindow *parent,
-						 CamelSession *session,
+						 EMailBackend *backend,
 						 CamelStore *initial_store);
-CamelSession *	em_subscription_editor_get_session
+EMailBackend *	em_subscription_editor_get_backend
+						(EMSubscriptionEditor *editor);
+CamelStore *	em_subscription_editor_get_store
 						(EMSubscriptionEditor *editor);
 CamelStore *	em_subscription_editor_get_store
 						(EMSubscriptionEditor *editor);
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 5ff93887a2..67978884d0 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -1194,69 +1194,6 @@ em_utils_folder_is_outbox (CamelFolder *folder)
 static EProxy *emu_proxy = NULL;
 static GStaticMutex emu_proxy_lock = G_STATIC_MUTEX_INIT;
 
-/* encode to string this way, because soup_uri_to_string doesn't include passwords */
-static gchar *
-suri_to_string (SoupURI *suri)
-{
-	GString *uri;
-	gchar *tmp;
-
-	if (!suri)
-		return NULL;
-
-	uri = g_string_sized_new (20);
-
-	if (suri->scheme)
-		g_string_append_printf (uri, "%s:", suri->scheme);
-	if (suri->host) {
-		g_string_append (uri, "//");
-		if (suri->user) {
-			tmp = soup_uri_encode (suri->user, ":/;#@?\\");
-			g_string_append (uri, tmp);
-			g_free (tmp);
-		}
-
-		if (suri->password) {
-			g_string_append_c (uri, ':');
-			tmp = soup_uri_encode (suri->password, ":/;#@?\\");
-			g_string_append (uri, tmp);
-			g_free (tmp);
-		}
-
-		if (suri->user || suri->password)
-			g_string_append_c (uri, '@');
-
-		if (strchr (suri->host, ':')) {
-			g_string_append_c (uri, '[');
-			g_string_append (uri, suri->host);
-			g_string_append_c (uri, ']');
-		} else {
-			tmp = soup_uri_encode (suri->host, ":/");
-			g_string_append (uri, tmp);
-			g_free (tmp);
-		}
-
-		if (suri->port && !soup_uri_uses_default_port (suri))
-			g_string_append_printf (uri, ":%d", suri->port);
-		if (!suri->path && (suri->query || suri->fragment))
-			g_string_append_c (uri, '/');
-	}
-
-	if (suri->path && *suri->path)
-		g_string_append (uri, suri->path);
-
-	if (suri->query) {
-		g_string_append_c (uri, '?');
-		g_string_append (uri, suri->query);
-	}
-	if (suri->fragment) {
-		g_string_append_c (uri, '#');
-		g_string_append (uri, suri->fragment);
-	}
-
-	return g_string_free (uri, FALSE);
-}
-
 static gpointer
 emu_proxy_setup (gpointer data)
 {
@@ -1269,30 +1206,18 @@ emu_proxy_setup (gpointer data)
 	return NULL;
 }
 
-/**
- * em_utils_get_proxy_uri:
- *
- * Get the system proxy uri for 'pUri'.
- *
- * Return value: Must be freed when finished with.
- **/
-gchar *
-em_utils_get_proxy_uri (const gchar *pUri)
+EProxy *
+em_utils_get_proxy (void)
 {
-	gchar *uri = NULL;
-
 	g_static_mutex_lock (&emu_proxy_lock);
 
 	if (!emu_proxy) {
 		mail_call_main (MAIL_CALL_p_p, (MailMainFunc) emu_proxy_setup, NULL);
 	}
 
-	if (e_proxy_require_proxy_for_uri (emu_proxy, pUri))
-		uri = suri_to_string (e_proxy_peek_uri_for (emu_proxy, pUri));
-
 	g_static_mutex_unlock (&emu_proxy_lock);
 
-	return uri;
+	return emu_proxy;
 }
 
 /**
@@ -2391,7 +2316,8 @@ free_account_sort_order_cache (void)
 }
 
 static void
-fill_accounts_sort_order_cache (EMailBackend *backend, gboolean force_reload)
+fill_accounts_sort_order_cache (EMailBackend *backend,
+                                gboolean force_reload)
 {
 	GSList *account_uids;
 
@@ -2455,7 +2381,8 @@ emu_get_sort_order_key_file (EMailBackend *backend)
 }
 
 void
-em_utils_save_accounts_sort_order (EMailBackend *backend, const GSList *account_uids)
+em_utils_save_accounts_sort_order (EMailBackend *backend,
+                                   const GSList *account_uids)
 {
 	gchar *filename;
 	GKeyFile *key_file;
@@ -2520,7 +2447,8 @@ em_utils_load_accounts_sort_order (EMailBackend *backend)
 }
 
 guint
-em_utils_get_account_sort_order (EMailBackend *backend, const gchar *account_uid)
+em_utils_get_account_sort_order (EMailBackend *backend,
+                                 const gchar *account_uid)
 {
 	guint res;
 
diff --git a/mail/em-utils.h b/mail/em-utils.h
index e6ebe8ca4b..b07b74b186 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -26,6 +26,7 @@
 #include <gtk/gtk.h>
 #include <sys/types.h>
 #include <camel/camel.h>
+#include <libedataserver/e-proxy.h>
 
 #include <mail/e-mail-reader.h>
 #include <mail/e-mail-session.h>
@@ -66,7 +67,7 @@ gboolean	em_utils_folder_is_templates	(CamelFolder *folder);
 gboolean	em_utils_folder_is_sent		(CamelFolder *folder);
 gboolean	em_utils_folder_is_outbox	(CamelFolder *folder);
 
-gchar *em_utils_get_proxy_uri (const gchar *uri);
+EProxy *	em_utils_get_proxy		(void);
 
 /* FIXME: should this have an override charset? */
 gchar *em_utils_message_to_html (CamelMimeMessage *msg, const gchar *credits, guint32 flags, struct _EMFormat *source, const gchar *append, guint32 *validity_found);
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index fbb711738f..04c009bc00 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -32,6 +32,7 @@
 
 #include "em-vfolder-context.h"
 #include "em-vfolder-rule.h"
+#include "mail/e-mail-folder-utils.h"
 #include "mail/e-mail-store.h"
 #include "mail/em-utils.h"
 #include "mail/em-folder-tree.h"
@@ -532,63 +533,38 @@ select_source_with_changed (GtkWidget *widget,
 	data->vr->with = with;
 }
 
-/* attempt to make a 'nice' folder name out of the raw uri */
-static gchar *
-format_source (const gchar *uri)
-{
-	CamelURL *url;
-	GString *out;
-	gchar *res;
-
-	/* This should really probably base it on the account name? */
-	url = camel_url_new (uri, NULL);
-
-	/* bad uri */
-	if (url == NULL)
-		return g_strdup (uri);
-
-	out = g_string_new (url->protocol);
-	g_string_append_c (out, ':');
-	if (url->user && url->host) {
-		g_string_append_printf(out, "%s@%s", url->user, url->host);
-		if (url->port)
-			g_string_append_printf(out, ":%d", url->port);
-	}
-	if (url->fragment)
-		g_string_append (out, url->fragment);
-	else if (url->path)
-		g_string_append (out, url->path);
-
-	res = out->str;
-	g_string_free (out, FALSE);
-
-	return res;
-}
-
 static void
 vfr_folder_response (EMFolderSelector *selector,
                      gint button,
                      struct _source_data *data)
 {
+	EMailBackend *backend;
+	EMailSession *session;
 	const gchar *uri;
 
+	backend = em_folder_selector_get_backend (selector);
+	session = e_mail_backend_get_session (backend);
+
 	uri = em_folder_selector_get_selected_uri (selector);
 
 	if (button == GTK_RESPONSE_OK && uri != NULL) {
-		gchar *urinice;
 		GtkTreeSelection *selection;
 		GtkTreeIter iter;
+		gchar *markup;
 
 		g_queue_push_tail (&data->vr->sources, g_strdup (uri));
 
+		markup = e_mail_folder_uri_to_markup (
+			CAMEL_SESSION (session), uri, NULL);
+
 		gtk_list_store_append (data->model, &iter);
-		urinice = format_source (uri);
-		gtk_list_store_set (data->model, &iter, 0, urinice, 1, uri, -1);
-		g_free (urinice);
+		gtk_list_store_set (data->model, &iter, 0, markup, 1, uri, -1);
 		selection = gtk_tree_view_get_selection (data->list);
 		gtk_tree_selection_select_iter (selection, &iter);
 		data->current = uri;
 
+		g_free (markup);
+
 		set_sensitive (data);
 	}
 
@@ -610,7 +586,7 @@ source_add (GtkWidget *widget,
 
 	backend = em_vfolder_rule_get_backend (data->vr);
 
-	model = em_folder_tree_model_get_default (backend);
+	model = em_folder_tree_model_get_default ();
 
 	dialog = em_folder_selector_new (
 		parent, backend, model,
@@ -687,6 +663,8 @@ get_widget (EFilterRule *fr,
             ERuleContext *rc)
 {
 	EMVFolderRule *vr =(EMVFolderRule *) fr;
+	EMailBackend *backend;
+	EMailSession *session;
 	GtkWidget *widget, *frame;
 	struct _source_data *data;
 	GtkRadioButton *rb;
@@ -721,13 +699,19 @@ get_widget (EFilterRule *fr,
 	object = gtk_builder_get_object (builder, "source_model");
 	data->model = GTK_LIST_STORE (object);
 
+	backend = em_vfolder_context_get_backend (EM_VFOLDER_CONTEXT (rc));
+	session = e_mail_backend_get_session (backend);
+
 	source = NULL;
 	while ((source = em_vfolder_rule_next_source (vr, source))) {
-		gchar *nice = format_source (source);
+		gchar *markup;
+
+		markup = e_mail_folder_uri_to_markup (
+			CAMEL_SESSION (session), source, NULL);
 
 		gtk_list_store_append (data->model, &iter);
-		gtk_list_store_set (data->model, &iter, 0, nice, 1, source, -1);
-		g_free (nice);
+		gtk_list_store_set (data->model, &iter, 0, markup, 1, source, -1);
+		g_free (markup);
 	}
 
 	g_signal_connect (data->list, "cursor-changed", G_CALLBACK(select_source), data);
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index 0c1864928b..fa1a400f03 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -6,11 +6,11 @@ libevolution_mail_importers_la_CPPFLAGS = \
 	-I$(srcdir)/..					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
 	-DG_LOG_DOMAIN=\"evolution-mail-importer\"	\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
-	$(IMPORTERS_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(GNOME_PLATFORM_CFLAGS)			\
+	$(GTKHTML_CFLAGS)
 
 libevolution_mail_importers_la_SOURCES =	\
 	mail-importer.c				\
@@ -28,8 +28,8 @@ libevolution_mail_importers_la_LIBADD =				\
 	$(top_builddir)/mail/libevolution-mail.la		\
 	$(top_builddir)/shell/libeshell.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
-	$(EVOLUTION_MAIL_LIBS)					\
-	$(IMPORTERS_LIBS)
+	$(GTKHTML_LIBS)
 
 -include $(top_srcdir)/git.mk
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index 5d934aafa2..8c788b69ad 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -409,6 +409,11 @@ for display purposes only. </property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkAdjustment" id="adjustment6">
+    <property name="upper">65535</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkNotebook" id="composer_toplevel">
     <property name="visible">True</property>
     <property name="can_focus">True</property>
@@ -1505,6 +1510,22 @@ for display purposes only. </property>
                                   </packing>
                                 </child>
                                 <child>
+                                  <object class="GtkLabel" id="lblSocksHost">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">SOC_KS Proxy:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">txtSocksHost</property>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
                                   <object class="GtkLabel" id="lblIgnoreHosts">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -1547,6 +1568,20 @@ for display purposes only. </property>
                                   </packing>
                                 </child>
                                 <child>
+                                  <object class="GtkEntry" id="txtSocksHost">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">â—�</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
                                   <object class="GtkLabel" id="lblHttpPort">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -1577,6 +1612,22 @@ for display purposes only. </property>
                                   </packing>
                                 </child>
                                 <child>
+                                  <object class="GtkLabel" id="lblSocksPort">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Port:</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
                                   <object class="GtkSpinButton" id="spnHttpPort">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -1607,6 +1658,22 @@ for display purposes only. </property>
                                   </packing>
                                 </child>
                                 <child>
+                                  <object class="GtkSpinButton" id="spnSocksPort">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">â—�</property>
+                                    <property name="adjustment">adjustment6</property>
+                                    <property name="climb_rate">1</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">3</property>
+                                    <property name="right_attach">4</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
                                   <object class="GtkEntry" id="txtIgnoreHosts">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -4265,6 +4332,7 @@ For example: "Work" or "Personal"</property>
                         <property name="receives_default">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
+                        <property name="active">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
diff --git a/mail/mail-dialogs.ui b/mail/mail-dialogs.ui
index ff74671741..58a9f8c2aa 100644
--- a/mail/mail-dialogs.ui
+++ b/mail/mail-dialogs.ui
@@ -125,7 +125,7 @@
                             <child>
                               <object class="GtkCellRendererText" id="source_renderer"/>
                               <attributes>
-                                <attribute name="text">0</attribute>
+                                <attribute name="markup">0</attribute>
                               </attributes>
                             </child>
                           </object>
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 0e1ac98413..30bbce6579 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -39,8 +39,8 @@
 #include <glib/gstdio.h>
 
 #include <libedataserver/e-data-server-util.h>
-#include "e-util/e-marshal.h"
-#include "e-util/e-util.h"
+#include <e-util/e-marshal.h>
+#include <e-util/e-util.h>
 
 #include "mail-mt.h"
 #include "mail-folder-cache.h"
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 2c4b3067df..57885172a9 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -215,7 +215,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m,
 	CamelFolder *folder = NULL;
 	CamelURL *url;
 	const gchar *uid;
-	gboolean is_local_delivery;
+	gboolean is_local_delivery = FALSE;
 	gint i;
 
 	fm->destination = e_mail_local_get_folder (
@@ -452,7 +452,7 @@ static const gchar *resent_recipients[] = {
 struct _send_queue_msg {
 	MailMsg base;
 
-	EMailSession *session;
+	EMailBackend *backend;
 	CamelFolder *queue;
 	CamelTransport *transport;
 
@@ -483,6 +483,7 @@ mail_send_message (struct _send_queue_msg *m,
                    GError **error)
 {
 	EAccount *account = NULL;
+	EMailSession *session;
 	const CamelInternetAddress *iaddr;
 	CamelAddress *from, *recipients;
 	CamelMessageInfo *info = NULL;
@@ -504,11 +505,13 @@ mail_send_message (struct _send_queue_msg *m,
 
 	camel_medium_set_header (CAMEL_MEDIUM (message), "X-Mailer", x_mailer);
 
-	err = g_string_new("");
+	err = g_string_new ("");
 	xev = mail_tool_remove_xevolution_headers (message);
 
-	tmp = camel_header_raw_find(&xev, "X-Evolution-Account", NULL);
-	if (tmp) {
+	session = e_mail_backend_get_session (m->backend);
+
+	tmp = camel_header_raw_find (&xev, "X-Evolution-Account", NULL);
+	if (tmp != NULL) {
 		gchar *name;
 
 		name = g_strstrip (g_strdup (tmp));
@@ -522,7 +525,7 @@ mail_send_message (struct _send_queue_msg *m,
 				transport_uid = g_strconcat (
 					account->uid, "-transport", NULL);
 				service = camel_session_get_service (
-					CAMEL_SESSION (m->session),
+					CAMEL_SESSION (session),
 					transport_uid);
 				g_free (transport_uid);
 
@@ -607,7 +610,7 @@ mail_send_message (struct _send_queue_msg *m,
 		uri = g_strstrip (g_strdup (header->value));
 		/* FIXME Not passing a GCancellable or GError here. */
 		folder = e_mail_session_uri_to_folder_sync (
-			m->session, uri, 0, NULL, NULL);
+			session, uri, 0, NULL, NULL);
 		if (folder) {
 			/* FIXME Not passing a GCancellable or GError here. */
 			camel_folder_append_message_sync (
@@ -647,7 +650,7 @@ mail_send_message (struct _send_queue_msg *m,
 
 		if (sent_folder_uri) {
 			folder = e_mail_session_uri_to_folder_sync (
-				m->session, sent_folder_uri, 0,
+				session, sent_folder_uri, 0,
 				cancellable, &local_error);
 			if (folder == NULL) {
 				g_string_append_printf (
@@ -714,7 +717,7 @@ mail_send_message (struct _send_queue_msg *m,
 	if (local_error == NULL) {
 		/* Mark the draft message for deletion, if present. */
 		e_mail_session_handle_draft_headers_sync (
-			m->session, message, cancellable, &local_error);
+			session, message, cancellable, &local_error);
 		if (local_error != NULL) {
 			g_warning ("%s: Failed to handle draft headers: %s", G_STRFUNC, local_error->message);
 			g_clear_error (&local_error);
@@ -724,7 +727,7 @@ mail_send_message (struct _send_queue_msg *m,
 		 * Source message refers to the message being forwarded
 		 * or replied to. */
 		e_mail_session_handle_source_headers_sync (
-			m->session, message, cancellable, &local_error);
+			session, message, cancellable, &local_error);
 		if (local_error != NULL) {
 			g_warning ("%s: Failed to handle source headers: %s", G_STRFUNC, local_error->message);
 			g_clear_error (&local_error);
@@ -766,8 +769,6 @@ exit:
 	camel_header_raw_clear (&xev);
 	g_string_free (err, TRUE);
 	g_object_unref (message);
-
-	return;
 }
 
 /* ** SEND MAIL QUEUE ***************************************************** */
@@ -930,8 +931,8 @@ send_queue_desc (struct _send_queue_msg *m)
 static void
 send_queue_free (struct _send_queue_msg *m)
 {
-	if (m->session != NULL)
-		g_object_unref (m->session);
+	if (m->backend != NULL)
+		g_object_unref (m->backend);
 	if (m->driver != NULL)
 		g_object_unref (m->driver);
 	if (m->transport != NULL)
@@ -950,7 +951,7 @@ static MailMsgInfo send_queue_info = {
 /* same interface as fetch_mail, just 'cause i'm lazy today
  * (and we need to run it from the same spot?) */
 void
-mail_send_queue (EMailSession *session,
+mail_send_queue (EMailBackend *backend,
                  CamelFolder *queue,
                  CamelTransport *transport,
                  const gchar *type,
@@ -962,10 +963,15 @@ mail_send_queue (EMailSession *session,
                  void (*done)(gpointer data),
                  gpointer data)
 {
+	EMailSession *session;
 	struct _send_queue_msg *m;
 
+	g_return_if_fail (E_IS_MAIL_BACKEND (backend));
+
+	session = e_mail_backend_get_session (backend);
+
 	m = mail_msg_new (&send_queue_info);
-	m->session = g_object_ref (session);
+	m->backend = g_object_ref (backend);
 	m->queue = g_object_ref (queue);
 	m->transport = g_object_ref (transport);
 	if (G_IS_CANCELLABLE (cancellable))
diff --git a/mail/mail-ops.h b/mail/mail-ops.h
index 32784be245..4ec64ccf22 100644
--- a/mail/mail-ops.h
+++ b/mail/mail-ops.h
@@ -63,7 +63,7 @@ void mail_xfer_folder (const gchar *src_uri, const gchar *dest_uri, gboolean rem
 		       gpointer data);
 
 /* yeah so this is messy, but it does a lot, maybe i can consolidate all user_data's to be the one */
-void		mail_send_queue			(EMailSession *session,
+void		mail_send_queue			(EMailBackend *backend,
 						 CamelFolder *queue,
 						 CamelTransport *transport,
 						 const gchar *type,
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 5fda76d103..33ac977e35 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -107,7 +107,7 @@ typedef enum {
 
 struct _send_info {
 	send_info_t type;		/* 0 = fetch, 1 = send */
-	EMailSession *session;
+	EMailBackend *backend;
 	GCancellable *cancellable;
 	gchar *service_uid;
 	gboolean keep_on_server;
@@ -151,8 +151,8 @@ free_folder_info (struct _folder_info *info)
 static void
 free_send_info (struct _send_info *info)
 {
-	if (info->session)
-		g_object_unref (info->session);
+	if (info->backend)
+		g_object_unref (info->backend);
 	if (info->cancellable)
 		g_object_unref (info->cancellable);
 	g_free (info->service_uid);
@@ -425,7 +425,7 @@ get_receive_type (CamelURL *url)
 
 static struct _send_data *
 build_dialog (GtkWindow *parent,
-              EMailSession *session,
+              EMailBackend *backend,
               EAccountList *accounts,
               CamelFolder *outbox,
               EAccount *outgoing_account,
@@ -552,7 +552,7 @@ build_dialog (GtkWindow *parent,
 
 			info = g_malloc0 (sizeof (*info));
 			info->type = type;
-			info->session = g_object_ref (session);
+			info->backend = g_object_ref (backend);
 
 			d(printf("adding source %s\n", source->url));
 
@@ -802,21 +802,24 @@ receive_done (gpointer data)
 
 	/* if we've been called to run again - run again */
 	if (info->type == SEND_SEND && info->state == SEND_ACTIVE && info->again) {
+		EMailSession *session;
 		CamelFolder *local_outbox;
 		CamelService *service;
 
+		session = e_mail_backend_get_session (info->backend);
+
 		local_outbox = e_mail_local_get_folder (
 			E_MAIL_LOCAL_FOLDER_OUTBOX);
 
 		service = camel_session_get_service (
-			CAMEL_SESSION (info->session),
+			CAMEL_SESSION (session),
 			info->service_uid);
 
 		g_return_if_fail (CAMEL_IS_TRANSPORT (service));
 
 		info->again = 0;
 		mail_send_queue (
-			info->session,
+			info->backend,
 			local_outbox,
 			CAMEL_TRANSPORT (service),
 			E_FILTER_SOURCE_OUTGOING,
@@ -875,19 +878,24 @@ receive_get_folder (CamelFilterDriver *d,
 {
 	struct _send_info *info = data;
 	CamelFolder *folder;
+	EMailSession *session;
 	struct _folder_info *oldinfo;
 	gpointer oldkey, oldinfoptr;
 
 	g_mutex_lock (info->data->lock);
 	oldinfo = g_hash_table_lookup (info->data->folders, uri);
 	g_mutex_unlock (info->data->lock);
+
 	if (oldinfo) {
 		g_object_ref (oldinfo->folder);
 		return oldinfo->folder;
 	}
+
+	session = e_mail_backend_get_session (info->backend);
+
 	/* FIXME Not passing a GCancellable here. */
 	folder = e_mail_session_uri_to_folder_sync (
-		info->session, uri, 0, NULL, error);
+		session, uri, 0, NULL, error);
 	if (!folder)
 		return NULL;
 
@@ -965,6 +973,7 @@ refresh_folders_exec (struct _refresh_folders_msg *m,
                       GError **error)
 {
 	CamelFolder *folder;
+	EMailSession *session;
 	gint i;
 	GError *local_error = NULL;
 	gulong handler_id = 0;
@@ -978,9 +987,11 @@ refresh_folders_exec (struct _refresh_folders_msg *m,
 
 	camel_operation_push_message (m->info->cancellable, _("Updating..."));
 
+	session = e_mail_backend_get_session (m->info->backend);
+
 	for (i = 0; i < m->folders->len; i++) {
 		folder = e_mail_session_uri_to_folder_sync (
-			m->info->session,
+			session,
 			m->folders->pdata[i], 0,
 			cancellable, &local_error);
 		if (folder) {
@@ -1068,14 +1079,16 @@ static void
 receive_update_got_store (CamelStore *store,
                           struct _send_info *info)
 {
+	EMailSession *session;
 	MailFolderCache *folder_cache;
 
-	folder_cache = e_mail_session_get_folder_cache (info->session);
+	session = e_mail_backend_get_session (info->backend);
+	folder_cache = e_mail_session_get_folder_cache (session);
 
 	if (store) {
 		mail_folder_cache_note_store (
 			folder_cache,
-			CAMEL_SESSION (info->session),
+			CAMEL_SESSION (session),
 			store, info->cancellable,
 			receive_update_got_folderinfo, info);
 	} else {
@@ -1085,11 +1098,12 @@ receive_update_got_store (CamelStore *store,
 
 static GtkWidget *
 send_receive (GtkWindow *parent,
-              EMailSession *session,
+              EMailBackend *backend,
               gboolean allow_send)
 {
 	CamelFolder *local_outbox;
 	struct _send_data *data;
+	EMailSession *session;
 	EAccountList *accounts;
 	EAccount *account;
 	GList *scan;
@@ -1101,6 +1115,8 @@ send_receive (GtkWindow *parent,
 		return send_recv_dialog;
 	}
 
+	session = e_mail_backend_get_session (backend);
+
 	if (!camel_session_get_online (CAMEL_SESSION (session)))
 		return send_recv_dialog;
 
@@ -1112,7 +1128,7 @@ send_receive (GtkWindow *parent,
 
 	local_outbox = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_OUTBOX);
 	data = build_dialog (
-		parent, session, accounts,
+		parent, backend, accounts,
 		local_outbox, account, allow_send);
 
 	for (scan = data->infos; scan != NULL; scan = scan->next) {
@@ -1139,7 +1155,7 @@ send_receive (GtkWindow *parent,
 		case SEND_SEND:
 			/* todo, store the folder in info? */
 			mail_send_queue (
-				session, local_outbox,
+				backend, local_outbox,
 				CAMEL_TRANSPORT (service),
 				E_FILTER_SOURCE_OUTGOING,
 				info->cancellable,
@@ -1161,21 +1177,21 @@ send_receive (GtkWindow *parent,
 
 GtkWidget *
 mail_send_receive (GtkWindow *parent,
-                   EMailSession *session)
+                   EMailBackend *backend)
 {
-	return send_receive (parent, session, TRUE);
+	return send_receive (parent, backend, TRUE);
 }
 
 GtkWidget *
 mail_receive (GtkWindow *parent,
-              EMailSession *session)
+              EMailBackend *backend)
 {
-	return send_receive (parent, session, FALSE);
+	return send_receive (parent, backend, FALSE);
 }
 
 struct _auto_data {
 	EAccount *account;
-	EMailSession *session;
+	EMailBackend *backend;
 	gint period;		/* in seconds */
 	gint timeout_id;
 };
@@ -1185,10 +1201,13 @@ static GHashTable *auto_active;
 static gboolean
 auto_timeout (gpointer data)
 {
+	EMailSession *session;
 	struct _auto_data *info = data;
 
-	if (camel_session_get_online (CAMEL_SESSION (info->session)))
-		mail_receive_account (info->session, info->account);
+	session = e_mail_backend_get_session (info->backend);
+
+	if (camel_session_get_online (CAMEL_SESSION (session)))
+		mail_receive_account (info->backend, info->account);
 
 	return TRUE;
 }
@@ -1211,8 +1230,8 @@ auto_account_removed (EAccountList *eal,
 static void
 auto_account_finalized (struct _auto_data *info)
 {
-	if (info->session != NULL)
-		g_object_unref (info->session);
+	if (info->backend != NULL)
+		g_object_unref (info->backend);
 	if (info->timeout_id)
 		g_source_remove (info->timeout_id);
 	g_free (info);
@@ -1243,13 +1262,13 @@ auto_account_commit (struct _auto_data *info)
 static void
 auto_account_added (EAccountList *eal,
                     EAccount *ea,
-                    EMailSession *session)
+                    EMailBackend *backend)
 {
 	struct _auto_data *info;
 
 	info = g_malloc0 (sizeof (*info));
 	info->account = ea;
-	info->session = g_object_ref (session);
+	info->backend = g_object_ref (backend);
 	g_object_set_data_full (
 		G_OBJECT (ea), "mail-autoreceive", info,
 		(GDestroyNotify) auto_account_finalized);
@@ -1314,7 +1333,6 @@ mail_autoreceive_init (EMailBackend *backend)
 {
 	EShellBackend *shell_backend;
 	EShellSettings *shell_settings;
-	EMailSession *session;
 	EAccountList *accounts;
 	EIterator *iter;
 	EShell *shell;
@@ -1327,11 +1345,9 @@ mail_autoreceive_init (EMailBackend *backend)
 	accounts = e_get_account_list ();
 	auto_active = g_hash_table_new (g_str_hash, g_str_equal);
 
-	session = e_mail_backend_get_session (backend);
-
 	g_signal_connect (
 		accounts, "account-added",
-		G_CALLBACK (auto_account_added), session);
+		G_CALLBACK (auto_account_added), backend);
 	g_signal_connect (
 		accounts, "account-removed",
 		G_CALLBACK (auto_account_removed), NULL);
@@ -1344,7 +1360,7 @@ mail_autoreceive_init (EMailBackend *backend)
 	     e_iterator_next (iter))
 		auto_account_added (
 			accounts, (EAccount *)
-			e_iterator_get (iter), session);
+			e_iterator_get (iter), backend);
 
 	shell_backend = E_SHELL_BACKEND (backend);
 	shell = e_shell_backend_get_shell (shell_backend);
@@ -1356,7 +1372,7 @@ mail_autoreceive_init (EMailBackend *backend)
 
 		/* also flush outbox on start */
 		if (e_shell_get_online (shell))
-			mail_send (session);
+			mail_send (backend);
 	}
 
 	g_signal_connect (
@@ -1367,11 +1383,12 @@ mail_autoreceive_init (EMailBackend *backend)
 /* We setup the download info's in a hashtable, if we later
  * need to build the gui, we insert them in to add them. */
 void
-mail_receive_account (EMailSession *session,
+mail_receive_account (EMailBackend *backend,
                       EAccount *account)
 {
 	struct _send_info *info;
 	struct _send_data *data;
+	EMailSession *session;
 	CamelFolder *local_outbox;
 	CamelService *service;
 	CamelURL *url;
@@ -1394,7 +1411,7 @@ mail_receive_account (EMailSession *session,
 
 	info = g_malloc0 (sizeof (*info));
 	info->type = type;
-	info->session = g_object_ref (session);
+	info->backend = g_object_ref (backend);
 	info->progress_bar = NULL;
 	info->status_label = NULL;
 	info->service_uid = g_strdup (account->uid);
@@ -1413,6 +1430,8 @@ mail_receive_account (EMailSession *session,
 
 	g_hash_table_insert (data->active, account->uid, info);
 
+	session = e_mail_backend_get_session (backend);
+
 	service = camel_session_get_service (
 		CAMEL_SESSION (session), account->uid);
 
@@ -1434,7 +1453,7 @@ mail_receive_account (EMailSession *session,
 		local_outbox = e_mail_local_get_folder (
 			E_MAIL_LOCAL_FOLDER_OUTBOX);
 		mail_send_queue (
-			info->session,
+			info->backend,
 			local_outbox,
 			CAMEL_TRANSPORT (service),
 			E_FILTER_SOURCE_OUTGOING,
@@ -1452,10 +1471,11 @@ mail_receive_account (EMailSession *session,
 }
 
 void
-mail_send (EMailSession *session)
+mail_send (EMailBackend *backend)
 {
 	CamelFolder *local_outbox;
 	CamelService *service;
+	EMailSession *session;
 	EAccount *account;
 	CamelURL *url;
 	struct _send_info *info;
@@ -1490,7 +1510,7 @@ mail_send (EMailSession *session)
 
 	info = g_malloc0 (sizeof (*info));
 	info->type = SEND_SEND;
-	info->session = g_object_ref (session);
+	info->backend = g_object_ref (backend);
 	info->progress_bar = NULL;
 	info->status_label = NULL;
 	info->service_uid = g_strdup (transport_uid);
@@ -1508,6 +1528,8 @@ mail_send (EMailSession *session)
 	/* todo, store the folder in info? */
 	local_outbox = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_OUTBOX);
 
+	session = e_mail_backend_get_session (backend);
+
 	service = camel_session_get_service (
 		CAMEL_SESSION (session), transport_uid);
 
@@ -1516,7 +1538,7 @@ mail_send (EMailSession *session)
 	g_return_if_fail (CAMEL_IS_TRANSPORT (service));
 
 	mail_send_queue (
-		session, local_outbox,
+		backend, local_outbox,
 		CAMEL_TRANSPORT (service),
 		E_FILTER_SOURCE_OUTGOING,
 		info->cancellable,
diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h
index 5da6599712..f702b74d7a 100644
--- a/mail/mail-send-recv.h
+++ b/mail/mail-send-recv.h
@@ -32,16 +32,16 @@ G_BEGIN_DECLS
 
 /* send/receive all uri's */
 GtkWidget *	mail_send_receive		(GtkWindow *parent,
-						 EMailSession *session);
+						 EMailBackend *backend);
 
 GtkWidget *	mail_receive			(GtkWindow *parent,
-						 EMailSession *session);
+						 EMailBackend *backend);
 
 /* receive a single account */
-void		mail_receive_account		(EMailSession *session,
+void		mail_receive_account		(EMailBackend *backend,
 						 EAccount *account);
 
-void		mail_send			(EMailSession *session);
+void		mail_send			(EMailBackend *backend);
 
 /* setup auto receive stuff */
 void		mail_autoreceive_init		(EMailBackend *backend);
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 78d0863e0c..c1e451d04c 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -1161,7 +1161,7 @@ vfolder_load_storage (EMailBackend *backend)
 		G_CALLBACK (context_rule_removed), context);
 
 	/* load store to mail component */
-	e_mail_store_add (session, vfolder_store);
+	e_mail_store_add (backend, vfolder_store);
 
 	/* and setup the rules we have */
 	rule = NULL;
diff --git a/mail/mail.error.xml b/mail/mail.error.xml
index f32b4ce688..006cc559a4 100644
--- a/mail/mail.error.xml
+++ b/mail/mail.error.xml
@@ -540,5 +540,10 @@ An mbox account will be created to preserve the old mbox folders. You can delete
     <_secondary>The reported error was &quot;{0}&quot;.</_secondary>
   </error>
 
+  <error id="blacklisted-file" type="warning">
+    <_primary>Hidden file is attached.</_primary>
+    <_secondary xml:space="preserve">The attachment named {0} is a hidden file and may contain sensitive data. Please review it before sending.</_secondary>
+  </error>
+
 </error-list>
 
diff --git a/mail/message-list.c b/mail/message-list.c
index cd44b9506a..603fc71d89 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -3332,7 +3332,7 @@ build_tree (MessageList *ml,
 #endif
 	if (!saveuid && ml->cursor_uid && g_hash_table_lookup (ml->uid_nodemap, ml->cursor_uid)) {
 		/* this makes sure a visible node is selected, like when
-		   collapsing all nodes and a children had been selected
+		 * collapsing all nodes and a children had been selected
 		*/
 		saveuid = g_strdup (ml->cursor_uid);
 	}
@@ -4125,7 +4125,7 @@ on_click (ETree *tree,
 	CamelMessageInfo *info;
 	gboolean folder_is_trash;
 	const gchar *uid;
-	gint flag;
+	gint flag = 0;
 	guint32 flags;
 
 	if (col == COL_MESSAGE_STATUS)
diff --git a/maint/Makefile.am b/maint/Makefile.am
index dc2b1165bd..175832e0f7 100644
--- a/maint/Makefile.am
+++ b/maint/Makefile.am
@@ -16,8 +16,6 @@ libgladeevolution_la_LIBADD = \
 	$(top_srcdir)/calendar/gui/libevolution-calendar.la \
 	$(top_builddir)/widgets/misc/libemiscwidgets.la \
 	$(EVOLUTION_DATA_SERVER_LIBS) \
-	$(EVOLUTION_CALENDAR_LIBS) \
-	$(EVOLUTION_MAIL_LIBS) \
 	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = \
diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am
index b6dec30b0a..5757ac2e74 100644
--- a/modules/addressbook/Makefile.am
+++ b/modules/addressbook/Makefile.am
@@ -19,8 +19,9 @@ libevolution_module_addressbook_la_CPPFLAGS =			\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"			\
 	-DPREFIX=\""$(prefix)"\"				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)				\
+	$(GTKHTML_CFLAGS)					\
 	$(LDAP_CFLAGS)						\
 	$(CHAMPLAIN_CFLAGS)
 
@@ -72,8 +73,9 @@ libevolution_module_addressbook_la_LIBADD =			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/widgets/menus/libmenus.la		\
 	$(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la \
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
+	$(GTKHTML_LIBS)						\
 	$(LDAP_LIBS)
 
 
diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c
index f075372540..e3120246b3 100644
--- a/modules/addressbook/addressbook-config.c
+++ b/modules/addressbook/addressbook-config.c
@@ -76,7 +76,6 @@
 #define EVOLUTIONPERSON      "evolutionPerson"
 #define CALENTRY             "calEntry"
 
-
 typedef struct _AddressbookSourceDialog AddressbookSourceDialog;
 
 struct _AddressbookSourceDialog {
@@ -122,8 +121,6 @@ struct _AddressbookSourceDialog {
 	GtkWidget *display_name;
 };
 
-
-
 #ifdef HAVE_LDAP
 
 static const gchar *
diff --git a/modules/bogofilter/Makefile.am b/modules/bogofilter/Makefile.am
index 7803267836..5fbf45e5b4 100644
--- a/modules/bogofilter/Makefile.am
+++ b/modules/bogofilter/Makefile.am
@@ -5,8 +5,8 @@ libevolution_module_bogofilter_la_CPPFLAGS =			\
 	-I$(top_srcdir)						\
 	-DG_LOG_DOMAIN=\"evolution-bogofilter\"			\
 	-DWELCOME_MESSAGE=\""$(privdatadir)/default/C/mail/local/Inbox"\" \
-	$(GNOME_PLATFORM_CFLAGS)				\
-	$(EVOLUTION_MAIL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libevolution_module_bogofilter_la_SOURCES =			\
 	evolution-bogofilter.c
@@ -14,8 +14,8 @@ libevolution_module_bogofilter_la_SOURCES =			\
 libevolution_module_bogofilter_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/mail/libevolution-mail.la		\
-	$(GNOME_PLATFORM_LIBS)					\
-	$(EVOLUTION_MAIL_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)
 
 libevolution_module_bogofilter_la_LDFLAGS =			\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index c725dedb1c..4f09f92692 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -7,9 +7,9 @@ libevolution_module_calendar_la_CPPFLAGS =		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
-	$(CAMEL_CFLAGS)					\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_CALENDAR_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 libevolution_module_calendar_la_SOURCES =		\
 	evolution-module-calendar.c			\
@@ -94,9 +94,9 @@ libevolution_module_calendar_la_LIBADD =		\
 	$(top_builddir)/widgets/menus/libmenus.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(top_builddir)/widgets/table/libetable.la			\
-	$(CAMEL_LIBS)							\
-	$(EVOLUTION_CALENDAR_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)					\
+	$(GNOME_PLATFORM_LIBS)						\
+	$(GTKHTML_LIBS)
 
 libevolution_module_calendar_la_LDFLAGS =		\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/calendar/e-cal-config-calendar-item.c b/modules/calendar/e-cal-config-calendar-item.c
index 09895c0a0e..d0d6e11b90 100644
--- a/modules/calendar/e-cal-config-calendar-item.c
+++ b/modules/calendar/e-cal-config-calendar-item.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-calendar-item.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <misc/e-calendar-item.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-comp-editor.c b/modules/calendar/e-cal-config-comp-editor.c
index b522975bac..dc37c748c3 100644
--- a/modules/calendar/e-cal-config-comp-editor.c
+++ b/modules/calendar/e-cal-config-comp-editor.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-comp-editor.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/dialogs/comp-editor.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-date-edit.c b/modules/calendar/e-cal-config-date-edit.c
index d59549764b..48a5848f73 100644
--- a/modules/calendar/e-cal-config-date-edit.c
+++ b/modules/calendar/e-cal-config-date-edit.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-date-edit.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <misc/e-dateedit.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-meeting-store.c b/modules/calendar/e-cal-config-meeting-store.c
index f9a91dacd0..7b4f2dec30 100644
--- a/modules/calendar/e-cal-config-meeting-store.c
+++ b/modules/calendar/e-cal-config-meeting-store.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-meeting-store.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/e-meeting-store.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-meeting-time-selector.c b/modules/calendar/e-cal-config-meeting-time-selector.c
index 23eef11ef5..249d541274 100644
--- a/modules/calendar/e-cal-config-meeting-time-selector.c
+++ b/modules/calendar/e-cal-config-meeting-time-selector.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-meeting-time-selector.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/e-meeting-time-sel.h>
 
 static gpointer parent_class;
diff --git a/modules/calendar/e-cal-config-model.c b/modules/calendar/e-cal-config-model.c
index f42e4a9b66..9898942bf9 100644
--- a/modules/calendar/e-cal-config-model.c
+++ b/modules/calendar/e-cal-config-model.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-model.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/e-cal-model.h>
 #include <calendar/gui/e-cal-model-tasks.h>
 
diff --git a/modules/calendar/e-cal-config-view.c b/modules/calendar/e-cal-config-view.c
index ecc35871ca..afe747dd80 100644
--- a/modules/calendar/e-cal-config-view.c
+++ b/modules/calendar/e-cal-config-view.c
@@ -22,8 +22,9 @@
 
 #include "e-cal-config-view.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <calendar/gui/e-day-view.h>
 #include <calendar/gui/e-week-view.h>
 
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index 21472453ef..aa5738e27e 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -1705,6 +1705,13 @@ static GtkRadioActionEntry calendar_filter_entries[] = {
 	  NULL,  /* XXX Add a tooltip! */
 	  CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS },
 
+	{ "calendar-filter-occurs-less-than-5-times",
+	  NULL,
+	  N_("Occurs Less Than 5 Times"),
+	  NULL,
+	  NULL,  /* XXX Add a tooltip! */
+	  CALENDAR_FILTER_OCCURS_LESS_THAN_5_TIMES },
+
 	{ "calendar-filter-unmatched",
 	  NULL,
 	  N_("Unmatched"),
@@ -1972,7 +1979,7 @@ e_cal_shell_view_update_search_filter (ECalShellView *cal_shell_view)
 		ii = CALENDAR_FILTER_UNMATCHED;
 		e_action_combo_box_add_separator_after (combo_box, ii);
 
-		ii = CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS;
+		ii = CALENDAR_FILTER_OCCURS_LESS_THAN_5_TIMES;
 		e_action_combo_box_add_separator_after (combo_box, ii);
 
 		e_shell_view_unblock_execute_search (shell_view);
diff --git a/modules/calendar/e-cal-shell-view-actions.h b/modules/calendar/e-cal-shell-view-actions.h
index b79bc6baaf..fcc77ea011 100644
--- a/modules/calendar/e-cal-shell-view-actions.h
+++ b/modules/calendar/e-cal-shell-view-actions.h
@@ -133,6 +133,8 @@
 	E_SHELL_WINDOW_ACTION ((window), "calendar-filter-any-category")
 #define E_SHELL_WINDOW_ACTION_CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS(window) \
 	E_SHELL_WINDOW_ACTION ((window), "calendar-filter-next-7-days-appointments")
+#define E_SHELL_WINDOW_ACTION_CALENDAR_FILTER_OCCURS_LESS_THAN_5_TIMES(window) \
+	E_SHELL_WINDOW_ACTION ((window), "calendar-filter-occurs-less-than-5-times")
 #define E_SHELL_WINDOW_ACTION_CALENDAR_FILTER_UNMATCHED(window) \
 	E_SHELL_WINDOW_ACTION ((window), "calendar-filter-unmatched")
 #define E_SHELL_WINDOW_ACTION_CALENDAR_SEARCH_ADVANCED_HIDDEN(window) \
diff --git a/modules/calendar/e-cal-shell-view-private.h b/modules/calendar/e-cal-shell-view-private.h
index 7c78130fc3..6653632662 100644
--- a/modules/calendar/e-cal-shell-view-private.h
+++ b/modules/calendar/e-cal-shell-view-private.h
@@ -85,10 +85,11 @@ G_BEGIN_DECLS
 /* Filter items are displayed in ascending order.
  * Non-negative values are reserved for categories. */
 enum {
-	CALENDAR_FILTER_ANY_CATEGORY			= -4,
-	CALENDAR_FILTER_UNMATCHED			= -3,
-	CALENDAR_FILTER_ACTIVE_APPOINTMENTS		= -2,
-	CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS	= -1
+	CALENDAR_FILTER_ANY_CATEGORY			= -5,
+	CALENDAR_FILTER_UNMATCHED			= -4,
+	CALENDAR_FILTER_ACTIVE_APPOINTMENTS		= -3,
+	CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS	= -2,
+	CALENDAR_FILTER_OCCURS_LESS_THAN_5_TIMES	= -1
 };
 
 /* Search items are displayed in ascending order. */
diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index 0a9b7701f8..f644402080 100644
--- a/modules/calendar/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
@@ -194,6 +194,12 @@ cal_shell_view_execute_search (EShellView *shell_view)
 			range_search = TRUE;
 			break;
 
+		case CALENDAR_FILTER_OCCURS_LESS_THAN_5_TIMES:
+			temp = g_strdup_printf ("(and %s (< (occurrences-count?) 5))", query);
+			g_free (query);
+			query = temp;
+			break;
+
 		default:
 		{
 			GList *categories;
diff --git a/modules/composer-autosave/Makefile.am b/modules/composer-autosave/Makefile.am
index 691fbe0bb1..2d4a774c70 100644
--- a/modules/composer-autosave/Makefile.am
+++ b/modules/composer-autosave/Makefile.am
@@ -5,8 +5,9 @@ libevolution_module_composer_autosave_la_CPPFLAGS =		\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
 	-DG_LOG_DOMAIN=\"evolution-composer-autosave\"		\
-	$(EVOLUTION_MAIL_CFLAGS)				\
-	$(GNOME_PLATFORM_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
+	$(GNOME_PLATFORM_CFLAGS)				\
+	$(GTKHTML_CFLAGS)
 
 libevolution_module_composer_autosave_la_SOURCES =		\
 	evolution-composer-autosave.c				\
@@ -20,8 +21,9 @@ libevolution_module_composer_autosave_la_LIBADD =		\
 	$(top_builddir)/composer/libcomposer.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/e-util/libeutil.la			\
-	$(EVOLUTION_MAIL_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)					\
+	$(GTKHTML_LIBS)
 
 libevolution_module_composer_autosave_la_LDFLAGS =		\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/composer-autosave/e-composer-autosave.c b/modules/composer-autosave/e-composer-autosave.c
index f2578875fa..f2b39c4d68 100644
--- a/modules/composer-autosave/e-composer-autosave.c
+++ b/modules/composer-autosave/e-composer-autosave.c
@@ -20,7 +20,8 @@
 #include <config.h>
 #endif
 
-#include <e-util/e-extension.h>
+#include <libebackend/e-extension.h>
+
 #include <e-util/e-alert-dialog.h>
 #include <composer/e-msg-composer.h>
 
diff --git a/modules/composer-autosave/e-composer-registry.c b/modules/composer-autosave/e-composer-registry.c
index eef69f1286..9fcba43ff9 100644
--- a/modules/composer-autosave/e-composer-registry.c
+++ b/modules/composer-autosave/e-composer-registry.c
@@ -21,9 +21,10 @@
 #endif
 
 #include <glib/gstdio.h>
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
 #include <shell/e-shell-window.h>
-#include <e-util/e-extension.h>
 #include <e-util/e-alert-dialog.h>
 #include <composer/e-msg-composer.h>
 
diff --git a/modules/connman/Makefile.am b/modules/connman/Makefile.am
index 58defdd838..d01a8f0daa 100644
--- a/modules/connman/Makefile.am
+++ b/modules/connman/Makefile.am
@@ -4,6 +4,7 @@ libevolution_module_connman_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-DG_LOG_DOMAIN=\"evolution-connman\"		\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)
 
 libevolution_module_connman_la_SOURCES =		\
@@ -12,6 +13,7 @@ libevolution_module_connman_la_SOURCES =		\
 libevolution_module_connman_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/shell/libeshell.la		\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)
 
 libevolution_module_connman_la_LDFLAGS =		\
diff --git a/modules/connman/evolution-connman.c b/modules/connman/evolution-connman.c
index f6225df46c..2c35c2412e 100644
--- a/modules/connman/evolution-connman.c
+++ b/modules/connman/evolution-connman.c
@@ -21,9 +21,9 @@
 #endif
 
 #include <gio/gio.h>
+#include <libebackend/e-extension.h>
 
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 
 #define CM_DBUS_SERVICE   "net.connman"
 #define CM_DBUS_INTERFACE "net.connman.Manager"
diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index 0bea9ac1a2..90cf1aa54f 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -5,13 +5,13 @@ libevolution_module_mail_la_CPPFLAGS =					\
 	-I$(top_srcdir)							\
 	-I$(top_srcdir)/mail						\
 	-I$(top_srcdir)/widgets						\
-	$(GNOME_PLATFORM_CFLAGS)					\
-	$(EVOLUTION_MAIL_CFLAGS)					\
-	$(CAMEL_CFLAGS)							\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"			\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"				\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"			\
-	-DG_LOG_DOMAIN=\"evolution-module-mail\"
+	-DG_LOG_DOMAIN=\"evolution-module-mail\"			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
+	$(GNOME_PLATFORM_CFLAGS)					\
+	$(GTKHTML_CFLAGS)
 
 libevolution_module_mail_la_SOURCES =					\
 	evolution-module-mail.c						\
@@ -66,11 +66,9 @@ libevolution_module_mail_la_LIBADD =					\
 	$(top_builddir)/widgets/menus/libmenus.la			\
 	$(top_builddir)/filter/libfilter.la				\
 	$(top_builddir)/capplet/settings/libevolution-mail-settings.la	\
-	$(EVOLUTION_MAIL_LIBS)						\
-	$(CAMEL_LIBS)							\
-	$(GTKHTML_LIBS)							\
-	$(E_WIDGETS_LIBS)						\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)					\
+	$(GNOME_PLATFORM_LIBS)						\
+	$(GTKHTML_LIBS)
 
 libevolution_module_mail_la_LDFLAGS =					\
 	-avoid-version -module $(NO_UNDEFINED)
diff --git a/modules/mail/e-mail-config-format-html.c b/modules/mail/e-mail-config-format-html.c
index 23d448f7f0..83bc78f0b2 100644
--- a/modules/mail/e-mail-config-format-html.c
+++ b/modules/mail/e-mail-config-format-html.c
@@ -22,9 +22,10 @@
 
 #include "e-mail-config-format-html.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
 #include <e-util/e-util.h>
-#include <e-util/e-extension.h>
 #include <mail/em-format-html.h>
 
 static gpointer parent_class;
diff --git a/modules/mail/e-mail-config-reader.c b/modules/mail/e-mail-config-reader.c
index 3837581562..b284fbdd8d 100644
--- a/modules/mail/e-mail-config-reader.c
+++ b/modules/mail/e-mail-config-reader.c
@@ -22,8 +22,9 @@
 
 #include "e-mail-config-reader.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <mail/e-mail-reader.h>
 
 static gpointer parent_class;
diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c
index b8a755b46f..ebab286a2d 100644
--- a/modules/mail/e-mail-config-web-view.c
+++ b/modules/mail/e-mail-config-web-view.c
@@ -22,8 +22,9 @@
 
 #include "e-mail-config-web-view.h"
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 #include <misc/e-web-view.h>
 
 typedef struct _EMailConfigWebView EMailConfigWebView;
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 5eb5ce9f53..ad572f1421 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -252,7 +252,8 @@ mail_shell_backend_mail_sync (EMailShellBackend *mail_shell_backend)
 	session = e_mail_backend_get_session (backend);
 
 	e_mail_store_foreach (
-		session, (GFunc) mail_shell_backend_sync_store_cb,
+		E_MAIL_BACKEND (mail_shell_backend),
+		(GFunc) mail_shell_backend_sync_store_cb,
 		mail_shell_backend);
 
 exit:
@@ -455,10 +456,9 @@ mail_shell_backend_start (EShellBackend *shell_backend)
 	shell_settings = e_shell_get_shell_settings (shell);
 
 	backend = E_MAIL_BACKEND (shell_backend);
-	session = e_mail_backend_get_session (backend);
 	data_dir = e_shell_backend_get_data_dir (shell_backend);
 
-	e_mail_store_init (session, data_dir);
+	e_mail_store_init (backend, data_dir);
 
 	enable_search_folders = e_shell_settings_get_boolean (
 		shell_settings, "mail-enable-search-folders");
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index f4f5ea26f6..6d9b3a4252 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -85,7 +85,6 @@ action_mail_account_disable_cb (GtkAction *action,
 	EShellBackend *shell_backend;
 	EShellView *shell_view;
 	EMailBackend *backend;
-	EMailSession *session;
 	EMFolderTree *folder_tree;
 	CamelService *service;
 	CamelStore *store;
@@ -99,7 +98,6 @@ action_mail_account_disable_cb (GtkAction *action,
 	shell_backend = e_shell_view_get_shell_backend (shell_view);
 
 	backend = E_MAIL_BACKEND (shell_backend);
-	session = e_mail_backend_get_session (backend);
 
 	folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_sidebar);
 	store = em_folder_tree_get_selected_store (folder_tree);
@@ -117,7 +115,7 @@ action_mail_account_disable_cb (GtkAction *action,
 
 	account->enabled = !account->enabled;
 	e_account_list_change (account_list, account);
-	e_mail_store_remove_by_account (session, account);
+	e_mail_store_remove_by_account (backend, account);
 
 	if (account->parent_uid != NULL)
 		e_account_list_remove (account_list, account);
@@ -227,17 +225,15 @@ action_mail_download_cb (GtkAction *action,
 	EMailView *mail_view;
 	EMailReader *reader;
 	EMailBackend *backend;
-	EMailSession *session;
 
 	mail_shell_content = mail_shell_view->priv->mail_shell_content;
 	mail_view = e_mail_shell_content_get_mail_view (mail_shell_content);
 
 	reader = E_MAIL_READER (mail_view);
 	backend = e_mail_reader_get_backend (reader);
-	session = e_mail_backend_get_session (backend);
 
 	e_mail_store_foreach (
-		session, (GFunc) action_mail_download_foreach_cb, reader);
+		backend, (GFunc) action_mail_download_foreach_cb, reader);
 }
 
 static void
@@ -247,15 +243,12 @@ action_mail_flush_outbox_cb (GtkAction *action,
 	EShellBackend *shell_backend;
 	EShellView *shell_view;
 	EMailBackend *backend;
-	EMailSession *session;
 
 	shell_view = E_SHELL_VIEW (mail_shell_view);
 	shell_backend = e_shell_view_get_shell_backend (shell_view);
-
 	backend = E_MAIL_BACKEND (shell_backend);
-	session = e_mail_backend_get_session (backend);
 
-	mail_send (session);
+	mail_send (backend);
 }
 
 static void
@@ -1059,7 +1052,6 @@ action_mail_tools_subscriptions_cb (GtkAction *action,
 	EShellWindow *shell_window;
 	EShellView *shell_view;
 	EMailBackend *backend;
-	EMailSession *session;
 	EMFolderTree *folder_tree;
 	GtkWidget *dialog;
 	CamelStore *store;
@@ -1073,11 +1065,9 @@ action_mail_tools_subscriptions_cb (GtkAction *action,
 	store = em_folder_tree_get_selected_store (folder_tree);
 
 	backend = E_MAIL_BACKEND (shell_backend);
-	session = e_mail_backend_get_session (backend);
 
 	dialog = em_subscription_editor_new (
-		GTK_WINDOW (shell_window),
-		CAMEL_SESSION (session), store);
+		GTK_WINDOW (shell_window), backend, store);
 	gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
 }
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index a7309904bd..30a6756ddf 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -1089,7 +1089,6 @@ e_mail_shell_view_send_receive (EMailShellView *mail_shell_view,
                                 EMailSendReceiveMode mode,
                                 const gchar *account_uid)
 {
-	EMailSession *session;
 	EShellView *shell_view;
 	EShellWindow *shell_window;
 	EShellBackend *shell_backend;
@@ -1100,20 +1099,22 @@ e_mail_shell_view_send_receive (EMailShellView *mail_shell_view,
 	shell_window = e_shell_view_get_shell_window (shell_view);
 	shell_backend = e_shell_view_get_shell_backend (shell_view);
 
-	session = e_mail_backend_get_session (E_MAIL_BACKEND (shell_backend));
-
 	em_utils_clear_get_password_canceled_accounts_flag ();
 
 	if (!account_uid) {
 		switch (mode) {
 		case E_MAIL_SEND_RECEIVE_BOTH:
-			mail_send_receive (GTK_WINDOW (shell_window), session);
+			mail_send_receive (
+				GTK_WINDOW (shell_window),
+				E_MAIL_BACKEND (shell_backend));
 			break;
 		case E_MAIL_SEND_RECEIVE_RECEIVE:
-			mail_receive (GTK_WINDOW (shell_window), session);
+			mail_receive (
+				GTK_WINDOW (shell_window),
+				E_MAIL_BACKEND (shell_backend));
 			break;
 		case E_MAIL_SEND_RECEIVE_SEND:
-			mail_send (session);
+			mail_send (E_MAIL_BACKEND (shell_backend));
 			break;
 		}
 	} else {
@@ -1124,7 +1125,8 @@ e_mail_shell_view_send_receive (EMailShellView *mail_shell_view,
 		g_return_if_fail (account != NULL);
 
 		if (account->enabled && account->source != NULL)
-			mail_receive_account (session, account);
+			mail_receive_account (
+				E_MAIL_BACKEND (shell_backend), account);
 	}
 }
 
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index 3a92ce284b..5759b5830f 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -868,7 +868,7 @@ mail_shell_view_update_actions (EShellView *shell_view)
 	shell_sidebar = e_shell_view_get_shell_sidebar (shell_view);
 	state = e_shell_sidebar_check_state (shell_sidebar);
 
-	model = em_folder_tree_model_get_default (e_mail_reader_get_backend (reader));
+	model = em_folder_tree_model_get_default ();
 
 	folder_allows_children =
 		(state & E_MAIL_SIDEBAR_FOLDER_ALLOWS_CHILDREN);
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index 1b11b41b68..f4a0a740d5 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -62,7 +62,9 @@ G_DEFINE_TYPE (
 	E_TYPE_ACCOUNT_MANAGER)
 
 static gboolean
-account_prefs_toggle_enable_special (EMAccountPrefs *prefs, EAccountTreeViewSelectedType type, gboolean enabled)
+account_prefs_toggle_enable_special (EMAccountPrefs *prefs,
+                                     EAccountTreeViewSelectedType type,
+                                     gboolean enabled)
 {
 	const gchar *prop = NULL;
 	EShell *shell;
@@ -106,8 +108,7 @@ account_prefs_enable_account_cb (EAccountTreeView *tree_view,
 
 	g_return_if_fail (account != NULL);
 
-	session = e_mail_backend_get_session (prefs->priv->backend);
-	e_mail_store_add_by_account (session, account);
+	e_mail_store_add_by_account (prefs->priv->backend, account);
 }
 
 static void
@@ -131,10 +132,8 @@ account_prefs_disable_account_cb (EAccountTreeView *tree_view,
 	account_list = e_account_tree_view_get_account_list (tree_view);
 	g_return_if_fail (account_list != NULL);
 
-	session = e_mail_backend_get_session (prefs->priv->backend);
-
 	if (!e_account_list_account_has_proxies (account_list, account)) {
-		e_mail_store_remove_by_account (session, account);
+		e_mail_store_remove_by_account (prefs->priv->backend, account);
 		return;
 	}
 
@@ -151,7 +150,7 @@ account_prefs_disable_account_cb (EAccountTreeView *tree_view,
 
 	e_account_list_remove_account_proxies (account_list, account);
 
-	e_mail_store_remove_by_account (session, account);
+	e_mail_store_remove_by_account (prefs->priv->backend, account);
 }
 
 static void
@@ -330,7 +329,6 @@ account_prefs_delete_account (EAccountManager *manager)
 	gint response;
 
 	priv = EM_ACCOUNT_PREFS (manager)->priv;
-	session = e_mail_backend_get_session (priv->backend);
 
 	account_list = e_account_manager_get_account_list (manager);
 	tree_view = e_account_manager_get_tree_view (manager);
@@ -359,7 +357,7 @@ account_prefs_delete_account (EAccountManager *manager)
 
 	/* Remove the account from the folder tree. */
 	if (account->enabled)
-		e_mail_store_remove_by_account (session, account);
+		e_mail_store_remove_by_account (priv->backend, account);
 
 	/* Remove all the proxies the account has created. */
 	if (has_proxies)
@@ -423,7 +421,8 @@ em_account_prefs_init (EMAccountPrefs *prefs)
 }
 
 static void
-account_tree_view_sort_order_changed_cb (EAccountTreeView *tree_view, EMailBackend *backend)
+account_tree_view_sort_order_changed_cb (EAccountTreeView *tree_view,
+                                         EMailBackend *backend)
 {
 	GSList *account_uids;
 
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index fb49352357..12a521b454 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -43,16 +43,16 @@
 #include <gtkhtml/gtkhtml.h>
 #include <editor/gtkhtml-spell-language.h>
 
-#include "e-util/e-util.h"
-#include "e-util/e-util-private.h"
-#include "mail/e-mail-junk-options.h"
-#include "widgets/misc/e-charset-combo-box.h"
-#include "widgets/misc/e-signature-editor.h"
-#include "widgets/misc/e-signature-manager.h"
-#include "widgets/misc/e-signature-preview.h"
+#include <e-util/e-util.h>
+#include <e-util/e-util-private.h>
+#include <misc/e-charset-combo-box.h>
+#include <misc/e-signature-editor.h>
+#include <misc/e-signature-manager.h>
+#include <misc/e-signature-preview.h>
 
 #include "em-config.h"
 #include "em-folder-selection-button.h"
+#include "e-mail-junk-options.h"
 
 G_DEFINE_TYPE (
 	EMComposerPrefs,
@@ -132,14 +132,17 @@ transform_new_to_old_reply_style (GBinding *binding,
 }
 
 static void
-composer_prefs_finalize (GObject *object)
+composer_prefs_dispose (GObject *object)
 {
 	EMComposerPrefs *prefs = (EMComposerPrefs *) object;
 
-	g_object_unref (prefs->builder);
+	if (prefs->builder != NULL) {
+		g_object_unref (prefs->builder);
+		prefs->builder = NULL;
+	}
 
-	/* Chain up to parent's finalize() method. */
-	G_OBJECT_CLASS (em_composer_prefs_parent_class)->finalize (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (em_composer_prefs_parent_class)->dispose (object);
 }
 
 static void
@@ -148,7 +151,7 @@ em_composer_prefs_class_init (EMComposerPrefsClass *class)
 	GObjectClass *object_class;
 
 	object_class = G_OBJECT_CLASS (class);
-	object_class->finalize = composer_prefs_finalize;
+	object_class->dispose = composer_prefs_dispose;
 }
 
 static void
@@ -538,7 +541,8 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 
 	/* Signatures */
 	signature_list = e_get_signature_list ();
-	container = e_builder_get_widget (prefs->builder, "signature-alignment");
+	container = e_builder_get_widget (
+		prefs->builder, "signature-alignment");
 	widget = e_signature_manager_new (signature_list);
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
@@ -589,9 +593,10 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 GtkWidget *
 em_composer_prefs_new (EPreferencesWindow *window)
 {
+	EShell *shell;
 	EMComposerPrefs *prefs;
-	EShell *shell = e_preferences_window_get_shell (window);
 
+	shell = e_preferences_window_get_shell (window);
 	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
 
 	prefs = g_object_new (EM_TYPE_COMPOSER_PREFS, NULL);
diff --git a/modules/mail/em-composer-prefs.h b/modules/mail/em-composer-prefs.h
index f39af57c4e..79a53bb775 100644
--- a/modules/mail/em-composer-prefs.h
+++ b/modules/mail/em-composer-prefs.h
@@ -76,8 +76,8 @@ struct _EMComposerPrefsClass {
 	GtkVBoxClass parent_class;
 };
 
-GType      em_composer_prefs_get_type      (void);
-GtkWidget *em_composer_prefs_new           (EPreferencesWindow *window);
+GType		em_composer_prefs_get_type	(void);
+GtkWidget *	em_composer_prefs_new		(EPreferencesWindow *window);
 
 G_END_DECLS
 
diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c
index 242c84993e..64fe23e7f9 100644
--- a/modules/mail/em-network-prefs.c
+++ b/modules/mail/em-network-prefs.c
@@ -148,12 +148,11 @@ emnp_set_sensitiveness (EMNetworkPrefs *prefs,
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_http_port, sensitivity);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_https_host, sensitivity);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_https_port, sensitivity);
-#if 0
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->socks_host, sensitivity);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->socks_port, sensitivity);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_socks_host, sensitivity);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_socks_port, sensitivity);
-#endif
+
 		state = sensitivity && gtk_toggle_button_get_active (prefs->use_auth);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_auth_user, state);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_auth_pwd, state);
@@ -389,13 +388,17 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 	prefs->manual_proxy = GTK_TOGGLE_BUTTON (e_builder_get_widget (prefs->builder, "rdoManualProxy"));
 	prefs->http_host = GTK_ENTRY (e_builder_get_widget (prefs->builder, "txtHttpHost"));
 	prefs->https_host = GTK_ENTRY (e_builder_get_widget (prefs->builder, "txtHttpsHost"));
+	prefs->socks_host = GTK_ENTRY (e_builder_get_widget (prefs->builder, "txtSocksHost"));
 	prefs->ignore_hosts = GTK_ENTRY (e_builder_get_widget (prefs->builder, "txtIgnoreHosts"));
 	prefs->http_port = GTK_SPIN_BUTTON (e_builder_get_widget (prefs->builder, "spnHttpPort"));
 	prefs->https_port = GTK_SPIN_BUTTON (e_builder_get_widget (prefs->builder, "spnHttpsPort"));
+	prefs->socks_port = GTK_SPIN_BUTTON (e_builder_get_widget (prefs->builder, "spnSocksPort"));
 	prefs->lbl_http_host = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblHttpHost"));
 	prefs->lbl_http_port = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblHttpPort"));
 	prefs->lbl_https_host = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblHttpsHost"));
 	prefs->lbl_https_port = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblHttpsPort"));
+	prefs->lbl_socks_host = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblSocksHost"));
+	prefs->lbl_socks_port = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblSocksPort"));
 	prefs->lbl_ignore_hosts = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblIgnoreHosts"));
 	prefs->use_auth = GTK_TOGGLE_BUTTON (e_builder_get_widget (prefs->builder, "chkUseAuth"));
 	toggle_button_init (prefs, prefs->use_auth, GCONF_E_USE_AUTH_KEY);
@@ -404,17 +407,6 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 	prefs->auth_user = GTK_ENTRY (e_builder_get_widget (prefs->builder, "txtAuthUser"));
 	prefs->auth_pwd = GTK_ENTRY (e_builder_get_widget (prefs->builder, "txtAuthPwd"));
 
-#if 0
-	prefs->socks_host = GTK_ENTRY (e_builder_get_widget (prefs->builder, "txtSocksHost"));
-	prefs->socks_port = GTK_SPIN_BUTTON (e_builder_get_widget (prefs->builder, "spnSocksPort"));
-	prefs->lbl_socks_host = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblSocksHost"));
-	prefs->lbl_socks_port = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblSocksPort"));
-	g_signal_connect (prefs->socks_host, "changed",
-			  G_CALLBACK (widget_entry_changed_cb), GCONF_E_SOCKS_HOST_KEY);
-	g_signal_connect (prefs->socks_port, "value_changed",
-			  G_CALLBACK (widget_entry_changed_cb), GCONF_E_SOCKS_PORT_KEY);
-#endif
-
 	/* Manual proxy options */
 	g_signal_connect (prefs->http_host, "changed",
 			  G_CALLBACK (widget_entry_changed_cb),
@@ -431,6 +423,12 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 	g_signal_connect (prefs->https_port, "value_changed",
 			  G_CALLBACK (widget_entry_changed_cb),
 			  (gpointer) GCONF_E_HTTPS_PORT_KEY);
+	g_signal_connect (prefs->socks_host, "changed",
+			  G_CALLBACK (widget_entry_changed_cb),
+			  (gpointer) GCONF_E_SOCKS_HOST_KEY);
+	g_signal_connect (prefs->socks_port, "value_changed",
+			  G_CALLBACK (widget_entry_changed_cb),
+			  (gpointer) GCONF_E_SOCKS_PORT_KEY);
 	g_signal_connect (prefs->auth_user, "changed",
 			  G_CALLBACK (widget_entry_changed_cb),
 			  (gpointer) GCONF_E_AUTH_USER_KEY);
@@ -458,6 +456,10 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 	gtk_entry_set_text (prefs->https_host, buf ? buf : "");
 	g_free (buf);
 
+	buf = gconf_client_get_string (prefs->gconf, GCONF_E_SOCKS_HOST_KEY, NULL);
+	gtk_entry_set_text (prefs->socks_host, buf ? buf : "");
+	g_free (buf);
+
 	buf = NULL;
 	ignore = gconf_client_get_list (prefs->gconf, GCONF_E_IGNORE_HOSTS_KEY, GCONF_VALUE_STRING, NULL);
 	if (ignore) {
@@ -502,14 +504,9 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 	port = gconf_client_get_int (prefs->gconf, GCONF_E_HTTPS_PORT_KEY, NULL);
 	gtk_spin_button_set_value (prefs->https_port, (gdouble) port);
 
-#if 0
-	buf = gconf_client_get_string (prefs->gconf, GCONF_E_SOCKS_HOST_KEY, NULL);
-	gtk_entry_set_text (prefs->socks_host, buf ? buf : "");
-	g_free (buf);
-
 	port = gconf_client_get_int (prefs->gconf, GCONF_E_SOCKS_PORT_KEY, NULL);
 	gtk_spin_button_set_value (prefs->socks_port, (gdouble) port);
-#endif
+
 	emnp_set_markups (prefs);
 
 	if (val == NETWORK_PROXY_DIRECT_CONNECTION ||
diff --git a/modules/mail/em-network-prefs.h b/modules/mail/em-network-prefs.h
index 4196686ffe..f13a239490 100644
--- a/modules/mail/em-network-prefs.h
+++ b/modules/mail/em-network-prefs.h
@@ -82,12 +82,15 @@ struct _EMNetworkPrefs {
 	GtkLabel *lbl_http_port;
 	GtkLabel *lbl_https_host;
 	GtkLabel *lbl_https_port;
+	GtkLabel *lbl_socks_host;
+	GtkLabel *lbl_socks_port;
 	GtkLabel *lbl_ignore_hosts;
 	GtkLabel *lbl_auth_user;
 	GtkLabel *lbl_auth_pwd;
 
 	GtkSpinButton *http_port;
 	GtkSpinButton *https_port;
+	GtkSpinButton *socks_port;
 };
 
 struct _EMNetworkPrefsClass {
diff --git a/modules/mailto-handler/Makefile.am b/modules/mailto-handler/Makefile.am
index c6ab97f9fa..4e5598b498 100644
--- a/modules/mailto-handler/Makefile.am
+++ b/modules/mailto-handler/Makefile.am
@@ -4,8 +4,9 @@ libevolution_module_mailto_handler_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-DG_LOG_DOMAIN=\"evolution-mailto-handler\"		\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(SHELL_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 libevolution_module_mailto_handler_la_SOURCES =			\
 	evolution-mailto-handler.c
@@ -13,8 +14,9 @@ libevolution_module_mailto_handler_la_SOURCES =			\
 libevolution_module_mailto_handler_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
-	$(SHELL_LIBS)
+	$(GTKHTML_LIBS)
 
 libevolution_module_mailto_handler_la_LDFLAGS =			\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/mailto-handler/evolution-mailto-handler.c b/modules/mailto-handler/evolution-mailto-handler.c
index fdc3841f38..4846aaaa85 100644
--- a/modules/mailto-handler/evolution-mailto-handler.c
+++ b/modules/mailto-handler/evolution-mailto-handler.c
@@ -21,9 +21,9 @@
 #endif
 
 #include <glib/gi18n-lib.h>
+#include <libebackend/e-extension.h>
 
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAILTO_HANDLER \
diff --git a/modules/network-manager/Makefile.am b/modules/network-manager/Makefile.am
index bcfcaa7ecb..2d87b22acf 100644
--- a/modules/network-manager/Makefile.am
+++ b/modules/network-manager/Makefile.am
@@ -4,6 +4,7 @@ libevolution_module_network_manager_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-DG_LOG_DOMAIN=\"evolution-network-manager\"		\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(SHELL_CFLAGS)						\
 	$(NM_CFLAGS)
@@ -14,8 +15,8 @@ libevolution_module_network_manager_la_SOURCES =		\
 libevolution_module_network_manager_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
-	$(GNOME_PLATFORM_LIBS)					\
-	$(SHELL_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)
 
 libevolution_module_network_manager_la_LDFLAGS =		\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/network-manager/evolution-network-manager.c b/modules/network-manager/evolution-network-manager.c
index 3168b9adf1..bb83ba8104 100644
--- a/modules/network-manager/evolution-network-manager.c
+++ b/modules/network-manager/evolution-network-manager.c
@@ -21,6 +21,7 @@
 #endif
 
 #include <gio/gio.h>
+#include <libebackend/e-extension.h>
 #include <NetworkManager/NetworkManager.h>
 
 #if !defined(NM_CHECK_VERSION)
@@ -28,7 +29,6 @@
 #endif
 
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 
 /* Standard GObject macros */
 #define E_TYPE_NETWORK_MANAGER \
diff --git a/modules/offline-alert/Makefile.am b/modules/offline-alert/Makefile.am
index ed86fa7b0b..def90c1d06 100644
--- a/modules/offline-alert/Makefile.am
+++ b/modules/offline-alert/Makefile.am
@@ -5,8 +5,8 @@ libevolution_module_offline_alert_la_CPPFLAGS =			\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
 	-DG_LOG_DOMAIN=\"evolution-offline-alert\"		\
-	$(GNOME_PLATFORM_CFLAGS)				\
-	$(SHELL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libevolution_module_offline_alert_la_SOURCES =			\
 	evolution-offline-alert.c
@@ -14,8 +14,8 @@ libevolution_module_offline_alert_la_SOURCES =			\
 libevolution_module_offline_alert_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
-	$(GNOME_PLATFORM_LIBS)					\
-	$(SHELL_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)
 
 libevolution_module_offline_alert_la_LDFLAGS =			\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/offline-alert/evolution-offline-alert.c b/modules/offline-alert/evolution-offline-alert.c
index 4c064ce472..9fb5d2a60c 100644
--- a/modules/offline-alert/evolution-offline-alert.c
+++ b/modules/offline-alert/evolution-offline-alert.c
@@ -20,10 +20,11 @@
 #include <config.h>
 #endif
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell-view.h>
 #include <shell/e-shell-window-actions.h>
 #include <e-util/e-alert-sink.h>
-#include <e-util/e-extension.h>
 
 /* Standard GObject macros */
 #define E_TYPE_OFFLINE_ALERT \
diff --git a/modules/online-accounts/Makefile.am b/modules/online-accounts/Makefile.am
index a5dfd97a0b..ccb7ada29a 100644
--- a/modules/online-accounts/Makefile.am
+++ b/modules/online-accounts/Makefile.am
@@ -4,10 +4,8 @@ libevolution_module_online_accounts_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-DG_LOG_DOMAIN=\"evolution-online-accounts\"		\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)				\
-	$(EVOLUTION_MAIL_CFLAGS)				\
 	$(GOA_CFLAGS)
 
 libevolution_module_online_accounts_la_SOURCES =		\
@@ -20,10 +18,8 @@ libevolution_module_online_accounts_la_SOURCES =		\
 libevolution_module_online_accounts_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(EVOLUTION_MAIL_LIBS)					\
 	$(GOA_LIBS)
 
 libevolution_module_online_accounts_la_LDFLAGS =		\
diff --git a/modules/plugin-lib/Makefile.am b/modules/plugin-lib/Makefile.am
index b958a9ab42..1f74550cb7 100644
--- a/modules/plugin-lib/Makefile.am
+++ b/modules/plugin-lib/Makefile.am
@@ -5,7 +5,7 @@ libevolution_module_plugin_lib_la_CPPFLAGS =			\
 	-DG_LOG_DOMAIN=\"evolution-plugin-lib\"			\
 	-I$(top_srcdir)						\
 	-DEVOLUTION_PREFIX=\""$(prefix)"\"			\
-	$(E_UTIL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)
 
 libevolution_module_plugin_lib_la_SOURCES =			\
 	evolution-module-plugin-lib.c				\
@@ -14,7 +14,7 @@ libevolution_module_plugin_lib_la_SOURCES =			\
 
 libevolution_module_plugin_lib_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
-	$(E_UTIL_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)
 
 libevolution_module_plugin_lib_la_LDFLAGS =			\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/plugin-manager/Makefile.am b/modules/plugin-manager/Makefile.am
index 1e66fb4bd8..f350426b50 100644
--- a/modules/plugin-manager/Makefile.am
+++ b/modules/plugin-manager/Makefile.am
@@ -5,8 +5,8 @@ libevolution_module_plugin_manager_la_CPPFLAGS =		\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
 	-DG_LOG_DOMAIN=\"evolution-plugin-manager\"		\
-	$(GNOME_PLATFORM_CFLAGS)				\
-	$(SHELL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libevolution_module_plugin_manager_la_SOURCES =			\
 	evolution-plugin-manager.c
@@ -14,8 +14,8 @@ libevolution_module_plugin_manager_la_SOURCES =			\
 libevolution_module_plugin_manager_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
-	$(GNOME_PLATFORM_LIBS)					\
-	$(SHELL_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)
 
 libevolution_module_plugin_manager_la_LDFLAGS =			\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/plugin-manager/evolution-plugin-manager.c b/modules/plugin-manager/evolution-plugin-manager.c
index 29dba6c160..f95af37b23 100644
--- a/modules/plugin-manager/evolution-plugin-manager.c
+++ b/modules/plugin-manager/evolution-plugin-manager.c
@@ -20,13 +20,12 @@
 #include <config.h>
 #endif
 
-#include <glib/gi18n-lib.h>
-
 #include <string.h>
 #include <stdio.h>
+#include <glib/gi18n-lib.h>
+#include <libebackend/e-extension.h>
 
 #include <e-util/e-plugin.h>
-#include <e-util/e-extension.h>
 #include <shell/e-shell-window.h>
 #include <shell/e-shell-window-actions.h>
 
diff --git a/modules/plugin-mono/Makefile.am b/modules/plugin-mono/Makefile.am
index 8c9ba8ed81..a685cd89bd 100644
--- a/modules/plugin-mono/Makefile.am
+++ b/modules/plugin-mono/Makefile.am
@@ -4,7 +4,7 @@ libevolution_module_plugin_mono_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)						\
 	-DG_LOG_DOMAIN=\"evolution-plugin-mono\"		\
 	-I$(top_srcdir)						\
-	$(E_UTIL_CFLAGS)					\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(MONO_CFLAGS)
 
 libevolution_module_plugin_mono_la_SOURCES =			\
@@ -14,7 +14,7 @@ libevolution_module_plugin_mono_la_SOURCES =			\
 
 libevolution_module_plugin_mono_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
-	$(E_UTIL_LIBS)						\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(MONO_LIBS)
 
 libevolution_module_plugin_mono_la_LDFLAGS =			\
diff --git a/modules/plugin-python/Makefile.am b/modules/plugin-python/Makefile.am
index 6bc2dcf91c..435ab31c0f 100644
--- a/modules/plugin-python/Makefile.am
+++ b/modules/plugin-python/Makefile.am
@@ -4,7 +4,7 @@ libevolution_module_plugin_python_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)						\
 	-DG_LOG_DOMAIN=\"evolution-plugin-python\"		\
 	-I$(top_srcdir)						\
-	$(E_UTIL_CFLAGS)					\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(PY_INCLUDES)
 
 libevolution_module_plugin_python_la_SOURCES =			\
@@ -15,7 +15,7 @@ libevolution_module_plugin_python_la_SOURCES =			\
 libevolution_module_plugin_python_la_LIBADD =			\
 	-ldl -lutil -lm						\
 	$(top_builddir)/e-util/libeutil.la			\
-	$(E_UTIL_LIBS)						\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(PY_LIBS)
 
 libevolution_module_plugin_python_la_LDFLAGS =			\
diff --git a/modules/spamassassin/Makefile.am b/modules/spamassassin/Makefile.am
index b21e876c90..8ea91303b4 100644
--- a/modules/spamassassin/Makefile.am
+++ b/modules/spamassassin/Makefile.am
@@ -4,8 +4,8 @@ libevolution_module_spamassassin_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-DG_LOG_DOMAIN=\"evolution-spamassassin\"		\
-	$(GNOME_PLATFORM_CFLAGS)				\
-	$(EVOLUTION_MAIL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libevolution_module_spamassassin_la_SOURCES =			\
 	evolution-spamassassin.c
@@ -14,8 +14,8 @@ libevolution_module_spamassassin_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/mail/libevolution-mail.la		\
 	$(top_builddir)/shell/libeshell.la			\
-	$(GNOME_PLATFORM_LIBS)					\
-	$(EVOLUTION_MAIL_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)
 
 libevolution_module_spamassassin_la_LDFLAGS =			\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am
index 90ee736f5c..2643387010 100644
--- a/modules/startup-wizard/Makefile.am
+++ b/modules/startup-wizard/Makefile.am
@@ -5,9 +5,8 @@ libevolution_module_startup_wizard_la_CPPFLAGS =		\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
 	-DG_LOG_DOMAIN=\"evolution-startup-wizard\"		\
-	$(GNOME_PLATFORM_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)				\
-	$(EVOLUTION_MAIL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libevolution_module_startup_wizard_la_SOURCES =			\
 	evolution-startup-wizard.c
@@ -20,9 +19,8 @@ libevolution_module_startup_wizard_la_LIBADD =			\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(top_builddir)/mail/libevolution-mail.la		\
 	$(top_builddir)/capplet/settings/libevolution-mail-settings.la \
-	$(GNOME_PLATFORM_LIBS)					\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(EVOLUTION_MAIL_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)
 
 libevolution_module_startup_wizard_la_LDFLAGS =			\
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c
index 75ef5d8d99..1184948dd7 100644
--- a/modules/startup-wizard/evolution-startup-wizard.c
+++ b/modules/startup-wizard/evolution-startup-wizard.c
@@ -21,11 +21,11 @@
 #endif
 
 #include <glib/gi18n-lib.h>
+#include <libebackend/e-extension.h>
 
 #include <shell/e-shell.h>
 #include <e-util/e-account-utils.h>
 #include <e-util/e-alert-dialog.h>
-#include <e-util/e-extension.h>
 #include <e-util/e-import.h>
 
 #include <mail/e-mail-backend.h>
diff --git a/modules/windows-sens/Makefile.am b/modules/windows-sens/Makefile.am
index 5036642d09..a9b9d31865 100644
--- a/modules/windows-sens/Makefile.am
+++ b/modules/windows-sens/Makefile.am
@@ -1,20 +1,22 @@
 module_LTLIBRARIES = libevolution-module-windows-sens.la
 
-libevolution_module_windows_sens_la_CPPFLAGS =		\
+libevolution_module_windows_sens_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-DG_LOG_DOMAIN=\"evolution-windows-sens\"		\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)
 
-libevolution_module_windows_sens_la_SOURCES =		\
+libevolution_module_windows_sens_la_SOURCES =			\
 	evolution-windows-sens.c
 
 libevolution_module_windows_sens_la_LIBADD =			\
 	$(top_builddir)/shell/libeshell.la			\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(SENS_LIBS)
 
-libevolution_module_windows_sens_la_LDFLAGS =		\
+libevolution_module_windows_sens_la_LDFLAGS =			\
 	-module -avoid-version $(NO_UNDEFINED)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/windows-sens/evolution-windows-sens.c b/modules/windows-sens/evolution-windows-sens.c
index d2154590b1..f3110b2fcc 100644
--- a/modules/windows-sens/evolution-windows-sens.c
+++ b/modules/windows-sens/evolution-windows-sens.c
@@ -32,6 +32,8 @@
 #include <eventsys.h>
 #else
 
+#include <libebackend/e-extension.h>
+
 /* Extract relevant typedefs from mingw-w64 headers */
 
 typedef struct IEnumEventObject IEnumEventObject;
@@ -195,7 +197,6 @@ struct ISensNetwork {
 #endif
 
 #include <shell/e-shell.h>
-#include <e-util/e-extension.h>
 
 /* 4E14FB9F-2E22-11D1-9964-00C04FBBB345 */
 DEFINE_GUID (IID_IEventSystem, 0x4E14FB9F, 0x2E22, 0x11D1, 0x99, 0x64, 0x00, 0xC0, 0x4F, 0xBB, 0xB3, 0x45);
diff --git a/plugins/addressbook-file/Makefile.am b/plugins/addressbook-file/Makefile.am
index afe3453bc6..08401d45c8 100644
--- a/plugins/addressbook-file/Makefile.am
+++ b/plugins/addressbook-file/Makefile.am
@@ -7,15 +7,15 @@ plugin_LTLIBRARIES = liborg-gnome-addressbook-file.la
 liborg_gnome_addressbook_file_la_CPPFLAGS =	\
 	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
-	$(GNOME_PLATFORM_CFLAGS)		\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
+	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_addressbook_file_la_SOURCES = addressbook-file.c
 
 liborg_gnome_addressbook_file_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_addressbook_file_la_LIBADD =	\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)		\
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = org-gnome-addressbook-file.eplug.xml
diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am
index 684d1d2b21..d6b1116693 100644
--- a/plugins/attachment-reminder/Makefile.am
+++ b/plugins/attachment-reminder/Makefile.am
@@ -14,9 +14,10 @@ liborg_gnome_evolution_attachment_reminder_la_CPPFLAGS = \
 	-I$(top_builddir)/composer			\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
+	-DEVOLUTION_PLUGINDIR="\"$(plugindir)\""	\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	-DEVOLUTION_PLUGINDIR="\"$(plugindir)\""
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_evolution_attachment_reminder_la_SOURCES = attachment-reminder.c 
 
@@ -30,8 +31,9 @@ liborg_gnome_evolution_attachment_reminder_la_LIBADD =	\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
 	$(top_builddir)/mail/libevolution-mail.la	\
-	$(EVOLUTION_MAIL_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
+	$(GNOME_PLATFORM_LIBS)				\
+	$(GTKHTML_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = apps-evolution-attachment-reminder.schemas.in
diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am
index f813fa0edb..d5dc1a5a60 100644
--- a/plugins/audio-inline/Makefile.am
+++ b/plugins/audio-inline/Makefile.am
@@ -15,9 +15,10 @@ liborg_gnome_audio_inline_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	$(GSTREAMER_CFLAGS)
+	$(GSTREAMER_CFLAGS)				\
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_audio_inline_la_SOURCES = audio-inline.c
 
@@ -26,9 +27,10 @@ liborg_gnome_audio_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_audio_inline_la_LIBADD =			\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/e-util/libeutil.la		\
-	$(EVOLUTION_MAIL_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
-	$(GSTREAMER_LIBS)
+	$(GSTREAMER_LIBS)				\
+	$(GTKHTML_LIBS)
 
 EXTRA_DIST = org-gnome-audio-inline.eplug.xml
 
diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am
index c4e033f733..05748c24c5 100644
--- a/plugins/backup-restore/Makefile.am
+++ b/plugins/backup-restore/Makefile.am
@@ -16,18 +16,18 @@ liborg_gnome_backup_restore_la_CPPFLAGS =		\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
 	-DDATADIR=\""$(datadir)"\"			\
 	-DLIBDIR=\""$(libdir)"\"			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(SHELL_CFLAGS)					\
-	$(E_UTIL_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_backup_restore_la_SOURCES = backup-restore.c
 liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_backup_restore_la_LIBADD =		\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(top_builddir)/shell/libeshell.la	\
-	$(SHELL_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
+	$(GNOME_PLATFORM_LIBS)			\
+	$(GTKHTML_LIBS)
 
 privlibexec_PROGRAMS = evolution-backup
 evolution_backup_SOURCES = backup.c
@@ -41,14 +41,12 @@ evolution_backup_CPPFLAGS =				\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
 	-DDATADIR=\""$(datadir)"\"			\
 	-DLIBDIR=\""$(libdir)"\"			\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(SHELL_CFLAGS)					\
-	$(E_UTIL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(GNOME_PLATFORM_CFLAGS)
 
 evolution_backup_LDADD =			\
 	$(top_builddir)/e-util/libeutil.la	\
-	$(SHELL_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)
 
 if OS_WIN32
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index f558b19c71..acef0ae223 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -47,12 +47,14 @@
 #define localtime_r(timep, result)  (localtime (timep) ? memcpy ((result), localtime (timep), sizeof (*(result))) : 0)
 #endif
 
-gboolean	e_plugin_ui_init		(GtkUIManager *ui_manager,
-						 EShellWindow *shell_window);
-
-GtkWidget * backup_restore_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
-void backup_restore_commit (EPlugin *ep, EMConfigTargetAccount *target);
-void backup_restore_abort (EPlugin *ep, EMConfigTargetAccount *target);
+gboolean	e_plugin_ui_init	(GtkUIManager *ui_manager,
+					 EShellWindow *shell_window);
+GtkWidget *	backup_restore_page	(EPlugin *ep,
+					 EConfigHookItemFactoryData *hook_data);
+void		backup_restore_commit	(EPlugin *ep,
+					 EMConfigTargetAccount *target);
+void		backup_restore_abort	(EPlugin *ep,
+					 EMConfigTargetAccount *target);
 
 typedef enum _br_flags {
 	BR_OK = 1 << 0,
@@ -73,9 +75,22 @@ backup (const gchar *filename,
         gboolean restart)
 {
 	if (restart)
-		execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", "--restart", filename, (gchar *)NULL);
+		execl (
+			EVOLUTION_TOOLSDIR "/evolution-backup",
+			"evolution-backup",
+			"--gui",
+			"--backup",
+			"--restart",
+			filename,
+			NULL);
 	else
-		execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", filename, (gchar *)NULL);
+		execl (
+			EVOLUTION_TOOLSDIR "/evolution-backup",
+			"evolution-backup",
+			"--gui",
+			"--backup",
+			filename,
+			NULL);
 }
 
 static void
@@ -83,9 +98,22 @@ restore (const gchar *filename,
          gboolean restart)
 {
 	if (restart)
-		execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", "--restart", filename, (gchar *)NULL);
+		execl (
+			EVOLUTION_TOOLSDIR "/evolution-backup",
+			"evolution-backup",
+			"--gui",
+			"--restore",
+			"--restart",
+			filename,
+			NULL);
 	else
-		execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", filename, (gchar *)NULL);
+		execl (
+			EVOLUTION_TOOLSDIR "/evolution-backup",
+			"evolution-backup",
+			"--gui",
+			"--restore",
+			filename,
+			NULL);
 }
 
 static gboolean
@@ -105,7 +133,9 @@ sanity_check (const gchar *filename)
 	g_free (toolfname);
 
 #ifdef HAVE_SYS_WAIT_H
-	g_message ("Sanity check result %d:%d %d", WIFEXITED (result), WEXITSTATUS (result), result);
+	g_message (
+		"Sanity check result %d:%d %d",
+		WIFEXITED (result), WEXITSTATUS (result), result);
 
 	return WIFEXITED (result) && (WEXITSTATUS (result) == 0);
 #else
@@ -137,7 +167,6 @@ dialog_prompt_user (GtkWindow *parent,
 	container = e_alert_dialog_get_content_area (E_ALERT_DIALOG (dialog));
 
 	check = gtk_check_button_new_with_mnemonic (string);
-	/* We should hardcode this to true */
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE);
 	gtk_box_pack_start (GTK_BOX (container), check, FALSE, FALSE, 0);
 	gtk_widget_show (check);
@@ -171,7 +200,9 @@ suggest_file_name (void)
 	t = time (NULL);
 	localtime_r (&t, &tm);
 
-	return g_strdup_printf ("evolution-backup-%04d%02d%02d.tar.gz", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
+	return g_strdup_printf (
+		"evolution-backup-%04d%02d%02d.tar.gz",
+		tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
 }
 
 static void
@@ -232,7 +263,8 @@ action_settings_backup_cb (GtkAction *action,
 	} else {
 		e_alert_run_dialog_for_args (
 			GTK_WINDOW (shell_window),
-			"org.gnome.backup-restore:insufficient-permissions", NULL);
+			"org.gnome.backup-restore:insufficient-permissions",
+			NULL);
 	}
 
 	g_object_unref (file_info);
@@ -277,30 +309,42 @@ action_settings_restore_cb (GtkAction *action,
 
 static void
 check_toggled (GtkToggleButton *button,
-               GtkAssistant *assistant)
+               GObject *assistant)
 {
-	GtkWidget *box = g_object_get_data ((GObject *)button, "box");
-	gboolean state = gtk_toggle_button_get_active ((GtkToggleButton *) button);
+	EConfig *config;
+	GtkWidget *box;
+	gboolean active;
+
+	active = gtk_toggle_button_get_active (button);
+	box = g_object_get_data (G_OBJECT (button), "box");
+	gtk_widget_set_sensitive (box, active);
 
-	gtk_widget_set_sensitive (box, state);
+	g_object_set_data (
+		assistant, "restore",
+		GINT_TO_POINTER (active ? 1 : 0));
 
-	g_object_set_data ((GObject *)assistant, "restore", GINT_TO_POINTER (state?1:0));
+	config = g_object_get_data (assistant, "restore-config");
 
-	e_config_target_changed ((EConfig *) g_object_get_data ((GObject *)assistant, "restore-config"), E_CONFIG_TARGET_CHANGED_STATE);
+	e_config_target_changed (
+		config, E_CONFIG_TARGET_CHANGED_STATE);
 }
 
 static void
 file_changed (GtkFileChooser *chooser,
-              GtkAssistant *assistant)
+              GObject *assistant)
 {
+	EConfig *config;
 	gchar *file = NULL, *prevfile = NULL;
 
 	file = gtk_file_chooser_get_filename (chooser);
-	prevfile = g_object_get_data ((GObject *)assistant, "restore-file");
-	g_object_set_data ((GObject *)assistant, "restore-file", file);
+	prevfile = g_object_get_data (assistant, "restore-file");
+	g_object_set_data (assistant, "restore-file", file);
 	g_free (prevfile);
 
-	e_config_target_changed ((EConfig *) g_object_get_data ((GObject *)assistant, "restore-config"), E_CONFIG_TARGET_CHANGED_STATE);
+	config = g_object_get_data (assistant, "restore-config");
+
+	e_config_target_changed (
+		config, E_CONFIG_TARGET_CHANGED_STATE);
 }
 
 static gboolean
@@ -308,17 +352,18 @@ backup_restore_check (EConfig *ec,
                       const gchar *pageid,
                       gpointer data)
 {
-	GtkAssistant *assistant = data;
-	gint do_restore;
+	GObject *assistant = data;
+	gboolean do_restore;
 	gchar *file;
 
 	g_return_val_if_fail (data != NULL, FALSE);
 	g_return_val_if_fail (GTK_IS_ASSISTANT (data), FALSE);
 
-	do_restore = GPOINTER_TO_INT (g_object_get_data ((GObject *)assistant, "restore"));
-	file = g_object_get_data ((GObject *)assistant, "restore-file");
+	do_restore = (g_object_get_data (assistant, "restore") != NULL);
+	file = g_object_get_data (assistant, "restore-file");
 
-	e_config_set_page_is_finish (ec, "0.startup_page.10.backup_restore", do_restore);
+	e_config_set_page_is_finish (
+		ec, "0.startup_page.10.backup_restore", do_restore);
 
 	return !do_restore || file;
 }
@@ -328,60 +373,81 @@ backup_restore_page (EPlugin *ep,
                      EConfigHookItemFactoryData *hook_data)
 {
 	GtkWidget *page, *hbox, *label, *cbox, *button;
-	GtkAssistant *assistant = GTK_ASSISTANT (hook_data->parent);
+	GObject *assistant = G_OBJECT (hook_data->parent);
 
 	page = gtk_vbox_new (FALSE, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 
 	hbox = gtk_hbox_new (FALSE, 6);
-	label = gtk_label_new (_("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."));
-	gtk_label_set_line_wrap ((GtkLabel *) label, TRUE);
-	gtk_label_set_single_line_mode ((GtkLabel *) label, FALSE);
-	gtk_box_pack_start ((GtkBox *) hbox, label, FALSE, FALSE, 6);
-	gtk_box_pack_start ((GtkBox *) page, hbox, FALSE, FALSE, 0);
+	label = gtk_label_new (
+		_("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."));
+	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+	gtk_label_set_single_line_mode (GTK_LABEL (label), FALSE);
+	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 6);
+	gtk_box_pack_start (GTK_BOX (page), hbox, FALSE, FALSE, 0);
 
 	hbox = gtk_hbox_new (FALSE, 6);
-	cbox = gtk_check_button_new_with_mnemonic (_("_Restore Evolution from the backup file"));
-	g_signal_connect (cbox, "toggled", G_CALLBACK (check_toggled), assistant);
-	gtk_box_pack_start ((GtkBox *) hbox, cbox, FALSE, FALSE, 6);
-	gtk_box_pack_start ((GtkBox *) page, hbox, FALSE, FALSE, 0);
+	cbox = gtk_check_button_new_with_mnemonic (
+		_("_Restore Evolution from the backup file"));
+	g_signal_connect (
+		cbox, "toggled",
+		G_CALLBACK (check_toggled), assistant);
+	gtk_box_pack_start (GTK_BOX (hbox), cbox, FALSE, FALSE, 6);
+	gtk_box_pack_start (GTK_BOX (page), hbox, FALSE, FALSE, 0);
 
 	hbox = gtk_hbox_new (FALSE, 6);
 	g_object_set_data ((GObject *)cbox, "box", hbox);
-	label = gtk_label_new (_("Please select an Evolution Archive to restore:"));
-	gtk_box_pack_start ((GtkBox *) hbox, label, FALSE, FALSE, 12);
-
-	button = gtk_file_chooser_button_new (_("Choose a file to restore"), GTK_FILE_CHOOSER_ACTION_OPEN);
-	g_signal_connect (button, "selection-changed", G_CALLBACK (file_changed), assistant);
-	gtk_file_chooser_button_set_width_chars ((GtkFileChooserButton *) button, 20);
-	gtk_box_pack_start ((GtkBox *) hbox, button, FALSE, FALSE, 0);
-	gtk_box_pack_start ((GtkBox *) page, hbox, FALSE, FALSE, 0);
+	label = gtk_label_new (
+		_("Please select an Evolution Archive to restore:"));
+	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 12);
+
+	button = gtk_file_chooser_button_new (
+		_("Choose a file to restore"),
+		GTK_FILE_CHOOSER_ACTION_OPEN);
+	g_signal_connect (
+		button, "selection-changed",
+		G_CALLBACK (file_changed), assistant);
+	gtk_file_chooser_button_set_width_chars (
+		GTK_FILE_CHOOSER_BUTTON (button), 20);
+	gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (page), hbox, FALSE, FALSE, 0);
 	gtk_widget_set_sensitive (hbox, FALSE);
 
-	gtk_assistant_append_page (assistant, page);
-	gtk_assistant_set_page_title (assistant, page, _("Restore from backup"));
+	gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
+	gtk_assistant_set_page_title (
+		GTK_ASSISTANT (assistant),
+		page, _("Restore from backup"));
 	gtk_widget_show_all (page);
 
-	g_object_set_data ((GObject *)assistant, "restore", GINT_TO_POINTER (FALSE));
-	g_object_set_data ((GObject *)assistant, "restore-config", hook_data->config);
+	g_object_set_data (assistant, "restore", GINT_TO_POINTER (FALSE));
+	g_object_set_data (assistant, "restore-config", hook_data->config);
 
-	e_config_add_page_check (hook_data->config, "0.startup_page.10.backup_restore", backup_restore_check, assistant);
+	e_config_add_page_check (
+		hook_data->config,
+		"0.startup_page.10.backup_restore",
+		backup_restore_check, assistant);
 
 	return GTK_WIDGET (page);
 }
+
 void
 backup_restore_commit (EPlugin *ep,
                        EMConfigTargetAccount *target)
 {
-	GtkWidget *assistant = target->target.config->widget;
-	gboolean state = GPOINTER_TO_INT (g_object_get_data ((GObject *)assistant, "restore")) ? TRUE : FALSE;
-	gchar *file = g_object_get_data ((GObject *)assistant, "restore-file");
-
-	if (state) {
-		if (!file || !sanity_check (file)) {
-			e_alert_run_dialog_for_args ((GtkWindow *) assistant,
-						     "org.gnome.backup-restore:invalid-backup",
-						     NULL);
+	GObject *assistant;
+	gchar *file;
+
+	assistant = G_OBJECT (target->target.config->widget);
+	file = g_object_get_data (assistant, "restore-file");
+
+	if (g_object_get_data (assistant, "restore") != NULL) {
+		if (file == NULL || !sanity_check (file)) {
+			e_alert_run_dialog_for_args (
+				GTK_WINDOW (assistant),
+				"org.gnome.backup-restore:invalid-backup",
+				NULL);
 		} else {
 			restore (file, TRUE);
 		}
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 370608ac2a..a234a9cf7f 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -90,7 +90,8 @@ static GOptionEntry options[] = {
 
 #define d(x)
 
-#define print_and_run(x) G_STMT_START { g_message ("%s", x); system (x); } G_STMT_END
+#define print_and_run(x) \
+	G_STMT_START { g_message ("%s", x); system (x); } G_STMT_END
 
 static gboolean check (const gchar *filename, gboolean *is_new_format);
 
@@ -308,7 +309,9 @@ backup (const gchar *filename,
 	txt = _("Backing Evolution accounts and settings");
 	run_cmd ("gconftool-2 --dump " GCONF_DIR " > " EVOLUTION_DIR GCONF_DUMP_FILE);
 
-	replace_in_file (EVOLUTION_DIR GCONF_DUMP_FILE, e_get_user_data_dir (), EVOUSERDATADIR_MAGIC);
+	replace_in_file (
+		EVOLUTION_DIR GCONF_DUMP_FILE,
+		e_get_user_data_dir (), EVOUSERDATADIR_MAGIC);
 
 	write_dir_file ();
 
@@ -321,7 +324,10 @@ backup (const gchar *filename,
 	/* FIXME compression type?" */
 	/* FIXME date/time stamp?" */
 	/* FIXME backup location?" */
-	command = g_strdup_printf ("cd $HOME && tar chf - $STRIPDATADIR $STRIPCONFIGDIR .camel_certs " EVOLUTION_DIR_FILE " | gzip > %s", quotedfname);
+	command = g_strdup_printf (
+		"cd $HOME && tar chf - $STRIPDATADIR "
+		"$STRIPCONFIGDIR .camel_certs " EVOLUTION_DIR_FILE " | "
+		"gzip > %s", quotedfname);
 	run_cmd (command);
 	g_free (command);
 	g_free (quotedfname);
@@ -435,7 +441,9 @@ restore (const gchar *filename,
 		GString *dir_fn;
 		gchar *data_dir = NULL, *config_dir = NULL;
 
-		command = g_strdup_printf ("cd $TMP && tar xzf %s " EVOLUTION_DIR_FILE, quotedfname);
+		command = g_strdup_printf (
+			"cd $TMP && tar xzf %s "
+			EVOLUTION_DIR_FILE, quotedfname);
 		run_cmd (command);
 		g_free (command);
 
@@ -461,15 +469,20 @@ restore (const gchar *filename,
 		g_mkdir_with_parents (e_get_user_data_dir (), 0700);
 		g_mkdir_with_parents (e_get_user_config_dir (), 0700);
 
-		command = g_strdup_printf ("cd $DATADIR && tar xzf %s %s --strip-components=%d", quotedfname, data_dir, get_dir_level (data_dir));
+		command = g_strdup_printf (
+			"cd $DATADIR && tar xzf %s %s --strip-components=%d",
+			quotedfname, data_dir, get_dir_level (data_dir));
 		run_cmd (command);
 		g_free (command);
 
-		command = g_strdup_printf ("cd $CONFIGDIR && tar xzf %s %s --strip-components=%d", quotedfname, config_dir, get_dir_level (config_dir));
+		command = g_strdup_printf (
+			"cd $CONFIGDIR && tar xzf %s %s --strip-components=%d",
+			quotedfname, config_dir, get_dir_level (config_dir));
 		run_cmd (command);
 		g_free (command);
 
-		command = g_strdup_printf ("cd $HOME && tar xzf %s .camel_certs", quotedfname);
+		command = g_strdup_printf (
+			"cd $HOME && tar xzf %s .camel_certs", quotedfname);
 		run_cmd (command);
 		g_free (command);
 
@@ -478,7 +491,8 @@ restore (const gchar *filename,
 	} else {
 		run_cmd ("mv $HOME/.evolution $HOME/.evolution_old");
 
-		command = g_strdup_printf ("cd $HOME && gzip -cd %s | tar xf -", quotedfname);
+		command = g_strdup_printf (
+			"cd $HOME && gzip -cd %s | tar xf -", quotedfname);
 		run_cmd (command);
 		g_free (command);
 	}
@@ -492,14 +506,33 @@ restore (const gchar *filename,
 
 	if (is_new_format) {
 		/* new format has it in DATADIR... */
-		replace_in_file (EVOLUTION_DIR GCONF_DUMP_FILE, EVOUSERDATADIR_MAGIC, e_get_user_data_dir ());
+		replace_in_file (
+			EVOLUTION_DIR GCONF_DUMP_FILE,
+			EVOUSERDATADIR_MAGIC, e_get_user_data_dir ());
 		run_cmd ("gconftool-2 --load " EVOLUTION_DIR GCONF_DUMP_FILE);
 		run_cmd ("rm " EVOLUTION_DIR GCONF_DUMP_FILE);
 	} else {
+		gchar *gconf_dump_file;
+
 		/* ... old format in ~/.evolution */
-		replace_in_file ("$HOME/.evolution/" GCONF_DUMP_FILE, EVOUSERDATADIR_MAGIC, e_get_user_data_dir ());
-		run_cmd ("gconftool-2 --load " "$HOME/.evolution/" GCONF_DUMP_FILE);
-		run_cmd ("rm " "$HOME/.evolution/" GCONF_DUMP_FILE);
+		gconf_dump_file = g_build_filename (
+			"$HOME", ".evolution", GCONF_DUMP_FILE, NULL);
+
+		replace_in_file (
+			gconf_dump_file,
+			EVOUSERDATADIR_MAGIC,
+			e_get_user_data_dir ());
+
+		command = g_strconcat (
+			"gconftool-2 --load ", gconf_dump_file, NULL);
+		run_cmd (command);
+		g_free (command);
+
+		command = g_strconcat ("rm ", gconf_dump_file, NULL);
+		run_cmd (command);
+		g_free (command);
+
+		g_free (gconf_dump_file);
 	}
 
 	if (g_cancellable_is_cancelled (cancellable))
@@ -519,7 +552,7 @@ restore (const gchar *filename,
 
 	txt = _("Ensuring local sources");
 
- end:
+end:
 	if (restart_arg) {
 		if (g_cancellable_is_cancelled (cancellable))
 			return;
@@ -662,7 +695,8 @@ main (gint argc,
 {
 	GCancellable *cancellable;
 	gchar *file = NULL, *oper = NULL;
-	gint i;
+	const gchar *title = NULL;
+	gint ii;
 	GError *error = NULL;
 
 #ifdef G_OS_WIN32
@@ -671,18 +705,26 @@ main (gint argc,
 		typedef BOOL (WINAPI *t_SetDllDirectoryA) (LPCSTR lpPathName);
 		t_SetDllDirectoryA p_SetDllDirectoryA;
 
-		p_SetDllDirectoryA = GetProcAddress (GetModuleHandle ("kernel32.dll"), "SetDllDirectoryA");
-		if (p_SetDllDirectoryA)
-			(*p_SetDllDirectoryA) ("");
+		p_SetDllDirectoryA = GetProcAddress (
+			GetModuleHandle ("kernel32.dll"),
+			"SetDllDirectoryA");
+
+		if (p_SetDllDirectoryA != NULL)
+			p_SetDllDirectoryA ("");
 	}
 #ifndef _WIN64
 	{
 		typedef BOOL (WINAPI *t_SetProcessDEPPolicy) (DWORD dwFlags);
 		t_SetProcessDEPPolicy p_SetProcessDEPPolicy;
 
-		p_SetProcessDEPPolicy = GetProcAddress (GetModuleHandle ("kernel32.dll"), "SetProcessDEPPolicy");
+		p_SetProcessDEPPolicy = GetProcAddress (
+			GetModuleHandle ("kernel32.dll"),
+			"SetProcessDEPPolicy");
+
 		if (p_SetProcessDEPPolicy)
-			(*p_SetProcessDEPPolicy) (PROCESS_DEP_ENABLE | PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION);
+			p_SetProcessDEPPolicy (
+				PROCESS_DEP_ENABLE |
+				PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION);
 	}
 #endif
 #endif
@@ -691,31 +733,32 @@ main (gint argc,
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-	g_thread_init (NULL);
-
 	gtk_init_with_args (
-		&argc, &argv, NULL, options, (gchar *) GETTEXT_PACKAGE, &error);
+		&argc, &argv, NULL, options, GETTEXT_PACKAGE, &error);
+
 	if (error != NULL) {
 		g_printerr ("%s\n", error->message);
 		g_error_free (error);
-		exit (1);
+		exit (EXIT_FAILURE);
 	}
 
-	if (opt_remaining) {
-		for (i = 0; i < g_strv_length (opt_remaining); i++) {
+	if (opt_remaining != NULL) {
+		for (ii = 0; ii < g_strv_length (opt_remaining); ii++) {
 			if (backup_op) {
+				title = _("Evolution Back Up");
 				oper = _("Backing up to the folder %s");
-				d(g_message ("Backing up to the folder %s", (gchar *) opt_remaining[i]));
-				bk_file = g_strdup ((gchar *) opt_remaining[i]);
+				d(g_message ("Backing up to the folder %s", (gchar *) opt_remaining[ii]));
+				bk_file = g_strdup ((gchar *) opt_remaining[ii]);
 				file = bk_file;
 			} else if (restore_op) {
+				title = _("Evolution Restore");
 				oper = _("Restoring from the folder %s");
-				d(g_message ("Restoring from the folder %s", (gchar *) opt_remaining[i]));
-				res_file = g_strdup ((gchar *) opt_remaining[i]);
+				d(g_message ("Restoring from the folder %s", (gchar *) opt_remaining[ii]));
+				res_file = g_strdup ((gchar *) opt_remaining[ii]);
 				file = res_file;
 			} else if (check_op) {
-				d(g_message ("Checking %s", (gchar *) opt_remaining[i]));
-				chk_file = g_strdup ((gchar *) opt_remaining[i]);
+				d(g_message ("Checking %s", (gchar *) opt_remaining[ii]));
+				chk_file = g_strdup ((gchar *) opt_remaining[ii]);
 			}
 		}
 	}
@@ -732,15 +775,19 @@ main (gint argc,
 
 		gtk_window_set_default_icon_name ("evolution");
 
-		/* Backup / Restore only can have GUI. We should restrict the rest */
-		progress_dialog = gtk_dialog_new_with_buttons (backup_op ? _("Evolution Back up"): _("Evolution Restore"),
-							  NULL,
-							  GTK_DIALOG_MODAL,
-							  GTK_STOCK_CANCEL,
-							  GTK_RESPONSE_REJECT,
-							  NULL);
+		/* Backup / Restore only can have GUI.
+		 * We should restrict the rest. */
+		progress_dialog = gtk_dialog_new_with_buttons (
+			title, NULL,
+			GTK_DIALOG_MODAL,
+			GTK_STOCK_CANCEL,
+			GTK_RESPONSE_REJECT,
+			NULL);
 
-		gtk_container_set_border_width (GTK_CONTAINER (progress_dialog), 12);
+		gtk_container_set_border_width (
+			GTK_CONTAINER (progress_dialog), 12);
+		gtk_window_set_default_size (
+			GTK_WINDOW (progress_dialog), 450, 120);
 
 		action_area = gtk_dialog_get_action_area (
 			GTK_DIALOG (progress_dialog));
@@ -764,11 +811,14 @@ main (gint argc,
 		gtk_box_pack_start (
 			GTK_BOX (content_area), container, FALSE, TRUE, 0);
 
-		widget = gtk_image_new_from_stock (GTK_STOCK_COPY, GTK_ICON_SIZE_DIALOG);
+		widget = gtk_image_new_from_stock (
+			GTK_STOCK_COPY, GTK_ICON_SIZE_DIALOG);
 		gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.0);
 		gtk_widget_show (widget);
 
-		gtk_table_attach (GTK_TABLE (container), widget, 0, 1, 0, 3, GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+		gtk_table_attach (
+			GTK_TABLE (container), widget, 0, 1, 0, 3,
+			GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
 		if (backup_op) {
 			txt = _("Backing up Evolution Data");
@@ -777,53 +827,62 @@ main (gint argc,
 			txt = _("Restoring Evolution Data");
 			txt2 = _("Please wait while Evolution is restoring your data.");
 		} else {
-			/* do not translate these two, it's just a fallback when something goes wrong,
-			 * we should never get here anyway. */
-			txt = "Oops, doing nothing...";
-			txt2 = "Should not be here now, really...";
+			g_return_val_if_reached (EXIT_FAILURE);
 		}
 
-		markup = g_strconcat ("<b><big>", txt, "</big></b>", NULL);
-		widget = gtk_label_new (NULL);
+		markup = g_markup_printf_escaped ("<b><big>%s</big></b>", txt);
+		widget = gtk_label_new (markup);
 		gtk_label_set_line_wrap (GTK_LABEL (widget), FALSE);
-		gtk_label_set_markup (GTK_LABEL (widget), markup);
+		gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
 		gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.0);
 		gtk_widget_show (widget);
 		g_free (markup);
 
-		gtk_table_attach (GTK_TABLE (container), widget, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+		gtk_table_attach (
+			GTK_TABLE (container), widget, 1, 2, 0, 1,
+			GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
 
-		markup = g_strconcat (txt2, " ", _("This may take a while depending on the amount of data in your account."), NULL);
-		widget = gtk_label_new (NULL);
+		markup = g_strconcat (
+			txt2, " ", _("This may take a while depending "
+			"on the amount of data in your account."), NULL);
+		widget = gtk_label_new (markup);
 		gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
-		gtk_label_set_markup (GTK_LABEL (widget), markup);
 		gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
 		gtk_widget_show (widget);
 		g_free (markup);
 
-		gtk_table_attach (GTK_TABLE (container), widget, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+		gtk_table_attach (
+			GTK_TABLE (container), widget, 1, 2, 1, 2,
+			GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
 
 		pbar = gtk_progress_bar_new ();
 
-		if (str) {
-			markup = g_strconcat ("<i>", str, "</i>", NULL);
-			widget = gtk_label_new (NULL);
-			gtk_label_set_markup (GTK_LABEL (widget), markup);
+		if (str != NULL) {
+			markup = g_markup_printf_escaped ("<i>%s</i>", str);
+			widget = gtk_label_new (markup);
+			gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
 			gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
 			g_free (markup);
 			g_free (str);
-			gtk_table_attach (GTK_TABLE (container), widget, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+
+			gtk_table_attach (
+				GTK_TABLE (container), widget, 1, 2, 2, 3,
+				GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
 			gtk_table_set_row_spacing (GTK_TABLE (container), 2, 6);
 
-			gtk_table_attach (GTK_TABLE (container), pbar, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+			gtk_table_attach (
+				GTK_TABLE (container), pbar, 1, 2, 3, 4,
+				GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
 		} else
-			gtk_table_attach (GTK_TABLE (container), pbar, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+			gtk_table_attach (
+				GTK_TABLE (container), pbar, 1, 2, 2, 3,
+				GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
 
-		gtk_window_set_default_size ((GtkWindow *) progress_dialog, 450, 120);
 		g_signal_connect (
 			progress_dialog, "response",
 			G_CALLBACK (dlg_response), cancellable);
 		gtk_widget_show_all (progress_dialog);
+
 	} else if (check_op) {
 		/* For sanity we don't need gui */
 		check (chk_file, NULL);
diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am
index e4e9cdff03..e92d0549e6 100644
--- a/plugins/bbdb/Makefile.am
+++ b/plugins/bbdb/Makefile.am
@@ -16,9 +16,9 @@ liborg_gnome_evolution_bbdb_la_CPPFLAGS =		\
 	-I$(top_builddir)/composer			\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c
 
@@ -29,8 +29,9 @@ liborg_gnome_evolution_bbdb_la_LIBADD =		\
 	$(top_builddir)/composer/libcomposer.la	\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
-	$(EVOLUTION_ADDRESSBOOK_LIBS)		\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
+	$(GNOME_PLATFORM_LIBS)			\
+	$(GTKHTML_LIBS)
 
 EXTRA_DIST = org-gnome-evolution-bbdb.eplug.xml
 
diff --git a/plugins/caldav/Makefile.am b/plugins/caldav/Makefile.am
index f75d1c0f4c..6d89204eff 100644
--- a/plugins/caldav/Makefile.am
+++ b/plugins/caldav/Makefile.am
@@ -3,25 +3,23 @@
 plugin_DATA = org-gnome-evolution-caldav.eplug
 plugin_LTLIBRARIES = liborg-gnome-evolution-caldav.la
 
-liborg_gnome_evolution_caldav_la_CPPFLAGS =	\
-	$(AM_CPPFLAGS)				\
-	-I .					\
-	-I$(top_srcdir)				\
-	-DCALDAV_UIDIR=\""$(uidir)"\"		\
-	$(EVOLUTION_CALENDAR_CFLAGS)		\
-	$(LIBSOUP_CFLAGS)
-
-liborg_gnome_evolution_caldav_la_SOURCES =	\
-	caldav-source.c				\
-	caldav-browse-server.h			\
+liborg_gnome_evolution_caldav_la_CPPFLAGS =		\
+	$(AM_CPPFLAGS)					\
+	-I .						\
+	-I$(top_srcdir)					\
+	-DCALDAV_UIDIR=\""$(uidir)"\"			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(GNOME_PLATFORM_CFLAGS)
+
+liborg_gnome_evolution_caldav_la_SOURCES =		\
+	caldav-source.c					\
+	caldav-browse-server.h				\
 	caldav-browse-server.c
 
-liborg_gnome_evolution_caldav_la_LIBADD = 	\
-	$(top_builddir)/e-util/libeutil.la	\
+liborg_gnome_evolution_caldav_la_LIBADD = 		\
+	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
-	$(EVOLUTION_CALENDAR_LIBS)		\
-	$(EPLUGIN_LIBS)				\
-	$(LIBSOUP_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)
 
 liborg_gnome_evolution_caldav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/plugins/calendar-file/Makefile.am b/plugins/calendar-file/Makefile.am
index a4577e5019..c36053f550 100644
--- a/plugins/calendar-file/Makefile.am
+++ b/plugins/calendar-file/Makefile.am
@@ -7,9 +7,8 @@ plugin_LTLIBRARIES = liborg-gnome-calendar-file.la
 liborg_gnome_calendar_file_la_CPPFLAGS =	\
 	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
-	$(GNOME_PLATFORM_CFLAGS)		\
-	$(EVOLUTION_CALENDAR_CFLAGS)		\
-	$(SOURCE_SEL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
+	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_calendar_file_la_SOURCES = calendar-file.c
 
@@ -17,7 +16,7 @@ liborg_gnome_calendar_file_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_calendar_file_la_LIBADD = 		\
 	$(top_builddir)/e-util/libeutil.la	\
-	$(EVOLUTION_CALENDAR_LIBS)		\
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = org-gnome-calendar-file.eplug.xml
diff --git a/plugins/calendar-http/Makefile.am b/plugins/calendar-http/Makefile.am
index 54457c3c8b..7333fd31d5 100644
--- a/plugins/calendar-http/Makefile.am
+++ b/plugins/calendar-http/Makefile.am
@@ -7,9 +7,8 @@ plugin_LTLIBRARIES = liborg-gnome-calendar-http.la
 liborg_gnome_calendar_http_la_CPPFLAGS =	\
 	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
-	$(GNOME_PLATFORM_CFLAGS)		\
-	$(EVOLUTION_CALENDAR_CFLAGS)		\
-	$(SOURCE_SEL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
+	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_calendar_http_la_SOURCES = calendar-http.c
 
@@ -17,7 +16,7 @@ liborg_gnome_calendar_http_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_calendar_http_la_LIBADD =		\
 	$(top_builddir)/e-util/libeutil.la	\
-	$(EVOLUTION_CALENDAR_LIBS)		\
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = org-gnome-calendar-http.eplug.xml
diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am
index 5cc4b8cd07..4283318ffb 100644
--- a/plugins/calendar-weather/Makefile.am
+++ b/plugins/calendar-weather/Makefile.am
@@ -9,11 +9,10 @@ liborg_gnome_calendar_weather_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
-	$(GNOME_PLATFORM_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)				\
-	$(SOURCE_SEL_CFLAGS)					\
 	-DWEATHER_DATADIR=\""$(weatherdatadir)"\"		\
 	-DWEATHER_EDS_DATADIR=\""$(eds_datadir)/weather"\"	\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
+	$(GNOME_PLATFORM_CFLAGS)				\
 	$(GWEATHER_CFLAGS)
 
 liborg_gnome_calendar_weather_la_SOURCES = calendar-weather.c
@@ -21,9 +20,9 @@ liborg_gnome_calendar_weather_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED
 liborg_gnome_calendar_weather_la_LIBADD =			\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(top_builddir)/e-util/libeutil.la			\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(GWEATHER_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)					\
+	$(GWEATHER_LIBS)
 
 EXTRA_DIST =					\
 	org-gnome-calendar-weather.eplug.xml	\
diff --git a/plugins/dbx-import/Makefile.am b/plugins/dbx-import/Makefile.am
index ecd4890c37..67d5e0d5d3 100644
--- a/plugins/dbx-import/Makefile.am
+++ b/plugins/dbx-import/Makefile.am
@@ -1,9 +1,7 @@
 if OS_WIN32
 NO_UNDEFINED_REQUIRED_LIBS =				\
 	$(top_builddir)/mail/libevolution-mail.la	\
-	$(top_builddir)/e-util/libeutil.la		\
-	$(EVOLUTION_CALENDAR_LIBS)			\
-	$(EVOLUTION_MAIL_LIBS)
+	$(top_builddir)/e-util/libeutil.la
 endif
 
 @EVO_PLUGIN_RULE@
@@ -17,10 +15,9 @@ liborg_gnome_dbx_import_la_CPPFLAGS =			\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(CAMEL_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_dbx_import_la_SOURCES = dbx-importer.c
 
@@ -30,11 +27,9 @@ liborg_gnome_dbx_import_la_LIBADD =			\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/shell/libeshell.la		\
-	$(CAMEL_LIBS)					\
-	$(EVOLUTION_CALENDAR_LIBS)			\
-	$(EVOLUTION_MAIL_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
-	$(CAMEL_LIBS)
+	$(GTKHTML_LIBS)
 
 EXTRA_DIST = org-gnome-dbx-import.eplug.xml
 
diff --git a/plugins/default-source/Makefile.am b/plugins/default-source/Makefile.am
index f9778926bc..07efb18d20 100644
--- a/plugins/default-source/Makefile.am
+++ b/plugins/default-source/Makefile.am
@@ -7,10 +7,8 @@ plugin_LTLIBRARIES = liborg-gnome-default-source.la
 liborg_gnome_default_source_la_CPPFLAGS =	\
 	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
-	$(GNOME_PLATFORM_CFLAGS)		\
-	$(EVOLUTION_CALENDAR_CFLAGS)		\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)         \
-	$(SOURCE_SEL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
+	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_default_source_la_SOURCES = default-source.c
 
@@ -19,8 +17,7 @@ liborg_gnome_default_source_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_default_source_la_LIBADD =		\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(top_builddir)/shell/libeshell.la	\
-	$(EVOLUTION_CALENDAR_LIBS)		\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)		\
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = org-gnome-default-source.eplug.xml
diff --git a/plugins/default-source/default-source.c b/plugins/default-source/default-source.c
index 62ebd4b2a5..c80aba39cd 100644
--- a/plugins/default-source/default-source.c
+++ b/plugins/default-source/default-source.c
@@ -55,7 +55,8 @@ e_plugin_lib_enable (EPlugin *ep,
 }
 
 static void
-mark_default_source_in_list (ESourceList *source_list, ESource *source)
+mark_default_source_in_list (ESourceList *source_list,
+                             ESource *source)
 {
 	GSList *g, *s;
 	g_return_if_fail (source_list != NULL);
@@ -106,7 +107,7 @@ commit_default_calendar (EPlugin *epl,
 
 		if (source_list) {
 			/* mark in the backend's source_list, to avoid race
-			   with saving of two different source lists
+			 * with saving of two different source lists
 			*/
 			mark_default_source_in_list (source_list, source);
 		} else {
@@ -139,7 +140,7 @@ commit_default_book (EPlugin *epl,
 
 		if (source_list) {
 			/* mark in the backend's source_list, to avoid race
-			   with saving of two different source lists
+			 * with saving of two different source lists
 			*/
 			mark_default_source_in_list (source_list, source);
 		} else {
diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am
index 9778980b9f..d76a894cce 100644
--- a/plugins/email-custom-header/Makefile.am
+++ b/plugins/email-custom-header/Makefile.am
@@ -7,27 +7,27 @@ plugin_LTLIBRARIES = liborg-gnome-email-custom-header.la
 liborg_gnome_email_custom_header_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)					\
 	-I.	 					\
-	-I$(top_srcdir)	                                \
+	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_builddir)/mail                          \
+	-I$(top_builddir)/mail				\
 	-I$(top_builddir)/composer			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	-DEVOLUTION_UIDIR=\""$(uidir)"\"          \
-	-DCONNECTOR_UIDIR=\""$(uidir)"\"
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_email_custom_header_la_SOURCES = 		\
 	email-custom-header.c				\
-	email-custom-header.h										
+	email-custom-header.h
 
 liborg_gnome_email_custom_header_la_LIBADD = 			\
 	$(top_builddir)/e-util/libeutil.la 			\
 	$(top_builddir)/composer/libcomposer.la 		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/mail/libevolution-mail.la 		\
-	$(EVOLUTION_MAIL_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)					\
+	$(GTKHTML_LIBS)
 
 liborg_gnome_email_custom_header_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am
index 02591aaebc..7f801d7d06 100644
--- a/plugins/external-editor/Makefile.am
+++ b/plugins/external-editor/Makefile.am
@@ -1,6 +1,5 @@
 if OS_WIN32
 NO_UNDEFINED_REQUIRED_LIBS = \
-	$(EVOLUTION_MAIL_LIBS) \
 	$(GNOME_PLATFORM_LIBS) \
 	$(top_builddir)/e-util/libeutil.la \
 	$(top_builddir)/mail/libevolution-mail.la
@@ -28,10 +27,9 @@ liborg_gnome_external_editor_la_CPPFLAGS =		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/composer			\
 	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(SHELL_CFLAGS)					\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	$(E_UTIL_CFLAGS)				
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_external_editor_la_SOURCES = 		\
 	external-editor.c
@@ -45,8 +43,9 @@ liborg_gnome_external_editor_la_LIBADD = 			\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la 		\
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la	\
 	$(top_builddir)/mail/libevolution-mail.la		\
-	$(EVOLUTION_MAIL_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)					\
+	$(GTKHTML_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = apps-evolution-external-editor.schemas.in
diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am
index c358f8df83..9c413dbb18 100644
--- a/plugins/face/Makefile.am
+++ b/plugins/face/Makefile.am
@@ -12,20 +12,20 @@ liborg_gnome_face_la_CPPFLAGS =				\
 	-I$(top_srcdir)/widgets/misc			\
 	-I$(top_builddir)/mail				\
 	-I$(top_builddir)/composer			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
-	-DCONNECTOR_UIDIR=\""$(uidir)"\"
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_face_la_SOURCES = face.c
 
-liborg_gnome_face_la_LIBADD = 			\
+liborg_gnome_face_la_LIBADD = 					\
 	$(top_builddir)/e-util/libeutil.la 			\
 	$(top_builddir)/composer/libcomposer.la 		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/mail/libevolution-mail.la 		\
-	$(EVOLUTION_MAIL_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)					\
+	$(GTKHTML_LIBS)
 
 liborg_gnome_face_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
diff --git a/plugins/google-account-setup/Makefile.am b/plugins/google-account-setup/Makefile.am
index ed3ab93d5d..7380912a40 100644
--- a/plugins/google-account-setup/Makefile.am
+++ b/plugins/google-account-setup/Makefile.am
@@ -10,9 +10,8 @@ liborg_gnome_evolution_google_la_CPPFLAGS = 		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-DCALDAV_UIDIR=\""$(uidir)"\"			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
 	$(GDATA_CFLAGS)
 
 liborg_gnome_evolution_google_la_SOURCES =        \
@@ -23,8 +22,7 @@ liborg_gnome_evolution_google_la_SOURCES =        \
 liborg_gnome_evolution_google_la_LIBADD = 			\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(top_builddir)/e-util/libeutil.la			\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(EPLUGIN_LIBS)						\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(GDATA_LIBS)
 
diff --git a/plugins/image-inline/Makefile.am b/plugins/image-inline/Makefile.am
index 1c456e2d14..9cb4f9f242 100644
--- a/plugins/image-inline/Makefile.am
+++ b/plugins/image-inline/Makefile.am
@@ -9,7 +9,6 @@ liborg_gnome_image_inline_la_CPPFLAGS =			\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(GTKIMAGEVIEW_CFLAGS)
 
 liborg_gnome_image_inline_la_SOURCES = image-inline.c
@@ -20,7 +19,6 @@ liborg_gnome_image_inline_la_LIBADD =			\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
 	$(GTKIMAGEVIEW_LIBS)				\
-	$(EVOLUTION_MAIL_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = org-gnome-image-inline.eplug.xml
diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am
index de16f4e94d..3f492bf698 100644
--- a/plugins/imap-features/Makefile.am
+++ b/plugins/imap-features/Makefile.am
@@ -12,9 +12,8 @@ liborg_gnome_imap_features_la_CPPFLAGS = 		\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/mail				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	$(CAMEL_IMAP_CFLAGS)				\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"
 
@@ -23,7 +22,7 @@ liborg_gnome_imap_features_la_SOURCES = imap-headers.c
 liborg_gnome_imap_features_la_LIBADD=			\
 	$(top_builddir)/e-util/libeutil.la 		\
 	$(top_builddir)/mail/libevolution-mail.la	\
-	$(EVOLUTION_MAIL_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)
 
 liborg_gnome_imap_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/plugins/itip-formatter/Makefile.am b/plugins/itip-formatter/Makefile.am
index 62346f4c17..793908ecad 100644
--- a/plugins/itip-formatter/Makefile.am
+++ b/plugins/itip-formatter/Makefile.am
@@ -7,9 +7,9 @@ liborg_gnome_itip_formatter_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	$(EVOLUTION_CALENDAR_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_itip_formatter_la_SOURCES = itip-formatter.c itip-view.c itip-view.h
 
@@ -22,9 +22,9 @@ liborg_gnome_itip_formatter_la_LIBADD =				\
 	$(top_builddir)/shell/libeshell.la			\
 	$(top_builddir)/em-format/libemformat.la		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
-	$(CAMEL_LIBS)						\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)					\
+	$(GTKHTML_LIBS)
 
 error_DATA = org-gnome-itip-formatter.error
 errordir = $(privdatadir)/errors
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 189362c102..9ab5895c3d 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -2326,7 +2326,7 @@ view_response_cb (GtkWidget *widget,
 				camel_message_info_free (mi);
 				if (tag) {
 					CamelStore *parent_store;
-					GSList *list = NULL;
+					GList *list = NULL;
 					const gchar *full_name;
 					gint i = 0, count;
 
@@ -2339,7 +2339,7 @@ view_response_cb (GtkWidget *widget,
 						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_slist_prepend (list, (gpointer) mi->uid);
+							list = g_list_prepend (list, (gpointer) mi->uid);
 
 							/* step back once to have the right index */
 							count--;
@@ -2351,7 +2351,7 @@ view_response_cb (GtkWidget *widget,
 					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_slist_free (list);
+					g_list_free (list);
 				}
 			} else {
 				/* Either not a recurring appointment or "apply-to-all" is not selected. So just delete this instance alone */
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 149e01b185..5163d25e02 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -411,19 +411,19 @@ set_calendar_sender_text (ItipView *view)
 		if (priv->organizer_sentby)
 			sender = dupe_first_bold (_("%s through %s has canceled the following meeting:"), organizer, priv->organizer_sentby);
 		else
-			sender = dupe_first_bold (_("%s has canceled the following meeting."), organizer, NULL);
+			sender = dupe_first_bold (_("%s has canceled the following meeting:"), organizer, NULL);
 		break;
 	case ITIP_VIEW_MODE_COUNTER:
 		if (priv->attendee_sentby)
 			sender = dupe_first_bold (_("%s through %s has proposed the following meeting changes."), attendee, priv->attendee_sentby);
 		else
-			sender = dupe_first_bold (_("%s has proposed the following meeting changes."), attendee, NULL);
+			sender = dupe_first_bold (_("%s has proposed the following meeting changes:"), attendee, NULL);
 		break;
 	case ITIP_VIEW_MODE_DECLINECOUNTER:
 		if (priv->organizer_sentby)
 			sender = dupe_first_bold (_("%s through %s has declined the following meeting changes:"), organizer, priv->organizer_sentby);
 		else
-			sender = dupe_first_bold (_("%s has declined the following meeting changes."), organizer, NULL);
+			sender = dupe_first_bold (_("%s has declined the following meeting changes:"), organizer, NULL);
 		break;
 	default:
 		break;
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index ed916e64ec..bcac34a81c 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -15,23 +15,25 @@ liborg_gnome_mail_notification_la_CPPFLAGS =	\
 	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/widgets			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
 	$(GNOME_PLATFORM_CFLAGS)		\
-	$(EVOLUTION_MAIL_CFLAGS)		\
 	$(LIBNOTIFY_CFLAGS)			\
-	$(CANBERRA_CFLAGS)
+	$(CANBERRA_CFLAGS)			\
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_mail_notification_la_SOURCES = mail-notification.c
 
 liborg_gnome_mail_notification_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_mail_notification_la_LIBADD = 		\
-	$(CANBERRA_LIBS)				\
-	$(LIBNOTIFY_LIBS)				\
 	$(top_builddir)/e-util/libeutil.la 		\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/shell/libeshell.la		\
-	$(EVOLUTION_MAIL_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
+	$(GNOME_PLATFORM_LIBS)				\
+	$(LIBNOTIFY_LIBS)				\
+	$(CANBERRA_LIBS)				\
+	$(GTKHTML_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = apps-evolution-mail-notification.schemas.in
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index 9639bc6908..d85987df55 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -37,7 +37,6 @@
 #include <time.h>
 
 #include <e-util/e-config.h>
-#include <e-util/e-account-utils.h>
 #include <e-util/gconf-bridge.h>
 #include <mail/e-mail-folder-utils.h>
 #include <mail/em-utils.h>
diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am
index c263702904..845a82c7a3 100644
--- a/plugins/mail-to-task/Makefile.am
+++ b/plugins/mail-to-task/Makefile.am
@@ -8,9 +8,9 @@ liborg_gnome_mail_to_task_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c
 
@@ -23,9 +23,9 @@ liborg_gnome_mail_to_task_la_LIBADD =	\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la		\
 	$(top_builddir)/mail/libevolution-mail.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
-	$(EVOLUTION_CALENDAR_LIBS)					\
-	$(EVOLUTION_MAIL_LIBS)						\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)					\
+	$(GNOME_PLATFORM_LIBS)						\
+	$(GTKHTML_LIBS)
 
 EXTRA_DIST = org-gnome-mail-to-task.eplug.xml
 
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 1d9f1fa0d0..810a2b593c 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -1131,10 +1131,12 @@ mail_to_event (ECalClientSourceType source_type,
 		/* ask the user which tasks list to save to */
 		dialog = e_source_selector_dialog_new (NULL, source_list);
 
-		e_source_selector_dialog_select_default_source (E_SOURCE_SELECTOR_DIALOG (dialog));
+		e_source_selector_dialog_select_default_source (
+			E_SOURCE_SELECTOR_DIALOG (dialog));
 
 		if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
-			source = e_source_selector_dialog_peek_primary_selection (E_SOURCE_SELECTOR_DIALOG (dialog));
+			source = e_source_selector_dialog_peek_primary_selection (
+				E_SOURCE_SELECTOR_DIALOG (dialog));
 		else
 			source = NULL;
 
diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am
index c429a5ca84..77f6fdce6e 100644
--- a/plugins/mailing-list-actions/Makefile.am
+++ b/plugins/mailing-list-actions/Makefile.am
@@ -8,8 +8,9 @@ liborg_gnome_mailing_list_actions_la_CPPFLAGS =		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)/composer 			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_mailing_list_actions_la_SOURCES = mailing-list-actions.c
 
@@ -20,8 +21,9 @@ liborg_gnome_mailing_list_actions_la_LIBADD =		\
 	$(top_builddir)/composer/libcomposer.la		\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/shell/libeshell.la		\
-	$(EVOLUTION_MAIL_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
+	$(GNOME_PLATFORM_LIBS)				\
+	$(GTKHTML_LIBS)
 
 error_DATA = org-gnome-mailing-list-actions.error
 errordir = $(privdatadir)/errors
diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am
index f868aa0bdb..c159b7af02 100644
--- a/plugins/mark-all-read/Makefile.am
+++ b/plugins/mark-all-read/Makefile.am
@@ -8,8 +8,9 @@ liborg_gnome_mark_all_read_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_mark_all_read_la_SOURCES = mark-all-read.c  
 
@@ -19,8 +20,9 @@ liborg_gnome_mark_all_read_la_LIBADD = 			\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/shell/libeshell.la		\
-	$(EVOLUTION_MAIL_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
+	$(GNOME_PLATFORM_LIBS)				\
+	$(GTKHTML_LIBS)
 
 EXTRA_DIST = org-gnome-mark-all-read.eplug.xml
 
diff --git a/plugins/prefer-plain/Makefile.am b/plugins/prefer-plain/Makefile.am
index b747c55a69..5375da81fd 100644
--- a/plugins/prefer-plain/Makefile.am
+++ b/plugins/prefer-plain/Makefile.am
@@ -7,8 +7,8 @@ plugin_LTLIBRARIES = liborg-gnome-prefer-plain.la
 liborg_gnome_prefer_plain_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_prefer_plain_la_SOURCES = prefer-plain.c
 
@@ -17,7 +17,7 @@ liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_prefer_plain_la_LIBADD =	\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/em-format/libemformat.la	\
-	$(EVOLUTION_MAIL_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = org-gnome-prefer-plain.eplug.xml
diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am
index 71b37a9d0f..1ded6e0f80 100644
--- a/plugins/pst-import/Makefile.am
+++ b/plugins/pst-import/Makefile.am
@@ -2,7 +2,6 @@ if OS_WIN32
 NO_UNDEFINED_REQUIRED_LIBS =				\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/e-util/libeutil.la		\
-	$(EVOLUTION_CALENDAR_LIBS)			\
 	$(EVOLUTION_MAIL_LIBS)
 endif
 
@@ -17,11 +16,10 @@ liborg_gnome_pst_import_la_CPPFLAGS =			\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
-	$(LIBPST_CFLAGS)				\
-	$(CAMEL_CFLAGS)
+	$(GTKHTML_CFLAGS)				\
+	$(LIBPST_CFLAGS)
 
 liborg_gnome_pst_import_la_SOURCES = pst-importer.c
 
@@ -31,11 +29,10 @@ liborg_gnome_pst_import_la_LIBADD =			\
 	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/e-util/libeutil.la		\
-	$(EVOLUTION_CALENDAR_LIBS)			\
-	$(EVOLUTION_MAIL_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
-	$(LIBPST_LIBS)					\
-	$(CAMEL_LIBS)
+	$(GTKHTML_LIBS)					\
+	$(LIBPST_LIBS)
 
 EXTRA_DIST = org-gnome-pst-import.eplug.xml
 
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index b330a371ba..fc19d7a4fd 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -412,7 +412,9 @@ add_source_list_with_check (GtkWidget *frame,
 
 		gtk_box_pack_end ((GtkBox *) hbox, combo, FALSE, FALSE, 0);
 
-		g_signal_connect (check, "toggled", G_CALLBACK (widget_sanitizer_cb), combo);
+		g_signal_connect (
+			check, "toggled",
+			G_CALLBACK (widget_sanitizer_cb), combo);
 		widget_sanitizer_cb (GTK_TOGGLE_BUTTON (check), combo);
 	}
 
@@ -472,10 +474,22 @@ org_credativ_evolution_readpst_getwidget (EImport *ei,
 
 	gtk_box_pack_start ((GtkBox *) framebox, hbox, FALSE, FALSE, 0);
 
-	add_source_list_with_check (framebox, _("_Address Book"), E_CLIENT_SOURCE_TYPE_CONTACTS, G_CALLBACK (checkbox_addr_toggle_cb), target);
-	add_source_list_with_check (framebox, _("A_ppointments"), E_CLIENT_SOURCE_TYPE_EVENTS, G_CALLBACK (checkbox_appt_toggle_cb), target);
-	add_source_list_with_check (framebox, _("_Tasks"), E_CLIENT_SOURCE_TYPE_TASKS, G_CALLBACK (checkbox_task_toggle_cb), target);
-	add_source_list_with_check (framebox, _("_Journal entries"), E_CLIENT_SOURCE_TYPE_MEMOS, G_CALLBACK (checkbox_journal_toggle_cb), target);
+	add_source_list_with_check (
+		framebox, _("_Address Book"),
+		E_CLIENT_SOURCE_TYPE_CONTACTS,
+		G_CALLBACK (checkbox_addr_toggle_cb), target);
+	add_source_list_with_check (
+		framebox, _("A_ppointments"),
+		E_CLIENT_SOURCE_TYPE_EVENTS,
+		G_CALLBACK (checkbox_appt_toggle_cb), target);
+	add_source_list_with_check (
+		framebox, _("_Tasks"),
+		E_CLIENT_SOURCE_TYPE_TASKS,
+		G_CALLBACK (checkbox_task_toggle_cb), target);
+	add_source_list_with_check (
+		framebox, _("_Journal entries"),
+		E_CLIENT_SOURCE_TYPE_MEMOS,
+		G_CALLBACK (checkbox_journal_toggle_cb), target);
 
 	gtk_widget_show_all (framebox);
 
@@ -550,7 +564,8 @@ open_client (PstImporter *m,
 
 	m->waiting_open++;
 
-	e_client_utils_open_new (source, source_type, FALSE, m->cancellable,
+	e_client_utils_open_new (
+		source, source_type, FALSE, m->cancellable,
 		e_client_utils_authenticate_handler, NULL,
 		client_opened_cb, m);
 }
diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am
index 94c29f11b5..b19dc8d1a4 100644
--- a/plugins/publish-calendar/Makefile.am
+++ b/plugins/publish-calendar/Makefile.am
@@ -13,9 +13,9 @@ liborg_gnome_publish_calendar_la_CPPFLAGS =		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)/shell				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(E_UTIL_CFLAGS)				\
-	$(EVOLUTION_CALENDAR_CFLAGS)			\
+	$(LIBNOTIFY_CFLAGS)				\
 	-DEVOLUTION_PLUGINDIR="\"$(plugindir)\""	\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"
 
@@ -36,9 +36,9 @@ liborg_gnome_publish_calendar_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
-	$(E_UTIL_LIBS)						\
-	$(EVOLUTION_CALENDAR_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)					\
+	$(LIBNOTIFY_LIBS)
 
 EXTRA_DIST =					\
 	org-gnome-publish-calendar.eplug.xml	\
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index c55782985c..1ce9f17e41 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -252,11 +252,7 @@ unmount_done_cb (GObject *source_object,
 {
 	GError *error = NULL;
 
-#if GLIB_CHECK_VERSION(2,21,3)
 	g_mount_unmount_with_operation_finish (G_MOUNT (source_object), result, &error);
-#else
-	g_mount_unmount_finish (G_MOUNT (source_object), result, &error);
-#endif
 
 	if (error) {
 		g_warning ("Unmount failed: %s", error->message);
@@ -305,11 +301,7 @@ mount_ready_cb (GObject *source_object,
 
 	mount = g_file_find_enclosing_mount (G_FILE (source_object), NULL, NULL);
 	if (mount)
-#if GLIB_CHECK_VERSION(2,21,3)
 		g_mount_unmount_with_operation (mount, G_MOUNT_UNMOUNT_NONE, NULL, NULL, unmount_done_cb, NULL);
-#else
-		g_mount_unmount (mount, G_MOUNT_UNMOUNT_NONE, NULL, unmount_done_cb, NULL);
-#endif
 
 	g_object_unref (source_object);
 }
diff --git a/plugins/publish-calendar/publish-calendar.ui b/plugins/publish-calendar/publish-calendar.ui
index efd9613aec..88bce4265e 100644
--- a/plugins/publish-calendar/publish-calendar.ui
+++ b/plugins/publish-calendar/publish-calendar.ui
@@ -64,7 +64,7 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Secure FTP (SSH)</col>
+        <col id="0" translatable="yes">Secure FTP (SFTP)</col>
       </row>
       <row>
         <col id="0" translatable="yes">Public FTP</col>
diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am
index a4b7a4ef1c..982b6724ec 100644
--- a/plugins/save-calendar/Makefile.am
+++ b/plugins/save-calendar/Makefile.am
@@ -8,8 +8,8 @@ liborg_gnome_save_calendar_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_CALENDAR_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_save_calendar_la_SOURCES = \
 	save-calendar.c			\
@@ -22,7 +22,7 @@ liborg_gnome_save_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_save_calendar_la_LIBADD =	\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(top_builddir)/shell/libeshell.la	\
-	$(EVOLUTION_CALENDAR_LIBS)		\
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = org-gnome-save-calendar.eplug.xml
diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
index b5f1e283d0..ed9cf18bb6 100644
--- a/plugins/save-calendar/rdf-format.c
+++ b/plugins/save-calendar/rdf-format.c
@@ -45,6 +45,17 @@ static void	add_string_to_rdf		(xmlNodePtr node,
 						 const gchar *tag,
 						 const gchar *value);
 
+/* Use { */
+
+/* #include <calendar/gui/calendar-config-keys.h> */
+/* #include <calendar/gui/calendar-config.h> */
+
+/* } or { */
+#define CALENDAR_CONFIG_PREFIX "/apps/evolution/calendar"
+#define CALENDAR_CONFIG_TIMEZONE CALENDAR_CONFIG_PREFIX "/display/timezone"
+
+static GConfClient *config = NULL;
+
 static gchar *
 calendar_config_get_timezone (void)
 {
diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am
index 9104b3eb07..a64a10e1dd 100644
--- a/plugins/templates/Makefile.am
+++ b/plugins/templates/Makefile.am
@@ -10,10 +10,9 @@ liborg_gnome_templates_la_CPPFLAGS =			\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_builddir)				\
 	-I$(top_builddir)/composer			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
-	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
-	-DEVOLUTION_PLUGINDIR="\"$(plugindir)\""
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_templates_la_SOURCES = templates.c
 
@@ -24,8 +23,9 @@ liborg_gnome_templates_la_LIBADD =	\
 	$(top_builddir)/composer/libcomposer.la		\
 	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/mail/libevolution-mail.la	\
-	$(EVOLUTION_MAIL_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
+	$(GNOME_PLATFORM_LIBS)				\
+	$(GTKHTML_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = apps-evolution-template-placeholders.schemas.in
diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am
index 97240ce075..250453d740 100644
--- a/plugins/tnef-attachments/Makefile.am
+++ b/plugins/tnef-attachments/Makefile.am
@@ -1,7 +1,5 @@
 if OS_WIN32
 NO_UNDEFINED_REQUIRED_LIBS = 				\
-	$(EVOLUTION_MAIL_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)				\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/mail/libevolution-mail.la
 endif
@@ -16,8 +14,9 @@ liborg_gnome_tnef_attachments_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)			\
+	$(GTKHTML_CFLAGS)				\
 	$(TNEF_CFLAGS)
 
 liborg_gnome_tnef_attachments_la_SOURCES = tnef-plugin.c
@@ -27,8 +26,9 @@ liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version  $(NO_UNDEFINE
 liborg_gnome_tnef_attachments_la_LIBADD = 		\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/em-format/libemformat.la	\
-	$(EVOLUTION_MAIL_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
+	$(GTKHTML_LIBS)					\
 	-lytnef
 
 EXTRA_DIST = org-gnome-tnef-attachments.eplug.xml
diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am
index f595145418..07b747af79 100644
--- a/plugins/vcard-inline/Makefile.am
+++ b/plugins/vcard-inline/Makefile.am
@@ -15,23 +15,23 @@ liborg_gnome_vcard_inline_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
-	$(EVOLUTION_MAIL_CFLAGS)
+	$(GTKHTML_CFLAGS)
 
 liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c
 
 liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
-liborg_gnome_vcard_inline_la_LIBADD =	\
-	$(top_builddir)/mail/libevolution-mail.la		\
-	$(top_builddir)/addressbook/util/libeabutil.la		\
-	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la		\
-	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la		\
-	$(top_builddir)/addressbook/printing/libecontactprint.la		\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
-	$(EVOLUTION_MAIL_LIBS)					\
-	$(GNOME_PLATFORM_LIBS)
+liborg_gnome_vcard_inline_la_LIBADD =					\
+	$(top_builddir)/mail/libevolution-mail.la			\
+	$(top_builddir)/addressbook/util/libeabutil.la			\
+	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
+	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la	\
+	$(top_builddir)/addressbook/printing/libecontactprint.la	\
+	$(EVOLUTION_DATA_SERVER_LIBS)					\
+	$(GNOME_PLATFORM_LIBS)						\
+	$(GTKHTML_LIBS)
 
 EXTRA_DIST = org-gnome-vcard-inline.eplug.xml
 
diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c
index 1b72958712..cfe461b163 100644
--- a/plugins/vcard-inline/vcard-inline.c
+++ b/plugins/vcard-inline/vcard-inline.c
@@ -119,14 +119,13 @@ org_gnome_vcard_inline_decode (VCardInlinePObject *vcard_object,
 }
 
 static void
-org_gnome_vcard_inline_client_loaded_cb (GObject *source_object,
+org_gnome_vcard_inline_client_loaded_cb (ESource *source,
                                          GAsyncResult *result,
-                                         gpointer user_data)
+                                         GSList *contact_list)
 {
-	ESource *source = E_SOURCE (source_object);
 	EClient *client = NULL;
 	EBookClient *book_client;
-	GSList *contact_list = user_data, *iter;
+	GSList *iter;
 	GError *error = NULL;
 
 	e_client_utils_open_new_finish (source, result, &client, &error);
@@ -185,9 +184,11 @@ org_gnome_vcard_inline_save_cb (VCardInlinePObject *vcard_object)
 
 	contact_list = e_client_util_copy_object_slist (NULL, vcard_object->contact_list);
 
-	e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL,
-		e_client_utils_authenticate_handler, NULL,
-		org_gnome_vcard_inline_client_loaded_cb, contact_list);
+	e_client_utils_open_new (
+		source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE,
+		NULL, e_client_utils_authenticate_handler, NULL,
+		(GAsyncReadyCallback) org_gnome_vcard_inline_client_loaded_cb,
+		contact_list);
 }
 
 static void
diff --git a/plugins/webdav-account-setup/Makefile.am b/plugins/webdav-account-setup/Makefile.am
index 305d4ff06d..d4d9d006aa 100644
--- a/plugins/webdav-account-setup/Makefile.am
+++ b/plugins/webdav-account-setup/Makefile.am
@@ -8,16 +8,15 @@ liborg_gnome_evolution_webdav_la_CPPFLAGS = 	\
 	$(AM_CPPFLAGS)				\
 	-I .					\
 	-I$(top_srcdir)				\
-	$(GNOME_PLATFORM_CFLAGS)		\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
+	$(GNOME_PLATFORM_CFLAGS)
 
 liborg_gnome_evolution_webdav_la_SOURCES = \
 	webdav-contacts-source.c
 
 liborg_gnome_evolution_webdav_la_LIBADD =	\
 	$(top_builddir)/e-util/libeutil.la	\
-	$(EPLUGIN_LIBS)				\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)		\
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)
 
 liborg_gnome_evolution_webdav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 98c1f84a7d..b86d3f8fab 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -144,7 +144,6 @@ e-util/e-charset.c
 e-util/e-datetime-format.c
 e-util/e-dialog-utils.c
 e-util/e-file-utils.c
-e-util/e-module.c
 e-util/e-plugin.c
 e-util/e-plugin-util.c
 e-util/e-print.c
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index e9cee09693..fb874d058c 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -8,22 +8,37 @@
 # Francesc Dorca <f.dorca@filnet.es>, 2004
 # Jordi Mas <jmas@softcatala.org>, 2004-2007
 # Enric Balletbò i Serra <eballetbo@km103.com>, 2004
+<<<<<<< HEAD
 # Gil Forcada <gilforcada@guifi.net>, 2006
 # David Planella Molas <david.planella@gmail.com>, 2007, 2008, 2009, 2010, 2011.
 #
 #: ../shell/main.c:569
+=======
+# Gil Forcada <gilforcada@guifi.net>, 2006, 2011.
+# David Planella Molas <david.planella@gmail.com>, 2007, 2008, 2009, 2010, 2011.
+#
+#: ../shell/main.c:570
+>>>>>>> master
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2011-05-29 18:02+0200\n"
 "PO-Revision-Date: 2011-04-03 22:17+0200\n"
 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "Language: ca\n"
+=======
+"POT-Creation-Date: 2011-09-26 14:37+0200\n"
+"PO-Revision-Date: 2011-09-25 22:49+0200\n"
+"Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
+"Language-Team: Cataln <tradgnome@softcatala.org>\n"
+"Language: ca-XV\n"
+>>>>>>> master
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. For Translators: {0} is the name of the address book source
@@ -34,7 +49,7 @@ msgid ""
 msgstr ""
 "«{0}» és una llibreta d'adreces a la qual no és permés escriure-hi. Hauríeu "
 "de seleccionar una llibreta d'adreces diferent de la barra lateral de la "
-"visualització de Contactes."
+"visualització de contactes."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -45,22 +60,34 @@ msgstr ""
 "mateixa adreça?"
 
 #: ../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?"
+msgstr ""
+"Ja existeix un contacte a la llista de contactes amb el nom «{0}». Voleu "
+"afegir-l'hi de totes maneres?"
+
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Add with duplicates"
+msgstr "Afig amb duplicats"
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Address '{0}' already exists."
 msgstr "Ja existeix l'adreça «{0}»."
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Cannot add new contact"
 msgstr "No es pot crear un contacte nou"
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Cannot move contact."
 msgstr "No es pot moure el contacte."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Category editor not available."
 msgstr "L'editor de categories no està disponible."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:10
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -70,15 +97,15 @@ msgstr ""
 "un mètode d'entrada compatible. Recordeu que moltes contrasenyes "
 "distingeixen entre majúscules i minúscules."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Could not get schema information for LDAP server."
 msgstr "No s'ha pogut obtindre la informació d'esquema per al servidor LDAP."
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Could not remove address book."
 msgstr "No s'ha pogut suprimir la llibreta d'adreces."
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:13
 msgid ""
 "Currently you can only access the GroupWise System Address Book from "
 "Evolution. Please use some other GroupWise mail client once to get your "
@@ -89,55 +116,77 @@ msgstr ""
 "GroupWise una vegada per obtindre els vostres contactes freqüents de "
 "GroupWise i les carpetes de contactes personals de GroupWise."
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Delete address book '{0}'?"
 msgstr "Voleu suprimir la llibreta d'adreces «{0}»?"
 
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:13
 #: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+=======
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:37 ../mail/mail.error.xml.h:45
+>>>>>>> master
 msgid "Do _Not Delete"
 msgstr "No ho _suprimisques"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "Error saving {0} to {1}: {2}"
 msgstr "S'ha produït un error en alçar {0} a {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Failed to authenticate with LDAP server."
 msgstr "No es pot autenticar amb el servidor LDAP."
 
+<<<<<<< HEAD
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1279
+=======
+#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
+>>>>>>> master
 msgid "Failed to delete contact"
 msgstr "No s'ha pogut suprimir el contacte"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "GroupWise Address book creation:"
 msgstr "Creació de la llibreta d'adreces del GroupWise:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "LDAP server did not respond with valid schema information."
 msgstr "El servidor LDAP no ha respost amb informació d'esquema vàlida."
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "List '{0}' is already in this contact list."
+msgstr "La llista «{0}» ja és en esta llista de contactes."
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "Skip duplicates"
+msgstr "Ignora els duplicats"
+
+#: ../addressbook/addressbook.error.xml.h:23
+msgid "Some addresses already exist in this contact list."
+msgstr "Ja existeixen algunes adreces a la llista de contactes."
+
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Pot ser que algunes característiques no funcionen correctament amb el "
 "servidor actual"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "La llibreta d'adreces de l'Evolution ha eixit inesperadament."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "La imatge que heu seleccionat és gran. Voleu canviar-li la mida i tornar-la "
 "a emmagatzemar?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -148,15 +197,15 @@ msgstr ""
 "configurat. Demaneu al vostre administrador quines són les bases de cerca "
 "compatibles."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This address book could not be opened."
 msgstr "No s'ha pogut obrir esta llibreta d'adreces."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "This address book server does not have any suggested search bases."
 msgstr "Este servidor de llibreta d'adreces no té cap base de cerca suggerida."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:30
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -164,31 +213,31 @@ msgstr ""
 "O bé no es pot contactar amb el servidor de la llibreta d'adreces, o bé el "
 "seu nom està mal escrit, o potser no esteu connectat a la xarxa."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "This address book will be removed permanently."
 msgstr "Se suprimirà la llibreta d'adreces de manera permanent."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Este servidor no és compatible amb la informació d'esquema LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "Unable to open address book"
 msgstr "No s'ha pogut obrir la llibreta d'adreces"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Unable to perform search."
 msgstr "No s'ha pogut realitzar la cerca."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Unable to save {0}."
 msgstr "No s'ha pogut alçar {0}."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "Would you like to save your changes?"
 msgstr "Voleu alçar els canvis?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -196,7 +245,7 @@ msgstr ""
 "Esteu intentant moure un contacte d'una llibreta d'adreces a una altra, però "
 "no es pot suprimir de la font. Voleu alçar-ne una còpia?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../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 "
@@ -207,31 +256,48 @@ msgstr ""
 "els millors resultats el servidor s'hauria d'actualitzar a una versió "
 "compatible"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../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?"
+msgstr ""
+"Les adreces que voleu afegir ja estan a la llista. Les voleu afegir de totes "
+"maneres?"
+
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "You do not have permission to delete contacts in this address book."
 msgstr ""
 "No teniu els permisos suficients per suprimir contactes d'esta llibreta "
 "d'adreces."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:41
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Voleu alçar els canvis que heu fet en este contacte?"
 
 #. Translators: {0} is replaced with an address book name which will not be available
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:37
+=======
+#: ../addressbook/addressbook.error.xml.h:43
+>>>>>>> master
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Fins que no torneu a iniciar l'Evolution no estaran disponibles els vostres "
 "contactes per a {0}."
 
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:604
+=======
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:618
+>>>>>>> master
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Afig"
 
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
 msgstr "_Descarta"
@@ -245,12 +311,32 @@ msgid "_Resize"
 msgstr "_Canvia de mida"
 
 #: ../addressbook/addressbook.error.xml.h:42
+=======
+#: ../addressbook/addressbook.error.xml.h:45
+msgid "_Discard"
+msgstr "_Descarta"
+
+#: ../addressbook/addressbook.error.xml.h:46
+msgid "_Do not save"
+msgstr "No els _desis"
+
+#: ../addressbook/addressbook.error.xml.h:47
+msgid "_Resize"
+msgstr "_Canvia de mida"
+
+#: ../addressbook/addressbook.error.xml.h:48
+>>>>>>> master
 msgid "_Use as it is"
 msgstr "_Utilitza tal com és"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:574
 #: ../calendar/gui/e-calendar-view.c:2080
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:715
+#: ../calendar/gui/e-calendar-view.c:2104
+>>>>>>> master
 msgid "Anniversary"
 msgstr "Commemoració"
 
@@ -260,8 +346,13 @@ msgstr "Commemoració"
 #. * 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
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:573
 #: ../calendar/gui/e-calendar-view.c:2079 ../capplet/anjal-settings-main.c:79
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:714
+#: ../calendar/gui/e-calendar-view.c:2103 ../capplet/anjal-settings-main.c:79
+>>>>>>> master
 #: ../shell/main.c:140
 msgid "Birthday"
 msgstr "Aniversari"
@@ -272,7 +363,7 @@ msgid "Blog:"
 msgstr "Bloc:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegories..."
@@ -282,24 +373,43 @@ msgid "Calendar:"
 msgstr "Calendari:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+<<<<<<< HEAD
 #: ../addressbook/importers/evolution-vcard-importer.c:968
+=======
+#: ../addressbook/importers/evolution-vcard-importer.c:991
+>>>>>>> master
 msgid "Contact"
 msgstr "Contacte"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+<<<<<<< HEAD
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:646
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:666
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2838
+=======
+#: ../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
+>>>>>>> master
 msgid "Contact Editor"
 msgstr "Editor de contactes"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+<<<<<<< HEAD
 #: ../addressbook/gui/merging/eab-contact-merging.c:297
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:494
 #: ../addressbook/gui/widgets/eab-contact-display.c:502
 #: ../addressbook/gui/widgets/eab-contact-display.c:844
 #: ../smime/lib/e-cert.c:832
+=======
+#: ../addressbook/gui/merging/eab-contact-merging.c:386
+#: ../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
+>>>>>>> master
 msgid "Email"
 msgstr "Adreça electrònica"
 
@@ -313,7 +423,13 @@ msgstr "_Nom complet..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:198
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:68
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:1323
+#: ../widgets/misc/e-contact-map.c:295
+>>>>>>> master
 msgid "Home"
 msgstr "Particular"
 
@@ -347,15 +463,24 @@ msgid "Nic_kname:"
 msgstr "Sobre_nom:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+<<<<<<< HEAD
 #: ../modules/calendar/e-memo-shell-migrate.c:265
+=======
+>>>>>>> master
 msgid "Notes"
 msgstr "Notes"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:359
 #: ../calendar/gui/e-calendar-view.c:1785
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:79
+#: ../addressbook/gui/widgets/eab-contact-display.c:409
+#: ../calendar/gui/e-calendar-view.c:1806
+>>>>>>> master
 msgid "Other"
 msgstr "Altres"
 
@@ -381,8 +506,15 @@ msgstr "Adreces web"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:67
 #: ../addressbook/gui/widgets/eab-contact-display.c:554
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
+#: ../addressbook/gui/widgets/eab-contact-display.c:694
+#: ../addressbook/gui/widgets/eab-contact-display.c:1320
+#: ../widgets/misc/e-contact-map.c:303
+>>>>>>> master
 msgid "Work"
 msgstr "Faena"
 
@@ -407,9 +539,15 @@ msgid "_Blog:"
 msgstr "_Bloc:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/event-page.c:709
 #: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../plugins/itip-formatter/itip-view.c:1922
+=======
+#: ../calendar/gui/dialogs/event-page.c:710
+#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../plugins/itip-formatter/itip-view.c:1963
+>>>>>>> master
 msgid "_Calendar:"
 msgstr "_Calendari:"
 
@@ -488,41 +626,70 @@ msgid "_Zip/Postal Code:"
 msgstr "Codi posta_l:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:516
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
+>>>>>>> master
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:519
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
+>>>>>>> master
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:521
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
+>>>>>>> master
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:522
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:661
+>>>>>>> master
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:520
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
+>>>>>>> master
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:518
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
+>>>>>>> master
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
+>>>>>>> master
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:523
 msgid "Skype"
 msgstr "Skype"
@@ -542,10 +709,32 @@ msgstr "S'ha produït un error en suprimir el contacte"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:661
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
+=======
+#: ../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:469
+msgid "Error adding contact"
+msgstr "S'ha produït un error en afegir el contacte"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
+msgid "Error modifying contact"
+msgstr "S'ha produït un error en modificar el contacte"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
+msgid "Error removing contact"
+msgstr "S'ha produït un error en suprimir el contacte"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:670
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2919
+>>>>>>> master
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactes - %s"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3262
 msgid "Please select an image for this contact"
 msgstr "Seleccioneu una imatge per a este contacte"
@@ -555,6 +744,17 @@ msgid "_No image"
 msgstr "Cap _imatge"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3554
+=======
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3398
+msgid "Please select an image for this contact"
+msgstr "Seleccioneu una imatge per a este contacte"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3399
+msgid "_No image"
+msgstr "Cap _imatge"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3730
+>>>>>>> master
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -562,22 +762,36 @@ msgstr ""
 "Les dades del contacte no són vàlides:\n"
 "\n"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3558
+=======
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
+>>>>>>> master
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» té un format no vàlid"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3565
+=======
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3743
+>>>>>>> master
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» té un format no vàlid"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3580
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3591
+=======
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3756
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3770
+>>>>>>> master
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» és buit"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3606
 msgid "Invalid contact."
 msgstr "Contacte no vàlid."
@@ -599,6 +813,29 @@ msgid "E_mail"
 msgstr "Correu electrò_nic"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:474
+=======
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3785
+msgid "Invalid contact."
+msgstr "Contacte no vàlid."
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:437
+msgid "Contact Quick-Add"
+msgstr "Afig un contacte ràpidament"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:440
+msgid "_Edit Full"
+msgstr "_Edita sencer"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:488
+msgid "_Full name"
+msgstr "No_m complet"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:499
+msgid "E_mail"
+msgstr "Correu electrò_nic"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:510
+>>>>>>> master
 msgid "_Select Address Book"
 msgstr "_Seleccioneu la llibreta d'adreces"
 
@@ -670,7 +907,11 @@ msgid "_Suffix:"
 msgstr "_Sufix:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+<<<<<<< HEAD
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
+=======
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:742
+>>>>>>> master
 msgid "Contact List Editor"
 msgstr "Editor de la llista de contactes"
 
@@ -687,7 +928,11 @@ msgid "_List name:"
 msgstr "Nom de la _llista:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+<<<<<<< HEAD
 #: ../mail/mail-config.ui.h:164
+=======
+#: ../mail/mail-config.ui.h:163
+>>>>>>> master
 msgid "_Select..."
 msgstr "S_elecciona..."
 
@@ -697,6 +942,7 @@ msgstr ""
 "Escriviu una adreça electrònica o arrossegueu un con_tacte a la llista de "
 "sota:"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:844
 msgid "Contact List Members"
 msgstr "Membres de la llista de contactes"
@@ -715,9 +961,28 @@ msgid "Error modifying list"
 msgstr "S'ha produït un error en modificar la llista"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1404
+=======
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:865
+msgid "Contact List Members"
+msgstr "Membres de la llista de contactes"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1440
+msgid "Error adding list"
+msgstr "S'ha produït un error en afegir la llista"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1455
+msgid "Error modifying list"
+msgstr "S'ha produït un error en modificar la llista"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1470
+>>>>>>> master
 msgid "Error removing list"
 msgstr "S'ha produït un error en suprimir la llista"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1601
+msgid "_Members"
+msgstr "_Membres"
+
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Contacte canviat:"
@@ -734,11 +999,11 @@ msgstr "S'ha detectat un contacte duplicat"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
 msgid ""
-"The name or email of this contact already exists in this folder.  Would you "
-"like to add it anyway?"
+"The name or email of this contact already exists in this folder. Would you "
+"like to save the changes anyway?"
 msgstr ""
 "Ja existeix el nom o l'adreça electrònica d'este contacte en esta carpeta. "
-"Voleu afegir-l'hi de totes maneres?"
+"Voleu alçar els canvis igualment?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
@@ -757,6 +1022,7 @@ msgstr ""
 "en esta carpeta. Voleu afegir-l'hi de totes maneres?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+<<<<<<< HEAD
 #: ../addressbook/gui/merging/eab-contact-merging.c:243
 msgid "_Merge"
 msgstr "_Fusiona"
@@ -768,25 +1034,44 @@ msgid "Cancelled"
 msgstr "S'ha cancel·lat"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:226
+=======
+#: ../addressbook/gui/merging/eab-contact-merging.c:332
+msgid "_Merge"
+msgstr "_Fusiona"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:315
+>>>>>>> master
 msgid "Merge Contact"
 msgstr "Fusiona el contacte"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
+<<<<<<< HEAD
 #: ../modules/addressbook/e-book-shell-view-actions.c:912
 #: ../modules/calendar/e-cal-shell-view-actions.c:1686
 #: ../modules/calendar/e-memo-shell-view-actions.c:778
 #: ../modules/calendar/e-task-shell-view-actions.c:977
+=======
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
+>>>>>>> master
 msgid "Any field contains"
 msgstr "Qualsevol camp conté"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
+<<<<<<< HEAD
 #: ../modules/addressbook/e-book-shell-view-actions.c:919
+=======
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
+>>>>>>> master
 msgid "Email begins with"
 msgstr "L'adreça electrònica comença per"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
+<<<<<<< HEAD
 #: ../modules/addressbook/e-book-shell-view-actions.c:926
 msgid "Name contains"
 msgstr "El nom conté"
@@ -796,12 +1081,24 @@ msgid "No contacts"
 msgstr "Cap contacte"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:152
+=======
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
+msgid "Name contains"
+msgstr "El nom conté"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:157
+msgid "No contacts"
+msgstr "Cap contacte"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:161
+>>>>>>> master
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contacte"
 msgstr[1] "%d contactes"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-addressbook-model.c:344
 msgid "Error getting book view"
 msgstr "S'ha produït un error en obtindre la visualització de la llibreta"
@@ -811,30 +1108,47 @@ msgid "Search Interrupted"
 msgstr "S'ha interromput la cerca"
 
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:153
+=======
+#: ../addressbook/gui/widgets/e-addressbook-model.c:357
+msgid "Error getting book view"
+msgstr "S'ha produït un error en obtindre la visualització de la llibreta"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:771
+msgid "Search Interrupted"
+msgstr "S'ha interromput la cerca"
+
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:158
+>>>>>>> master
 msgid "Error modifying card"
 msgstr "S'ha produït un error en modificar la targeta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:626
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Cut selected contacts to the clipboard"
 msgstr "Retalla els contactes seleccionats al porta-retalls"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:632
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Copy selected contacts to the clipboard"
 msgstr "Copia els contactes seleccionats al porta-retalls"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:638
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
 msgid "Paste contacts from the clipboard"
 msgstr "Apega els contactes del porta-retalls"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-addressbook-view.c:644
 #: ../modules/addressbook/e-book-shell-view-actions.c:742
+=======
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
+>>>>>>> master
 msgid "Delete selected contacts"
 msgstr "Suprimeix els contactes seleccionats"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:650
+#: ../addressbook/gui/widgets/e-addressbook-view.c:648
 msgid "Select all visible contacts"
 msgstr "Selecciona tots els contactes visibles"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1297
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Segur que voleu suprimir estes llistes de contactes?"
@@ -844,10 +1158,22 @@ msgid "Are you sure you want to delete this contact list?"
 msgstr "Segur que voleu suprimir estes llistes de contactes?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+=======
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
+msgid "Are you sure you want to delete these contact lists?"
+msgstr "Segur que voleu suprimir estes llistes de contactes?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+msgid "Are you sure you want to delete this contact list?"
+msgstr "Segur que voleu suprimir estes llistes de contactes?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
+>>>>>>> master
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Segur que voleu suprimir esta llista de contactes (%s)?"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1311
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Segur que voleu suprimir estos contactes?"
@@ -857,12 +1183,27 @@ msgid "Are you sure you want to delete this contact?"
 msgstr "Segur que voleu suprimir este contacte?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1319
+=======
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1340
+msgid "Are you sure you want to delete these contacts?"
+msgstr "Segur que voleu suprimir estos contactes?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1344
+msgid "Are you sure you want to delete this contact?"
+msgstr "Segur que voleu suprimir este contacte?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1348
+>>>>>>> master
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Segur que voleu suprimir este contacte (%s)?"
 
 #. Translators: This is shown for > 5 contacts.
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1478
+=======
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1504
+>>>>>>> master
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -877,16 +1218,28 @@ msgstr[1] ""
 "En obrir %d contactes també s'obriran %d finestres noves.\n"
 "Segur que voleu mostrar tots estos contactes?"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1486
 msgid "_Don't Display"
 msgstr "_No els mostres"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1487
+=======
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1512
+msgid "_Don't Display"
+msgstr "_No els mostres"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
+>>>>>>> master
 msgid "Display _All Contacts"
 msgstr "_Mostra tots els contactes"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
+>>>>>>> master
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -915,7 +1268,7 @@ msgid "Car Phone"
 msgstr "Telèfon del cotxe"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -923,7 +1276,11 @@ msgid "Categories"
 msgstr "Categories"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
+>>>>>>> master
 msgid "Company"
 msgstr "Empresa"
 
@@ -972,22 +1329,38 @@ msgid "Journal"
 msgstr "Diari"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:544
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
+>>>>>>> master
 msgid "Manager"
 msgstr "Director"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:571
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:712
+>>>>>>> master
 msgid "Mobile Phone"
 msgstr "Telèfon mòbil"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:509
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+>>>>>>> master
 msgid "Nickname"
 msgstr "Sobrenom"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:739
+>>>>>>> master
 msgid "Note"
 msgstr "Nota"
 
@@ -1016,13 +1389,21 @@ msgid "Radio"
 msgstr "Ràdio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+<<<<<<< HEAD
 #: ../calendar/gui/e-meeting-list-view.c:571
+=======
+#: ../calendar/gui/e-meeting-list-view.c:610
+>>>>>>> master
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rol"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:575
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:716
+>>>>>>> master
 msgid "Spouse"
 msgstr "Cònjuge"
 
@@ -1052,7 +1433,11 @@ msgstr "Unitat"
 msgid "Web Site"
 msgstr "Lloc web"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-minicard-view.c:184
+=======
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
+>>>>>>> master
 msgid ""
 "\n"
 "\n"
@@ -1062,7 +1447,11 @@ msgstr ""
 "\n"
 "S'estan cercant els contactes..."
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-minicard-view.c:187
+=======
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
+>>>>>>> master
 msgid ""
 "\n"
 "\n"
@@ -1076,7 +1465,11 @@ msgstr ""
 "\n"
 "o feu doble clic per crear-ne un de nou."
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-minicard-view.c:190
+=======
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
+>>>>>>> master
 msgid ""
 "\n"
 "\n"
@@ -1090,7 +1483,11 @@ msgstr ""
 "\n"
 "Feu doble clic ací per crear un contacte nou."
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-minicard-view.c:194
+=======
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
+>>>>>>> master
 msgid ""
 "\n"
 "\n"
@@ -1100,7 +1497,11 @@ msgstr ""
 "\n"
 "Cerca el contacte."
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-minicard-view.c:196
+=======
+#: ../addressbook/gui/widgets/e-minicard-view.c:204
+>>>>>>> master
 msgid ""
 "\n"
 "\n"
@@ -1110,6 +1511,7 @@ msgstr ""
 "\n"
 "Esta visualització no té cap element per mostrar."
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Work Email"
 msgstr "Adreça electrònica de la faena"
@@ -1120,6 +1522,18 @@ msgstr "Adreça electrònica particular"
 
 #: ../addressbook/gui/widgets/e-minicard.c:103
 #: ../addressbook/gui/widgets/e-minicard.c:808
+=======
+#: ../addressbook/gui/widgets/e-minicard.c:100
+msgid "Work Email"
+msgstr "Adreça electrònica de la faena"
+
+#: ../addressbook/gui/widgets/e-minicard.c:101
+msgid "Home Email"
+msgstr "Adreça electrònica particular"
+
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:819
+>>>>>>> master
 msgid "Other Email"
 msgstr "Una altra adreça electrònica"
 
@@ -1160,6 +1574,7 @@ msgstr "Contacte: "
 msgid "evolution minicard"
 msgstr "minitargeta de l'Evolution"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:172
 msgid "Copy _Email Address"
 msgstr "Copia l'adr_eça electrònica"
@@ -1214,10 +1629,71 @@ msgstr "Calendari"
 #: ../calendar/gui/dialogs/event-editor.c:123
 #: ../calendar/gui/dialogs/event-editor.c:350
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:182
+msgid "Copy _Email Address"
+msgstr "Copia l'adr_eça electrònica"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:184
+#: ../widgets/misc/e-web-view.c:432
+msgid "Copy the email address to the clipboard"
+msgstr "Copia l'adreça electrònica al porta-retalls"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../widgets/misc/e-web-view.c:437
+msgid "_Send New Message To..."
+msgstr "Envia un mi_ssatge nou a..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../widgets/misc/e-web-view.c:439
+msgid "Send a mail message to this address"
+msgstr "Envia un missatge de correu a esta adreça"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:215
+msgid "Open map"
+msgstr "Obri el mapa"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
+msgid "List Members:"
+msgstr "Membres de la llista:"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
+msgid "Department"
+msgstr "Departament"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
+msgid "Profession"
+msgstr "Professió"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
+msgid "Position"
+msgstr "Posició"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
+msgid "Video Chat"
+msgstr "Xat de vídeo"
+
+#: ../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:517
+#: ../modules/online-accounts/e-online-accounts-google.c:294
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:528
+msgid "Calendar"
+msgstr "Calendari"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:688
+#: ../calendar/gui/dialogs/event-editor.c:123
+#: ../calendar/gui/dialogs/event-editor.c:350
+>>>>>>> master
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Lliure/ocupat"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:549
 #: ../addressbook/gui/widgets/eab-contact-display.c:570
 msgid "Phone"
@@ -1237,6 +1713,27 @@ msgid "Home Page"
 msgstr "Pàgina personal"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:568
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:689
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
+msgid "Phone"
+msgstr "Telèfon"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
+msgid "Fax"
+msgstr "Fax"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:691
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
+msgid "Address"
+msgstr "Adreça"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:708
+msgid "Home Page"
+msgstr "Pàgina personal"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
+>>>>>>> master
 msgid "Web Log"
 msgstr "Bloc web"
 
@@ -1244,6 +1741,7 @@ msgstr "Bloc web"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:577
 #: ../capplet/settings/mail-capplet-shell.c:347
 #: ../modules/addressbook/e-book-shell-backend.c:114
@@ -1253,10 +1751,22 @@ msgstr "Bloc web"
 #: ../modules/calendar/e-memo-shell-backend.c:116
 #: ../modules/calendar/e-memo-shell-migrate.c:120
 #: ../modules/calendar/e-task-shell-backend.c:116
+=======
+#: ../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
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-memo-shell-backend.c:122
+#: ../modules/calendar/e-memo-shell-migrate.c:120
+#: ../modules/calendar/e-task-shell-backend.c:122
+>>>>>>> master
 #: ../modules/calendar/e-task-shell-migrate.c:132
 msgid "Personal"
 msgstr "Personal"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:829
 msgid "Job Title"
 msgstr "Càrrec"
@@ -1271,11 +1781,35 @@ msgstr "Bloc"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1055
 #: ../widgets/misc/e-web-view.c:954
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:986
+msgid "List Members"
+msgstr "Membres de la llista"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1004
+msgid "Job Title"
+msgstr "Càrrec"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1041
+msgid "Home page"
+msgstr "Pàgina personal"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1050
+msgid "Blog"
+msgstr "Bloc"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1248
+#: ../widgets/misc/e-web-view.c:980
+>>>>>>> master
 #, c-format
 msgid "Click to mail %s"
 msgstr "Feu clic per enviar un correu a en/na %s"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:79
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
+>>>>>>> master
 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 "
@@ -1286,7 +1820,11 @@ msgstr ""
 "Carregueu la llibreta d'adreces un cop estigueu en línia per poder baixar el "
 "seu contingut."
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:106
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+>>>>>>> master
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1295,7 +1833,11 @@ msgstr ""
 "No s'ha pogut obrir la llibreta d'adreces. Comproveu que existeix el camí %s "
 "i que hi teniu permís d'accés."
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:119
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
+>>>>>>> master
 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."
@@ -1304,7 +1846,11 @@ msgstr ""
 "utilitzar l'Evolution amb l'LDAP haureu d'instal·lar un paquet de "
 "l'Evolution preparat per treballar amb l'LDAP."
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:128
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
+>>>>>>> master
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1312,11 +1858,19 @@ msgstr ""
 "No s'ha pogut obrir la llibreta d'adreces perquè l'URI introduït és "
 "incorrecte o el servidor no està disponible."
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:136
 msgid "Detailed error message:"
 msgstr "Informació detallada de l'error:"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:166
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid "Detailed error message:"
+msgstr "Informació detallada de l'error:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:209
+>>>>>>> master
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1330,7 +1884,11 @@ msgstr ""
 "a les preferències del servidor de directoris d'esta llibreta \n"
 "d'adreces."
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:173
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:216
+>>>>>>> master
 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"
@@ -1343,26 +1901,40 @@ msgstr ""
 "servidor de directori de la llibreta d'adreces."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:181
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
+>>>>>>> master
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr ""
 "El rerefons de la llibreta d'adreces no ha pogut analitzar esta consulta. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:186
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+>>>>>>> master
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr ""
 "El rerefons de la llibreta d'adreces ha refusat realitzar esta consulta. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:191
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:241
+>>>>>>> master
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "S'ha produït un error en l'execució d'esta consulta. %s"
 
 #. This is a filename. Translators take note.
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:216
 msgid "card.vcf"
 msgstr "targeta.vcf"
@@ -1388,6 +1960,33 @@ msgid "Move contacts to"
 msgstr "Mou els contactes a"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:464
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:263
+msgid "card.vcf"
+msgstr "targeta.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
+msgid "Select Address Book"
+msgstr "Seleccioneu la llibreta d'adreces"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
+msgid "list"
+msgstr "llista"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:552
+msgid "Move contact to"
+msgstr "Mou el contacte a"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:554
+msgid "Copy contact to"
+msgstr "Copia el contacte a"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:557
+msgid "Move contacts to"
+msgstr "Mou els contactes a"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:559
+>>>>>>> master
 msgid "Copy contacts to"
 msgstr "Copia els contactes a"
 
@@ -1395,6 +1994,7 @@ msgstr "Copia els contactes a"
 msgid "Card View"
 msgstr "Visualització de targeta"
 
+<<<<<<< HEAD
 #: ../addressbook/importers/evolution-csv-importer.c:730
 #: ../addressbook/importers/evolution-ldif-importer.c:526
 #: ../addressbook/importers/evolution-vcard-importer.c:278
@@ -1440,16 +2040,69 @@ msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:640
+=======
+#: ../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:902
+#: ../calendar/importers/icalendar-importer.c:941 ../shell/shell.error.xml.h:6
+msgid "Importing..."
+msgstr "S'està important..."
+
+#: ../addressbook/importers/evolution-csv-importer.c:1072
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr "Outlook CSV o Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1073
+msgid "Outlook CSV and Tab Importer"
+msgstr "Importador de l'Outlook CSV i Tab"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1081
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr "Mozilla CSV o Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1082
+msgid "Mozilla CSV and Tab Importer"
+msgstr "Importador de CSV i Tab del Mozilla"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1090
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr "Evolution CSV o Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1091
+msgid "Evolution CSV and Tab Importer"
+msgstr "Importador CSV i Tab de l'Evolution"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:796
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "Format d'intercanvi de dades LDAP (.ldif)"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:797
+msgid "Evolution LDIF importer"
+msgstr "Importador LDIF de l'Evolution"
+
+#: ../addressbook/importers/evolution-vcard-importer.c:658
+msgid "vCard (.vcf, .gcrd)"
+msgstr "vCard (.vcf, .gcrd)"
+
+#: ../addressbook/importers/evolution-vcard-importer.c:659
+>>>>>>> master
 msgid "Evolution vCard Importer"
 msgstr "Importador de vCard de l'Evolution"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
+<<<<<<< HEAD
 #: ../addressbook/printing/e-contact-print.c:744
+=======
+#: ../addressbook/printing/e-contact-print.c:719
+>>>>>>> master
 #, c-format
 msgid "Page %d"
 msgstr "Pàgina %d"
 
+<<<<<<< HEAD
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:644
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:679
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:47
@@ -1468,6 +2121,40 @@ msgstr "no es pot obrir la llibreta"
 msgid "Specify the output file instead of standard output"
 msgstr "Especifiqueu el fitxer d'eixida, en comptes de l'eixida estàndard"
 
+=======
+#: ../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 "No es pot obrir el fitxer"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#, c-format
+msgid "Couldn't get list of address books: %s"
+msgstr "No s'ha pogut obtindre la llista de llibretes d'adreces: %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:1765 ../em-format/em-format.c:2324
+#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:659
+#: ../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
+msgid "Unknown error"
+msgstr "Error desconegut"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#, c-format
+msgid "Failed to open client '%s': %s"
+msgstr "No s'ha pogut obrir el client «%s»: %s"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:60
+msgid "Specify the output file instead of standard output"
+msgstr "Especifiqueu el fitxer d'eixida, en comptes de l'eixida estàndard"
+
+>>>>>>> master
 #: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "OUTPUTFILE"
 msgstr "FITXERDESORTIDA"
@@ -1493,21 +2180,26 @@ msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr ""
-"El nombre de targetes en un fitxer d'eixida en mode asíncron; la mida "
-"predeterminada és 100."
+"El nombre de targetes en un fitxer d'eixida en mode asíncron; la mida per "
+"defecte és 100."
 
 # FIXME: s'ha de comprovar si això hauria de ser nombre o número (dpm)
 #: ../addressbook/tools/evolution-addressbook-export.c:76
 msgid "NUMBER"
 msgstr "NOMBRE"
 
+<<<<<<< HEAD
 #: ../addressbook/tools/evolution-addressbook-export.c:138
+=======
+#: ../addressbook/tools/evolution-addressbook-export.c:139
+>>>>>>> master
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "S'ha produït un error en els arguments de la línia d'ordes. Feu servir "
 "l'opció --help per consultar-ne l'ús."
 
+<<<<<<< HEAD
 #: ../addressbook/tools/evolution-addressbook-export.c:152
 msgid "Only support csv or vcard format."
 msgstr "Només són compatibles els formats csv i vCard."
@@ -1521,12 +2213,33 @@ msgid "In normal mode, there is no need for the size option."
 msgstr "No cal l'opció de la mida en el mode normal."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:200
+=======
+#: ../addressbook/tools/evolution-addressbook-export.c:153
+msgid "Only support csv or vcard format."
+msgstr "Només són compatibles els formats csv i vCard."
+
+#: ../addressbook/tools/evolution-addressbook-export.c:162
+msgid "In async mode, output must be file."
+msgstr "La eixida en mode asíncron ha de ser un fitxer."
+
+#: ../addressbook/tools/evolution-addressbook-export.c:170
+msgid "In normal mode, there is no need for the size option."
+msgstr "No cal l'opció de la mida en el mode normal."
+
+#: ../addressbook/tools/evolution-addressbook-export.c:201
+>>>>>>> master
 msgid "Unhandled error"
 msgstr "Error no gestionat"
 
 #. 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 ""
+
+#. 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 ""
@@ -1535,7 +2248,7 @@ msgstr ""
 "visualització de Calendari."
 
 #. 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."
@@ -1544,164 +2257,207 @@ msgstr ""
 "la visualització de calendari i seleccioneu un calendari que puga acceptar "
 "cites."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:5
+=======
+#: ../calendar/calendar.error.xml.h:7
+>>>>>>> master
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
 msgstr ""
+<<<<<<< HEAD
 "Si afegiu un camp de resum comprensible permetrà fer-s'una idea del tema de "
 "la cita."
 
 #: ../calendar/calendar.error.xml.h:6
+=======
+"Si afegiu un camp de resum comprensible permetrà fer-se una idea del tema de "
+"la cita."
+
+#: ../calendar/calendar.error.xml.h:8
+>>>>>>> master
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
 msgstr ""
+<<<<<<< HEAD
 "Si afegiu un camp de resum comprensible permetrà fer-s'una idea del tema de "
+=======
+"Si afegiu un camp de resum comprensible permetrà fer-se una idea del tema de "
+>>>>>>> master
 "la tasca."
 
-#: ../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 ""
 "Se suprimirà tota la informació en estes anotacions i no es podrà recuperar."
 
-#: ../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 ""
 "Se suprimirà tota la informació en esta anotació i no es podrà recuperar."
 
-#: ../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 "Se suprimirà tota la informació d'estes cites i no es podrà recuperar."
 
-#: ../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 ""
 "Se suprimirà tota la informació sobre estes tasques i no es podrà recuperar."
 
-#: ../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 "Se suprimirà tota la informació d'esta cita i no es podrà recuperar."
 
-#: ../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 ""
 "Se suprimirà tota la informació sobre esta reunió i no es podrà recuperar."
 
-#: ../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 ""
 "Se suprimirà tota la informació sobre esta anotació i no es podrà recuperar."
 
-#: ../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 ""
 "Se suprimirà tota la informació sobre esta tasca i no es podrà recuperar."
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Segur que voleu suprimir la tasca «{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 "Segur que voleu suprimir la cita «{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 "Segur que voleu suprimir la reunió «{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 "Segur que voleu suprimir l'anotació «{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 "Segur que voleu suprimir estes {0} cites?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Segur que voleu suprimir estes {0} anotacions?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:23
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Segur que voleu suprimir estes {0} tasques?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:24
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Segur que voleu suprimir esta cita?"
 
+<<<<<<< HEAD
 #: ../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:191
+>>>>>>> master
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Segur que voleu suprimir esta reunió?"
 
+<<<<<<< HEAD
 #: ../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:197
+>>>>>>> master
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Segur que voleu suprimir esta anotació?"
 
+<<<<<<< HEAD
 #: ../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:194
+>>>>>>> master
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Segur que voleu suprimir esta tasca?"
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:26
+=======
+#: ../calendar/calendar.error.xml.h:28
+>>>>>>> master
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "Segur que voleu alçar la cita sense cap resum?"
 
-#: ../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 "Segur que voleu alçar una nota sense resum?"
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:28
+=======
+#: ../calendar/calendar.error.xml.h:30
+>>>>>>> master
 msgid "Are you sure you want to save the task without a summary?"
 msgstr "Segur que voleu alçar la tasca sense cap resum?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:31
 msgid "Cannot create a new event"
 msgstr "No es pot crear un esdeveniment nou"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:32
 msgid "Cannot save event"
 msgstr "No es pot alçar l'esdeveniment"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:33
+#, fuzzy
+msgid "Cannot save task"
+msgstr "No es pot alçar l'esdeveniment"
+
+#: ../calendar/calendar.error.xml.h:34
 msgid "Delete calendar '{0}'?"
 msgstr "Voleu suprimir el calendari «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Delete memo list '{0}'?"
 msgstr "Voleu suprimir la llista d'anotacions «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Delete task list '{0}'?"
 msgstr "Voleu suprimir la llista de tasques «{0}»?"
 
 # Es refereix a enviar un avís de cancel·lació (dpm)
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
 msgid "Do _not Send"
 msgstr "No l'_envies"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "S'està baixant. Voleu alçar esta cita?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Download in progress. Do you want to save the task?"
 msgstr "S'està baixant. Voleu alçar la tasca al disc?"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Editor could not be loaded."
 msgstr "No s'ha pogut carregar l'editor."
 
-#: ../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."
@@ -1709,32 +2465,40 @@ msgstr ""
 "S'enviaran invitacions per correu a tots els participants i se'ls permetrà "
 "acceptar esta tasca."
 
-#: ../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 ""
 "S'enviaran invitacions per correu a tots els participants i se'ls permetrà "
 "respondre-hi."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:44
 msgid "Error loading calendar"
 msgstr "S'ha produït un error en carregar el calendari"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid "Error loading memo list"
 msgstr "S'ha produït un error en carregar la llista d'anotacions"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid "Error loading task list"
 msgstr "S'ha produït un error en carregar la llista de tasques"
 
 #. 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
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:46
 msgid "Error on {0}: {1}"
 msgstr "S'ha produït un error al {0}: {1}"
 
 #: ../calendar/calendar.error.xml.h:47
+=======
+#: ../calendar/calendar.error.xml.h:49
+msgid "Error on {0}: {1}"
+msgstr "S'ha produït un error al {0}: {1}"
+
+#: ../calendar/calendar.error.xml.h:50
+>>>>>>> master
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -1742,7 +2506,11 @@ msgstr ""
 "Si no envieu un avís de cancel·lació, els altres participants no sabran que "
 "s'ha cancel·lat la reunió."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:48
+=======
+#: ../calendar/calendar.error.xml.h:51
+>>>>>>> master
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -1750,7 +2518,11 @@ msgstr ""
 "Si no envieu un avís de cancel·lació, els altres participants no sabran que "
 "s'ha suprimit l'anotació."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:49
+=======
+#: ../calendar/calendar.error.xml.h:52
+>>>>>>> master
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -1758,7 +2530,11 @@ msgstr ""
 "Si no envieu un avís de cancel·lació, els altres participants no sabran que "
 "s'ha suprimit la tasca."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:50
+=======
+#: ../calendar/calendar.error.xml.h:53
+>>>>>>> master
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -1766,7 +2542,11 @@ msgstr ""
 "Si envieu informació actualitzada permet als altres participants mantindre "
 "actualitzats els seus calendaris."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:51
+=======
+#: ../calendar/calendar.error.xml.h:54
+>>>>>>> master
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -1774,24 +2554,37 @@ msgstr ""
 "Si envieu informació actualitzada permet als altres participants mantindre "
 "actualitzades les seues llistes de tasques."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:52
+=======
+#: ../calendar/calendar.error.xml.h:55
+>>>>>>> master
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr "S'estan baixant algunes adjuncions. Es perdran si alceu la cita ara."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:53
+=======
+#: ../calendar/calendar.error.xml.h:56
+>>>>>>> master
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr "S'estan baixant algunes adjuncions. Es perdran si alceu la tasca ara."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:54
+=======
+#: ../calendar/calendar.error.xml.h:57
+>>>>>>> master
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Pot ser que algunes característiques no funcionen correctament amb el vostre "
 "servidor actual."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "El calendari de l'Evolution ha eixit inesperadament."
@@ -1813,10 +2606,34 @@ msgid "The calendar is not marked for offline usage."
 msgstr "No s'ha marcat el calendari per a l'ús en mode fora de línia."
 
 #: ../calendar/calendar.error.xml.h:60
+=======
+#: ../calendar/calendar.error.xml.h:58
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "El calendari de l'Evolution ha eixit inesperadament."
+
+#: ../calendar/calendar.error.xml.h:59
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "Els calendaris de l'Evolution han eixit inesperadament."
+
+#: ../calendar/calendar.error.xml.h:60
+msgid "The Evolution memo has quit unexpectedly."
+msgstr "L'anotació de l'Evolution ha eixit inesperadament."
+
+#: ../calendar/calendar.error.xml.h:61
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr "Les tasques de l'Evolution han eixit inesperadament."
+
+#: ../calendar/calendar.error.xml.h:62
+msgid "The calendar is not marked for offline usage."
+msgstr "No s'ha marcat el calendari per a l'ús en mode fora de línia."
+
+#: ../calendar/calendar.error.xml.h:63
+>>>>>>> master
 msgid "The memo list is not marked for offline usage."
 msgstr ""
 "No s'ha marcat la llista d'anotacions per a l'ús en mode fora de línia."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:61
 msgid "The task list is not marked for offline usage."
 msgstr "No s'ha marcat la llista de tasques per a l'ús en mode fora de línia."
@@ -1874,6 +2691,65 @@ msgid "Would you like to send updated task information to participants?"
 msgstr "Voleu enviar informació actualitzada de la tasca als participants?"
 
 #: ../calendar/calendar.error.xml.h:75
+=======
+#: ../calendar/calendar.error.xml.h:64
+msgid "The task list is not marked for offline usage."
+msgstr "No s'ha marcat la llista de tasques per a l'ús en mode fora de línia."
+
+#: ../calendar/calendar.error.xml.h:65
+msgid "This calendar will be removed permanently."
+msgstr "El calendari se suprimirà permanentment."
+
+#: ../calendar/calendar.error.xml.h:66
+msgid "This memo list will be removed permanently."
+msgstr "Esta llista d'anotacions se suprimirà permanentment."
+
+#: ../calendar/calendar.error.xml.h:67
+msgid "This task list will be removed permanently."
+msgstr "Esta llista d'anotacions se suprimirà permanentment."
+
+#: ../calendar/calendar.error.xml.h:68
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Voleu alçar els canvis en esta cita?"
+
+#: ../calendar/calendar.error.xml.h:69
+msgid "Would you like to save your changes to this meeting?"
+msgstr "Voleu alçar els canvis en esta reunió?"
+
+#: ../calendar/calendar.error.xml.h:70
+msgid "Would you like to save your changes to this memo?"
+msgstr "Voleu alçar els canvis en esta tasca?"
+
+#: ../calendar/calendar.error.xml.h:71
+msgid "Would you like to save your changes to this task?"
+msgstr "Voleu alçar els canvis en esta tasca?"
+
+#: ../calendar/calendar.error.xml.h:72
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr "Voleu enviar un avís de cancel·lació per a esta anotació?"
+
+#: ../calendar/calendar.error.xml.h:73
+msgid "Would you like to send all the participants a cancelation notice?"
+msgstr "Voleu enviar un avís de cancel·lació a tots els participants?"
+
+#: ../calendar/calendar.error.xml.h:74
+msgid "Would you like to send meeting invitations to participants?"
+msgstr "Voleu enviar invitacions de la reunió als participants?"
+
+#: ../calendar/calendar.error.xml.h:75
+msgid "Would you like to send this task to participants?"
+msgstr "Voleu enviar esta tasca als participants?"
+
+#: ../calendar/calendar.error.xml.h:76
+msgid "Would you like to send updated meeting information to participants?"
+msgstr "Voleu enviar informació actualitzada de la reunió als participants?"
+
+#: ../calendar/calendar.error.xml.h:77
+msgid "Would you like to send updated task information to participants?"
+msgstr "Voleu enviar informació actualitzada de la tasca als participants?"
+
+#: ../calendar/calendar.error.xml.h:78
+>>>>>>> master
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -1883,6 +2759,7 @@ msgstr ""
 "tingueu problemes en fer servir l'Evolution. Per obtindre els millors "
 "resultats és recomanable actualitzar el servidor a una versió compatible."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:76
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Heu realitzat canvis a esta cita, però encara no els heu alçat."
@@ -1900,24 +2777,56 @@ msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Heu realitzat canvis a esta tasca, però encara no els heu alçat."
 
 #: ../calendar/calendar.error.xml.h:80
+=======
+#: ../calendar/calendar.error.xml.h:79
+msgid "You have changed this appointment, but not yet saved it."
+msgstr "Heu realitzat canvis a esta cita, però encara no els heu alçat."
+
+#: ../calendar/calendar.error.xml.h:80
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "Heu realitzat canvis a esta reunió, però encara no els heu alçat."
+
+#: ../calendar/calendar.error.xml.h:81
+msgid "You have changed this task, but not yet saved it."
+msgstr "Heu realitzat canvis a esta tasca, però encara no els heu alçat."
+
+#: ../calendar/calendar.error.xml.h:82
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr "Heu realitzat canvis a esta tasca, però encara no els heu alçat."
+
+#: ../calendar/calendar.error.xml.h:83
+>>>>>>> master
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Fins que no reinicieu l'Evolution no estaran disponibles els calendaris."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:81
+=======
+#: ../calendar/calendar.error.xml.h:84
+>>>>>>> master
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Fins que no reinicieu l'Evolution no estaran disponibles les anotacions."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:82
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Fins que no reinicieu l'Evolution no estaran disponibles les tasques."
 
 #: ../calendar/calendar.error.xml.h:83
+=======
+#: ../calendar/calendar.error.xml.h:85
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr "Fins que no reinicieu l'Evolution no estaran disponibles les tasques."
+
+#: ../calendar/calendar.error.xml.h:86
+>>>>>>> master
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "_Descarta els canvis"
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:317
 msgid "_Save"
 msgstr "Al_ça"
@@ -1928,11 +2837,24 @@ msgstr "Al_ça els canvis"
 
 #: ../calendar/calendar.error.xml.h:86
 #: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:164
+=======
+#: ../calendar/calendar.error.xml.h:87 ../composer/e-composer-actions.c:317
+msgid "_Save"
+msgstr "Al_ça"
+
+#: ../calendar/calendar.error.xml.h:88
+msgid "_Save Changes"
+msgstr "Al_ça els canvis"
+
+#: ../calendar/calendar.error.xml.h:89
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
+>>>>>>> master
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Envia"
 
 # Es refereix a enviar un avís de cancel·lació (dpm)
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:87
 msgid "_Send Notice"
 msgstr "E_nvia l'avís"
@@ -1947,18 +2869,30 @@ msgid "Enter password"
 msgstr "Introduïu la contrasenya"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
+=======
+#: ../calendar/calendar.error.xml.h:90
+msgid "_Send Notice"
+msgstr "E_nvia l'avís"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:107
+>>>>>>> master
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuts"
 
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+=======
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+>>>>>>> master
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "hores"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+<<<<<<< HEAD
 #. (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
@@ -1970,6 +2904,18 @@ msgstr[0] "dia"
 msgstr[1] "dia"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:301
+=======
+#. * (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
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dia"
+msgstr[1] "dies"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:313
+>>>>>>> master
 msgid "Start time"
 msgstr "Hora d'inici"
 
@@ -1983,9 +2929,15 @@ msgstr "Descarta-ho _tot"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1629
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1639
 #: ../plugins/itip-formatter/itip-view.c:1044
+=======
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1739
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1749
+#: ../plugins/itip-formatter/itip-view.c:1052
+>>>>>>> master
 msgid "Location:"
 msgstr "Ubicació:"
 
@@ -1993,7 +2945,11 @@ msgstr "Ubicació:"
 msgid "Snooze _time:"
 msgstr "_Temps de repetició:"
 
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:916
+=======
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:919
+>>>>>>> master
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "_Descarta"
@@ -2005,6 +2961,7 @@ msgstr "Mi_gdiada"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:428
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:340
 #: ../plugins/google-account-setup/google-contacts-source.c:379
@@ -2018,6 +2975,20 @@ msgstr "dia"
 #: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:427
 #: ../filter/filter.ui.h:15
 #: ../plugins/google-account-setup/google-contacts-source.c:378
+=======
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../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:387
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+msgid "days"
+msgstr "dies"
+
+#: ../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:453
+#: ../filter/filter.ui.h:15
+#: ../plugins/google-account-setup/google-contacts-source.c:386
+>>>>>>> master
 msgid "hours"
 msgstr "hores"
 
@@ -2028,6 +2999,7 @@ msgstr "ubicació de la cita"
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:426
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
 #: ../plugins/google-account-setup/google-contacts-source.c:377
@@ -2061,6 +3033,41 @@ msgid "Warning"
 msgstr "Avís"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1742
+=======
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../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:385
+msgid "minutes"
+msgstr "minuts"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+msgid "No summary available."
+msgstr "No hi ha cap resum disponible."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+msgid "No description available."
+msgstr "No hi ha cap descripció disponible."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1607
+msgid "No location information available."
+msgstr "No hi ha cap informació d'ubicació disponible."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
+#, c-format
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] "Teniu %d recordatori"
+msgstr[1] "Teniu %d recordatoris"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1853
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
+msgid "Warning"
+msgstr "Avís"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1857
+>>>>>>> master
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2072,7 +3079,11 @@ msgstr ""
 "es va configurar per enviar un correu. En lloc d'això, \n"
 "l'Evolution mostrarà un quadre de diàleg de recordatori normal."
 
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1777
+=======
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1894
+>>>>>>> master
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2089,17 +3100,26 @@ msgstr ""
 "\n"
 "Segur que voleu executar-lo?"
 
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1792
+=======
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1909
+>>>>>>> master
 msgid "Do not ask me about this program again."
 msgstr "No em faces més preguntes sobre este programa."
 
-#: ../calendar/gui/alarm-notify/util.c:44
+#: ../calendar/gui/alarm-notify/util.c:45
 msgid "invalid time"
 msgstr "l'hora no és vàlida"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:396
 #: ../calendar/gui/misc.c:116
+=======
+#: ../calendar/gui/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/misc.c:118
+>>>>>>> master
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -2107,8 +3127,13 @@ msgstr[0] "%d hora"
 msgstr[1] "%d hores"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:402
 #: ../calendar/gui/misc.c:122
+=======
+#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:411
+#: ../calendar/gui/misc.c:124
+>>>>>>> master
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2118,14 +3143,20 @@ msgstr[1] "%d minuts"
 #. 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")
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:408
 #: ../calendar/gui/misc.c:126
+=======
+#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:417
+#: ../calendar/gui/misc.c:128
+>>>>>>> master
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segon"
 msgstr[1] "%d segons"
 
+<<<<<<< HEAD
 #: ../calendar/gui/cal-editor-utils.c:105
 msgid "Invalid object"
 msgstr "Objecte no vàlid"
@@ -3837,6 +4868,1733 @@ msgid "Busy"
 msgstr "Ocupat"
 
 #: ../calendar/gui/e-cal-model-tasks.c:655
+=======
+#: ../calendar/gui/calendar-view-factory.c:116
+msgid "Day View"
+msgstr "Visualització de dia"
+
+#: ../calendar/gui/calendar-view-factory.c:119
+msgid "Work Week View"
+msgstr "Visualització de setmana laborable"
+
+#: ../calendar/gui/calendar-view-factory.c:122
+msgid "Week View"
+msgstr "Visualització setmanal"
+
+#: ../calendar/gui/calendar-view-factory.c:125
+msgid "Month View"
+msgstr "Visualització mensual"
+
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
+msgid "Any Field"
+msgstr "Qualsevol camp"
+
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Fitxers adjunts"
+
+#: ../calendar/gui/caltypes.xml.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:6
+msgid "Attendee"
+msgstr "Assistents"
+
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:8
+msgid "Category"
+msgstr "Categoria"
+
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
+msgid "Classification"
+msgstr "Classificació"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../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"
+msgstr "Confidencial"
+
+#: ../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
+#: ../widgets/misc/e-attachment-tree-view.c:526
+#: ../widgets/table/e-table-config.ui.h:6
+msgid "Description"
+msgstr "Descripció"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Description Contains"
+msgstr "La descripció conté"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "No existeix"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Existeix"
+
+#: ../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
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../plugins/save-calendar/csv-format.c:397
+msgid "Location"
+msgstr "Ubicació"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Organizer"
+msgstr "Organitzador"
+
+#: ../calendar/gui/caltypes.xml.h:14 ../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: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úblic"
+
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../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 "Periodicitat"
+
+#: ../calendar/gui/caltypes.xml.h:17
+#: ../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
+msgid "Summary"
+msgstr "Resum"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Summary Contains"
+msgstr "El resum conté"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "conté"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "no conté"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
+msgid "is"
+msgstr "és"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
+msgid "is not"
+msgstr "no és"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:636
+msgid "Edit Reminder"
+msgstr "Edita el recordatori"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:827
+#: ../calendar/gui/e-alarm-list.c:447
+msgid "Pop up an alert"
+msgstr "Mostra una alerta emergent"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:828
+#: ../calendar/gui/e-alarm-list.c:443
+msgid "Play a sound"
+msgstr "Reprodueix un so"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:829
+#: ../calendar/gui/e-alarm-list.c:455
+msgid "Run a program"
+msgstr "Executa un programa"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:830
+#: ../calendar/gui/e-alarm-list.c:451
+msgid "Send an email"
+msgstr "Envia un correu electrònic"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
+msgid "Add Reminder"
+msgstr "Afig un recordatori"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+msgid "Custom _message"
+msgstr "_Missatge personalitzat"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+msgid "Custom reminder sound"
+msgstr "So del recordatori personalitzat"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
+msgid "Mes_sage:"
+msgstr "Mi_ssatge:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
+msgid "Options"
+msgstr "Opcions"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+msgid "Reminder"
+msgstr "Recordatori"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+msgid "Repeat"
+msgstr "Repetició"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+msgid "Select A File"
+msgstr "Seleccioneu un fitxer"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+msgid "Send To:"
+msgstr "Envia a:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
+msgid "_Arguments:"
+msgstr "_Arguments:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
+msgid "_Program:"
+msgstr "_Programa:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
+msgid "_Repeat the reminder"
+msgstr "_Repeteix el recordatori"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
+msgid "_Sound:"
+msgstr "_So:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+msgid "after"
+msgstr "després de"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
+msgid "before"
+msgstr "abans de"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+msgid "day(s)"
+msgstr "dies"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+msgid "end of appointment"
+msgstr "final de la cita"
+
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+msgid "extra times every"
+msgstr "temps extra per cada"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+msgid "hour(s)"
+msgstr "hores"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+msgid "minute(s)"
+msgstr "minuts"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
+msgid "start of appointment"
+msgstr "inici de la cita"
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:245
+msgid "Action/Trigger"
+msgstr "Acció/activador"
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
+msgid "A_dd"
+msgstr "A_fig"
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+msgid "Reminders"
+msgstr "Recordatoris"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:169
+msgid "Type:"
+msgstr "Tipus:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:185
+#: ../modules/addressbook/addressbook-config.c:530
+msgid "_Type:"
+msgstr "_Tipus:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:155
+#: ../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 "_Nom:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:300
+msgid "Cop_y calendar contents locally for offline operation"
+msgstr ""
+"Copi_a el contingut dels calendaris localment per treballar fora de línia"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:302
+msgid "Cop_y task list contents locally for offline operation"
+msgstr ""
+"Cop_ia localment el contingut de la llista de tasques per treballar fora de "
+"línia"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:304
+msgid "Cop_y memo list contents locally for offline operation"
+msgstr ""
+"Cop_ia localment el contingut de la llista d'anotacions per treballar fora "
+"de línia"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:350
+msgid "Sh_ow reminder notifications"
+msgstr "_Mostra les notificacions de recordatoris"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:425
+msgid "Colo_r:"
+msgstr "C_olor:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:448
+#: ../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/calendar/e-calendar-preferences.ui.h:17
+#: ../plugins/itip-formatter/itip-formatter.c:3045
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "General"
+msgstr "General"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:461
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
+msgid "Task List"
+msgstr "Llista de tasques"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:472
+msgid "Memo List"
+msgstr "Llista d'anotacions"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:564
+msgid "Calendar Properties"
+msgstr "Propietats del calendari"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:564
+msgid "New Calendar"
+msgstr "Calendari nou"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:624
+msgid "Task List Properties"
+msgstr "Propietats de la llista de tasques"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:624
+msgid "New Task List"
+msgstr "Llista de tasques nova"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:684
+msgid "Memo List Properties"
+msgstr "Propietats de la llista d'anotacions"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:684
+msgid "New Memo List"
+msgstr "Llista d'anotacions nova"
+
+#: ../calendar/gui/dialogs/changed-comp.c:62
+msgid "This event has been deleted."
+msgstr "S'ha suprimit l'esdeveniment."
+
+#: ../calendar/gui/dialogs/changed-comp.c:66
+msgid "This task has been deleted."
+msgstr "S'ha suprimit la tasca."
+
+#: ../calendar/gui/dialogs/changed-comp.c:70
+msgid "This memo has been deleted."
+msgstr "S'ha suprimit l'anotació."
+
+#: ../calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr "%s  Heu realitzat canvis. Voleu desfer els canvis i tancar l'editor?"
+
+#: ../calendar/gui/dialogs/changed-comp.c:81
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr "%s  No heu realitzat cap canvi, voleu tancar l'editor?"
+
+#: ../calendar/gui/dialogs/changed-comp.c:86
+msgid "This event has been changed."
+msgstr "S'ha modificat l'esdeveniment."
+
+#: ../calendar/gui/dialogs/changed-comp.c:90
+msgid "This task has been changed."
+msgstr "S'ha modificat la tasca."
+
+#: ../calendar/gui/dialogs/changed-comp.c:94
+msgid "This memo has been changed."
+msgstr "S'ha modificat l'anotació."
+
+#: ../calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+"%s  Heu realitzat canvis. Voleu desfer els canvis i actualitzar l'editor?"
+
+#: ../calendar/gui/dialogs/changed-comp.c:105
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr "%s  No heu realitzat cap canvi, voleu actualitzar l'editor?"
+
+#: ../calendar/gui/dialogs/comp-editor-page.c:461
+#, c-format
+msgid "Validation error: %s"
+msgstr "S'ha produït un error de validació: %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:274
+msgid "Could not save attachments"
+msgstr "No s'han pogut alçar els fitxers adjunts"
+
+#: ../calendar/gui/dialogs/comp-editor.c:620
+msgid "Could not update object"
+msgstr "No s'ha pogut actualitzar l'objecte"
+
+#: ../calendar/gui/dialogs/comp-editor.c:748
+msgid "Edit Appointment"
+msgstr "Edita la cita"
+
+#: ../calendar/gui/dialogs/comp-editor.c:755
+#, c-format
+msgid "Meeting - %s"
+msgstr "Reunió - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:757
+#, c-format
+msgid "Appointment - %s"
+msgstr "Cita - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:763
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Tasca assignada - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:765
+#, c-format
+msgid "Task - %s"
+msgstr "Tasca - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:770
+#, c-format
+msgid "Memo - %s"
+msgstr "Anotació - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:786
+msgid "No Summary"
+msgstr "Sense resum"
+
+#: ../calendar/gui/dialogs/comp-editor.c:907
+msgid "Keep original item?"
+msgstr "Voleu mantindre l'element original?"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1120
+msgid "Close the current window"
+msgstr "Tanca la finestra actual"
+
+#: ../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 "Copia la selecció"
+
+#: ../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 "Retalla la selecció"
+
+#: ../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 "Suprimeix la selecció"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1148
+msgid "View help"
+msgstr "Visualitza l'ajuda"
+
+#: ../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 "Enganxa el porta-retalls"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1176
+msgid "Save current changes"
+msgstr "Alça els canvis actuals"
+
+#: ../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 "Selecciona tot el text"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1190
+msgid "_Classification"
+msgstr "_Classificació"
+
+#: ../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
+#: ../shell/e-shell-window-actions.c:1602
+#: ../widgets/menus/gal-define-views.ui.h:5
+msgid "_Edit"
+msgstr "_Edita"
+
+#: ../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 "_Fitxer"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1211
+#: ../shell/e-shell-window-actions.c:1616
+msgid "_Help"
+msgstr "A_juda"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1218
+msgid "_Insert"
+msgstr "_Insereix"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1225
+#: ../composer/e-composer-actions.c:340
+msgid "_Options"
+msgstr "_Opcions"
+
+#: ../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 "_Visualitza"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1242
+#: ../composer/e-composer-actions.c:289
+msgid "_Attachment..."
+msgstr "Fitxer _adjunt..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1244
+#: ../composer/e-composer-actions.c:291
+#: ../widgets/misc/e-attachment-view.c:439
+msgid "Attach a file"
+msgstr "Adjunta un fitxer"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1252
+msgid "_Categories"
+msgstr "_Categories"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1254
+msgid "Toggles whether to display categories"
+msgstr "Commuta la visualització de categories"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1260
+msgid "Time _Zone"
+msgstr "Fus h_orari"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Toggles whether the time zone is displayed"
+msgstr "Commuta la visualització del fus horari"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1271
+msgid "Pu_blic"
+msgstr "Pú_blic"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1273
+msgid "Classify as public"
+msgstr "Classifica com a públic"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1278
+msgid "_Private"
+msgstr "_Privat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1280
+msgid "Classify as private"
+msgstr "Classifica com a privat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1285
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1287
+msgid "Classify as confidential"
+msgstr "Classifica com a confidencial"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1295
+msgid "R_ole Field"
+msgstr "Camp del r_ol"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1297
+msgid "Toggles whether the Role field is displayed"
+msgstr "Commuta la visualització del camp del rol"
+
+# Prové de «Répondez s'il-vous-plaît» (dpm)
+#: ../calendar/gui/dialogs/comp-editor.c:1303
+msgid "_RSVP"
+msgstr "Esperem la vostra _resposta"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1305
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Commuta si s'ha de mostrar el camp RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "_Status Field"
+msgstr "Camp d'e_stat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1313
+msgid "Toggles whether the Status field is displayed"
+msgstr "Commuta la visualització del camp d'estat"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1319
+msgid "_Type Field"
+msgstr "Camp de _tipus"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1321
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Commuta la visualització del camp del tipus d'assistent"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../composer/e-composer-private.c:77
+msgid "Recent _Documents"
+msgstr "Documents _recents"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2078
+#: ../composer/e-composer-actions.c:508
+msgid "Attach"
+msgstr "Adjunta"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2428
+#: ../calendar/gui/dialogs/comp-editor.c:2591
+#: ../calendar/gui/dialogs/comp-editor.c:3580
+msgid "Changes made to this item may be discarded if an update arrives"
+msgstr ""
+"Els canvis realitzats en este element es descartaran en produir-se una "
+"actualització"
+
+#: ../calendar/gui/dialogs/comp-editor.c:3544
+#: ../plugins/prefer-plain/prefer-plain.c:67
+msgid "attachment"
+msgstr "adjunció"
+
+#: ../calendar/gui/dialogs/comp-editor.c:3612
+msgid "Unable to use current version!"
+msgstr "No s'ha pogut utilitzar la versió actual"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:114
+msgid "Could not open destination"
+msgstr "No s'ha pogut obrir la destinació"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+msgid "Destination is read only"
+msgstr "La destinació és de només lectura"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:164
+msgid "Cannot create object"
+msgstr "No es pot crear l'objecte"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:193
+msgid "Could not open source"
+msgstr "No s'ha pogut obrir la font"
+
+#: ../calendar/gui/dialogs/delete-comp.c:214
+msgid "_Delete this item from all other recipient's mailboxes?"
+msgstr ""
+"Voleu suprimir este element _de totes les bústies dels altres destinataris?"
+
+#: ../calendar/gui/dialogs/delete-comp.c:217
+msgid "_Retract comment"
+msgstr "_Retira el missatge"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:57
+#, c-format
+msgid "The event could not be deleted due to a dbus error: %s"
+msgstr ""
+"No s'ha pogut suprimir l'esdeveniment perquè s'ha produït un error del D-"
+"Bus: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:61
+#, c-format
+msgid "The task could not be deleted due to a dbus error: %s"
+msgstr ""
+"No s'ha pogut suprimir la tasca perquè s'ha produït un error del D-Bus: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:65
+#, c-format
+msgid "The memo could not be deleted due to a dbus error: %s"
+msgstr ""
+"No s'ha pogut suprimir l'anotació perquè s'ha produït un error del D-Bus: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:69
+#, c-format
+msgid "The item could not be deleted due to a dbus error: %s"
+msgstr ""
+"No s'ha pogut suprimir l'element perquè s'ha produït un error del D-Bus: %s"
+
+#: ../calendar/gui/dialogs/delete-error.c:76
+msgid "The event could not be deleted because permission was denied"
+msgstr "No s'ha pogut suprimir l'esdeveniment perquè no en teniu permís"
+
+#: ../calendar/gui/dialogs/delete-error.c:79
+msgid "The task could not be deleted because permission was denied"
+msgstr "No s'ha pogut suprimir la tasca perquè no en teniu permís"
+
+#: ../calendar/gui/dialogs/delete-error.c:82
+msgid "The memo could not be deleted because permission was denied"
+msgstr "No s'ha pogut suprimir l'anotació perquè no en teniu permís"
+
+#: ../calendar/gui/dialogs/delete-error.c:85
+msgid "The item could not be deleted because permission was denied"
+msgstr "No s'ha pogut suprimir l'element perquè no en teniu permís"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:93
+#, c-format
+msgid "The event could not be deleted due to an error: %s"
+msgstr "No s'ha pogut suprimir l'esdeveniment perquè s'ha produït un error: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:97
+#, c-format
+msgid "The task could not be deleted due to an error: %s"
+msgstr "No s'ha pogut suprimir la tasca perquè s'ha produït un error: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:101
+#, c-format
+msgid "The memo could not be deleted due to an error: %s"
+msgstr "No s'ha pogut suprimir l'anotació perquè s'ha produït un error: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:105
+#, c-format
+msgid "The item could not be deleted due to an error: %s"
+msgstr "No s'ha pogut suprimir l'element perquè s'ha produït un error: %s"
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
+msgid "Contacts..."
+msgstr "Contactes..."
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
+msgid "Delegate To:"
+msgstr "Delega a:"
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
+msgid "Enter Delegate"
+msgstr "Introduïu el delegat"
+
+#: ../calendar/gui/dialogs/event-editor.c:212
+msgid "_Reminders"
+msgstr "_Recordatoris"
+
+#: ../calendar/gui/dialogs/event-editor.c:214
+msgid "Set or unset reminders for this event"
+msgstr "Habilita o inhabilita els recordatoris per este esdeveniment"
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Show Time as _Busy"
+msgstr "Mostra el temps com a _ocupat"
+
+#: ../calendar/gui/dialogs/event-editor.c:224
+msgid "Toggles whether to show time as busy"
+msgstr "Commuta la visualització del temps com a ocupat"
+
+#: ../calendar/gui/dialogs/event-editor.c:233
+msgid "_Recurrence"
+msgstr "_Periodicitat"
+
+#: ../calendar/gui/dialogs/event-editor.c:235
+msgid "Make this a recurring event"
+msgstr "Fes-lo un esdeveniment periòdic"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../widgets/misc/e-send-options.ui.h:22
+msgid "Send Options"
+msgstr "Opcions d'enviament"
+
+#: ../calendar/gui/dialogs/event-editor.c:242
+#: ../calendar/gui/dialogs/task-editor.c:128
+msgid "Insert advanced send options"
+msgstr "Insereix opcions avançades d'enviament"
+
+#: ../calendar/gui/dialogs/event-editor.c:250
+msgid "All _Day Event"
+msgstr "Esdeveniment de tot el _dia"
+
+#: ../calendar/gui/dialogs/event-editor.c:252
+msgid "Toggles whether to have All Day Event"
+msgstr "Commuta per tindre l'esdeveniment tot el dia"
+
+#: ../calendar/gui/dialogs/event-editor.c:261
+msgid "_Free/Busy"
+msgstr "_Lliure/ocupat"
+
+#: ../calendar/gui/dialogs/event-editor.c:263
+msgid "Query free / busy information for the attendees"
+msgstr "Sol·licita la informació de lliure/ocupat dels assistents"
+
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3310
+msgid "Appointment"
+msgstr "Cita"
+
+#: ../calendar/gui/dialogs/event-editor.c:384
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/e-meeting-list-view.c:161
+msgid "Attendees"
+msgstr "Assistents"
+
+#: ../calendar/gui/dialogs/event-editor.c:582
+msgid "Print this event"
+msgstr "Imprimeix este esdeveniment"
+
+#: ../calendar/gui/dialogs/event-page.c:558
+msgid "Event's start time is in the past"
+msgstr "La data d'inici de l'esdeveniment es troba en el passat"
+
+#: ../calendar/gui/dialogs/event-page.c:635
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr ""
+"No es pot editar l'esdeveniment perquè el calendari seleccionat és de només "
+"lectura"
+
+#: ../calendar/gui/dialogs/event-page.c:639
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr ""
+"No es pot editar l'esdeveniment completament perquè no en sou l'organitzador"
+
+#: ../calendar/gui/dialogs/event-page.c:651
+#: ../calendar/gui/dialogs/event-page.c:3080
+msgid "This event has reminders"
+msgstr "Este esdeveniment té recordatoris"
+
+#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
+msgid "Or_ganizer:"
+msgstr "Or_ganitzador:"
+
+#: ../calendar/gui/dialogs/event-page.c:1263
+msgid "Event with no start date"
+msgstr "L'esdeveniment no té data d'inici"
+
+#: ../calendar/gui/dialogs/event-page.c:1266
+msgid "Event with no end date"
+msgstr "L'esdeveniment no té data de finalització"
+
+#: ../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 "La data d'inici és errònia"
+
+#: ../calendar/gui/dialogs/event-page.c:1449
+msgid "End date is wrong"
+msgstr "La data de finalització és errònia"
+
+#: ../calendar/gui/dialogs/event-page.c:1472
+msgid "Start time is wrong"
+msgstr "L'hora d'inici és errònia"
+
+#: ../calendar/gui/dialogs/event-page.c:1479
+msgid "End time is wrong"
+msgstr "L'hora de finalització és errònia"
+
+#: ../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 "Cal un organitzador."
+
+#: ../calendar/gui/dialogs/event-page.c:1678
+#: ../calendar/gui/dialogs/task-page.c:913
+msgid "At least one attendee is required."
+msgstr "Cal un assistent com a mínim."
+
+# FIXME: [l10n-bug] (dpm)
+#: ../calendar/gui/dialogs/event-page.c:1885
+msgid "_Delegatees"
+msgstr "De_legats"
+
+#: ../calendar/gui/dialogs/event-page.c:1887
+msgid "Atte_ndees"
+msgstr "Assist_ents"
+
+#: ../calendar/gui/dialogs/event-page.c:2921
+#, c-format
+msgid "Unable to open the calendar '%s': %s"
+msgstr "No s'ha pogut obrir el calendari «%s»: %s"
+
+#. Translators: This string is used when we are creating an Event
+#. * (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
+#. 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/memo-page.c:1012
+#: ../calendar/gui/dialogs/task-page.c:1844
+#, c-format
+msgid "You are acting on behalf of %s"
+msgstr "Esteu actuant en representació de %s"
+
+#: ../calendar/gui/dialogs/event-page.c:3325
+#, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "%d dia abans de la cita"
+msgstr[1] "%d dies abans de la cita"
+
+#: ../calendar/gui/dialogs/event-page.c:3331
+#, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "%d hora abans de la cita"
+msgstr[1] "%d hores abans de la cita"
+
+#: ../calendar/gui/dialogs/event-page.c:3337
+#, c-format
+msgid "%d minute before appointment"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "%d minut abans de la cita"
+msgstr[1] "%d minuts abans de la cita"
+
+#: ../calendar/gui/dialogs/event-page.c:3356
+msgid "Customize"
+msgstr "Personalitza"
+
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/dialogs/event-page.c:3362
+msgctxt "cal-reminders"
+msgid "None"
+msgstr "Cap"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:564
+msgid "Atte_ndees..."
+msgstr "Ass_istents..."
+
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+msgid "Custom Reminder:"
+msgstr "Recordatori personalitzat:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:6
+msgid "Event Description"
+msgstr "Descripció de l'esdeveniment"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
+msgid "Time _zone:"
+msgstr "Fu_s horari:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:8
+#: ../widgets/misc/e-attachment-dialog.c:347
+msgid "_Description:"
+msgstr "_Descripció:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../plugins/calendar-weather/calendar-weather.c:381
+msgid "_Location:"
+msgstr "_Ubicació:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+msgid "_Reminder"
+msgstr "_Recordatori"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+msgid "_Summary:"
+msgstr "_Resum:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+msgid "_Time:"
+msgstr "_Temps:"
+
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "1 dia abans de la cita"
+
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "1 hora abans de la cita"
+
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:21
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "15 minuts abans de la cita"
+
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+msgctxt "eventpage"
+msgid "for"
+msgstr "durant"
+
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+msgctxt "eventpage"
+msgid "until"
+msgstr "fins"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
+msgid "April"
+msgstr "abril"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
+msgid "August"
+msgstr "agost"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
+msgid "December"
+msgstr "desembre"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
+msgid "February"
+msgstr "febrer"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
+msgid "January"
+msgstr "gener"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
+msgid "July"
+msgstr "juliol"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
+msgid "June"
+msgstr "juny"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
+msgid "March"
+msgstr "març"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
+msgid "May"
+msgstr "maig"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
+msgid "November"
+msgstr "novembre"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
+msgid "October"
+msgstr "octubre"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "Select Date"
+msgstr "Seleccioneu una data"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+msgid "Select _Today"
+msgstr "Selecciona av_ui"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
+msgid "September"
+msgstr "setembre"
+
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3314
+msgid "Memo"
+msgstr "Anotació"
+
+#: ../calendar/gui/dialogs/memo-editor.c:156
+msgid "Print this memo"
+msgstr "Imprimeix esta anotació"
+
+#: ../calendar/gui/dialogs/memo-page.c:405
+msgid "Memo's start date is in the past"
+msgstr "La data d'inici de l'anotació es troba en el passat"
+
+#: ../calendar/gui/dialogs/memo-page.c:442
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr ""
+"No es pot editar l'anotació perquè la llista d'anotacions seleccionada és de "
+"només lectura"
+
+#: ../calendar/gui/dialogs/memo-page.c:446
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr ""
+"No es pot editar l'anotació completament perquè no en sou l'organitzador"
+
+#: ../calendar/gui/dialogs/memo-page.c:936
+#, c-format
+msgid "Unable to open memos in '%s': %s"
+msgstr "No s'han pogut obrir les anotacions a «%s»: %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
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
+msgid "To"
+msgstr "Per a"
+
+#: ../calendar/gui/dialogs/memo-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:5
+msgid "Sta_rt date:"
+msgstr "Data d'ini_ci:"
+
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "Resu_m:"
+
+#: ../calendar/gui/dialogs/memo-page.ui.h:5
+msgid "T_o:"
+msgstr "_A:"
+
+#: ../calendar/gui/dialogs/memo-page.ui.h:7
+#: ../calendar/gui/dialogs/task-page.c:339
+#: ../calendar/gui/dialogs/task-page.ui.h:9
+msgid "_List:"
+msgstr "_Llista:"
+
+#: ../calendar/gui/dialogs/recur-comp.c:55
+#, c-format
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr "Esteu modificant un esdeveniment periòdic. Què voleu modificar?"
+
+#: ../calendar/gui/dialogs/recur-comp.c:57
+#, c-format
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr "Esteu delegant un esdeveniment periòdic. Què voleu delegar?"
+
+#: ../calendar/gui/dialogs/recur-comp.c:61
+#, c-format
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr "Esteu modificant una tasca periòdica. Què voleu modificar?"
+
+#: ../calendar/gui/dialogs/recur-comp.c:65
+#, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "Esteu modificant una anotació periòdica. Què voleu modificar?"
+
+#: ../calendar/gui/dialogs/recur-comp.c:91
+msgid "This Instance Only"
+msgstr "Només este cas"
+
+#: ../calendar/gui/dialogs/recur-comp.c:95
+msgid "This and Prior Instances"
+msgstr "Estos casos i els anteriors"
+
+#: ../calendar/gui/dialogs/recur-comp.c:101
+msgid "This and Future Instances"
+msgstr "Estos casos i els futurs"
+
+#: ../calendar/gui/dialogs/recur-comp.c:106
+msgid "All Instances"
+msgstr "Tots els casos"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:575
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Esta cita conté periodicitats que l'Evolution no pot editar."
+
+#: ../calendar/gui/dialogs/recurrence-page.c:964
+msgid "Recurrence date is invalid"
+msgstr "La data de periodicitat no és vàlida"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1004
+msgid "End time of the recurrence was before event's start"
+msgstr ""
+"L'hora de finalització de la recurrència era abans de l'inici de "
+"l'esdeveniment"
+
+#. 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
+msgid "on"
+msgstr "el"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
+msgid "first"
+msgstr "primer"
+
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1103
+msgid "second"
+msgstr "segon"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
+msgid "third"
+msgstr "tercer"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+msgid "fourth"
+msgstr "quart"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (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
+msgid "fifth"
+msgstr "cinquè"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
+msgid "last"
+msgstr "últim"
+
+#. 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
+msgid "Other Date"
+msgstr "Una altra data"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1153
+msgid "1st to 10th"
+msgstr "de l'1 al 10"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1159
+msgid "11th to 20th"
+msgstr "de l'11 al 20"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
+msgid "21st to 31st"
+msgstr "del 21 al 31"
+
+# Apareix al mig d'una frase, per això ha d'anar en minúscula (dpm)
+#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
+msgid "Monday"
+msgstr "dilluns"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "Tuesday"
+msgstr "Dimarts"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
+msgid "Wednesday"
+msgstr "Dimecres"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+msgid "Thursday"
+msgstr "Dijous"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+msgid "Friday"
+msgstr "divendres"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1196
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
+msgid "Saturday"
+msgstr "Dissabte"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1197
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
+msgid "Sunday"
+msgstr "Diumenge"
+
+#. 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
+msgid "on the"
+msgstr "al"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1496
+msgid "occurrences"
+msgstr "aparicions"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2214
+msgid "Add exception"
+msgstr "Afig una excepció"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2255
+msgid "Could not get a selection to modify."
+msgstr "No s'ha pogut obtindre una selecció per modificar."
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2261
+msgid "Modify exception"
+msgstr "Modifica l'excepció"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2305
+msgid "Could not get a selection to delete."
+msgstr "No s'ha pogut obtindre una selecció per suprimir."
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2439
+msgid "Date/Time"
+msgstr "Data/hora"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
+msgid "Every"
+msgstr "Cada"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
+msgid "Exceptions"
+msgstr "Excepcions"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
+msgid "Preview"
+msgstr "Previsualització"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
+msgid "This appointment rec_urs"
+msgstr "Aq_uesta cita és periòdica"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "dies"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgctxt "recurrpage"
+msgid "for"
+msgstr "en"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+msgctxt "recurrpage"
+msgid "forever"
+msgstr "per sempre"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
+msgctxt "recurrpage"
+msgid "month(s)"
+msgstr "mesos"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+msgctxt "recurrpage"
+msgid "until"
+msgstr "fins"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
+msgctxt "recurrpage"
+msgid "week(s)"
+msgstr "setmanes"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+msgctxt "recurrpage"
+msgid "year(s)"
+msgstr "anys"
+
+#: ../calendar/gui/dialogs/send-comp.c:198
+msgid "Send my reminders with this event"
+msgstr "Envia els meus recordatoris amb este esdeveniment"
+
+#: ../calendar/gui/dialogs/send-comp.c:200
+msgid "Notify new attendees _only"
+msgstr "Notifica n_omés els assistents nous"
+
+#: ../calendar/gui/dialogs/task-details-page.c:351
+#: ../calendar/gui/dialogs/task-details-page.c:373
+msgid "Completed date is wrong"
+msgstr "La data de finalització és errònia"
+
+#: ../calendar/gui/dialogs/task-details-page.c:488
+msgid "Web Page"
+msgstr "Pàgina web"
+
+#. 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: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
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
+#, c-format
+msgid "Canceled"
+msgstr "S'ha cancel·lat"
+
+#. 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: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:217 ../calendar/gui/e-task-table.c:232
+#: ../calendar/gui/e-task-table.c:605 ../calendar/gui/print.c:3397
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:387
+msgid "Completed"
+msgstr "Completada"
+
+#. 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:526 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1274 ../widgets/misc/e-send-options.ui.h:13
+msgid "High"
+msgstr "Alta"
+
+#. 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: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:3394
+msgid "In Progress"
+msgstr "En procés"
+
+#. 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:528 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1272 ../widgets/misc/e-send-options.ui.h:14
+msgid "Low"
+msgstr "Baixa"
+
+#. 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: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"
+msgstr "Normal"
+
+#. 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: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
+msgid "Not Started"
+msgstr "No s'ha iniciat"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
+msgid "P_ercent complete:"
+msgstr "P_ercentatge completat:"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
+msgid "Stat_us:"
+msgstr "_Estat:"
+
+#. 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-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
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Estat"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:20
+#: ../calendar/gui/e-task-table.c:529 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:27
+msgid "Undefined"
+msgstr "No s'ha definit"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:21
+msgid "_Date completed:"
+msgstr "_Data de compleció:"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:35
+msgid "_Priority:"
+msgstr "_Prioritat:"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:23
+msgid "_Web Page:"
+msgstr "Pàgina _web:"
+
+#: ../calendar/gui/dialogs/task-editor.c:116
+msgid "_Status Details"
+msgstr "Detalls de l'e_stat"
+
+#: ../calendar/gui/dialogs/task-editor.c:118
+msgid "Click to change or view the status details of the task"
+msgstr "Feu clic per canviar o visualitzar els detalls de l'estat de la tasca"
+
+#: ../calendar/gui/dialogs/task-editor.c:126
+msgid "_Send Options"
+msgstr "_Opcions d'enviament"
+
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3312
+#: ../widgets/misc/e-send-options.c:535
+msgid "Task"
+msgstr "Tasca"
+
+#: ../calendar/gui/dialogs/task-editor.c:324
+msgid "Task Details"
+msgstr "Detalls de la tasca"
+
+#: ../calendar/gui/dialogs/task-editor.c:366
+msgid "Print this task"
+msgstr "Imprimeix esta tasca"
+
+#: ../calendar/gui/dialogs/task-page.c:251
+msgid "Task's start date is in the past"
+msgstr "La data d'inici de la tasca es troba en el passat"
+
+#: ../calendar/gui/dialogs/task-page.c:252
+msgid "Task's due date is in the past"
+msgstr "La data de venciment de la tasca es troba en el passat"
+
+#: ../calendar/gui/dialogs/task-page.c:286
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr ""
+"No es pot editar la tasca perquè la llista de tasques seleccionada és de "
+"només lectura"
+
+#: ../calendar/gui/dialogs/task-page.c:290
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "No es pot editar la tasca completament perquè no en sou l'organitzador"
+
+#: ../calendar/gui/dialogs/task-page.c:294
+#, fuzzy
+msgid ""
+"Task cannot be edited, because the selected task list does not support "
+"assigned tasks"
+msgstr ""
+"No es pot editar la tasca perquè la llista de tasques seleccionada és de "
+"només lectura"
+
+#: ../calendar/gui/dialogs/task-page.c:347
+#: ../calendar/gui/dialogs/task-page.ui.h:4
+msgid "Organi_zer:"
+msgstr "Organit_zador:"
+
+#: ../calendar/gui/dialogs/task-page.c:807
+msgid "Due date is wrong"
+msgstr "La data de venciment és errònia"
+
+#: ../calendar/gui/dialogs/task-page.c:1763
+#, c-format
+msgid "Unable to open tasks in '%s': %s"
+msgstr "No s'han pogut obrir les tasques a «%s»: %s"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:2
+msgid "Categor_ies..."
+msgstr "Ca_tegories..."
+
+#: ../calendar/gui/dialogs/task-page.ui.h:3
+msgid "D_ue date:"
+msgstr "_Data de venciment:"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:7
+msgid "Time zone:"
+msgstr "Fus horari:"
+
+#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dia"
+msgstr[1] "%d dies"
+
+#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:399
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d setmana"
+msgstr[1] "%d setmanes"
+
+#: ../calendar/gui/e-alarm-list.c:461
+msgid "Unknown action to be performed"
+msgstr "Es desconeix l'acció a realitzar"
+
+#. 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:475
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s abans de començar la cita"
+
+#. 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:480
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s després de començar la cita"
+
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s en començar la cita"
+
+#. 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:498
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s abans de finalitzar la cita"
+
+#. 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:503
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s després de la cita"
+
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:510
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s en finalitzar la cita"
+
+#. 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:534
+#, c-format
+msgid "%s at %s"
+msgstr "%s a %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:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s per a un tipus d'activador desconegut"
+
+#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:671
+msgid "Untitled"
+msgstr "Sense títol"
+
+#: ../calendar/gui/e-cal-component-preview.c:200
+msgid "Categories:"
+msgstr "Categories:"
+
+#: ../calendar/gui/e-cal-component-preview.c:239
+msgid "Summary:"
+msgstr "Resum:"
+
+#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:263
+msgid "Start Date:"
+msgstr "Data d'inici:"
+
+#: ../calendar/gui/e-cal-component-preview.c:277
+msgid "Due Date:"
+msgstr "Data de venciment:"
+
+#. Status
+#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../plugins/itip-formatter/itip-view.c:1083
+msgid "Status:"
+msgstr "Estat:"
+
+#: ../calendar/gui/e-cal-component-preview.c:317
+msgid "Priority:"
+msgstr "Prioritat:"
+
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
+msgid "Description:"
+msgstr "Descripció:"
+
+#: ../calendar/gui/e-cal-component-preview.c:373
+msgid "Web Page:"
+msgstr "Pàgina web:"
+
+#: ../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:388
+msgid "Created"
+msgstr "Creat"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
+msgid "End Date"
+msgstr "Data de finalització"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:4
+msgid "Last modified"
+msgstr "Darrera modificació"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:5
+msgid "Start Date"
+msgstr "Data d'inici"
+
+#: ../calendar/gui/e-cal-model-calendar.c:188
+#: ../calendar/gui/e-task-table.c:580
+msgid "Free"
+msgstr "Lliure"
+
+#: ../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 "Ocupat"
+
+#: ../calendar/gui/e-cal-model-tasks.c:665
+>>>>>>> master
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3845,6 +6603,7 @@ msgstr ""
 "La posició geogràfica s'ha d'introduir amb el format: \n"
 "\n"
 "45.436845,125.862501"
+<<<<<<< HEAD
 
 #. Translators: "None" for task's status
 #: ../calendar/gui/e-cal-model-tasks.c:705
@@ -4046,18 +6805,229 @@ msgid "%02i minute divisions"
 msgstr "%02i divisions de minut"
 
 #: ../calendar/gui/e-day-view-time-item.c:825
+=======
+
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:717
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "Cap"
+
+#: ../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 "Sí"
+
+#: ../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 "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
+#: ../modules/plugin-manager/evolution-plugin-manager.c:102
+#: ../plugins/itip-formatter/itip-formatter.c:469
+#: ../plugins/itip-formatter/itip-formatter.c:2697
+msgid "Unknown"
+msgstr "Es desconeix"
+
+#: ../calendar/gui/e-cal-model.c:1585
+msgid "Recurring"
+msgstr "Periòdic"
+
+#: ../calendar/gui/e-cal-model.c:1587
+msgid "Assigned"
+msgstr "Assignat"
+
+#: ../calendar/gui/e-cal-model.c:2963
+#, c-format
+msgid "Opening %s"
+msgstr "S'està obrint %s"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% acabat"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "Feu clic per afegir una tasca"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:5
+msgid "Complete"
+msgstr "Acabat"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:6
+msgid "Completion date"
+msgstr "Data de finalització"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due date"
+msgstr "Data de venciment"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:20
+#: ../plugins/save-calendar/csv-format.c:394
+msgid "Priority"
+msgstr "Prioritat"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+msgid "Start date"
+msgstr "Data d'inici"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../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 "Tipus"
+
+#: ../calendar/gui/e-calendar-view.c:420
+msgid "Cut selected events to the clipboard"
+msgstr "Retalla els esdeveniments seleccionats al porta-retalls"
+
+#: ../calendar/gui/e-calendar-view.c:426
+msgid "Copy selected events to the clipboard"
+msgstr "Copia els esdeveniments seleccionats al porta-retalls"
+
+#: ../calendar/gui/e-calendar-view.c:432
+msgid "Paste events from the clipboard"
+msgstr "Enganxa els esdeveniments del porta-retalls"
+
+#: ../calendar/gui/e-calendar-view.c:438
+msgid "Delete selected events"
+msgstr "Suprimeix els esdeveniments seleccionats"
+
+#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-task-table.c:269
+msgid "Deleting selected objects"
+msgstr "S'estan suprimint els objectes seleccionats"
+
+#: ../calendar/gui/e-calendar-view.c:650 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-task-table.c:1104
+msgid "Updating objects"
+msgstr "S'estan actualitzant els objectes"
+
+#: ../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 "Acceptat"
+
+#: ../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 "Declinat"
+
+#: ../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 "Provisionalment"
+
+#: ../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 "Delegat"
+
+#: ../calendar/gui/e-calendar-view.c:1805
+msgid "Needs action"
+msgstr "Necessita una acció"
+
+#. 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
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organitzador: %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
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organitzador: %s"
+
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:1969 ../calendar/gui/print.c:3346
+#, c-format
+msgid "Location: %s"
+msgstr "Ubicació: %s"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:2000
+#, c-format
+msgid "Time: %s %s"
+msgstr "Hora: %s %s"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: ../calendar/gui/e-cell-date-edit-text.c:156
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: ../calendar/gui/e-cell-date-edit-text.c:159
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d-%m-%Y %I:%M:%S %p"
+
+#: ../calendar/gui/e-cell-date-edit-text.c:167
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"%s"
+msgstr ""
+"Heu d'introduir la data segons el format següent: \n"
+"\n"
+"%s"
+
+#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
+#. * to change the length of the time division in the calendar day view, e.g.
+#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
+#.
+#: ../calendar/gui/e-day-view-time-item.c:809
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i divisions de minut"
+
+#: ../calendar/gui/e-day-view-time-item.c:830
+>>>>>>> master
 msgid "Show the second time zone"
 msgstr "Mostra el segon fus horari"
 
 #. Translators: "None" indicates no second time zone set for a day view
+<<<<<<< HEAD
 #: ../calendar/gui/e-day-view-time-item.c:842
 #: ../modules/calendar/e-calendar-preferences.ui.h:76
 #: ../modules/calendar/e-calendar-preferences.c:178
 #: ../modules/calendar/e-calendar-preferences.c:227
+=======
+#: ../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:231
+>>>>>>> master
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Cap"
 
+<<<<<<< HEAD
 #: ../calendar/gui/e-day-view-time-item.c:870
 #: ../calendar/gui/e-timezone-entry.c:319
 #: ../modules/calendar/e-calendar-preferences.c:254
@@ -4222,19 +7192,202 @@ msgstr "Motiu de la fallada: %s"
 #. %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
+=======
+#: ../calendar/gui/e-day-view-time-item.c:879
+#: ../calendar/gui/e-timezone-entry.c:319
+#: ../modules/calendar/e-calendar-preferences.c:258
+msgid "Select..."
+msgstr "Seleccioneu..."
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. * %B = full month name. Don't use any other specifiers.
+#. strftime format %A = full weekday name, %d = day of
+#. * month, %B = full month name. You can change the
+#. * order but don't change the specifiers or add
+#. * anything.
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1819
+#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1968
+msgid "%A %d %B"
+msgstr "%A, %d de %B"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1836
+#: ../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
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1852
+#: ../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
+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
+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
+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
+#, c-format
+msgid "Week %d"
+msgstr "Setmana %d"
+
+#: ../calendar/gui/e-meeting-list-view.c:64
+msgid "Chair Persons"
+msgstr "Presidents"
+
+#: ../calendar/gui/e-meeting-list-view.c:65
+msgid "Required Participants"
+msgstr "Participants obligatoris"
+
+#: ../calendar/gui/e-meeting-list-view.c:66
+msgid "Optional Participants"
+msgstr "Participants opcionals"
+
+#: ../calendar/gui/e-meeting-list-view.c:67
+msgid "Resources"
+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
+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
+msgid "Group"
+msgstr "Grup"
+
+#: ../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
+msgid "Resource"
+msgstr "Recurs"
+
+#: ../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
+msgid "Room"
+msgstr "Habitació"
+
+#: ../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
+msgid "Chair"
+msgstr "President"
+
+#: ../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
+msgid "Required Participant"
+msgstr "Participant obligatori"
+
+#: ../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
+msgid "Optional Participant"
+msgstr "Participant 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
+msgid "Non-Participant"
+msgstr "No hi participa"
+
+#: ../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:1060
+msgid "Needs Action"
+msgstr "Necessita una acció"
+
+#. The extra space is just a hack to occupy more space for Attendee
+#: ../calendar/gui/e-meeting-list-view.c:578
+msgid "Attendee                          "
+msgstr "Assistent                         "
+
+# Prové de «Répondez s'il-vous-plaît» (dpm)
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:623
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "Esperem la vostra resposta"
+
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
+msgid "In Process"
+msgstr "En curs"
+
+#: ../calendar/gui/e-meeting-store.c:1876
+#, c-format
+msgid "Enter password to access free/busy information on server %s as user %s"
+msgstr ""
+"Introduïu la contrasenya de l'usuari %s al servidor %s per accedir a la "
+"informació de lliure/ocupat"
+
+#: ../calendar/gui/e-meeting-store.c:1886
+#, c-format
+msgid "Failure reason: %s"
+msgstr "Motiu de la fallada: %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
+msgid "Enter password"
+msgstr "Introduïu la contrasenya"
+
+#. 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:445
+#: ../calendar/gui/e-meeting-time-sel.c:2379
+>>>>>>> master
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
+<<<<<<< HEAD
 #. 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
+=======
+#. * 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:449
+#: ../calendar/gui/e-meeting-time-sel.c:2410
+>>>>>>> master
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
+<<<<<<< HEAD
 #. %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:439
 msgid "%m/%d/%Y"
@@ -4297,6 +7450,70 @@ msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
 #: ../calendar/gui/e-meeting-time-sel.c:813
+=======
+#. * %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:453
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: ../calendar/gui/e-meeting-time-sel.c:548
+msgid "Out of Office"
+msgstr "Fora de l'oficina"
+
+#: ../calendar/gui/e-meeting-time-sel.c:549
+msgid "No Information"
+msgstr "Cap informació"
+
+#: ../calendar/gui/e-meeting-time-sel.c:585
+msgid "O_ptions"
+msgstr "O_pcions"
+
+#: ../calendar/gui/e-meeting-time-sel.c:603
+msgid "Show _only working hours"
+msgstr "M_ostra només les hores de treball"
+
+#: ../calendar/gui/e-meeting-time-sel.c:614
+msgid "Show _zoomed out"
+msgstr "Reduei_x l'ampliació"
+
+#: ../calendar/gui/e-meeting-time-sel.c:630
+msgid "_Update free/busy"
+msgstr "Act_ualitza lliure/ocupat"
+
+#: ../calendar/gui/e-meeting-time-sel.c:645
+msgid "_<<"
+msgstr "_<<"
+
+#: ../calendar/gui/e-meeting-time-sel.c:663
+msgid "_Autopick"
+msgstr "Tria _automàtica"
+
+#: ../calendar/gui/e-meeting-time-sel.c:678
+msgid ">_>"
+msgstr ">_>"
+
+#: ../calendar/gui/e-meeting-time-sel.c:696
+msgid "_All people and resources"
+msgstr "Tot_es les persones i recursos"
+
+#: ../calendar/gui/e-meeting-time-sel.c:706
+msgid "All _people and one resource"
+msgstr "Totes les _persones i un recurs"
+
+#: ../calendar/gui/e-meeting-time-sel.c:716
+msgid "_Required people"
+msgstr "Pe_rsones necessàries"
+
+#: ../calendar/gui/e-meeting-time-sel.c:725
+msgid "Required people and _one resource"
+msgstr "Pers_ones necessàries i un recurs"
+
+#: ../calendar/gui/e-meeting-time-sel.c:774
+msgid "_Start time:"
+msgstr "Hora d'_inici:"
+
+#: ../calendar/gui/e-meeting-time-sel.c:814
+>>>>>>> master
 msgid "_End time:"
 msgstr "Hora d_e finalització:"
 
@@ -4324,6 +7541,7 @@ msgstr "Idioma"
 msgid "Member"
 msgstr "Membre"
 
+<<<<<<< HEAD
 #: ../calendar/gui/e-memo-table.c:419
 #: ../modules/calendar/e-cal-shell-content.c:473
 #: ../modules/calendar/e-memo-shell-view-actions.c:222
@@ -4334,15 +7552,32 @@ msgid "Memos"
 msgstr "Anotacions"
 
 #: ../calendar/gui/e-memo-table.c:500 ../calendar/gui/e-task-table.c:723
+=======
+#: ../calendar/gui/e-memo-table.c:420
+#: ../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:458
+msgid "Memos"
+msgstr "Anotacions"
+
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:733
+>>>>>>> master
 msgid "* No Summary *"
 msgstr "* Sense resum *"
 
 #. Translators: This is followed by an event's start date/time
+<<<<<<< HEAD
 #: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:805
+=======
+#: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:817
+>>>>>>> master
 msgid "Start: "
 msgstr "Inici: "
 
 #. Translators: This is followed by an event's due date/time
+<<<<<<< HEAD
 #: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:823
 msgid "Due: "
 msgstr "Venciment: "
@@ -4535,14 +7770,216 @@ msgstr "%A, %d de %B del %Y"
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
+=======
+#: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:835
+msgid "Due: "
+msgstr "Venciment: "
+
+#: ../calendar/gui/e-memo-table.c:726
+msgid "Cut selected memos to the clipboard"
+msgstr "Retalla les anotacions seleccionades al porta-retalls"
+
+#: ../calendar/gui/e-memo-table.c:732
+msgid "Copy selected memos to the clipboard"
+msgstr "Copia les anotacions seleccionades al porta-retalls"
+
+#: ../calendar/gui/e-memo-table.c:738
+msgid "Paste memos from the clipboard"
+msgstr "Enganxa les anotacions del porta-retalls"
+
+#: ../calendar/gui/e-memo-table.c:744
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
+msgid "Delete selected memos"
+msgstr "Suprimeix les anotacions seleccionades"
+
+#: ../calendar/gui/e-memo-table.c:750
+msgid "Select all visible memos"
+msgstr "Selecciona totes les anotacions visibles"
+
+#: ../calendar/gui/e-memo-table.etspec.h:2
+msgid "Click to add a memo"
+msgstr "Feu clic per afegir una anotació"
+
+#. 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%
+#.
+#: ../calendar/gui/e-task-table.c:555
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: ../calendar/gui/e-task-table.c:652 ../calendar/gui/print.c:2273
+#: ../calendar/importers/icalendar-importer.c:85
+#: ../calendar/importers/icalendar-importer.c:1043
+#: ../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
+#: ../modules/calendar/e-task-shell-view-actions.c:269
+#: ../modules/calendar/e-task-shell-view.c:448
+#: ../plugins/caldav/caldav-browse-server.c:456
+msgid "Tasks"
+msgstr "Tasques"
+
+#: ../calendar/gui/e-task-table.c:968
+msgid "Cut selected tasks to the clipboard"
+msgstr "Retalla les tasques seleccionades al porta-retalls"
+
+#: ../calendar/gui/e-task-table.c:974
+msgid "Copy selected tasks to the clipboard"
+msgstr "Copia les tasques seleccionades al porta-retalls"
+
+#: ../calendar/gui/e-task-table.c:980
+msgid "Paste tasks from the clipboard"
+msgstr "Enganxa les tasques del porta-retalls"
+
+#: ../calendar/gui/e-task-table.c:986
+#: ../modules/calendar/e-task-shell-view-actions.c:710
+msgid "Delete selected tasks"
+msgstr "Suprimeix la tasca seleccionada"
+
+#: ../calendar/gui/e-task-table.c:992
+msgid "Select all visible tasks"
+msgstr "Selecciona totes les tasques visibles"
+
+#: ../calendar/gui/e-timezone-entry.c:330
+msgid "Select Timezone"
+msgstr "Seleccioneu un fus horari"
+
+#. 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
+msgid "%d %B"
+msgstr "%d %B"
+
+#: ../calendar/gui/ea-cal-view-event.c:290
+msgid "It has reminders."
+msgstr "Té recordatoris."
+
+#: ../calendar/gui/ea-cal-view-event.c:293
+msgid "It has recurrences."
+msgstr "Té recurrències."
+
+#: ../calendar/gui/ea-cal-view-event.c:296
+msgid "It is a meeting."
+msgstr "És una reunió."
+
+#: ../calendar/gui/ea-cal-view-event.c:303
+#, c-format
+msgid "Calendar Event: Summary is %s."
+msgstr "Esdeveniment del calendari: el resum és %s."
+
+#: ../calendar/gui/ea-cal-view-event.c:306
+msgid "Calendar Event: It has no summary."
+msgstr "Esdeveniment de calendari: no té resum."
+
+#: ../calendar/gui/ea-cal-view-event.c:328
+msgid "calendar view event"
+msgstr "visualització del calendari per a un esdeveniment"
+
+#: ../calendar/gui/ea-cal-view-event.c:557
+msgid "Grab Focus"
+msgstr "Captura el focus"
+
+#: ../calendar/gui/ea-cal-view.c:315
+msgid "New Appointment"
+msgstr "Cita nova"
+
+#: ../calendar/gui/ea-cal-view.c:316
+msgid "New All Day Event"
+msgstr "Esdeveniment de tot el dia nou"
+
+#: ../calendar/gui/ea-cal-view.c:317
+msgid "New Meeting"
+msgstr "Reunió nova"
+
+#: ../calendar/gui/ea-cal-view.c:318
+msgid "Go to Today"
+msgstr "Vés a hui"
+
+#: ../calendar/gui/ea-cal-view.c:319
+msgid "Go to Date"
+msgstr "Vés a una data"
+
+#: ../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 "una taula per visualitzar i seleccionar l'interval de temps actual"
+
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
+#, c-format
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "Té %d esdeveniment."
+msgstr[1] "Té %d esdeveniments."
+
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:154
+msgid "It has no events."
+msgstr "No té esdeveniments."
+
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:163
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "Visualització de setmana laboral: %s. %s"
+
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:169
+#, c-format
+msgid "Day View: %s. %s"
+msgstr "Visualització de dia: %s. %s"
+
+#: ../calendar/gui/ea-day-view.c:203
+msgid "calendar view for a work week"
+msgstr "visualització del calendari per a una setmana laboral"
+
+#: ../calendar/gui/ea-day-view.c:205
+msgid "calendar view for one or more days"
+msgstr "visualització de calendari per a un o més dies"
+
+#: ../calendar/gui/ea-gnome-calendar.c:50
+#: ../calendar/gui/ea-gnome-calendar.c:58
+#: ../calendar/importers/icalendar-importer.c:1077
+msgid "Gnome Calendar"
+msgstr "Calendari del GNOME"
+
+#: ../calendar/gui/ea-gnome-calendar.c:201
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
+msgid "%A %d %b %Y"
+msgstr "%A, %d de %B del %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: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 %d %b %Y"
+
+>>>>>>> master
 #: ../calendar/gui/ea-gnome-calendar.c:230
 #: ../calendar/gui/ea-gnome-calendar.c:236
 #: ../calendar/gui/ea-gnome-calendar.c:242
 #: ../calendar/gui/ea-gnome-calendar.c:244
+<<<<<<< HEAD
 #: ../modules/calendar/e-cal-shell-view-private.c:1046
 #: ../modules/calendar/e-cal-shell-view-private.c:1057
 #: ../modules/calendar/e-cal-shell-view-private.c:1064
 #: ../modules/calendar/e-cal-shell-view-private.c:1067
+=======
+#: ../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
+>>>>>>> master
 msgid "%d %b %Y"
 msgstr "%d de %B del %Y"
 
@@ -4572,6 +8009,7 @@ msgstr "visualització del calendari per a un mes"
 msgid "calendar view for one or more weeks"
 msgstr "visualització del calendari per a una o més setmanes"
 
+<<<<<<< HEAD
 #: ../calendar/gui/gnome-cal.c:2218
 msgid "Purging"
 msgstr "S'està buidant"
@@ -4602,6 +8040,38 @@ msgid "Free/Busy information"
 msgstr "Informació lliure/ocupat"
 
 #: ../calendar/gui/itip-utils.c:753
+=======
+#: ../calendar/gui/gnome-cal.c:2262
+msgid "Purging"
+msgstr "S'està buidant"
+
+#: ../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 "S'ha d'especificar un organitzador."
+
+#: ../calendar/gui/itip-utils.c:558
+msgid "At least one attendee is necessary"
+msgstr "Cal un assistent com a mínim"
+
+#: ../calendar/gui/itip-utils.c:755 ../calendar/gui/itip-utils.c:916
+msgid "Event information"
+msgstr "Informació de l'esdeveniment"
+
+#: ../calendar/gui/itip-utils.c:758 ../calendar/gui/itip-utils.c:919
+msgid "Task information"
+msgstr "Informació de la tasca"
+
+#: ../calendar/gui/itip-utils.c:761 ../calendar/gui/itip-utils.c:922
+msgid "Memo information"
+msgstr "Informació de l'anotació"
+
+#: ../calendar/gui/itip-utils.c:764 ../calendar/gui/itip-utils.c:940
+msgid "Free/Busy information"
+msgstr "Informació lliure/ocupat"
+
+#: ../calendar/gui/itip-utils.c:767
+>>>>>>> master
 msgid "Calendar information"
 msgstr "Informació del calendari"
 
@@ -4609,7 +8079,11 @@ msgstr "Informació del calendari"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:790
+=======
+#: ../calendar/gui/itip-utils.c:804
+>>>>>>> master
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Acceptada"
@@ -4618,7 +8092,11 @@ msgstr "Acceptada"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:797
+=======
+#: ../calendar/gui/itip-utils.c:811
+>>>>>>> master
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Acceptada provisionalment"
@@ -4630,7 +8108,11 @@ msgstr "Acceptada provisionalment"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:804 ../calendar/gui/itip-utils.c:852
+=======
+#: ../calendar/gui/itip-utils.c:818 ../calendar/gui/itip-utils.c:866
+>>>>>>> master
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Declinada"
@@ -4639,7 +8121,11 @@ msgstr "Declinada"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:811
+=======
+#: ../calendar/gui/itip-utils.c:825
+>>>>>>> master
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegada"
@@ -4647,7 +8133,11 @@ msgstr "Delegada"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:824
+=======
+#: ../calendar/gui/itip-utils.c:838
+>>>>>>> master
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Actualitzada"
@@ -4655,7 +8145,11 @@ msgstr "Actualitzada"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:831
+=======
+#: ../calendar/gui/itip-utils.c:845
+>>>>>>> master
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancel·lada"
@@ -4663,7 +8157,11 @@ msgstr "Cancel·lada"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:838
+=======
+#: ../calendar/gui/itip-utils.c:852
+>>>>>>> master
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Actualitzada"
@@ -4671,25 +8169,42 @@ msgstr "Actualitzada"
 #. 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".
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:845
+=======
+#: ../calendar/gui/itip-utils.c:859
+>>>>>>> master
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contraproposta"
 
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:923
+=======
+#: ../calendar/gui/itip-utils.c:937
+>>>>>>> master
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informació lliure/ocupat (%s a %s)"
 
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:931
 msgid "iCalendar information"
 msgstr "Informació de l'iCalendar"
 
 #: ../calendar/gui/itip-utils.c:956
+=======
+#: ../calendar/gui/itip-utils.c:945
+msgid "iCalendar information"
+msgstr "Informació de l'iCalendar"
+
+#: ../calendar/gui/itip-utils.c:970
+>>>>>>> master
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "No s'ha pogut reservar un recurs, l'esdeveniment nou coincideix amb un altre."
 
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:960
 msgid "Unable to book a resource, error: "
 msgstr "No s'ha pogut reservar un recurs. L'error fou: "
@@ -22028,12 +25543,17543 @@ msgstr "Mètodes d'entrada"
 # FIXME (dpm)
 #~ msgid "Drafts based template plugin"
 #~ msgstr "Connector de plantilles basat en esborranys"
+=======
+#: ../calendar/gui/itip-utils.c:974
+msgid "Unable to book a resource, error: "
+msgstr "No s'ha pogut reservar un recurs. L'error fou: "
+
+#: ../calendar/gui/itip-utils.c:1137
+msgid "You must be an attendee of the event."
+msgstr "Heu de ser un assistent de l'esdeveniment."
+
+#: ../calendar/gui/print.c:581
+msgid "1st"
+msgstr "1"
+
+#: ../calendar/gui/print.c:581
+msgid "2nd"
+msgstr "2"
+
+#: ../calendar/gui/print.c:581
+msgid "3rd"
+msgstr "3"
+
+#: ../calendar/gui/print.c:581
+msgid "4th"
+msgstr "4"
+
+#: ../calendar/gui/print.c:581
+msgid "5th"
+msgstr "5"
+
+#: ../calendar/gui/print.c:582
+msgid "6th"
+msgstr "6"
+
+#: ../calendar/gui/print.c:582
+msgid "7th"
+msgstr "7"
+
+#: ../calendar/gui/print.c:582
+msgid "8th"
+msgstr "8"
+
+#: ../calendar/gui/print.c:582
+msgid "9th"
+msgstr "9"
+
+#: ../calendar/gui/print.c:582
+msgid "10th"
+msgstr "10"
+
+#: ../calendar/gui/print.c:583
+msgid "11th"
+msgstr "11"
+
+#: ../calendar/gui/print.c:583
+msgid "12th"
+msgstr "12"
+
+#: ../calendar/gui/print.c:583
+msgid "13th"
+msgstr "13"
+
+#: ../calendar/gui/print.c:583
+msgid "14th"
+msgstr "14"
+
+#: ../calendar/gui/print.c:583
+msgid "15th"
+msgstr "15"
+
+#: ../calendar/gui/print.c:584
+msgid "16th"
+msgstr "16"
+
+#: ../calendar/gui/print.c:584
+msgid "17th"
+msgstr "17"
+
+#: ../calendar/gui/print.c:584
+msgid "18th"
+msgstr "18"
+
+#: ../calendar/gui/print.c:584
+msgid "19th"
+msgstr "19"
+
+#: ../calendar/gui/print.c:584
+msgid "20th"
+msgstr "20"
+
+#: ../calendar/gui/print.c:585
+msgid "21st"
+msgstr "21"
+
+#: ../calendar/gui/print.c:585
+msgid "22nd"
+msgstr "22"
+
+#: ../calendar/gui/print.c:585
+msgid "23rd"
+msgstr "23"
+
+#: ../calendar/gui/print.c:585
+msgid "24th"
+msgstr "24"
+
+#: ../calendar/gui/print.c:585
+msgid "25th"
+msgstr "25"
+
+#: ../calendar/gui/print.c:586
+msgid "26th"
+msgstr "26"
+
+#: ../calendar/gui/print.c:586
+msgid "27th"
+msgstr "27"
+
+#: ../calendar/gui/print.c:586
+msgid "28th"
+msgstr "28"
+
+#: ../calendar/gui/print.c:586
+msgid "29th"
+msgstr "29"
+
+#: ../calendar/gui/print.c:586
+msgid "30th"
+msgstr "30"
+
+#: ../calendar/gui/print.c:587
+msgid "31st"
+msgstr "31"
+
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:644
+msgid "Su"
+msgstr "dg"
+
+#: ../calendar/gui/print.c:644
+msgid "Mo"
+msgstr "dl"
+
+#: ../calendar/gui/print.c:644
+msgid "Tu"
+msgstr "dm"
+
+#: ../calendar/gui/print.c:644
+msgid "We"
+msgstr "dc"
+
+#: ../calendar/gui/print.c:645
+msgid "Th"
+msgstr "dj"
+
+#: ../calendar/gui/print.c:645
+msgid "Fr"
+msgstr "dv"
+
+#: ../calendar/gui/print.c:645
+msgid "Sa"
+msgstr "ds"
+
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:3139
+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
+msgid " (Completed "
+msgstr " (Completada "
+
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:3155
+msgid "Completed "
+msgstr "Completada "
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:3165
+msgid " (Due "
+msgstr " (Venciment "
+
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:3172
+msgid "Due "
+msgstr "Venciment "
+
+#: ../calendar/gui/print.c:3337
+#, c-format
+msgid "Summary: %s"
+msgstr "Resum: %s"
+
+#: ../calendar/gui/print.c:3364
+msgid "Attendees: "
+msgstr "Assistents: "
+
+#: ../calendar/gui/print.c:3407
+#, c-format
+msgid "Status: %s"
+msgstr "Estat: %s"
+
+#: ../calendar/gui/print.c:3422
+#, c-format
+msgid "Priority: %s"
+msgstr "Prioritat: %s"
+
+#: ../calendar/gui/print.c:3440
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Percentatge completat: %i"
+
+#: ../calendar/gui/print.c:3451
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: ../calendar/gui/print.c:3464
+#, c-format
+msgid "Categories: %s"
+msgstr "Categories: %s"
+
+#: ../calendar/gui/print.c:3475
+msgid "Contacts: "
+msgstr "Contactes: "
+
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% acabat"
+
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Cancelled"
+msgstr "S'ha cancel·lat"
+
+#: ../calendar/gui/tasktypes.xml.h:15
+msgid "In progress"
+msgstr "En procés"
+
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+msgid "is greater than"
+msgstr "és més gran que"
+
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
+msgid "is less than"
+msgstr "és més petita que"
+
+#: ../calendar/importers/icalendar-importer.c:84
+msgid "Appointments and Meetings"
+msgstr "Cites i reunions"
+
+#: ../calendar/importers/icalendar-importer.c:435
+#: ../calendar/importers/icalendar-importer.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:2170
+msgid "Opening calendar"
+msgstr "Calendari d'obertura"
+
+#: ../calendar/importers/icalendar-importer.c:583
+msgid "iCalendar files (.ics)"
+msgstr "Fitxers de l'iCalendar (.ics)"
+
+#: ../calendar/importers/icalendar-importer.c:584
+msgid "Evolution iCalendar importer"
+msgstr "Importador de l'iCalendar de l'Evolution"
+
+#: ../calendar/importers/icalendar-importer.c:674
+msgid "Reminder!"
+msgstr "Recordatori"
+
+#: ../calendar/importers/icalendar-importer.c:758
+msgid "vCalendar files (.vcs)"
+msgstr "Fitxers del vCalendar (.vcs)"
+
+#: ../calendar/importers/icalendar-importer.c:759
+msgid "Evolution vCalendar importer"
+msgstr "Importador del vCalendar de l'Evolution"
+
+#: ../calendar/importers/icalendar-importer.c:1038
+msgid "Calendar Events"
+msgstr "Esdeveniments del calendari"
+
+#: ../calendar/importers/icalendar-importer.c:1078
+msgid "Evolution Calendar intelligent importer"
+msgstr "Importador intel·ligent del calendari de l'Evolution"
+
+#: ../calendar/importers/icalendar-importer.c:1146
+#: ../calendar/importers/icalendar-importer.c:1464
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "Reunió"
+
+#: ../calendar/importers/icalendar-importer.c:1146
+#: ../calendar/importers/icalendar-importer.c:1464
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "Esdeveniment"
+
+#: ../calendar/importers/icalendar-importer.c:1149
+#: ../calendar/importers/icalendar-importer.c:1465
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "Tasca"
+
+#: ../calendar/importers/icalendar-importer.c:1152
+#: ../calendar/importers/icalendar-importer.c:1466
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "Anotació"
+
+#: ../calendar/importers/icalendar-importer.c:1161
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "té recurrències"
+
+#: ../calendar/importers/icalendar-importer.c:1166
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "és una ocurrència"
+
+#: ../calendar/importers/icalendar-importer.c:1171
+msgctxt "iCalImp"
+msgid "has reminders"
+msgstr "té recordatoris"
+
+#: ../calendar/importers/icalendar-importer.c:1176
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "té adjuncions"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:1189
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "Públic"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:1192
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "Privat"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:1195
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "Confidencial"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:1199
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "Classificació"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:1204
+#: ../calendar/importers/icalendar-importer.c:1505
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "Resum"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:1210
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "Ubicació"
+
+#. 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
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "Inici"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1229
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "Venciment"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1241
+msgctxt "iCalImp"
+msgid "End"
+msgstr "Final"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1251
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "Categories"
+
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1275
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "Completada"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1283
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "URL"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1294
+#: ../calendar/importers/icalendar-importer.c:1297
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "Organitzador"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1317
+#: ../calendar/importers/icalendar-importer.c:1320
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "Assistents"
+
+#: ../calendar/importers/icalendar-importer.c:1334
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "Descripció"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1497
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "Tipus"
+
+#.
+#. *
+#. * This program is free software; you can redistribute it and/or
+#. * modify it under the terms of the GNU Lesser General Public
+#. * License as published by the Free Software Foundation; either
+#. * version 2 of the License, or (at your option) version 3.
+#. *
+#. * This program is distributed in the hope that it will be useful,
+#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#. * Lesser General Public License for more details.
+#. *
+#. * You should have received a copy of the GNU Lesser General Public
+#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. *
+#. *
+#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+#. *
+#.
+#.
+#. * These are the timezone names from the Olson timezone data.
+#. * We only place them here so gettext picks them up for translation.
+#. * Don't include in any C files.
+#.
+#: ../calendar/zones.h:26
+msgid "Africa/Abidjan"
+msgstr "Àfrica/Abidjan"
+
+#: ../calendar/zones.h:27
+msgid "Africa/Accra"
+msgstr "Àfrica/Accra"
+
+#: ../calendar/zones.h:28
+msgid "Africa/Addis_Ababa"
+msgstr "Àfrica/Addis_Ababa"
+
+#: ../calendar/zones.h:29
+msgid "Africa/Algiers"
+msgstr "Àfrica/Algiers"
+
+#: ../calendar/zones.h:30
+msgid "Africa/Asmera"
+msgstr "Àfrica/Asmera"
+
+#: ../calendar/zones.h:31
+msgid "Africa/Bamako"
+msgstr "Àfrica/Bamako"
+
+#: ../calendar/zones.h:32
+msgid "Africa/Bangui"
+msgstr "Àfrica/Bangui"
+
+#: ../calendar/zones.h:33
+msgid "Africa/Banjul"
+msgstr "Àfrica/Banjul"
+
+#: ../calendar/zones.h:34
+msgid "Africa/Bissau"
+msgstr "Àfrica/Bissau"
+
+#: ../calendar/zones.h:35
+msgid "Africa/Blantyre"
+msgstr "Àfrica/Blantyre"
+
+#: ../calendar/zones.h:36
+msgid "Africa/Brazzaville"
+msgstr "Àfrica/Brazzaville"
+
+#: ../calendar/zones.h:37
+msgid "Africa/Bujumbura"
+msgstr "Àfrica/Bujumbura"
+
+#: ../calendar/zones.h:38
+msgid "Africa/Cairo"
+msgstr "Àfrica/Cairo"
+
+#: ../calendar/zones.h:39
+msgid "Africa/Casablanca"
+msgstr "Àfrica/Casablanca"
+
+#: ../calendar/zones.h:40
+msgid "Africa/Ceuta"
+msgstr "Àfrica/Ceuta"
+
+#: ../calendar/zones.h:41
+msgid "Africa/Conakry"
+msgstr "Àfrica/Conakry"
+
+#: ../calendar/zones.h:42
+msgid "Africa/Dakar"
+msgstr "Àfrica/Dakar"
+
+#: ../calendar/zones.h:43
+msgid "Africa/Dar_es_Salaam"
+msgstr "Àfrica/Dar_es_Salaam"
+
+#: ../calendar/zones.h:44
+msgid "Africa/Djibouti"
+msgstr "Àfrica/Djibouti"
+
+#: ../calendar/zones.h:45
+msgid "Africa/Douala"
+msgstr "Àfrica/Douala"
+
+#: ../calendar/zones.h:46
+msgid "Africa/El_Aaiun"
+msgstr "Àfrica/El_Aaiun"
+
+#: ../calendar/zones.h:47
+msgid "Africa/Freetown"
+msgstr "Àfrica/Freetown"
+
+#: ../calendar/zones.h:48
+msgid "Africa/Gaborone"
+msgstr "Àfrica/Gaborone"
+
+#: ../calendar/zones.h:49
+msgid "Africa/Harare"
+msgstr "Àfrica/Harare"
+
+#: ../calendar/zones.h:50
+msgid "Africa/Johannesburg"
+msgstr "Àfrica/Johannesburg"
+
+#: ../calendar/zones.h:51
+msgid "Africa/Kampala"
+msgstr "Àfrica/Kampala"
+
+#: ../calendar/zones.h:52
+msgid "Africa/Khartoum"
+msgstr "Àfrica/Khartoum"
+
+#: ../calendar/zones.h:53
+msgid "Africa/Kigali"
+msgstr "Àfrica/Kigali"
+
+#: ../calendar/zones.h:54
+msgid "Africa/Kinshasa"
+msgstr "Àfrica/Kinshasa"
+
+#: ../calendar/zones.h:55
+msgid "Africa/Lagos"
+msgstr "Àfrica/Lagos"
+
+#: ../calendar/zones.h:56
+msgid "Africa/Libreville"
+msgstr "Àfrica/Libreville"
+
+#: ../calendar/zones.h:57
+msgid "Africa/Lome"
+msgstr "Àfrica/Lome"
+
+#: ../calendar/zones.h:58
+msgid "Africa/Luanda"
+msgstr "Àfrica/Luanda"
+
+#: ../calendar/zones.h:59
+msgid "Africa/Lubumbashi"
+msgstr "Àfrica/Lubumbashi"
+
+#: ../calendar/zones.h:60
+msgid "Africa/Lusaka"
+msgstr "Àfrica/Lusaka"
+
+#: ../calendar/zones.h:61
+msgid "Africa/Malabo"
+msgstr "Àfrica/Malabo"
+
+#: ../calendar/zones.h:62
+msgid "Africa/Maputo"
+msgstr "Àfrica/Maputo"
+
+#: ../calendar/zones.h:63
+msgid "Africa/Maseru"
+msgstr "Àfrica/Maseru"
+
+#: ../calendar/zones.h:64
+msgid "Africa/Mbabane"
+msgstr "Àfrica/Mbabane"
+
+#: ../calendar/zones.h:65
+msgid "Africa/Mogadishu"
+msgstr "Àfrica/Mogadishu"
+
+#: ../calendar/zones.h:66
+msgid "Africa/Monrovia"
+msgstr "Àfrica/Monrovia"
+
+#: ../calendar/zones.h:67
+msgid "Africa/Nairobi"
+msgstr "Àfrica/Nairobi"
+
+#: ../calendar/zones.h:68
+msgid "Africa/Ndjamena"
+msgstr "Àfrica/Ndjamena"
+
+#: ../calendar/zones.h:69
+msgid "Africa/Niamey"
+msgstr "Àfrica/Niamey"
+
+#: ../calendar/zones.h:70
+msgid "Africa/Nouakchott"
+msgstr "Àfrica/Nouakchott"
+
+#: ../calendar/zones.h:71
+msgid "Africa/Ouagadougou"
+msgstr "Àfrica/Ouagadougou"
+
+#: ../calendar/zones.h:72
+msgid "Africa/Porto-Novo"
+msgstr "Àfrica/Porto-Novo"
+
+#: ../calendar/zones.h:73
+msgid "Africa/Sao_Tome"
+msgstr "Àfrica/Sao_Tomé"
+
+#: ../calendar/zones.h:74
+msgid "Africa/Timbuktu"
+msgstr "Àfrica/Timbuktu"
+
+#: ../calendar/zones.h:75
+msgid "Africa/Tripoli"
+msgstr "Àfrica/Trípoli"
+
+#: ../calendar/zones.h:76
+msgid "Africa/Tunis"
+msgstr "Àfrica/Tunis"
+
+#: ../calendar/zones.h:77
+msgid "Africa/Windhoek"
+msgstr "Àfrica/Windhoek"
+
+#: ../calendar/zones.h:78
+msgid "America/Adak"
+msgstr "Amèrica/Adak"
+
+#: ../calendar/zones.h:79
+msgid "America/Anchorage"
+msgstr "Amèrica/Anchorage"
+
+#: ../calendar/zones.h:80
+msgid "America/Anguilla"
+msgstr "Amèrica/Anguilla"
+
+#: ../calendar/zones.h:81
+msgid "America/Antigua"
+msgstr "Amèrica/Antigua"
+
+#: ../calendar/zones.h:82
+msgid "America/Araguaina"
+msgstr "Amèrica/Araguaina"
+
+#: ../calendar/zones.h:83
+msgid "America/Aruba"
+msgstr "Amèrica/Aruba"
+
+#: ../calendar/zones.h:84
+msgid "America/Asuncion"
+msgstr "Amèrica/Asunción"
+
+#: ../calendar/zones.h:85
+msgid "America/Barbados"
+msgstr "Amèrica/Barbados"
+
+#: ../calendar/zones.h:86
+msgid "America/Belem"
+msgstr "Amèrica/Belem"
+
+#: ../calendar/zones.h:87
+msgid "America/Belize"
+msgstr "Amèrica/Belize"
+
+#: ../calendar/zones.h:88
+msgid "America/Boa_Vista"
+msgstr "Amèrica/Boa_Vista"
+
+#: ../calendar/zones.h:89
+msgid "America/Bogota"
+msgstr "Amèrica/Bogotà"
+
+#: ../calendar/zones.h:90
+msgid "America/Boise"
+msgstr "Amèrica/Boise"
+
+#: ../calendar/zones.h:91
+msgid "America/Buenos_Aires"
+msgstr "Amèrica/Buenos_Aires"
+
+#: ../calendar/zones.h:92
+msgid "America/Cambridge_Bay"
+msgstr "Amèrica/Cambridge_Bay"
+
+#: ../calendar/zones.h:93
+msgid "America/Cancun"
+msgstr "Amèrica/Cancún"
+
+#: ../calendar/zones.h:94
+msgid "America/Caracas"
+msgstr "Amèrica/Caracas"
+
+#: ../calendar/zones.h:95
+msgid "America/Catamarca"
+msgstr "Amèrica/Catamarca"
+
+#: ../calendar/zones.h:96
+msgid "America/Cayenne"
+msgstr "Amèrica/Cayenne"
+
+#: ../calendar/zones.h:97
+msgid "America/Cayman"
+msgstr "Amèrica/Caiman"
+
+#: ../calendar/zones.h:98
+msgid "America/Chicago"
+msgstr "Amèrica/Chicago"
+
+#: ../calendar/zones.h:99
+msgid "America/Chihuahua"
+msgstr "Amèrica/Chihuahua"
+
+#: ../calendar/zones.h:100
+msgid "America/Cordoba"
+msgstr "Amèrica/Córdoba"
+
+#: ../calendar/zones.h:101
+msgid "America/Costa_Rica"
+msgstr "Amèrica/Costa_Rica"
+
+#: ../calendar/zones.h:102
+msgid "America/Cuiaba"
+msgstr "Amèrica/Cuiaba"
+
+#: ../calendar/zones.h:103
+msgid "America/Curacao"
+msgstr "Amèrica/Curacao"
+
+#: ../calendar/zones.h:104
+msgid "America/Danmarkshavn"
+msgstr "Amèrica/Danmarkshavn"
+
+#: ../calendar/zones.h:105
+msgid "America/Dawson"
+msgstr "Amèrica/Dawson"
+
+#: ../calendar/zones.h:106
+msgid "America/Dawson_Creek"
+msgstr "Amèrica/Dawson_Creek"
+
+#: ../calendar/zones.h:107
+msgid "America/Denver"
+msgstr "Amèrica/Denver"
+
+#: ../calendar/zones.h:108
+msgid "America/Detroit"
+msgstr "Amèrica/Detroit"
+
+#: ../calendar/zones.h:109
+msgid "America/Dominica"
+msgstr "Amèrica/Dominica"
+
+#: ../calendar/zones.h:110
+msgid "America/Edmonton"
+msgstr "Amèrica/Edmonton"
+
+#: ../calendar/zones.h:111
+msgid "America/Eirunepe"
+msgstr "Amèrica/Eirunepe"
+
+#: ../calendar/zones.h:112
+msgid "America/El_Salvador"
+msgstr "Amèrica/El_Salvador"
+
+#: ../calendar/zones.h:113
+msgid "America/Fortaleza"
+msgstr "Amèrica/Fortaleza"
+
+#: ../calendar/zones.h:114
+msgid "America/Glace_Bay"
+msgstr "Amèrica/Glace_Bay"
+
+#: ../calendar/zones.h:115
+msgid "America/Godthab"
+msgstr "Amèrica/Godthab"
+
+#: ../calendar/zones.h:116
+msgid "America/Goose_Bay"
+msgstr "Amèrica/Goose_Bay"
+
+#: ../calendar/zones.h:117
+msgid "America/Grand_Turk"
+msgstr "Amèrica/Grand_Turk"
+
+#: ../calendar/zones.h:118
+msgid "America/Grenada"
+msgstr "Amèrica/Grenada"
+
+#: ../calendar/zones.h:119
+msgid "America/Guadeloupe"
+msgstr "Amèrica/Guadeloupe"
+
+#: ../calendar/zones.h:120
+msgid "America/Guatemala"
+msgstr "Amèrica/Guatemala"
+
+#: ../calendar/zones.h:121
+msgid "America/Guayaquil"
+msgstr "Amèrica/Guayaquil"
+
+#: ../calendar/zones.h:122
+msgid "America/Guyana"
+msgstr "Amèrica/Guyana"
+
+#: ../calendar/zones.h:123
+msgid "America/Halifax"
+msgstr "Amèrica/Halifax"
+
+#: ../calendar/zones.h:124
+msgid "America/Havana"
+msgstr "Amèrica/L'Havana"
+
+#: ../calendar/zones.h:125
+msgid "America/Hermosillo"
+msgstr "Amèrica/Hermosillo"
+
+#: ../calendar/zones.h:126
+msgid "America/Indiana/Indianapolis"
+msgstr "Amèrica/Indiana/Indianàpolis"
+
+#: ../calendar/zones.h:127
+msgid "America/Indiana/Knox"
+msgstr "Amèrica/Indiana/Knox"
+
+#: ../calendar/zones.h:128
+msgid "America/Indiana/Marengo"
+msgstr "Amèrica/Indiana/Marengo"
+
+#: ../calendar/zones.h:129
+msgid "America/Indiana/Vevay"
+msgstr "Amèrica/Indiana/Vevay"
+
+#: ../calendar/zones.h:130
+msgid "America/Indianapolis"
+msgstr "Amèrica/Indianàpolis"
+
+#: ../calendar/zones.h:131
+msgid "America/Inuvik"
+msgstr "Amèrica/Inuvik"
+
+#: ../calendar/zones.h:132
+msgid "America/Iqaluit"
+msgstr "Amèrica/Iqaluit"
+
+#: ../calendar/zones.h:133
+msgid "America/Jamaica"
+msgstr "Amèrica/Jamaica"
+
+#: ../calendar/zones.h:134
+msgid "America/Jujuy"
+msgstr "Amèrica/Jujuy"
+
+#: ../calendar/zones.h:135
+msgid "America/Juneau"
+msgstr "Amèrica/Juneau"
+
+#: ../calendar/zones.h:136
+msgid "America/Kentucky/Louisville"
+msgstr "Amèrica/Kentucky/Louisville"
+
+#: ../calendar/zones.h:137
+msgid "America/Kentucky/Monticello"
+msgstr "Amèrica/Kentucky/Monticello"
+
+#: ../calendar/zones.h:138
+msgid "America/La_Paz"
+msgstr "Amèrica/La_Paz"
+
+#: ../calendar/zones.h:139
+msgid "America/Lima"
+msgstr "Amèrica/Lima"
+
+#: ../calendar/zones.h:140
+msgid "America/Los_Angeles"
+msgstr "Amèrica/Los_Angeles"
+
+#: ../calendar/zones.h:141
+msgid "America/Louisville"
+msgstr "Amèrica/Louisville"
+
+#: ../calendar/zones.h:142
+msgid "America/Maceio"
+msgstr "Amèrica/Maceio"
+
+#: ../calendar/zones.h:143
+msgid "America/Managua"
+msgstr "Amèrica/Managua"
+
+#: ../calendar/zones.h:144
+msgid "America/Manaus"
+msgstr "Amèrica/Manaus"
+
+#: ../calendar/zones.h:145
+msgid "America/Martinique"
+msgstr "Amèrica/Martinique"
+
+#: ../calendar/zones.h:146
+msgid "America/Mazatlan"
+msgstr "Amèrica/Mazatlan"
+
+#: ../calendar/zones.h:147
+msgid "America/Mendoza"
+msgstr "Amèrica/Mendoza"
+
+#: ../calendar/zones.h:148
+msgid "America/Menominee"
+msgstr "Amèrica/Menominee"
+
+#: ../calendar/zones.h:149
+msgid "America/Merida"
+msgstr "Amèrica/Mèrida"
+
+#: ../calendar/zones.h:150
+msgid "America/Mexico_City"
+msgstr "Amèrica/Ciutat_de_Mèxic"
+
+#: ../calendar/zones.h:151
+msgid "America/Miquelon"
+msgstr "Amèrica/Miquelon"
+
+#: ../calendar/zones.h:152
+msgid "America/Monterrey"
+msgstr "Amèrica/Monterrey"
+
+#: ../calendar/zones.h:153
+msgid "America/Montevideo"
+msgstr "Amèrica/Montevideo"
+
+#: ../calendar/zones.h:154
+msgid "America/Montreal"
+msgstr "Amèrica/Montreal"
+
+#: ../calendar/zones.h:155
+msgid "America/Montserrat"
+msgstr "Amèrica/Montserrat"
+
+#: ../calendar/zones.h:156
+msgid "America/Nassau"
+msgstr "Amèrica/Nassau"
+
+#: ../calendar/zones.h:157
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
+msgid "America/New_York"
+msgstr "Amèrica/New_York"
+
+#: ../calendar/zones.h:158
+msgid "America/Nipigon"
+msgstr "Amèrica/Nipigon"
+
+#: ../calendar/zones.h:159
+msgid "America/Nome"
+msgstr "Amèrica/Nome"
+
+#: ../calendar/zones.h:160
+msgid "America/Noronha"
+msgstr "Amèrica/Noronha"
+
+#: ../calendar/zones.h:161
+msgid "America/North_Dakota/Center"
+msgstr "Amèrica/North_Dakota/Center"
+
+#: ../calendar/zones.h:162
+msgid "America/Panama"
+msgstr "Amèrica/Panamà"
+
+#: ../calendar/zones.h:163
+msgid "America/Pangnirtung"
+msgstr "Amèrica/Pangnirtung"
+
+#: ../calendar/zones.h:164
+msgid "America/Paramaribo"
+msgstr "Amèrica/Paramaribo"
+
+#: ../calendar/zones.h:165
+msgid "America/Phoenix"
+msgstr "Amèrica/Phoenix"
+
+#: ../calendar/zones.h:166
+msgid "America/Port-au-Prince"
+msgstr "Amèrica/Port-au-Prince"
+
+#: ../calendar/zones.h:167
+msgid "America/Port_of_Spain"
+msgstr "Amèrica/Port_of_Spain"
+
+#: ../calendar/zones.h:168
+msgid "America/Porto_Velho"
+msgstr "Amèrica/Porto_Velho"
+
+#: ../calendar/zones.h:169
+msgid "America/Puerto_Rico"
+msgstr "America/Puerto_Rico"
+
+#: ../calendar/zones.h:170
+msgid "America/Rainy_River"
+msgstr "Amèrica/Rainy_River"
+
+#: ../calendar/zones.h:171
+msgid "America/Rankin_Inlet"
+msgstr "Amèrica/Rankin_Inlet"
+
+#: ../calendar/zones.h:172
+msgid "America/Recife"
+msgstr "Amèrica/Recife"
+
+#: ../calendar/zones.h:173
+msgid "America/Regina"
+msgstr "Amèrica/Regina"
+
+#: ../calendar/zones.h:174
+msgid "America/Rio_Branco"
+msgstr "Amèrica/Rio_Branco"
+
+#: ../calendar/zones.h:175
+msgid "America/Rosario"
+msgstr "Amèrica/Rosario"
+
+#: ../calendar/zones.h:176
+msgid "America/Santiago"
+msgstr "Amèrica/Santiago"
+
+#: ../calendar/zones.h:177
+msgid "America/Santo_Domingo"
+msgstr "Amèrica/Santo_Domingo"
+
+#: ../calendar/zones.h:178
+msgid "America/Sao_Paulo"
+msgstr "Amèrica/Sao_Paulo"
+
+#: ../calendar/zones.h:179
+msgid "America/Scoresbysund"
+msgstr "Amèrica/Scoresbysund"
+
+#: ../calendar/zones.h:180
+msgid "America/Shiprock"
+msgstr "Amèrica/Shiprock"
+
+#: ../calendar/zones.h:181
+msgid "America/St_Johns"
+msgstr "Amèrica/St_Johns"
+
+#: ../calendar/zones.h:182
+msgid "America/St_Kitts"
+msgstr "Amèrica/St_Kitts"
+
+#: ../calendar/zones.h:183
+msgid "America/St_Lucia"
+msgstr "Amèrica/St_Lucia"
+
+#: ../calendar/zones.h:184
+msgid "America/St_Thomas"
+msgstr "Amèrica/St_Thomas"
+
+#: ../calendar/zones.h:185
+msgid "America/St_Vincent"
+msgstr "Amèrica/St_Vincent"
+
+#: ../calendar/zones.h:186
+msgid "America/Swift_Current"
+msgstr "Amèrica/Swift_Current"
+
+#: ../calendar/zones.h:187
+msgid "America/Tegucigalpa"
+msgstr "Amèrica/Tegucigalpa"
+
+#: ../calendar/zones.h:188
+msgid "America/Thule"
+msgstr "Amèrica/Thule"
+
+#: ../calendar/zones.h:189
+msgid "America/Thunder_Bay"
+msgstr "Amèrica/Thunder_Bay"
+
+#: ../calendar/zones.h:190
+msgid "America/Tijuana"
+msgstr "Amèrica/Tijuana"
+
+#: ../calendar/zones.h:191
+msgid "America/Tortola"
+msgstr "Amèrica/Tortola"
+
+#: ../calendar/zones.h:192
+msgid "America/Vancouver"
+msgstr "Amèrica/Vancouver"
+
+#: ../calendar/zones.h:193
+msgid "America/Whitehorse"
+msgstr "Amèrica/Whitehorse"
+
+#: ../calendar/zones.h:194
+msgid "America/Winnipeg"
+msgstr "Amèric/Winnipeg"
+
+#: ../calendar/zones.h:195
+msgid "America/Yakutat"
+msgstr "Amèrica/Yakutat"
+
+#: ../calendar/zones.h:196
+msgid "America/Yellowknife"
+msgstr "Amèrica/Yellowknife"
+
+#: ../calendar/zones.h:197
+msgid "Antarctica/Casey"
+msgstr "Antàrtida/Casey"
+
+#: ../calendar/zones.h:198
+msgid "Antarctica/Davis"
+msgstr "Antàrtida/Davis"
+
+#: ../calendar/zones.h:199
+msgid "Antarctica/DumontDUrville"
+msgstr "Antàrtida/DumontDUrville"
+
+#: ../calendar/zones.h:200
+msgid "Antarctica/Mawson"
+msgstr "Antàrtida/Mawson"
+
+#: ../calendar/zones.h:201
+msgid "Antarctica/McMurdo"
+msgstr "Antàrtida/McMurdo"
+
+#: ../calendar/zones.h:202
+msgid "Antarctica/Palmer"
+msgstr "Antàrtida/Palmer"
+
+#: ../calendar/zones.h:203
+msgid "Antarctica/South_Pole"
+msgstr "Antàrtida/Pol_Sud"
+
+#: ../calendar/zones.h:204
+msgid "Antarctica/Syowa"
+msgstr "Antàrtida/Syowa"
+
+#: ../calendar/zones.h:205
+msgid "Antarctica/Vostok"
+msgstr "Antàrtida/Vostok"
+
+#: ../calendar/zones.h:206
+msgid "Arctic/Longyearbyen"
+msgstr "Àrtic/Longyearbyen"
+
+#: ../calendar/zones.h:207
+msgid "Asia/Aden"
+msgstr "Àsia/Aden"
+
+#: ../calendar/zones.h:208
+msgid "Asia/Almaty"
+msgstr "Àsia/Almaty"
+
+#: ../calendar/zones.h:209
+msgid "Asia/Amman"
+msgstr "Àsia/Amman"
+
+#: ../calendar/zones.h:210
+msgid "Asia/Anadyr"
+msgstr "Àsia/Anadyr"
+
+#: ../calendar/zones.h:211
+msgid "Asia/Aqtau"
+msgstr "Àsia/Aqtau"
+
+#: ../calendar/zones.h:212
+msgid "Asia/Aqtobe"
+msgstr "Àsia/Aqtobe"
+
+#: ../calendar/zones.h:213
+msgid "Asia/Ashgabat"
+msgstr "Àsia/Ashgabat"
+
+#: ../calendar/zones.h:214
+msgid "Asia/Baghdad"
+msgstr "Àsia/Bagdad"
+
+#: ../calendar/zones.h:215
+msgid "Asia/Bahrain"
+msgstr "Àsia/Bahrain"
+
+#: ../calendar/zones.h:216
+msgid "Asia/Baku"
+msgstr "Àsia/Baku"
+
+#: ../calendar/zones.h:217
+msgid "Asia/Bangkok"
+msgstr "Àsia/Bangkok"
+
+#: ../calendar/zones.h:218
+msgid "Asia/Beirut"
+msgstr "Àsia/Beirut"
+
+#: ../calendar/zones.h:219
+msgid "Asia/Bishkek"
+msgstr "Àsia/Bishkek"
+
+#: ../calendar/zones.h:220
+msgid "Asia/Brunei"
+msgstr "Àsia/Brunei"
+
+#: ../calendar/zones.h:221
+msgid "Asia/Calcutta"
+msgstr "Àsia/Calcuta"
+
+#: ../calendar/zones.h:222
+msgid "Asia/Choibalsan"
+msgstr "Àsia/Choibalsan"
+
+#: ../calendar/zones.h:223
+msgid "Asia/Chongqing"
+msgstr "Àsia/Chongqing"
+
+#: ../calendar/zones.h:224
+msgid "Asia/Colombo"
+msgstr "Àsia/Colombo"
+
+#: ../calendar/zones.h:225
+msgid "Asia/Damascus"
+msgstr "Àsia/Damascus"
+
+#: ../calendar/zones.h:226
+msgid "Asia/Dhaka"
+msgstr "Àsia/Dhaka"
+
+#: ../calendar/zones.h:227
+msgid "Asia/Dili"
+msgstr "Àsia/Dili"
+
+#: ../calendar/zones.h:228
+msgid "Asia/Dubai"
+msgstr "Àsia/Dubai"
+
+#: ../calendar/zones.h:229
+msgid "Asia/Dushanbe"
+msgstr "Àsia/Dushanbe"
+
+#: ../calendar/zones.h:230
+msgid "Asia/Gaza"
+msgstr "Àsia/Gaza"
+
+#: ../calendar/zones.h:231
+msgid "Asia/Harbin"
+msgstr "Àsia/Harbin"
+
+#: ../calendar/zones.h:232
+msgid "Asia/Hong_Kong"
+msgstr "Àsia/Hong_Kong"
+
+#: ../calendar/zones.h:233
+msgid "Asia/Hovd"
+msgstr "Àsia/Hovd"
+
+#: ../calendar/zones.h:234
+msgid "Asia/Irkutsk"
+msgstr "Àsia/Irkutsk"
+
+#: ../calendar/zones.h:235
+msgid "Asia/Istanbul"
+msgstr "Àsia/Istanbul"
+
+#: ../calendar/zones.h:236
+msgid "Asia/Jakarta"
+msgstr "Àsia/Jakarta"
+
+#: ../calendar/zones.h:237
+msgid "Asia/Jayapura"
+msgstr "Àsia/Jayapura"
+
+#: ../calendar/zones.h:238
+msgid "Asia/Jerusalem"
+msgstr "Àsia/Jerusalem"
+
+#: ../calendar/zones.h:239
+msgid "Asia/Kabul"
+msgstr "Àsia/Kabul"
+
+#: ../calendar/zones.h:240
+msgid "Asia/Kamchatka"
+msgstr "Àsia/Kamchatka"
+
+#: ../calendar/zones.h:241
+msgid "Asia/Karachi"
+msgstr "Àsia/Karachi"
+
+#: ../calendar/zones.h:242
+msgid "Asia/Kashgar"
+msgstr "Àsia/Kashgar"
+
+#: ../calendar/zones.h:243
+msgid "Asia/Katmandu"
+msgstr "Àsia/Katmandu"
+
+#: ../calendar/zones.h:244
+msgid "Asia/Krasnoyarsk"
+msgstr "Àsia/Krasnojarsk"
+
+#: ../calendar/zones.h:245
+msgid "Asia/Kuala_Lumpur"
+msgstr "Àsia/Kuala_Lumpur"
+
+#: ../calendar/zones.h:246
+msgid "Asia/Kuching"
+msgstr "Àsia/Kuching"
+
+#: ../calendar/zones.h:247
+msgid "Asia/Kuwait"
+msgstr "Àsia/Kuwait"
+
+#: ../calendar/zones.h:248
+msgid "Asia/Macao"
+msgstr "Àsia/Macao"
+
+#: ../calendar/zones.h:249
+msgid "Asia/Macau"
+msgstr "Àsia/Macau"
+
+#: ../calendar/zones.h:250
+msgid "Asia/Magadan"
+msgstr "Àsia/Magadan"
+
+#: ../calendar/zones.h:251
+msgid "Asia/Makassar"
+msgstr "Àsia/Makassar"
+
+#: ../calendar/zones.h:252
+msgid "Asia/Manila"
+msgstr "Àsia/Manila"
+
+#: ../calendar/zones.h:253
+msgid "Asia/Muscat"
+msgstr "Àsia/Muscat"
+
+#: ../calendar/zones.h:254
+msgid "Asia/Nicosia"
+msgstr "Àsia/Nicòsia"
+
+#: ../calendar/zones.h:255
+msgid "Asia/Novosibirsk"
+msgstr "Àsia/Novosibrisk"
+
+#: ../calendar/zones.h:256
+msgid "Asia/Omsk"
+msgstr "Àsia/Omsk"
+
+#: ../calendar/zones.h:257
+msgid "Asia/Oral"
+msgstr "Àsia/Oral"
+
+#: ../calendar/zones.h:258
+msgid "Asia/Phnom_Penh"
+msgstr "Àsia/Phnom_Penh"
+
+#: ../calendar/zones.h:259
+msgid "Asia/Pontianak"
+msgstr "Àsia/Pontianak"
+
+#: ../calendar/zones.h:260
+msgid "Asia/Pyongyang"
+msgstr "Àsia/Pyongyang"
+
+#: ../calendar/zones.h:261
+msgid "Asia/Qatar"
+msgstr "Àsia/Qatar"
+
+#: ../calendar/zones.h:262
+msgid "Asia/Qyzylorda"
+msgstr "Àsia/Qyzylorda"
+
+#: ../calendar/zones.h:263
+msgid "Asia/Rangoon"
+msgstr "Àsia/Rangoon"
+
+#: ../calendar/zones.h:264
+msgid "Asia/Riyadh"
+msgstr "Àsia/Riyadh"
+
+#: ../calendar/zones.h:265
+msgid "Asia/Saigon"
+msgstr "Àsia/Saigon"
+
+#: ../calendar/zones.h:266
+msgid "Asia/Sakhalin"
+msgstr "Àsia/Sakhalin"
+
+#: ../calendar/zones.h:267
+msgid "Asia/Samarkand"
+msgstr "Àsia/Samarcanda"
+
+#: ../calendar/zones.h:268
+msgid "Asia/Seoul"
+msgstr "Àsia/Seül"
+
+#: ../calendar/zones.h:269
+msgid "Asia/Shanghai"
+msgstr "Àsia/Shangai"
+
+#: ../calendar/zones.h:270
+msgid "Asia/Singapore"
+msgstr "Àsia/Singapur"
+
+#: ../calendar/zones.h:271
+msgid "Asia/Taipei"
+msgstr "Àsia/Taipei"
+
+#: ../calendar/zones.h:272
+msgid "Asia/Tashkent"
+msgstr "Àsia/Tashkent"
+
+#: ../calendar/zones.h:273
+msgid "Asia/Tbilisi"
+msgstr "Àsia/Tbilisi"
+
+#: ../calendar/zones.h:274
+msgid "Asia/Tehran"
+msgstr "Àsia/Teheran"
+
+#: ../calendar/zones.h:275
+msgid "Asia/Thimphu"
+msgstr "Àsia/Thimphu"
+
+#: ../calendar/zones.h:276
+msgid "Asia/Tokyo"
+msgstr "Àsia/Tòquio"
+
+#: ../calendar/zones.h:277
+msgid "Asia/Ujung_Pandang"
+msgstr "Àsia/Ujung_Pandang"
+
+#: ../calendar/zones.h:278
+msgid "Asia/Ulaanbaatar"
+msgstr "Àsia/Ulaanbaatar"
+
+#: ../calendar/zones.h:279
+msgid "Asia/Urumqi"
+msgstr "Àsia/Urumqi"
+
+#: ../calendar/zones.h:280
+msgid "Asia/Vientiane"
+msgstr "Àsia/Vientiane"
+
+#: ../calendar/zones.h:281
+msgid "Asia/Vladivostok"
+msgstr "Àsia/Vladivostok"
+
+#: ../calendar/zones.h:282
+msgid "Asia/Yakutsk"
+msgstr "Àsia/Yakutsk"
+
+#: ../calendar/zones.h:283
+msgid "Asia/Yekaterinburg"
+msgstr "Àsia/Yekaterinburg"
+
+#: ../calendar/zones.h:284
+msgid "Asia/Yerevan"
+msgstr "Àsia/Yerevan"
+
+#: ../calendar/zones.h:285
+msgid "Atlantic/Azores"
+msgstr "Atlàntic/Azores"
+
+#: ../calendar/zones.h:286
+msgid "Atlantic/Bermuda"
+msgstr "Atlàntic/Bermuda"
+
+#: ../calendar/zones.h:287
+msgid "Atlantic/Canary"
+msgstr "Atlàntic/Canàries"
+
+#: ../calendar/zones.h:288
+msgid "Atlantic/Cape_Verde"
+msgstr "Atlàntic/Cap_Verde"
+
+#: ../calendar/zones.h:289
+msgid "Atlantic/Faeroe"
+msgstr "Atlàntic/Faeroe"
+
+#: ../calendar/zones.h:290
+msgid "Atlantic/Jan_Mayen"
+msgstr "Atlàntic/Jan_Mayen"
+
+#: ../calendar/zones.h:291
+msgid "Atlantic/Madeira"
+msgstr "Atlàntic/Madeira"
+
+#: ../calendar/zones.h:292
+msgid "Atlantic/Reykjavik"
+msgstr "Atlàntic/Reykjavik"
+
+#: ../calendar/zones.h:293
+msgid "Atlantic/South_Georgia"
+msgstr "Atlàntic/South_Georgia"
+
+#: ../calendar/zones.h:294
+msgid "Atlantic/St_Helena"
+msgstr "Atlàntic/St_Helena"
+
+#: ../calendar/zones.h:295
+msgid "Atlantic/Stanley"
+msgstr "Atlàntic/Stanley"
+
+#: ../calendar/zones.h:296
+msgid "Australia/Adelaide"
+msgstr "Austràlia/Adelaida"
+
+#: ../calendar/zones.h:297
+msgid "Australia/Brisbane"
+msgstr "Austràlia/Brisbane"
+
+#: ../calendar/zones.h:298
+msgid "Australia/Broken_Hill"
+msgstr "Austràlia/Broken_Hill"
+
+#: ../calendar/zones.h:299
+msgid "Australia/Darwin"
+msgstr "Austràlia/Darwin"
+
+#: ../calendar/zones.h:300
+msgid "Australia/Hobart"
+msgstr "Austràlia/Hobart"
+
+#: ../calendar/zones.h:301
+msgid "Australia/Lindeman"
+msgstr "Austràlia/Lindeman"
+
+#: ../calendar/zones.h:302
+msgid "Australia/Lord_Howe"
+msgstr "Austràlia/Lord_Howe"
+
+#: ../calendar/zones.h:303
+msgid "Australia/Melbourne"
+msgstr "Austràlia/Melbourne"
+
+#: ../calendar/zones.h:304
+msgid "Australia/Perth"
+msgstr "Austràlia/Perth"
+
+#: ../calendar/zones.h:305
+msgid "Australia/Sydney"
+msgstr "Austràlia/Sidney"
+
+#: ../calendar/zones.h:306
+msgid "Europe/Amsterdam"
+msgstr "Europa/Àmsterdam"
+
+#: ../calendar/zones.h:307
+msgid "Europe/Andorra"
+msgstr "Europa/Andorra"
+
+#: ../calendar/zones.h:308
+msgid "Europe/Athens"
+msgstr "Europa/Atenes"
+
+#: ../calendar/zones.h:309
+msgid "Europe/Belfast"
+msgstr "Europa/Belfast"
+
+#: ../calendar/zones.h:310
+msgid "Europe/Belgrade"
+msgstr "Europa/Belgrad"
+
+#: ../calendar/zones.h:311
+msgid "Europe/Berlin"
+msgstr "Europa/Berlín"
+
+#: ../calendar/zones.h:312
+msgid "Europe/Bratislava"
+msgstr "Europa/Bratislava"
+
+#: ../calendar/zones.h:313
+msgid "Europe/Brussels"
+msgstr "Europa/Brussel·les"
+
+#: ../calendar/zones.h:314
+msgid "Europe/Bucharest"
+msgstr "Europa/Bucarest"
+
+#: ../calendar/zones.h:315
+msgid "Europe/Budapest"
+msgstr "Europa/Budapest"
+
+#: ../calendar/zones.h:316
+msgid "Europe/Chisinau"
+msgstr "Europa/Chisinau"
+
+#: ../calendar/zones.h:317
+msgid "Europe/Copenhagen"
+msgstr "Europa/Copenhagen"
+
+#: ../calendar/zones.h:318
+msgid "Europe/Dublin"
+msgstr "Europa/Dublín"
+
+#: ../calendar/zones.h:319
+msgid "Europe/Gibraltar"
+msgstr "Europa/Gibraltar"
+
+#: ../calendar/zones.h:320
+msgid "Europe/Helsinki"
+msgstr "Europa/Helsinki"
+
+#: ../calendar/zones.h:321
+msgid "Europe/Istanbul"
+msgstr "Europa/Istanbul"
+
+#: ../calendar/zones.h:322
+msgid "Europe/Kaliningrad"
+msgstr "Europa/Kaliningrad"
+
+#: ../calendar/zones.h:323
+msgid "Europe/Kiev"
+msgstr "Europa/Kiev"
+
+#: ../calendar/zones.h:324
+msgid "Europe/Lisbon"
+msgstr "Europa/Lisbon"
+
+#: ../calendar/zones.h:325
+msgid "Europe/Ljubljana"
+msgstr "Europa/Ljubljana"
+
+#: ../calendar/zones.h:326
+msgid "Europe/London"
+msgstr "Europa/Londres"
+
+#: ../calendar/zones.h:327
+msgid "Europe/Luxembourg"
+msgstr "Europa/Luxemburg"
+
+#: ../calendar/zones.h:328
+msgid "Europe/Madrid"
+msgstr "Europa/Madrid"
+
+#: ../calendar/zones.h:329
+msgid "Europe/Malta"
+msgstr "Europa/Malta"
+
+#: ../calendar/zones.h:330
+msgid "Europe/Minsk"
+msgstr "Europa/Minsk"
+
+#: ../calendar/zones.h:331
+msgid "Europe/Monaco"
+msgstr "Europa/Mònaco"
+
+#: ../calendar/zones.h:332
+msgid "Europe/Moscow"
+msgstr "Europa/Moscou"
+
+#: ../calendar/zones.h:333
+msgid "Europe/Nicosia"
+msgstr "Europa/Nicosia"
+
+#: ../calendar/zones.h:334
+msgid "Europe/Oslo"
+msgstr "Europa/Oslo"
+
+#: ../calendar/zones.h:335
+msgid "Europe/Paris"
+msgstr "Europa/París"
+
+#: ../calendar/zones.h:336
+msgid "Europe/Prague"
+msgstr "Europa/Praga"
+
+#: ../calendar/zones.h:337
+msgid "Europe/Riga"
+msgstr "Europa/Riga"
+
+#: ../calendar/zones.h:338
+msgid "Europe/Rome"
+msgstr "Europa/Roma"
+
+#: ../calendar/zones.h:339
+msgid "Europe/Samara"
+msgstr "Europa/Samara"
+
+#: ../calendar/zones.h:340
+msgid "Europe/San_Marino"
+msgstr "Europa/San_Marino"
+
+#: ../calendar/zones.h:341
+msgid "Europe/Sarajevo"
+msgstr "Europa/Sarajevo"
+
+#: ../calendar/zones.h:342
+msgid "Europe/Simferopol"
+msgstr "Europa/Simferopol"
+
+#: ../calendar/zones.h:343
+msgid "Europe/Skopje"
+msgstr "Europa/Skopje"
+
+#: ../calendar/zones.h:344
+msgid "Europe/Sofia"
+msgstr "Europa/Sofia"
+
+#: ../calendar/zones.h:345
+msgid "Europe/Stockholm"
+msgstr "Europa/Estocolm"
+
+#: ../calendar/zones.h:346
+msgid "Europe/Tallinn"
+msgstr "Europa/Tallin"
+
+#: ../calendar/zones.h:347
+msgid "Europe/Tirane"
+msgstr "Europa/Tirana"
+
+#: ../calendar/zones.h:348
+msgid "Europe/Uzhgorod"
+msgstr "Europa/Uzhgorod"
+
+#: ../calendar/zones.h:349
+msgid "Europe/Vaduz"
+msgstr "Europa/Vaduz"
+
+#: ../calendar/zones.h:350
+msgid "Europe/Vatican"
+msgstr "Europa/Vaticà"
+
+#: ../calendar/zones.h:351
+msgid "Europe/Vienna"
+msgstr "Europa/Viena"
+
+#: ../calendar/zones.h:352
+msgid "Europe/Vilnius"
+msgstr "Europa/Vilnius"
+
+#: ../calendar/zones.h:353
+msgid "Europe/Warsaw"
+msgstr "Europa/Warsaw"
+
+#: ../calendar/zones.h:354
+msgid "Europe/Zagreb"
+msgstr "Europa/Zagreb"
+
+#: ../calendar/zones.h:355
+msgid "Europe/Zaporozhye"
+msgstr "Europa/Zaporozhye"
+
+#: ../calendar/zones.h:356
+msgid "Europe/Zurich"
+msgstr "Europa/Zuric"
+
+#: ../calendar/zones.h:357
+msgid "Indian/Antananarivo"
+msgstr "�ndic/Antananarivo"
+
+#: ../calendar/zones.h:358
+msgid "Indian/Chagos"
+msgstr "�ndic/Chagos"
+
+#: ../calendar/zones.h:359
+msgid "Indian/Christmas"
+msgstr "�ndic/Christmas"
+
+#: ../calendar/zones.h:360
+msgid "Indian/Cocos"
+msgstr "�ndic/Cocos"
+
+#: ../calendar/zones.h:361
+msgid "Indian/Comoro"
+msgstr "�ndic/Comores"
+
+#: ../calendar/zones.h:362
+msgid "Indian/Kerguelen"
+msgstr "�ndic/Kerguelen"
+
+#: ../calendar/zones.h:363
+msgid "Indian/Mahe"
+msgstr "�ndic/Mahe"
+
+#: ../calendar/zones.h:364
+msgid "Indian/Maldives"
+msgstr "�ndic/Maldives"
+
+#: ../calendar/zones.h:365
+msgid "Indian/Mauritius"
+msgstr "�ndic/Maurici"
+
+#: ../calendar/zones.h:366
+msgid "Indian/Mayotte"
+msgstr "�ndic/Mayotte"
+
+#: ../calendar/zones.h:367
+msgid "Indian/Reunion"
+msgstr "�ndic/Reunion"
+
+#: ../calendar/zones.h:368
+msgid "Pacific/Apia"
+msgstr "Pacífic/Apia"
+
+#: ../calendar/zones.h:369
+msgid "Pacific/Auckland"
+msgstr "Pacífic/Auckland"
+
+#: ../calendar/zones.h:370
+msgid "Pacific/Chatham"
+msgstr "Pacífic/Chatham"
+
+#: ../calendar/zones.h:371
+msgid "Pacific/Easter"
+msgstr "Pacífic/Easter"
+
+#: ../calendar/zones.h:372
+msgid "Pacific/Efate"
+msgstr "Pacífic/Efate"
+
+#: ../calendar/zones.h:373
+msgid "Pacific/Enderbury"
+msgstr "Pacífic/Enderbury"
+
+#: ../calendar/zones.h:374
+msgid "Pacific/Fakaofo"
+msgstr "Pacífic/Fakaofo"
+
+#: ../calendar/zones.h:375
+msgid "Pacific/Fiji"
+msgstr "Pacífic/Fiji"
+
+#: ../calendar/zones.h:376
+msgid "Pacific/Funafuti"
+msgstr "Pacífic/Funafuti"
+
+#: ../calendar/zones.h:377
+msgid "Pacific/Galapagos"
+msgstr "Pacífic/Galapagos"
+
+#: ../calendar/zones.h:378
+msgid "Pacific/Gambier"
+msgstr "Pacífic/Gambier"
+
+#: ../calendar/zones.h:379
+msgid "Pacific/Guadalcanal"
+msgstr "Pacífic/Guadalcanal"
+
+#: ../calendar/zones.h:380
+msgid "Pacific/Guam"
+msgstr "Pacífic/Guam"
+
+#: ../calendar/zones.h:381
+msgid "Pacific/Honolulu"
+msgstr "Pacífic/Honolulu"
+
+#: ../calendar/zones.h:382
+msgid "Pacific/Johnston"
+msgstr "Pacífic/Johnston"
+
+#: ../calendar/zones.h:383
+msgid "Pacific/Kiritimati"
+msgstr "Pacífic/Kiritimati"
+
+#: ../calendar/zones.h:384
+msgid "Pacific/Kosrae"
+msgstr "Pacífic/Kosrae"
+
+#: ../calendar/zones.h:385
+msgid "Pacific/Kwajalein"
+msgstr "Pacífic/Kwajalein"
+
+#: ../calendar/zones.h:386
+msgid "Pacific/Majuro"
+msgstr "Pacífic/Majuro"
+
+#: ../calendar/zones.h:387
+msgid "Pacific/Marquesas"
+msgstr "Pacífic/Marqueses"
+
+#: ../calendar/zones.h:388
+msgid "Pacific/Midway"
+msgstr "Pacífic/Midway"
+
+#: ../calendar/zones.h:389
+msgid "Pacific/Nauru"
+msgstr "Pacífic/Nauru"
+
+#: ../calendar/zones.h:390
+msgid "Pacific/Niue"
+msgstr "Pacífic/Niue"
+
+#: ../calendar/zones.h:391
+msgid "Pacific/Norfolk"
+msgstr "Pacífic/Norfolk"
+
+#: ../calendar/zones.h:392
+msgid "Pacific/Noumea"
+msgstr "Pacífic/Noumea"
+
+#: ../calendar/zones.h:393
+msgid "Pacific/Pago_Pago"
+msgstr "Pacífic/Pago_Pago"
+
+#: ../calendar/zones.h:394
+msgid "Pacific/Palau"
+msgstr "Pacífic/Palau"
+
+#: ../calendar/zones.h:395
+msgid "Pacific/Pitcairn"
+msgstr "Pacífic/Pitcairn"
+
+#: ../calendar/zones.h:396
+msgid "Pacific/Ponape"
+msgstr "Pacífic/Ponape"
+
+#: ../calendar/zones.h:397
+msgid "Pacific/Port_Moresby"
+msgstr "Pacífic/Port_Moresby"
+
+#: ../calendar/zones.h:398
+msgid "Pacific/Rarotonga"
+msgstr "Pacífic/Rarotonga"
+
+#: ../calendar/zones.h:399
+msgid "Pacific/Saipan"
+msgstr "Pacífic/Saipan"
+
+#: ../calendar/zones.h:400
+msgid "Pacific/Tahiti"
+msgstr "Pacífic/Tahití"
+
+#: ../calendar/zones.h:401
+msgid "Pacific/Tarawa"
+msgstr "Pacífic/Tarawa"
+
+#: ../calendar/zones.h:402
+msgid "Pacific/Tongatapu"
+msgstr "Pacífic/Tongatapu"
+
+#: ../calendar/zones.h:403
+msgid "Pacific/Truk"
+msgstr "Pacífic/Truk"
+
+#: ../calendar/zones.h:404
+msgid "Pacific/Wake"
+msgstr "Pacífic/Wake"
+
+#: ../calendar/zones.h:405
+msgid "Pacific/Wallis"
+msgstr "Pacífic/Wallis"
+
+#: ../calendar/zones.h:406
+msgid "Pacific/Yap"
+msgstr "Pacífic/Yap"
+
+#: ../composer/e-composer-actions.c:208
+msgid "Save as..."
+msgstr "Anomena i alça..."
+
+#: ../composer/e-composer-actions.c:296
+#: ../widgets/misc/e-signature-editor.c:207
+msgid "_Close"
+msgstr "Tan_ca"
+
+#: ../composer/e-composer-actions.c:298
+msgid "Close the current file"
+msgstr "Tanca el fitxer actual"
+
+#: ../composer/e-composer-actions.c:303
+msgid "New _Message"
+msgstr "_Missatge nou"
+
+#: ../composer/e-composer-actions.c:305
+msgid "Open New Message window"
+msgstr "Obri una finestra de missatge nou"
+
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
+msgid "Configure Evolution"
+msgstr "Configura l'Evolution"
+
+#: ../composer/e-composer-actions.c:319
+msgid "Save the current file"
+msgstr "Alça el fitxer actual"
+
+#: ../composer/e-composer-actions.c:324
+msgid "Save _As..."
+msgstr "_Anomena i alça..."
+
+#: ../composer/e-composer-actions.c:326
+msgid "Save the current file with a different name"
+msgstr "Alça el fitxer actual amb un nom diferent"
+
+#: ../composer/e-composer-actions.c:333
+msgid "Character _Encoding"
+msgstr "_Codificació dels caràcters"
+
+#: ../composer/e-composer-actions.c:350
+msgid "_Print..."
+msgstr "Im_primeix..."
+
+#: ../composer/e-composer-actions.c:357
+msgid "Print Pre_view"
+msgstr "Pre_visualització d'impressió"
+
+#: ../composer/e-composer-actions.c:364
+msgid "Save as _Draft"
+msgstr "Alça com a _esborrany"
+
+#: ../composer/e-composer-actions.c:366
+msgid "Save as draft"
+msgstr "Alça com a esborrany"
+
+#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
+msgid "S_end"
+msgstr "E_nvia"
+
+#: ../composer/e-composer-actions.c:373
+msgid "Send this message"
+msgstr "Envia este missatge"
+
+#: ../composer/e-composer-actions.c:381
+msgid "PGP _Encrypt"
+msgstr "_Xifra amb PGP"
+
+#: ../composer/e-composer-actions.c:383
+msgid "Encrypt this message with PGP"
+msgstr "Xifra este missatge amb el PGP"
+
+#: ../composer/e-composer-actions.c:389
+msgid "PGP _Sign"
+msgstr "_Signa amb PGP"
+
+#: ../composer/e-composer-actions.c:391
+msgid "Sign this message with your PGP key"
+msgstr "Signa este missatge amb la vostra clau PGP"
+
+#: ../composer/e-composer-actions.c:397
+msgid "_Picture Gallery"
+msgstr "Galeria d'_imatges"
+
+#: ../composer/e-composer-actions.c:399
+msgid "Show a collection of pictures that you can drag to your message"
+msgstr ""
+"Mostra una coŀlecció d'imatges que podreu arrossegar i deixar anar en un "
+"missatge"
+
+#: ../composer/e-composer-actions.c:405
+msgid "_Prioritize Message"
+msgstr "_Prioritza el missatge"
+
+#: ../composer/e-composer-actions.c:407
+msgid "Set the message priority to high"
+msgstr "Estableix el missatge a prioritat alta"
+
+#: ../composer/e-composer-actions.c:413
+msgid "Re_quest Read Receipt"
+msgstr "Sol·licita la confirmació de l_ectura"
+
+#: ../composer/e-composer-actions.c:415
+msgid "Get delivery notification when your message is read"
+msgstr "Obteniu una notificació d'entrega quan es llija el missatge"
+
+#: ../composer/e-composer-actions.c:421
+msgid "S/MIME En_crypt"
+msgstr "Xi_fra amb S/MIME"
+
+#: ../composer/e-composer-actions.c:423
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "Xifra este missatge amb el vostre certificat de xifratge S/MIME"
+
+#: ../composer/e-composer-actions.c:429
+msgid "S/MIME Sig_n"
+msgstr "Si_gna amb S/MIME"
+
+#: ../composer/e-composer-actions.c:431
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Signa este missatge amb el vostre certificat de signatures S/MIME"
+
+#: ../composer/e-composer-actions.c:437
+msgid "_Bcc Field"
+msgstr "Camp _CCO"
+
+#: ../composer/e-composer-actions.c:439
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Commuta la visualització del camp «CCO»"
+
+#: ../composer/e-composer-actions.c:445
+msgid "_Cc Field"
+msgstr "Camp _CC"
+
+#: ../composer/e-composer-actions.c:447
+msgid "Toggles whether the CC field is displayed"
+msgstr "Commuta la visualització del camp «CC»"
+
+#: ../composer/e-composer-actions.c:453
+msgid "_Reply-To Field"
+msgstr "Camp _Respon-a"
+
+#: ../composer/e-composer-actions.c:455
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Commuta la visualització del camp «Respon-a»"
+
+#: ../composer/e-composer-actions.c:514
+msgid "Save Draft"
+msgstr "Alça l'esborrany"
+
+#: ../composer/e-composer-header-table.c:40
+msgid "Enter the recipients of the message"
+msgstr "Introduïu els destinataris del missatge"
+
+#: ../composer/e-composer-header-table.c:42
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Introduïu les adreces que rebran una còpia del missatge"
+
+#: ../composer/e-composer-header-table.c:45
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message"
+msgstr ""
+"Introduïu les adreces que rebran una còpia del missatge sense aparèixer a la "
+"llista de destinataris del missatge"
+
+#: ../composer/e-composer-header-table.c:1021
+msgid "Fr_om:"
+msgstr "D_e:"
+
+#: ../composer/e-composer-header-table.c:1030
+msgid "_Reply-To:"
+msgstr "_Respon a:"
+
+#: ../composer/e-composer-header-table.c:1034
+msgid "_To:"
+msgstr "_Per a:"
+
+#: ../composer/e-composer-header-table.c:1039
+msgid "_Cc:"
+msgstr "_CC:"
+
+#: ../composer/e-composer-header-table.c:1044
+msgid "_Bcc:"
+msgstr "CC_O:"
+
+#: ../composer/e-composer-header-table.c:1049
+msgid "_Post To:"
+msgstr "_Envia a:"
+
+#: ../composer/e-composer-header-table.c:1053
+msgid "S_ubject:"
+msgstr "Ass_umpte:"
+
+#: ../composer/e-composer-header-table.c:1062
+msgid "Si_gnature:"
+msgstr "Si_gnatura:"
+
+#: ../composer/e-composer-name-header.c:141
+msgid "Click here for the address book"
+msgstr "Feu clic ací per anar a la llibreta d'adreces"
+
+#: ../composer/e-composer-post-header.c:131
+msgid "Click here to select folders to post to"
+msgstr "Feu clic per seleccionar les carpetes on enviar"
+
+#: ../composer/e-composer-private.c:249
+msgid "Undo the last action"
+msgstr "Desfés l'última acció"
+
+#: ../composer/e-composer-private.c:253
+msgid "Redo the last undone action"
+msgstr "Refés l'última acció desfeta"
+
+#: ../composer/e-composer-private.c:257
+msgid "Search for text"
+msgstr "Cerca text"
+
+#: ../composer/e-composer-private.c:261
+msgid "Search for and replace text"
+msgstr "Cerca i reemplaça text"
+
+#: ../composer/e-composer-private.c:372
+msgid "Save draft"
+msgstr "Alça l'esborrany"
+
+#: ../composer/e-msg-composer.c:812
+#, c-format
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"No s'ha pogut signar el missatge d'eixida: no s'ha definit cap certificat de "
+"signatura per a este compte"
+
+#: ../composer/e-msg-composer.c:821
+#, c-format
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"No s'ha pogut xifrar el missatge d'eixida: no s'ha definit cap certificat de "
+"xifratge per a este compte"
+
+#: ../composer/e-msg-composer.c:1699 ../composer/e-msg-composer.c:2083
+msgid "Compose Message"
+msgstr "Redacta un missatge"
+
+#: ../composer/e-msg-composer.c:4228
+msgid "The composer contains a non-text message body, which cannot be edited."
+msgstr ""
+"El redactor conté un cos de missatge que no està format per text i no es pot "
+"editar."
+
+#: ../composer/e-msg-composer.c:4933
+msgid "Untitled Message"
+msgstr "Missatges sense títol"
+
+#: ../composer/mail-composer.error.xml.h:1
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr ""
+" S'estan baixant alguns fitxers adjunts. En enviar el correu, s'enviarà "
+"sense els fitxers adjunts pendents "
+
+#: ../composer/mail-composer.error.xml.h:2
+msgid "All accounts have been removed."
+msgstr "S'han suprimit tots els comptes."
+
+#: ../composer/mail-composer.error.xml.h:3
+msgid "An error occurred while saving to your Drafts folder."
+msgstr "S'ha produït un error en alçar a la carpeta d'esborranys."
+
+#: ../composer/mail-composer.error.xml.h:4
+msgid "An error occurred while saving to your Outbox folder."
+msgstr "S'ha produït un error en alçar a la safata d'eixida."
+
+#: ../composer/mail-composer.error.xml.h:5
+msgid "An error occurred while sending. How do you want to proceed?"
+msgstr "S'ha produït un error en l'enviament. Què voleu fer a continuació?"
+
+#: ../composer/mail-composer.error.xml.h:6
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Segur que voleu descartar el missatge «{0}» que esteu redactant?"
+
+#: ../composer/mail-composer.error.xml.h:7
+msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+msgstr ""
+"Degut a &quot;{0}&quot;, pot ser que hàgeu de seleccionar diferents opcions "
+"de correu."
+
+#: ../composer/mail-composer.error.xml.h:8
+msgid "Because &quot;{1}&quot;."
+msgstr "Degut a &quot;{1}&quot;."
+
+#: ../composer/mail-composer.error.xml.h:9
+msgid ""
+"Because you are working offline, the message will be saved to your local "
+"Outbox folder. When you are back online you can send the message by clicking "
+"the Send/Receive button in Evolution's toolbar."
+msgstr ""
+"Atès que esteu treballant fora de línia el missatge s'alçarà a la carpeta "
+"local de la safata d'eixida. Un cop torneu a estar en línia podreu enviar el "
+"missatge fent clic al botó «Envia / rep» de la barra d'eines de l'Evolution."
+
+#: ../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 "
+"continue the message at a later date."
+msgstr ""
+"Si tanqueu la finestra del redactor es descartarà el missatge permanentment, "
+"a menys que trieu alçar el missatge a la carpeta d'Esborranys. Així podreu "
+"continuar amb el missatge més avant."
+
+#: ../composer/mail-composer.error.xml.h:11
+msgid "Could not create message."
+msgstr "No s'ha pogut crear el missatge."
+
+#: ../composer/mail-composer.error.xml.h:12
+msgid "Could not read signature file &quot;{0}&quot;."
+msgstr "No s'ha pogut llegir el fitxer de signatura &quot;{0}&quot;."
+
+#: ../composer/mail-composer.error.xml.h:13
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "No s'han pogut obtindre els missatges per adjuntar de {0}."
+
+#: ../composer/mail-composer.error.xml.h:14
+msgid "Could not save to autosave file &quot;{0}&quot;."
+msgstr "No s'ha pogut alçar el fitxer de còpia automàtica &quot;{0}&quot;."
+
+#: ../composer/mail-composer.error.xml.h:15
+msgid "Do you want to recover unfinished messages?"
+msgstr "Voleu recuperar els missatges sense acabar?"
+
+#: ../composer/mail-composer.error.xml.h:16
+msgid "Download in progress. Do you want to send the mail?"
+msgstr "S'està baixant. Voleu enviar el correu?"
+
+#: ../composer/mail-composer.error.xml.h:17
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr "S'ha produït un error en alçar automàticament degut a &quot;{1}&quot;."
+
+#: ../composer/mail-composer.error.xml.h:18
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+"L'Evolution va eixir inesperadament quan estàveu redactant un missatge nou. "
+"Si recupereu el missatge podreu continuar on vos veu quedar."
+
+#: ../composer/mail-composer.error.xml.h:19
+msgid "Saving message to Outbox."
+msgstr "S'està desant el missatge a la safata d'eixida."
+
+#: ../composer/mail-composer.error.xml.h:20
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr ""
+"El fitxer «{0}» no és un fitxer normal i no es pot enviar en un missatge."
+
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
+msgid "The reported error was &quot;{0}&quot;."
+msgstr "L'error fou &quot;{0}&quot;."
+
+#: ../composer/mail-composer.error.xml.h:22
+msgid ""
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
+msgstr "L'error fou &quot;{0}&quot;. El missatge probablement no s'ha alçat."
+
+#: ../composer/mail-composer.error.xml.h:23
+msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
+msgstr "L'error fou &quot;{0}&quot;. El missatge no s'ha enviat."
+
+#: ../composer/mail-composer.error.xml.h:24
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "No es pot adjuntar el fitxer &quot;{0}&quot; a este missatge."
+
+#: ../composer/mail-composer.error.xml.h:25
+msgid "You need to configure an account before you can compose mail."
+msgstr "Heu de configurar un compte abans de poder redactar un correu."
+
+#: ../composer/mail-composer.error.xml.h:26
+msgid "Your message was sent, but an error occurred during post-processing."
+msgstr ""
+"S'ha enviat el missatge però s'ha produït un error durant el processament."
+
+#. Response codes were chosen somewhat arbitrarily.
+#: ../composer/mail-composer.error.xml.h:28
+msgid "_Continue Editing"
+msgstr "_Continua amb l'edició"
+
+#: ../composer/mail-composer.error.xml.h:30
+msgid "_Do not Recover"
+msgstr "N_o el recuperis"
+
+#: ../composer/mail-composer.error.xml.h:31
+msgid "_Recover"
+msgstr "R_ecupera"
+
+#: ../composer/mail-composer.error.xml.h:32
+msgid "_Save Draft"
+msgstr "Alça l'_esborrany"
+
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save to Outbox"
+msgstr "Al_ça'l a la safata d'eixida"
+
+#: ../composer/mail-composer.error.xml.h:35
+msgid "_Try Again"
+msgstr "_Torna-ho a intentar"
+
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplet/anjal-settings-main.c:154
+msgid "ID of the socket to embed in"
+msgstr "Identificador del sòcol on incrustar-se"
+
+#: ../capplet/anjal-settings-main.c:155
+msgid "socket"
+msgstr "sòcol"
+
+#: ../capplet/settings/mail-account-view.c:77
+msgid "Please enter your full name."
+msgstr "Introduïu el vostre nom complet."
+
+#: ../capplet/settings/mail-account-view.c:78
+msgid "Please enter your email address."
+msgstr "Introduïu la vostra adreça electrònica."
+
+#: ../capplet/settings/mail-account-view.c:79
+msgid "The email address you have entered is invalid."
+msgstr "L'adreça electrònica que heu introduït no és vàlida."
+
+#: ../capplet/settings/mail-account-view.c:80
+msgid "Please enter your password."
+msgstr "Introduïu la vostra contrasenya."
+
+#: ../capplet/settings/mail-account-view.c:259
+#: ../plugins/caldav/caldav-source.c:67
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:413
+#: ../modules/online-accounts/e-online-accounts-google.c:287
+#: ../modules/online-accounts/e-online-accounts-google.c:359
+#: ../plugins/google-account-setup/google-contacts-source.c:55
+#: ../plugins/google-account-setup/google-source.c:87
+msgid "Google"
+msgstr "Google"
+
+#: ../capplet/settings/mail-account-view.c:480
+msgid "Personal details:"
+msgstr "Dades personals:"
+
+#: ../capplet/settings/mail-account-view.c:487
+msgid "Name:"
+msgstr "Nom:"
+
+#: ../capplet/settings/mail-account-view.c:496
+msgid "Email address:"
+msgstr "Adreça electrònica:"
+
+#: ../capplet/settings/mail-account-view.c:506
+msgid "Details:"
+msgstr "Detalls:"
+
+#: ../capplet/settings/mail-account-view.c:514
+msgid "Receiving"
+msgstr "Recepció"
+
+#: ../capplet/settings/mail-account-view.c:521
+msgid "Server type:"
+msgstr "Tipus de servidor:"
+
+#: ../capplet/settings/mail-account-view.c:530
+msgid "Server address:"
+msgstr "Adreça del servidor:"
+
+#: ../capplet/settings/mail-account-view.c:539
+msgid "Username:"
+msgstr "Nom d'usuari:"
+
+#: ../capplet/settings/mail-account-view.c:548
+msgid "Use encryption:"
+msgstr "Utilitza l'encriptació:"
+
+#: ../capplet/settings/mail-account-view.c:553
+#: ../capplet/settings/mail-account-view.c:588
+msgid "never"
+msgstr "mai"
+
+# gal/e-table/e-table-config.glade.h:3
+# gal/e-table/e-table-config-no-group.glade.h:3
+#: ../capplet/settings/mail-account-view.c:565
+msgid "Sending"
+msgstr "Enviament"
+
+#: ../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."
+msgstr ""
+"Per poder utilitzar l'aplicació haureu de configurar un compte. Introduïu la "
+"vostra adreça electrònica i contrasenya ací sota i s'intentarà configurar "
+"automàticament tots els paràmetres. En cas que no es puga fer, haureu "
+"d'introduir els detalls del servidor."
+
+#: ../capplet/settings/mail-account-view.c:609
+msgid ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
+msgstr ""
+"No s'han pogut detectar automàticament els paràmetres per a la recepció de "
+"correu, per la qual cosa els haureu d'introduir ací sota. S'ha intentat "
+"començar amb els detalls que ja heu introduït, però pot ser que els hàgeu de "
+"canviar."
+
+#: ../capplet/settings/mail-account-view.c:611
+msgid "You can specify more options to configure the account."
+msgstr "Podeu especificar més opcions per configurar el compte."
+
+#: ../capplet/settings/mail-account-view.c:613
+msgid ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
+msgstr ""
+"Ara cal que introduïu els vostres paràmetres per a l'enviament de correus. "
+"S'han intentat detectar-los automàticament, però els hauríeu de comprovar "
+"per estar-ne segur."
+
+#: ../capplet/settings/mail-account-view.c:614
+msgid "You can specify your default settings for your account."
+msgstr "Podeu especificar les opcions per defecte del vostre compte."
+
+#: ../capplet/settings/mail-account-view.c:615
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
+msgstr ""
+"Ara teniu l'ocasió de comprovar els paràmetres abans d'intentar connectar "
+"amb el servidor i recollir el correu."
+
+#: ../capplet/settings/mail-account-view.c:630
+#: ../mail/em-account-editor.c:2289 ../mail/em-account-editor.c:2425
+msgid "Identity"
+msgstr "Identitat"
+
+#: ../capplet/settings/mail-account-view.c:630
+msgid "Next - Receiving mail"
+msgstr "Següent - Recepció de correu"
+
+#: ../capplet/settings/mail-account-view.c:631
+msgid "Receiving mail"
+msgstr "Recepció de correu"
+
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:632
+msgid "Next - Sending mail"
+msgstr "Següent - Enviament de correu"
+
+#: ../capplet/settings/mail-account-view.c:631
+msgid "Back - Identity"
+msgstr "Arrere - Identitat"
+
+#: ../capplet/settings/mail-account-view.c:631
+msgid "Next - Receiving options"
+msgstr "Següent - Opcions de recepció"
+
+#: ../capplet/settings/mail-account-view.c:632
+msgid "Receiving options"
+msgstr "Opcions de recepció"
+
+#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:634
+msgid "Back - Receiving mail"
+msgstr "Arrere - Recepció de correu"
+
+#: ../capplet/settings/mail-account-view.c:634
+msgid "Sending mail"
+msgstr "Enviament de correu"
+
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
+msgid "Next - Review account"
+msgstr "Següent - Revisió del compte"
+
+#: ../capplet/settings/mail-account-view.c:634
+msgid "Next - Defaults"
+msgstr "Següent - Valors per defecte"
+
+#: ../capplet/settings/mail-account-view.c:634
+msgid "Back - Receiving options"
+msgstr "Arrere - Opcions de recepció"
+
+#: ../capplet/settings/mail-account-view.c:635
+#: ../mail/em-account-editor.c:3377
+msgid "Defaults"
+msgstr "Opcions per defecte"
+
+#: ../capplet/settings/mail-account-view.c:635
+msgid "Back - Sending mail"
+msgstr "Arrere - Enviament de correu"
+
+#: ../capplet/settings/mail-account-view.c:637
+msgid "Review account"
+msgstr "Revisió del compte"
+
+#: ../capplet/settings/mail-account-view.c:637
+msgid "Finish"
+msgstr "Finalitza"
+
+# gal/e-table/e-table-config.glade.h:3
+# gal/e-table/e-table-config-no-group.glade.h:3
+#: ../capplet/settings/mail-account-view.c:637
+msgid "Back - Sending"
+msgstr "Arrere - Enviament"
+
+#: ../capplet/settings/mail-account-view.c:760
+msgid "Setup Google contacts with Evolution"
+msgstr "Configureu els contactes del Google a l'Evolution"
+
+#: ../capplet/settings/mail-account-view.c:761
+msgid "Setup Google calendar with Evolution"
+msgstr "Configureu els calendaris del Google a l'Evolution"
+
+#: ../capplet/settings/mail-account-view.c:766
+msgid "You may need to enable IMAP access."
+msgstr "Pot ser que hàgeu d'habilitar l'accés per IMAP."
+
+#: ../capplet/settings/mail-account-view.c:774
+msgid "Google account settings:"
+msgstr "Paràmetres del compte del Google:"
+
+#: ../capplet/settings/mail-account-view.c:800
+msgid "Setup Yahoo calendar with Evolution"
+msgstr "Configureu els calendaris del Yahoo a l'Evolution"
+
+#: ../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 ""
+"Els calendaris de Yahoo s'anomenen nom_cognom. Hem intentat formar el nom "
+"del calendari, per la qual cosa hauríeu de confirmar i tornar a introduir el "
+"nom del calendari si no és correcte."
+
+#: ../capplet/settings/mail-account-view.c:813
+msgid "Yahoo account settings:"
+msgstr "Paràmetres del compte de Yahoo:"
+
+#: ../capplet/settings/mail-account-view.c:827
+msgid "Yahoo Calendar name:"
+msgstr "Nom del calendari del Yahoo:"
+
+#: ../capplet/settings/mail-account-view.c:1098
+msgid "Password:"
+msgstr "Contrasenya:"
+
+#: ../capplet/settings/mail-account-view.c:1150
+#: ../capplet/settings/mail-settings-view.c:254
+msgid "Close Tab"
+msgstr "Tanca la pestanya"
+
+#: ../capplet/settings/mail-account-view.c:1160
+msgid "Account Wizard"
+msgstr "Auxiliar per als comptes"
+
+#: ../capplet/settings/mail-capplet-shell.c:215
+msgid "Evolution account assistant"
+msgstr "Auxiliar de comptes de l'Evolution"
+
+#. 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:155
+#: ../modules/addressbook/e-book-shell-backend.c:100
+#: ../modules/addressbook/e-book-shell-migrate.c:136
+#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-migrate.c:154
+#: ../modules/calendar/e-memo-shell-backend.c:102
+#: ../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:979
+#: ../widgets/misc/e-account-tree-view.c:1050
+#: ../widgets/misc/e-account-tree-view.c:1125
+#: ../widgets/misc/e-account-tree-view.c:1348
+msgid "On This Computer"
+msgstr "En este ordinador"
+
+#: ../capplet/settings/mail-settings-view.c:150
+#, c-format
+msgid "Modify %s..."
+msgstr "Modifica %s..."
+
+#: ../capplet/settings/mail-settings-view.c:152
+msgid "Add a new account"
+msgstr "Afig un compte nou"
+
+#: ../capplet/settings/mail-settings-view.c:188
+msgid "Account management"
+msgstr "Gestió de comptes"
+
+#: ../capplet/settings/mail-settings-view.c:264
+msgid "Settings"
+msgstr "Paràmetres"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+msgid "Calendar event notifications"
+msgstr "Notificacions d'esdeveniments del calendari"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Evolution Alarm Notify"
+msgstr "Notificador d'alarmes de l'Evolution"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:999
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../shell/e-shell-window-private.c:257
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/evolution.desktop.in.in.h:2
+msgid "Evolution Mail and Calendar"
+msgstr "Correu i calendari de l'Evolution"
+
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
+msgid "Groupware Suite"
+msgstr "Aplicacions de treball en grup"
+
+#: ../data/evolution.desktop.in.in.h:4
+msgid "Manage your email, contacts and schedule"
+msgstr "Gestioneu els correus electrònics, contactes i horaris"
+
+#: ../data/evolution-settings.desktop.in.in.h:1
+msgid "Configure email accounts"
+msgstr "Configuració dels comptes de correu electrònic"
+
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "Paràmetres del correu electrònic"
+
+#. Translators: This is a cancelled activity.
+#: ../e-util/e-activity.c:227
+#, c-format
+msgid "%s (cancelled)"
+msgstr "%s (s'ha cancel·lat)"
+
+#. Translators: This is a completed activity.
+#: ../e-util/e-activity.c:230
+#, c-format
+msgid "%s (completed)"
+msgstr "%s (s'ha completat)"
+
+#. Translators: This is an activity waiting to run.
+#: ../e-util/e-activity.c:233
+#, c-format
+msgid "%s (waiting)"
+msgstr "%s (en espera)"
+
+#. Translators: This is a running activity which
+#. *              the user has requested to cancel.
+#: ../e-util/e-activity.c:237
+#, c-format
+msgid "%s (cancelling)"
+msgstr "%s (es cancel·larà)"
+
+#: ../e-util/e-activity.c:239
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../e-util/e-activity.c:244
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% completat)"
+
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
+msgstr "Aràbic"
+
+#: ../e-util/e-charset.c:54
+msgid "Baltic"
+msgstr "Bàltic"
+
+#: ../e-util/e-charset.c:55
+msgid "Central European"
+msgstr "Centreeuropeu"
+
+#: ../e-util/e-charset.c:56
+msgid "Chinese"
+msgstr "Xinés"
+
+#: ../e-util/e-charset.c:57
+msgid "Cyrillic"
+msgstr "Ciríl·lic"
+
+#: ../e-util/e-charset.c:58
+msgid "Greek"
+msgstr "Grec"
+
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "Hebreu"
+
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "Japonés"
+
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "Coreà"
+
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "Tai"
+
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "Turc"
+
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../e-util/e-charset.c:65
+msgid "Western European"
+msgstr "Europeu occidental"
+
+#: ../e-util/e-charset.c:66
+msgid "Western European, New"
+msgstr "Europeu occidental, nou"
+
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
+msgid "Traditional"
+msgstr "Tradicional"
+
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
+msgid "Simplified"
+msgstr "Simplificat"
+
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
+msgid "Ukrainian"
+msgstr "Ucraïnés"
+
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
+msgid "Visual"
+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
+#: ../plugins/itip-formatter/itip-view.c:191
+#: ../widgets/table/e-cell-date-edit.c:307
+msgid "Today"
+msgstr "Hui"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:219
+msgid "Tomorrow"
+msgstr "Demà"
+
+#: ../e-util/e-datetime-format.c:219
+msgid "Yesterday"
+msgstr "Ahir"
+
+#. 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:227
+msgctxt "DateFmt"
+msgid "Next Mon"
+msgstr "Següent %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:233
+msgctxt "DateFmt"
+msgid "Next Tue"
+msgstr "Següent %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:239
+msgctxt "DateFmt"
+msgid "Next Wed"
+msgstr "Següent %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:245
+msgctxt "DateFmt"
+msgid "Next Thu"
+msgstr "Següent %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:251
+msgctxt "DateFmt"
+msgid "Next Fri"
+msgstr "Següent %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:257
+msgctxt "DateFmt"
+msgid "Next Sat"
+msgstr "Següent %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:263
+msgctxt "DateFmt"
+msgid "Next Sun"
+msgstr "Següent %a"
+
+#: ../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 "Utilitza els valors per defecte de la localització"
+
+#: ../e-util/e-datetime-format.c:574
+msgid "Format:"
+msgstr "Format:"
+
+#: ../e-util/e-file-utils.c:151
+msgid "(Unknown Filename)"
+msgstr "(nom de fitxer desconegut)"
+
+#. Translators: The string value is the basename of a file.
+#: ../e-util/e-file-utils.c:155
+#, c-format
+msgid "Writing \"%s\""
+msgstr "S'està escrivint «%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
+#, c-format
+msgid "Writing \"%s\" to %s"
+msgstr "S'està escrivint «%s» a «%s»"
+
+#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:388
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "setmanes"
+
+#: ../e-util/e-print.c:161
+msgid "An error occurred while printing"
+msgstr "S'ha produït un error mentre s'estava imprimint"
+
+#: ../e-util/e-print.c:168
+msgid "The printing system reported the following details about the error:"
+msgstr "El sistema d'impressió ha llistat els detalls següents sobre l'error:"
+
+#: ../e-util/e-print.c:174
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr ""
+"El sistema d'impressió no ha llistat cap detall addicional sobre l'error."
+
+#: ../e-util/e-signature.c:708
+msgid "Autogenerated"
+msgstr "Generada automàticament"
+
+#: ../e-util/e-system.error.xml.h:1
+msgid "Because \"{1}\"."
+msgstr "Degut a «{1}»."
+
+#: ../e-util/e-system.error.xml.h:2
+msgid "Cannot open file \"{0}\"."
+msgstr "No es pot obrir el fitxer «{0}»."
+
+#: ../e-util/e-system.error.xml.h:3
+msgid "Cannot save file \"{0}\"."
+msgstr "No es pot alçar el fitxer «{0}»."
+
+#: ../e-util/e-system.error.xml.h:4
+msgid "Do you wish to overwrite it?"
+msgstr "El voleu sobreescriure?"
+
+#: ../e-util/e-system.error.xml.h:5
+msgid "File exists \"{0}\"."
+msgstr "Ja existeix el fitxer «{0}»."
+
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
+msgid "_Overwrite"
+msgstr "S_obreescriu"
+
+#: ../e-util/e-util.c:117
+msgid "Could not open the link."
+msgstr "No s'ha pogut obrir l'enllaç."
+
+#: ../e-util/e-util.c:164
+msgid "Could not display help for Evolution."
+msgstr "No s'ha pogut mostrar l'ajuda de l'Evolution."
+
+#: ../e-util/gconf-bridge.c:1332
+#, c-format
+msgid "GConf error: %s"
+msgstr "S'ha produït un error del GConf: %s"
+
+#: ../e-util/gconf-bridge.c:1343
+msgid "All further errors shown only on terminal."
+msgstr "La resta d'errors es mostraran només al terminal."
+
+#: ../em-format/em-format-quote.c:319 ../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
+msgid "From"
+msgstr "De"
+
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1061
+#: ../modules/mail/em-mailer-prefs.c:73
+msgid "Reply-To"
+msgstr "Respon"
+
+#: ../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
+msgid "Cc"
+msgstr "CC"
+
+#: ../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
+msgid "Bcc"
+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
+msgid "Subject"
+msgstr "Assumpte"
+
+#. pseudo-header
+#: ../em-format/em-format-quote.c:475 ../mail/em-format-html.c:2786
+#: ../modules/mail/em-mailer-prefs.c:1028
+msgid "Mailer"
+msgstr "Generador del correu"
+
+#: ../em-format/em-format-quote.c:565 ../mail/em-composer-utils.c:1203
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Missatge reenviat --------"
+
+#: ../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
+#: ../widgets/misc/e-dateedit.c:545
+msgid "Date"
+msgstr "Data"
+
+#: ../em-format/em-format.c:1067 ../modules/mail/em-mailer-prefs.c:79
+msgid "Newsgroups"
+msgstr "Grups de notícies"
+
+#: ../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 "Cares"
+
+#: ../em-format/em-format.c:1472
+#, c-format
+msgid "%s attachment"
+msgstr "fitxer adjunt %s"
+
+#: ../em-format/em-format.c:1583
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "S'ha produït un error desconegut en analitzar el missatge S/MIME"
+
+#: ../em-format/em-format.c:1777 ../em-format/em-format.c:2005
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "No s'ha pogut analitzar el missatge MIME. Es mostrarà com a codi font."
+
+#: ../em-format/em-format.c:1788
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "El tipus de xifratge per a multipart/encrypted no està implementat"
+
+#: ../em-format/em-format.c:1808
+msgid "Could not parse PGP/MIME message"
+msgstr "No s'ha pogut analitzar el missatge PGP/MIME"
+
+#: ../em-format/em-format.c:1809
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "No s'ha pogut analitzar el missatge PGP/MIME: error desconegut"
+
+#: ../em-format/em-format.c:2030
+msgid "Unsupported signature format"
+msgstr "El format de la signatura no està implementat"
+
+#: ../em-format/em-format.c:2043 ../em-format/em-format.c:2225
+msgid "Error verifying signature"
+msgstr "S'ha produït un error en verificar la contrasenya"
+
+#: ../em-format/em-format.c:2044 ../em-format/em-format.c:2210
+#: ../em-format/em-format.c:2226
+msgid "Unknown error verifying signature"
+msgstr "S'ha produït un error desconegut en verificar la contrasenya"
+
+#: ../em-format/em-format.c:2318
+msgid "Could not parse PGP message: "
+msgstr "No s'ha pogut analitzar el missatge PGP: "
+
+#. Don't delete this code, since it is needed so that xgettext can extract the translations.
+#. * Please, keep these strings in sync with the strings in the timespans array
+#: ../filter/e-filter-datespec.c:66
+#, c-format
+msgid "1 second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "fa 1 segon"
+msgstr[1] "fa %d segons"
+
+#: ../filter/e-filter-datespec.c:67
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] "d'ací a 1 segon"
+msgstr[1] "d'ací a %d segons"
+
+#: ../filter/e-filter-datespec.c:68
+#, c-format
+msgid "1 minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "fa 1 minut"
+msgstr[1] "fa %d minuts"
+
+#: ../filter/e-filter-datespec.c:69
+#, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] "d'ací a 1 minut"
+msgstr[1] "d'ací a %d minut"
+
+#: ../filter/e-filter-datespec.c:70
+#, c-format
+msgid "1 hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "fa 1 hora"
+msgstr[1] "fa %d hores"
+
+#: ../filter/e-filter-datespec.c:71
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] "d'ací a 1 hora"
+msgstr[1] "d'ací a %d hores"
+
+#: ../filter/e-filter-datespec.c:72
+#, c-format
+msgid "1 day ago"
+msgid_plural "%d days ago"
+msgstr[0] "fa 1 dia"
+msgstr[1] "fa %d dies"
+
+#: ../filter/e-filter-datespec.c:73
+#, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] "D'ací a 1 dia"
+msgstr[1] "D'ací a %d dies"
+
+#: ../filter/e-filter-datespec.c:74
+#, c-format
+msgid "1 week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "fa 1 setmana"
+msgstr[1] "fa %d setmanes"
+
+#: ../filter/e-filter-datespec.c:75
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] "D'ací a 1 setmana"
+msgstr[1] "D'ací a %d setmanes"
+
+#: ../filter/e-filter-datespec.c:76
+#, c-format
+msgid "1 month ago"
+msgid_plural "%d months ago"
+msgstr[0] "fa 1 mes"
+msgstr[1] "fa %d mesos"
+
+#: ../filter/e-filter-datespec.c:77
+#, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] "D'ací a 1 mes"
+msgstr[1] "D'ací a %d mesos"
+
+#: ../filter/e-filter-datespec.c:78
+#, c-format
+msgid "1 year ago"
+msgid_plural "%d years ago"
+msgstr[0] "fa 1 any"
+msgstr[1] "fa %d anys"
+
+#: ../filter/e-filter-datespec.c:79
+#, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] "D'ací a 1 any"
+msgstr[1] "D'ací a %d anys"
+
+#: ../filter/e-filter-datespec.c:129
+msgid "<click here to select a date>"
+msgstr "<feu clic per seleccionar una data>"
+
+#: ../filter/e-filter-datespec.c:132 ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:154
+msgid "now"
+msgstr "ara"
+
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: ../filter/e-filter-datespec.c:139
+msgid "%d-%b-%Y"
+msgstr "%d/%b/%Y"
+
+#: ../filter/e-filter-datespec.c:286
+msgid "Select a time to compare against"
+msgstr "Seleccioneu amb quina hora es compararà"
+
+#: ../filter/e-filter-file.c:190
+msgid "Choose a File"
+msgstr "Trieu un fitxer"
+
+#: ../filter/e-filter-rule.c:666
+msgid "R_ule name:"
+msgstr "Nom de la _regla:"
+
+#: ../filter/e-filter-rule.c:696
+msgid "Find items that meet the following conditions"
+msgstr "Troba els elements que compleixen les condicions següents"
+
+#: ../filter/e-filter-rule.c:721
+msgid "If all conditions are met"
+msgstr "Si es compleixen totes les condicions"
+
+#: ../filter/e-filter-rule.c:722
+msgid "If any conditions are met"
+msgstr "Si es compleix qualsevol condició"
+
+#: ../filter/e-filter-rule.c:725
+msgid "_Find items:"
+msgstr "_Cerca elements:"
+
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#: ../filter/e-filter-rule.c:754
+msgid "None"
+msgstr "Cap"
+
+#: ../filter/e-filter-rule.c:755
+msgid "All related"
+msgstr "Tots els relacionats"
+
+#: ../filter/e-filter-rule.c:756 ../widgets/misc/e-send-options.ui.h:19
+msgid "Replies"
+msgstr "Respostes"
+
+#: ../filter/e-filter-rule.c:757
+msgid "Replies and parents"
+msgstr "Respostes i pares"
+
+#: ../filter/e-filter-rule.c:758
+msgid "No reply or parent"
+msgstr "Sense resposta o pare"
+
+#: ../filter/e-filter-rule.c:761
+msgid "I_nclude threads:"
+msgstr "I_nclou els fils:"
+
+#: ../filter/e-filter-rule.c:786
+msgid "A_dd Condition"
+msgstr "Afig una _condició"
+
+#: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:323
+msgid "Incoming"
+msgstr "Entrada"
+
+#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:324
+msgid "Outgoing"
+msgstr "Eixida"
+
+#: ../filter/e-rule-editor.c:270
+msgid "Add Rule"
+msgstr "Afig una regla"
+
+#: ../filter/e-rule-editor.c:359
+msgid "Edit Rule"
+msgstr "Edita la regla"
+
+#: ../filter/filter.error.xml.h:1
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr "L'expressió regular &quot;{0}&quot; és incorrecta."
+
+#: ../filter/filter.error.xml.h:2
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr "No s'ha pogut compilar l'expressió regular &quot;{1}&quot;."
+
+#: ../filter/filter.error.xml.h:3
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr "El fitxer &quot;{0}&quot; no existeix o no és un fitxer normal."
+
+#: ../filter/filter.error.xml.h:4
+msgid "Missing date."
+msgstr "Manca la data."
+
+#: ../filter/filter.error.xml.h:5
+msgid "Missing file name."
+msgstr "Manca el nom de fitxer."
+
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
+msgid "Missing name."
+msgstr "Manca el nom."
+
+#: ../filter/filter.error.xml.h:7
+msgid "Name &quot;{0}&quot; already used."
+msgstr "Ja s'està fent servir el nom &quot;{0}&quot;."
+
+#: ../filter/filter.error.xml.h:8
+msgid "Please choose another name."
+msgstr "Seleccioneu un altre nom."
+
+#: ../filter/filter.error.xml.h:9
+msgid "You must choose a date."
+msgstr "Heu de triar una data."
+
+#: ../filter/filter.error.xml.h:10
+msgid "You must name this filter."
+msgstr "Heu d'assignar un nom a este filtre."
+
+#: ../filter/filter.error.xml.h:11
+msgid "You must specify a file name."
+msgstr "Heu d'especificar un nom de fitxer."
+
+#: ../filter/filter.ui.h:1
+msgid "Compare against"
+msgstr "Compara amb"
+
+#: ../filter/filter.ui.h:3
+msgid "Show filters for mail:"
+msgstr "Mostra els filtres de correu:"
+
+#: ../filter/filter.ui.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"La data del missatge es compararà amb les 12:00am\n"
+"de la data que indiqueu."
+
+#: ../filter/filter.ui.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"A l'hora de filtrar, es compararà la data del missatge\n"
+"amb una hora relativa."
+
+#: ../filter/filter.ui.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"La data del missatge es compararà amb l'hora\n"
+"actual quan s'haja de filtrar."
+
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:194
+msgid "_Filter Rules"
+msgstr "Regles de _filtratge"
+
+#: ../filter/filter.ui.h:12
+msgid "a time relative to the current time"
+msgstr "una hora relativa a l'actual"
+
+# FIXME: potser hauria de ser «passat» o quelcom semblant, ja que
+# crec que anirà al fina de la frase. (dpm)
+#: ../filter/filter.ui.h:13
+msgid "ago"
+msgstr "fa"
+
+#: ../filter/filter.ui.h:16
+msgid "in the future"
+msgstr "en el futur"
+
+#: ../filter/filter.ui.h:18
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+msgid "months"
+msgstr "mesos"
+
+#: ../filter/filter.ui.h:19
+msgid "seconds"
+msgstr "segons"
+
+#: ../filter/filter.ui.h:20
+msgid "the current time"
+msgstr "l'hora actual"
+
+#: ../filter/filter.ui.h:21
+msgid "the time you specify"
+msgstr "l'hora que indiqueu"
+
+#: ../filter/filter.ui.h:23
+msgid "years"
+msgstr "anys"
+
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:863 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "cap"
+
+#: ../mail/em-account-editor.c:946
+msgid "Never"
+msgstr "Mai"
+
+#: ../mail/em-account-editor.c:947
+msgid "Always"
+msgstr "Sempre"
+
+#: ../mail/em-account-editor.c:948
+msgid "Ask for each message"
+msgstr "Pregunta per cada missatge"
+
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1833 ../widgets/misc/e-account-tree-view.c:265
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "Cap"
+
+#: ../mail/em-account-editor.c:2237
+msgid "Fil_e:"
+msgstr "_Fitxer:"
+
+#: ../mail/em-account-editor.c:2237 ../mail/mail-config.ui.h:157
+msgid "_Path:"
+msgstr "_Camí:"
+
+#: ../mail/em-account-editor.c:2286
+msgid "Mail Configuration"
+msgstr "Configuració del correu"
+
+#: ../mail/em-account-editor.c:2287
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"Vos donem la benvinguda a l'auxiliar de configuració del correu de "
+"l'Evolution.\n"
+"\n"
+"Feu clic a «Continua» per començar."
+
+#: ../mail/em-account-editor.c:2290
+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 ""
+"Introduïu el vostre nom i la vostra adreça electrònica ací sota. Els camps "
+"«opcionals» no són necessaris, a menys que els vulgueu afegir en els correus "
+"que envieu."
+
+#: ../mail/em-account-editor.c:2292 ../mail/em-account-editor.c:2484
+msgid "Receiving Email"
+msgstr "Recepció de correu"
+
+#: ../mail/em-account-editor.c:2293
+msgid "Please configure the following account settings."
+msgstr "Configureu els següents paràmetres del compte."
+
+#: ../mail/em-account-editor.c:2295 ../mail/em-account-editor.c:3081
+msgid "Sending Email"
+msgstr "Enviament de correu"
+
+#: ../mail/em-account-editor.c:2296
+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 ""
+"Introduïu informació sobre com voleu enviar el correu. Si no n'esteu segur, "
+"pregunteu-ho a l'administrador del sistema o al vostre proveïdor d'Internet."
+
+#: ../mail/em-account-editor.c:2298 ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "Informació de compte"
+
+#: ../mail/em-account-editor.c:2299
+msgid ""
+"Please enter a descriptive name for this account below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"Introduïu un nom descriptiu per a este compte ací sota. \n"
+"Este nom només s'utilitzarà per visualitzar-lo."
+
+#: ../mail/em-account-editor.c:2303
+msgid "Done"
+msgstr "Fet"
+
+#: ../mail/em-account-editor.c:2304
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"Enhorabona, s'ha completat la configuració del vostre correu.\n"
+"\n"
+"Ja podeu rebre i enviar correu amb l'Evolution.\n"
+"\n"
+"Feu clic a «Aplica» per alçar la configuració."
+
+#: ../mail/em-account-editor.c:2843
+msgid "Check for _new messages every"
+msgstr "Comprova si hi ha correu _nou cada"
+
+#: ../mail/em-account-editor.c:2851
+msgid "minu_tes"
+msgstr "minu_ts"
+
+#: ../mail/em-account-editor.c:3520 ../mail/mail-config.ui.h:101
+msgid "Security"
+msgstr "Seguretat"
+
+#. 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
+msgid "Receiving Options"
+msgstr "Opcions de recepció"
+
+#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
+msgid "Checking for New Messages"
+msgstr "Comprovació de correu nou"
+
+#: ../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
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Fitxer adjunt"
+msgstr[1] "Fitxers adjunts"
+
+#: ../mail/e-mail-attachment-bar.c:608
+#: ../widgets/misc/e-attachment-paned.c:623
+msgid "Icon View"
+msgstr "Vista d'icones"
+
+#: ../mail/e-mail-attachment-bar.c:610
+#: ../widgets/misc/e-attachment-paned.c:625
+msgid "List View"
+msgstr "Vista de llista"
+
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1441
+msgid "Close this window"
+msgstr "Tanca esta finestra"
+
+#: ../mail/e-mail-browser.c:293
+msgid "(No Subject)"
+msgstr "(Sense assumpte)"
+
+#: ../mail/e-mail-display.c:66
+msgid "_Add to Address Book..."
+msgstr "_Afig a la llibreta d'adreces..."
+
+#: ../mail/e-mail-display.c:73
+msgid "_To This Address"
+msgstr "Per a aques_ta adreça"
+
+#: ../mail/e-mail-display.c:80
+msgid "_From This Address"
+msgstr "D'a_questa adreça"
+
+#: ../mail/e-mail-display.c:87
+msgid "Send _Reply To..."
+msgstr "_Respon a..."
+
+#: ../mail/e-mail-display.c:89
+msgid "Send a reply message to this address"
+msgstr "Envia un missatge de resposta a esta adreça"
+
+#: ../mail/e-mail-display.c:96
+msgid "Create Search _Folder"
+msgstr "Crea una carpeta de _cerca"
+
+#: ../mail/e-mail-folder-utils.c:111
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr "S'està desant el missatge a la carpeta «%s»"
+
+#: ../mail/e-mail-folder-utils.c:274
+msgid "Forwarded messages"
+msgstr "Missatges reenviats"
+
+#: ../mail/e-mail-folder-utils.c:391
+msgid "Scanning messages for duplicates"
+msgstr "S'estan escanejant els missatges per si n'hi ha de duplicats"
+
+#: ../mail/e-mail-folder-utils.c:584
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "S'està recuperant %d missatge"
+msgstr[1] "S'estan recuperant %d missatges"
+
+#: ../mail/e-mail-folder-utils.c:834
+#, c-format
+msgid "Removing folder '%s'"
+msgstr "S'està suprimint la carpeta «%s»"
+
+#: ../mail/e-mail-folder-utils.c:968
+#, c-format
+msgid "File \"%s\" has been removed."
+msgstr "S'ha suprimit el fitxer «%s»."
+
+#: ../mail/e-mail-folder-utils.c:972
+msgid "File has been removed."
+msgstr "S'ha suprimit el fitxer."
+
+#: ../mail/e-mail-folder-utils.c:1031
+msgid "Removing attachments"
+msgstr "S'estan suprimint les adjuncions"
+
+#: ../mail/e-mail-folder-utils.c:1195
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messages"
+msgstr[0] "S'està desant %d missatge"
+msgstr[1] "S'estan desant %d missatges"
+
+#: ../mail/e-mail-folder-utils.c:1539 ../mail/em-folder-utils.c:628
+#, c-format
+msgid "Invalid folder URI '%s'"
+msgstr "L'URI de la carpeta «%s» no és vàlid"
+
+#. Label + combo box has a 12px left margin so it's
+#. * aligned with the junk mail options above it.
+#: ../mail/e-mail-junk-options.c:252
+msgid "Junk filtering software:"
+msgstr "Programari de filtratge de brossa:"
+
+#: ../mail/e-mail-label-dialog.c:223
+msgid "_Label name:"
+msgstr "_Nom de l'etiqueta:"
+
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "Imp_ortant"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:42
+msgid "_Work"
+msgstr "F_eina"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:43
+msgid "_Personal"
+msgstr "P_ersonal"
+
+#. green
+#: ../mail/e-mail-label-list-store.c:44
+msgid "_To Do"
+msgstr "P_er fer"
+
+#. blue
+#: ../mail/e-mail-label-list-store.c:45
+msgid "_Later"
+msgstr "D_esprés"
+
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:684
+msgid "Add Label"
+msgstr "Afig una etiqueta"
+
+#: ../mail/e-mail-label-manager.c:216
+msgid "Edit Label"
+msgstr "Edita l'etiqueta"
+
+#: ../mail/e-mail-label-manager.c:350
+msgid ""
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
+msgstr ""
+"Nota: el caràcter de subratllat al nom de \n"
+"l'etiqueta s'utilitza com a \n"
+"identificador mnemònic en el menú."
+
+#: ../mail/e-mail-label-tree-view.c:88
+msgid "Color"
+msgstr "Color"
+
+#: ../mail/e-mail-label-tree-view.c:98
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../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 "Nom"
+
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:312
+#: ../mail/em-folder-tree-model.c:934
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
+msgid "Inbox"
+msgstr "Safata d'entrada"
+
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:927
+#: ../modules/mail/e-mail-shell-view-private.c:1064
+msgid "Drafts"
+msgstr "Esborranys"
+
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:938
+#: ../modules/mail/e-mail-shell-view-private.c:1068
+msgid "Outbox"
+msgstr "Safata d'eixida"
+
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:942
+#: ../modules/mail/e-mail-shell-view-private.c:1070
+msgid "Sent"
+msgstr "Enviat"
+
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:930
+#: ../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
+#: ../plugins/templates/templates.c:1322
+msgid "Templates"
+msgstr "Plantilles"
+
+#: ../mail/e-mail-migrate.c:134
+msgid "Migrating..."
+msgstr "S'està migrant..."
+
+#: ../mail/e-mail-migrate.c:169
+msgid "Migration"
+msgstr "Migració"
+
+#: ../mail/e-mail-migrate.c:210
+#, c-format
+msgid "Migrating '%s':"
+msgstr "S'està migrant «%s»:"
+
+#: ../mail/e-mail-migrate.c:728
+msgid "Migrating Folders"
+msgstr "S'estan migrant les carpetes"
+
+#: ../mail/e-mail-migrate.c:729
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"El format del resum de les carpetes de les bústies de correu de l'Evolution "
+"s'ha convertit a l'SQLite a partir de la versió 2.24.\n"
+"\n"
+"Espereu mentre l'Evolution migra les vostres carpetes..."
+
+#: ../mail/e-mail-migrate.c:1527
+#, c-format
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "No s'han pogut crear les carpetes de correu local a «%s»: %s"
+
+#: ../mail/e-mail-notebook-view.c:621
+msgid "Please select a folder"
+msgstr "Seleccioneu una carpeta"
+
+#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "Copia a carpeta"
+
+#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:487
+msgid "C_opy"
+msgstr "C_opia"
+
+#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
+msgid "Move to Folder"
+msgstr "Mou a la carpeta"
+
+#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:487
+msgid "_Move"
+msgstr "_Mou"
+
+#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1403
+msgid "_Do not ask me again."
+msgstr "_No m'ho tornes a demanar."
+
+#: ../mail/e-mail-reader.c:1409
+msgid "_Always ignore Reply-To: for mailing lists."
+msgstr "_Ignora sempre «Reply-To:» (respon a) a les llistes de correu."
+
+#: ../mail/e-mail-reader.c:1775
+msgid "A_dd Sender to Address Book"
+msgstr "Afig el remitent a la llibreta d'a_dreces"
+
+#: ../mail/e-mail-reader.c:1777
+msgid "Add sender to address book"
+msgstr "Afig el remitent a la llibreta d'adreces"
+
+#: ../mail/e-mail-reader.c:1782
+msgid "Check for _Junk"
+msgstr "Comprova si hi ha _brossa"
+
+#: ../mail/e-mail-reader.c:1784
+msgid "Filter the selected messages for junk status"
+msgstr "Filtra els missatges seleccionats per l'estat de brossa"
+
+#: ../mail/e-mail-reader.c:1789
+msgid "_Copy to Folder..."
+msgstr "_Copia a la carpeta..."
+
+#: ../mail/e-mail-reader.c:1791
+msgid "Copy selected messages to another folder"
+msgstr "Copia els missatges seleccionats a una altra carpeta"
+
+#: ../mail/e-mail-reader.c:1796
+msgid "_Delete Message"
+msgstr "Suprimeix el _missatge"
+
+#: ../mail/e-mail-reader.c:1798
+msgid "Mark the selected messages for deletion"
+msgstr "Marca els missatges seleccionats per suprimir-los"
+
+#: ../mail/e-mail-reader.c:1803
+msgid "Filter on Mailing _List..."
+msgstr "Fi_ltra per la llista de correu..."
+
+#: ../mail/e-mail-reader.c:1805
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Crea una regla per filtrar els missatges per a esta llista de correu"
+
+#: ../mail/e-mail-reader.c:1810
+msgid "Filter on _Recipients..."
+msgstr "Filt_ra pels destinataris..."
+
+#: ../mail/e-mail-reader.c:1812
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Crea una regla per filtrar els missatges per a estos destinataris"
+
+#: ../mail/e-mail-reader.c:1817
+msgid "Filter on Se_nder..."
+msgstr "Filtra pels remite_nts..."
+
+#: ../mail/e-mail-reader.c:1819
+msgid "Create a rule to filter messages from this sender"
+msgstr "Crea una regla per filtrar els missatges d'este remitent"
+
+#: ../mail/e-mail-reader.c:1824
+msgid "Filter on _Subject..."
+msgstr "Filtra per l'a_ssumpte..."
+
+#: ../mail/e-mail-reader.c:1826
+msgid "Create a rule to filter messages with this subject"
+msgstr "Crea una regla per filtrar els missatges amb este assumpte"
+
+#: ../mail/e-mail-reader.c:1831
+msgid "A_pply Filters"
+msgstr "A_plica els filtres"
+
+#: ../mail/e-mail-reader.c:1833
+msgid "Apply filter rules to the selected messages"
+msgstr "Aplica les regles de filtratge als missatges seleccionats"
+
+#: ../mail/e-mail-reader.c:1838
+msgid "_Find in Message..."
+msgstr "_Cerca en el missatge..."
+
+#: ../mail/e-mail-reader.c:1840
+msgid "Search for text in the body of the displayed message"
+msgstr "Cerca un text en el cos del missatge visualitzat"
+
+#: ../mail/e-mail-reader.c:1845
+msgid "_Clear Flag"
+msgstr "Nete_ja el senyalador"
+
+#: ../mail/e-mail-reader.c:1847
+msgid "Remove the follow-up flag from the selected messages"
+msgstr "Suprimeix el senyalador de seguiment dels missatges seleccionats"
+
+#: ../mail/e-mail-reader.c:1852
+msgid "_Flag Completed"
+msgstr "Sen_yalador completat"
+
+#: ../mail/e-mail-reader.c:1854
+msgid "Set the follow-up flag to completed on the selected messages"
+msgstr ""
+"Estableix el senyalador de seguiment com a completat en els missatges "
+"seleccionats"
+
+#: ../mail/e-mail-reader.c:1859
+msgid "Follow _Up..."
+msgstr "Res_pon..."
+
+#: ../mail/e-mail-reader.c:1861
+msgid "Flag the selected messages for follow-up"
+msgstr "Senyala els missatges seleccionats per fer-ne un seguiment"
+
+#: ../mail/e-mail-reader.c:1866
+msgid "_Attached"
+msgstr "_Adjuntat"
+
+#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
+msgid "Forward the selected message to someone as an attachment"
+msgstr ""
+"Reenvia el missatge seleccionat a una altra persona com a fitxer adjunt"
+
+#: ../mail/e-mail-reader.c:1873
+msgid "Forward As _Attached"
+msgstr "Reenvia com a _adjunció"
+
+#: ../mail/e-mail-reader.c:1880
+msgid "_Inline"
+msgstr "_Inserit"
+
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
+msgid "Forward the selected message in the body of a new message"
+msgstr "Reenvia el missatge seleccionat al cos d'un missatge nou"
+
+#: ../mail/e-mail-reader.c:1887
+msgid "Forward As _Inline"
+msgstr "Reenvia _inserit"
+
+#: ../mail/e-mail-reader.c:1894
+msgid "_Quoted"
+msgstr "_Citat"
+
+#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
+msgid "Forward the selected message quoted like a reply"
+msgstr "Reenvia el missatge seleccionat citat com una resposta"
+
+#: ../mail/e-mail-reader.c:1901
+msgid "Forward As _Quoted"
+msgstr "Reenvia com a _citat"
+
+#: ../mail/e-mail-reader.c:1908
+msgid "_Load Images"
+msgstr "Carrega i_matges"
+
+#: ../mail/e-mail-reader.c:1910
+msgid "Force images in HTML mail to be loaded"
+msgstr "Força la càrrega d'imatges en els correus HTML"
+
+#: ../mail/e-mail-reader.c:1915
+msgid "_Important"
+msgstr "_Important"
+
+#: ../mail/e-mail-reader.c:1917
+msgid "Mark the selected messages as important"
+msgstr "Marca els missatges seleccionats com a importants"
+
+#: ../mail/e-mail-reader.c:1922
+msgid "_Junk"
+msgstr "_Brossa"
+
+#: ../mail/e-mail-reader.c:1924
+msgid "Mark the selected messages as junk"
+msgstr "Marca els missatges seleccionats com a brossa"
+
+#: ../mail/e-mail-reader.c:1929
+msgid "_Not Junk"
+msgstr "_No és brossa"
+
+#: ../mail/e-mail-reader.c:1931
+msgid "Mark the selected messages as not being junk"
+msgstr "Marca els missatges seleccionats com a no brossa"
+
+#: ../mail/e-mail-reader.c:1936
+msgid "_Read"
+msgstr "_Llegit"
+
+#: ../mail/e-mail-reader.c:1938
+msgid "Mark the selected messages as having been read"
+msgstr "Marca els missatges seleccionats com a llegits"
+
+#: ../mail/e-mail-reader.c:1943
+msgid "Uni_mportant"
+msgstr "Poc i_mportant"
+
+#: ../mail/e-mail-reader.c:1945
+msgid "Mark the selected messages as unimportant"
+msgstr "Marca els missatges seleccionats com a no importants"
+
+#: ../mail/e-mail-reader.c:1950
+msgid "_Unread"
+msgstr "No ll_egit"
+
+#: ../mail/e-mail-reader.c:1952
+msgid "Mark the selected messages as not having been read"
+msgstr "Marca els missatges seleccionats com a no llegits"
+
+#: ../mail/e-mail-reader.c:1957
+msgid "_Edit as New Message..."
+msgstr "_Edita com a missatge nou..."
+
+#: ../mail/e-mail-reader.c:1959
+msgid "Open the selected messages in the composer for editing"
+msgstr "Obri els missatges seleccionats en el redactor per editar-los"
+
+#: ../mail/e-mail-reader.c:1964
+msgid "Compose _New Message"
+msgstr "Redacta u_n missatge nou"
+
+#: ../mail/e-mail-reader.c:1966
+msgid "Open a window for composing a mail message"
+msgstr "Obri una finestra per redactar un missatge de correu"
+
+#: ../mail/e-mail-reader.c:1971
+msgid "_Open in New Window"
+msgstr "_Obri en una finestra nova"
+
+#: ../mail/e-mail-reader.c:1973
+msgid "Open the selected messages in a new window"
+msgstr "Obri els missatges seleccionats en una finestra nova"
+
+#: ../mail/e-mail-reader.c:1978
+msgid "_Move to Folder..."
+msgstr "_Mou a la carpeta..."
+
+#: ../mail/e-mail-reader.c:1980
+msgid "Move selected messages to another folder"
+msgstr "Mou els missatges seleccionats a una altra carpeta"
+
+#: ../mail/e-mail-reader.c:1985
+msgid "_Switch to Folder"
+msgstr "C_ommuta a la carpeta"
+
+#: ../mail/e-mail-reader.c:1987
+msgid "Display the parent folder"
+msgstr "Mostra la carpeta mare"
+
+#: ../mail/e-mail-reader.c:1992
+msgid "Switch to _next tab"
+msgstr "Commuta a la pestanya _següent"
+
+#: ../mail/e-mail-reader.c:1994
+msgid "Switch to the next tab"
+msgstr "Commuta a la pestanya següent"
+
+#: ../mail/e-mail-reader.c:1999
+msgid "Switch to _previous tab"
+msgstr "Commuta a la pestanya an_terior"
+
+#: ../mail/e-mail-reader.c:2001
+msgid "Switch to the previous tab"
+msgstr "Commuta a la pestanya anterior"
+
+#: ../mail/e-mail-reader.c:2006
+msgid "Cl_ose current tab"
+msgstr "Tan_ca la pestanya actual"
+
+#: ../mail/e-mail-reader.c:2008
+msgid "Close current tab"
+msgstr "Tanca la pestanya actual"
+
+#: ../mail/e-mail-reader.c:2013
+msgid "_Next Message"
+msgstr "Missatge següe_nt"
+
+#: ../mail/e-mail-reader.c:2015
+msgid "Display the next message"
+msgstr "Mostra el missatge següent"
+
+#: ../mail/e-mail-reader.c:2020
+msgid "Next _Important Message"
+msgstr "M_issatge important següent"
+
+#: ../mail/e-mail-reader.c:2022
+msgid "Display the next important message"
+msgstr "Mostra el missatge important següent"
+
+#: ../mail/e-mail-reader.c:2027
+msgid "Next _Thread"
+msgstr "Fil següen_t"
+
+#: ../mail/e-mail-reader.c:2029
+msgid "Display the next thread"
+msgstr "Mostra el següent fil"
+
+#: ../mail/e-mail-reader.c:2034
+msgid "Next _Unread Message"
+msgstr "Missa_tge sense llegir següent"
+
+#: ../mail/e-mail-reader.c:2036
+msgid "Display the next unread message"
+msgstr "Mostra el missatge sense llegir següent"
+
+#: ../mail/e-mail-reader.c:2041
+msgid "_Previous Message"
+msgstr "Missa_tge anterior"
+
+#: ../mail/e-mail-reader.c:2043
+msgid "Display the previous message"
+msgstr "Mostra el missatge anterior"
+
+#: ../mail/e-mail-reader.c:2048
+msgid "Pr_evious Important Message"
+msgstr "Missatge important ant_erior"
+
+#: ../mail/e-mail-reader.c:2050
+msgid "Display the previous important message"
+msgstr "Mostra el missatge important anterior"
+
+#: ../mail/e-mail-reader.c:2055
+msgid "Previous T_hread"
+msgstr "_Fil anterior"
+
+#: ../mail/e-mail-reader.c:2057
+msgid "Display the previous thread"
+msgstr "Mostra el fil anterior"
+
+#: ../mail/e-mail-reader.c:2062
+msgid "P_revious Unread Message"
+msgstr "Missatge sense llegir ante_rior"
+
+#: ../mail/e-mail-reader.c:2064
+msgid "Display the previous unread message"
+msgstr "Mostra el missatge sense llegir anterior"
+
+#: ../mail/e-mail-reader.c:2071
+msgid "Print this message"
+msgstr "Imprimeix este missatge"
+
+#: ../mail/e-mail-reader.c:2078
+msgid "Preview the message to be printed"
+msgstr "Previsualitza el missatge que s'imprimirà"
+
+#: ../mail/e-mail-reader.c:2083
+msgid "Re_direct"
+msgstr "Re_direcciona"
+
+#: ../mail/e-mail-reader.c:2085
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Reexpedeix el missatge seleccionat a una altra persona"
+
+#: ../mail/e-mail-reader.c:2090
+msgid "Remo_ve Attachments"
+msgstr "Su_primeix les adjuncions"
+
+#: ../mail/e-mail-reader.c:2092
+msgid "Remove attachments"
+msgstr "Suprimeix les adjuncions"
+
+#: ../mail/e-mail-reader.c:2097
+msgid "Remove Du_plicate Messages"
+msgstr "Suprimeix els missatges _duplicats"
+
+#: ../mail/e-mail-reader.c:2099
+msgid "Checks selected messages for duplicates"
+msgstr "Comprova si hi ha duplicats en els missatges seleccionats"
+
+#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+#: ../modules/mail/e-mail-attachment-handler.c:177
+msgid "Reply to _All"
+msgstr "Respon a _tots"
+
+#: ../mail/e-mail-reader.c:2106
+msgid "Compose a reply to all the recipients of the selected message"
+msgstr ""
+"Redacta una resposta per a tots els destinataris del missatge seleccionat"
+
+#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
+msgid "Reply to _List"
+msgstr "Respon a _la llista"
+
+#: ../mail/e-mail-reader.c:2113
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
+"Redacta una resposta per a la llista de correu del missatge seleccionat"
+
+#: ../mail/e-mail-reader.c:2118
+#: ../modules/mail/e-mail-attachment-handler.c:184
+msgid "_Reply to Sender"
+msgstr "_Respon al remitent"
+
+#: ../mail/e-mail-reader.c:2120
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Redacta una resposta per al remitent del missatge seleccionat"
+
+#: ../mail/e-mail-reader.c:2125
+msgid "_Save as mbox..."
+msgstr "_Anomena i alça com a fitxer mbox..."
+
+#: ../mail/e-mail-reader.c:2127
+msgid "Save selected messages as an mbox file"
+msgstr "Alça els missatges com a fitxer mbox"
+
+#: ../mail/e-mail-reader.c:2132
+msgid "_Message Source"
+msgstr "Font del _missatge"
+
+#: ../mail/e-mail-reader.c:2134
+msgid "Show the raw email source of the message"
+msgstr "Mostra el codi del missatge de correu"
+
+#: ../mail/e-mail-reader.c:2146
+msgid "_Undelete Message"
+msgstr "Desfés la s_upressió del missatge"
+
+#: ../mail/e-mail-reader.c:2148
+msgid "Undelete the selected messages"
+msgstr "Desfés la supressió dels missatges seleccionats"
+
+#: ../mail/e-mail-reader.c:2153
+msgid "_Normal Size"
+msgstr "Mida _normal"
+
+#: ../mail/e-mail-reader.c:2155
+msgid "Reset the text to its original size"
+msgstr "Torna el text a la seua mida original"
+
+#: ../mail/e-mail-reader.c:2160
+msgid "_Zoom In"
+msgstr "A_propa"
+
+#: ../mail/e-mail-reader.c:2162
+msgid "Increase the text size"
+msgstr "Incrementa la mida del text"
+
+#: ../mail/e-mail-reader.c:2167
+msgid "Zoom _Out"
+msgstr "A_llunya"
+
+#: ../mail/e-mail-reader.c:2169
+msgid "Decrease the text size"
+msgstr "Redueix la mida del text"
+
+#: ../mail/e-mail-reader.c:2176
+msgid "Create R_ule"
+msgstr "Crea _una regla"
+
+#: ../mail/e-mail-reader.c:2183
+msgid "Ch_aracter Encoding"
+msgstr "Codificació dels c_aràcters"
+
+#: ../mail/e-mail-reader.c:2190
+msgid "F_orward As"
+msgstr "Reenvia c_om a"
+
+#: ../mail/e-mail-reader.c:2197
+msgid "_Group Reply"
+msgstr "_Respon al grup"
+
+#: ../mail/e-mail-reader.c:2204
+msgid "_Go To"
+msgstr "_Vés a"
+
+#: ../mail/e-mail-reader.c:2211
+msgid "Mar_k As"
+msgstr "Mar_ca com a"
+
+#: ../mail/e-mail-reader.c:2218
+msgid "_Message"
+msgstr "_Missatges"
+
+#: ../mail/e-mail-reader.c:2225
+msgid "_Zoom"
+msgstr "A_propa"
+
+#: ../mail/e-mail-reader.c:2235
+msgid "Search Folder from Mailing _List..."
+msgstr "Carpeta de cerca a partir de _la llista de correu..."
+
+#: ../mail/e-mail-reader.c:2237
+msgid "Create a search folder for this mailing list"
+msgstr "Crea una carpeta de cerca per a esta llista de correu"
+
+#: ../mail/e-mail-reader.c:2242
+msgid "Search Folder from Recipien_ts..."
+msgstr "Carpeta de cerca a partir dels destinata_ris..."
+
+#: ../mail/e-mail-reader.c:2244
+msgid "Create a search folder for these recipients"
+msgstr "Crea una carpeta de cerca per a estos destinataris"
+
+#: ../mail/e-mail-reader.c:2249
+msgid "Search Folder from Sen_der..."
+msgstr "Carpeta de cerca a partir del remite_nt..."
+
+#: ../mail/e-mail-reader.c:2251
+msgid "Create a search folder for this sender"
+msgstr "Crea una carpeta de cerca per a este remitent"
+
+#: ../mail/e-mail-reader.c:2256
+msgid "Search Folder from S_ubject..."
+msgstr "Carpeta de cerca a partir de l'ass_umpte..."
+
+#: ../mail/e-mail-reader.c:2258
+msgid "Create a search folder for this subject"
+msgstr "Crea una carpeta de cerca per a este assumpte"
+
+#: ../mail/e-mail-reader.c:2281
+msgid "Mark for Follo_w Up..."
+msgstr "Marca per al se_guiment..."
+
+#: ../mail/e-mail-reader.c:2289
+msgid "Mark as _Important"
+msgstr "Marca'l com a _important"
+
+#: ../mail/e-mail-reader.c:2293
+msgid "Mark as _Junk"
+msgstr "Marca'l com a bro_ssa"
+
+#: ../mail/e-mail-reader.c:2297
+msgid "Mark as _Not Junk"
+msgstr "_No el marques com a brossa"
+
+#: ../mail/e-mail-reader.c:2301
+msgid "Mar_k as Read"
+msgstr "Mar_ca'l com a llegit"
+
+#: ../mail/e-mail-reader.c:2305
+msgid "Mark as Uni_mportant"
+msgstr "Marca com a no _important"
+
+#: ../mail/e-mail-reader.c:2309
+msgid "Mark as _Unread"
+msgstr "Marca com a _no llegit"
+
+#: ../mail/e-mail-reader.c:2353
+msgid "_Caret Mode"
+msgstr "Mode de _cursor"
+
+#: ../mail/e-mail-reader.c:2355
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Mostra un cursor parpellejant en el cos dels missatges visualitzats"
+
+#: ../mail/e-mail-reader.c:2361
+msgid "All Message _Headers"
+msgstr "Totes les _capçaleres de missatge"
+
+#: ../mail/e-mail-reader.c:2363
+msgid "Show messages with all email headers"
+msgstr "Mostra els missatges amb totes les capçaleres"
+
+#: ../mail/e-mail-reader.c:2659
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "S'està recuperant el missatge «%s»"
+
+#. 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
+#: ../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 "Per defecte"
+
+#: ../mail/e-mail-reader.c:3415
+#: ../modules/mail/e-mail-attachment-handler.c:170
+msgid "_Forward"
+msgstr "_Reenvia"
+
+#: ../mail/e-mail-reader.c:3416
+msgid "Forward the selected message to someone"
+msgstr "Reenvia el missatge seleccionat a una altra persona"
+
+# gal/e-table/e-table-config.glade.h:19
+#: ../mail/e-mail-reader.c:3435
+msgid "Group Reply"
+msgstr "Respon al grup"
+
+#: ../mail/e-mail-reader.c:3436
+msgid "Reply to the mailing list, or to all recipients"
+msgstr "Respon a la llista de correu o a tots els destinataris"
+
+#: ../mail/e-mail-reader.c:3489 ../mail/em-filter-i18n.h:14
+msgid "Delete"
+msgstr "Suprimeix"
+
+#: ../mail/e-mail-reader.c:3522
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../widgets/misc/e-calendar.c:202
+msgid "Next"
+msgstr "Següent"
+
+#: ../mail/e-mail-reader.c:3526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../widgets/misc/e-calendar.c:178
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../mail/e-mail-reader.c:3535 ../mail/mail-dialogs.ui.h:17
+msgid "Reply"
+msgstr "Respon"
+
+#: ../mail/e-mail-reader.c:4205
+#, c-format
+msgid "Folder '%s'"
+msgstr "Carpeta «%s»"
+
+#: ../mail/e-mail-reader-utils.c:145
+msgid "Do not warn me again"
+msgstr "No em tornes a avisar"
+
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:670
+#, 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?"
+msgstr[0] ""
+"La carpeta «%s» conté %u missatge duplicat. Segur que el voleu suprimir?"
+msgstr[1] ""
+"La carpeta «%s» conté %u missatges duplicats. Segur que els voleu suprimir?"
+
+#: ../mail/e-mail-reader-utils.c:1047
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "Alça el missatge"
+msgstr[1] "Alça els missatges"
+
+#. Translators: This is part of a suggested file name
+#. * used when saving a message or multiple messages to
+#. * 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
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "Missatge"
+msgstr[1] "Missatges"
+
+#: ../mail/e-mail-session.c:871
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "Introduïu la contrasenya per a %s"
+
+#: ../mail/e-mail-session.c:875
+msgid "Enter Passphrase"
+msgstr "Introduïu la contrasenya"
+
+#: ../mail/e-mail-session.c:879
+#, c-format
+msgid "Enter Password for %s"
+msgstr "Introduïu la contrasenya per a %s"
+
+#: ../mail/e-mail-session.c:883
+msgid "Enter Password"
+msgstr "Introduïu la contrasenya"
+
+#: ../mail/e-mail-session.c:934
+#, c-format
+msgid "User canceled operation."
+msgstr "L'usuari ha cancel·lat l'operació."
+
+#: ../mail/e-mail-session.c:1047
+#, c-format
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+"No s'ha especificat cap adreça de destinació, de manera que s'ha cancel·lat "
+"el reenviament del missatge."
+
+#: ../mail/e-mail-session.c:1056
+#, c-format
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
+"No s'ha trobat cap compte a utilitzar, de manera que s'ha cancel·lat el "
+"reenviament del missatge."
+
+#: ../mail/e-mail-session-utils.c:419
+#, c-format
+msgid "Cannot get transport for account '%s'"
+msgstr "No es pot obtindre el transport pel compte «%s»"
+
+#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:635
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "No s'han pogut aplicar els filtres d'eixida: %s"
+
+#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
+#: ../mail/mail-ops.c:654 ../mail/mail-ops.c:688
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+"No s'ha pogut afegir a %s: %s\n"
+"S'afegirà a la carpeta local «Enviat» en lloc d'això."
+
+#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:708
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "No s'han pogut afegir a la carpeta local «Enviat»: %s"
+
+#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:831
+#: ../mail/mail-ops.c:927
+msgid "Sending message"
+msgstr "S'està enviant el missatge"
+
+#: ../mail/e-mail-session-utils.c:873
+#, c-format
+msgid "Unsubscribing from folder '%s'"
+msgstr "S'ha cancel·lat la subscripció a la carpeta «%s»"
+
+#: ../mail/e-mail-store-utils.c:168
+#, c-format
+msgid "Disconnecting from '%s'"
+msgstr "S'està desconnectant de «%s»"
+
+#: ../mail/e-mail-store-utils.c:259
+#, c-format
+msgid "Reconnecting to '%s'"
+msgstr "S'està tornant a connectar a «%s»"
+
+#: ../mail/e-mail-store-utils.c:334
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "S'està preparant el compte «%s» per treballar fora de línia"
+
+#: ../mail/e-mail-tag-editor.c:291
+msgid "Flag to Follow Up"
+msgstr "Senyala per respondre"
+
+#. Note to translators: this is the attribution string used
+#. * when quoting messages.  Each ${Variable} gets replaced
+#. * with a value.  To see a full list of available variables,
+#. * see mail/em-composer-utils.c:attribvars array.
+#: ../mail/em-composer-utils.c:1197
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"El ${AbbrevWeekdayName} ${Day} de ${Month} de ${Year} a les ${24Hour}:"
+"${Minute} ${TimeZone}, en/na ${Sender} va escriure:"
+
+#: ../mail/em-composer-utils.c:1208
+msgid "-----Original Message-----"
+msgstr "-----Missatge original-----"
+
+#. 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
+#, c-format
+msgid "Your message to %s about \"%s\" on %s has been read."
+msgstr "S'ha llegit el vostre missatge del %3$s per a %1$s sobre «%2$s»."
+
+#: ../mail/em-composer-utils.c:2052
+#, c-format
+msgid "Delivery Notification for: \"%s\""
+msgstr "Notificació d'entrega per a: «%s»"
+
+#: ../mail/em-composer-utils.c:2592
+msgid "an unknown sender"
+msgstr "un remitent anònim"
+
+#: ../mail/em-composer-utils.c:2998
+msgid "Posting destination"
+msgstr "Destinació de l'enviament"
+
+#: ../mail/em-composer-utils.c:2999
+msgid "Choose folders to post the message to."
+msgstr "Trieu a quines carpetes s'enviarà el missatge."
+
+#: ../mail/em-filter-folder-element.c:241
+msgid "Select Folder"
+msgstr "Seleccioneu una carpeta"
+
+#. Automatically generated. Do not edit.
+#: ../mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Ajusta la puntuació"
+
+#: ../mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Assigna el color"
+
+#: ../mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Assigna la puntuació"
+
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "CCO"
+
+#: ../mail/em-filter-i18n.h:7
+msgid "Beep"
+msgstr "So"
+
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
+#: ../mail/em-filter-i18n.h:9
+msgid "Completed On"
+msgstr "Completat el"
+
+#: ../mail/em-filter-i18n.h:12
+msgid "Date received"
+msgstr "Data de recepció"
+
+#: ../mail/em-filter-i18n.h:13
+msgid "Date sent"
+msgstr "Data d'enviament"
+
+#: ../mail/em-filter-i18n.h:15
+msgid "Deleted"
+msgstr "Suprimit"
+
+#: ../mail/em-filter-i18n.h:17
+msgid "does not end with"
+msgstr "no acaba amb"
+
+#: ../mail/em-filter-i18n.h:18
+msgid "does not exist"
+msgstr "no existeix"
+
+#: ../mail/em-filter-i18n.h:19
+msgid "does not return"
+msgstr "no retorna"
+
+#: ../mail/em-filter-i18n.h:20
+msgid "does not sound like"
+msgstr "no sona com"
+
+#: ../mail/em-filter-i18n.h:21
+msgid "does not start with"
+msgstr "no comença amb"
+
+#: ../mail/em-filter-i18n.h:23
+msgid "Draft"
+msgstr "Esborrany"
+
+#: ../mail/em-filter-i18n.h:24
+msgid "ends with"
+msgstr "acaba amb"
+
+#: ../mail/em-filter-i18n.h:26
+msgid "exists"
+msgstr "existeix"
+
+#: ../mail/em-filter-i18n.h:27
+msgid "Expression"
+msgstr "Expressió"
+
+#: ../mail/em-filter-i18n.h:28
+msgid "Follow Up"
+msgstr "Respondre"
+
+#: ../mail/em-filter-i18n.h:29
+msgid "Forward to"
+msgstr "Reenvia a"
+
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Important"
+
+#: ../mail/em-filter-i18n.h:32
+msgid "is after"
+msgstr "és després de"
+
+#: ../mail/em-filter-i18n.h:33
+msgid "is before"
+msgstr "és abans de"
+
+#: ../mail/em-filter-i18n.h:34
+msgid "is Flagged"
+msgstr "està senyalat"
+
+#: ../mail/em-filter-i18n.h:38
+msgid "is not Flagged"
+msgstr "no està senyalat"
+
+#: ../mail/em-filter-i18n.h:39
+msgid "is not set"
+msgstr "no està definit"
+
+#: ../mail/em-filter-i18n.h:40
+msgid "is set"
+msgstr "està definit"
+
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
+msgid "Junk"
+msgstr "Correu brossa"
+
+#: ../mail/em-filter-i18n.h:42
+msgid "Junk Test"
+msgstr "Prova de correu brossa"
+
+#: ../mail/em-filter-i18n.h:43
+msgid "Label"
+msgstr "Etiqueta"
+
+#: ../mail/em-filter-i18n.h:44
+msgid "Mailing list"
+msgstr "Llista de correu"
+
+#: ../mail/em-filter-i18n.h:45
+msgid "Match All"
+msgstr "Coincideix amb tot"
+
+#: ../mail/em-filter-i18n.h:46
+msgid "Message Body"
+msgstr "Cos del missatge"
+
+#: ../mail/em-filter-i18n.h:47
+msgid "Message Header"
+msgstr "Capçalera del missatge"
+
+#: ../mail/em-filter-i18n.h:48
+msgid "Message is Junk"
+msgstr "El missatge és brossa"
+
+#: ../mail/em-filter-i18n.h:49
+msgid "Message is not Junk"
+msgstr "El missatge no és brossa"
+
+#: ../mail/em-filter-i18n.h:50
+msgid "Message Location"
+msgstr "Ubicació del missatge"
+
+#: ../mail/em-filter-i18n.h:52
+msgid "Pipe to Program"
+msgstr "Envia l'eixida al programa"
+
+#: ../mail/em-filter-i18n.h:53
+msgid "Play Sound"
+msgstr "Reprodueix un so"
+
+#. Past tense, as in "has been read".
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
+msgid "Read"
+msgstr "Llegit"
+
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+msgid "Recipients"
+msgstr "Destinataris"
+
+#: ../mail/em-filter-i18n.h:56
+msgid "Regex Match"
+msgstr "Expressió regular"
+
+#: ../mail/em-filter-i18n.h:57
+msgid "Replied to"
+msgstr "Respost a"
+
+#: ../mail/em-filter-i18n.h:58
+msgid "returns"
+msgstr "retorna"
+
+#: ../mail/em-filter-i18n.h:59
+msgid "returns greater than"
+msgstr "retorna més gran que"
+
+#: ../mail/em-filter-i18n.h:60
+msgid "returns less than"
+msgstr "retorna més petit que"
+
+#: ../mail/em-filter-i18n.h:61
+msgid "Run Program"
+msgstr "Executa el programa"
+
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
+msgid "Score"
+msgstr "Puntuació"
+
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
+msgid "Sender"
+msgstr "Remitent"
+
+#: ../mail/em-filter-i18n.h:64
+msgid "Sender or Recipients"
+msgstr "Remitent o destinataris"
+
+#: ../mail/em-filter-i18n.h:65
+msgid "Set Label"
+msgstr "Defineix l'etiqueta"
+
+#: ../mail/em-filter-i18n.h:66
+msgid "Set Status"
+msgstr "Defineix l'estat"
+
+#: ../mail/em-filter-i18n.h:67
+msgid "Size (kB)"
+msgstr "Mida (kB)"
+
+#: ../mail/em-filter-i18n.h:68
+msgid "sounds like"
+msgstr "sona com"
+
+#: ../mail/em-filter-i18n.h:69
+msgid "Source Account"
+msgstr "Compte origen"
+
+#: ../mail/em-filter-i18n.h:70
+msgid "Specific header"
+msgstr "Capçalera específica"
+
+#: ../mail/em-filter-i18n.h:71
+msgid "starts with"
+msgstr "comença amb"
+
+#: ../mail/em-filter-i18n.h:73
+msgid "Stop Processing"
+msgstr "Atura el processament"
+
+#: ../mail/em-filter-i18n.h:75
+msgid "Unset Status"
+msgstr "Desfés la definició de l'estat"
+
+# gal/e-table/e-table-config.glade.h:16
+# gal/e-table/e-table-config-no-group.glade.h:16
+#. and now for the action area
+#: ../mail/em-filter-rule.c:561
+msgid "Then"
+msgstr "Llavors"
+
+#: ../mail/em-filter-rule.c:592
+msgid "Add Ac_tion"
+msgstr "Afig una a_cció"
+
+#: ../mail/em-folder-properties.c:145
+msgid "Unread messages:"
+msgid_plural "Unread messages:"
+msgstr[0] "Missatge sense llegir:"
+msgstr[1] "Missatges sense llegir:"
+
+#: ../mail/em-folder-properties.c:156
+msgid "Total messages:"
+msgid_plural "Total messages:"
+msgstr[0] "Missatge en total:"
+msgstr[1] "Missatges en total:"
+
+# FIXME (dpm)
+#: ../mail/em-folder-properties.c:177
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "Quota d'utilització d'espai (%s):"
+
+# FIXME (dpm)
+#: ../mail/em-folder-properties.c:179
+#, c-format
+msgid "Quota usage"
+msgstr "Quota d'utilització d'espai"
+
+#: ../mail/em-folder-properties.c:317
+msgid "Folder Properties"
+msgstr "Propietats de la carpeta"
+
+#: ../mail/em-folder-selection-button.c:79
+msgid "<click here to select a folder>"
+msgstr "<feu clic per seleccionar una carpeta>"
+
+#: ../mail/em-folder-selector.c:436
+msgid "C_reate"
+msgstr "C_rea"
+
+#: ../mail/em-folder-selector.c:442
+msgid "Folder _name:"
+msgstr "_Nom de la carpeta:"
+
+#: ../mail/em-folder-tree.c:647
+msgid "Folder names cannot contain '/'"
+msgstr "El nom de la carpeta no pot contindre el caràcter «/»"
+
+#: ../mail/em-folder-tree.c:768
+#, c-format
+msgctxt "folder-display"
+msgid "%s (%u%s)"
+msgstr "%s (%u%s)"
+
+#: ../mail/em-folder-tree.c:1590
+msgid "Mail Folder Tree"
+msgstr "Arbre de carpetes de correu"
+
+#: ../mail/em-folder-tree.c:2069 ../mail/em-folder-utils.c:115
+#, c-format
+msgid "Moving folder %s"
+msgstr "S'està movent la carpeta %s"
+
+#: ../mail/em-folder-tree.c:2072 ../mail/em-folder-utils.c:117
+#, c-format
+msgid "Copying folder %s"
+msgstr "S'està copiant la carpeta %s"
+
+#: ../mail/em-folder-tree.c:2079 ../mail/message-list.c:2303
+#, c-format
+msgid "Moving messages into folder %s"
+msgstr "S'estan movent els missatges a la carpeta %s"
+
+#: ../mail/em-folder-tree.c:2083 ../mail/message-list.c:2305
+#, c-format
+msgid "Copying messages into folder %s"
+msgstr "S'estan copiant els missatges a la carpeta %s"
+
+#: ../mail/em-folder-tree.c:2102
+#, c-format
+msgid "Cannot drop message(s) into toplevel store"
+msgstr "No es poden deixar anar els missatges al magatzem del nivell superior"
+
+#: ../mail/em-folder-tree-model.c:156 ../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:982
+#: ../widgets/misc/e-account-tree-view.c:1052
+#: ../widgets/misc/e-account-tree-view.c:1127
+#: ../widgets/misc/e-account-tree-view.c:1375
+msgid "Search Folders"
+msgstr "Carpetes de cerca"
+
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:195 ../mail/em-folder-tree-model.c:197
+msgid "UNMATCHED"
+msgstr "Cap concordança"
+
+#: ../mail/em-folder-tree-model.c:1004 ../mail/em-folder-tree-model.c:1296
+msgid "Loading..."
+msgstr "S'està carregant..."
+
+#: ../mail/em-folder-utils.c:488
+msgid "Move Folder To"
+msgstr "Mou la carpeta a"
+
+#: ../mail/em-folder-utils.c:488
+msgid "Copy Folder To"
+msgstr "Copia la carpeta a"
+
+#: ../mail/em-folder-utils.c:605
+msgid "Create Folder"
+msgstr "Crea una carpeta"
+
+#: ../mail/em-folder-utils.c:606
+msgid "Specify where to create the folder:"
+msgstr "Especifiqueu on s'ha de crear la carpeta:"
+
+#: ../mail/em-format-html.c:166
+msgid "Formatting message"
+msgstr "S'està formatant el missatge"
+
+#: ../mail/em-format-html.c:378
+msgid "Formatting Message..."
+msgstr "S'està formatant el missatge..."
+
+#: ../mail/em-format-html.c:1562 ../mail/em-format-html.c:1572
+#, c-format
+msgid "Retrieving '%s'"
+msgstr "S'està obtenint «%s»"
+
+#: ../mail/em-format-html.c:1723 ../mail/em-format-html-display.c:89
+msgid "Unsigned"
+msgstr "Sense signar"
+
+#: ../mail/em-format-html.c:1724 ../mail/em-format-html-display.c:90
+msgid "Valid signature"
+msgstr "La signatura és vàlida"
+
+#: ../mail/em-format-html.c:1725 ../mail/em-format-html-display.c:91
+msgid "Invalid signature"
+msgstr "La signatura no és vàlida"
+
+#: ../mail/em-format-html.c:1726 ../mail/em-format-html-display.c:92
+msgid "Valid signature, but cannot verify sender"
+msgstr "La signatura és vàlida però no es pot verificar el remitent"
+
+#: ../mail/em-format-html.c:1727 ../mail/em-format-html-display.c:93
+msgid "Signature exists, but need public key"
+msgstr "La signatura existeix, però es necessita la clau pública"
+
+#: ../mail/em-format-html.c:1733 ../mail/em-format-html-display.c:100
+msgid "Unencrypted"
+msgstr "Sense xifrar"
+
+#: ../mail/em-format-html.c:1734 ../mail/em-format-html-display.c:101
+msgid "Encrypted, weak"
+msgstr "Xifrat, feble"
+
+#: ../mail/em-format-html.c:1735 ../mail/em-format-html-display.c:102
+msgid "Encrypted"
+msgstr "Xifrat"
+
+#: ../mail/em-format-html.c:1736 ../mail/em-format-html-display.c:103
+msgid "Encrypted, strong"
+msgstr "Xifrat, fort"
+
+#: ../mail/em-format-html.c:2136
+msgid "Unknown external-body part."
+msgstr "La part del cos externa és desconeguda."
+
+#: ../mail/em-format-html.c:2146
+msgid "Malformed external-body part."
+msgstr "La part del cos externa està mal formada."
+
+#: ../mail/em-format-html.c:2177
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Punter al lloc FTP (%s)"
+
+#: ../mail/em-format-html.c:2188
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Punter a un fitxer local (%s) vàlid al lloc «%s»"
+
+#: ../mail/em-format-html.c:2190
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Punter al fitxer local (%s)"
+
+#: ../mail/em-format-html.c:2211
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Punter a dades remotes (%s)"
+
+#: ../mail/em-format-html.c:2226
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Punter a dades externes (tipus «%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
+#, c-format
+msgid "From: %s"
+msgstr "De: %s"
+
+#: ../mail/em-format-html.c:2956
+msgid "(no subject)"
+msgstr "(sense assumpte)"
+
+#: ../mail/em-format-html.c:3032
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "Este missatge fou enviat per %s en nom de %s"
+
+#: ../mail/em-format-html-display.c:89
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"Este missatge no està signat. No hi ha cap garantia que el remitent del "
+"missatge siga l'autèntic."
+
+#: ../mail/em-format-html-display.c:90
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"Este missatge està signat i és vàlid. És molt probable que el remitent del "
+"missatge siga l'autèntic."
+
+#: ../mail/em-format-html-display.c:91
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+"No es pot verificar la signatura del missatge. Pot ser que s'haja alterat "
+"durant la transmissió."
+
+#: ../mail/em-format-html-display.c:92
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"Este missatge està signat amb una signatura vàlida, però no es pot verificar "
+"el remitent del missatge."
+
+#: ../mail/em-format-html-display.c:93
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr ""
+"Este missatge està signat amb una signatura vàlida, però no se li ha trobat "
+"la clau pública corresponent."
+
+#: ../mail/em-format-html-display.c:100
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+"Este missatge no està xifrat. Es podria visualitzar el seu contingut en el "
+"transport per Internet."
+
+#: ../mail/em-format-html-display.c:101
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+"Este missatge està xifrat amb un algorisme de xifratge feble. Serà difícil, "
+"però no impossible, que alguna persona desconeguda puga visualitzar el "
+"contingut d'este missatge en una quantitat de temps raonable."
+
+#: ../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."
+msgstr ""
+"Este missatge està xifrat. Seria molt difícil que una persona desconeguda "
+"visualitzés el contingut d'este missatge."
+
+#: ../mail/em-format-html-display.c:103
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+"Este missatge està xifrat amb un algorisme de xifratge fort. Serà molt "
+"difícil que alguna persona desconeguda puga visualitzar el contingut d'este "
+"missatge en una quantitat de temps raonable."
+
+#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
+msgid "_View Certificate"
+msgstr "_Visualitza el certificat"
+
+#: ../mail/em-format-html-display.c:254
+msgid "This certificate is not viewable"
+msgstr "No es pot visualitzar este certificat"
+
+#: ../mail/em-format-html-display.c:566
+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 ""
+"L'Evolution no pot mostrar correctament este correu perquè és massa gros. "
+"Podeu veure'l sense formatar, o amb un editor de text extern."
+
+#: ../mail/em-format-html-display.c:756
+msgid "Save Image"
+msgstr "Alça la imatge"
+
+#: ../mail/em-format-html-display.c:804
+msgid "Save _Image..."
+msgstr "Alça la _imatge..."
+
+#: ../mail/em-format-html-display.c:806
+msgid "Save the image to a file"
+msgstr "Alça la imatge a un fitxer"
+
+#: ../mail/em-format-html-display.c:1034
+msgid "Completed on"
+msgstr "Completat el"
+
+#: ../mail/em-format-html-display.c:1046
+msgid "Overdue:"
+msgstr "Vençut:"
+
+#: ../mail/em-format-html-display.c:1054
+msgid "by"
+msgstr "el"
+
+#: ../mail/em-format-html-display.c:1335 ../mail/em-format-html-display.c:1386
+msgid "View _Unformatted"
+msgstr "Mostra'l sense _format"
+
+#: ../mail/em-format-html-display.c:1337
+msgid "Hide _Unformatted"
+msgstr "Amaga'l _sense format"
+
+#: ../mail/em-format-html-display.c:1408
+msgid "O_pen With"
+msgstr "O_bre amb"
+
+#: ../mail/em-format-html-print.c:176
+#, c-format
+msgid "Page %d of %d"
+msgstr "Pàgina %d de %d"
+
+#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:122
+#, c-format
+msgid "No HTML stream available"
+msgstr "No hi ha cap flux HTML disponible"
+
+#: ../mail/em-subscription-editor.c:1162
+msgid "Folder Subscriptions"
+msgstr "Subscripció a carpetes"
+
+#: ../mail/em-subscription-editor.c:1201
+msgid "_Account:"
+msgstr "_Compte:"
+
+#: ../mail/em-subscription-editor.c:1216
+msgid "Clear Search"
+msgstr "Neteja la cerca"
+
+#: ../mail/em-subscription-editor.c:1234
+msgid "Sho_w items that contain:"
+msgstr "_Mostra els elements que continguen:"
+
+#: ../mail/em-subscription-editor.c:1273
+msgid "Subscribe to the selected folder"
+msgstr "Subscriu-me a la carpeta seleccionada"
+
+#: ../mail/em-subscription-editor.c:1274
+msgid "Su_bscribe"
+msgstr "Su_bscriu-me"
+
+#: ../mail/em-subscription-editor.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
+msgid "Unsubscribe from the selected folder"
+msgstr "Cancel·la la subscripció a la carpeta seleccionada"
+
+#: ../mail/em-subscription-editor.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
+msgid "_Unsubscribe"
+msgstr "Cancel·la la s_ubscripció"
+
+#: ../mail/em-subscription-editor.c:1297
+msgid "Collapse all folders"
+msgstr "Contreu totes les carpetes"
+
+#: ../mail/em-subscription-editor.c:1298
+msgid "C_ollapse All"
+msgstr "Contreu-les _totes"
+
+#: ../mail/em-subscription-editor.c:1308
+msgid "Expand all folders"
+msgstr "Expandeix totes les carpetes"
+
+#: ../mail/em-subscription-editor.c:1309
+msgid "E_xpand All"
+msgstr "E_xpandeix-les totes"
+
+#: ../mail/em-subscription-editor.c:1319
+msgid "Refresh the folder list"
+msgstr "Refresca la llista de carpetes"
+
+#: ../mail/em-subscription-editor.c:1331
+msgid "Stop the current operation"
+msgstr "Cancel·la l'operació actual"
+
+#. Translators: This message is shown only for ten or more
+#. * 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: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] "Voleu obrir %d missatge a la vegada?"
+msgstr[1] "Voleu obrir %d missatges a la vegada?"
+
+#: ../mail/em-utils.c:160
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
+msgid "_Do not show this message again"
+msgstr "_No tornes a mostrar este missatge."
+
+#: ../mail/em-utils.c:335
+msgid "Message Filters"
+msgstr "Filtres de missatge"
+
+#: ../mail/em-utils.c:920
+#, c-format
+msgid "Messages from %s"
+msgstr "Missatges de %s"
+
+#: ../mail/em-vfolder-editor.c:108
+msgid "Search _Folders"
+msgstr "Car_petes de cerca"
+
+#: ../mail/em-vfolder-rule.c:618
+msgid "Add Folder"
+msgstr "Afig una carpeta"
+
+#: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Filter Editor\" window height"
+msgstr "Alçada de la finestra de l'editor de filtres"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Filter Editor\" window maximize state"
+msgstr "Estat de maximització de la finestra de l'editor de filtres"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Filter Editor\" window width"
+msgstr "Amplada de la finestra de l'editor de filtres"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "\"Folder Subscriptions\" window height"
+msgstr "Alçada de la finestra de subscripció a carpetes"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "\"Folder Subscriptions\" window maximize state"
+msgstr "Estat de maximització de la finestra de subscripció a carpetes"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "\"Folder Subscriptions\" window width"
+msgstr "Amplada de la finestra de subscripció a carpetes"
+
+#: ../mail/evolution-mail.schemas.in.h:7
+msgid "\"Search Folder Editor\" window height"
+msgstr "Alçada de la finestra de l'editor de carpetes de cerca"
+
+#: ../mail/evolution-mail.schemas.in.h:8
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "Estat de maximització de la finestra de l'editor de carpetes de cerca"
+
+#: ../mail/evolution-mail.schemas.in.h:9
+msgid "\"Search Folder Editor\" window width"
+msgstr "Amplada de la finestra de l'editor de carpetes de cerca"
+
+#: ../mail/evolution-mail.schemas.in.h:10
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Alçada de la finestra «Envia i rep el correu»"
+
+#: ../mail/evolution-mail.schemas.in.h:11
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "Estat de maximització de la finestra «Envia i rep el correu»"
+
+#: ../mail/evolution-mail.schemas.in.h:12
+msgid "\"Send and Receive Mail\" window width"
+msgstr "Amplada de la finestra «Envia i rep el correu»"
+
+#: ../mail/evolution-mail.schemas.in.h:13
+msgid "Always request read receipt"
+msgstr "Sol·licita sempre una confirmació de lectura"
+
+#: ../mail/evolution-mail.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "Temps en segons durant el qual es mostrarà l'error a la barra d'estat."
+
+#: ../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"
+msgstr ""
+"Demana si s'ha de tancar la finestra del missatge quan l'usuari reenvie o "
+"respongui el missatge dins la finestra"
+
+#: ../mail/evolution-mail.schemas.in.h:16
+msgid "Attribute message."
+msgstr "Missatge d'atribució."
+
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid "Automatic emoticon recognition"
+msgstr "Reconeix automàticament les emoticones"
+
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid "Automatic link recognition"
+msgstr "Reconeix automàticament els enllaços"
+
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Check for new messages in all active accounts"
+msgstr "Comprova si hi ha correu nou a tots els comptes actius"
+
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Check for new messages on start"
+msgstr "Comprova si hi ha correu nou en iniciar"
+
+#: ../mail/evolution-mail.schemas.in.h:21
+msgid "Check incoming mail being junk"
+msgstr "Comprova si el correu d'entrada és brossa"
+
+#: ../mail/evolution-mail.schemas.in.h:22
+msgid "Citation highlight color"
+msgstr "Color de ressaltat de les citacions"
+
+#: ../mail/evolution-mail.schemas.in.h:23
+msgid "Citation highlight color."
+msgstr "Color de ressaltat de les citacions."
+
+#: ../mail/evolution-mail.schemas.in.h:24
+msgid "Composer Window default height"
+msgstr "Alçada per defecte de la finestra del redactor"
+
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Composer Window default width"
+msgstr "Amplada per defecte de la finestra del redactor"
+
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid "Composer load/attach directory"
+msgstr "Directori de càrrega/adjunció del redactor"
+
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Compress display of addresses in TO/CC/BCC"
+msgstr "Comprimeix la visualització de les adreces a Per a/CC/CCO"
+
+#: ../mail/evolution-mail.schemas.in.h:28
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+"Comprimeix la visualització d'adreces a Per a/CC/CCO al nombre especificat a "
+"«adress_count»."
+
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+"Controla cada quan se sincronitzaran els canvis locals amb el servidor "
+"remot. L'interval ha de ser 30 segons com a mínim."
+
+#: ../mail/evolution-mail.schemas.in.h:30
+msgid "Custom headers to use while checking for junk."
+msgstr "Capçaleres a utilitzar per a la comprovació de correu brossa."
+
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"Especifica les capçaleres personalitzades a utilitzar per a la detecció de "
+"correu brossa. El format és «nomdelacapçalera=valor»."
+
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid "Default charset in which to compose messages"
+msgstr "Joc de caràcters per defecte amb què es visualitzaran els missatges"
+
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid "Default charset in which to compose messages."
+msgstr "Joc de caràcters per defecte amb què es redactaran els missatges."
+
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Default charset in which to display messages"
+msgstr "Joc de caràcters per defecte amb què es visualitzaran els missatges"
+
+#: ../mail/evolution-mail.schemas.in.h:35
+msgid "Default charset in which to display messages."
+msgstr "Joc de caràcters per defecte amb què es visualitzaran els missatges."
+
+#: ../mail/evolution-mail.schemas.in.h:36
+msgid "Default forward style"
+msgstr "Estil de reenviament per defecte"
+
+#: ../mail/evolution-mail.schemas.in.h:37
+msgid "Default height of the Composer Window."
+msgstr "Alçada per defecte de la finestra del redactor."
+
+#: ../mail/evolution-mail.schemas.in.h:38
+msgid "Default height of the mail browser window."
+msgstr "Alçada per defecte de la finestra del navegador de correu."
+
+#: ../mail/evolution-mail.schemas.in.h:39
+msgid "Default maximized state of the mail browser window."
+msgstr "Amplada per defecte de la finestra del navegador de correu."
+
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Default reply style"
+msgstr "Estil de resposta per defecte"
+
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid "Default value for thread expand state"
+msgstr "Valor per defecte de l'estat de l'expansió dels fils"
+
+#: ../mail/evolution-mail.schemas.in.h:42
+msgid "Default width of the Composer Window."
+msgstr "Amplada per defecte de la finestra del redactor."
+
+#: ../mail/evolution-mail.schemas.in.h:43
+msgid "Default width of the mail browser window."
+msgstr "Amplada per defecte de la finestra del navegador de correu."
+
+#: ../mail/evolution-mail.schemas.in.h:44
+msgid ""
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded \"1\" = collapsed"
+msgstr ""
+"Defineix si les capçaleres del missatge a la visualització de subfinestra "
+"haurien d'estar col·lapsades (1) o expandides (0) per defecte."
+
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+"Determina si s'han de cercar només les adreces de les llibretes d'adreces "
+"locals en comprovar si hi ha correu brossa"
+
+#: ../mail/evolution-mail.schemas.in.h:46
+msgid "Determines whether to lookup in address book for sender email"
+msgstr ""
+"Determina si s'ha de cercar l'adreça del remitent a la llibreta d'adreces"
+
+#: ../mail/evolution-mail.schemas.in.h:47
+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 ""
+"Determina si s'ha de cercar l'adreça del remitent a la llibreta d'adreces. "
+"Si hi és, el missatge no es considerarà com a brossa. Només es cercarà en "
+"les llibretes marcades per a l'autocompleció, per la qual cosa això pot ser "
+"lent en llibretes d'adreces remotes (p. ex. LDAP) marcades per a "
+"l'autocompleció."
+
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
+"Determina si s'han d'utilitzar capçaleres personalitzades per detectar el "
+"correu brossa"
+
+# FIXME [l10n-bug] (dpm)
+#: ../mail/evolution-mail.schemas.in.h:49
+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 ""
+"Determina si s'han d'utilitzar capçaleres personalitzades per determinar el "
+"que és correu brossa. Si s'habilita esta opció i es mencionen les "
+"capçaleres, s'incrementarà la velocitat de detecció del correu brossa."
+
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+msgstr ""
+"Determina si en la visualització vertical s'han d'utilitzar els mateixos "
+"tipus de lletra per a les línies dels camps «De» i «Assumpte» a la columna "
+"dels «Missatges»."
+
+#: ../mail/evolution-mail.schemas.in.h:51
+msgid "Directory for loading/attaching files to composer."
+msgstr "Directori des d'on carregar/adjuntar fitxers al redactor."
+
+#: ../mail/evolution-mail.schemas.in.h:52
+msgid "Directory for saving mail component files."
+msgstr "Directori on alçar fitxers del component de correu."
+
+#: ../mail/evolution-mail.schemas.in.h:53
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr ""
+"Habilita o inhabilita l'escurçament amb punts suspensius dels noms de les "
+"carpetes a la barra lateral"
+
+#: ../mail/evolution-mail.schemas.in.h:54
+msgid "Display only message texts not exceeding certain size"
+msgstr ""
+"Mostra només els texts dels missatges que no sobreparen una mida determinada"
+
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid "Do not add signature delimiter"
+msgstr "No afiges el delimitador de signatura"
+
+#: ../mail/evolution-mail.schemas.in.h:56
+msgid "Draw spelling error indicators on words as you type."
+msgstr "Marca els errors ortogràfics a les paraules mentre s'escriu."
+
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid "Empty Junk folders on exit"
+msgstr "Buida les carpetes de correu brossa en eixir"
+
+#: ../mail/evolution-mail.schemas.in.h:58
+msgid "Empty Trash folders on exit"
+msgstr "Buida les papereres en eixir"
+
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "Buida totes les carpetes de correu brossa en eixir de l'Evolution."
+
+#: ../mail/evolution-mail.schemas.in.h:60
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Buida les carpetes de paperera en eixir de l'Evolution."
+
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+"Habilita les imatges animades en els correus de format HTML. Molts usuaris "
+"les troben empipadores i prefereixen utilitzar una imatge estàtica en lloc "
+"d'elles."
+
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+"Habilita el mode de cursor, de manera que vegeu un cursor en llegir el "
+"correu."
+
+#: ../mail/evolution-mail.schemas.in.h:63
+#, fuzzy
+msgid "Enable local folders"
+msgstr "Totes les carpetes locals"
+
+#: ../mail/evolution-mail.schemas.in.h:64
+msgid "Enable or disable magic space bar"
+msgstr "Habilita o inhabilita la tecla d'espai màgica"
+
+#: ../mail/evolution-mail.schemas.in.h:65
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "Habilita/inhabilita la pregunta en marcar múltiples missatges."
+
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid "Enable or disable type ahead search feature"
+msgstr "Habilita o inhabilita la cerca mentre escriviu"
+
+#: ../mail/evolution-mail.schemas.in.h:67
+msgid "Enable search folders"
+msgstr "Habilita les carpetes de cerca"
+
+#: ../mail/evolution-mail.schemas.in.h:68
+msgid "Enable search folders on startup."
+msgstr "Habilita les carpetes de cerca a l'inici."
+
+#: ../mail/evolution-mail.schemas.in.h:69
+msgid ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
+msgstr ""
+"Habilita la funció de cerca de la barra lateral per permetre la cerca "
+"interactiva de noms de carpeta."
+
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
+"Habiliteu-ho per utilitzar la tecla d'espai per desplaçar-se en la "
+"previsualització dels missatges, en la llista dels missatges i en la de les "
+"carpetes."
+
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
+"Habilita la visualització dels texts de missatge que no sobreparen la mida "
+"definida a la clau «message_text_part_limit»."
+
+#: ../mail/evolution-mail.schemas.in.h:72
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr ""
+"Habiliteu-ho per utilitzar uns paràmetres semblants per la visualització de "
+"la llista de missatges per a totes les carpetes"
+
+#: ../mail/evolution-mail.schemas.in.h:73
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr ""
+"Habiliteu-ho per utilitzar uns paràmetres semblants per la visualització de "
+"la llista de missatges per a totes les carpetes."
+
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid "Enable/disable caret mode"
+msgstr "Habilita/inhabilita el mode de cursor"
+
+#: ../mail/evolution-mail.schemas.in.h:75 ../mail/mail-config.ui.h:45
+msgid "Encode file names in an Outlook/GMail way"
+msgstr "Codifica els noms de fitxer tal com ho fan l'Outlook i el GMail"
+
+#: ../mail/evolution-mail.schemas.in.h:76
+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 ""
+"Codifica els noms de fitxer en les capçaleres de correu de la mateixa manera "
+"que ho fan l'Outlook o el GMail, de manera que estos mostren correctament "
+"els noms de fitxer amb UTF-8 enviats amb l'Evolution. Això cal fer-ho perquè "
+"no segueixen l'RFC 2231, sinó que utilitzen l'estàndard incorrecte RFC 2047."
+
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "Flush Outbox after filtering"
+msgstr "Buida la safata d'eixida després de filtrar"
+
+#: ../mail/evolution-mail.schemas.in.h:78
+msgid "Forward message."
+msgstr "Missatge reenviat."
+
+#: ../mail/evolution-mail.schemas.in.h:79
+msgid "Group Reply replies to list"
+msgstr "La resposta al grup respon a la llista"
+
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid "Height of the message-list pane"
+msgstr "Alçada de la subfinestra de la llista de missatges"
+
+#: ../mail/evolution-mail.schemas.in.h:81
+msgid "Height of the message-list pane."
+msgstr "Alçada de la subfinestra de la llista de missatges."
+
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "Oculta la previsualització per a cada carpeta i suprimeix la selecció"
+
+#: ../mail/evolution-mail.schemas.in.h:83
+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 ""
+"Pregunta a l'usuari si de debò vol obrir deu o més missatges a la vegada."
+
+#: ../mail/evolution-mail.schemas.in.h:84
+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 ""
+"Si l'Evolution no té un visualitzador integrat per a un tipus MIME concret, "
+"qualsevol dels tipus MIME d'esta llista que es corresponguin amb un "
+"visualitzador de components Bonobo de la base de dades MIME del GNOME poden "
+"ser utilitzats per visualitzar-ne el contingut."
+
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid "Ignore list Reply-To:"
+msgstr "Ignora «Reply-To:» (respon a) a les llistes"
+
+#: ../mail/evolution-mail.schemas.in.h:86
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr ""
+"Alçada inicial de la finestra de l'editor de filtres. S'actualitza a mesura "
+"que l'usuari canvia la mida vertical de la finestra."
+
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid ""
+"Initial height of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Alçada inicial de la finestra de subscripció a carpetes. S'actualitza a "
+"mesura que l'usuari canvia la mida vertical de la finestra."
+
+#: ../mail/evolution-mail.schemas.in.h:88
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Alçada inicial de la finestra de l'editor de carpetes de cerca. S'actualitza "
+"a mesura que l'usuari canvia la mida vertical de la finestra."
+
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Alçada inicial de la finestra «Envia i rep el correu». S'actualitza a mesura "
+"que l'usuari canvia la mida vertical de la finestra."
+
+#: ../mail/evolution-mail.schemas.in.h:90
+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 ""
+"Estat de maximització inicial de la finestra de l'editor de filtres. "
+"S'actualitza a mesura que l'usuari maximitza o minimitza  la finestra. "
+"Tingueu en compte que l'Evolution no utilitza este valor degut al fet que "
+"esta finestra no es pot maximitzar. Esta clau existeix només com a detall "
+"d'implementació."
+
+#: ../mail/evolution-mail.schemas.in.h:91
+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 ""
+"Estat de maximització inicial de la finestra subscripció a carpetes. "
+"S'actualitza a mesura que l'usuari maximitza o minimitza  la finestra. "
+"Tingueu en compte que l'Evolution no utilitza este valor degut al fet que "
+"esta finestra no es pot maximitzar. Esta clau existeix només com a detall "
+"d'implementació."
+
+#: ../mail/evolution-mail.schemas.in.h:92
+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 ""
+"Estat de maximització inicial de la finestra de l'editor de carpetes de "
+"cerca. S'actualitza a mesura que l'usuari maximitza o minimitza  la "
+"finestra. Tingueu en compte que l'Evolution no utilitza este valor degut al "
+"fet que esta finestra no es pot maximitzar. Esta clau existeix només com a "
+"detall d'implementació."
+
+#: ../mail/evolution-mail.schemas.in.h:93
+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 ""
+"Estat de maximització inicial de la finestra «Envia i rep el correu». "
+"S'actualitza a mesura que l'usuari maximitza o minimitza  la finestra. "
+"Tingueu en compte que l'Evolution no utilitza este valor degut al fet que "
+"esta finestra no es pot maximitzar. Esta clau existeix només com a detall "
+"d'implementació."
+
+#: ../mail/evolution-mail.schemas.in.h:94
+msgid ""
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+msgstr ""
+"Amplada inicial de la finestra de l'editor de filtres. S'actualitza a mesura "
+"que l'usuari canvia la mida horitzontal de la finestra."
+
+#: ../mail/evolution-mail.schemas.in.h:95
+msgid ""
+"Initial width of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Amplada inicial de la finestra de subscripció a carpetes. S'actualitza a "
+"mesura que l'usuari canvia la mida horitzontal de la finestra."
+
+#: ../mail/evolution-mail.schemas.in.h:96
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Amplada inicial de la finestra de l'editor de carpetes de cerca. "
+"S'actualitza a mesura que l'usuari canvia la mida horitzontal de la finestra."
+
+#: ../mail/evolution-mail.schemas.in.h:97
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Amplada inicial de la finestra «Envia i rep el correu». S'actualitza a "
+"mesura que l'usuari canvia la mida horitzontal de la finestra."
+
+#: ../mail/evolution-mail.schemas.in.h:98
+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 ""
+"En lloc del comportament normal de l'acció «Respon a tots», esta opció farà "
+"que el botó «Respon al grup» de la barra d'eines intente respondre a la "
+"llista de correu a través de la qual heu rebut una còpia del missatge al "
+"qual voleu respondre."
+
+#: ../mail/evolution-mail.schemas.in.h:99
+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 ""
+"Habilita o inhabilita la mostra de confirmacions múltiples per advertir que "
+"en suprimir els missatges d'una carpeta de cerca la supressió serà "
+"permanent, i que no només implica la supressió d'estos en els resultats de "
+"la cerca."
+
+#: ../mail/evolution-mail.schemas.in.h:100
+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 ""
+"Habilita o inhabilita la mostra de confirmacions múltiples per advertir que "
+"esteu enviant una resposta privada a un missatge que ha arribat a través "
+"d'una llista de correu."
+
+#: ../mail/evolution-mail.schemas.in.h:101
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr ""
+"Habilita o inhabilita la mostra de confirmacions múltiples per advertir que "
+"esteu enviant una resposta a diverses persones."
+
+#: ../mail/evolution-mail.schemas.in.h:102
+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 ""
+"Habilita o inhabilita la mostra de confirmacions múltiples per advertir que "
+"esteu enviant una resposta privada a un missatge que ha arribat a través "
+"d'una llista de correu, però la llista estableix una capçalera Respon-a: "
+"(«Reply-To:») que torna a dirigir la vostra resposta a la llista"
+
+#: ../mail/evolution-mail.schemas.in.h:103
+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 ""
+"Habilita o inhabilita la mostra de confirmacions múltiples per advertir que "
+"esteu intentant enviar un missatge a destinataris que no s'han introduït com "
+"a adreces de correu"
+
+#: ../mail/evolution-mail.schemas.in.h:104
+msgid "Last time Empty Junk was run"
+msgstr "La darrera vegada que es va buidar la paperera de correu brossa"
+
+#: ../mail/evolution-mail.schemas.in.h:105
+msgid "Last time Empty Trash was run"
+msgstr "La darrera vegada que es va buidar la paperera"
+
+#: ../mail/evolution-mail.schemas.in.h:106
+msgid "Layout style"
+msgstr "Estil de disposició"
+
+#: ../mail/evolution-mail.schemas.in.h:107
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
+msgid "Level beyond which the message should be logged."
+msgstr "Nivell per sobre del qual s'enregistrarà el missatge."
+
+#: ../mail/evolution-mail.schemas.in.h:108
+msgid "List of Labels and their associated colors"
+msgstr "Llista d'etiquetes i els seus colors associats"
+
+#: ../mail/evolution-mail.schemas.in.h:109
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr ""
+"Llista de tipus MIME per als quals es cercaran components de visualització "
+"del Bonobo"
+
+#: ../mail/evolution-mail.schemas.in.h:110
+msgid "List of accepted licenses"
+msgstr "Llista de llicències acceptades"
+
+#: ../mail/evolution-mail.schemas.in.h:111
+msgid "List of accounts"
+msgstr "Llista de comptes"
+
+#: ../mail/evolution-mail.schemas.in.h:112
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+"Llista de comptes reconegudes pel component de correu de l'Evolution. La "
+"llista conté cadenes referents a subdirectoris relatius a /apps/evolution/"
+"mail/accounts."
+
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "List of custom headers and whether they are enabled."
+msgstr "Llista de capçaleres personalitzades i si estan habilitades."
+
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+"Llista dels codis de llengua dels diccionaris a utilitzar per a la "
+"verificació ortogràfica."
+
+#: ../mail/evolution-mail.schemas.in.h:115
+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 ""
+"Llista d'etiquetes reconegudes pel component de correu de l'Evolution. La "
+"llista conté cadenes de tipus nom:color, on color fa servir la codificació "
+"hexadecimal HTML."
+
+#: ../mail/evolution-mail.schemas.in.h:116
+msgid "List of protocol names whose license has been accepted."
+msgstr "Llista de noms de protocol per als quals s'ha acceptat la llicència."
+
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid "Load images for HTML messages over HTTP"
+msgstr "Carrega les imatges dels missatges HTML a través de l'HTTP"
+
+#: ../mail/evolution-mail.schemas.in.h:118
+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 ""
+"Carrega imatges per a missatges HTML a través de l'HTTP(S). Els valors "
+"possibles són: «0» - mai carreguis imatges de la xarxa, «1»- carrega imatges "
+"dels contactes, «2» - carrega sempre les imatges de la xarxa."
+
+#: ../mail/evolution-mail.schemas.in.h:119
+msgid "Log filter actions"
+msgstr "Registra les accions del filtre"
+
+#: ../mail/evolution-mail.schemas.in.h:120
+msgid "Log filter actions to the specified log file."
+msgstr "Registra les accions al fitxer de registre especificat."
+
+#: ../mail/evolution-mail.schemas.in.h:121
+msgid "Logfile to log filter actions"
+msgstr "Fitxer on registrar accions de filtre"
+
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid "Logfile to log filter actions."
+msgstr "Fitxer on enregistrar accions de filtre."
+
+#: ../mail/evolution-mail.schemas.in.h:123
+msgid "Mail browser height"
+msgstr "Alçada del navegador de correu"
+
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Mail browser maximized"
+msgstr "Maximitza el navegador de correu"
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Mail browser width"
+msgstr "Amplada del navegador de correu"
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Mark as Seen after specified timeout"
+msgstr "Marca com a vist després del temps d'espera"
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Mark as Seen after specified timeout."
+msgstr "Marca com a vist després del temps d'espera."
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Mark citations in the message \"Preview\""
+msgstr "Marca les citacions en la «Previsualització» del missatge"
+
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Mark citations in the message \"Preview\"."
+msgstr "Marca les citacions en la «Previsualització» del missatge."
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Message text limit for display"
+msgstr "Límit del text dels missatges per mostrar-los"
+
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr ""
+"Estil de visualització de missatges a normal («normal»), capçaleres senceres "
+"(«full headers»), font («source»)"
+
+#: ../mail/evolution-mail.schemas.in.h:132
+msgid "Minimum days between emptying the junk on exit"
+msgstr ""
+"Mínim nombre de dies entre buidatges de la paperera de correu brossa en eixir"
+
+#: ../mail/evolution-mail.schemas.in.h:133
+msgid "Minimum days between emptying the trash on exit"
+msgstr "Mínim nombre de dies entre buidatges de la paperera en eixir"
+
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr ""
+"Temps mínim entre buidatges de la paperera de correu brossa en eixir, en "
+"dies."
+
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr "Temps mínim entre buidatges de la paperera en eixir, en dies."
+
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr "Nombre d'adreces a mostrar a Per a/CC/CCO"
+
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid "Original message."
+msgstr "Missatge original."
+
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "Path where picture gallery should search for its content"
+msgstr "Camí en el qual la galeria d'imatges ha de cercar el contingut"
+
+#: ../mail/evolution-mail.schemas.in.h:139
+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 ""
+"Els valors possibles són «never» (mai) - per no tancar mai la finestra de "
+"navegació; «always» (sempre) - per tancar sempre la finestra de navegació; "
+"«ask» (demana-ho) - per demanar-li a l'usuari si vol tancar la finestra de "
+"navegació"
+
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid "Prompt before sending to recipients not entered as mail addresses"
+msgstr ""
+"Demana confirmació abans d'enviar correus a destinataris que no s'han "
+"introduït com a adreça de correu"
+
+#: ../mail/evolution-mail.schemas.in.h:141
+msgid "Prompt on empty subject"
+msgstr "Pregunta quan l'assumpte siga buit"
+
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr "Pregunta l'usuari quan intente buidar una carpeta."
+
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr "Pregunta quan l'usuari intente enviar un missatge sense assumpte."
+
+#: ../mail/evolution-mail.schemas.in.h:144
+msgid "Prompt when deleting messages in search folder"
+msgstr "Pregunta quan se suprimisquen els missatges d'una carpeta de cerca"
+
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "Pregunta quan la llista de correu segresti les respostes privades"
+
+#: ../mail/evolution-mail.schemas.in.h:146
+msgid "Prompt when replying privately to list messages"
+msgstr "Pregunta en respondre privadament a missatges d'una llista de correu"
+
+#: ../mail/evolution-mail.schemas.in.h:147
+msgid "Prompt when replying to many recipients"
+msgstr "Pregunta en respondre a diversos destinataris"
+
+#: ../mail/evolution-mail.schemas.in.h:148
+msgid "Prompt when user expunges"
+msgstr "Pregunta quan l'usuari buide"
+
+#: ../mail/evolution-mail.schemas.in.h:149
+msgid "Prompt when user only fills Bcc"
+msgstr "Pregunta quan l'usuari només entri el camp CCO"
+
+#: ../mail/evolution-mail.schemas.in.h:150
+msgid "Prompt when user tries to open 10 or more messages at once"
+msgstr "Pregunta quan l'usuari intente obrir deu o més missatges a la vegada"
+
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"Pregunta quan l'usuari intente enviar correu HTML a destinataris que no "
+"volen rebre correu HTML."
+
+#: ../mail/evolution-mail.schemas.in.h:152
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+"Pregunta quan l'usuari intente enviar un missatge sense destinataris a Per a "
+"o CC."
+
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr "Pregunta quan l'usuari intente enviar correu HTML no desitjat"
+
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid "Prompt while marking multiple messages"
+msgstr "Pregunta en marcar múltiples missatges"
+
+#: ../mail/evolution-mail.schemas.in.h:155
+msgid "Put personalized signatures at the top of replies"
+msgstr "Posa signatures personalitzades a la part superior de les respostes"
+
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Put the cursor at the bottom of replies"
+msgstr "Posa el cursor al final del missatge en respondre"
+
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "Recognize emoticons in text and replace them with images."
+msgstr ""
+"Reconeix les emoticones en el text i reemplaça-les per les seues imatges."
+
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid "Recognize links in text and replace them."
+msgstr "Reconeix els enllaços en el text i reemplaça'ls."
+
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid "Run junk test on incoming mail."
+msgstr "Executa la prova de brossa per al correu d'entrada."
+
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid "Save directory"
+msgstr "Directori on alçar"
+
+#: ../mail/evolution-mail.schemas.in.h:161
+msgid "Search for the sender photo in local address books"
+msgstr "Cerca la fotografia del remitent a les llibretes d'adreces locals"
+
+#: ../mail/evolution-mail.schemas.in.h:162
+msgid "Send HTML mail by default"
+msgstr "Envia els missatges en format HTML per defecte"
+
+#: ../mail/evolution-mail.schemas.in.h:163
+msgid "Send HTML mail by default."
+msgstr "Envia els missatges en format HTML per defecte."
+
+#: ../mail/evolution-mail.schemas.in.h:164
+msgid "Sender email-address column in the message list"
+msgstr "Columna del correu del remitent a la llista de missatges"
+
+#: ../mail/evolution-mail.schemas.in.h:165
+msgid "Server synchronization interval"
+msgstr "Interval de sincronització amb el servidor"
+
+#: ../mail/evolution-mail.schemas.in.h:166
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+"Establiu-ho a «TRUE» (cert) si en redactar un correu no voleu afegir un "
+"delimitador abans de la signatura."
+
+#: ../mail/evolution-mail.schemas.in.h:167
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "Mostra el camp «CCO» en enviar un missatge de correu"
+
+#: ../mail/evolution-mail.schemas.in.h:168
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr "Mostra el camp «CC» en enviar un missatge de correu"
+
+#: ../mail/evolution-mail.schemas.in.h:169
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr "Mostra el camp «De» en enviar un missatge a un grup de notícies"
+
+#: ../mail/evolution-mail.schemas.in.h:170
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr "Mostra el camp «Respon a» en enviar un missatge a un grup de notícies"
+
+#: ../mail/evolution-mail.schemas.in.h:171
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "Mostra el camp «Respon a» en enviar un missatge de correu"
+
+#: ../mail/evolution-mail.schemas.in.h:172
+msgid "Show Animations"
+msgstr "Mostra les animacions"
+
+#: ../mail/evolution-mail.schemas.in.h:173
+msgid "Show all message headers"
+msgstr "Mostra totes les capçaleres de missatge"
+
+#: ../mail/evolution-mail.schemas.in.h:174
+msgid "Show all the headers when viewing a messages."
+msgstr "Mostra totes les capçaleres en visualitzar un missatge."
+
+#: ../mail/evolution-mail.schemas.in.h:175
+msgid "Show animated images as animations."
+msgstr "Mostra les imatges animades com a animacions."
+
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+"Mostra els missatges suprimits a la llista de missatges (amb una ratlla a "
+"sobre)."
+
+#: ../mail/evolution-mail.schemas.in.h:177
+msgid "Show deleted messages in the message-list"
+msgstr "Mostra els missatges suprimits a la llista de missatges"
+
+#: ../mail/evolution-mail.schemas.in.h:178
+msgid "Show image animations"
+msgstr "Mostra les animacions de les imatges"
+
+#: ../mail/evolution-mail.schemas.in.h:179
+msgid "Show original \"Date\" header value."
+msgstr "Mostra el valor de la capçalera original de «Date» (data)."
+
+#: ../mail/evolution-mail.schemas.in.h:180
+msgid "Show photo of the sender"
+msgstr "Mostra la fotografia del remitent"
+
+#: ../mail/evolution-mail.schemas.in.h:181
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"Mostra el camp «CCO» en enviar un missatge de correu. Este paràmetre es "
+"controla des del menú Visualitza en seleccionar un compte de correu."
+
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"Mostra el camp «CC» en enviar un missatge de correu. Este paràmetre es "
+"controla des del menú Visualitza en seleccionar un compte de correu."
+
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+"Mostra el camp «De» en enviar un missatge a un grup de notícies. Este "
+"paràmetre es controla des del menú Visualitza en seleccionar un compte de "
+"grup de notícies."
+
+#: ../mail/evolution-mail.schemas.in.h:184
+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 ""
+"Mostra el camp «Respon a» en enviar un missatge a un grup de notícies. Este "
+"paràmetre es controla des del menú Visualitza en seleccionar un compte de "
+"grup de notícies."
+
+#: ../mail/evolution-mail.schemas.in.h:185
+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 ""
+"Mostra el camp «Respon a» en enviar un missatge de correu. Este paràmetre es "
+"controla des del menú Visualitza en seleccionar un compte de correu."
+
+#: ../mail/evolution-mail.schemas.in.h:186
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr ""
+"Mostra el correu del remitent en una columna separada a la llista de "
+"missatges."
+
+#: ../mail/evolution-mail.schemas.in.h:187
+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 ""
+"Mostra la capçalera «Date» (data) original (amb una hora local en cas que "
+"els fusos horaris no coincidisquen). En cas contrari mostra sempre el valor "
+"de la capçalera «Date» en el format preferit de l'usuari i en el fus horari "
+"local."
+
+#: ../mail/evolution-mail.schemas.in.h:188
+msgid "Show the photo of the sender in the message reading pane."
+msgstr ""
+"Mostra la fotografia del remitent a la subfinestra de lectura de missatges."
+
+#: ../mail/evolution-mail.schemas.in.h:189
+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 ""
+"Algunes llistes de correu estableixen una capçalera «Respon-a:» («Reply-"
+"To:») per forçar als usuaris a enviar respostes a la llista, fins i tot quan "
+"han especificat que l'Evolution envie una resposta privada. En establir esta "
+"opció com a TRUE (cert), l'Evolution intentarà ignorar estes capçaleres "
+"Respon-a:, de manera que es puga comportar tal com s'espera. Si utilitzeu "
+"l'acció de resposta privada, s'enviarà una resposta privada, mentre que si "
+"utilitzeu l'opció «Respon a la llista», es respondrà a la llista. El "
+"funcionament es basa en comparar la capçalera «Reply-To:» amb la capçalera "
+"«List-Post:», si és que n'hi ha una."
+
+#: ../mail/evolution-mail.schemas.in.h:190
+msgid "Sort accounts alphabetically in a folder tree"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:191
+msgid "Spell check inline"
+msgstr "Comprovació ortogràfica mentre s'escriu"
+
+#: ../mail/evolution-mail.schemas.in.h:192
+msgid "Spell checking color"
+msgstr "Color de la verificació ortogràfica"
+
+#: ../mail/evolution-mail.schemas.in.h:193
+msgid "Spell checking languages"
+msgstr "Llengües per a la verificació ortogràfica"
+
+#: ../mail/evolution-mail.schemas.in.h:194
+msgid "State of message headers in paned view"
+msgstr ""
+"L'estat de les capçaleres del missatge a la visualització de subfinestra"
+
+#: ../mail/evolution-mail.schemas.in.h:195
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:196
+msgid "Terminal font"
+msgstr "Tipus de lletra de terminal"
+
+#: ../mail/evolution-mail.schemas.in.h:197
+msgid "The default plugin for Junk hook"
+msgstr "El connector de correu brossa per defecte"
+
+#: ../mail/evolution-mail.schemas.in.h:198
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr ""
+"La darrera vegada que es va buidar la paperera de correu brossa, en dies des "
+"de l'inici de l'època Unix (1 de gener de 1970)."
+
+#: ../mail/evolution-mail.schemas.in.h:199
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr ""
+"La darrera vegada que es va buidar la paperera, en dies des de l'inici de "
+"l'època Unix (1 de gener de 1970)."
+
+#: ../mail/evolution-mail.schemas.in.h:200
+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 ""
+"L'estil de disposició determina on posar la subfinestra en relació a la "
+"llista de missatges. El valor «0» (visualització clàssica) ubica la "
+"subfinestra de previsualització sota la llista de missatges. El valor "
+"«1» (visualització vertical) ubica la subfinestra de previsualització al "
+"costat de la llista de missatges."
+
+#: ../mail/evolution-mail.schemas.in.h:201
+msgid "The terminal font for mail display."
+msgstr "El tipus de lletra de terminal per visualitzar el correu."
+
+#: ../mail/evolution-mail.schemas.in.h:202
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows."
+msgstr ""
+"El text que s'afegirà en reenviar un missatge, el qual indica que es mostra "
+"el missatge reenviat a continuació."
+
+#: ../mail/evolution-mail.schemas.in.h:203
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows."
+msgstr ""
+"El text que s'afegirà en respondre a un missatge (amb la resposta al "
+"capdamunt), el qual indica que es mostra el missatge original a continuació."
+
+#: ../mail/evolution-mail.schemas.in.h:204
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author."
+msgstr ""
+"El text que s'afegirà en respondre a un missatge, el qual atribueix el "
+"missatge a l'autor original."
+
+#: ../mail/evolution-mail.schemas.in.h:205
+msgid "The variable width font for mail display."
+msgstr "El tipus de lletra de mida variable per visualitzar el correu."
+
+#: ../mail/evolution-mail.schemas.in.h:206
+msgid ""
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+msgstr ""
+"Això pot tindre tres valors possibles: «0» per als errors, «1» per als "
+"avisos, i «2» per als missatges de depuració."
+
+#: ../mail/evolution-mail.schemas.in.h:207
+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 ""
+"Això decideix la mida màxima de la part de text que es mostrarà a "
+"l'Evolution. El valor per defecte és 4096 KB (4 MB), i s'especifica en KB. "
+"Este valor s'utilitza només en activar la clau «force_message_limit»."
+
+#: ../mail/evolution-mail.schemas.in.h:208
+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 ""
+"El connector de correu brossa per defecte, encara que tingueu múltiples "
+"connectors habilitats. Si s'inhabilita este connector per defecte, "
+"l'Evolution tampoc recorrerà als altres connectors disponibles."
+
+#: ../mail/evolution-mail.schemas.in.h:209
+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 ""
+"Esta clau es llig només una vegada i a continuació es reinicialitza com a "
+"«false» (falsa). Això provoca que es desfaci la selecció dels correus de la "
+"llista i que se suprimisca la previsualització de la carpeta."
+
+#: ../mail/evolution-mail.schemas.in.h:210
+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 ""
+"Esta clau ha de contindre una llista d'estructures XML que especifique "
+"capçaleres personalitzades i si s'han de visualitzar. El format de "
+"l'estructura XML és &lt;capçalera enabled&gt;. Indiqueu «enabled» si s'ha de "
+"visualitzar la capçalera en la visualització del correu."
+
+#: ../mail/evolution-mail.schemas.in.h:211
+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 ""
+"Esta opció està relacionada amb la clau lookup_addressbook i s'utilitza per "
+"determinar si s'han de cercar adreces només en les llibretes d'adreces "
+"locals amb la finalitat d'excloure els correus enviats per contactes "
+"coneguts del filtratge de correu brossa."
+
+#: ../mail/evolution-mail.schemas.in.h:212
+msgid "This option would help in improving the speed of fetching."
+msgstr "Esta opció ajudaria a millorar la velocitat de recollida."
+
+#: ../mail/evolution-mail.schemas.in.h:213
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr ""
+"Això estableix el nombre d'adreces per mostrar a la visualització de la "
+"llista de missatges."
+
+#: ../mail/evolution-mail.schemas.in.h:214
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Requires a restart to apply."
+msgstr ""
+"Este paràmetre especifica si l'estat per defecte dels fils és expandit o "
+"contret. Haureu de reiniciar perquè els canvis tinguen efecte."
+
+#: ../mail/evolution-mail.schemas.in.h:215
+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 ""
+"Este paràmetre especifica si els fils s'ordenaran basant-se en el darrer "
+"missatge de cadascun d'ells, o bé segons la data del missatge. Haureu de "
+"reiniciar l'Evolution perquè els canvis tinguen efecte."
+
+#: ../mail/evolution-mail.schemas.in.h:216
+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 ""
+"Este valor pot ser una cadena buida, cosa que indicarà que s'haurà "
+"d'utilitzar la carpeta d'imatges del sistema (que és generalment la carpeta "
+"Imatges dins la carpeta de l'usuari). Esta carpeta també s'utilitzarà quan "
+"el camí establit no correspongui a una carpeta existent."
+
+#: ../mail/evolution-mail.schemas.in.h:217
+msgid "Thread the message-list based on Subject"
+msgstr "Crea fils basats en l'assumpte en la llista de missatges"
+
+#: ../mail/evolution-mail.schemas.in.h:218
+msgid "Timeout for marking message as seen"
+msgstr "Temps d'espera per marcar un missatge com a llegit"
+
+#: ../mail/evolution-mail.schemas.in.h:219
+msgid "Timeout for marking message as seen."
+msgstr "Temps d'espera per marcar un missatge com a llegit."
+
+#: ../mail/evolution-mail.schemas.in.h:220
+msgid "UID string of the default account."
+msgstr "Cadena d'identificació d'usuari del compte per defecte."
+
+#: ../mail/evolution-mail.schemas.in.h:221
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
+"Color de subratllat per als errors ortogràfics quan s'utilitze la "
+"verificació ortogràfica."
+
+#: ../mail/evolution-mail.schemas.in.h:222
+msgid "Use custom fonts"
+msgstr "Utilitza tipus de lletra personalitzats"
+
+#: ../mail/evolution-mail.schemas.in.h:223
+msgid "Use custom fonts for displaying mail."
+msgstr "Utilitza tipus de lletra personalitzats per visualitzar el correu."
+
+#: ../mail/evolution-mail.schemas.in.h:224
+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 ""
+"Els usuaris tenen diferents preferències sobre on s'ha de situar el cursor "
+"en respondre a un missatge. Este paràmetre determina si el cursor s'ha de "
+"posicionar a l'inici o al final del missatge."
+
+#: ../mail/evolution-mail.schemas.in.h:225
+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 ""
+"Els usuaris tenen diferents preferències sobre on s'ha de situar la "
+"signatura en respondre a un missatge. Este paràmetre determina si la "
+"signatura s'ha de posicionar a l'inici o al final del missatge."
+
+#: ../mail/evolution-mail.schemas.in.h:226
+msgid "Variable width font"
+msgstr "Tipus de lletra de mida variable"
+
+#: ../mail/evolution-mail.schemas.in.h:227
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr ""
+"Si s'afegirà una sol·licitud de confirmació de lectura per a cada missatge "
+"de manera per defecte."
+
+#: ../mail/evolution-mail.schemas.in.h:228
+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 ""
+"Si s'ha de comprovar si hi ha correu nou a tots els comptes actius en "
+"iniciar l'Evolution, independentment del valor de l'opció «Comprova si hi ha "
+"correu nou cada X minuts». Esta opció s'utilitzarà només conjuntament amb "
+"l'opció «send_recv_on_start»."
+
+#: ../mail/evolution-mail.schemas.in.h:229
+msgid ""
+"Whether check for new messages when Evolution is started. This includes also "
+"sending messages from Outbox."
+msgstr ""
+"Si s'ha de comprovar si hi ha correu nou en iniciar l'Evolution. Això també "
+"inclou l'enviament de missatges de la safata d'eixida."
+
+#: ../mail/evolution-mail.schemas.in.h:230
+msgid "Whether disable ellipsizing feature of folder names in side bar."
+msgstr ""
+"Si s'ha d'inhabilitar la funcionalitat d'escurçar els noms de les carpetes "
+"amb punts suspensius a la barra lateral."
+
+#: ../mail/evolution-mail.schemas.in.h:231
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+"Si s'ha de provar de crear fils per temes quan els missatges no continguen "
+"les capçaleres «References» o «In-Reply-To»."
+
+#: ../mail/evolution-mail.schemas.in.h:232
+msgid "Whether sort threads based on latest message in that thread"
+msgstr "Si s'han d'ordenar els fils basant-se en el seu l'últim missatge"
+
+#: ../mail/evolution-mail.schemas.in.h:233
+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 ""
+"Si s'ha de buidar la safata d'eixida després de completar el filtratge. El "
+"buidatge només es durà a terme si s'ha utilitzat alguna acció de filtre «Mou "
+"a la carpeta», aproximadament un minut després de la darrera invocació de la "
+"darrera acció."
+
+#: ../mail/evolution-mail.schemas.in.h:234
+msgid "Whether to show local folders (On This Computer) in a folder tree."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:235
+msgid "Width of the message-list pane"
+msgstr "Amplada de la subfinestra de la llista de missatges"
+
+#: ../mail/evolution-mail.schemas.in.h:236
+msgid "Width of the message-list pane."
+msgstr "Amplada de la subfinestra de la llista de missatges."
+
+#: ../mail/importers/elm-importer.c:181
+msgid "Importing Elm data"
+msgstr "S'estan important dades de l'Elm"
+
+#: ../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:520
+msgid "Mail"
+msgstr "Correu"
+
+#: ../mail/importers/elm-importer.c:396
+msgid "Evolution Elm importer"
+msgstr "Importador Elm de l'Evolution"
+
+#: ../mail/importers/elm-importer.c:397
+msgid "Import mail from Elm."
+msgstr "S'està important correu de l'Elm."
+
+#: ../mail/importers/evolution-mbox-importer.c:138
+#: ../plugins/dbx-import/dbx-importer.c:250
+msgid "_Destination folder:"
+msgstr "Carpeta de _destinació:"
+
+#: ../mail/importers/evolution-mbox-importer.c:145
+#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../plugins/pst-import/pst-importer.c:460
+msgid "Select folder"
+msgstr "Seleccioneu una carpeta"
+
+#: ../mail/importers/evolution-mbox-importer.c:146
+#: ../plugins/dbx-import/dbx-importer.c:261
+#: ../plugins/pst-import/pst-importer.c:461
+msgid "Select folder to import into"
+msgstr "Seleccioneu a quina carpeta s'importarà"
+
+#: ../mail/importers/evolution-mbox-importer.c:433
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "Assumpte"
+
+#: ../mail/importers/evolution-mbox-importer.c:438
+msgctxt "mboxImp"
+msgid "From"
+msgstr "De"
+
+#: ../mail/importers/evolution-mbox-importer.c:482
+#: ../shell/e-shell-utils.c:221
+msgid "Berkeley Mailbox (mbox)"
+msgstr "Bústia de correu de Berkeley (mbox)"
+
+#: ../mail/importers/evolution-mbox-importer.c:483
+msgid "Importer Berkeley Mailbox format folders"
+msgstr "Importador de carpetes de correu de format Berkeley"
+
+#: ../mail/importers/mail-importer.c:64
+msgid "Importing mailbox"
+msgstr "S'està important una bústia"
+
+#. 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
+#, c-format
+msgid "Importing '%s'"
+msgstr "S'està important «%s»"
+
+#: ../mail/importers/mail-importer.c:316
+#, c-format
+msgid "Scanning %s"
+msgstr "S'està examinant %s"
+
+#: ../mail/importers/pine-importer.c:260
+msgid "Importing Pine data"
+msgstr "S'estan important dades del Pine"
+
+#: ../mail/importers/pine-importer.c:463
+#: ../modules/addressbook/addressbook-config.c:1081
+msgid "Address Book"
+msgstr "Llibreta d'adreces"
+
+#: ../mail/importers/pine-importer.c:509
+msgid "Evolution Pine importer"
+msgstr "Importador del Pine de l'Evolution"
+
+#: ../mail/importers/pine-importer.c:510
+msgid "Import mail from Pine."
+msgstr "Importa correu del Pine."
+
+#: ../mail/mail-autofilter.c:72
+#, c-format
+msgid "Mail to %s"
+msgstr "Correu per a %s"
+
+#: ../mail/mail-autofilter.c:228 ../mail/mail-autofilter.c:271
+#, c-format
+msgid "Mail from %s"
+msgstr "Correu de %s"
+
+#: ../mail/mail-autofilter.c:254
+#, c-format
+msgid "Subject is %s"
+msgstr "L'assumpte és %s"
+
+#: ../mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "Llista de correu %s"
+
+#: ../mail/mail-autofilter.c:404
+msgid "Add Filter Rule"
+msgstr "Afig una regla de filtre"
+
+#. Translators: The first %s is name of the affected
+#. * filter rule(s), the second %s is URI of the removed
+#. * 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:507
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been modified to account for the deleted folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"La regla de filtre «%s» s'ha actualitzat, atès que l'usuari ha suprimit la "
+"carpeta\n"
+"«%s»"
+msgstr[1] ""
+"Les regles de filtre següents\n"
+"«%s» s'han actualitzat, atès que l'usuari ha suprimit la carpeta\n"
+"«%s»"
+
+#: ../mail/mail-config.ui.h:2
+msgid "Add Ne_w Signature..."
+msgstr "Afig una signatura no_va..."
+
+#: ../mail/mail-config.ui.h:3
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "Si_gna sempre els missatges d'eixida d'este compte"
+
+#: ../mail/mail-config.ui.h:4
+msgid ""
+"All new emails with header that matches given content will be automatically "
+"filtered as junk"
+msgstr ""
+"Es filtraran automàticament com a brossa tots els correus nous que "
+"continguen capçaleres que coincidisquen amb el contingut donat"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:6
+msgid "Allowing a _mailing list to redirect a private reply to the list"
+msgstr ""
+"Permet que una _llista de correu torne a dirigir la resposta privada a la "
+"llista de correu"
+
+# «to self» vol dir «amb la meva clau» - dpm
+#: ../mail/mail-config.ui.h:7
+msgid "Also encrypt to sel_f when sending encrypted messages"
+msgstr "Xi_fra també per a mi quan envie correu xifrat"
+
+#: ../mail/mail-config.ui.h:8
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "_Sempre amb còpia amb carbó (CC) a:"
+
+#: ../mail/mail-config.ui.h:9
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Sempre amb còpia am_b carbó oculta (CCO) a:"
+
+#: ../mail/mail-config.ui.h:10
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr "Confia sempre en les claus del meu anell de claus en _xifrar"
+
+# «to myself» vol dir «amb la meva clau», de manera que el remitent pugui
+# llegir també els correus xifrats que ell mateix enviï - dpm
+#: ../mail/mail-config.ui.h:11
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr "Xifra sempre per a _mi quan envie correu xifrat"
+
+#: ../mail/mail-config.ui.h:12
+msgid "Always request rea_d receipt"
+msgstr "Envia sempre una confirmació de _lectura"
+
+#: ../mail/mail-config.ui.h:13
+msgid "Apply the same _view settings to all folders"
+msgstr "Aplica els mateixos paràmetres de _visualització a totes les carpetes"
+
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1088
+msgid "Authentication"
+msgstr "Autenticació"
+
+#: ../mail/mail-config.ui.h:16
+msgid "Automatically insert _emoticon images"
+msgstr "_Insereix emoticones automàticament"
+
+#: ../mail/mail-config.ui.h:17
+msgid "C_haracter set:"
+msgstr "_Joc de caràcters:"
+
+#: ../mail/mail-config.ui.h:18
+msgid "Ch_eck for Supported Types"
+msgstr "Comprova els tipus _disponibles"
+
+#: ../mail/mail-config.ui.h:19
+msgid "Check cu_stom headers for junk"
+msgstr "Comprova s_i les capçaleres personalitzades són brossa"
+
+#: ../mail/mail-config.ui.h:20
+msgid "Check for new _messages on start"
+msgstr "Comprova si hi ha correu _nou en iniciar"
+
+#: ../mail/mail-config.ui.h:21
+msgid "Check for new messa_ges in all active accounts"
+msgstr "Comprova si hi ha correu _nou a tots els comptes actius"
+
+#: ../mail/mail-config.ui.h:22
+msgid "Check incoming _messages for junk"
+msgstr "Comprova s_i el correu d'entrada és brossa"
+
+#: ../mail/mail-config.ui.h:23
+msgid "Check spelling while I _type"
+msgstr "Comprova l'or_tografia mentre escric"
+
+#: ../mail/mail-config.ui.h:24
+msgid "Cle_ar"
+msgstr "Netej_a"
+
+#: ../mail/mail-config.ui.h:25
+msgid "Clea_r"
+msgstr "Nete_ja"
+
+#: ../mail/mail-config.ui.h:26
+msgid "Color for _misspelled words:"
+msgstr "Color de les paraules i_ncorrectes:"
+
+#: ../mail/mail-config.ui.h:27
+msgid "Composing Messages"
+msgstr "Redacció de missatges"
+
+#: ../mail/mail-config.ui.h:28
+#: ../modules/plugin-manager/evolution-plugin-manager.c:161
+msgid "Configuration"
+msgstr "Configuració"
+
+#: ../mail/mail-config.ui.h:29
+msgid "Confirm _when expunging a folder"
+msgstr "Demana'm _confirmació per buidar una carpeta"
+
+#: ../mail/mail-config.ui.h:30
+msgid "Confirmations"
+msgstr "Confirmacions"
+
+#: ../mail/mail-config.ui.h:31
+#: ../modules/addressbook/autocompletion-config.c:188
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
+msgid "Date/Time Format"
+msgstr "Format de data/hora"
+
+#: ../mail/mail-config.ui.h:33
+msgid "Default Behavior"
+msgstr "Comportament per defecte"
+
+#: ../mail/mail-config.ui.h:34
+msgid "Default character e_ncoding:"
+msgstr "Codi_ficació de caràcters per defecte:"
+
+#: ../mail/mail-config.ui.h:35
+msgid "Delete Mail"
+msgstr "Suprimeix el correu"
+
+#: ../mail/mail-config.ui.h:36
+msgid "Delete junk messages on e_xit"
+msgstr "Suprimei_x el correu brossa en eixir"
+
+#: ../mail/mail-config.ui.h:38
+msgid "Digitally sign o_utgoing messages (by default)"
+msgstr "_Signa digitalment els missatges d'eixida (per defecte)"
+
+#: ../mail/mail-config.ui.h:39
+msgid "Displayed Message Headers"
+msgstr "Capçaleres de missatge mostrades"
+
+#: ../mail/mail-config.ui.h:40
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr ""
+"No mar_quis els missatges com a brossa si el remitent és a la meua llibreta "
+"d'adreces"
+
+#: ../mail/mail-config.ui.h:41
+msgid "Do not quote"
+msgstr "Sense citacions"
+
+#: ../mail/mail-config.ui.h:42
+msgid "Drafts _Folder:"
+msgstr "Carpeta d'es_borranys:"
+
+#: ../mail/mail-config.ui.h:43
+msgid "Email _Address:"
+msgstr "_Adreça electrònica:"
+
+#: ../mail/mail-config.ui.h:44
+msgid "Empty trash folders on e_xit"
+msgstr "Buida les papereres en sor_tir"
+
+#: ../mail/mail-config.ui.h:46
+msgid "Encry_ption certificate:"
+msgstr "Certi_ficats de xifratge:"
+
+#: ../mail/mail-config.ui.h:47
+msgid "Encrypt out_going messages (by default)"
+msgstr "Xifra els missat_ges d'eixida (per defecte)"
+
+#: ../mail/mail-config.ui.h:48
+msgid "F_all back to threading messages by subject"
+msgstr "Crea _fils segons l'assumpte dels missatges per defecte"
+
+#: ../mail/mail-config.ui.h:49
+msgid "Fix_ed Width Font:"
+msgstr "Tipus de lletra d'amplada fi_xa:"
+
+#: ../mail/mail-config.ui.h:50
+msgid "Format messages in _HTML"
+msgstr "Missatges en format _HTML"
+
+#: ../mail/mail-config.ui.h:51
+msgid "Full Nam_e:"
+msgstr "Nom compl_et:"
+
+#: ../mail/mail-config.ui.h:53
+msgid "Group Reply goes only to mailing list, if possible"
+msgstr ""
+"La resposta al grup s'enviarà només a la llista de correu, si és possible"
+
+#: ../mail/mail-config.ui.h:54
+msgid "HTML Messages"
+msgstr "Missatges HTML"
+
+#: ../mail/mail-config.ui.h:55
+msgid "H_TTP Proxy:"
+msgstr "Servidor intermediari per a l'H_TTP:"
+
+#: ../mail/mail-config.ui.h:56
+msgid "Header content"
+msgstr "Contingut de la capçalera"
+
+#: ../mail/mail-config.ui.h:57
+msgid "Header name"
+msgstr "Nom de la capçalera"
+
+#: ../mail/mail-config.ui.h:58
+msgid "Headers"
+msgstr "Capçaleres"
+
+#: ../mail/mail-config.ui.h:59
+msgid "Highlight _quotations with"
+msgstr "Ressalta el text _citat amb"
+
+#: ../mail/mail-config.ui.h:60
+msgid "Ignore Reply-To: for mailing lists"
+msgstr "Ignora «Reply-To:» (respon a) a les llistes de correu"
+
+#: ../mail/mail-config.ui.h:61
+msgid "Inline"
+msgstr "Inserit"
+
+#: ../mail/mail-config.ui.h:62
+msgid "Inline (Outlook style)"
+msgstr "Missatge original inserit (a l'estil de l'Outlook)"
+
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
+msgid "Labels"
+msgstr "Etiquetes"
+
+#: ../mail/mail-config.ui.h:65
+msgid "Languages Table"
+msgstr "Taula d'idiomes"
+
+#: ../mail/mail-config.ui.h:66
+msgid "Loading Images"
+msgstr "Càrrega de les imatges"
+
+#: ../mail/mail-config.ui.h:67
+msgid "Mail Headers Table"
+msgstr "Taula de capçaleres de correu"
+
+#: ../mail/mail-config.ui.h:68
+msgid "Mailbox location"
+msgstr "Ubicació de la bústia"
+
+#: ../mail/mail-config.ui.h:69
+msgid "Message Display"
+msgstr "Visualització dels missatges"
+
+#: ../mail/mail-config.ui.h:70
+msgid "Message Receipts"
+msgstr "Confirmacions de lectura"
+
+#: ../mail/mail-config.ui.h:71
+msgid "No _Proxy for:"
+msgstr "No uti_litzis el servidor intermediari per a:"
+
+#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr "Sense xifratge"
+
+#: ../mail/mail-config.ui.h:73
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+"S'ignorarà esta opció si es produeix una concordança amb les capçaleres de "
+"correu brossa personalitzades."
+
+#: ../mail/mail-config.ui.h:74
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+msgid "Optional Information"
+msgstr "Informació opcional"
+
+#: ../mail/mail-config.ui.h:76
+msgid "Or_ganization:"
+msgstr "_Organització:"
+
+#: ../mail/mail-config.ui.h:77
+msgid "PGP/GPG _Key ID:"
+msgstr "Id. de _clau PGP/GPG:"
+
+#: ../mail/mail-config.ui.h:78
+msgid "Pass_word:"
+msgstr "Contrasen_ya:"
+
+#: ../mail/mail-config.ui.h:79
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
+msgid "Pick a color"
+msgstr "Seleccioneu un color"
+
+#: ../mail/mail-config.ui.h:80
+msgid "Port:"
+msgstr "Port:"
+
+#: ../mail/mail-config.ui.h:81
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "Privadesa força bona (PGP/GPG)"
+
+#: ../mail/mail-config.ui.h:83
+msgid "Proxy Settings"
+msgstr "Configuració del servidor intermediari"
+
+#: ../mail/mail-config.ui.h:84
+msgid "Quoted"
+msgstr "Citat"
+
+#: ../mail/mail-config.ui.h:85
+msgid "Re_member password"
+msgstr "_Recorda la contrasenya"
+
+#: ../mail/mail-config.ui.h:86
+msgid "Re_ply-To:"
+msgstr "_Respon-A:"
+
+#: ../mail/mail-config.ui.h:87
+msgid "Remember _password"
+msgstr "Recorda la contrasen_ya"
+
+#: ../mail/mail-config.ui.h:88
+msgid "Replies and Forwards"
+msgstr "Respostes i reenviaments"
+
+#: ../mail/mail-config.ui.h:89
+msgid "Required Information"
+msgstr "Informació requerida"
+
+#: ../mail/mail-config.ui.h:90
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/mail-config.ui.h:91
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/mail-config.ui.h:92
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/mail-config.ui.h:93
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "Xifratge SSL"
+
+#: ../mail/mail-config.ui.h:95
+msgid "SSL is not supported in this build of Evolution"
+msgstr "Este muntatge de l'Evolution no funciona amb l'SSL"
+
+#: ../mail/mail-config.ui.h:96
+msgid "S_earch for sender photograph only in local address books"
+msgstr ""
+"Ce_rca la fotografia del remitent només a les llibretes d'adreces locals"
+
+#: ../mail/mail-config.ui.h:97
+msgid "S_elect..."
+msgstr "S_elecciona..."
+
+#: ../mail/mail-config.ui.h:98
+msgid "S_end message receipts:"
+msgstr "_Envia confirmacions de lectura:"
+
+#: ../mail/mail-config.ui.h:99
+msgid "S_tandard Font:"
+msgstr "_Tipus de lletra estàndard:"
+
+#: ../mail/mail-config.ui.h:100
+msgid "Secure MIME (S/MIME)"
+msgstr "MIME segur (S/MIME)"
+
+#: ../mail/mail-config.ui.h:102
+msgid "Select HTML fixed width font"
+msgstr "Selecciona el tipus de lletra HTML d'amplada fixa"
+
+#: ../mail/mail-config.ui.h:103
+msgid "Select HTML variable width font"
+msgstr "Selecciona el tipus de lletra HTML d'amplada variable"
+
+#: ../mail/mail-config.ui.h:104
+msgid "Sender Photograph"
+msgstr "Fotografia del remitent"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:106
+msgid "Sending a _private reply to a mailing list message"
+msgstr "Enviament d'una resposta privada a un missatge de _llista de correu"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:108
+msgid "Sending a message with _recipients not entered as mail addresses"
+msgstr ""
+"Enviament d'un missatge amb _destinataris que no s'han introduït com a "
+"adreces de correu"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:110
+msgid "Sending a message with an _empty subject line"
+msgstr "Enviament d'un missatge amb l'assumpte _buit"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:112
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "Enviament d'un missatge amb destinataris n_omés al camp CCO"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:114
+msgid "Sending a reply to a large _number of recipients"
+msgstr "Enviament d'una resposta a un nombre ele_vat de destinataris"
+
+#: ../mail/mail-config.ui.h:115
+msgid "Sent _Messages Folder:"
+msgstr "Carpeta de _missatges enviats:"
+
+#: ../mail/mail-config.ui.h:116
+msgid "Ser_ver requires authentication"
+msgstr "El ser_vidor requereix autenticació"
+
+#: ../mail/mail-config.ui.h:117
+msgid "Server Configuration"
+msgstr "Configuració del servidor"
+
+#: ../mail/mail-config.ui.h:118
+msgid "Server _Type:"
+msgstr "_Tipus de servidor:"
+
+# FIXME: s'ha de mirar si és massa llarg (dpm)
+#: ../mail/mail-config.ui.h:119
+msgid "Set custom junk header"
+msgstr "Estableix una capçalera de correu brossa personalitzada"
+
+#: ../mail/mail-config.ui.h:120
+msgid "Si_gning algorithm:"
+msgstr "Al_gorisme de signatura:"
+
+#: ../mail/mail-config.ui.h:121
+msgid "Sig_natures"
+msgstr "Sig_natures"
+
+#: ../mail/mail-config.ui.h:122
+msgid "Sig_ning certificate:"
+msgstr "Ce_rtificat de signatura:"
+
+#: ../mail/mail-config.ui.h:123
+msgid "Signat_ure:"
+msgstr "Signat_ura:"
+
+#: ../mail/mail-config.ui.h:124
+msgid "Signatures"
+msgstr "Signatures"
+
+#: ../mail/mail-config.ui.h:125
+msgid "Signing _algorithm:"
+msgstr "Al_gorisme de signatura:"
+
+#: ../mail/mail-config.ui.h:126
+msgid "Special Folders"
+msgstr "Carpetes especials"
+
+#: ../mail/mail-config.ui.h:127
+msgid "Spell Checking"
+msgstr "Verificació ortogràfica"
+
+#: ../mail/mail-config.ui.h:128
+msgid "Start _typing at the bottom on replying"
+msgstr "Inicia la redac_ció al final en respondre"
+
+#: ../mail/mail-config.ui.h:129
+msgid "Start up"
+msgstr "Inici"
+
+#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "Xifratge TLS"
+
+#: ../mail/mail-config.ui.h:131
+msgid "T_ype:"
+msgstr "T_ipus:"
+
+#: ../mail/mail-config.ui.h:132
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Esta llista reflecteix només els idiomes per als quals teniu instal·lat un "
+"diccionari."
+
+#: ../mail/mail-config.ui.h:133
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+"La eixida d'este script s'utilitzarà per a la vostra signatura.\n"
+"El nom que especifiqueu només s'utilitzarà per visualitzar-lo."
+
+#: ../mail/mail-config.ui.h:136
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
+msgstr ""
+"Per evitar errades en enviar correus i situacions compromeses, demana "
+"confirmació abans de realitzar les accions marcades a continuació:"
+
+#: ../mail/mail-config.ui.h:137
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+"Escriviu el nom que vulgueu fer servir per referir-vos a este compte.\n"
+"Per exemple: «Faena» o «Personal»"
+
+#: ../mail/mail-config.ui.h:139
+msgid "Us_ername:"
+msgstr "Nom d'_usuari:"
+
+#: ../mail/mail-config.ui.h:140
+msgid "Use Authe_ntication"
+msgstr "Utilitza au_tenticació"
+
+#: ../mail/mail-config.ui.h:141
+msgid "User _Name:"
+msgstr "Nom d'_usuari:"
+
+#: ../mail/mail-config.ui.h:142
+msgid "_Add Signature"
+msgstr "_Afig la signatura"
+
+#: ../mail/mail-config.ui.h:143
+msgid "_Always load images from the Internet"
+msgstr "C_arrega sempre les imatges d'Internet"
+
+#: ../mail/mail-config.ui.h:144
+msgid "_Authentication Type"
+msgstr "Tipus d'_autenticació"
+
+#: ../mail/mail-config.ui.h:145
+msgid "_Direct connection to the Internet"
+msgstr "Connexió _directa a Internet"
+
+#: ../mail/mail-config.ui.h:146
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr "No signis les sol·licituds _de reunió (compatible amb l'Outlook)"
+
+#: ../mail/mail-config.ui.h:147
+msgid "_Forward style:"
+msgstr "Estil de reen_viament:"
+
+#: ../mail/mail-config.ui.h:148
+msgid "_Junk Folder:"
+msgstr "Carpeta de correu _brossa:"
+
+#: ../mail/mail-config.ui.h:149
+msgid "_Keep signature above the original message on replying"
+msgstr ""
+"Mantén la _signatura a la part superior del missatge original en respondre"
+
+#: ../mail/mail-config.ui.h:150
+msgid "_Languages"
+msgstr "_Llengües"
+
+#: ../mail/mail-config.ui.h:151
+msgid "_Load images only in messages from contacts"
+msgstr "_Carrega les imatges només si són en correus dels contactes"
+
+#: ../mail/mail-config.ui.h:152
+msgid "_Lookup in local address book only"
+msgstr "_Cerca només a les llibretes d'adreces locals"
+
+#: ../mail/mail-config.ui.h:153
+msgid "_Make this my default account"
+msgstr "Fes-lo el meu compte per _defecte"
+
+#: ../mail/mail-config.ui.h:154
+msgid "_Manual proxy configuration:"
+msgstr "Configuració _manual del servidor intermediari:"
+
+#: ../mail/mail-config.ui.h:156
+msgid "_Never load images from the Internet"
+msgstr "_No carreguis mai les imatges d'Internet"
+
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../mail/mail-config.ui.h:159
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "_Pregunta quan s'envien missatges HTML als contactes que no ho vulguen"
+
+#: ../mail/mail-config.ui.h:160
+msgid "_Reply style:"
+msgstr "Estil de la _resposta:"
+
+#: ../mail/mail-config.ui.h:161
+msgid "_Script:"
+msgstr "_Script:"
+
+#: ../mail/mail-config.ui.h:162
+msgid "_Secure HTTP Proxy:"
+msgstr "Servidor intermediari per a l'HTTP _segur:"
+
+#: ../mail/mail-config.ui.h:164 ../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
+msgid "_Show animated images"
+msgstr "Mos_tra les imatges animades"
+
+#: ../mail/mail-config.ui.h:167
+msgid "_Show the photograph of sender in the message preview"
+msgstr "_Mostra la fotografia del remitent en la previsualització del correu"
+
+#: ../mail/mail-config.ui.h:168
+msgid "_Trash Folder:"
+msgstr "Carpeta de la _paperera:"
+
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
+msgstr "_Utilitza una connexió segura:"
+
+#: ../mail/mail-config.ui.h:170
+msgid "_Use system defaults"
+msgstr "Utilitza els paràmetres p_redeterminats del sistema"
+
+#: ../mail/mail-config.ui.h:171
+msgid "_Use the same fonts as other applications"
+msgstr "_Utilitza el mateix tipus de lletra que la resta d'aplicacions"
+
+#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
+msgid "a"
+msgstr "a"
+
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
+msgid "b"
+msgstr "b"
+
+#: ../mail/mail-config.ui.h:174
+msgid "color"
+msgstr "color"
+
+#: ../mail/mail-config.ui.h:175
+msgid "description"
+msgstr "descripció"
+
+#: ../mail/mail-dialogs.ui.h:1
+msgid "All active remote folders"
+msgstr "Totes les carpetes remotes actives"
+
+#: ../mail/mail-dialogs.ui.h:2
+msgid "All local and active remote folders"
+msgstr "Totes les carpetes locals i remotes actives"
+
+#: ../mail/mail-dialogs.ui.h:3
+msgid "All local folders"
+msgstr "Totes les carpetes locals"
+
+#: ../mail/mail-dialogs.ui.h:4
+msgid "Call"
+msgstr "Crida"
+
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
+msgid "Co_mpleted"
+msgstr "Co_mpletat"
+
+#: ../mail/mail-dialogs.ui.h:7
+msgid "Digital Signature"
+msgstr "Signatura digital"
+
+#: ../mail/mail-dialogs.ui.h:8
+msgid "Do Not Forward"
+msgstr "No ho reenvïis"
+
+#: ../mail/mail-dialogs.ui.h:9
+msgid "Encryption"
+msgstr "Xifratge"
+
+#: ../mail/mail-dialogs.ui.h:10
+msgid "Follow-Up"
+msgstr "Respondre"
+
+#: ../mail/mail-dialogs.ui.h:11
+msgid "For Your Information"
+msgstr "Per a la vostra informació"
+
+#: ../mail/mail-dialogs.ui.h:12
+msgid "Forward"
+msgstr "Reenvia"
+
+#: ../mail/mail-dialogs.ui.h:13
+msgid "License Agreement"
+msgstr "Acord de llicència"
+
+#: ../mail/mail-dialogs.ui.h:14
+msgid "No Response Necessary"
+msgstr "No és necessària cap resposta"
+
+#: ../mail/mail-dialogs.ui.h:18
+msgid "Reply to All"
+msgstr "Respon a tots"
+
+#: ../mail/mail-dialogs.ui.h:19
+msgid "Review"
+msgstr "Ressenya"
+
+#: ../mail/mail-dialogs.ui.h:20
+msgid "Search Folder Sources"
+msgstr "Orígens de la carpeta de cerca"
+
+#: ../mail/mail-dialogs.ui.h:21
+msgid "Security Information"
+msgstr "Informació sobre seguretat"
+
+#: ../mail/mail-dialogs.ui.h:22
+msgid "Specific folders"
+msgstr "Carpetes específiques"
+
+#: ../mail/mail-dialogs.ui.h:23
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Els missatges que heu seleccionat per respondre es llisten a sota.\n"
+"Seleccioneu una acció per respondre-hi al menú «Senyalador»."
+
+#: ../mail/mail-dialogs.ui.h:25
+msgid "_Accept License"
+msgstr "_Accepteu la llicència"
+
+#: ../mail/mail-dialogs.ui.h:26
+msgid "_Due By:"
+msgstr "_Venciment:"
+
+#: ../mail/mail-dialogs.ui.h:27
+msgid "_Flag:"
+msgstr "Sen_yalador:"
+
+#: ../mail/mail-dialogs.ui.h:28
+msgid "_Tick this to accept the license agreement"
+msgstr "Habili_teu-lo per acceptar l'acord de llicència"
+
+#: ../mail/mail-folder-cache.c:779
+#, c-format
+msgid "Pinging %s"
+msgstr "S'està enviant un ping a %s"
+
+#: ../mail/mail-ops.c:86
+msgid "Filtering Selected Messages"
+msgstr "S'estan filtrant els missatges seleccionats"
+
+#: ../mail/mail-ops.c:206
+msgid "Fetching Mail"
+msgstr "S'està recollint el correu electrònic"
+
+#: ../mail/mail-ops.c:842
+#, c-format
+msgid "Sending message %d of %d"
+msgstr "S'està enviant el missatge %d de %d"
+
+#: ../mail/mail-ops.c:890
+#, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "No s'han pogut enviar %d de %d missatges"
+
+#: ../mail/mail-ops.c:894 ../mail/mail-send-recv.c:837
+msgid "Canceled."
+msgstr "S'ha cancel·lat."
+
+#: ../mail/mail-ops.c:896 ../mail/mail-send-recv.c:839
+msgid "Complete."
+msgstr "Completat."
+
+#: ../mail/mail-ops.c:1006
+#, c-format
+msgid "Moving messages to '%s'"
+msgstr "S'estan movent els missatges a «%s»"
+
+#: ../mail/mail-ops.c:1007
+#, c-format
+msgid "Copying messages to '%s'"
+msgstr "S'estan copiant els missatges a «%s»"
+
+#: ../mail/mail-ops.c:1125
+#, c-format
+msgid "Storing folder '%s'"
+msgstr "S'està emmagatzemant la carpeta «%s»"
+
+#: ../mail/mail-ops.c:1200
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr "S'està buidant i emmagatzemant el compte «%s»"
+
+#: ../mail/mail-ops.c:1201
+#, c-format
+msgid "Storing account '%s'"
+msgstr "S'està emmagatzemant el compte «%s»"
+
+#: ../mail/mail-ops.c:1263
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr "S'està refrescant la carpeta «%s»"
+
+#: ../mail/mail-ops.c:1453
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr "S'està suprimint la carpeta «%s»"
+
+#: ../mail/mail-ops.c:1538
+#, c-format
+msgid "Emptying trash in '%s'"
+msgstr "S'està buidant la paperera a «%s»"
+
+#: ../mail/mail-ops.c:1640
+#, c-format
+msgid "Disconnecting %s"
+msgstr "S'està desconnectant de %s"
+
+#: ../mail/mail-send-recv.c:198
+msgid "Canceling..."
+msgstr "S'està cancel·lant..."
+
+#: ../mail/mail-send-recv.c:454
+msgid "Send & Receive Mail"
+msgstr "Envia i rep el correu"
+
+#: ../mail/mail-send-recv.c:470
+msgid "Cancel _All"
+msgstr "C_ancel·la-ho tot"
+
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:979
+msgid "Updating..."
+msgstr "S'està actualitzant..."
+
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:691
+msgid "Waiting..."
+msgstr "S'està esperant..."
+
+#: ../mail/mail-send-recv.c:959
+#, c-format
+msgid "Checking for new mail"
+msgstr "Comprovació de correu nou"
+
+#: ../mail/mail-tools.c:72
+#, c-format
+msgid "Could not create spool directory '%s': %s"
+msgstr "No s'ha pogut crear el directori de cues «%s»: %s"
+
+#: ../mail/mail-tools.c:106
+#, c-format
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr "S'està intentant executar el movemail a una font no mbox «%s»"
+
+#: ../mail/mail-tools.c:215
+#, c-format
+msgid "Forwarded message - %s"
+msgstr "Missatge reenviat - %s"
+
+#: ../mail/mail-tools.c:217
+msgid "Forwarded message"
+msgstr "Missatge reenviat"
+
+#: ../mail/mail-vfolder.c:92
+#, c-format
+msgid "Setting up Search Folder: %s"
+msgstr "S'està configurant la carpeta de cerca: %s"
+
+#: ../mail/mail-vfolder.c:232
+#, c-format
+msgid "Updating Search Folders for '%s' : %s"
+msgstr "S'estan actualitzant les carpetes de cerca per a «%s»: %s"
+
+#. Translators: The first %s is name of the affected
+#. * search folder(s), the second %s is the URI of the
+#. * 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:678
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been modified to account for the deleted "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"La carpeta de cerca «%s» s'ha actualitzat, atès que l'usuari ha suprimit la "
+"carpeta\n"
+"«%s»"
+msgstr[1] ""
+"Les carpetes de cerca següents\n"
+"«%s» s'han actualitzat, atès que l'usuari ha suprimit la carpeta\n"
+"«%s»"
+
+#: ../mail/mail-vfolder.c:1314
+msgid "Edit Search Folder"
+msgstr "Edita les carpetes de cerca"
+
+#: ../mail/mail-vfolder.c:1423
+msgid "New Search Folder"
+msgstr "Carpeta de cerca nova"
+
+#: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "Ha fallat la comprovació de correu brossa"
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "Ha fallat el marcatge com a correu brossa"
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "Ha fallat el marcatge com a correu que no és brossa"
+
+#: ../mail/mail.error.xml.h:4
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "Ja existeix una carpeta anomenada «{0}». Feu servir un nom diferent."
+
+#: ../mail/mail.error.xml.h:5
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "Ja existeix una carpeta anomenada «{1}». Feu servir un nom diferent."
+
+#: ../mail/mail.error.xml.h:6
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
+msgstr ""
+"Ja existeix una carpeta que no és buida a «{1}».\n"
+"\n"
+"Podeu triar ignorar esta carpeta, sobreescriure o afegir al seu contingut, o "
+"bé eixir."
+
+#: ../mail/mail.error.xml.h:9
+msgid ""
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
+msgstr ""
+"S'ha sol·licitat una confirmació de lectura per a «{1}». Voleu enviar la "
+"confirmació de lectura a {0}?"
+
+#: ../mail/mail.error.xml.h:10
+msgid ""
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr "Ja existeix una signatura anomenada «{0}». Feu servir un nom diferent."
+
+#: ../mail/mail.error.xml.h:11
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+"Un camp Assumpte comprensible permetrà als destinataris fer-se una idea del "
+"tema del correu."
+
+#: ../mail/mail.error.xml.h:12
+msgid "Are you sure you want to delete this account and all its proxies?"
+msgstr "Segur que voleu suprimir este compte i tots els seus apoderats?"
+
+#: ../mail/mail.error.xml.h:13
+msgid "Are you sure you want to delete this account?"
+msgstr "Segur que voleu suprimir este compte?"
+
+#: ../mail/mail.error.xml.h:14
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr "Segur que voleu suprimir este compte i tots els seus apoderats?"
+
+#: ../mail/mail.error.xml.h:15
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+"Segur que voleu suprimir permanentment tots els missatges suprimits de totes "
+"les carpetes?"
+
+#: ../mail/mail.error.xml.h:16
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
+msgstr ""
+"Segur que voleu suprimir permanentment tots els missatges suprimits de la "
+"carpeta «{0}»?"
+
+#: ../mail/mail.error.xml.h:17
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Segur que voleu enviar un missatge HTML?"
+
+#: ../mail/mail.error.xml.h:18
+msgid "Are you sure you want to send a message with invalid address?"
+msgstr "Segur que voleu enviar un missatge amb una adreça no vàlida?"
+
+#: ../mail/mail.error.xml.h:19
+msgid "Are you sure you want to send a message with invalid addresses?"
+msgstr "Segur que voleu enviar un missatge només amb adreces no vàlides?"
+
+#: ../mail/mail.error.xml.h:20
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "Segur que voleu enviar un missatge només amb destinataris CCO?"
+
+#: ../mail/mail.error.xml.h:21
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "Segur que voleu enviar un missatge sense assumpte?"
+
+#: ../mail/mail.error.xml.h:22
+msgid "Blank Signature"
+msgstr "Signatura buida"
+
+#: ../mail/mail.error.xml.h:23
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "No es pot afegir la carpeta de cerca «{0}»."
+
+#: ../mail/mail.error.xml.h:24
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "No es pot copiar la carpeta «{0}» a «{1}»."
+
+#: ../mail/mail.error.xml.h:25
+msgid "Cannot create folder \"{0}\"."
+msgstr "No s'ha pogut crear la carpeta «{0}»."
+
+#: ../mail/mail.error.xml.h:26
+msgid "Cannot create temporary save directory."
+msgstr "No s'ha pogut crear el directori temporal per alçar."
+
+#: ../mail/mail.error.xml.h:27
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "No s'ha pogut crear el directori per alçar degut a «{1}»"
+
+#: ../mail/mail.error.xml.h:28
+msgid "Cannot delete folder \"{0}\"."
+msgstr "No s'ha pogut suprimir la carpeta «{0}»."
+
+#: ../mail/mail.error.xml.h:29
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "No es pot suprimir la carpeta de sistema «{0}»."
+
+#: ../mail/mail.error.xml.h:30
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "No es pot editar la carpeta de cerca «{0}» perquè no existeix."
+
+#: ../mail/mail.error.xml.h:31
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "No es pot moure la carpeta «{0}» a «{1}»."
+
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{1}\"."
+msgstr "No s'ha pogut obrir l'origen «{1}»."
+
+#: ../mail/mail.error.xml.h:33
+msgid "Cannot open source \"{2}\"."
+msgstr "No s'ha pogut obrir l'origen «{2}»."
+
+#: ../mail/mail.error.xml.h:34
+msgid "Cannot open target \"{2}\"."
+msgstr "No es pot obrir la destinació «{2}»."
+
+#: ../mail/mail.error.xml.h:35
+msgid ""
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
+msgstr ""
+"No es pot llegir el fitxer de llicència «{0}» degut a un problema "
+"d'instal·lació. No podreu utilitzar este proveïdor fins que no n'accepteu la "
+"llicència."
+
+#: ../mail/mail.error.xml.h:36
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "No es pot canviar el nom de «{0}» a «{1}»."
+
+#: ../mail/mail.error.xml.h:37
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "No es pot canviar el nom o moure la carpeta de sistema «{0}»."
+
+#: ../mail/mail.error.xml.h:38
+msgid "Cannot save changes to account."
+msgstr "No es poden alçar els canvis al compte."
+
+#: ../mail/mail.error.xml.h:39
+msgid "Cannot save to directory \"{0}\"."
+msgstr "No s'ha pogut alçar al directori «{0}»."
+
+#: ../mail/mail.error.xml.h:40
+msgid "Cannot save to file \"{0}\"."
+msgstr "No es pot alçar al fitxer «{0}»."
+
+#: ../mail/mail.error.xml.h:41
+msgid "Cannot set signature script \"{0}\"."
+msgstr "No s'ha pogut establir l'script de signatura «{0}»."
+
+#: ../mail/mail.error.xml.h:42
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"Assegureu-vos que la contrasenya està escrita correctament. Recordeu que "
+"moltes contrasenyes diferencien majúscules i minúscules. Assegureu-vos que "
+"la tecla de bloqueig de majúscules no estiga activada."
+
+#: ../mail/mail.error.xml.h:43
+msgid "Close message window."
+msgstr "Tanca la finestra de missatges."
+
+#: ../mail/mail.error.xml.h:44
+msgid "Could not save signature file."
+msgstr "No s'ha pogut alçar el fitxer de signatura."
+
+#: ../mail/mail.error.xml.h:46
+msgid "Do _Not Disable"
+msgstr "No ho _inhabilitis"
+
+# Es refereix a enviar un avís de cancel·lació (dpm)
+#: ../mail/mail.error.xml.h:47
+msgid "Do _Not Send"
+msgstr "No l'_envies"
+
+#: ../mail/mail.error.xml.h:48
+msgid "Do _Not Synchronize"
+msgstr "N_o sincronitzis"
+
+#: ../mail/mail.error.xml.h:49
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
+"Voleu sincronitzar localment les carpetes marcades per treballar fora de "
+"línia?"
+
+#: ../mail/mail.error.xml.h:50
+msgid "Do you want to mark all messages as read?"
+msgstr "Voleu marcar tots els missatges com a llegits?"
+
+#: ../mail/mail.error.xml.h:51
+msgid "Do you wish to save your changes?"
+msgstr "Voleu alçar els canvis?"
+
+#: ../mail/mail.error.xml.h:52
+msgid "Enter password."
+msgstr "Introduïu la contrasenya."
+
+#: ../mail/mail.error.xml.h:53
+msgid "Error loading filter definitions."
+msgstr "S'ha produït un error en carregar les definicions de filtre."
+
+#: ../mail/mail.error.xml.h:54
+msgid "Error while performing operation."
+msgstr "S'ha produït un error en realitzar l'operació."
+
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:58
+msgid "Error while {0}."
+msgstr "S'ha produït un error en {0}."
+
+#: ../mail/mail.error.xml.h:59
+msgid ""
+"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"mail must be migrated to the new format before Evolution can proceed. Do you "
+"want to migrate now?\n"
+"\n"
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
+msgstr ""
+"El format de correu local de l'Evolution ha canviat d'mbox a Maildir. Cal "
+"que migreu el correu local al format nou abans de continuar. Voleu fer la "
+"migració ara?\n"
+"\n"
+"Es crearà un compte mbox per preservar les carpetes mbox antigues. Un cop "
+"hàgeu comprovat que les dades s'han migrat de manera satisfactòria podeu "
+"suprimir este compte. Assegureu-vos que hi ha prou espai al disc per "
+"realitzar la migració ara."
+
+#: ../mail/mail.error.xml.h:62
+msgid "Evolution's local mail format has changed."
+msgstr "El format del correu local de l'Evolution ha canviat."
+
+#: ../mail/mail.error.xml.h:63
+msgid "Failed to download messages for offline viewing."
+msgstr "No s'han pogut baixar els missatges per poder-los veure fora de línia."
+
+#: ../mail/mail.error.xml.h:64
+msgid "Failed to find duplicate messages."
+msgstr "No s'ha trobat cap missatge duplicat."
+
+#: ../mail/mail.error.xml.h:65
+msgid "Failed to open folder."
+msgstr "No s'ha pogut obrir la carpeta."
+
+#: ../mail/mail.error.xml.h:66
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr ""
+"No s'ha pogut consultar al servidor els mecanismes d'autenticació "
+"compatibles."
+
+#: ../mail/mail.error.xml.h:67
+msgid "Failed to remove attachments from messages."
+msgstr "No s'han pogut suprimir les adjuncions dels correus."
+
+#: ../mail/mail.error.xml.h:68
+msgid "Failed to retrieve messages."
+msgstr "No s'han pogut recuperar els missatges."
+
+#: ../mail/mail.error.xml.h:69
+msgid "Failed to save messages to disk."
+msgstr "No s'han pogut alçar els missatges al disc."
+
+#: ../mail/mail.error.xml.h:70
+msgid "Failed to unsubscribe from folder."
+msgstr "No s'ha pogut cancel·lar la subscripció a la carpeta."
+
+#: ../mail/mail.error.xml.h:71
+msgid "File exists but cannot overwrite it."
+msgstr "El fitxer existeix però no es pot sobreescriure."
+
+#: ../mail/mail.error.xml.h:72
+msgid "File exists but is not a regular file."
+msgstr "El fitxer existeix però no és un fitxer normal."
+
+#. Translators: {0} is replaced with a folder name
+#: ../mail/mail.error.xml.h:74
+msgid "Folder '{0}' doesn't contain any duplicate message."
+msgstr "La carpeta «{0}» no conté cap missatge duplicat."
+
+#: ../mail/mail.error.xml.h:75
+msgid "If you continue, you will not be able to recover these messages."
+msgstr "Si continueu, no podreu recuperar estos missatges."
+
+#: ../mail/mail.error.xml.h:76
+msgid ""
+"If you delete the folder, all of its contents and its subfolders' contents "
+"will be deleted permanently."
+msgstr ""
+"Si suprimiu la carpeta, tots els continguts i els de les seues subcarpetes "
+"se suprimiran permanentment."
+
+#: ../mail/mail.error.xml.h:77
+msgid ""
+"If you delete the folder, all of its contents will be deleted permanently."
+msgstr ""
+"Si suprimiu la carpeta, tots els continguts i els de les seues subcarpetes "
+"se suprimiran permanentment."
+
+#: ../mail/mail.error.xml.h:78
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr "Si continueu, els comptes apoderats se suprimiran permanentment."
+
+#: ../mail/mail.error.xml.h:79
+msgid ""
+"If you proceed, the account information and\n"
+"all proxy information will be deleted permanently."
+msgstr ""
+"Si continueu, la informació dels comptes i\n"
+"la informació de l'apoderat se suprimiran permanentment."
+
+#: ../mail/mail.error.xml.h:81
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr "Si continueu, la informació dels comptes se suprimirà permanentment."
+
+#: ../mail/mail.error.xml.h:82
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+"Si eixiu, estos missatges no s'enviaran fins que s'inicie l'Evolution de nou."
+
+#: ../mail/mail.error.xml.h:83
+msgid "Ignore"
+msgstr "Ignora"
+
+#: ../mail/mail.error.xml.h:84
+msgid "Invalid authentication"
+msgstr "Autenticació no vàlida"
+
+#: ../mail/mail.error.xml.h:85
+msgid "Mail Deletion Failed"
+msgstr "Ha fallat la supressió del correu"
+
+#: ../mail/mail.error.xml.h:86
+msgid "Mail filters automatically updated."
+msgstr "S'han actualitzat automàticament els filtres de correu."
+
+#: ../mail/mail.error.xml.h:87
+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 ""
+"Molts sistemes de correu electrònic afigen una capçalera «Aparentment-Per a» "
+"als missatges que només tenen destinataris CCO. Quan s'afig esta capçalera "
+"es mostrarà una llista de tots els destinataris de tots els missatges. Per "
+"evitar-ho, hauríeu d'afegir almenys un destinatari «Per a:» o «CC:»."
+
+#: ../mail/mail.error.xml.h:88
+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 ""
+"Els missatges que es mostren a les carpetes de cerca no són còpies. Si "
+"suprimiu un missatge d'una carpeta de cerca es suprimirà el missatge de la "
+"carpeta o les carpetes en què està físicament. Segur que voleu suprimir-los?"
+
+#: ../mail/mail.error.xml.h:89
+msgid "Missing folder."
+msgstr "Manca la carpeta."
+
+#: ../mail/mail.error.xml.h:91
+msgid "N_ever"
+msgstr "Ma_i"
+
+#: ../mail/mail.error.xml.h:92
+msgid "No duplicate messages found."
+msgstr "No s'ha trobat cap missatge duplicat."
+
+#: ../mail/mail.error.xml.h:93
+msgid "No sources selected."
+msgstr "No s'ha seleccionat cap font."
+
+#: ../mail/mail.error.xml.h:94
+msgid "Opening too many messages at once may take a long time."
+msgstr ""
+"Si obriu molts missatges a la vegada pot ser que s'hi trigui molt de temps."
+
+#: ../mail/mail.error.xml.h:95
+msgid "Please check your account settings and try again."
+msgstr "Comproveu la configuració de comptes i torneu-ho a provar."
+
+#: ../mail/mail.error.xml.h:96
+msgid "Please enable the account or send using another account."
+msgstr "Habiliteu el compte o bé envieu amb un altre compte."
+
+#: ../mail/mail.error.xml.h:97
+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 ""
+"Introduïu una adreça electrònica vàlida en el camp Per a:. Podeu cercar "
+"adreces electròniques si feu clic en el botó Per a: al costat de l'entrada "
+"de text."
+
+#: ../mail/mail.error.xml.h:98
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}"
+msgstr ""
+"Assegureu-vos que els següents destinataris volen i poden rebre correus en "
+"format HTML:\n"
+"{0}"
+
+#: ../mail/mail.error.xml.h:100
+msgid "Please provide an unique name to identify this signature."
+msgstr "Introduïu un nom únic per identificar esta signatura."
+
+#: ../mail/mail.error.xml.h:101
+msgid "Please wait."
+msgstr "Espereu."
+
+#: ../mail/mail.error.xml.h:102
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "Hi ha hagut un problema en migrar la carpeta de correu antiga «{0}»."
+
+#: ../mail/mail.error.xml.h:103
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr ""
+"S'estan consultant els mecanismes d'autenticació compatibles al servidor."
+
+#: ../mail/mail.error.xml.h:104
+msgid "Read receipt requested."
+msgstr "S'ha sol·licitat una confirmació de lectura."
+
+#: ../mail/mail.error.xml.h:105
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Voleu suprimir la carpeta «{0}» i totes les seues subcarpetes?"
+
+#: ../mail/mail.error.xml.h:106
+msgid "Really delete folder \"{0}\"?"
+msgstr "Segur que voleu suprimir la carpeta «{0}»?"
+
+#: ../mail/mail.error.xml.h:107
+msgid "Remove duplicate messages?"
+msgstr "Voleu suprimir els missatges duplicats?"
+
+#: ../mail/mail.error.xml.h:108
+msgid "Reply _Privately"
+msgstr "Respon en _privat"
+
+#: ../mail/mail.error.xml.h:111
+msgid "Search Folders automatically updated."
+msgstr "S'han actualitzat les carpetes de cerca automàticament."
+
+#: ../mail/mail.error.xml.h:112
+msgid "Send private reply?"
+msgstr "Voleu enviar una resposta en privat?"
+
+#: ../mail/mail.error.xml.h:113
+msgid "Send reply to all recipients?"
+msgstr "Voleu enviar una resposta a tots els destinataris?"
+
+#: ../mail/mail.error.xml.h:114
+msgid "Signature Already Exists"
+msgstr "La signatura ja existeix"
+
+#: ../mail/mail.error.xml.h:115
+msgid "Synchronize folders locally for offline usage?"
+msgstr "Voleu sincronitzar les carpetes localment per treballar fora de línia?"
+
+#: ../mail/mail.error.xml.h:116
+msgid ""
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
+msgstr ""
+"L'Evolution necessita les carpetes del sistema per funcionar correctament i "
+"no se les pot tornar a anomenar, moure ni suprimir."
+
+#: ../mail/mail.error.xml.h:117
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
+msgstr ""
+"Esteu enviant un missatge a una llista configurada per amagar la llista de "
+"destinataris.\n"
+"Molts sistemes de correu electrònic afigen una capçalera «Apparently-"
+"To» («Aparentment-Per a») als missatges que només tenen destinataris CCO. En "
+"afegir esta capçalera es mostrarà una llista de tots els destinataris de "
+"tots els missatges. Per evitar-ho, hauríeu d'afegir almenys un destinatari "
+"«Per a:» o «CC:»."
+
+#: ../mail/mail.error.xml.h:120
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
+msgstr ""
+"No s'ha reconegut el destinatari següent com a una adreça de correu vàlida:\n"
+"{0}"
+
+#: ../mail/mail.error.xml.h:122
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
+msgstr ""
+"No s'han reconegut els destinataris següents com a adreces de correu "
+"vàlides:\n"
+"{0}"
+
+#: ../mail/mail.error.xml.h:125
+msgid "The script file must exist and be executable."
+msgstr "El fitxer de l'script ha de ser executable."
+
+#: ../mail/mail.error.xml.h:126
+msgid "These messages are not copies."
+msgstr "Estos missatges no són còpies."
+
+#: ../mail/mail.error.xml.h:127
+msgid ""
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
+msgstr ""
+"Pot ser que esta carpeta s'haja afegit implícitament.\n"
+"Aneu a l'editor de carpetes de cerca per afegir-la explícitament en cas que "
+"siga necessari."
+
+#: ../mail/mail.error.xml.h:129
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr ""
+"No es pot enviar el missatge perquè el compte que heu triat per enviar no "
+"està habilitat"
+
+#: ../mail/mail.error.xml.h:130
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
+"Este missatge no es pot enviar perquè no se n'ha indicat cap destinatari"
+
+#: ../mail/mail.error.xml.h:131
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+"El servidor no funciona amb el tipus d'autenticació sol·licitat. És possible "
+"que no permeta cap tipus d'autenticació."
+
+#: ../mail/mail.error.xml.h:132
+msgid "This signature has been changed, but has not been saved."
+msgstr "Esta signatura s'ha modificat, però no s'ha alçat."
+
+#: ../mail/mail.error.xml.h:133
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr ""
+"Això marcarà tots els missatges com a llegits en el directori seleccionat i "
+"els seus subdirectoris."
+
+#: ../mail/mail.error.xml.h:134
+msgid "This will mark all messages as read in the selected folder."
+msgstr ""
+"Això marcarà tots els missatges com a llegits a la carpeta seleccionada."
+
+#: ../mail/mail.error.xml.h:135
+msgid "Unable to connect to the GroupWise server."
+msgstr "No es pot connectar al servidor GroupWise."
+
+#: ../mail/mail.error.xml.h:136
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
+"No s'ha pogut obrir la carpeta d'esborranys d'este compte. Voleu fer servir "
+"la carpeta d'esborranys del sistema?"
+
+#: ../mail/mail.error.xml.h:137
+msgid "Unable to read license file."
+msgstr "No es pot llegir el fitxer de la llicència."
+
+#: ../mail/mail.error.xml.h:138
+msgid "Unable to retrieve message."
+msgstr "No s'ha pogut recuperar el missatge."
+
+#: ../mail/mail.error.xml.h:139
+msgid "Use _Default"
+msgstr "Pre_determinat"
+
+#: ../mail/mail.error.xml.h:140
+msgid "Use default drafts folder?"
+msgstr "Voleu utilitzar la carpeta d'esborranys per defecte?"
+
+#: ../mail/mail.error.xml.h:141
+msgid "Would you like to close the message window?"
+msgstr "Voleu tancar la finestra de missatges?"
+
+#: ../mail/mail.error.xml.h:142
+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 ""
+"Esteu responent de manera privada a un missatge que ha arribat a través "
+"d'una llista de correu, però la llista està intentant tornar a dirigir la "
+"vostra resposta a la llista mateixa. Segur que voleu continuar?"
+
+#: ../mail/mail.error.xml.h:143
+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 ""
+"Esteu responent a un missatge que ha arribat a través d'una llista de "
+"correu, però responeu de manera privada al remitent en lloc de fer-ho a la "
+"llista. Segur que voleu continuar?"
+
+#: ../mail/mail.error.xml.h:144
+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 ""
+"Esteu responent a un missatge que fou enviat a diversos destinataris. Segur "
+"que voleu respondre'ls a tots?"
+
+#: ../mail/mail.error.xml.h:145
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "No teniu els permisos suficients per esborrar este correu."
+
+#: ../mail/mail.error.xml.h:146
+msgid "You have not filled in all of the required information."
+msgstr "No heu introduït tota la informació necessària."
+
+#: ../mail/mail.error.xml.h:147
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Teniu missatges sense enviar. Voleu eixir de totes maneres?"
+
+#: ../mail/mail.error.xml.h:148
+msgid "You may not create two accounts with the same name."
+msgstr "No és possible crear dos comptes amb el mateix nom."
+
+#: ../mail/mail.error.xml.h:149
+msgid "You must name this Search Folder."
+msgstr "Heu d'assignar un nom a esta carpeta de cerca."
+
+#: ../mail/mail.error.xml.h:150
+msgid "You must specify a folder."
+msgstr "Heu d'especificar una carpeta."
+
+#: ../mail/mail.error.xml.h:151
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
+msgstr ""
+"Heu d'especificar almenys una carpeta com a font.\n"
+"Podeu fer-ho seleccionant les carpetes individualment, i/o seleccionant "
+"totes les carpetes locals, totes les remotes, o ambdues."
+
+#: ../mail/mail.error.xml.h:153
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "Ha fallat l'entrada al servidor «{0}» com a «{0}»."
+
+#: ../mail/mail.error.xml.h:154
+msgid "_Always"
+msgstr "Se_mpre"
+
+#: ../mail/mail.error.xml.h:155
+msgid "_Append"
+msgstr "_Afig"
+
+#: ../mail/mail.error.xml.h:156
+#: ../plugins/publish-calendar/publish-calendar.c:619
+msgid "_Disable"
+msgstr "_Inhabilita"
+
+#: ../mail/mail.error.xml.h:157
+msgid "_Discard changes"
+msgstr "_Descarta els canvis"
+
+#: ../mail/mail.error.xml.h:158
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
+msgid "_Empty Trash"
+msgstr "Buida la _paperera"
+
+#: ../mail/mail.error.xml.h:159
+msgid "_Exit Evolution"
+msgstr "I_x de l'Evolution"
+
+#: ../mail/mail.error.xml.h:160
+msgid "_Expunge"
+msgstr "Bui_da"
+
+#: ../mail/mail.error.xml.h:161
+msgid "_Migrate Now"
+msgstr "Inicia la _migració"
+
+#: ../mail/mail.error.xml.h:162
+msgid "_No"
+msgstr "_No"
+
+#: ../mail/mail.error.xml.h:163
+msgid "_Open Messages"
+msgstr "_Obri els missatges"
+
+#: ../mail/mail.error.xml.h:166
+msgid "_Send Receipt"
+msgstr "Envia la _confirmació"
+
+#: ../mail/mail.error.xml.h:167
+msgid "_Synchronize"
+msgstr "Sincronit_za"
+
+#: ../mail/mail.error.xml.h:168
+msgid "_Yes"
+msgstr "_Sí"
+
+#: ../mail/mail.error.xml.h:169
+msgid "{0}"
+msgstr "{0}"
+
+#: ../mail/message-list.c:1261
+msgid "Unseen"
+msgstr "No vist"
+
+#: ../mail/message-list.c:1262
+msgid "Seen"
+msgstr "Vist"
+
+#: ../mail/message-list.c:1263
+msgid "Answered"
+msgstr "Respost"
+
+#: ../mail/message-list.c:1264
+msgid "Forwarded"
+msgstr "Reenviat"
+
+#: ../mail/message-list.c:1265
+msgid "Multiple Unseen Messages"
+msgstr "Múltiples missatges sense veure"
+
+#: ../mail/message-list.c:1266
+msgid "Multiple Messages"
+msgstr "Missatges múltiples"
+
+#: ../mail/message-list.c:1270
+msgid "Lowest"
+msgstr "La més baixa"
+
+#: ../mail/message-list.c:1271
+msgid "Lower"
+msgstr "Més baixa"
+
+#: ../mail/message-list.c:1275
+msgid "Higher"
+msgstr "Més alta"
+
+#: ../mail/message-list.c:1276
+msgid "Highest"
+msgstr "La més alta"
+
+#: ../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:1916 ../plugins/itip-formatter/itip-view.c:205
+msgid "Today %l:%M %p"
+msgstr "Hui a les %k:%M"
+
+#: ../mail/message-list.c:1925
+msgid "Yesterday %l:%M %p"
+msgstr "Ahir a les %k:%M"
+
+#: ../mail/message-list.c:1937
+msgid "%a %l:%M %p"
+msgstr "%a a les %k:%M"
+
+#: ../mail/message-list.c:1945
+msgid "%b %d %l:%M %p"
+msgstr "el %d de %b a les %k:%M"
+
+#: ../mail/message-list.c:1947
+msgid "%b %d %Y"
+msgstr "%d de %b del %Y"
+
+#: ../mail/message-list.c:2752
+msgid "Select all visible messages"
+msgstr "Selecciona tots els missatges visibles"
+
+#: ../mail/message-list.c:2912 ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Missatges"
+
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:4160
+msgid "Follow-up"
+msgstr "Seguiment"
+
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:4675 ../mail/message-list.c:5098
+msgid "Generating message list"
+msgstr "S'està generant la llista de missatges"
+
+#: ../mail/message-list.c:4912
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"No hi ha cap missatge que satisfaci els vostres criteris de cerca. Netegeu "
+"la cerca a través de l'element de menú Cerca -> Neteja, o bé canvieu-la."
+
+#: ../mail/message-list.c:4914
+msgid "There are no messages in this folder."
+msgstr "No hi ha cap missatge en esta carpeta."
+
+#: ../mail/message-list.etspec.h:3
+msgid "Due By"
+msgstr "Venciment"
+
+#: ../mail/message-list.etspec.h:4
+msgid "Flag Status"
+msgstr "Estat del senyalador"
+
+#: ../mail/message-list.etspec.h:5
+msgid "Flagged"
+msgstr "Senyalat"
+
+#: ../mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr "Senyalador per respondre"
+
+#: ../mail/message-list.etspec.h:11
+msgid "Received"
+msgstr "Rebut"
+
+#: ../mail/message-list.etspec.h:15
+msgid "Sent Messages"
+msgstr "Missatges enviats"
+
+#: ../mail/message-list.etspec.h:16
+#: ../widgets/misc/e-attachment-tree-view.c:572
+msgid "Size"
+msgstr "Mida"
+
+#: ../mail/message-list.etspec.h:19
+msgid "Subject - Trimmed"
+msgstr "Assumpte - retallat"
+
+#: ../mail/searchtypes.xml.h:1
+#: ../modules/mail/e-mail-shell-view-actions.c:1562
+msgid "Body contains"
+msgstr "El cos conté"
+
+#: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1569
+msgid "Message contains"
+msgstr "El missatge conté"
+
+#: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1576
+msgid "Recipients contain"
+msgstr "Els destinataris contenen"
+
+#: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
+msgid "Sender contains"
+msgstr "El remitent conté"
+
+#: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1590
+msgid "Subject contains"
+msgstr "L'assumpte conté"
+
+#: ../mail/searchtypes.xml.h:6
+msgid "Subject or Addresses contains"
+msgstr "L'assumpte o les adreces contenen"
+
+#: ../modules/addressbook/addressbook-config.c:207
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"Si seleccioneu esta opció l'Evolution només es connectarà al servidor d'LDAP "
+"si este funciona amb l'SSL."
+
+#: ../modules/addressbook/addressbook-config.c:209
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"Si seleccioneu esta opció l'Evolution només es connectarà al servidor d'LDAP "
+"si este funciona amb el TLS."
+
+#: ../modules/addressbook/addressbook-config.c:211
+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 ""
+"Si seleccioneu esta opció vol dir que el servidor no funciona ni amb l'SSL "
+"ni amb el TLS. Això implica que la connexió serà insegura i que sereu "
+"vulnerables als atacs de seguretat."
+
+#: ../modules/addressbook/addressbook-config.c:641
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "Utilitza al calendari d'_aniversaris i commemoracions"
+
+#: ../modules/addressbook/addressbook-config.c:683
+msgid "Copy _book content locally for offline operation"
+msgstr ""
+"Copia el contingut de la _llibreta localment per treballar fora de línia"
+
+#: ../modules/addressbook/addressbook-config.c:798
+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 ""
+"És el port d'LDAP on s'intentarà connectar l'Evolution. Se vos proporciona "
+"una llista de ports estàndard. Pregunteu a l'administrador del sistema quin "
+"port heu d'especificar."
+
+#: ../modules/addressbook/addressbook-config.c:879
+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 ""
+"El mètode que utilitzarà l'Evolution per autenticar-vos. Recordeu que "
+"l'opció «Adreça electrònica» necessita accés anònim al servidor d'LDAP."
+
+#: ../modules/addressbook/addressbook-config.c:962
+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 ""
+"L'àmbit de la cerca defineix fins a quina profunditat voleu que la cerca "
+"s'endinsi per l'arbre de directoris. L'àmbit de cerca «sub» inclourà totes "
+"les entrades per sota de la base de la cerca. L'àmbit de cerca «one» només "
+"inclourà les entrades un nivell per sota de la vostra base."
+
+#: ../modules/addressbook/addressbook-config.c:1086
+msgid "Server Information"
+msgstr "Informació del servidor"
+
+#: ../modules/addressbook/addressbook-config.c:1091
+#: ../smime/gui/smime-ui.ui.h:13
+msgid "Details"
+msgstr "Detalls"
+
+#: ../modules/addressbook/addressbook-config.c:1092
+#: ../modules/mail/e-mail-shell-view.c:58
+msgid "Searching"
+msgstr "Cerca"
+
+#: ../modules/addressbook/addressbook-config.c:1094
+msgid "Downloading"
+msgstr "Baixada"
+
+#: ../modules/addressbook/addressbook-config.c:1309
+msgid "Address Book Properties"
+msgstr "Propietats de la llibreta d'adreces"
+
+#: ../modules/addressbook/addressbook-config.c:1311
+msgid "New Address Book"
+msgstr "Llibreta d'adreces nova"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr "Longitud abans d'autocompletar"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
+msgid "Contact layout style"
+msgstr "Estil de disposició dels contactes"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
+msgid "Contact preview pane position (horizontal)"
+msgstr ""
+"Posició de la subfinestra de previsualització dels contactes (horitzontal)"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
+msgid "Contact preview pane position (vertical)"
+msgstr ""
+"Posició de la subfinestra de previsualització dels contactes (vertical)"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "XML de l'EFolderList per a la llista d'URI de compleció"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "XML de l'EFolderList per a la llista d'URI de compleció."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr ""
+"Posició de la subfinestra de previsualització dels contactes quan s'orienti "
+"horitzontalment."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr ""
+"Posició de la subfinestra de previsualització dels contactes quan s'orienti "
+"verticalment."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Primary address book"
+msgstr "La llibreta d'adreces primària"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+msgid "Show autocompleted name with an address"
+msgstr "Mostra el nom autocompletat amb una adreça"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid "Show maps"
+msgstr "Mostra els mapes"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid "Show preview pane"
+msgstr "Mostra la subfinestra de previsualització"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid ""
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view."
+msgstr ""
+"L'UID de la llibreta d'adreces seleccionada (o «primary» -primària-) a la "
+"barra lateral de la visualització de «Contactes»."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+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 ""
+"L'estil de disposició determina on posar la subfinestra en relació a la "
+"llista de contactes. El valor «0» (visualització clàssica) ubica la "
+"subfinestra de previsualització sota la llista de contactes. El valor "
+"«1» (visualització vertical) ubica la subfinestra de previsualització al "
+"costat de la llista de contactes."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+"El nombre de caràcters que s'han d'haver escrit abans que l'Evolution inicie "
+"la compleció automàtica."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+msgid "URI for the folder last used in the select names dialog"
+msgstr "L'URI de l'última carpeta utilitzada en el diàleg de selecció de noms"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
+msgid "URI for the folder last used in the select names dialog."
+msgstr "L'URI de l'última carpeta utilitzada en el diàleg de selecció de noms."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+"Si s'ha de forçar la visualització de l'adreça electrònica amb el nom del "
+"contacte autocompletat a l'entrada."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+msgid "Whether to show maps in preview pane."
+msgstr "Si s'han de mostrar els mapes en la subfinestra de previsualització."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
+msgid "Whether to show the preview pane."
+msgstr "Si s'ha de mostrar la subfinestra de previsualització."
+
+#. 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:194
+#: ../modules/mail/em-mailer-prefs.c:1049
+msgid "_Table column:"
+msgstr "Columna de la _taula:"
+
+#: ../modules/addressbook/autocompletion-config.c:197
+msgid "Autocompletion"
+msgstr "Compleció automàtica"
+
+#: ../modules/addressbook/autocompletion-config.c:200
+msgid "Always _show address of the autocompleted contact"
+msgstr "M_ostra sempre l'adreça del contacte autocompletat"
+
+#. Create the LDAP source group
+#: ../modules/addressbook/e-book-shell-backend.c:102
+#: ../modules/addressbook/e-book-shell-migrate.c:154
+msgid "On LDAP Servers"
+msgstr "Als servidors d'LDAP"
+
+#: ../modules/addressbook/e-book-shell-backend.c:302
+msgctxt "New"
+msgid "_Contact"
+msgstr "_Contacte"
+
+#: ../modules/addressbook/e-book-shell-backend.c:304
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
+msgid "Create a new contact"
+msgstr "Crea un contacte nou"
+
+#: ../modules/addressbook/e-book-shell-backend.c:309
+msgctxt "New"
+msgid "Contact _List"
+msgstr "_Llista de contactes"
+
+#: ../modules/addressbook/e-book-shell-backend.c:311
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
+msgid "Create a new contact list"
+msgstr "Crea una llista de contactes nova"
+
+#: ../modules/addressbook/e-book-shell-backend.c:319
+msgctxt "New"
+msgid "Address _Book"
+msgstr "Lli_breta d'adreces"
+
+#: ../modules/addressbook/e-book-shell-backend.c:321
+#: ../modules/addressbook/e-book-shell-view-actions.c:835
+msgid "Create a new address book"
+msgstr "Crea una llibreta d'adreces nova"
+
+#. Create the contacts group
+#: ../modules/addressbook/e-book-shell-backend.c:338
+#: ../modules/addressbook/e-book-shell-view.c:405
+#: ../modules/calendar/e-cal-shell-backend.c:115
+#: ../modules/calendar/e-cal-shell-migrate.c:63
+#: ../modules/online-accounts/e-online-accounts-google.c:366
+msgid "Contacts"
+msgstr "Contactes"
+
+#: ../modules/addressbook/e-book-shell-backend.c:348
+msgid "Certificates"
+msgstr "Certificats"
+
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:387
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
+msgid "Save as vCard"
+msgstr "Alça com a vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
+msgid "Co_py All Contacts To..."
+msgstr "C_opia tots els contactes a..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+msgid "Copy the contacts of the selected address book to another"
+msgstr "Copia els contactes de la llibreta d'adreces seleccionada a una altra"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
+msgid "D_elete Address Book"
+msgstr "Suprim_eix la llibreta d'adreces"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
+msgid "Delete the selected address book"
+msgstr "Suprimeix la llibreta d'adreces seleccionada"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
+msgid "Mo_ve All Contacts To..."
+msgstr "Mo_u tots els contactes a..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
+msgid "Move the contacts of the selected address book to another"
+msgstr "Mou els contactes de la llibreta d'adreces seleccionada a una altra"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:833
+msgid "_New Address Book"
+msgstr "Llibreta d'adreces _nova"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
+msgid "Address _Book Properties"
+msgstr "Propieta_ts de la llibreta d'adreces"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
+msgid "Show properties of the selected address book"
+msgstr "Canvia les propietats de la llibreta d'adreces seleccionada"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
+msgid "Address Book _Map"
+msgstr "_Mapa de la llibreta d'adreces"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+msgid "Show map with all contacts from selected address book"
+msgstr ""
+"Mostra un mapa de tots els contactes de la llibreta d'adreces seleccionada"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:854
+#: ../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
+msgid "_Rename..."
+msgstr "Can_via el nom..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
+msgid "Rename the selected address book"
+msgstr "Canvia el nom de la llibreta d'adreces"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
+msgid "Stop loading"
+msgstr "Atura la càrrega"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
+msgid "_Copy Contact To..."
+msgstr "C_opia el contacte a..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+msgid "Copy selected contacts to another address book"
+msgstr "Copia els contactes seleccionats a una altra llibreta d'adreces"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
+msgid "_Delete Contact"
+msgstr "_Suprimeix el contacte"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:882
+msgid "_Find in Contact..."
+msgstr "_Cerca en un contacte..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
+msgid "Search for text in the displayed contact"
+msgstr "Cerca un text en el cos del contacte que es mostra"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:889
+msgid "_Forward Contact..."
+msgstr "Reen_via un contacte..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
+msgid "Send selected contacts to another person"
+msgstr "Envia els contactes seleccionats a una altra persona"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
+msgid "_Move Contact To..."
+msgstr "_Mou el contacte a..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
+msgid "Move selected contacts to another address book"
+msgstr "Mou els contactes a una altra llibreta d'adreces"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
+msgid "_New Contact..."
+msgstr "Contacte _nou..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:910
+msgid "New Contact _List..."
+msgstr "_Llista de contactes nova..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:917
+msgid "_Open Contact"
+msgstr "Obri el _contacte"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
+msgid "View the current contact"
+msgstr "Visualitza el contacte actual"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:924
+msgid "_Send Message to Contact..."
+msgstr "Envia un _missatge al contacte..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
+msgid "Send a message to the selected contacts"
+msgstr "Envia un missatge als contactes seleccionats"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:933
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-task-shell-view-actions.c:822
+msgid "_Actions"
+msgstr "_Accions"
+
+#: ../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
+msgid "_Preview"
+msgstr "_Previsualització"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../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 "_Suprimeix"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
+msgid "_Properties"
+msgstr "_Propietats"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
+msgid "Address Book Map"
+msgstr "Mapa de la llibreta d'adreces"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
+msgid "Contact _Preview"
+msgstr "_Previsualització de contactes"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:991
+msgid "Show contact preview window"
+msgstr "Mostra la finestra de previsualització de contactes"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
+msgid "Show _Maps"
+msgstr "Mostra els _mapes"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:999
+msgid "Show maps in contact preview window"
+msgstr "Mostra els mapes en la finestra de previsualització de contactes"
+
+#: ../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
+msgid "_Classic View"
+msgstr "Visualització _clàssica"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1020
+msgid "Show contact preview below the contact list"
+msgstr "Mostra la previsualització del contacte sota la llista de contactes"
+
+#: ../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
+msgid "_Vertical View"
+msgstr "_Visualització vertical"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1027
+msgid "Show contact preview alongside the contact list"
+msgstr ""
+"Mostra la previsualització de contacte al costat de la llista de contactes"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../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 "Qualsevol categoria"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:970
+msgid "Unmatched"
+msgstr "Sense coincidència"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../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
+msgid "Advanced Search"
+msgstr "Cerca avançada"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1085
+msgid "Print all shown contacts"
+msgstr "Imprimeix tots els contactes que es mostren"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1092
+msgid "Preview the contacts to be printed"
+msgstr "Previsualitza els contactes que s'han d'imprimir"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1099
+msgid "Print selected contacts"
+msgstr "Imprimeix els contactes seleccionats"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1114
+msgid "S_ave Address Book as vCard"
+msgstr "Des_a la llibreta d'adreces com a vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "Alça els contactes de la llibreta d'adreces seleccionada com a vCard"
+
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:1122
+#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+msgid "_Save as vCard..."
+msgstr "Al_ça com a vCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1124
+msgid "Save selected contacts as a vCard"
+msgstr "Alça els contactes seleccionats com a vCard"
+
+#: ../modules/addressbook/e-book-shell-view.c:349
+msgid "_Forward Contacts"
+msgstr "R_eenvia contactes"
+
+#: ../modules/addressbook/e-book-shell-view.c:351
+msgid "_Forward Contact"
+msgstr "_Reenvia el contacte"
+
+#: ../modules/addressbook/e-book-shell-view.c:382
+msgid "_Send Message to Contacts"
+msgstr "Envia un _missatge als contactes"
+
+#: ../modules/addressbook/e-book-shell-view.c:384
+msgid "_Send Message to List"
+msgstr "En_via un missatge a la llista"
+
+#: ../modules/addressbook/e-book-shell-view.c:386
+msgid "_Send Message to Contact"
+msgstr "Envia _un missatge al contacte"
+
+#: ../modules/addressbook/eab-composer-util.c:149
+msgid "Multiple vCards"
+msgstr "vCard múltiples"
+
+#: ../modules/addressbook/eab-composer-util.c:157
+#, c-format
+msgid "vCard for %s"
+msgstr "vCard per a %s"
+
+#: ../modules/addressbook/eab-composer-util.c:169
+#: ../modules/addressbook/eab-composer-util.c:196
+#, c-format
+msgid "Contact information"
+msgstr "Informació del contacte"
+
+#: ../modules/addressbook/eab-composer-util.c:198
+#, c-format
+msgid "Contact information for %s"
+msgstr "Informació de contacte per a %s"
+
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
+msgid "1"
+msgstr "1"
+
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:4
+msgid "5"
+msgstr "5"
+
+#: ../modules/addressbook/ldap-config.ui.h:5
+msgid "Anonymously"
+msgstr "Anònimament"
+
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../modules/addressbook/ldap-config.ui.h:7
+msgid "B_rowse this book until limit reached"
+msgstr "Na_vega per esta llibreta fins arribar al límit establit"
+
+#: ../modules/addressbook/ldap-config.ui.h:8
+msgid "Lo_gin:"
+msgstr "_Entra:"
+
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:11
+msgid "One"
+msgstr "Un/una"
+
+#: ../modules/addressbook/ldap-config.ui.h:13
+msgid "Search Filter"
+msgstr "Filtre de cerca"
+
+#: ../modules/addressbook/ldap-config.ui.h:14
+msgid "Search _base:"
+msgstr "Ba_se de la cerca:"
+
+#: ../modules/addressbook/ldap-config.ui.h:15
+msgid "Search _filter:"
+msgstr "Fil_tre de cerca:"
+
+#: ../modules/addressbook/ldap-config.ui.h:16
+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 ""
+"El filtre de cerca és el tipus d'objecte a cercar. Si no es modifica, per "
+"defecte la cerca es realitzarà sobre el tipus «persona»."
+
+# És el nom d'un mètode
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:18
+msgid "Sub"
+msgstr "Sub"
+
+#: ../modules/addressbook/ldap-config.ui.h:19
+msgid "Supported Search Bases"
+msgstr "Bases de cerca compatibles"
+
+#: ../modules/addressbook/ldap-config.ui.h:21
+msgid "Using distinguished name (DN)"
+msgstr "Utilitza el nom distingit (DN)"
+
+#: ../modules/addressbook/ldap-config.ui.h:22
+msgid "Using email address"
+msgstr "Utilitza l'adreça electrònica"
+
+#: ../modules/addressbook/ldap-config.ui.h:23
+msgid "_Download limit:"
+msgstr "Límit de baixa_da:"
+
+#: ../modules/addressbook/ldap-config.ui.h:24
+msgid "_Find Possible Search Bases"
+msgstr "Cerca les _bases de cerca possibles"
+
+#: ../modules/addressbook/ldap-config.ui.h:25
+msgid "_Login method:"
+msgstr "Mè_tode d'entrada:"
+
+#: ../modules/addressbook/ldap-config.ui.h:28
+msgid "_Search scope:"
+msgstr "Àmbit de la c_erca:"
+
+#: ../modules/addressbook/ldap-config.ui.h:30
+msgid "_Timeout:"
+msgstr "_Temps d'espera:"
+
+#: ../modules/addressbook/ldap-config.ui.h:32
+msgid "cards"
+msgstr "targetes"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:146
+#, c-format
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "No s'ha pogut engendrar el Bogofilter (%s): "
+
+#: ../modules/bogofilter/evolution-bogofilter.c:164
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr ""
+"No s'ha pogut transmetre el contingut del correu electrònic al Bogofilter:"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:213
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr ""
+"El Bogofilter o ha fallat, o bé, no ha pogut processar el correu electrònic"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:312
+msgid "Bogofilter Options"
+msgstr "Opcions del Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:321
+msgid "Convert message text to _Unicode"
+msgstr "Converteix el text del missatge a _Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:477
+msgid "Bogofilter"
+msgstr "Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "Converteix el text dels correus a Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"Converteix el text dels missatges a Unicode (codificació UTF-8) per unificar "
+"els elements de spam/ham provinents de jocs de caràcters diferents."
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr ""
+"%u i %d es reemplaçaran amb l'usuari i el domini de l'adreça electrònica."
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
+msgid "(Shown in a Day View)"
+msgstr "(mostrat en la visualització de dia)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
+msgid "05 minutes"
+msgstr "05 minuts"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
+msgid "10 minutes"
+msgstr "10 minuts"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
+msgid "15 minutes"
+msgstr "15 minuts"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
+msgid "30 minutes"
+msgstr "30 minuts"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
+msgid "60 minutes"
+msgstr "60 minuts"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
+msgid "Alerts"
+msgstr "Avisos"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
+msgid "Day _ends:"
+msgstr "_El dia s'acaba a les:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
+msgid "Days"
+msgstr "Dies"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Default Free/Busy Server"
+msgstr "Servidor lliure/ocupat per defecte"
+
+# És un nom de pestanya, i per tant ha de ser un substantiu (dpm)
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
+msgid "Display"
+msgstr "Visualització"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+msgid "Display reminders in _notification area only"
+msgstr "Mostra els recordatoris només a l'àrea de _notificació"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+msgid "Hours"
+msgstr "Hores"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
+msgid "Minutes"
+msgstr "Minuts"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+msgid "Publishing Information"
+msgstr "Informació de publicació"
+
+#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+msgid "S_un"
+msgstr "d_g"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
+msgid "Sc_roll Month View by a week"
+msgstr "Des_plaça la visualització mensual en passos d'una setmana"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Se_cond zone:"
+msgstr "Se_gon fus:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
+msgid "Select the calendars for reminder notification"
+msgstr "Seleccioneu els calendaris per a les notificacions de recordatori"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Sh_ow a reminder"
+msgstr "M_ostra un recordatori"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
+msgid "Show a _reminder"
+msgstr "M_ostra un recordatori"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
+msgid "Show r_ecurring events in italic in bottom left calendar"
+msgstr ""
+"Mostra els esdeveniments per_iòdics en cursiva a la part inferior esquerra "
+"del calendari"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
+msgid "Show week _numbers"
+msgstr "Mostra els _números de setmana"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "T_asks due today:"
+msgstr "T_asques que vencen hui:"
+
+#. Thursday
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
+msgid "T_hu"
+msgstr "d_j"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
+msgid "Template:"
+msgstr "Plantilla:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../widgets/misc/e-dateedit.c:592
+msgid "Time"
+msgstr "Hora"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
+msgid "Time format:"
+msgstr "Format de l'hora:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
+msgid "Use s_ystem time zone"
+msgstr "Utilitza el _fus horari del sistema"
+
+#. A weekday like "Monday" follows
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
+msgid "Wee_k starts on:"
+msgstr "La s_etmana comença el:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+msgid "Work Week"
+msgstr "Setmana laborable"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
+msgid "Work days:"
+msgstr "Dies laborables:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "_12 hour (AM/PM)"
+msgstr "_12 hores (am/pm)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_24 hour"
+msgstr "_24 hores"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "_Ask for confirmation when deleting items"
+msgstr "Sol·licit_a la confirmació en suprimir elements"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
+msgid "_Compress weekends in month view"
+msgstr "_Comprimeix els caps de setmana en la visualització mensual"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
+msgid "_Day begins:"
+msgstr "El _dia comença a les:"
+
+#. Friday
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
+msgid "_Fri"
+msgstr "d_v"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
+msgid "_Hide completed tasks after"
+msgstr "Amaga les tasqu_es completades després de"
+
+#. Monday
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+msgid "_Mon"
+msgstr "d_l"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
+msgid "_Overdue tasks:"
+msgstr "Tasq_ues endarrerides:"
+
+#. Saturday
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
+msgid "_Sat"
+msgstr "d_s"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
+msgid "_Show appointment end times in week and month view"
+msgstr ""
+"Mo_stra les hores de finalització de les cites en visualitzacions setmanals "
+"i mensuals"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
+msgid "_Time divisions:"
+msgstr "Divisions de _temps:"
+
+#. Tuesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
+msgid "_Tue"
+msgstr "d_m"
+
+#. Wednesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
+msgid "_Wed"
+msgstr "d_c"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
+msgid "before every anniversary/birthday"
+msgstr "abans de cada commemoració/aniversari"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
+msgid "before every appointment"
+msgstr "abans de cada cita"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+msgid "Ask for confirmation when deleting items"
+msgstr "Sol·licita confirmació en suprimir elements"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr "Color de fons de les tasques que vencen hui, en format «#rrggbb»."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr "Color de fons de les tasques que han vençut, en format «#rrggbb»."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+msgid "Birthday and anniversary reminder"
+msgstr "Recordatori d'aniversaris i commemoracions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+msgid "Birthday and anniversary reminder units"
+msgstr "Unitats del recordatori d'aniversaris i commemoracions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+msgid "Birthday and anniversary reminder value"
+msgstr "Valor del recordatori d'aniversaris i commemoracions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+msgid "Calendars to run reminders for"
+msgstr "Calendaris pels quals s'han d'executar els recordatoris"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr ""
+"Color amb el qual s'ha de dibuixar la línia de Marcus Bains a la barra de "
+"temps (buit per defecte)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr ""
+"Color amb el qual s'ha de dibuixar la línia de Marcus Bains a la "
+"visualització de dia."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+msgid "Compress weekends in month view"
+msgstr "Comprimeix els caps de setmana en la visualització mensual"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+msgid "Confirm expunge"
+msgstr "Demana confirmació en buidar"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr ""
+"Dies en els quals s'ha d'indicar l'inici i el final de les hores laborals."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+msgid "Default appointment reminder"
+msgstr "Recordatori de cita per defecte"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+msgid "Default reminder units"
+msgstr "Unitats per defecte pels recordatoris"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+msgid "Default reminder value"
+msgstr "Valor per defecte pels recordatoris"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+msgid "Directory for saving reminder audio files"
+msgstr "Directori per alçar els fitxers de so dels recordatoris"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
+msgid "Free/busy server URLs"
+msgstr "URL del servidor lliure/ocupat"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+msgid "Free/busy template URL"
+msgstr "Plantilla URL de lliure/ocupat"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+msgid "Hide completed tasks"
+msgstr "Oculta les tasques completades"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+msgid "Hide task units"
+msgstr "Oculta les unitats de la tasca"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+msgid "Hide task value"
+msgstr "Oculta el valor de la tasca"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+msgid "Horizontal pane position"
+msgstr "Posició de la subfinestra horitzontal"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr "A quina hora acaba el dia laboral, entre 0 i 23."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr "A quina hora comença el dia laboral, entre 0 i 23."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr ""
+"Si és «true» (cert), mostra la subfinestra de previsualització de les "
+"anotacions a la finestra principal."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr ""
+"Si és «true» (cert), mostra la subfinestra de previsualització de les "
+"tasques a la finestra principal."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr ""
+"Intervals mostrats en les visualitzacions de dies i setmanes laborals, en "
+"minuts."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Last reminder time"
+msgstr "Última hora del recordatori"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+msgid "List of recently used second time zones in a Day View."
+msgstr ""
+"Llista dels fusos horaris secundaris utilitzats recentment a la "
+"visualització de dia."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+msgid "List of server URLs for free/busy publishing."
+msgstr ""
+"Llista dels URL dels servidors per a la publicació de l'estat lliure/ocupat."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+msgid "Marcus Bains Line"
+msgstr "Línia de Marcus Bains"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+msgid "Marcus Bains Line Color - Day View"
+msgstr "Color de la línia de Marcus Bains - Visualització de dia"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+msgid "Marcus Bains Line Color - Time bar"
+msgstr "Color de la línia de Marcus Bains - Barra de temps"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr ""
+"Nombre màxim de fusos horaris utilitzats recentment a recordar en una llista "
+"«day_second_zones»."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+msgid "Maximum number of recently used timezones to remember."
+msgstr "Nombre màxim de fusos horaris utilitzats recentment a recordar."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+msgid "Memo layout style"
+msgstr "Estil de la disposició de les anotacions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+msgid "Memo preview pane position (horizontal)"
+msgstr ""
+"Posició de la subfinestra horitzontal de la vista prèvia de les anotacions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+msgid "Memo preview pane position (vertical)"
+msgstr ""
+"Posició de la subfinestra vertical de la vista prèvia de les anotacions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "Minut de finalització de la jornada laboral, de 0 a 59."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "Minut d'inici de la jornada laboral, de 0 a 59."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+msgid "Month view horizontal pane position"
+msgstr "Posició de la subfinestra horitzontal a la visualització mensual"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+msgid "Month view vertical pane position"
+msgstr "Posició de la subfinestra vertical a la visualització mensual"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+msgid "Number of units for determining a birthday or anniversary reminder."
+msgstr ""
+"Nombre d'unitats per determinar un recordatori d'aniversaris o "
+"commemoracions."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+msgid "Number of units for determining a default reminder."
+msgstr "Nombre d'unitats per determinar un recordatori per defecte."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+msgid "Number of units for determining when to hide tasks."
+msgstr "Nombre d'unitats per determinar quan s'han d'amagar les tasques."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+msgid "Overdue tasks color"
+msgstr "Color de les tasques vençudes"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+msgstr ""
+"Posició de la subfinestra horitzontal, entre el calendari de navegació de "
+"dates i la llista de tasques quan no s'estiga a la visualització mensual, en "
+"píxels."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"Posició de la subfinestra horitzontal, entre la visualització i el calendari "
+"de navegació de dates i la llista de tasques en la visualització mensual, en "
+"píxels."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr ""
+"Posició de la subfinestra de previsualització de les anotacions quan "
+"s'orienti verticalment."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr ""
+"Posició de la subfinestra de previsualització de les tasques quan s'orienti "
+"horitzontalment."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+msgid "Position of the task preview pane when oriented vertically."
+msgstr ""
+"Posició de la subfinestra de previsualització de les tasques quan s'orienti "
+"verticalment."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr ""
+"Posició de la subfinestra vertical, entre les llistes de calendaris i el "
+"calendari de navegació de les dates."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"Posició de la subfinestra vertical, entre la visualització i el calendari de "
+"navegació de dates i la llista de tasques en la visualització mensual, en "
+"píxels."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+"Posició de la subfinestra vertical, entre el calendari de navegació de dates "
+"i la llista de tasques quan no s'estiga a la visualització mensual, en "
+"píxels."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+msgid "Primary calendar"
+msgstr "Calendari principal"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+msgid "Primary memo list"
+msgstr "Llista d'anotacions principal"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+msgid "Primary task list"
+msgstr "Llista de tasques principal"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Programs that are allowed to be run by reminders."
+msgstr "Els programes que es permet que puguen executar els recordatoris."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+msgid "Recently used second time zones in a Day View"
+msgstr ""
+"Fusos horaris secundaris utilitzats recentment en una visualització de dia"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+msgid "Recurrent Events in Italic"
+msgstr "Esdeveniments periòdics en cursiva"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+msgid "Reminder programs"
+msgstr "Programes pels recordatoris"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
+msgid "Save directory for reminder audio"
+msgstr "Directori on alçar els sons dels recordatoris"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
+msgid "Scroll Month View by a week"
+msgstr "Desplaça la visualització mensual en passos d'una setmana"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "Mostra el camp de RSVP en l'editor d'esdeveniments/tasques/reunions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "Mostra el camp de rol en l'editor d'esdeveniments/tasques/reunions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
+msgid "Show appointment end times in week and month views"
+msgstr ""
+"Mostra les hores de finalització de les cites en les visualitzacions "
+"setmanals i mensuals"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
+msgid "Show categories field in the event/meeting/task editor"
+msgstr ""
+"Mostra el camp de categories a l'editor d'esdeveniments/tasques/reunions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
+msgid "Show days with recurrent events in italic font in bottom left calendar."
+msgstr ""
+"Mostra els dies que tinguen esdeveniments periòdics en cursiva a la part "
+"inferior esquerra del calendari."
+
+# FIXME: [l10n-bug] (dpm)
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
+msgid "Show display reminders in notification tray"
+msgstr "Mostra els recordatoris per visualitzar a l'àrea de notificació"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
+msgid "Show status field in the event/task/meeting editor"
+msgstr "Mostra el camp d'estat a l'editor d'esdeveniments/tasques/reunions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
+msgid "Show the memo preview pane"
+msgstr "Mostra la subfinestra de previsualització de les anotacions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
+msgid "Show the task preview pane"
+msgstr "Mostra la subfinestra de previsualització de les tasques"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
+msgid "Show timezone field in the event/meeting editor"
+msgstr ""
+"Mostra el camp de fus horari en l'editor d'esdeveniments/tasques/reunions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
+msgid "Show type field in the event/task/meeting editor"
+msgstr "Mostra el camp de tipus en l'editor d'esdeveniments/tasques/reunions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr ""
+"Mostra el número de setmana a les visualitzacions de dies, setmanes "
+"laborables i al navegador de dates"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+"Si està establit, mostra el fus horari secundari en una visualització de "
+"dia. El valor és similar a l'utilitzat en una clau «timezone» (fus horari)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
+msgid "Task layout style"
+msgstr "Estil de disposició de les tasques"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
+msgid "Task preview pane position (horizontal)"
+msgstr ""
+"Posició de la subfinestra de previsualització de les tasques (horitzontal)"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
+msgid "Task preview pane position (vertical)"
+msgstr ""
+"Posició de la subfinestra de previsualització de les tasques (vertical)"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
+msgid "Tasks due today color"
+msgstr "Color de les tasques que vencen hui"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
+msgid ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
+msgstr ""
+"L'UID del calendari seleccionat (o «primary» -primària-) a la barra lateral "
+"de la visualització de «Calendari»."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
+msgid ""
+"The UID of the selected (or \"primary\") memo list in the sidebar of the "
+"\"Memos\" view."
+msgstr ""
+"L'UID de la llista d'anotacions seleccionada (o «primary» -primària-) a la "
+"barra lateral de la visualització d'«Anotacions»."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+msgid ""
+"The UID of the selected (or \"primary\") task list in the sidebar of the "
+"\"Tasks\" view."
+msgstr ""
+"L'UID de la llista de tasques seleccionada (o «primary» -primària-) a la "
+"barra lateral de la visualització de «Tasques»."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+"La plantilla d'URL per utilitzar per defecte de dades de lliure/ocupat, %u "
+"es reemplaça amb la part d'usuari de l'adreça de correu i %d es reemplaça "
+"amb el domini."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"El fus horari per defecte per a les dates i hores del calendari, com a "
+"ubicació de base de dades de fus horari no traduït d'Olsen, com en «Europe/"
+"Andorra»."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+"L'estil de disposició determina on posar la subfinestra en relació a la "
+"llista d'anotacions. El valor «0» (visualització clàssica) ubica la "
+"subfinestra de previsualització sota la llista d'anotacions. El valor "
+"«1» (visualització vertical) ubica la subfinestra de previsualització al "
+"costat de la llista d'anotacions."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"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 ""
+"L'estil de disposició determina on posar la subfinestra en relació a la "
+"llista de tasques. El valor «0» (visualització clàssica) ubica la "
+"subfinestra de previsualització sota la llista de tasques. El valor "
+"«1» (visualització vertical) ubica la subfinestra de previsualització al "
+"costat de la llista de tasques."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
+msgid "The second timezone for a Day View"
+msgstr "El fus horari secundari per a una visualització de dia"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+"Això pot tindre tres valors possibles: «0» per als errors, «1» per als "
+"avisos, i «2» per als missatges de depuració."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
+msgid "Time divisions"
+msgstr "Divisions de temps"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
+msgid "Time the last reminder ran, in time_t."
+msgstr "L'última vegada que es va executar el recordatori, en time_t."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+msgid "Timezone"
+msgstr "Fus horari"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
+msgid "Twenty four hour time format"
+msgstr "Format horari de 24 hores"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\"."
+msgstr ""
+"Unitats per a un recordatori d'aniversaris o commemoracions: "
+"«minutes» (minuts), «hours» (hores) o «days» (dies)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"Unitats per al recordatori per defecte, «minutes» (minuts), «hours» (hores) "
+"o «days» (dies)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"Unitats per determinar quan s'han d'amagar les tasques, «minutes» (minuts), "
+"«hours» (hores) o «days» (dies)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
+msgid "Use system timezone"
+msgstr "Utilitza el fus horari del sistema"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr ""
+"Utilitza el fus horari del sistema en lloc del seleccionat a l'Evolution."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
+msgid "Vertical pane position"
+msgstr "Posició de la subfinestra vertical"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
+msgid "Week start"
+msgstr "Inici de setmana"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgstr "Dia en què comença la setmana, de diumenge (0) a dissabte (6)."
+
+# FIXME: [l10n-bug] (dpm)
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
+msgid "Whether or not to use the notification tray for display reminders."
+msgstr ""
+"Si s'ha de fer servir l'àrea de notificació per visualitzar els recordatoris."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr "Si s'ha de sol·licitar confirmació en suprimir una cita o tasca."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr "Si s'ha de sol·licitar confirmació en buidar les cites i tasques."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+"Si s'han de comprimir els caps de setmana en la visualització mensual, cosa "
+"que posarà els dissabtes i diumenges en un únic espai."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
+msgid "Whether to display the end time of events in the week and month views."
+msgstr ""
+"Si s'ha de mostrar l'hora de finalització dels esdeveniments en les "
+"visualitzacions setmanals i mensuals."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr ""
+"Si s'ha de dibuixar la línia de Marcus Bains (línia en el moment actual) al "
+"calendari."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr ""
+"Si s'han d'amagar les tasques completades a la visualització de tasques."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr ""
+"Si s'ha de desplaçar la visualització mensual en passos d'una setmana en "
+"lloc de per mes."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
+msgid "Whether to set a default reminder for appointments."
+msgstr "Si s'ha d'establir un recordatori per defecte per a les cites."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
+msgid "Whether to set a reminder for birthdays and anniversaries."
+msgstr "Si s'ha d'establir un recordatori per a aniversaris i commemoracions."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr ""
+"Si s'ha de mostrar el camp RSVP a l'editor d'esdeveniments/tasques/reunions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr ""
+"Si s'ha de mostrar el camp de categories a l'editor d'esdeveniments/tasques/"
+"reunions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr ""
+"Si s'ha de mostrar el camp de rol a l'editor d'esdeveniments/tasques/reunions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr ""
+"Si s'ha de mostrar el camp d'estat a l'editor d'esdeveniments/tasques/"
+"reunions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
+msgstr ""
+"Si s'ha de mostrar l'hora en el format de 24 hores en comptes d'utilitzar am/"
+"pm."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr ""
+"Si s'ha de mostrar el camp de fus horari en l'editor d'esdeveniments/tasques/"
+"reunions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr ""
+"Si s'ha de mostrar el camp de tipus a l'editor d'esdeveniments/tasques/"
+"reunions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr ""
+"Si s'ha de mostrar el número de setmana a diversos llocs del calendari."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
+msgid "Work days"
+msgstr "Dies feiners"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
+msgid "Workday end hour"
+msgstr "Hora de finalització de la jornada laboral"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+msgid "Workday end minute"
+msgstr "Minut de finalització de la jornada laboral"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+msgid "Workday start hour"
+msgstr "Hora d'inici de la jornada laboral"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
+msgid "Workday start minute"
+msgstr "Minut d'inici de la jornada laboral"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:312
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "I_mport"
+msgstr "I_mporta"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:393
+msgid "Select a Calendar"
+msgstr "Seleccioneu un calendari"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:420
+msgid "Select a Task List"
+msgstr "Seleccioneu una llista de tasques"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:430
+msgid "I_mport to Calendar"
+msgstr "I_mporta al calendari"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:437
+msgid "I_mport to Tasks"
+msgstr "_Importa a les tasques"
+
+#: ../modules/calendar/e-calendar-preferences.c:461
+msgid "Selected Calendars for Reminders"
+msgstr "Seleccioneu els calendaris pels recordatoris"
+
+#: ../modules/calendar/e-calendar-preferences.c:863
+msgid "Ti_me and date:"
+msgstr "Ho_ra i data:"
+
+#: ../modules/calendar/e-calendar-preferences.c:864
+msgid "_Date only:"
+msgstr "Només la _data:"
+
+#. Create the Webcal source group
+#: ../modules/calendar/e-cal-shell-backend.c:117
+#: ../modules/calendar/e-cal-shell-migrate.c:198
+#: ../modules/calendar/e-memo-shell-backend.c:104
+#: ../modules/calendar/e-memo-shell-migrate.c:152
+#: ../modules/calendar/e-task-shell-backend.c:104
+#: ../modules/calendar/e-task-shell-migrate.c:164
+msgid "On The Web"
+msgstr "A Internet"
+
+#: ../modules/calendar/e-cal-shell-backend.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:127
+msgid "Weather"
+msgstr "Temps"
+
+#: ../modules/calendar/e-cal-shell-backend.c:206
+#: ../modules/calendar/e-cal-shell-migrate.c:66
+msgid "Birthdays & Anniversaries"
+msgstr "Aniversaris i commemoracions"
+
+#: ../modules/calendar/e-cal-shell-backend.c:439
+msgctxt "New"
+msgid "_Appointment"
+msgstr "Cit_a"
+
+#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+msgid "Create a new appointment"
+msgstr "Crea una cita nova"
+
+#: ../modules/calendar/e-cal-shell-backend.c:446
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "Cita de tot el _dia"
+
+#: ../modules/calendar/e-cal-shell-backend.c:448
+msgid "Create a new all-day appointment"
+msgstr "Crea una cita de tot el dia nova"
+
+#: ../modules/calendar/e-cal-shell-backend.c:453
+msgctxt "New"
+msgid "M_eeting"
+msgstr "R_eunió"
+
+#: ../modules/calendar/e-cal-shell-backend.c:455
+msgid "Create a new meeting request"
+msgstr "Crea una sol·licitud de reunió nova"
+
+#: ../modules/calendar/e-cal-shell-backend.c:463
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "Cale_ndari"
+
+#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+msgid "Create a new calendar"
+msgstr "Crea un calendari nou"
+
+#: ../modules/calendar/e-cal-shell-backend.c:788
+msgid "Calendar and Tasks"
+msgstr "Calendari i tasques"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:184
+msgid "Loading calendars"
+msgstr "S'estan carregant els calendaris"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:755
+msgid "_New Calendar..."
+msgstr "Calendari no_u..."
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:772
+msgid "Calendar Selector"
+msgstr "Selector de calendaris"
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-cal-shell-sidebar.c:1123
+#, c-format
+msgid "Opening calendar at %s"
+msgstr "S'està obrint el calendari a %s"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
+msgid "Print"
+msgstr "Imprimeix"
+
+#: ../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."
+msgstr ""
+"Esta operació suprimirà tots els esdeveniments anteriors a l'interval de "
+"temps seleccionat; si continueu no podreu recuperar-los."
+
+#. Translators: This is the first part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:337
+msgid "Purge events older than"
+msgstr "Buida els esdeveniments anteriors a"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:564
+msgid "Copying Items"
+msgstr "Còpia d'elements"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:848
+msgid "Moving Items"
+msgstr "Desplaçament d'elements"
+
+#. Translators: Default filename part saving an event to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-actions.c:1175
+msgid "event"
+msgstr "esdeveniment"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1177
+#: ../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 "Alça com a iCalendar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
+msgid "_Copy..."
+msgstr "_Copia..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+msgid "D_elete Calendar"
+msgstr "S_uprimeix el calendari"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+msgid "Delete the selected calendar"
+msgstr "Suprimeix el calendari seleccionat"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+msgid "Go Back"
+msgstr "Vés arrere"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+msgid "Go Forward"
+msgstr "Vés avant"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+msgid "Select today"
+msgstr "Selecciona hui"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+msgid "Select _Date"
+msgstr "Selecciona una _data"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+msgid "Select a specific date"
+msgstr "Selecciona una data concreta"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+msgid "_New Calendar"
+msgstr "Calendari no_u"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-task-shell-view-actions.c:813
+msgid "Purg_e"
+msgstr "Bui_da"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+msgid "Purge old appointments and meetings"
+msgstr "Buida les cites i reunions antigues"
+
+#: ../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 "Re_fresca"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+msgid "Refresh the selected calendar"
+msgstr "Refresca el calendari seleccionat"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+msgid "Rename the selected calendar"
+msgstr "Canvia el nom del calendari seleccionat"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+msgid "Show _Only This Calendar"
+msgstr "Mo_stra només este calendari"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+msgid "Cop_y to Calendar..."
+msgstr "Cop_ia al calendari..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+msgid "_Delegate Meeting..."
+msgstr "_Delega una reunió..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+msgid "_Delete Appointment"
+msgstr "Su_primeix la cita"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+msgid "Delete selected appointments"
+msgstr "Suprimeix les cites seleccionades"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+msgid "Delete This _Occurrence"
+msgstr "Suprimeix esta a_parició"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+msgid "Delete this occurrence"
+msgstr "Suprimeix esta aparició"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+msgid "Delete All Occ_urrences"
+msgstr "Suprimeix totes les _aparicions"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+msgid "Delete all occurrences"
+msgstr "Suprimeix totes les aparicions"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+msgid "New All Day _Event..."
+msgstr "_Esdeveniment de tot el dia nou..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+msgid "Create a new all day event"
+msgstr "Crea un esdeveniment de tot el dia nou"
+
+#: ../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 "R_eenvia com a iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+msgid "New _Meeting..."
+msgstr "Re_unió nova..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+msgid "Create a new meeting"
+msgstr "Crea una reunió nova"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+msgid "Mo_ve to Calendar..."
+msgstr "Mo_u al calendari..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+msgid "New _Appointment..."
+msgstr "Cit_a nova..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1489
+msgid "Make this Occurrence _Movable"
+msgstr "Per_met moure esta aparició"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+msgid "_Open Appointment"
+msgstr "_Obri una cita"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+msgid "View the current appointment"
+msgstr "Visualitza la cita"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+msgid "_Reply"
+msgstr "_Respon"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+msgid "_Schedule Meeting..."
+msgstr "Planifica una _reunió..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+msgid "Converts an appointment to a meeting"
+msgstr "Converteix la cita en una reunió"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+msgid "Conv_ert to Appointment..."
+msgstr "Con_verteix a cita..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+msgid "Converts a meeting to an appointment"
+msgstr "Converteix una reunió en una cita"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+msgid "Quit"
+msgstr "Ix"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1651
+msgid "Day"
+msgstr "Dia"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+msgid "Show one day"
+msgstr "Mostra un dia"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
+msgid "List"
+msgstr "Llista"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+msgid "Show as list"
+msgstr "Mostra com a llista"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1665
+msgid "Month"
+msgstr "Mes"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+msgid "Show one month"
+msgstr "Mostra un mes"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1672
+msgid "Week"
+msgstr "Setmana"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+msgid "Show one week"
+msgstr "Mostra una setmana"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1681
+msgid "Show one work week"
+msgstr "Mostra una setmana laborable"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+msgid "Active Appointments"
+msgstr "Cites actives"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+msgid "Next 7 Days' Appointments"
+msgstr "Cites dels propers 7 dies"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-memo-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:994
+msgid "Description contains"
+msgstr "La descripció conté"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-memo-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:1001
+msgid "Summary contains"
+msgstr "El resum conté"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1753
+msgid "Print this calendar"
+msgstr "Imprimeix este calendari"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+msgid "Preview the calendar to be printed"
+msgstr "Previsualitza el calendari que s'ha d'imprimir"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1782
+#: ../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 "_Anomena i alça com a iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1859
+msgid "Go To"
+msgstr "Vés a"
+
+#. 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:217
+#: ../modules/calendar/e-memo-shell-view-actions.c:522
+msgid "memo"
+msgstr "anotació"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
+msgid "New _Memo"
+msgstr "Nova _anotació"
+
+#: ../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:656
+msgid "Create a new memo"
+msgstr "Crea una anotació nova"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:661
+msgid "_Open Memo"
+msgstr "_Obri l'anotació"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:269
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
+msgid "View the selected memo"
+msgstr "Visualitza l'anotació seleccionada"
+
+#: ../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 "Obri una pàgina _web"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:286
+#: ../modules/calendar/e-memo-shell-view-actions.c:828
+msgid "Print the selected memo"
+msgstr "Imprimeix l'anotació seleccionada"
+
+#. Translators: Default filename part saving a task to a file when
+#. * 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:284
+#: ../modules/calendar/e-task-shell-view-actions.c:639
+msgid "task"
+msgstr "tasca"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
+#: ../modules/calendar/e-task-shell-view-actions.c:701
+msgid "_Assign Task"
+msgstr "_Assigna una tasca"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:778
+msgid "_Mark as Complete"
+msgstr "_Marca com a acabada"
+
+#: ../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 "Marca la tasca seleccionada com a completa"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+msgid "_Mark as Incomplete"
+msgstr "_Marca com a incomplet"
+
+#: ../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 "Marca les tasques seleccionades com a no completades"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:792
+msgid "New _Task"
+msgstr "_Tasca nova"
+
+#: ../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:794
+msgid "Create a new task"
+msgstr "Crea una tasca nova"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
+#: ../modules/calendar/e-task-shell-view-actions.c:799
+msgid "_Open Task"
+msgstr "_Obri una tasca"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
+#: ../modules/calendar/e-task-shell-view-actions.c:801
+msgid "View the selected task"
+msgstr "Visualitza la tasca seleccionada"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-task-shell-view-actions.c:1027
+msgid "Print the selected task"
+msgstr "Imprimeix la tasca seleccionada"
+
+#: ../modules/calendar/e-memo-shell-backend.c:298
+msgctxt "New"
+msgid "Mem_o"
+msgstr "An_otació"
+
+#: ../modules/calendar/e-memo-shell-backend.c:305
+msgctxt "New"
+msgid "_Shared Memo"
+msgstr "Anotació _compartida"
+
+#: ../modules/calendar/e-memo-shell-backend.c:307
+msgid "Create a new shared memo"
+msgstr "Crea una anotació compartida nova"
+
+#: ../modules/calendar/e-memo-shell-backend.c:315
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "Lli_sta d'anotacions"
+
+#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
+msgid "Create a new memo list"
+msgstr "Crea una llista d'anotacions nova"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:179
+msgid "Loading memos"
+msgstr "S'estan carregant les anotacions"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:696
+msgid "Memo List Selector"
+msgstr "Selector de llistes d'anotacions"
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-memo-shell-sidebar.c:1009
+#, c-format
+msgid "Opening memos at %s"
+msgstr "S'estan obrint les anotacions a %s"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
+msgid "Print Memos"
+msgstr "Imprimeix anotacions"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+msgid "_Delete Memo"
+msgstr "Suprimeix l'_anotació"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
+msgid "_Find in Memo..."
+msgstr "_Cerca en l'anotació..."
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
+msgid "Search for text in the displayed memo"
+msgstr "Cerca un text en el cos de l'anotació que es mostra"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
+msgid "D_elete Memo List"
+msgstr "Suprimeix la llista d'_anotacions"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
+msgid "Delete the selected memo list"
+msgstr "Suprimeix la llista d'anotacions seleccionada"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
+msgid "_New Memo List"
+msgstr "Llista d'anotacions _nova"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+msgid "Refresh the selected memo list"
+msgstr "Refresca la llista d'anotacions seleccionada"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
+msgid "Rename the selected memo list"
+msgstr "Canvia el nom de la llista d'anotacions seleccionada"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+msgid "Show _Only This Memo List"
+msgstr "Mo_stra només esta llista d'anotacions"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
+msgid "Memo _Preview"
+msgstr "_Previsualització d'anotacions"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
+msgid "Show memo preview pane"
+msgstr "Mostra la subfinestra de previsualització de les anotacions"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:749
+msgid "Show memo preview below the memo list"
+msgstr "Mostra la previsualització de l'anotació sota la llista d'anotacions"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:756
+msgid "Show memo preview alongside the memo list"
+msgstr ""
+"Mostra la previsualització de l'anotació al costat de la llista d'anotacions"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
+msgid "Print the list of memos"
+msgstr "Imprimeix la llista d'anotacions"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:821
+msgid "Preview the list of memos to be printed"
+msgstr "Previsualitza la llista d'anotacions a imprimir"
+
+#: ../modules/calendar/e-memo-shell-view.c:227
+msgid "Delete Memos"
+msgstr "Suprimeix les anotacions"
+
+#: ../modules/calendar/e-memo-shell-view.c:229
+msgid "Delete Memo"
+msgstr "Suprimeix l'anotació"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:424
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d anotació"
+msgstr[1] "%d anotacions"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:428
+#: ../modules/calendar/e-task-shell-view-private.c:585
+#, c-format
+msgid "%d selected"
+msgstr "%d seleccionades"
+
+#: ../modules/calendar/e-task-shell-backend.c:297
+msgctxt "New"
+msgid "_Task"
+msgstr "_Tasca"
+
+#: ../modules/calendar/e-task-shell-backend.c:304
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "Tasca assigna_da"
+
+#: ../modules/calendar/e-task-shell-backend.c:306
+msgid "Create a new assigned task"
+msgstr "Crea una tasca assignada nova"
+
+#: ../modules/calendar/e-task-shell-backend.c:314
+msgctxt "New"
+msgid "Tas_k List"
+msgstr "Llista de tas_ques"
+
+#: ../modules/calendar/e-task-shell-backend.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:745
+msgid "Create a new task list"
+msgstr "Crea una llista de tasques nova"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:179
+msgid "Loading tasks"
+msgstr "S'estan carregant les tasques"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:696
+msgid "Task List Selector"
+msgstr "Selector de llistes de tasques"
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-task-shell-sidebar.c:1010
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "S'estan obrint les tasques a %s"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
+msgid "Print Tasks"
+msgstr "Imprimeix les tasques"
+
+#: ../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"
+"Really erase these tasks?"
+msgstr ""
+"Esta operació suprimirà totes les tasques marcades com a acabades; si "
+"continueu no podreu recuperar-les.\n"
+"\n"
+"Segur que voleu suprimir estes tasques?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:590
+msgid "Do not ask me again"
+msgstr "No m'ho tornes a demanar"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:708
+msgid "_Delete Task"
+msgstr "_Suprimeix la tasca"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:715
+msgid "_Find in Task..."
+msgstr "_Cerca a la tasca..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:717
+msgid "Search for text in the displayed task"
+msgstr "Cerca un text a la tasca mostrada"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:729
+msgid "Copy..."
+msgstr "Copia..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:736
+msgid "D_elete Task List"
+msgstr "_Suprimeix la llista de tasques"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:738
+msgid "Delete the selected task list"
+msgstr "Suprimeix la llista de tasques seleccionada"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:743
+msgid "_New Task List"
+msgstr "Llista de tasques _nova"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:759
+msgid "Refresh the selected task list"
+msgstr "Refresca la llista de tasques seleccionada"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:766
+msgid "Rename the selected task list"
+msgstr "Canvia el nom de llista de tasques seleccionada"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:771
+msgid "Show _Only This Task List"
+msgstr "Mo_stra només esta llista de tasques"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:785
+msgid "Mar_k as Incomplete"
+msgstr "_Marca com a no completada"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:815
+msgid "Delete completed tasks"
+msgstr "Suprimeix les tasques completades"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:890
+msgid "Task _Preview"
+msgstr "_Previsualitza la tasca"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:892
+msgid "Show task preview pane"
+msgstr "Mostra la subfinestra de previsualització de tasques"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:913
+msgid "Show task preview below the task list"
+msgstr "Mostra la previsualització de la tasca sota la llista de tasques"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:920
+msgid "Show task preview alongside the task list"
+msgstr ""
+"Mostra la previsualització de la tasca al costat de la llista de tasques"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:928
+msgid "Active Tasks"
+msgstr "Tasques actives"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:942
+msgid "Completed Tasks"
+msgstr "Tasques completades"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:949
+msgid "Next 7 Days' Tasks"
+msgstr "Tasques dels propers 7 dies"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:956
+msgid "Overdue Tasks"
+msgstr "Tasques vençudes"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:963
+msgid "Tasks with Attachments"
+msgstr "Tasques amb fitxers adjunts"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
+msgid "Print the list of tasks"
+msgstr "Imprimeix la llista de tasques"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1020
+msgid "Preview the list of tasks to be printed"
+msgstr "Previsualitza la llista de tasques a imprimir"
+
+#: ../modules/calendar/e-task-shell-view.c:362
+msgid "Delete Tasks"
+msgstr "Suprimeix les tasques"
+
+#: ../modules/calendar/e-task-shell-view.c:364
+msgid "Delete Task"
+msgstr "Suprimeix la tasca"
+
+#: ../modules/calendar/e-task-shell-view-private.c:472
+msgid "Expunging"
+msgstr "S'està buidant"
+
+#: ../modules/calendar/e-task-shell-view-private.c:581
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d tasca"
+msgstr[1] "%d tasques"
+
+#: ../modules/mail/em-account-prefs.c:261
+msgid "Evolution Account Assistant"
+msgstr "Auxiliar per als comptes de l'Evolution"
+
+#: ../modules/mail/em-account-prefs.c:310
+msgid "Account Editor"
+msgstr "Editor de comptes"
+
+#. Translators: This is only for multiple messages.
+#: ../modules/mail/e-mail-attachment-handler.c:384
+#, c-format
+msgid "%d attached messages"
+msgstr "%d missatges adjunts"
+
+#: ../modules/mail/e-mail-shell-backend.c:195
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "_Missatge de correu"
+
+#: ../modules/mail/e-mail-shell-backend.c:197
+msgid "Compose a new mail message"
+msgstr "Redacta un missatge de correu nou"
+
+#: ../modules/mail/e-mail-shell-backend.c:205
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "_Carpeta de correu"
+
+#: ../modules/mail/e-mail-shell-backend.c:207
+msgid "Create a new mail folder"
+msgstr "Crea una carpeta de correu nova"
+
+#: ../modules/mail/e-mail-shell-backend.c:412
+msgid "Mail Accounts"
+msgstr "Comptes de correu"
+
+#: ../modules/mail/e-mail-shell-backend.c:420
+msgid "Mail Preferences"
+msgstr "Preferències del correu"
+
+#: ../modules/mail/e-mail-shell-backend.c:428
+msgid "Composer Preferences"
+msgstr "Preferències del redactor"
+
+#: ../modules/mail/e-mail-shell-backend.c:436
+msgid "Network Preferences"
+msgstr "Preferències de la xarxa"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view.c:960
+msgid "_Disable Account"
+msgstr "_Inhabilita el compte"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
+msgid "Disable this account"
+msgstr "Inhabilita este compte"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr ""
+"Suprimeix permanentment tots els missatges suprimits de totes les carpetes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
+msgid "_Download Messages for Offline Usage"
+msgstr "_Baixa els missatges per treballar fora de línia"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
+msgid "Download messages of accounts and folders marked for offline usage"
+msgstr ""
+"Baixa els missatges dels comptes o carpetes marcats per treballar fora de "
+"línia"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
+msgid "Fl_ush Outbox"
+msgstr "Bui_da la safata d'eixida"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
+msgid "_Copy Folder To..."
+msgstr "_Copia la carpeta a..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
+msgid "Copy the selected folder into another folder"
+msgstr "Copia la carpeta seleccionada a una altra carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
+msgid "Permanently remove this folder"
+msgstr "Suprimeix permanentment la carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
+msgid "E_xpunge"
+msgstr "Suprimei_x"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Suprimeix permanentment tots els missatges esborrats d'esta carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
+msgid "Mar_k All Messages as Read"
+msgstr "Marca _tots els missatges com a llegits"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
+msgid "Mark all messages in the folder as read"
+msgstr "Marca tots els missatges d'esta carpeta com a llegits"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
+msgid "_Move Folder To..."
+msgstr "_Mou la carpeta a..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
+msgid "Move the selected folder into another folder"
+msgstr "Mou la carpeta seleccionada a una altra carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
+msgid "_New..."
+msgstr "_Nova..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
+msgid "Create a new folder for storing mail"
+msgstr "Crea una carpeta nova per emmagatzemar correu"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
+msgid "Change the properties of this folder"
+msgstr "Canvia les propietats de la carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
+msgid "Refresh the folder"
+msgstr "Refresca la carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
+msgid "Change the name of this folder"
+msgstr "Canvia el nom de la carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
+msgid "Select Message _Thread"
+msgstr "Selecciona el fil del missa_tge"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
+msgid "Select all messages in the same thread as the selected message"
+msgstr "Selecciona tots els missatges del fil del missatge seleccionat"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
+msgid "Select Message S_ubthread"
+msgstr "Selecciona el _subfil del missatge"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
+msgid "Select all replies to the currently selected message"
+msgstr "Selecciona totes les respostes del missatge seleccionat"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
+msgid "Empty _Trash"
+msgstr "Buida la _paperera"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
+msgid "Permanently remove all the deleted messages from all accounts"
+msgstr ""
+"Suprimeix permanentment tots els missatges suprimits de tots els comptes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
+msgid "_New Label"
+msgstr "Etiqueta _nova"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
+msgid "N_one"
+msgstr "Ca_p"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
+msgid "_Manage Subscriptions"
+msgstr "Gestiona les _subscripcions"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Subscriu o cancel·la la subscripció a una carpeta en servidors remots"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
+msgid "Send / _Receive"
+msgstr "Envia / _rep"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
+msgid "Send queued items and retrieve new items"
+msgstr "Envia els elements enviats a la cua i obté els nous"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
+msgid "R_eceive All"
+msgstr "R_ep-ho tot"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
+msgid "Receive new items from all accounts"
+msgstr "Rep els elements nous de tots els comptes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
+msgid "_Send All"
+msgstr "_Envia-ho tot"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
+msgid "Send queued items in all accounts"
+msgstr "Envia els elements enviats a la cua de tots els comptes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../widgets/misc/e-activity-proxy.c:310
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
+msgid "Cancel the current mail operation"
+msgstr "Cancel·la l'operació de correu actual"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
+msgid "Collapse All _Threads"
+msgstr "Col·lapsa tots els _fils"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
+msgid "Collapse all message threads"
+msgstr "Contrau tots els fils del missatge"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
+msgid "E_xpand All Threads"
+msgstr "E_xpandeix tots els fils"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
+msgid "Expand all message threads"
+msgstr "Expandeix tots els fils de missatge"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
+msgid "_Message Filters"
+msgstr "Filtres de _missatge"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
+msgid "Create or edit rules for filtering new mail"
+msgstr "Crea o edita les regles per filtrar el correu nou"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
+msgid "_Subscriptions..."
+msgstr "_Subscripcions..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
+msgid "F_older"
+msgstr "C_arpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
+msgid "_Label"
+msgstr "_Etiqueta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1367
+msgid "C_reate Search Folder From Search..."
+msgstr "C_rea una carpeta de cerca a partir de la cerca..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1374
+msgid "Search F_olders"
+msgstr "Car_petes de cerca"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
+msgid "Create or edit search folder definitions"
+msgstr "Crea o edita les definicions de carpetes de cerca"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1407
+msgid "_New Folder..."
+msgstr "Carpeta _nova..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
+msgid "Show Message _Preview"
+msgstr "Mostra la _previsualització del missatge"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1437
+msgid "Show message preview pane"
+msgstr "Mostra la finestra de previsualització de missatges"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
+msgid "Show _Deleted Messages"
+msgstr "Mostra els missatges _suprimits"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
+msgid "Show deleted messages with a line through them"
+msgstr "Mostra els missatges suprimits amb una ratlla a sobre."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1451
+msgid "_Group By Threads"
+msgstr "Agrupa per _fils"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
+msgid "Threaded message list"
+msgstr "Llista de missatges amb fils"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
+msgid "Show message preview below the message list"
+msgstr "Mostra la previsualització del missatge sota la llista de missatges"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1481
+msgid "Show message preview alongside the message list"
+msgstr ""
+"Mostra la previsualització del missatge al costat de la llista de missatges"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1489
+msgid "All Messages"
+msgstr "Tots els missatges"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1496
+msgid "Important Messages"
+msgstr "Missatges importants"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1503
+msgid "Last 5 Days' Messages"
+msgstr "Missatges dels darrers 5 dies"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1510
+msgid "Messages Not Junk"
+msgstr "Missatges que no són brossa"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1517
+msgid "Messages with Attachments"
+msgstr "Missatges amb fitxers adjunts"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1524
+msgid "No Label"
+msgstr "Cap etiqueta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1531
+msgid "Read Messages"
+msgstr "Missatges llegits"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1538
+msgid "Recent Messages"
+msgstr "Missatges recents"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
+msgid "Unread Messages"
+msgstr "Missatges sense llegir"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1597
+msgid "Subject or Addresses contain"
+msgstr "L'assumpte o les adreces contenen"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
+msgid "All Accounts"
+msgstr "Comptes de correu"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
+msgid "Current Account"
+msgstr "Compte actual"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
+msgid "Current Folder"
+msgstr "Carpeta actual"
+
+#: ../modules/mail/e-mail-shell-view.c:563
+msgid "All Account Search"
+msgstr "Cerca a tots els comptes"
+
+#: ../modules/mail/e-mail-shell-view.c:736
+msgid "Account Search"
+msgstr "Cerca al compte"
+
+#: ../modules/mail/e-mail-shell-view.c:958
+msgid "Proxy _Logout"
+msgstr "Eixida de_l servidor intermediari"
+
+#: ../modules/mail/e-mail-shell-view-private.c:997
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "%d seleccionat, "
+msgstr[1] "%d seleccionats, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:1008
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d suprimit"
+msgstr[1] "%d suprimits"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d brossa"
+msgstr[1] "%d brossa"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1027
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d esborrany"
+msgstr[1] "%d esborranys"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1033
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d sense enviar"
+msgstr[1] "%d sense enviar"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1039
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d enviat"
+msgstr[1] "%d enviats"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1051
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d sense llegir, "
+msgstr[1] "%d sense llegir, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:1054
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d en total"
+msgstr[1] "%d en total"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1074
+msgid "Trash"
+msgstr "Paperera"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1542
+msgid "Send / Receive"
+msgstr "Envia / rep"
+
+#: ../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:385
+msgid "Enabled"
+msgstr "Habilitat"
+
+#: ../modules/mail/em-composer-prefs.c:499
+msgid "Language(s)"
+msgstr "Idiomes"
+
+# Apareix enmig d'una frase, i per tant ha d'anar en minúscula (dpm)
+#: ../modules/mail/em-mailer-prefs.c:91
+msgid "Every time"
+msgstr "cada vegada"
+
+# Apareix enmig d'una frase, i per tant ha d'anar en minúscula (dpm)
+#: ../modules/mail/em-mailer-prefs.c:92
+msgid "Once per day"
+msgstr "una vegada al dia"
+
+# Apareix enmig d'una frase, i per tant ha d'anar en minúscula (dpm)
+#: ../modules/mail/em-mailer-prefs.c:93
+msgid "Once per week"
+msgstr "una vegada a la setmana"
+
+# Apareix enmig d'una frase, i per tant ha d'anar en minúscula (dpm)
+#: ../modules/mail/em-mailer-prefs.c:94
+msgid "Once per month"
+msgstr "una vegada al mes"
+
+#: ../modules/mail/em-mailer-prefs.c:293
+msgid "Header"
+msgstr "Capçalera"
+
+#: ../modules/mail/em-mailer-prefs.c:297
+msgid "Contains Value"
+msgstr "Conté el valor"
+
+#. 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:1051
+msgid "_Date header:"
+msgstr "Capçalera de la _data:"
+
+#: ../modules/mail/em-mailer-prefs.c:1052
+msgid "Show _original header value"
+msgstr "Mostra el valor _original de la capçalera"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Comprova si l'Evolution és el gestor de correu per defecte"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr "Comprova si l'Evolution és el gestor de correu per defecte en iniciar."
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+msgid "Do you want to make Evolution your default email client?"
+msgstr "Voleu que l'Evolution siga el vostre gestor de correu per defecte?"
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+msgid "Click 'Work Online' to return to online mode."
+msgstr "Feu clic a «Treballa en línia» per tornar al mode en línia."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
+msgid "Evolution is currently offline due to a network outage."
+msgstr "L'Evolution està fora de línia degut a un tall a la xarxa."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
+msgid "Evolution is currently offline."
+msgstr "L'Evolution es troba en mode fora de línia."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
+msgid ""
+"Evolution will return to online mode once a network connection is "
+"established."
+msgstr ""
+"L'Evolution tornarà a estar en mode en línia tant bon punt es restablisca la "
+"connexió de xarxa."
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an authentication token."
+msgstr ""
+"No es pot trobar el compte corresponent al servei org.gnome.OnlineAccounts "
+"del que obtindre'n el testimoni d'autenticació."
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+msgid "OAuth"
+msgstr "OAuth"
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+msgid ""
+"This option will connect to the server by way of the GNOME Online Accounts "
+"service"
+msgstr ""
+"Esta opció farà que es connecte amb el servidor a través del servei dels "
+"comptes en línia del GNOME"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:70
+msgid "Author(s)"
+msgstr "Autors"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:256
+msgid "Plugin Manager"
+msgstr "Administrador de connectors"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:271
+msgid "Note: Some changes will not take effect until restart"
+msgstr "Avís: alguns canvis només s'aplicaran després de reiniciar"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:300
+msgid "Overview"
+msgstr "Resum"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:369
+#: ../modules/plugin-manager/evolution-plugin-manager.c:452
+msgid "Plugin"
+msgstr "Connector"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:490
+msgid "_Plugins"
+msgstr "_Connectors"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:491
+msgid "Enable and disable plugins"
+msgstr "Habilita i inhabilita connectors"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Connector de prova del Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Carregador de l'EPlugin del connector de prova del Python."
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hola Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Proves del carregador del connector del Python"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:191
+#, c-format
+msgid "Failed to spawn SpamAssassin (%s): "
+msgstr "No s'ha pogut engendrar l'SpamAssaren (%s):"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:214
+msgid "Failed to stream mail message content to SpamAssassin: "
+msgstr ""
+"No s'ha pogut transmetre el contingut del correu electrònic a l'SpamAssaren: "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:233
+#, c-format
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "No s'ha pogut escriure «%s» a l'SpamAssaren: "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:261
+msgid "Failed to read output from SpamAssassin: "
+msgstr "No s'ha pogut llegir l'eixida de l'SpamAssaren: "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:316
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr ""
+"L'SpamAssaren ha fallat, o bé, no ha pogut processar el correu electrònic"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:835
+msgid "SpamAssassin Options"
+msgstr "Opcions de l'SpamAssaren"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:850
+msgid "I_nclude remote tests"
+msgstr "I_nclou proves remotes"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:864
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr "Això farà que l'SpamAssaren siga més fiable, però més lent."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:1073
+msgid "SpamAssassin"
+msgstr "SpamAssaren"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use SpamAssassin daemon and client"
+msgstr "Utilitza el client i el dimoni de l'SpamAssaren"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "Utilitza el client i el dimoni de l'SpamAssaren (spamc/spamd)."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
+msgid "Use only local spam tests."
+msgstr "Fes només proves de correu no desitjat locals."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
+msgid "Use only the local spam tests (no DNS)."
+msgstr "Fes només proves de correu no desitjat locals (no DNS)."
+
+#: ../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 "Seleccioneu la informació que voleu importar:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:312
+#: ../widgets/misc/e-import-assistant.c:552
+#, c-format
+msgid "From %s:"
+msgstr "De %s:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:323
+#: ../modules/startup-wizard/evolution-startup-wizard.c:421
+msgid "Importing Files"
+msgstr "Importació de fitxers"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:399
+msgid "Import cancelled. Click \"Forward\" to continue."
+msgstr "S'ha cancel·lat la importació. Feu clic a «Avant» per continuar."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:417
+msgid "Import complete. Click \"Forward\" to continue."
+msgstr "S'ha completat la importació. Feu clic a «Avant» per continuar."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:497
+msgid "Evolution Setup Assistant"
+msgstr "Auxiliar de la configuració de l'Evolution"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:503
+msgid "Welcome"
+msgstr "Vos donem la benvinguda"
+
+#: ../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"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"Vos donem la benvinguda a l'Evolution. En les pantalles següents podreu "
+"configurar-lo perquè puga connectar-se als vostres comptes de correu i "
+"importar fitxers d'altres aplicacions.\n"
+"\n"
+"Feu clic a «Avant» per continuar."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:613
+msgid "Loading accounts..."
+msgstr "S'estan carregant els comptes..."
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+msgid "Add local address books to Evolution."
+msgstr "Afig llibretes d'adreces locals a l'Evolution."
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Local Address Books"
+msgstr "Llibretes d'adreces locals"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
+"Llista de pistes que el connector de recordatori d'adjuncions cercarà en el "
+"cos del missatge"
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
+msgid "_Do not show this message again."
+msgstr "No _tornes a mostrar este missatge."
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:464
+#: ../plugins/templates/templates.c:462
+msgid "Keywords"
+msgstr "Paraules clau"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr ""
+"L'Evolution ha trobat paraules clau que suggereixen que este missatge hauria "
+"de tindre un fitxer adjunt, el qual no s'ha trobat."
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+msgid "Message has no attachments"
+msgstr "El missatge no té cap fitxer adjunt"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+msgid "_Add Attachment..."
+msgstr "_Afig una adjunció..."
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Edit Message"
+msgstr "_Edita el missatge"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+msgid "Attachment Reminder"
+msgstr "Recordatori d'adjuncions"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr ""
+"Vos mostra un recordatori si heu oblidat d'afegir una adjunció a un missatge "
+"de correu."
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+msgid "Inline Audio"
+msgstr "Àudio inserit"
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+msgid "Play audio attachments directly in mail messages."
+msgstr ""
+"Reprodueix les adjuncions d'àudio directament des dels missatges de correu."
+
+#: ../plugins/backup-restore/backup-restore.c:192
+msgid "Select name of the Evolution backup file"
+msgstr "Seleccioneu el nom del fitxer de còpia de seguretat de l'Evolution"
+
+#: ../plugins/backup-restore/backup-restore.c:225
+msgid "_Restart Evolution after backup"
+msgstr "_Reinicia l'Evolution després de la còpia de seguretat"
+
+#: ../plugins/backup-restore/backup-restore.c:251
+msgid "Select name of the Evolution backup file to restore"
+msgstr ""
+"Seleccioneu el nom del fitxer de còpia de seguretat de l'Evolution a "
+"restaurar"
+
+#: ../plugins/backup-restore/backup-restore.c:264
+msgid "_Restart Evolution after restore"
+msgstr "_Reinicia l'Evolution després de restaurar"
+
+#: ../plugins/backup-restore/backup-restore.c:337
+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 ""
+"Podeu restaurar l'Evolution a partir de la còpia de seguretat, la qual "
+"permet restaurar tots els correus, els calendaris, les tasques, les "
+"anotacions i els contactes. També permet la restauració de la vostra "
+"configuració personal, els filtres de correu, etc."
+
+#: ../plugins/backup-restore/backup-restore.c:344
+msgid "_Restore Evolution from the backup file"
+msgstr "_Restaura l'Evolution a partir del fitxer de còpia de seguretat"
+
+#: ../plugins/backup-restore/backup-restore.c:351
+msgid "Please select an Evolution Archive to restore:"
+msgstr "Seleccioneu l'arxiu de l'Evolution a restaurar:"
+
+#: ../plugins/backup-restore/backup-restore.c:354
+msgid "Choose a file to restore"
+msgstr "Trieu un fitxer a restaurar"
+
+#: ../plugins/backup-restore/backup-restore.c:362
+msgid "Restore from backup"
+msgstr "Restaura a partir de la còpia de seguretat"
+
+#: ../plugins/backup-restore/backup-restore.c:402
+msgid "_Back up Evolution Data..."
+msgstr "_Fes una còpia de seguretat de les dades de l'Evolution..."
+
+#: ../plugins/backup-restore/backup-restore.c:404
+msgid "Back up Evolution data and settings to an archive file"
+msgstr ""
+"Fes una còpia de seguretat de les dades i la configuració de l'Evolution en "
+"un fitxer d'arxiu"
+
+#: ../plugins/backup-restore/backup-restore.c:409
+msgid "R_estore Evolution Data..."
+msgstr "R_estaura una còpia de seguretat de les dades de l'Evolution..."
+
+#: ../plugins/backup-restore/backup-restore.c:411
+msgid "Restore Evolution data and settings from an archive file"
+msgstr ""
+"Copia i restaura les dades i la configuració de l'Evolution a partir d'un "
+"fitxer d'arxiu"
+
+#: ../plugins/backup-restore/backup.c:77
+msgid "Back up Evolution directory"
+msgstr "Fes una còpia de seguretat del directori de l'Evolution"
+
+#: ../plugins/backup-restore/backup.c:79
+msgid "Restore Evolution directory"
+msgstr "Restaura el directori de l'Evolution"
+
+#: ../plugins/backup-restore/backup.c:81
+msgid "Check Evolution Back up"
+msgstr "Comprova la còpia de seguretat de l'Evolution"
+
+#: ../plugins/backup-restore/backup.c:83
+msgid "Restart Evolution"
+msgstr "Reinicia l'Evolution"
+
+#: ../plugins/backup-restore/backup.c:85
+msgid "With Graphical User Interface"
+msgstr "Amb interfície gràfica d'usuari"
+
+#. FIXME Will the versioned setting always work?
+#: ../plugins/backup-restore/backup.c:299
+#: ../plugins/backup-restore/backup.c:418
+msgid "Shutting down Evolution"
+msgstr "S'està eixint de l'Evolution"
+
+#: ../plugins/backup-restore/backup.c:308
+msgid "Backing Evolution accounts and settings"
+msgstr ""
+"S'està fent una còpia de seguretat dels comptes i la configuració de "
+"l'Evolution"
+
+#: ../plugins/backup-restore/backup.c:318
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr ""
+"S'està fent una còpia de seguretat de les dades de l'Evolution (Correu, "
+"Contactes, Calendari, Tasques, Anotacions)"
+
+#: ../plugins/backup-restore/backup.c:331
+msgid "Back up complete"
+msgstr "S'ha completat la còpia de seguretat"
+
+#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:527
+msgid "Restarting Evolution"
+msgstr "S'està reiniciant l'Evolution"
+
+#: ../plugins/backup-restore/backup.c:424
+msgid "Back up current Evolution data"
+msgstr "Fes una còpia de seguretat de les dades de l'Evolution"
+
+#: ../plugins/backup-restore/backup.c:432
+msgid "Extracting files from back up"
+msgstr "S'estan extraient els fitxers de la còpia de seguretat"
+
+#: ../plugins/backup-restore/backup.c:491
+msgid "Loading Evolution settings"
+msgstr "S'està carregant la configuració de l'Evolution"
+
+#: ../plugins/backup-restore/backup.c:508
+msgid "Removing temporary back up files"
+msgstr "S'estan suprimint els fitxers de còpia de seguretat temporals"
+
+# FIXME (dpm)
+#: ../plugins/backup-restore/backup.c:520
+msgid "Ensuring local sources"
+msgstr "Comprovació de les fonts originals"
+
+#: ../plugins/backup-restore/backup.c:707
+#, c-format
+msgid "Backing up to the folder %s"
+msgstr "S'està fent una còpia de seguretat a la carpeta %s"
+
+#: ../plugins/backup-restore/backup.c:712
+#, c-format
+msgid "Restoring from the folder %s"
+msgstr "S'està restaurant la còpia de seguretat de 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 "Còpia de seguretat de l'Evolution"
+
+#: ../plugins/backup-restore/backup.c:736
+msgid "Evolution Restore"
+msgstr "Restauració de l'Evolution"
+
+#: ../plugins/backup-restore/backup.c:774
+msgid "Backing up Evolution Data"
+msgstr "S'està fent una còpia de seguretat de les dades de l'Evolution"
+
+#: ../plugins/backup-restore/backup.c:775
+msgid "Please wait while Evolution is backing up your data."
+msgstr ""
+"Espereu mentre l'Evolution fa una còpia de seguretat de les vostres dades."
+
+#: ../plugins/backup-restore/backup.c:777
+msgid "Restoring Evolution Data"
+msgstr "S'està restaurant la còpia de seguretat de les dades de l'Evolution"
+
+#: ../plugins/backup-restore/backup.c:778
+msgid "Please wait while Evolution is restoring your data."
+msgstr ""
+"Espereu mentre l'Evolution restaura la còpia de seguretat de les vostres "
+"dades."
+
+#: ../plugins/backup-restore/backup.c:796
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
+"Depenent de la quantitat de dades del vostre compte, això pot trigar una "
+"estona."
+
+#. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+msgid "Back up and Restore"
+msgstr "Còpia de seguretat i restauració"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+msgid "Back up and restore your Evolution data and settings."
+msgstr "Copia i restaura les dades i la configuració de l'Evolution."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Are you sure you want to close Evolution?"
+msgstr "Segur que voleu eixir de l'Evolution?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+msgid ""
+"Are you sure you want to restore Evolution from the selected back up file?"
+msgstr ""
+"Segur que voleu restaurar l'Evolution a partir del fitxer de còpia de "
+"seguretat seleccionat?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid "Close and Back up Evolution"
+msgstr "Tanca i fes una còpia de seguretat de l'Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Close and Restore Evolution"
+msgstr "Tanca i restaura una còpia de seguretat de l'Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Insufficient Permissions"
+msgstr "No teniu els permisos necessaris"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid "Invalid Evolution back up file"
+msgstr "El fitxer de còpia de seguretat de l'Evolution no és vàlid"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid "Please select a valid back up file to restore."
+msgstr ""
+"Seleccioneu un fitxer de còpia de seguretat de l'Evolution vàlid per "
+"restaurar."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid "The selected folder is not writable."
+msgstr "La carpeta seleccionada és de només lectura."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid ""
+"To back up your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
+msgstr ""
+"Heu de tancar l'Evolution per fer una còpia de seguretat de les vostres "
+"dades i paràmetres. Assegureu-vos que alceu totes les dades abans de "
+"continuar."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+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 ""
+"Heu de tancar l'Evolution per restaurar les vostres dades i paràmetres. "
+"Assegureu-vos que alceu totes les dades abans de continuar. Esta acció "
+"suprimirà totes les vostres dades i paràmetres de l'Evolution i les "
+"restaurarà a partir de la còpia de seguretat."
+
+#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+msgid "Automatic Contacts"
+msgstr "Contactes automàtics"
+
+#. Enable BBDB checkbox
+#: ../plugins/bbdb/bbdb.c:710
+msgid "Create _address book entries when sending mails"
+msgstr "Crea _entrades a la llibreta d'adreces en enviar correus"
+
+#: ../plugins/bbdb/bbdb.c:716
+msgid "Select Address book for Automatic Contacts"
+msgstr "Seleccioneu la llibreta d'adreces per als contactes automàtics"
+
+#: ../plugins/bbdb/bbdb.c:731
+msgid "Instant Messaging Contacts"
+msgstr "Contactes de la missatgeria instantània"
+
+#. Enable Gaim Checkbox
+#: ../plugins/bbdb/bbdb.c:746
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr ""
+"Sincronit_za la informació de contactes i les imatges de la llista d'amics "
+"del Pidgin"
+
+#: ../plugins/bbdb/bbdb.c:752
+msgid "Select Address book for Pidgin buddy list"
+msgstr "Seleccioneu la llibreta d'adreces per a la llista d'amics del Pidgin"
+
+#. Synchronize now button.
+#: ../plugins/bbdb/bbdb.c:763
+msgid "Synchronize with _buddy list now"
+msgstr "Sincronitza amb la me_va llista d'amics"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
+"lists."
+msgstr ""
+"Facilita la gestió de la llibreta d'adreces.\n"
+"\n"
+"Emplena automàticament la llibreta d'adreces amb noms i adreces "
+"electròniques en respondre als correus. També omple la informació de "
+"contactes de missatgeria instantània a partir de la vostra llista d'amics."
+
+#: ../plugins/caldav/caldav-browse-server.c:214
+msgid "Authentication failed. Server requires correct login."
+msgstr "Ha fallat l'autenticació. El servidor requereix una entrada correcta."
+
+#: ../plugins/caldav/caldav-browse-server.c:216
+msgid "Given URL cannot be found."
+msgstr "No es pot trobar l'URL especificat."
+
+#: ../plugins/caldav/caldav-browse-server.c:220
+#, c-format
+msgid ""
+"Server returned unexpected data.\n"
+"%d - %s"
+msgstr ""
+"El servidor ha retornat dades inesperades.\n"
+"%d - %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:360
+#: ../plugins/caldav/caldav-browse-server.c:694
+msgid "Failed to parse server response."
+msgstr "No s'ha pogut processar la resposta del servidor."
+
+#: ../plugins/caldav/caldav-browse-server.c:454
+msgid "Events"
+msgstr "Esdeveniments"
+
+#: ../plugins/caldav/caldav-browse-server.c:476
+msgid "User's calendars"
+msgstr "Calendaris de l'usuari"
+
+#: ../plugins/caldav/caldav-browse-server.c:588
+#: ../plugins/caldav/caldav-browse-server.c:763
+msgid "Failed to get server URL."
+msgstr "No es pot obtindre l'URL del servidor."
+
+#: ../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 "S'estan cercant els calendaris de l'usuari..."
+
+#: ../plugins/caldav/caldav-browse-server.c:800
+msgid "Could not find any user calendar."
+msgstr "No s'ha pogut trobat cap calendari d'usuari."
+
+#: ../plugins/caldav/caldav-browse-server.c:938
+#, c-format
+msgid "Previous attempt failed: %s"
+msgstr "Ha fallat l'intent anterior: %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:940
+#, c-format
+msgid "Previous attempt failed with code %d"
+msgstr "Ha fallat l'intent anterior amb el codi: %d"
+
+#: ../plugins/caldav/caldav-browse-server.c:945
+#, c-format
+msgid "Enter password for user %s on server %s"
+msgstr "Introduïu la contrasenya per a l'usuari %s al servidor %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:1008
+#, c-format
+msgid "Cannot create soup message for URL '%s'"
+msgstr "No s'ha pogut crear el missatge «soup» per a l'URL «%s»"
+
+#. fetch content
+#: ../plugins/caldav/caldav-browse-server.c:1266
+msgid "Searching folder content..."
+msgstr "S'està cercant el contingut de la carpeta..."
+
+#: ../plugins/caldav/caldav-browse-server.c:1325
+#: ../plugins/caldav/caldav-source.c:261
+msgid "Server _handles meeting invitations"
+msgstr "El servidor _gestiona invitacions de reunió"
+
+#: ../plugins/caldav/caldav-browse-server.c:1332
+msgid "List of available calendars:"
+msgstr "Llista de calendaris disponibles:"
+
+#: ../plugins/caldav/caldav-browse-server.c:1370
+msgid "Supports"
+msgstr "Admet"
+
+#: ../plugins/caldav/caldav-browse-server.c:1397
+#: ../plugins/caldav/caldav-source.c:259
+msgid "User e_mail:"
+msgstr "Adreça electrònica de l'_usuari:"
+
+#: ../plugins/caldav/caldav-browse-server.c:1469
+#, c-format
+msgid "Failed to create thread: %s"
+msgstr "No s'ha pogut crear el fil: %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:1585
+#, c-format
+msgid "Server URL '%s' is not a valid URL"
+msgstr "L'URL del servidor «%s» no és vàlid"
+
+#: ../plugins/caldav/caldav-browse-server.c:1591
+msgid "Browse for a CalDAV calendar"
+msgstr "Navega per un calendari CalDAV"
+
+#: ../plugins/caldav/caldav-source.c:240
+#: ../plugins/calendar-http/calendar-http.c:107
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../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 "_Utilitza una connexió segura"
+
+#: ../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 "Nom d'_usuari:"
+
+#: ../plugins/caldav/caldav-source.c:264
+msgid "Brows_e server for a calendar"
+msgstr "Nave_ga pel servidor per cercar un calendari"
+
+#: ../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 "Re_fresca:"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+msgid "Add CalDAV support to Evolution."
+msgstr "Afig compatibilitat amb el CalDAV a l'Evolution."
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "CalDAV Support"
+msgstr "Compatibilitat CalDAV"
+
+#: ../plugins/calendar-file/calendar-file.c:134
+msgid "_Customize options"
+msgstr "_Personalitza les opcions"
+
+#: ../plugins/calendar-file/calendar-file.c:153
+msgid "File _name:"
+msgstr "_Nom del fitxer:"
+
+#: ../plugins/calendar-file/calendar-file.c:157
+msgid "Choose calendar file"
+msgstr "Trieu un fitxer de calendari"
+
+#: ../plugins/calendar-file/calendar-file.c:209
+msgid "On open"
+msgstr "En obrir"
+
+#: ../plugins/calendar-file/calendar-file.c:210
+msgid "On file change"
+msgstr "En produir-se canvis al fitxer"
+
+#: ../plugins/calendar-file/calendar-file.c:211
+msgid "Periodically"
+msgstr "De manera periòdica"
+
+#: ../plugins/calendar-file/calendar-file.c:228
+msgid "Force read _only"
+msgstr "Força la n_omés lectura"
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
+msgid "Add local calendars to Evolution."
+msgstr "Afig calendaris locals a l'Evolution."
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+msgid "Local Calendars"
+msgstr "Calendaris locals"
+
+#: ../plugins/calendar-http/calendar-http.c:207
+msgid "Userna_me:"
+msgstr "Nom d'_usuari:"
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
+msgid "Add web calendars to Evolution."
+msgstr "Afig calendaris web a l'Evolution."
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+msgid "Web Calendars"
+msgstr "Calendaris web"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Fog"
+msgstr "Temps: boira"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
+msgid "Weather: Cloudy"
+msgstr "Temps: amb núvols"
+
+#: ../plugins/calendar-weather/calendar-weather.c:67
+msgid "Weather: Cloudy Night"
+msgstr "Temps: nit amb núvols"
+
+#: ../plugins/calendar-weather/calendar-weather.c:68
+msgid "Weather: Overcast"
+msgstr "Temps: cel cobert"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
+msgid "Weather: Showers"
+msgstr "Temps: ruixats"
+
+#: ../plugins/calendar-weather/calendar-weather.c:70
+msgid "Weather: Snow"
+msgstr "Temps: neu"
+
+#: ../plugins/calendar-weather/calendar-weather.c:71
+msgid "Weather: Sunny"
+msgstr "Temps: sol"
+
+#: ../plugins/calendar-weather/calendar-weather.c:72
+msgid "Weather: Clear Night"
+msgstr "Temps: nit clara"
+
+#: ../plugins/calendar-weather/calendar-weather.c:73
+msgid "Weather: Thunderstorms"
+msgstr "Temps: llamps i trons"
+
+#: ../plugins/calendar-weather/calendar-weather.c:239
+msgid "Select a location"
+msgstr "Seleccioneu una ubicació"
+
+#. Translators: "None" location for a weather calendar
+#: ../plugins/calendar-weather/calendar-weather.c:350
+#: ../plugins/calendar-weather/calendar-weather.c:398
+msgctxt "weather-cal-location"
+msgid "None"
+msgstr "Cap"
+
+#: ../plugins/calendar-weather/calendar-weather.c:477
+msgid "_Units:"
+msgstr "_Unitats:"
+
+#: ../plugins/calendar-weather/calendar-weather.c:486
+msgid "Metric (Celsius, cm, etc)"
+msgstr "Mètriques (Celsius, cm, etc)"
+
+#: ../plugins/calendar-weather/calendar-weather.c:489
+msgid "Imperial (Fahrenheit, inches, etc)"
+msgstr "Imperials (Fahrenheit, polzades, etc)"
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
+msgid "Add weather calendars to Evolution."
+msgstr "Afegiu calendaris meteorològics a l'Evolution."
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
+msgid "Weather Calendars"
+msgstr "Calendaris meteorològics"
+
+#: ../plugins/dbx-import/dbx-importer.c:284
+msgid "Importing Outlook Express data"
+msgstr "S'estan important les dades de l'Outlook Express"
+
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+msgid "Import Outlook Express messages from DBX file"
+msgstr "Importa els missatges de l'Outlook Express a partir del fitxer DBX"
+
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+msgid "Outlook DBX import"
+msgstr "Importador de DBX de l'Outlook"
+
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+msgid "Outlook Express 5/6 personal folders (.dbx)"
+msgstr "Carpetes personals de l'Outlook Express 5/6 (.dbx)"
+
+#: ../plugins/default-source/default-source.c:168
+msgid "Mark as _default address book"
+msgstr "Marca-la com a llibreta d'adreces pre_determinada"
+
+#: ../plugins/default-source/default-source.c:182
+msgid "A_utocomplete with this address book"
+msgstr "Fes la compleció aut_omàtica amb esta llibreta d'adreces"
+
+#: ../plugins/default-source/default-source.c:191
+msgid "Mark as _default calendar"
+msgstr "Marca'l com a calendari pre_determinat"
+
+#: ../plugins/default-source/default-source.c:192
+msgid "Mark as _default task list"
+msgstr "Marca-la com a llista de tasques pre_determinada"
+
+#: ../plugins/default-source/default-source.c:193
+msgid "Mark as _default memo list"
+msgstr "Marca-la com a llista d'anotacions pre_determinada"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+msgid "Default Sources"
+msgstr "Fonts per defecte"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid "Mark your preferred address book and calendar as default."
+msgstr ""
+"Marqueu la llibreta d'adreces i el calendari preferits com a per defecte."
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "Llista de les capçaleres personalitzades"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"La clau especifica la llista de capçaleres personalitzades que podeu afegir "
+"a un missatge que envieu. El format per especificar una capçalera i el seu "
+"valor és: el nom de la capçalera seguit del signe d'igualtat («=») i els "
+"valors separats per punts i comes («;»)"
+
+#: ../plugins/email-custom-header/email-custom-header.c:322
+msgctxt "email-custom-header-Security"
+msgid "Security:"
+msgstr "Seguretat:"
+
+#: ../plugins/email-custom-header/email-custom-header.c:326
+msgctxt "email-custom-header-Security"
+msgid "Personal"
+msgstr "Personal"
+
+#: ../plugins/email-custom-header/email-custom-header.c:327
+msgctxt "email-custom-header-Security"
+msgid "Unclassified"
+msgstr "Sense classificar"
+
+#: ../plugins/email-custom-header/email-custom-header.c:328
+msgctxt "email-custom-header-Security"
+msgid "Protected"
+msgstr "Protegit"
+
+#: ../plugins/email-custom-header/email-custom-header.c:329
+msgctxt "email-custom-header-Security"
+msgid "Confidential"
+msgstr "Confidencial"
+
+#: ../plugins/email-custom-header/email-custom-header.c:330
+msgctxt "email-custom-header-Security"
+msgid "Secret"
+msgstr "Secret"
+
+#: ../plugins/email-custom-header/email-custom-header.c:331
+msgctxt "email-custom-header-Security"
+msgid "Top secret"
+msgstr "Alt secret"
+
+#: ../plugins/email-custom-header/email-custom-header.c:388
+msgctxt "email-custom-header"
+msgid "None"
+msgstr "Cap"
+
+#: ../plugins/email-custom-header/email-custom-header.c:584
+msgid "_Custom Header"
+msgstr "Capçalera personalit_zada"
+
+#. 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:847
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+"El format per especificar un valor per a una clau de capçalera "
+"personalitzada és:\n"
+"Nom dels valors de clau de capçalera personalitzada separats per «;»."
+
+#: ../plugins/email-custom-header/email-custom-header.c:901
+msgid "Key"
+msgstr "Clau"
+
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:468
+msgid "Values"
+msgstr "Valors"
+
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Add custom headers to outgoing mail messages."
+msgstr "Afig capçaleres personalitzades als missatges que s'envien."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "Capçalera personalitzada"
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
+msgid "Email Custom Header"
+msgstr "Capçalera personalitzada de correu electrònic"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr ""
+"Inicia automàticament l'editor en prémer una tecla al redactor de correu"
+
+#: ../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 "Inicia'l automàticament en editar un correu nou"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
+msgid "Default External Editor"
+msgstr "Editor extern per defecte"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
+msgid "The default command that must be used as the editor."
+msgstr "L'orde per defecte a utilitzar com a editor."
+
+#: ../plugins/external-editor/external-editor.c:121
+msgid "Command to be executed to launch the editor: "
+msgstr "Orde a executar per iniciar l'editor: "
+
+#: ../plugins/external-editor/external-editor.c:122
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
+msgstr ""
+"Utilitzeu «xemacs» per a l'Emacs\n"
+"Utilitzeu «gvim -f» per al VI"
+
+#: ../plugins/external-editor/external-editor.c:402
+#: ../plugins/external-editor/external-editor.c:404
+msgid "Compose in External Editor"
+msgstr "Redacció en un editor extern"
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+msgid "External Editor"
+msgstr "Editor extern"
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr "Utilitzeu un editor extern com a redactor de missatges de text pla."
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr "No s'ha pogut crear el fitxer temporal"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
+msgid "Editor not launchable"
+msgstr "No es pot executar l'editor"
+
+#: ../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."
+msgstr ""
+"L'Evolution no pot crear un fitxer temporal per emmagatzemar el correu. "
+"Torneu-ho a provar d'ací a una estona."
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+msgid "External editor still running"
+msgstr "Encara s'està executant l'editor extern"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr ""
+"Encara s'està executant l'editor extern. No es podrà tancar la finestra del "
+"redactor del correu mentre l'editor siga actiu."
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"No es pot executar l'editor extern especificat a les preferències del "
+"connector. Intenteu seleccionar un altre editor."
+
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
+msgid "Insert Face picture by default"
+msgstr "Afig una foto de la cara per defecte"
+
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
+msgid ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+msgstr ""
+"Si per defecte s'ha d'inserir una imatge de cara als missatges que s'envien. "
+"La imatge s'haurà d'establir abans de seleccionar esta opció, atès que en "
+"cas contrari no s'utilitzarà."
+
+#: ../plugins/face/face.c:292
+msgid "Select a Face Picture"
+msgstr "Seleccioneu un fitxer de cara"
+
+#: ../plugins/face/face.c:302
+msgid "Image files"
+msgstr "Fitxers d'imatge"
+
+#: ../plugins/face/face.c:359
+msgid "_Insert Face picture by default"
+msgstr "_Afig una foto de la cara per defecte"
+
+#: ../plugins/face/face.c:370
+msgid "Load new _Face picture"
+msgstr "Carrega una nova imatge de _cara"
+
+#: ../plugins/face/face.c:429
+msgid "Include _Face"
+msgstr "Inclou la _cara"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid "Attach a small picture of your face to outgoing messages."
+msgstr "Adjunta una foto petita de la vostra cara als missatges que envieu."
+
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+msgid "Failed Read"
+msgstr "Ha fallat la lectura"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+msgid "Invalid Image Size"
+msgstr "La mida de la imatge no és vàlida"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:3
+msgid "Not an image"
+msgstr "No és una imatge"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:4
+msgid "Please select an image of size 48 * 48"
+msgstr "Seleccioneu una imatge de mida 48 x 48"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+msgid "The file cannot be read"
+msgstr "No es pot llegir el fitxer"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid "The file you selected does not look like a valid .png image. Error: {0}"
+msgstr ""
+"El fitxer que heu seleccionat no pareix ser una imatge .png vàlida. Error: "
+"{0}"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:325
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+msgid "Server"
+msgstr "Servidor"
+
+#: ../plugins/google-account-setup/google-source.c:459
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr ""
+"Introduïu la contrasenya de l'usuari %s per accedir a la llista de "
+"subscripcions a calendaris."
+
+#: ../plugins/google-account-setup/google-source.c:576
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"No es poden llegir les dades del servidor del Google.\n"
+"%s"
+
+#: ../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 "S'ha produït un error desconegut."
+
+#: ../plugins/google-account-setup/google-source.c:679
+msgid "Cal_endar:"
+msgstr "_Calendari:"
+
+#: ../plugins/google-account-setup/google-source.c:714
+msgid "Retrieve _List"
+msgstr "Recupera la _llista"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+msgid "Add Google Calendars to Evolution."
+msgstr "Afegiu calendaris del Google a l'Evolution."
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Google Calendars"
+msgstr "Calendaris del Google"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+msgid "Inline Image"
+msgstr "Imatge inserida"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+msgid "View image attachments directly in mail messages."
+msgstr "Mostra les adjuncions d'imatge directament en els correus."
+
+#: ../plugins/imap-features/imap-headers.c:337
+#: ../plugins/imap-features/imap-headers.ui.h:2
+msgid "Custom Headers"
+msgstr "Capçaleres personalitzades"
+
+#: ../plugins/imap-features/imap-headers.c:349
+#: ../plugins/imap-features/imap-headers.ui.h:5
+msgid "IMAP Headers"
+msgstr "Capçaleres IMAP"
+
+#: ../plugins/imap-features/imap-headers.ui.h:1
+msgid "Basic and _Mailing List Headers (Default)"
+msgstr "Capçaleres bàsiques i de llista de correu (predeter_minat)"
+
+#: ../plugins/imap-features/imap-headers.ui.h:3
+msgid ""
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
+"You can ignore this if you choose \"All Headers\"."
+msgstr ""
+"Mostra les capçaleres addicionals que necessiteu obtindre a més de les "
+"capçaleres estàndard de sobre.\n"
+"Podeu ignorar-ho si trieu «Totes les capçaleres»."
+
+#: ../plugins/imap-features/imap-headers.ui.h:6
+msgid ""
+"Select your IMAP Header Preferences. \n"
+"The more headers you have the more time it will take to download."
+msgstr ""
+"Seleccioneu les preferències de les capçaleres IMAP.\n"
+"Com més capçaleres tingueu, més es trigarà en baixar."
+
+#: ../plugins/imap-features/imap-headers.ui.h:8
+msgid ""
+"_Basic Headers (Fastest) \n"
+"Use this if you do not have filters based on mailing lists"
+msgstr ""
+"Capçaleres _bàsiques (el més ràpid)\n"
+"Utilitzeu això si no teniu filtres basats en llistes de correu"
+
+#: ../plugins/imap-features/imap-headers.ui.h:10
+msgid "_Fetch All Headers"
+msgstr "Obté totes _les capçaleres"
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
+msgid "Fine-tune your IMAP accounts."
+msgstr "Ajusteu els paràmetres dels comptes IMAP."
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+msgid "IMAP Features"
+msgstr "Característiques d'IMAP"
+
+#. Translators: The first '%s' is replaced with a calendar name,
+#. * 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 "No s'ha pogut carregar el calendari «%s» (%s)"
+
+#: ../plugins/itip-formatter/itip-formatter.c:659
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr "Un esdeveniment del calendari «%s» coincideix amb esta reunió"
+
+# c-format
+#: ../plugins/itip-formatter/itip-formatter.c:683
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "S'ha trobat l'esdeveniment al calendari «%s»"
+
+#: ../plugins/itip-formatter/itip-formatter.c:789
+msgid "Unable to find any calendars"
+msgstr "No s'ha pogut trobat cap calendari"
+
+#: ../plugins/itip-formatter/itip-formatter.c:796
+msgid "Unable to find this meeting in any calendar"
+msgstr "No s'ha pogut trobar esta reunió en cap calendari"
+
+#: ../plugins/itip-formatter/itip-formatter.c:800
+msgid "Unable to find this task in any task list"
+msgstr "No s'ha pogut trobar la tasca a la llista de tasques"
+
+#: ../plugins/itip-formatter/itip-formatter.c:804
+msgid "Unable to find this memo in any memo list"
+msgstr "No s'ha pogut trobar esta anotació a la llista d'anotacions"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1082
+msgid "Opening the calendar. Please wait..."
+msgstr "S'està obrint el calendari. Espereu..."
+
+#: ../plugins/itip-formatter/itip-formatter.c:1085
+msgid "Searching for an existing version of this appointment"
+msgstr "S'està cercant una versió existent d'esta cita"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1362
+msgid "Unable to parse item"
+msgstr "No s'ha pogut analitzar l'element"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1451
+#, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr "No s'ha pogut enviar l'element al calendari «%s». %s"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1463
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr "S'ha enviat al calendari «%s» com a acceptat"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1467
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr "S'ha enviat al calendari «%s» com a provisional"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1472
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr "S'ha enviat al calendari «%s» com a rebutjat"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1477
+#, c-format
+msgid "Sent to calendar '%s' as canceled"
+msgstr "S'ha enviat al calendari «%s» com a cancel·lat"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1579
+#, c-format
+msgid "Organizer has removed the delegate %s "
+msgstr "L'organitzador ha suprimit el delegat %s "
+
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+msgid "Sent a cancelation notice to the delegate"
+msgstr "Envia un avís de cancel·lació al delegat"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1588
+msgid "Could not send the cancelation notice to the delegate"
+msgstr "No s'ha pogut enviar un avís de cancel·lació al delegat"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1700
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr ""
+"L'estat de l'assistent no s'ha pogut actualitzar perquè l'estat no és vàlid"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1729
+#, c-format
+msgid "Unable to update attendee. %s"
+msgstr "No s'ha pogut actualitzar l'assistent. %s"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1733
+msgid "Attendee status updated"
+msgstr "S'ha actualitzat l'estat de l'assistent"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1737
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+"No es pot actualitzar l'estat de l'assistent perquè l'element ja no existeix"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1759
+msgid "Meeting information sent"
+msgstr "S'ha enviat la informació de la reunió"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1762
+msgid "Task information sent"
+msgstr "S'ha enviat la informació de la tasca"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1765
+msgid "Memo information sent"
+msgstr "S'ha enviat la informació de l'anotació"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1774
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr "No s'ha pogut enviar la informació de la reunió; la reunió no existeix"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1777
+msgid "Unable to send task information, the task does not exist"
+msgstr "No s'ha pogut enviar la informació de la tasca; la tasca no existeix"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1780
+msgid "Unable to send memo information, the memo does not exist"
+msgstr ""
+"No s'ha pogut enviar la informació de l'anotació; l'anotació no existeix"
+
+#. Translators: This is a default filename for a calendar.
+#: ../plugins/itip-formatter/itip-formatter.c:1846
+msgid "calendar.ics"
+msgstr "calendari.ics"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1851
+msgid "Save Calendar"
+msgstr "Alça el calendari"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1914
+#: ../plugins/itip-formatter/itip-formatter.c:1925
+msgid "The calendar attached is not valid"
+msgstr "El calendari adjunt no és vàlid"
+
+#: ../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 ""
+"El missatge no conté un calendari iCalendar vàlid, tot i que diu contindre'n "
+"un."
+
+#: ../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 "L'element en el calendari no és vàlid"
+
+#: ../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 ""
+"El missatge conté un calendari, però el calendari no conté esdeveniments, "
+"tasques o informació de lliure/ocupat"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2008
+msgid "The calendar attached contains multiple items"
+msgstr "El calendari adjunt conté múltiples elements"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2009
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr ""
+"Per processar tots els elements, s'hauria d'alçar el fitxer i importar el "
+"calendari"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2672
+msgctxt "cal-itip"
+msgid "None"
+msgstr "Cap"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2688
+msgid "Tentatively Accepted"
+msgstr "Acceptat provisionalment"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2806
+msgid "This meeting recurs"
+msgstr "Esta reunió és periòdica"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2809
+msgid "This task recurs"
+msgstr "Esta tasca és periòdica"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2812
+msgid "This memo recurs"
+msgstr "Esta anotació és periòdica"
+
+#: ../plugins/itip-formatter/itip-formatter.c:3036
+msgid "Meeting Invitations"
+msgstr "Invitacions de la reunió"
+
+#. Delete message after acting
+#. FIXME Need a schema for this
+#: ../plugins/itip-formatter/itip-formatter.c:3061
+msgid "_Delete message after acting"
+msgstr "Suprimeix el missatge _després d'actuar"
+
+#: ../plugins/itip-formatter/itip-formatter.c:3071
+#: ../plugins/itip-formatter/itip-formatter.c:3104
+msgid "Conflict Search"
+msgstr "Cerca de conflictes"
+
+#. Source selector
+#: ../plugins/itip-formatter/itip-formatter.c:3086
+msgid "Select the calendars to search for meeting conflicts"
+msgstr "Seleccioneu els calendaris on cercar conflictes entre reunions"
+
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:196
+msgid "Today %H:%M"
+msgstr "Hui a les %H:%M"
+
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:200
+msgid "Today %H:%M:%S"
+msgstr "Hui a les %H:%M:%S"
+
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:209
+msgid "Today %l:%M:%S %p"
+msgstr "Hui a les %l:%M:%S %p"
+
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:224
+msgid "Tomorrow %H:%M"
+msgstr "Demà a les %H:%M"
+
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:228
+msgid "Tomorrow %H:%M:%S"
+msgstr "Demà a les %H:%M:%S"
+
+#. strftime format of a time,
+#. * in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:233
+msgid "Tomorrow %l:%M %p"
+msgstr "Demà a les %l:%M %p"
+
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:237
+msgid "Tomorrow %l:%M:%S %p"
+msgstr "Demà a les %l:%M:%S %p"
+
+#. strftime format of a weekday.
+#: ../plugins/itip-formatter/itip-view.c:256
+#, c-format
+msgid "%A"
+msgstr "%A"
+
+#. strftime format of a weekday and a
+#. * time, in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:261
+msgid "%A %H:%M"
+msgstr "%A a les %H:%M"
+
+#. strftime format of a weekday and a
+#. * time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:265
+msgid "%A %H:%M:%S"
+msgstr "%A a les %H:%M:%S"
+
+#. strftime format of a weekday and a
+#. * time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:270
+msgid "%A %l:%M %p"
+msgstr "%A a les %l:%M %p"
+
+#. strftime format of a weekday and a
+#. * time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:274
+msgid "%A %l:%M:%S %p"
+msgstr "%A a les %l:%M:%S %p"
+
+#. strftime format of a weekday and a date
+#. * without a year.
+#: ../plugins/itip-formatter/itip-view.c:283
+msgid "%A, %B %e"
+msgstr "%A, %e de %B"
+
+#. strftime format of a weekday, a date
+#. * without a year and a time,
+#. * in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:289
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %e de %B a les %H:%M"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:293
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%A, %e de %B a les %H:%M:%S"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:298
+msgid "%A, %B %e %l:%M %p"
+msgstr "%A, %e de %B a les %l:%M %p"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:302
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %e de %B a les %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: ../plugins/itip-formatter/itip-view.c:308
+msgid "%A, %B %e, %Y"
+msgstr "%A, %e de %B del %Y"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:313
+msgid "%A, %B %e, %Y %H:%M"
+msgstr "%A, %e de %B del %Y a les %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:317
+msgid "%A, %B %e, %Y %H:%M:%S"
+msgstr "%A, %e de %B del %Y a les %H:%M:%S"
+
+# consulteu man 3 strftime per comprendre aquest format
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:322
+msgid "%A, %B %e, %Y %l:%M %p"
+msgstr "%A, %e de %B del %Y a les %l:%M %p"
+
+# consulteu man 3 strftime per comprendre aquest format
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:326
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%A, %e de %B del %Y a les %l:%M:%S %p"
+
+#: ../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 "Una persona desconeguda"
+
+#: ../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 "Responeu en nom de %s"
+
+#: ../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 "Rebut en nom de %s"
+
+#: ../plugins/itip-formatter/itip-view.c:376
+#, c-format
+msgid "%s through %s has published the following meeting information:"
+msgstr ""
+"En/na %s, a través de %s, ha publicat la informació de la reunió següent:"
+
+#: ../plugins/itip-formatter/itip-view.c:378
+#, c-format
+msgid "%s has published the following meeting information:"
+msgstr "En/na %s ha publicat la informació de la reunió següent:"
+
+#: ../plugins/itip-formatter/itip-view.c:383
+#, c-format
+msgid "%s has delegated the following meeting to you:"
+msgstr "En/na %s vos ha delegat la reunió següent:"
+
+#: ../plugins/itip-formatter/itip-view.c:386
+#, c-format
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr ""
+"En/na %s, a través de %s, sol·licita la vostra presència a la reunió següent:"
+
+#: ../plugins/itip-formatter/itip-view.c:388
+#, c-format
+msgid "%s requests your presence at the following meeting:"
+msgstr "En/na %s sol·licita la vostra presència a la reunió següent:"
+
+#: ../plugins/itip-formatter/itip-view.c:394
+#, c-format
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "En/na %s, a través de %s, es voldria afegir a una reunió existent:"
+
+#: ../plugins/itip-formatter/itip-view.c:396
+#, c-format
+msgid "%s wishes to add to an existing meeting:"
+msgstr "En/na %s es voldria afegir a una reunió existent:"
+
+#: ../plugins/itip-formatter/itip-view.c:400
+#, c-format
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr ""
+"En/na %s, a través de %s, voldria rebre l'última informació sobre la reunió "
+"següent:"
+
+#: ../plugins/itip-formatter/itip-view.c:402
+#, c-format
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "En/na %s voldria rebre l'última informació de la reunió següent:"
+
+#: ../plugins/itip-formatter/itip-view.c:406
+#, c-format
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "En/na %s, a través de %s, ha retornat la resposta de reunió següent:"
+
+#: ../plugins/itip-formatter/itip-view.c:408
+#, c-format
+msgid "%s has sent back the following meeting response:"
+msgstr "En/na %s ha retornat la resposta de reunió següent:"
+
+#: ../plugins/itip-formatter/itip-view.c:412
+#, c-format
+msgid "%s through %s has canceled the following meeting:"
+msgstr "En/na %s, a través de %s, ha cancel·lat la reunió següent:"
+
+#: ../plugins/itip-formatter/itip-view.c:414
+#, c-format
+msgid "%s has canceled the following meeting."
+msgstr "En/na %s ha cancel·lat la reunió següent."
+
+#: ../plugins/itip-formatter/itip-view.c:418
+#, c-format
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "En/na %s, a través de %s, ha proposat els següents canvis a la reunió."
+
+#: ../plugins/itip-formatter/itip-view.c:420
+#, c-format
+msgid "%s has proposed the following meeting changes."
+msgstr "En/na %s ha proposat els següents canvis a la reunió."
+
+#: ../plugins/itip-formatter/itip-view.c:424
+#, c-format
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "En/na %s, a través de %s, ha rebutjat els següents canvis a la reunió:"
+
+#: ../plugins/itip-formatter/itip-view.c:426
+#, c-format
+msgid "%s has declined the following meeting changes."
+msgstr "En/na %s ha rebutjat els següents canvis a la reunió."
+
+#: ../plugins/itip-formatter/itip-view.c:464
+#, c-format
+msgid "%s through %s has published the following task:"
+msgstr "En/na %s, a través de %s, ha publicat la informació de tasca següent:"
+
+#: ../plugins/itip-formatter/itip-view.c:466
+#, c-format
+msgid "%s has published the following task:"
+msgstr "En/na %s ha publicat la tasca següent:"
+
+#: ../plugins/itip-formatter/itip-view.c:471
+#, c-format
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "En/na %s sol·licita assignar la tasca següent a %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:474
+#, c-format
+msgid "%s through %s has assigned you a task:"
+msgstr "En/na %s, a través de %s, vos ha assignat una tasca:"
+
+#: ../plugins/itip-formatter/itip-view.c:476
+#, c-format
+msgid "%s has assigned you a task:"
+msgstr "En/na %s vos ha assignat una tasca:"
+
+#: ../plugins/itip-formatter/itip-view.c:482
+#, c-format
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "En/na %s, a través de %s, es voldria afegir a una tasca existent:"
+
+#: ../plugins/itip-formatter/itip-view.c:484
+#, c-format
+msgid "%s wishes to add to an existing task:"
+msgstr "En/na %s es voldria afegir a una tasca existent:"
+
+#: ../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 ""
+"En/na %s, a través de %s, voldria rebre l'última informació per a la següent "
+"tasca assignada:"
+
+#: ../plugins/itip-formatter/itip-view.c:490
+#, c-format
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr ""
+"En/na %s voldria rebre l'última informació per a la següent tasca assignada:"
+
+#: ../plugins/itip-formatter/itip-view.c:494
+#, c-format
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr ""
+"En/na %s, a través de %s, ha retornat la següent resposta de la tasca "
+"assignada:"
+
+#: ../plugins/itip-formatter/itip-view.c:496
+#, c-format
+msgid "%s has sent back the following assigned task response:"
+msgstr "En/na %s ha retornat la següent resposta de la tasca assignada:"
+
+#: ../plugins/itip-formatter/itip-view.c:500
+#, c-format
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "En/na %s, a través de %s, ha cancel·lat la següent tasca assignada:"
+
+#: ../plugins/itip-formatter/itip-view.c:502
+#, c-format
+msgid "%s has canceled the following assigned task:"
+msgstr "En/na %s ha cancel·lat la següent tasca assignada:"
+
+#: ../plugins/itip-formatter/itip-view.c:506
+#, c-format
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr ""
+"En/na %s, a través de %s, ha proposat els següents canvis d'assignació d'una "
+"tasca:"
+
+#: ../plugins/itip-formatter/itip-view.c:508
+#, c-format
+msgid "%s has proposed the following task assignment changes:"
+msgstr "En/na %s ha proposat els següents canvis d'assignació d'una tasca:"
+
+#: ../plugins/itip-formatter/itip-view.c:512
+#, c-format
+msgid "%s through %s has declined the following assigned task:"
+msgstr "En/na %s, a través de %s, ha rebutjat la següent tasca assignada:"
+
+#: ../plugins/itip-formatter/itip-view.c:514
+#, c-format
+msgid "%s has declined the following assigned task:"
+msgstr "En/na %s ha rebutjat la següent tasca assignada:"
+
+#: ../plugins/itip-formatter/itip-view.c:551
+#, c-format
+msgid "%s through %s has published the following memo:"
+msgstr "En/na %s, a través de %s, ha publicat la següent anotació:"
+
+#: ../plugins/itip-formatter/itip-view.c:553
+#, c-format
+msgid "%s has published the following memo:"
+msgstr "En/na %s ha publicat la següent anotació:"
+
+#: ../plugins/itip-formatter/itip-view.c:558
+#, c-format
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "En/na %s, a través de %s es voldria afegir a una anotació existent:"
+
+#: ../plugins/itip-formatter/itip-view.c:560
+#, c-format
+msgid "%s wishes to add to an existing memo:"
+msgstr "En/na %s es voldria afegir a una anotació existent:"
+
+#: ../plugins/itip-formatter/itip-view.c:564
+#, c-format
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "En/na %s, a través de %s, ha cancel·lat l'anotació compartida següent:"
+
+#: ../plugins/itip-formatter/itip-view.c:566
+#, c-format
+msgid "%s has canceled the following shared memo:"
+msgstr "En/na %s ha cancel·lat l'anotació compartida següent:"
+
+#: ../plugins/itip-formatter/itip-view.c:690
+msgid "All day:"
+msgstr "Tot el dia:"
+
+#: ../plugins/itip-formatter/itip-view.c:700
+msgid "Start day:"
+msgstr "Dia d'inici:"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:700
+#: ../plugins/itip-formatter/itip-view.c:1062
+msgid "Start time:"
+msgstr "Hora d'inici:"
+
+#: ../plugins/itip-formatter/itip-view.c:712
+msgid "End day:"
+msgstr "Dia de finalització:"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:712
+#: ../plugins/itip-formatter/itip-view.c:1073
+msgid "End time:"
+msgstr "Hora de finalització:"
+
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:848
+msgid "_Open Calendar"
+msgstr "Obri el ca_lendari"
+
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../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 "_Declina"
+
+#: ../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 "Ac_cepta"
+
+#: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Decline all"
+msgstr "_Declina'ls tots"
+
+#: ../plugins/itip-formatter/itip-view.c:859
+msgid "_Tentative all"
+msgstr "_Tots provisionalment"
+
+#: ../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 "Provisionalmen_t"
+
+#: ../plugins/itip-formatter/itip-view.c:860
+msgid "A_ccept all"
+msgstr "_Accepta'ls tots"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:871
+msgid "_Send Information"
+msgstr "Informació d'en_viament"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:875
+msgid "_Update Attendee Status"
+msgstr "Act_ualitza l'estat de l'assistent"
+
+#: ../plugins/itip-formatter/itip-view.c:878
+msgid "_Update"
+msgstr "Act_ualitza"
+
+#. Comment
+#: ../plugins/itip-formatter/itip-view.c:1093
+#: ../plugins/itip-formatter/itip-view.c:1147
+msgid "Comment:"
+msgstr "Comentari:"
+
+#: ../plugins/itip-formatter/itip-view.c:1132
+msgid "Send _reply to sender"
+msgstr "_Respon al remitent"
+
+#: ../plugins/itip-formatter/itip-view.c:1162
+msgid "Send _updates to attendees"
+msgstr "En_via actualitzacions als assistents"
+
+#: ../plugins/itip-formatter/itip-view.c:1171
+msgid "_Apply to all instances"
+msgstr "A_plica a totes les instàncies"
+
+#: ../plugins/itip-formatter/itip-view.c:1180
+msgid "Show time as _free"
+msgstr "Mostra el temps com a _lliure"
+
+#: ../plugins/itip-formatter/itip-view.c:1183
+msgid "_Preserve my reminder"
+msgstr "_Conserva el meu recordatori"
+
+#. To Translators: This is a check box to inherit a reminder.
+#: ../plugins/itip-formatter/itip-view.c:1189
+msgid "_Inherit reminder"
+msgstr "_Hereta el recordatori"
+
+#: ../plugins/itip-formatter/itip-view.c:1965
+msgid "_Tasks:"
+msgstr "_Tasques:"
+
+#: ../plugins/itip-formatter/itip-view.c:1967
+msgid "_Memos:"
+msgstr "A_notacions:"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "Mostra les parts MIME «text/calendar» en els missatges de correu."
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Itip Formatter"
+msgstr "Formatador d'itip"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr "«{0}» ha delegat la reunió. Voleu afegir el delegat «{1}»?"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+msgid "This meeting has been delegated"
+msgstr "S'ha delegat la reunió"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr ""
+"Esta resposta no està associada a cap assistent actual. Voleu afegir-lo com "
+"a assistent?"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Beep or play sound file."
+msgstr "Emet un to o reprodueix un fitxer de so."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Enable icon in notification area."
+msgstr "Habilita la icona a l'àrea de notificació."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr ""
+"Si es defineix com a «true» (cert), s'emetrà un to en rebre correu nou. En "
+"cas contrari, es reproduirà un fitxer de so."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Notify new messages for Inbox only."
+msgstr "Notifica només quan hi haja correu nou a la safata d'entrada."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+msgid "Play sound when new messages arrive."
+msgstr "Reprodueix un so quan arribe correu nou."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr ""
+"Reprodueix el so de tema quan arribe correu nou (en cas que el mode "
+"d'emissió de to no estiga activat)."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr ""
+"Mostra la icona de correu nou a l'àrea de notificació en rebre missatges "
+"nous."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+msgid "Sound file name to be played."
+msgstr "Nom del fitxer de so a reproduir."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr ""
+"Fitxer de so que es reproduirà quan arribe correu nou (en cas que el mode "
+"d'emissió de to no estiga activat)."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+msgid "Use sound theme"
+msgstr "Utilitza el tema de sons"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid "Whether play sound or beep when new messages arrive."
+msgstr ""
+"Si s'ha de reproduir un fitxer de so o emetre un to quan arribe correu nou."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr "Si s'ha de notificar només per al correu nou a la safata d'entrada."
+
+#: ../plugins/mail-notification/mail-notification.c:391
+#, c-format
+msgid ""
+"You have received %d new message\n"
+"in %s."
+msgid_plural ""
+"You have received %d new messages\n"
+"in %s."
+msgstr[0] "Heu rebut %d missatge nou a %s."
+msgstr[1] "Heu rebut %d missatges nous a %s."
+
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:416
+#, c-format
+msgid "Subject: %s"
+msgstr "Assumpte: %s"
+
+#: ../plugins/mail-notification/mail-notification.c:427
+#, c-format
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
+msgstr[0] "Heu rebut %d missatge nou."
+msgstr[1] "Heu rebut %d missatges nous."
+
+#: ../plugins/mail-notification/mail-notification.c:436
+#: ../plugins/mail-notification/mail-notification.c:444
+#: ../plugins/mail-notification/mail-notification.c:447
+msgid "New email"
+msgstr "Correu nou"
+
+#. Translators: The '%s' is a mail
+#. * folder name.  (e.g. "Show Inbox")
+#: ../plugins/mail-notification/mail-notification.c:468
+#, c-format
+msgid "Show %s"
+msgstr "Mostra %s"
+
+#: ../plugins/mail-notification/mail-notification.c:673
+msgid "_Play sound when a new message arrives"
+msgstr "Re_produeix un so quan arriben correus nous"
+
+#: ../plugins/mail-notification/mail-notification.c:703
+msgid "_Beep"
+msgstr "_Emet un to"
+
+#: ../plugins/mail-notification/mail-notification.c:716
+msgid "Use sound _theme"
+msgstr "Utilitza el _tema de sons"
+
+#: ../plugins/mail-notification/mail-notification.c:735
+msgid "Play _file:"
+msgstr "_Reprodueix un fitxer:"
+
+#: ../plugins/mail-notification/mail-notification.c:744
+msgid "Select sound file"
+msgstr "Seleccioneu un fitxer de so"
+
+#: ../plugins/mail-notification/mail-notification.c:801
+msgid "Notify new messages for _Inbox only"
+msgstr "Notifica només per als missatges a la safata _d'entrada"
+
+#: ../plugins/mail-notification/mail-notification.c:811
+msgid "Show _notification when a new message arrives"
+msgstr "Mostra una _notificació quan arriben missatges nous"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid "Mail Notification"
+msgstr "Notificació de correu"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Notifies you when new mail messages arrive."
+msgstr "Vos notifica quan arriben missatges de correu nous."
+
+#. 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:239
+#, c-format
+msgid "Created from a mail by %s"
+msgstr "Creat a partir d'un correu de %s"
+
+#: ../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 ""
+"El calendari seleccionat ja conté l'esdeveniment «%s». Voleu editar "
+"l'esdeveniment antic?"
+
+#: ../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 ""
+"La llista de tasques seleccionades ja conté la tasca «%s». Voleu editar la "
+"tasca antiga?"
+
+#: ../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 ""
+"La llista d'anotacions seleccionada ja conté l'anotació «%s». Voleu editar "
+"l'anotació antiga?"
+
+#: ../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 ""
+"Heu seleccionat %d correus per convertir-los en esdeveniments. Segur que els "
+"voleu afegir tots?"
+
+#: ../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 ""
+"Heu seleccionat %d correus per convertir-los en tasques. Segur que els voleu "
+"afegir tots?"
+
+#: ../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 ""
+"Heu seleccionat %d correus per convertir-los en anotacions. Segur que els "
+"voleu afegir tots?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:658
+msgid "Do you wish to continue converting remaining mails?"
+msgstr "Voleu continuar convertint la resta de correus?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:733
+msgid "[No Summary]"
+msgstr "[Sense resum]"
+
+#: ../plugins/mail-to-task/mail-to-task.c:745
+msgid "Invalid object returned from a server"
+msgstr "S'ha retornat un objecte no vàlid d'un servidor"
+
+#: ../plugins/mail-to-task/mail-to-task.c:795
+#, c-format
+msgid "An error occurred during processing: %s"
+msgstr "S'ha produït un error durant el processament: %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:820
+#, c-format
+msgid "Cannot open calendar. %s"
+msgstr "No es pot obrir el calendari. %s"
+
+#: ../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 ""
+"La font que heu seleccionat és només de lectura, per la qual cosa no hi "
+"podeu crear un esdeveniment. Seleccioneu una altra font."
+
+#: ../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 ""
+"La font que heu seleccionat és només de lectura, per la qual cosa no hi "
+"podeu crear una tasca."
+
+#: ../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 ""
+"La font que heu seleccionat és només de lectura, per la qual cosa no hi "
+"podeu crear una anotació. Seleccioneu una altra font."
+
+#: ../plugins/mail-to-task/mail-to-task.c:1084
+#, c-format
+msgid "Cannot get source list. %s"
+msgstr "No s'ha pogut obtindre la llista font. %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1145
+msgid "No writable calendar is available."
+msgstr "No hi ha cap calendari en mode escriptura disponible."
+
+#: ../plugins/mail-to-task/mail-to-task.c:1237
+msgid "Create an _Event"
+msgstr "Crea un _esdeveniment"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1239
+msgid "Create a new event from the selected message"
+msgstr "Crea un esdeveniment nou a partir del missatge seleccionat"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1244
+msgid "Create a Mem_o"
+msgstr "Crea una an_otació"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1246
+msgid "Create a new memo from the selected message"
+msgstr "Crea una anotació nova a partir del missatge seleccionat"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1251
+msgid "Create a _Task"
+msgstr "Crea una _tasca"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1253
+msgid "Create a new task from the selected message"
+msgstr "Crea una tasca nova a partir del missatge seleccionat"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1261
+msgid "Create a _Meeting"
+msgstr "Crea una re_unió"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1263
+msgid "Create a new meeting from the selected message"
+msgstr "Crea una reunió nova a partir del missatge seleccionat"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "Converteix un missatge de correu en una tasca."
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:346
+msgid "Get List _Archive"
+msgstr "Obté l'_arxiu de la llista"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:348
+msgid "Get an archive of the list this message belongs to"
+msgstr "Obté un arxiu de la llista a la qual pertany este missatge"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:353
+msgid "Get List _Usage Information"
+msgstr "O_bté informació de l'ús de la llista"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:355
+msgid "Get information about the usage of the list this message belongs to"
+msgstr ""
+"Obté informació sobre l'ús de la llista a la qual pertany este missatge"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:360
+msgid "Contact List _Owner"
+msgstr "Contacta amb el pr_opietari de la llista"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:362
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr ""
+"Contacteu amb el propietari de la llista a la qual pertany este missatge"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
+msgid "_Post Message to List"
+msgstr "Envia un _missatge a la llista"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
+msgid "Post a message to the mailing list this message belongs to"
+msgstr ""
+"Envieu un missatge a la llista de correu a la qual pertany este missatge"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
+msgid "_Subscribe to List"
+msgstr "_Subscriu a la llista"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "Subscriviu-vos a la llista de correu a la qual pertany este missatge"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
+msgid "_Unsubscribe from List"
+msgstr "Cancel·la la s_ubscripció a la llista"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
+msgid "Unsubscribe from the mailing list this message belongs to"
+msgstr ""
+"Cancel·la la subscripció a la llista de correu a la qual pertany este "
+"missatge"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
+msgid "Mailing _List"
+msgstr "_Llista de correu"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Mailing List Actions"
+msgstr "Accions de la llista de correu"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr ""
+"Dueu a terme accions per a ordes habituals de les llistes de correu "
+"(subscripció, cancel·lació de subscripcions, etc.)."
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+msgid "Action not available"
+msgstr "Acció no disponible"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
+msgid ""
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
+msgstr ""
+"S'enviarà un missatge de correu electrònic a l'URL «{0}». Podeu enviar el "
+"missatge automàticament, o veure'l i canviar-lo abans.\n"
+"\n"
+"Hauríeu de rebre una resposta de la llista de correu poc després d'enviar el "
+"missatge."
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
+msgid "Malformed header"
+msgstr "La capçalera està mal formada"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+msgid "No e-mail action"
+msgstr "Cap acció de correu electrònic"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
+msgid "Posting not allowed"
+msgstr "No es permet publicar"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+"No es permet publicar en esta llista de correu. Possiblement siga una llista "
+"només per llegir. Contacteu amb el propietari de la llista."
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+msgid "Send e-mail message to mailing list?"
+msgstr "Voleu enviar un correu electrònic a la llista?"
+
+#: ../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"
+"\n"
+"Header: {0}"
+msgstr ""
+"No s'ha pogut realitzar l'acció. Això significa que la capçalera per a esta "
+"acció no contenia cap acció que es poguera gestionar.\n"
+"\n"
+"Capçalera: {0}"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
+msgid ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+msgstr ""
+"La capçalera {0} d'este missatge està mal construïda i no es processarà.\n"
+"\n"
+"Capçalera: {1}"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+msgid ""
+"This message does not contain the header information required for this "
+"action."
+msgstr ""
+"Este missatge no conté la informació de capçalera necessària per a esta "
+"acció."
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
+msgid "_Edit message"
+msgstr "_Edita el missatge"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
+msgid "_Send message"
+msgstr "Envia el mi_ssatge"
+
+#: ../plugins/mark-all-read/mark-all-read.c:42
+msgid "Also mark messages in subfolders?"
+msgstr "Voleu que també es marquen els missatges de les subcarpetes?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:44
+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 ""
+"Voleu marcar els missatges com a llegits només a la carpeta seleccionada, o "
+"bé a la carpeta seleccionada i a totes les seues subcarpetes?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:215
+msgid "In Current Folder and _Subfolders"
+msgstr "A la carpeta actual i a les seues _subcarpetes"
+
+#: ../plugins/mark-all-read/mark-all-read.c:229
+msgid "In Current _Folder Only"
+msgstr "_Només a la carpeta actual"
+
+#: ../plugins/mark-all-read/mark-all-read.c:575
+msgid "Mark Me_ssages as Read"
+msgstr "Marca els mi_ssatges com a llegits"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+msgid "Mark All Read"
+msgstr "Marca'ls tots com a llegits"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+msgid "Mark all messages in a folder as read."
+msgstr "Marca tots els missatges d'una carpeta com a llegits."
+
+#. but then we also need to create our own section frame
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
+msgid "Plain Text Mode"
+msgstr "Mode de text sense format"
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Prefer Plain Text"
+msgstr "Prefereixo text sense format"
+
+#: ../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 ""
+"Visualitza els missatges de correu en format de text sense format, encara "
+"que tinguen contingut HTML."
+
+#: ../plugins/prefer-plain/prefer-plain.c:251
+msgid "Show HTML if present"
+msgstr "Mostra HTML si n'hi ha"
+
+#: ../plugins/prefer-plain/prefer-plain.c:252
+msgid "Let Evolution choose the best part to show."
+msgstr "Deixa que l'Evolution decidisca la part òptima a mostrar."
+
+#: ../plugins/prefer-plain/prefer-plain.c:255
+msgid "Show plain text if present"
+msgstr "Mostra text sense format si n'hi ha"
+
+#: ../plugins/prefer-plain/prefer-plain.c:256
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
+"Mostra la part de text sense format, si és que existeix. En cas contrari, "
+"l'Evolution triarà la millor part a mostrar."
+
+#: ../plugins/prefer-plain/prefer-plain.c:260
+msgid "Only ever show plain text"
+msgstr "Mostra només text sense format"
+
+#: ../plugins/prefer-plain/prefer-plain.c:261
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr ""
+"Mostra sempre text sense format i crea adjuncions de les altres parts, si "
+"així s'especifica."
+
+#: ../plugins/prefer-plain/prefer-plain.c:313
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr "Mostra les parts en HTML s_uprimides com a adjuncions"
+
+#: ../plugins/prefer-plain/prefer-plain.c:333
+msgid "HTML _Mode"
+msgstr "_Mode HTML"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+msgid "Import Outlook messages from PST file"
+msgstr "Importa els missatges de l'Outlook a partir del fitxer PST"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook PST import"
+msgstr "Importador de PST de l'Outlook"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr "Carpetes personals de l'Outlook (.pst)"
+
+#: ../plugins/pst-import/pst-importer.c:450
+msgid "_Mail"
+msgstr "_Correu"
+
+#: ../plugins/pst-import/pst-importer.c:469
+msgid "Destination folder:"
+msgstr "Carpeta de destí:"
+
+#: ../plugins/pst-import/pst-importer.c:475
+msgid "_Address Book"
+msgstr "_Llibreta d'adreces"
+
+#: ../plugins/pst-import/pst-importer.c:476
+msgid "A_ppointments"
+msgstr "Ci_tes"
+
+#: ../plugins/pst-import/pst-importer.c:477 ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tasques"
+
+#: ../plugins/pst-import/pst-importer.c:478
+msgid "_Journal entries"
+msgstr "_Entrades al diari"
+
+#: ../plugins/pst-import/pst-importer.c:585
+msgid "Importing Outlook data"
+msgstr "S'estan important les dades de l'Outlook"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../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 "Publicació de calendaris"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+msgid "Locations"
+msgstr "Ubicacions"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Publish calendars to the web."
+msgstr "Publiqueu calendaris a la web."
+
+#: ../plugins/publish-calendar/publish-calendar.c:216
+#: ../plugins/publish-calendar/publish-calendar.c:471
+#, c-format
+msgid "Could not open %s:"
+msgstr "No s'ha pogut obrir %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:218
+#, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "No s'ha pogut obrir %s: error desconegut"
+
+#: ../plugins/publish-calendar/publish-calendar.c:238
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr "S'ha produït un error en publicar a %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:240
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr "S'ha completat la publicació a %s amb èxit"
+
+#: ../plugins/publish-calendar/publish-calendar.c:288
+#, c-format
+msgid "Mount of %s failed:"
+msgstr "Ha fallat el muntatge de %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:619
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "E_nable"
+msgstr "Habi_lita"
+
+#: ../plugins/publish-calendar/publish-calendar.c:767
+msgid "Are you sure you want to remove this location?"
+msgstr "Segur que voleu suprimir esta ubicació?"
+
+#. 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
+msgid "Could not create publish thread."
+msgstr "No s'ha pogut crear el fil de publicació."
+
+#: ../plugins/publish-calendar/publish-calendar.c:1107
+msgid "_Publish Calendar Information"
+msgstr "_Publica informació del calendari"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Custom Location"
+msgstr "Ubicació personalitzada"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+msgid "Daily"
+msgstr "Cada dia"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+msgid "FTP (with login)"
+msgstr "FTP (amb entrada)"
+
+# Es refereix a la freqüència de publicació, per això és en femení (dpm)
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+msgid "Manual (via Actions menu)"
+msgstr "Manual (a través del menú d'accions)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
+msgid "P_ort:"
+msgstr "_Port:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+msgid "Public FTP"
+msgstr "FTP públic"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
+msgid "Publishing Location"
+msgstr "Ubicació de la publicació"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
+msgid "Publishing _Frequency:"
+msgstr "_Freqüència de publicació:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Secure FTP (SSH)"
+msgstr "FTP segur (SSH)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "Secure WebDAV (HTTPS)"
+msgstr "WebDAV segur (HTTPS)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:17
+msgid "Service _type:"
+msgstr "_Tipus de servei:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+msgid "Sources"
+msgstr "Fonts"
+
+# FIXME (dpm)
+#: ../plugins/publish-calendar/publish-calendar.ui.h:19
+msgid "Time _duration:"
+msgstr "_Durada del temps:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (HTTP)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Weekly"
+msgstr "Setmanal"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+msgid "Windows share"
+msgstr "Compartició del Windows"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+msgid "_File:"
+msgstr "_Fitxer:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
+msgid "_Password:"
+msgstr "Contrasen_ya:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+msgid "_Publish as:"
+msgstr "_Publica com a:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+msgid "_Remember password"
+msgstr "_Recorda la contrasenya"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
+msgid "_Username:"
+msgstr "Nom d'_usuari:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+msgid "iCal"
+msgstr "iCal"
+
+#: ../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 ""
+"No s'ha pogut publicar el calendari: el rerefons de calendari ja no existeix"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:518
+msgid "New Location"
+msgstr "Ubicació nova"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:520
+msgid "Edit Location"
+msgstr "Edita la ubicació"
+
+#. 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:168
+msgid "%F %T"
+msgstr "%F %T"
+
+#: ../plugins/save-calendar/csv-format.c:382
+msgid "UID"
+msgstr "UID"
+
+#: ../plugins/save-calendar/csv-format.c:384
+msgid "Description List"
+msgstr "Llista de descripció"
+
+#: ../plugins/save-calendar/csv-format.c:385
+msgid "Categories List"
+msgstr "Llista de categories"
+
+#: ../plugins/save-calendar/csv-format.c:386
+msgid "Comment List"
+msgstr "Llista de comentaris"
+
+#: ../plugins/save-calendar/csv-format.c:389
+msgid "Contact List"
+msgstr "Llista de contactes"
+
+#: ../plugins/save-calendar/csv-format.c:390
+msgid "Start"
+msgstr "Comença"
+
+#: ../plugins/save-calendar/csv-format.c:391
+msgid "End"
+msgstr "Acaba"
+
+#: ../plugins/save-calendar/csv-format.c:392
+msgid "Due"
+msgstr "Venciment"
+
+#: ../plugins/save-calendar/csv-format.c:393
+msgid "percent Done"
+msgstr "percentatge fet"
+
+#: ../plugins/save-calendar/csv-format.c:395
+msgid "URL"
+msgstr "URL"
+
+#: ../plugins/save-calendar/csv-format.c:396
+msgid "Attendees List"
+msgstr "Llista d'assistents"
+
+#: ../plugins/save-calendar/csv-format.c:398
+msgid "Modified"
+msgstr "Modificat"
+
+#: ../plugins/save-calendar/csv-format.c:573
+msgid "A_dvanced options for the CSV format"
+msgstr "Opcions a_vançades del format CSV"
+
+#: ../plugins/save-calendar/csv-format.c:581
+msgid "Prepend a _header"
+msgstr "Afig una ca_pçalera al començament"
+
+#: ../plugins/save-calendar/csv-format.c:590
+msgid "_Value delimiter:"
+msgstr "_Separador de valors:"
+
+#: ../plugins/save-calendar/csv-format.c:601
+msgid "_Record delimiter:"
+msgstr "Separador de _registres:"
+
+#: ../plugins/save-calendar/csv-format.c:612
+msgid "_Encapsulate values with:"
+msgstr "_Encapsula els valors amb:"
+
+#: ../plugins/save-calendar/csv-format.c:638
+msgid "Comma separated values (.csv)"
+msgstr "Valors separats per comes (.csv)"
+
+#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:225
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
+msgid "Save Selected"
+msgstr "Alça els seleccionats"
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+msgid "Save a calendar or task list to disk."
+msgstr "Alça un calendari o una llista de tasques al disc."
+
+#.
+#. * Translator: the %FT%T is the thirth argument for a strftime function.
+#. * It lets you define the formatting of the date in the rdf-file.
+#. * Also check out http://www.w3.org/2002/12/cal/tzd
+#. *
+#: ../plugins/save-calendar/rdf-format.c:156
+msgid "%FT%T"
+msgstr "%FT%T"
+
+#: ../plugins/save-calendar/rdf-format.c:389
+msgid "RDF (.rdf)"
+msgstr "RDF (.rdf)"
+
+#: ../plugins/save-calendar/save-calendar.c:127
+msgid "_Format:"
+msgstr "_Format:"
+
+#: ../plugins/save-calendar/save-calendar.c:189
+msgid "Select destination file"
+msgstr "Seleccioneu el fitxer destí"
+
+#: ../plugins/save-calendar/save-calendar.c:344
+msgid "Save the selected calendar to disk"
+msgstr "Alça el calendari seleccionat en el disc"
+
+#: ../plugins/save-calendar/save-calendar.c:375
+msgid "Save the selected memo list to disk"
+msgstr "Alça l'anotació seleccionada en el disc"
+
+#: ../plugins/save-calendar/save-calendar.c:406
+msgid "Save the selected task list to disk"
+msgstr "Alça la llista de tasques seleccionades en el disc"
+
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Llista de parells de clau/valor que el connector de plantilles substituirà "
+"en el cos d'un missatge."
+
+#: ../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."
+msgstr ""
+"Connector de plantilles basat en esborranys. Podeu utilitzar variables com "
+"$ORIG[subject] ($origen[assumpte]), $ORIG[to] ($origen[per]) o $ORIG[body] "
+"($origen[cos]), que es reemplaçaran per els valors del correu que estigueu "
+"responent."
+
+#: ../plugins/templates/templates.c:1094
+msgid "No Title"
+msgstr "Sense títol"
+
+#: ../plugins/templates/templates.c:1195
+msgid "Save as _Template"
+msgstr "Alça com a _plantilla"
+
+#: ../plugins/templates/templates.c:1197
+msgid "Save as Template"
+msgstr "Alça com a plantilla"
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr "Descodifiqueu adjuncions TNEF (winmail.dat) de l'Outlook de Microsoft."
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "TNEF Decoder"
+msgstr "Descodificador TNEF"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+msgid "Inline vCards"
+msgstr "vCard en línia"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr "Mostra les vCard directament en els missatges de correu."
+
+#: ../plugins/vcard-inline/vcard-inline.c:207
+#: ../plugins/vcard-inline/vcard-inline.c:292
+msgid "Show Full vCard"
+msgstr "Mostra la vCard completa"
+
+#: ../plugins/vcard-inline/vcard-inline.c:210
+msgid "Show Compact vCard"
+msgstr "Mostra la vCard compacta"
+
+#: ../plugins/vcard-inline/vcard-inline.c:271
+msgid "There is one other contact."
+msgstr "Hi ha un altre contacte."
+
+#: ../plugins/vcard-inline/vcard-inline.c:280
+#, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "Hi ha %d altre contacte."
+msgstr[1] "Hi ha %d contactes més."
+
+#: ../plugins/vcard-inline/vcard-inline.c:301
+msgid "Save in Address Book"
+msgstr "Alça a la llibreta d'adreces"
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "Add WebDAV contacts to Evolution."
+msgstr "Afig contactes WebDAV a l'Evolution."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "Contactes WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:283
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
+msgstr "_Evita l'IfMatch (requerit per a l'Apache < 2.2.8)"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:1
+msgid "Authenticate proxy server connections"
+msgstr "Autentica les connexions al servidor intermediari"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:2
+msgid "Automatic proxy configuration URL"
+msgstr "URL de configuració automàtica del servidor intermediari"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Configuration version"
+msgstr "Versió de la configuració"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:4
+msgid "Default sidebar width"
+msgstr "Amplada per defecte de la barra lateral"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:5
+msgid "Default window X coordinate"
+msgstr "Coordinada X de finestra per defecte"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+msgid "Default window Y coordinate"
+msgstr "Coordinada Y de finestra per defecte"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
+msgid "Default window height"
+msgstr "Alçada per defecte de la finestra"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid "Default window state"
+msgstr "Estat per defecte de la finestra"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "Default window width"
+msgstr "Amplada per defecte de la finestra"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "Enable express mode"
+msgstr "Habilita el mode senzill"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+"Habilita els paràmetres de servidor intermediari en accedir a l'HTTP/HTTP "
+"segur a través d'Internet."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "Flag that enables a much simplified user interface."
+msgstr "Senyalador que habilita una interfície d'usuari molt més simplificada."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "HTTP proxy host name"
+msgstr "Nom de servidor del servidor intermediari per a l'HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14
+msgid "HTTP proxy password"
+msgstr "Contrasenya del servidor intermediari per a l'HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:15
+msgid "HTTP proxy port"
+msgstr "Port del servidor intermediari per a l'HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid "HTTP proxy username"
+msgstr "Nom d'usuari per al servidor intermediari per a l'HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+"Identificador o sobrenom del component a mostrar per defecte a l'inici."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
+"Si és cert, caldrà autenticar-se en connectar-se al servidor intermediari. "
+"El nom d'usuari s'obté de la clau «/apps/evolution/shell/network_config/"
+"authentication_user» del GConf, i la contrasenya de l'anell de claus del "
+"GNOME o bé del fitxer de contrasenyes ~/.gnome2_private/Evolution."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Initial attachment view"
+msgstr "Visualització inicial de les adjuncions"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "Initial file chooser folder"
+msgstr "Carpeta inicial del selector de fitxers"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "Carpeta inicial dels diàlegs de tipus GtkFileChooser."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+"Visualització inicial per als ginys de la barra d'adjuncions. «0» significa "
+"vista d'icones i «1» vista de llista."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Last upgraded configuration version"
+msgstr "Versió de la darrera actualització de la configuració"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+"Llista de camins de les carpetes a sincronitzar al disc per a la utilització "
+"fora de línia"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
+msgid "Non-proxy hosts"
+msgstr "Ordinadors sense servidor intermediari"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr "Contrasenya a utilitzar per a l'autenticació al servidor intermediari."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+msgid "Proxy configuration mode"
+msgstr "Mode de configuració del servidor intermediari"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:28
+msgid "SOCKS proxy host name"
+msgstr "Nom de servidor del servidor intermediari per al SOCKS"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:29
+msgid "SOCKS proxy port"
+msgstr "Port del servidor intermediari per al SOCKS"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+msgid "Secure HTTP proxy host name"
+msgstr "Nom de servidor del servidor intermediari per a l'HTTP segur"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:31
+msgid "Secure HTTP proxy port"
+msgstr "Port del servidor intermediari per a l'HTTP segur"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:32
+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 ""
+"Selecciona el mode de configuració del servidor intermediari. Els valors "
+"permesos són 0, 1, 2 i 3, els quals representen, respectivament, «use system "
+"settings» (utilitza els paràmetres del sistema), «use manual proxy "
+"configuration» (utilitza la configuració manual del servidor intermediari) i "
+"«use proxy configuration provided in the autoconfig url» (utilitza la "
+"configuració del servidor intermediari proporcionada a l'URL de configuració "
+"automàtica)."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:33
+msgid "Sidebar is visible"
+msgstr "La barra lateral és visible"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:34
+msgid "Skip development warning dialog"
+msgstr "Omet el diàleg d'avís de versió de desenvolupament"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
+msgid "Start in offline mode"
+msgstr "Inicia en mode fora de línia"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "Statusbar is visible"
+msgstr "La barra d'estat és visible"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr ""
+"La versió de la configuració de l'Evolution, amb nivell major/menor/"
+"configuració (per exemple «2.6.0»)."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+msgid "The default X coordinate for the main window."
+msgstr "La coordinada X per defecte de la finestra principal."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid "The default Y coordinate for the main window."
+msgstr "La coordinada Y per defecte de la finestra principal."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
+msgid "The default height for the main window, in pixels."
+msgstr "Alçada per defecte de la finestra principal, en píxels."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid "The default width for the main window, in pixels."
+msgstr "Amplada per defecte de la finestra principal, en píxels."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
+msgid "The default width for the sidebar, in pixels."
+msgstr "L'amplada per defecte de la barra lateral, en píxels."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+"La darrera versió actualitzada de  la configuració de l'Evolution, amb "
+"nivell major/menor/configuració (per exemple «2.6.0»)."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "The machine name to proxy HTTP through."
+msgstr ""
+"El nom de la màquina que actuarà com a servidor intermediari per a l'HTTP."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "The machine name to proxy secure HTTP through."
+msgstr ""
+"El nom de la màquina que actuarà com a servidor intermediari per a l'HTTP "
+"segur."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
+msgid "The machine name to proxy socks through."
+msgstr ""
+"El nom de la màquina que actuarà com a servidor intermediari per al SOCKS."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+"El port de la màquina definit a «/apps/evolution/shell/network_config/"
+"http_host», a través del qual s'accedeix al servidor intermediari."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+"El port de la màquina definit a «/apps/evolution/shell/network_config/"
+"secure_host», a través del qual s'accedeix al servidor intermediari."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:49
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+"El port de la màquina definit a «/apps/evolution/shell/network_config/"
+"socks_host», a través del qual s'accedeix al servidor intermediari."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:50
+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 ""
+"L'estil dels botons de la finestra. Pot ser «text», «icons», "
+"«both» (ambdós), o «toolbar» (barra d'eines). Si s'habilita «toolbar», "
+"l'estil dels botons es determina mitjançant la configuració de la barra "
+"d'eines del GNOME."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:51
+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 ""
+"Esta clau conté una llista d'ordinadors als quals es connectarà directament "
+"en lloc d'utilitzar el servidor intermediari (en cas que s'haja activat). "
+"Els valors poden ser noms d'ordinadors, dominis (amb comodins com ara *."
+"exemple.cat), adreces IP d'ordinadors (tant IPv4 com IPv6), i adreces de "
+"xarxa amb màscara de xarxa (com per exemple 192.168.0.0/24)."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:52
+msgid "Toolbar is visible"
+msgstr "La barra d'eines és visible"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:53
+msgid "URL that provides proxy configuration values."
+msgstr ""
+"URL que proporciona els valors de configuració del servidor intermediari."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:54
+msgid "Use HTTP proxy"
+msgstr "Utilitza un servidor intermediari HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:55
+msgid "Username to pass as authentication when doing HTTP proxying."
+msgstr ""
+"Nom d'usuari a utilitzar per a l'autenticació quan es faça servir un "
+"servidor intermediari HTTP."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:56
+msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr ""
+"Si l'Evolution s'inicia en mode fora de línia en comptes del mode en línia."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:57
+msgid "Whether or not the window should be maximized."
+msgstr "Si s'ha de maximitzar la finestra."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:58
+msgid "Whether the sidebar should be visible."
+msgstr "Si s'ha de veure la barra lateral."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:59
+msgid "Whether the status bar should be visible."
+msgstr "Si s'ha de veure la barra d'estat."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:60
+msgid "Whether the toolbar should be visible."
+msgstr "Si s'ha de veure la barra d'eines."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:61
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+"Si s'ha de mostrar el diàleg d'avís per indicar que s'està executant una "
+"versió de desenvolupament de l'Evolution."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:62
+msgid "Whether the window buttons should be visible."
+msgstr "Si s'han de veure els botons de la finestra."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:63
+msgid "Window button style"
+msgstr "Estil del botó de la finestra"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:64
+msgid "Window buttons are visible"
+msgstr "Els botons de la finestra són visibles"
+
+#: ../shell/e-shell-content.c:729 ../shell/e-shell-content.c:730
+msgid "Searches"
+msgstr "Cerques"
+
+#: ../shell/e-shell-content.c:773
+msgid "Save Search"
+msgstr "Alça la cerca"
+
+#. Translators: The "Show:" label precedes a combo box that
+#. * 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
+msgid "Sho_w:"
+msgstr "Mos_tra:"
+
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:971
+msgid "Sear_ch:"
+msgstr "Cer_ca:"
+
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:1034
+msgid "i_n"
+msgstr "_a"
+
+#: ../shell/e-shell-utils.c:223
+msgid "vCard (.vcf)"
+msgstr "vCard (.vcf)"
+
+#: ../shell/e-shell-utils.c:246
+msgid "All Files (*)"
+msgstr "Tots els fitxers (*)"
+
+#: ../shell/e-shell-view.c:296
+msgid "Saving user interface state"
+msgstr "S'està desant l'estat de la interfície d'usuari"
+
+#. The translator-credits string is for translators to list
+#. * per-language credits for translation, displayed in the
+#. * about dialog.
+#: ../shell/e-shell-window-actions.c:645
+msgid "translator-credits"
+msgstr ""
+"Víctor Nieto <vnie2025@alu-etsetb.upc.es>\n"
+"Aleix Badia i Bosch <abadia@ica.es>\n"
+"Francesc Dorca <f.dorca@filnet.es>\n"
+"Jordi Mas i Hernàndez <jmas@softcatala.org>\n"
+"Enric Balletbò i Serra <eballetbo@km103.com>\n"
+"Xavier Conde Rueda <xavi.conde@gmail.com>\n"
+"Gil Forcada <gilforcada@guifi.net>\n"
+"David Planella Molas <david.planella@gmail.com>"
+
+#: ../shell/e-shell-window-actions.c:656
+msgid "Evolution Website"
+msgstr "Lloc web de l'Evolution"
+
+#: ../shell/e-shell-window-actions.c:902
+msgid "Categories Editor"
+msgstr "Editor de categories"
+
+#: ../shell/e-shell-window-actions.c:1237
+msgid "Bug Buddy is not installed."
+msgstr "El Bug Buddy no està instal·lat."
+
+#: ../shell/e-shell-window-actions.c:1239
+msgid "Bug Buddy could not be run."
+msgstr "No es pot executar el Bug Buddy."
+
+#: ../shell/e-shell-window-actions.c:1420
+msgid "Show information about Evolution"
+msgstr "Mostra informació sobre l'Evolution"
+
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1439
+msgid "_Close Window"
+msgstr "_Tanca la finestra"
+
+#: ../shell/e-shell-window-actions.c:1446
+msgid "_Contents"
+msgstr "C_ontingut"
+
+#: ../shell/e-shell-window-actions.c:1448
+msgid "Open the Evolution User Guide"
+msgstr "Obri la guia de l'usuari de l'Evolution"
+
+#: ../shell/e-shell-window-actions.c:1474
+msgid "_Forget Passwords"
+msgstr "Oblida les _contrasenyes"
+
+#: ../shell/e-shell-window-actions.c:1476
+msgid "Forget all remembered passwords"
+msgstr "Oblida totes les contrasenyes recordades"
+
+#: ../shell/e-shell-window-actions.c:1481
+msgid "I_mport..."
+msgstr "I_mporta..."
+
+#: ../shell/e-shell-window-actions.c:1483
+msgid "Import data from other programs"
+msgstr "Importa dades d'altres programes"
+
+#: ../shell/e-shell-window-actions.c:1488
+msgid "New _Window"
+msgstr "_Finestra nova"
+
+#: ../shell/e-shell-window-actions.c:1490
+msgid "Create a new window displaying this view"
+msgstr "Crea una finestra nova que mostre esta visualització"
+
+#: ../shell/e-shell-window-actions.c:1502
+msgid "Available Cate_gories"
+msgstr "C_ategories disponibles"
+
+#: ../shell/e-shell-window-actions.c:1504
+msgid "Manage available categories"
+msgstr "Gestiona les categories disponibles"
+
+#: ../shell/e-shell-window-actions.c:1516
+msgid "_Quick Reference"
+msgstr "Referència rà_pida"
+
+#: ../shell/e-shell-window-actions.c:1518
+msgid "Show Evolution's shortcut keys"
+msgstr "Mostra les dreceres de teclat de l'Evolution"
+
+#: ../shell/e-shell-window-actions.c:1525
+msgid "Exit the program"
+msgstr "Ix del programa"
+
+#: ../shell/e-shell-window-actions.c:1530
+msgid "_Advanced Search..."
+msgstr "Cerca _avançada..."
+
+#: ../shell/e-shell-window-actions.c:1532
+msgid "Construct a more advanced search"
+msgstr "Creeu una cerca més avançada"
+
+#: ../shell/e-shell-window-actions.c:1539
+msgid "Clear the current search parameters"
+msgstr "Neteja els paràmetres actuals de cerca"
+
+#: ../shell/e-shell-window-actions.c:1544
+msgid "_Edit Saved Searches..."
+msgstr "_Edita les cerques alçades..."
+
+#: ../shell/e-shell-window-actions.c:1546
+msgid "Manage your saved searches"
+msgstr "Gestioneu les vostres cerques alçades"
+
+#: ../shell/e-shell-window-actions.c:1553
+msgid "Click here to change the search type"
+msgstr "Feu clic ací per canviar el tipus de cerca"
+
+#: ../shell/e-shell-window-actions.c:1558
+msgid "_Find Now"
+msgstr "_Cerca ara"
+
+#. Block the default Ctrl+F.
+#: ../shell/e-shell-window-actions.c:1560
+msgid "Execute the current search parameters"
+msgstr "Executa els paràmetres actuals de cerca"
+
+#: ../shell/e-shell-window-actions.c:1565
+msgid "_Save Search..."
+msgstr "Al_ça la cerca..."
+
+#: ../shell/e-shell-window-actions.c:1567
+msgid "Save the current search parameters"
+msgstr "Alça els paràmetres de cerca actuals"
+
+#: ../shell/e-shell-window-actions.c:1579
+msgid "Submit _Bug Report..."
+msgstr "En_via un informe d'error..."
+
+#: ../shell/e-shell-window-actions.c:1581
+msgid "Submit a bug report using Bug Buddy"
+msgstr "Envia un informe d'error utilitzant el Bug Buddy"
+
+#: ../shell/e-shell-window-actions.c:1586
+msgid "_Work Offline"
+msgstr "_Treballa fora de línia"
+
+#: ../shell/e-shell-window-actions.c:1588
+msgid "Put Evolution into offline mode"
+msgstr "Posa l'Evolution en mode fora de línia"
+
+#: ../shell/e-shell-window-actions.c:1593
+msgid "_Work Online"
+msgstr "_Treballa en línia"
+
+#: ../shell/e-shell-window-actions.c:1595
+msgid "Put Evolution into online mode"
+msgstr "Posa l'Evolution en mode en línia"
+
+#: ../shell/e-shell-window-actions.c:1623
+msgid "Lay_out"
+msgstr "_Disposició"
+
+#: ../shell/e-shell-window-actions.c:1630
+msgid "_New"
+msgstr "_Nou"
+
+#: ../shell/e-shell-window-actions.c:1637
+msgid "_Search"
+msgstr "_Cerca"
+
+#: ../shell/e-shell-window-actions.c:1644
+msgid "_Switcher Appearance"
+msgstr "Aparença de l'_intercanviador"
+
+#: ../shell/e-shell-window-actions.c:1658
+msgid "_Window"
+msgstr "_Finestra"
+
+#: ../shell/e-shell-window-actions.c:1687
+msgid "Show Side _Bar"
+msgstr "Mostra la _barra lateral"
+
+#: ../shell/e-shell-window-actions.c:1689
+msgid "Show the side bar"
+msgstr "Mostra la barra lateral"
+
+#: ../shell/e-shell-window-actions.c:1695
+msgid "Show _Buttons"
+msgstr "Mostra els _botons"
+
+#: ../shell/e-shell-window-actions.c:1697
+msgid "Show the switcher buttons"
+msgstr "Mostra els botons de commutació"
+
+#: ../shell/e-shell-window-actions.c:1703
+msgid "Show _Status Bar"
+msgstr "Mostra la barra d'e_stat"
+
+#: ../shell/e-shell-window-actions.c:1705
+msgid "Show the status bar"
+msgstr "Mostra la barra d'estat"
+
+#: ../shell/e-shell-window-actions.c:1711
+msgid "Show _Tool Bar"
+msgstr "Mos_tra la barra d'eines"
+
+#: ../shell/e-shell-window-actions.c:1713
+msgid "Show the tool bar"
+msgstr "Mostra la barra d'eines"
+
+#: ../shell/e-shell-window-actions.c:1735
+msgid "_Icons Only"
+msgstr "Només _icones"
+
+#: ../shell/e-shell-window-actions.c:1737
+msgid "Display window buttons with icons only"
+msgstr "Visualitza els botons de la finestra només amb icones"
+
+#: ../shell/e-shell-window-actions.c:1742
+msgid "_Text Only"
+msgstr "Només _text"
+
+#: ../shell/e-shell-window-actions.c:1744
+msgid "Display window buttons with text only"
+msgstr "Visualitza els botons de finestra només amb text"
+
+#: ../shell/e-shell-window-actions.c:1749
+msgid "Icons _and Text"
+msgstr "Icones i _text"
+
+#: ../shell/e-shell-window-actions.c:1751
+msgid "Display window buttons with icons and text"
+msgstr "Visualitza els botons de la finestra amb icones i text"
+
+#: ../shell/e-shell-window-actions.c:1756
+msgid "Tool_bar Style"
+msgstr "Estil de la _barra d'eines"
+
+#: ../shell/e-shell-window-actions.c:1758
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr ""
+"Visualitza els botons de la finestra utilitzant la configuració de "
+"l'escriptori"
+
+#: ../shell/e-shell-window-actions.c:1766
+msgid "Define Views..."
+msgstr "Defineix les visualitzacions..."
+
+#: ../shell/e-shell-window-actions.c:1768
+msgid "Create or edit views"
+msgstr "Crea o edita visualitzacions"
+
+#: ../shell/e-shell-window-actions.c:1773
+msgid "Save Custom View..."
+msgstr "Alça la visualització personalitzada..."
+
+#: ../shell/e-shell-window-actions.c:1775
+msgid "Save current custom view"
+msgstr "Alça la visualització personalitzada actual"
+
+#: ../shell/e-shell-window-actions.c:1782
+msgid "C_urrent View"
+msgstr "Vis_ualització actual"
+
+#: ../shell/e-shell-window-actions.c:1792
+msgid "Custom View"
+msgstr "Visualització personalitzada"
+
+#: ../shell/e-shell-window-actions.c:1794
+msgid "Current view is a customized view"
+msgstr "La visualització actual ha estat personalitzada"
+
+#: ../shell/e-shell-window-actions.c:1804
+msgid "Change the page settings for your current printer"
+msgstr "Configura els paràmetres de pàgina per a la impressora actual"
+
+#: ../shell/e-shell-window-actions.c:2194
+#, c-format
+msgid "Switch to %s"
+msgstr "Commuta a %s"
+
+#: ../shell/e-shell-window-actions.c:2414
+msgid "Execute these search parameters"
+msgstr "Executa estos paràmetres de cerca"
+
+#. Translators: This is used for the main window title.
+#: ../shell/e-shell-window-private.c:584
+#, c-format
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
+
+#: ../shell/e-shell-window.c:442
+msgid "New"
+msgstr "Nou"
+
+#: ../shell/e-shell.c:361
+msgid "Preparing to go offline..."
+msgstr "S'està preparant per treballar fora de línia..."
+
+#: ../shell/e-shell.c:414
+msgid "Preparing to go online..."
+msgstr "S'està preparant per treballar en línia..."
+
+#: ../shell/e-shell.c:476
+msgid "Preparing to quit..."
+msgstr "S'està preparant l'eixida..."
+
+#. Preview/Alpha/Beta version warning message
+#: ../shell/main.c:195
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Evolution groupware suite.\n"
+"\n"
+"This version of Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+"Gràcies per baixar-vos esta versió\n"
+"provisional del paquet de treball en grup Evolution.\n"
+"\n"
+"Esta versió de l'Evolution no està completament acabada. Està\n"
+"pràcticament llesta, però algunes característiques encara no a\n"
+"punt o no funcionen correctament.\n"
+"\n"
+"Si voleu utilitzar una versió estable de l'Evolution vos suggerim que\n"
+"desinstal·leu esta versió, i instal·leu la versió %s.\n"
+"\n"
+"Si trobeu algun error, informeu-nos-en a bugzilla.gnome.org.\n"
+"Este producte es distribueix sense cap garantia i no és adequat\n"
+"per a persones propenses a reaccions violentes.\n"
+"\n"
+"Esperem que gaudiu del resultat de la nostra faena, i esperem\n"
+"ansiosament les vostres contribucions.\n"
+
+#: ../shell/main.c:219
+msgid ""
+"Thanks\n"
+"The Evolution Team\n"
+msgstr ""
+"Gràcies\n"
+"L'equip de l'Evolution\n"
+
+#: ../shell/main.c:226
+msgid "Do not tell me again"
+msgstr "No ho tornes a mostrar"
+
+#. Translators: Do NOT translate the five component
+#. * names, they MUST remain in English!
+#: ../shell/main.c:308
+msgid ""
+"Start Evolution showing the specified component. Available options are "
+"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+msgstr ""
+"Inicia l'Evolution de manera que mostre el component especificat. Les "
+"opcions disponibles són «mail» (correu), «calendar» (calendari), "
+"«contacts» (contactes), «tasks» (tasques) i «memos» (anotacions)"
+
+#: ../shell/main.c:312
+msgid "Apply the given geometry to the main window"
+msgstr "Aplica la geometria especificada a la finestra principal"
+
+#: ../shell/main.c:316
+msgid "Start in online mode"
+msgstr "Inicia en mode en línia"
+
+#: ../shell/main.c:318
+msgid "Ignore network availability"
+msgstr "Ignora la disponibilitat de la xarxa"
+
+#: ../shell/main.c:320
+msgid "Start in \"express\" mode"
+msgstr "Inicia en mode senzill"
+
+#: ../shell/main.c:323
+msgid "Forcibly shut down Evolution"
+msgstr "Força l'aturada de l'Evolution"
+
+#: ../shell/main.c:326
+msgid "Send the debugging output of all components to a file."
+msgstr "Envia l'eixida de depuració de tots els components a un fitxer."
+
+#: ../shell/main.c:328
+msgid "Disable loading of any plugins."
+msgstr "Inhabilita la càrrega de connectors."
+
+#: ../shell/main.c:330
+msgid "Disable preview pane of Mail, Contacts and Tasks."
+msgstr ""
+"Inhabilita la subfinestra de previsualització per al Correu, Contactes i "
+"Tasques."
+
+#: ../shell/main.c:334
+msgid "Import URIs or file names given as rest of arguments."
+msgstr ""
+"Importa els URI o noms de fitxers especificats com la resta d'arguments."
+
+#: ../shell/main.c:336
+msgid "Request a running Evolution process to quit"
+msgstr "Sol·licita que isca a un procés de l'Evolution que s'estiga executant"
+
+#: ../shell/main.c:512 ../shell/main.c:520
+msgid "- The Evolution PIM and Email Client"
+msgstr "El gestor d'informació personal i client de correu de l'Evolution"
+
+#: ../shell/main.c:583
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Run '%s --help' for more information.\n"
+msgstr ""
+"%s: --online i --offline no es poden utilitzar junts.\n"
+"  Executeu l'orde «%s --help» per obtindre més informació.\n"
+
+#: ../shell/main.c:589
+#, c-format
+msgid ""
+"%s: --force-online and --offline cannot be used together.\n"
+"  Run '%s --help' for more information.\n"
+msgstr ""
+"%s: --force-online i --offline no es poden utilitzar junts.\n"
+"  Utilitzeu %s --help per a més informació.\n"
+
+#: ../shell/shell.error.xml.h:1
+msgid "Are you sure you want to forget all remembered passwords?"
+msgstr "Segur que voleu oblidar totes les contrasenyes recordades?"
+
+#: ../shell/shell.error.xml.h:2
+msgid "Cannot upgrade directly from version {0}"
+msgstr "No es pot realitzar l'actualització directament des de la versió {0}"
+
+#: ../shell/shell.error.xml.h:3
+msgid "Continue Anyway"
+msgstr "Continua de totes maneres"
+
+#: ../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."
+msgstr ""
+"L'Evolution ja no permet l'actualització directa des de la versió {0}. De "
+"totes maneres, podeu provar d'actualitzar primer a l'Evolution 2 i després a "
+"l'Evolution 3."
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed."
+msgstr ""
+"Si oblideu les contrasenyes es netejaran totes les contrasenyes recordades. "
+"Se vos tornarà a preguntar la propera vegada que calga."
+
+#: ../shell/shell.error.xml.h:7
+msgid "Quit Now"
+msgstr "Ix ara"
+
+#: ../shell/shell.error.xml.h:8
+msgid "Upgrade from previous version failed:"
+msgstr "Ha fallat l'actualització des de la versió anterior:"
+
+#: ../shell/shell.error.xml.h:9
+msgid "_Forget"
+msgstr "_Oblida"
+
+#: ../shell/shell.error.xml.h:10
+msgid ""
+"{0}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+"{0}\n"
+"\n"
+"Si decidiu continuar, potser no podreu accedir a algunes de les vostres "
+"dades antigues.\n"
+
+#: ../shell/test/e-test-shell-backend.c:56
+msgctxt "New"
+msgid "_Test Item"
+msgstr "Element de p_rova"
+
+#: ../shell/test/e-test-shell-backend.c:58
+msgid "Create a new test item"
+msgstr "Crea un element de prova nou"
+
+#: ../shell/test/e-test-shell-backend.c:66
+msgctxt "New"
+msgid "Test _Source"
+msgstr "_Font de prova"
+
+#: ../shell/test/e-test-shell-backend.c:68
+msgid "Create a new test source"
+msgstr "Crea una font de prova nova"
+
+#: ../smclient/eggdesktopfile.c:166
+#, c-format
+msgid "File is not a valid .desktop file"
+msgstr "El fitxer no és un fitxer .desktop vàlid"
+
+#: ../smclient/eggdesktopfile.c:189
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr "No es reconeix la versió «%s» del fitxer d'escriptori"
+
+#: ../smclient/eggdesktopfile.c:959
+#, c-format
+msgid "Starting %s"
+msgstr "S'està iniciant %s"
+
+#: ../smclient/eggdesktopfile.c:1102
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr "L'aplicació no accepta documents a la línia d'ordes"
+
+#: ../smclient/eggdesktopfile.c:1170
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr "No es reconeix l'opció d'inici: %d"
+
+#: ../smclient/eggdesktopfile.c:1370
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr ""
+"No es poden especificar URI de document a una entrada d'escriptori de tipus "
+"«Type=Link»"
+
+#: ../smclient/eggdesktopfile.c:1391
+#, c-format
+msgid "Not a launchable item"
+msgstr "No és un element que es puga iniciar"
+
+#: ../smclient/eggsmclient.c:226
+msgid "Disable connection to session manager"
+msgstr "Inhabilita la connexió al gestor de sessions"
+
+#: ../smclient/eggsmclient.c:229
+msgid "Specify file containing saved configuration"
+msgstr "Especifiqueu el fitxer que conté la configuració alçada"
+
+#: ../smclient/eggsmclient.c:229
+msgid "FILE"
+msgstr "FITXER"
+
+#: ../smclient/eggsmclient.c:232
+msgid "Specify session management ID"
+msgstr "Especifiqueu l'identificador de gestió de la sessió"
+
+#: ../smclient/eggsmclient.c:232
+msgid "ID"
+msgstr "ID"
+
+#: ../smclient/eggsmclient.c:253
+msgid "Session management options:"
+msgstr "Opcions de la gestió de la sessió:"
+
+#: ../smclient/eggsmclient.c:254
+msgid "Show session management options"
+msgstr "Mostra les opcions de la gestió de la sessió"
+
+#: ../smime/gui/ca-trust-dialog.c:107
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+"El certificat «%s» és un certificat d'entitat de certificació.\n"
+"\n"
+"Editeu la configuració de la confiança:"
+
+#: ../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 ""
+"Atès que confieu en l'autoritat de certificació que ha emés este certificat, "
+"confieu en l'autenticitat d'este certificat tret que ací s'especifique el "
+"contrari"
+
+#: ../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 ""
+"Atès que no confieu en l'autoritat de certificació que ha emés este "
+"certificat, no confieu en l'autenticitat d'este certificat tret que ací "
+"s'especifique el contrari"
+
+#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+msgid "Certificate Name"
+msgstr "Nom del certificat"
+
+#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+msgid "Issued To Organization"
+msgstr "Emés per l'ús de la organització"
+
+#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+msgid "Issued To Organizational Unit"
+msgstr "Emés per l'ús de la unitat organitzacional"
+
+#: ../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
+msgid "Serial Number"
+msgstr "Número de sèrie"
+
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:115
+msgid "Purposes"
+msgstr "Finalitats"
+
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+msgid "Issued By"
+msgstr "Emés per"
+
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:117
+msgid "Issued By Organization"
+msgstr "Emés per la organització"
+
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118
+msgid "Issued By Organizational Unit"
+msgstr "Emés per la unitat organitzacional"
+
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
+msgid "Issued"
+msgstr "Emés"
+
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120
+msgid "Expires"
+msgstr "Venciment"
+
+#: ../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 "Empremta electrònica SHA1"
+
+#: ../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 "Empremta electrònica MD5"
+
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
+msgid "Email Address"
+msgstr "Adreça electrònica"
+
+#: ../smime/gui/certificate-manager.c:575
+msgid "Select a certificate to import..."
+msgstr "Seleccioneu quin certificat s'importarà..."
+
+#: ../smime/gui/certificate-manager.c:588
+msgid "All files"
+msgstr "Tots els fitxers"
+
+#: ../smime/gui/certificate-manager.c:623
+msgid "Failed to import certificate"
+msgstr "Ha fallat la importació del certificat"
+
+#: ../smime/gui/certificate-manager.c:991
+msgid "All PKCS12 files"
+msgstr "Tots els fitxers PKCS12"
+
+#: ../smime/gui/certificate-manager.c:1009
+msgid "All email certificate files"
+msgstr "Tots els fitxers de certificat de correu"
+
+#: ../smime/gui/certificate-manager.c:1027
+msgid "All CA certificate files"
+msgstr "Tots els fitxers de certificat d'entitats certificadores"
+
+#: ../smime/gui/certificate-viewer.c:345
+#, c-format
+msgid "Certificate Viewer: %s"
+msgstr "Visualitzador de certificats: %s"
+
+#: ../smime/gui/component.c:50
+#, c-format
+msgid "Enter the password for '%s'"
+msgstr "Introduïu la contrasenya per a «%s»"
+
+#. we're setting the password initially
+#: ../smime/gui/component.c:76
+msgid "Enter new password for certificate database"
+msgstr "Introduïu una contrasenya nova per a la base de dades de certificats"
+
+#: ../smime/gui/component.c:78
+msgid "Enter new password"
+msgstr "Introduïu la contrasenya nova"
+
+#. FIXME: add serial no, validity date, uses
+#: ../smime/gui/e-cert-selector.c:118
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+"Emés per a:\n"
+"  Assumpte: %s\n"
+
+#: ../smime/gui/e-cert-selector.c:119
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+"Emés per:\n"
+"  Assumpte: %s\n"
+
+#: ../smime/gui/e-cert-selector.c:172
+msgid "Select certificate"
+msgstr "Seleccioneu el certificat"
+
+#: ../smime/gui/smime-ui.ui.h:1
+msgid "<Not Part of Certificate>"
+msgstr "<No és una part del certificat>"
+
+#: ../smime/gui/smime-ui.ui.h:2
+msgid "Authorities"
+msgstr "Entitats certificadores"
+
+#: ../smime/gui/smime-ui.ui.h:3
+msgid "Backup _All"
+msgstr "Fes una còpia de seguretat de to_ts"
+
+#: ../smime/gui/smime-ui.ui.h:4
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+"Abans de confiar en esta autoritat certificadora per a qualsevol propòsit, "
+"n'hauríeu d'examinar el certificat i la seua política i procediments (si "
+"estan disponibles)."
+
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1097
+msgid "Certificate"
+msgstr "Certificat"
+
+#: ../smime/gui/smime-ui.ui.h:6
+msgid "Certificate Authority Trust"
+msgstr "Confiança en l'entitat certificadora"
+
+#: ../smime/gui/smime-ui.ui.h:7
+msgid "Certificate Fields"
+msgstr "Camps del certificat"
+
+#: ../smime/gui/smime-ui.ui.h:8
+msgid "Certificate Hierarchy"
+msgstr "Jerarquia del certificat"
+
+#: ../smime/gui/smime-ui.ui.h:9
+msgid "Certificate details"
+msgstr "Detalls del certificat"
+
+#: ../smime/gui/smime-ui.ui.h:10
+msgid "Certificates Table"
+msgstr "Taula de certificats"
+
+#: ../smime/gui/smime-ui.ui.h:11
+msgid "Common Name (CN)"
+msgstr "Nom comú (CN)"
+
+#: ../smime/gui/smime-ui.ui.h:12
+msgid "Contact Certificates"
+msgstr "Certificats dels contactes"
+
+#: ../smime/gui/smime-ui.ui.h:14
+msgid "Do not trust the authenticity of this certificate"
+msgstr "No confies en l'autenticitat d'estos certificats"
+
+#: ../smime/gui/smime-ui.ui.h:15
+msgid "Email Certificate Trust Settings"
+msgstr "Configuració de la confiança en el certificat de correu"
+
+#: ../smime/gui/smime-ui.ui.h:16
+msgid "Email Recipient Certificate"
+msgstr "Certificat del destinatari de correu electrònic"
+
+#: ../smime/gui/smime-ui.ui.h:17
+msgid "Email Signer Certificate"
+msgstr "Certificat del signador de correu electrònic"
+
+#: ../smime/gui/smime-ui.ui.h:18
+msgid "Expires On"
+msgstr "Venç el"
+
+#: ../smime/gui/smime-ui.ui.h:19
+msgid "Field Value"
+msgstr "Valor del camp"
+
+#: ../smime/gui/smime-ui.ui.h:20
+msgid "Fingerprints"
+msgstr "Empremtes electròniques"
+
+#: ../smime/gui/smime-ui.ui.h:24
+msgid "Issued On"
+msgstr "Emés el"
+
+#: ../smime/gui/smime-ui.ui.h:25
+msgid "Issued To"
+msgstr "Emés per a"
+
+#: ../smime/gui/smime-ui.ui.h:27
+msgid "Organization (O)"
+msgstr "Organització (O)"
+
+#: ../smime/gui/smime-ui.ui.h:28
+msgid "Organizational Unit (OU)"
+msgstr "Unitat organitzacional (OU)"
+
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:829
+msgid "SSL Client Certificate"
+msgstr "Certificat SSL del client"
+
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:833
+msgid "SSL Server Certificate"
+msgstr "Certificat SSL del servidor"
+
+#: ../smime/gui/smime-ui.ui.h:33
+msgid "This certificate has been verified for the following uses:"
+msgstr "S'ha verificat el següent certificat per als següents usos:"
+
+#: ../smime/gui/smime-ui.ui.h:34
+msgid "Trust the authenticity of this certificate"
+msgstr "Confia en l'autenticitat d'este certificat"
+
+#: ../smime/gui/smime-ui.ui.h:35
+msgid "Trust this CA to identify email users."
+msgstr ""
+"Confia en esta entitat certificadora per identificar usuaris de correu "
+"electrònic."
+
+#: ../smime/gui/smime-ui.ui.h:36
+msgid "Trust this CA to identify software developers."
+msgstr ""
+"Confia en esta entitat certificadora per identificar desenvolupadors de "
+"programari."
+
+#: ../smime/gui/smime-ui.ui.h:37
+msgid "Trust this CA to identify websites."
+msgstr "Confia en esta entitat certificadora per identificar llocs web."
+
+#: ../smime/gui/smime-ui.ui.h:38
+msgid "Validity"
+msgstr "Validesa"
+
+#: ../smime/gui/smime-ui.ui.h:39
+msgid "You have certificates from these organizations that identify you:"
+msgstr "Teniu certificats d'estes organitzacions que vos identifiquen:"
+
+#: ../smime/gui/smime-ui.ui.h:40
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
+msgstr ""
+"Teniu certificats en un fitxer que identifiquen estes entitats "
+"certificadores:"
+
+#: ../smime/gui/smime-ui.ui.h:41
+msgid "You have certificates on file that identify these people:"
+msgstr "Teniu certificats en un fitxer que identifiquen estes persones:"
+
+#: ../smime/gui/smime-ui.ui.h:42
+msgid "Your Certificates"
+msgstr "Els vostres certificats"
+
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:44
+msgid "_Backup"
+msgstr "Fes-ne una còpia de _seguretat"
+
+#: ../smime/gui/smime-ui.ui.h:45
+msgid "_Edit CA Trust"
+msgstr "_Edita la confiança en l'entitat certificadora"
+
+#: ../smime/lib/e-cert-db.c:912
+msgid "Certificate already exists"
+msgstr "El certificat ja existeix"
+
+#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#. x509 certificate usage types
+#: ../smime/lib/e-cert.c:417
+msgid "Sign"
+msgstr "Signa"
+
+#: ../smime/lib/e-cert.c:418
+msgid "Encrypt"
+msgstr "Xifra"
+
+#: ../smime/lib/e-cert.c:530
+msgid "Version"
+msgstr "Versió"
+
+#: ../smime/lib/e-cert.c:545
+msgid "Version 1"
+msgstr "Versió 1"
+
+#: ../smime/lib/e-cert.c:548
+msgid "Version 2"
+msgstr "Versió 2"
+
+#: ../smime/lib/e-cert.c:551
+msgid "Version 3"
+msgstr "Versió 3"
+
+#: ../smime/lib/e-cert.c:634
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr "PKCS #1 MD2 amb xifratge RSA"
+
+#: ../smime/lib/e-cert.c:637
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr "PKCS #1 MD5 amb xifratge RSA"
+
+#: ../smime/lib/e-cert.c:640
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr "PKCS #1 SHA-1 amb xifratge RSA"
+
+#: ../smime/lib/e-cert.c:643
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-256 amb encriptació RSA"
+
+#: ../smime/lib/e-cert.c:646
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-384 amb encriptació RSA"
+
+#: ../smime/lib/e-cert.c:649
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-512 amb encriptació RSA"
+
+#: ../smime/lib/e-cert.c:676
+msgid "PKCS #1 RSA Encryption"
+msgstr "Xifratge PKCS #1 RSA"
+
+#: ../smime/lib/e-cert.c:679
+msgid "Certificate Key Usage"
+msgstr "Ús de la clau de certificat"
+
+#: ../smime/lib/e-cert.c:682
+msgid "Netscape Certificate Type"
+msgstr "Tipus de certificat del Netscape"
+
+#: ../smime/lib/e-cert.c:685
+msgid "Certificate Authority Key Identifier"
+msgstr "Identificador de clau de l'entitat certificadora"
+
+#: ../smime/lib/e-cert.c:697
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr "Identificador de l'objecte (%s)"
+
+#: ../smime/lib/e-cert.c:749
+msgid "Algorithm Identifier"
+msgstr "Identificador de l'algorisme"
+
+#: ../smime/lib/e-cert.c:757
+msgid "Algorithm Parameters"
+msgstr "Paràmetres de l'algorisme"
+
+#: ../smime/lib/e-cert.c:779
+msgid "Subject Public Key Info"
+msgstr "Informació de clau pública de l'assumpte"
+
+#: ../smime/lib/e-cert.c:784
+msgid "Subject Public Key Algorithm"
+msgstr "Algorisme de clau pública de l'assumpte"
+
+#: ../smime/lib/e-cert.c:799
+msgid "Subject's Public Key"
+msgstr "Clau pública de l'assumpte"
+
+#: ../smime/lib/e-cert.c:820 ../smime/lib/e-cert.c:870
+msgid "Error: Unable to process extension"
+msgstr "S'ha produït un error: no es pot processar l'extensió"
+
+#: ../smime/lib/e-cert.c:841 ../smime/lib/e-cert.c:853
+msgid "Object Signer"
+msgstr "Signador de l'objecte"
+
+#: ../smime/lib/e-cert.c:845
+msgid "SSL Certificate Authority"
+msgstr "Entitat certificadora de l'SSL"
+
+#: ../smime/lib/e-cert.c:849
+msgid "Email Certificate Authority"
+msgstr "Entitat certificadora del correu electrònic"
+
+#: ../smime/lib/e-cert.c:878
+msgid "Signing"
+msgstr "Signatura"
+
+# FIXME: si algú vol canviar-ho, aquí hi ha un bon article
+# sobre el tema: http://www.firstmonday.org/issues/issue5_8/mccullagh/
+# (dpm)
+#: ../smime/lib/e-cert.c:882
+msgid "Non-repudiation"
+msgstr "Propietat de no refús"
+
+#: ../smime/lib/e-cert.c:886
+msgid "Key Encipherment"
+msgstr "Xifrat de clau"
+
+#: ../smime/lib/e-cert.c:890
+msgid "Data Encipherment"
+msgstr "Xifrat de dades"
+
+#: ../smime/lib/e-cert.c:894
+msgid "Key Agreement"
+msgstr "Acord sobre la clau"
+
+#: ../smime/lib/e-cert.c:898
+msgid "Certificate Signer"
+msgstr "Signador del certificat"
+
+#: ../smime/lib/e-cert.c:902
+msgid "CRL Signer"
+msgstr "Signador CRL"
+
+#: ../smime/lib/e-cert.c:951
+msgid "Critical"
+msgstr "És crític"
+
+#: ../smime/lib/e-cert.c:953 ../smime/lib/e-cert.c:956
+msgid "Not Critical"
+msgstr "No és crític"
+
+#: ../smime/lib/e-cert.c:977
+msgid "Extensions"
+msgstr "Extensions"
+
+#. Translators: This string is used in Certificate
+#. * details for fields like Issuer or Subject, which
+#. * shows the field name on the left and its respective
+#. * value on the right, both as stored in the
+#. * certificate itself.  You probably do not need to
+#. * 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
+#, c-format
+msgid "%s = %s"
+msgstr "%s = %s"
+
+#: ../smime/lib/e-cert.c:1111 ../smime/lib/e-cert.c:1234
+msgid "Certificate Signature Algorithm"
+msgstr "Algorisme de la signatura del certificat"
+
+#: ../smime/lib/e-cert.c:1120
+msgid "Issuer"
+msgstr "Emissor"
+
+#: ../smime/lib/e-cert.c:1175
+msgid "Issuer Unique ID"
+msgstr "Identificador únic de l'emissor"
+
+#: ../smime/lib/e-cert.c:1194
+msgid "Subject Unique ID"
+msgstr "Identificador únic de l'assumpte"
+
+#: ../smime/lib/e-cert.c:1240
+msgid "Certificate Signature Value"
+msgstr "Valor de la signatura de certificat"
+
+#: ../smime/lib/e-pkcs12.c:256
+msgid "PKCS12 File Password"
+msgstr "Fitxer de contrasenya PKCS12"
+
+#: ../smime/lib/e-pkcs12.c:257
+msgid "Enter password for PKCS12 file:"
+msgstr "Introduïu la contrasenya per al fitxer PKCS12:"
+
+#: ../smime/lib/e-pkcs12.c:363
+msgid "Imported Certificate"
+msgstr "Certificat importat"
+
+#: ../views/addressbook/galview.xml.h:1
+msgid "By _Company"
+msgstr "Per e_mpresa"
+
+#: ../views/addressbook/galview.xml.h:2
+msgid "_Address Cards"
+msgstr "T_argetes d'adreça"
+
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "Visua_lització de llista"
+
+#: ../views/calendar/galview.xml.h:1
+msgid "W_eek View"
+msgstr "Visualització d_e setmana"
+
+#: ../views/calendar/galview.xml.h:2
+msgid "_Day View"
+msgstr "Visualització _de dia"
+
+#: ../views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr "Visualització de _mes"
+
+#: ../views/calendar/galview.xml.h:5
+msgid "_Work Week View"
+msgstr "Visualització de _setmana laborable"
+
+#: ../views/mail/galview.xml.h:1
+msgid "As Sent Folder for Wi_de View"
+msgstr "Com a carpeta _d'enviats per a la visualització ampla"
+
+#: ../views/mail/galview.xml.h:2
+msgid "As _Sent Folder"
+msgstr "Com a _carpeta d'enviat"
+
+#: ../views/mail/galview.xml.h:3
+msgid "By S_tatus"
+msgstr "Per l'es_tat"
+
+#: ../views/mail/galview.xml.h:4
+msgid "By Se_nder"
+msgstr "Pel remite_nt"
+
+#: ../views/mail/galview.xml.h:5
+msgid "By Su_bject"
+msgstr "Per l'assum_pte"
+
+#: ../views/mail/galview.xml.h:6
+msgid "By _Follow Up Flag"
+msgstr "Pel sen_yalador de respondre"
+
+#: ../views/mail/galview.xml.h:7
+msgid "For _Wide View"
+msgstr "Per a _visualització ampla"
+
+#: ../views/mail/galview.xml.h:8
+msgid "_Messages"
+msgstr "_Missatges"
+
+#: ../views/memos/galview.xml.h:1
+msgid "_Memos"
+msgstr "A_notacions"
+
+#: ../views/tasks/galview.xml.h:1
+msgid "With _Due Date"
+msgstr "Amb _data de venciment"
+
+#: ../views/tasks/galview.xml.h:2
+msgid "With _Status"
+msgstr "Amb e_stat"
+
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../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:789
+msgid "UTC"
+msgstr "UTC"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
+msgid "Select a Time Zone"
+msgstr "Seleccioneu un fus horari"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
+msgid "Time Zones"
+msgstr "Fusos horaris"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
+msgid "Timezone drop-down combination box"
+msgstr "Quadre combinat per seleccionar el fus horari"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+"Feu servir el botó esquerre del ratolí per ampliar una àrea del mapa i "
+"seleccioneu un fus horari.\n"
+"Feu servir el botó dret del ratolí per desfer l'ampliació anterior."
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "_Selecció"
+
+#: ../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 "Defineix les visualitzacions per a %s"
+
+#: ../widgets/menus/gal-define-views-dialog.c:367
+#: ../widgets/menus/gal-define-views-dialog.c:369
+msgid "Define Views"
+msgstr "Defineix les visualitzacions"
+
+#: ../widgets/menus/gal-define-views.ui.h:2
+#, no-c-format
+msgid "Define Views for \"%s\""
+msgstr "Defineix les visualitzacions per a «%s»"
+
+# gal/menus/gal-view-factory-etable.c:38
+#: ../widgets/menus/gal-view-factory-etable.c:111
+msgid "Table"
+msgstr "Taula"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+msgid "Save Current View"
+msgstr "Alça la visualització actual"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "_Crea una visualització nova"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "_Reemplaça la visualització actual"
+
+# gal/menus/gal-define-views.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.c:108
+msgid "Define New View"
+msgstr "Defineix una visualització nova"
+
+#: ../widgets/menus/gal-view-new-dialog.ui.h:1
+msgid "Name of new view:"
+msgstr "Nom de la visualització nova:"
+
+#: ../widgets/menus/gal-view-new-dialog.ui.h:2
+msgid "Type of View"
+msgstr "Tipus de visualització"
+
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
+msgid "Type of view:"
+msgstr "Tipus de visualització:"
+
+#: ../widgets/misc/e-account-manager.c:383
+msgid "Use default Evolution _sort order for accounts"
+msgstr ""
+
+#: ../widgets/misc/e-account-manager.c:438
+msgid "De_fault"
+msgstr "_Per defecte"
+
+#: ../widgets/misc/e-account-tree-view.c:404
+msgid "Account Name"
+msgstr "Nom del compte"
+
+#: ../widgets/misc/e-account-tree-view.c:435
+msgid "Protocol"
+msgstr "Protocol"
+
+#: ../widgets/misc/e-attachment-dialog.c:308
+msgid "Attachment Properties"
+msgstr "Propietats del fitxer adjunt"
+
+#: ../widgets/misc/e-attachment-dialog.c:330
+msgid "_Filename:"
+msgstr "Nom del f_itxer:"
+
+#: ../widgets/misc/e-attachment-dialog.c:365
+msgid "MIME Type:"
+msgstr "Tipus MIME:"
+
+#: ../widgets/misc/e-attachment-dialog.c:373
+#: ../widgets/misc/e-attachment-store.c:559
+msgid "_Suggest automatic display of attachment"
+msgstr "_Suggereix visualitzar l'adjunció automàticament"
+
+#: ../widgets/misc/e-attachment-handler-image.c:95
+msgid "Could not set as background"
+msgstr "No s'ha pogut establir com a fons de pantalla"
+
+#: ../widgets/misc/e-attachment-handler-image.c:145
+msgid "Set as _Background"
+msgstr "De_fineix-la com a fons"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:93
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "No s'ha pogut enviar l'adjunció"
+msgstr[1] "No s'han pogut enviar les adjuncions"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:135
+msgid "_Send To..."
+msgstr "En_via a..."
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:137
+msgid "Send the selected attachments somewhere"
+msgstr "Envia les adjuncions seleccionades"
+
+#: ../widgets/misc/e-attachment-icon-view.c:162
+#: ../widgets/misc/e-attachment-tree-view.c:547
+msgid "Loading"
+msgstr "S'està carregant"
+
+#: ../widgets/misc/e-attachment-icon-view.c:174
+#: ../widgets/misc/e-attachment-tree-view.c:559
+msgid "Saving"
+msgstr "S'està desant"
+
+#: ../widgets/misc/e-attachment-paned.c:97
+msgid "Hide Attachment _Bar"
+msgstr "Amaga la _barra d'adjuncions"
+
+#: ../widgets/misc/e-attachment-paned.c:99
+#: ../widgets/misc/e-attachment-paned.c:639
+msgid "Show Attachment _Bar"
+msgstr "Mostra la barra _d'adjuncions"
+
+#: ../widgets/misc/e-attachment-store.c:547
+msgid "Add Attachment"
+msgstr "Afig una adjunció"
+
+#: ../widgets/misc/e-attachment-store.c:550
+msgid "A_ttach"
+msgstr "Adjun_ta"
+
+#: ../widgets/misc/e-attachment-store.c:613
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "Alça l'adjunció"
+msgstr[1] "Alça les adjuncions"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment-store.c:642
+#: ../widgets/misc/e-attachment.c:1810 ../widgets/misc/e-attachment.c:2352
+msgid "attachment.dat"
+msgstr "adjuncio.dat"
+
+#: ../widgets/misc/e-attachment-view.c:404
+msgid "Open With Other Application..."
+msgstr "Obri amb una altra aplicació..."
+
+#: ../widgets/misc/e-attachment-view.c:411
+msgid "S_ave All"
+msgstr "Al_ça'ls tots"
+
+#: ../widgets/misc/e-attachment-view.c:437
+msgid "A_dd Attachment..."
+msgstr "_Afig una adjunció..."
+
+#: ../widgets/misc/e-attachment-view.c:461
+msgid "_Hide"
+msgstr "A_maga"
+
+#: ../widgets/misc/e-attachment-view.c:468
+msgid "Hid_e All"
+msgstr "Ama_ga'ls tots"
+
+#: ../widgets/misc/e-attachment-view.c:475
+msgid "_View Inline"
+msgstr "_Visualitza inserit"
+
+#: ../widgets/misc/e-attachment-view.c:482
+msgid "Vie_w All Inline"
+msgstr "Vi_sualitza'ls tots inserits"
+
+#: ../widgets/misc/e-attachment-view.c:803
+#, c-format
+msgid "Open With \"%s\""
+msgstr "Obri amb «%s»"
+
+#: ../widgets/misc/e-attachment-view.c:806
+#, c-format
+msgid "Open this attachment in %s"
+msgstr "Obri esta adjunció amb %s"
+
+#. To Translators: This text is set as a description of an attached
+#. * 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:998
+msgid "Attached message"
+msgstr "Missatge adjunt"
+
+#: ../widgets/misc/e-attachment.c:1853 ../widgets/misc/e-attachment.c:2654
+msgid "A load operation is already in progress"
+msgstr "Ja s'està efectuant una operació de càrrega"
+
+#: ../widgets/misc/e-attachment.c:1861 ../widgets/misc/e-attachment.c:2662
+msgid "A save operation is already in progress"
+msgstr "Ja s'està efectuant una operació de desament"
+
+#: ../widgets/misc/e-attachment.c:1953
+#, c-format
+msgid "Could not load '%s'"
+msgstr "No s'ha pogut carregar «%s»"
+
+#: ../widgets/misc/e-attachment.c:1956
+#, c-format
+msgid "Could not load the attachment"
+msgstr "No s'ha pogut carregar l'adjunció"
+
+#: ../widgets/misc/e-attachment.c:2232
+#, c-format
+msgid "Could not open '%s'"
+msgstr "No s'ha pogut obrir «%s»"
+
+#: ../widgets/misc/e-attachment.c:2235
+#, c-format
+msgid "Could not open the attachment"
+msgstr "No s'ha pogut obrir l'adjunció"
+
+#: ../widgets/misc/e-attachment.c:2670
+msgid "Attachment contents not loaded"
+msgstr "No s'ha carregat el contingut de l'adjunció"
+
+#: ../widgets/misc/e-attachment.c:2746
+#, c-format
+msgid "Could not save '%s'"
+msgstr "No s'ha pogut alçar «%s»"
+
+#: ../widgets/misc/e-attachment.c:2749
+#, c-format
+msgid "Could not save the attachment"
+msgstr "No s'ha pogut alçar l'adjunció"
+
+#. 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:387
+msgid "Ctrl-click to open a link"
+msgstr "Premeu la tecla Ctrl i feu clic al mateix temps per obrir un enllaç"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../widgets/misc/e-calendar-item.c:1249
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../widgets/misc/e-calendar.c:226
+msgid "Month Calendar"
+msgstr "Calendari mensual"
+
+#: ../widgets/misc/e-charset-combo-box.c:96
+msgid "Character Encoding"
+msgstr "Codificació dels caràcters"
+
+#: ../widgets/misc/e-charset-combo-box.c:119
+msgid "Enter the character set to use"
+msgstr "Introduïu el joc de caràcters a utilitzar"
+
+#: ../widgets/misc/e-charset-combo-box.c:339
+msgid "Other..."
+msgstr "Altres..."
+
+#: ../widgets/misc/e-contact-map-window.c:355
+msgid "Contacts Map"
+msgstr "Mapa de contactes"
+
+#: ../widgets/misc/e-dateedit.c:501
+msgid "Date and Time"
+msgstr "Data i hora"
+
+#: ../widgets/misc/e-dateedit.c:522
+msgid "Text entry to input date"
+msgstr "Entrada de text per a la data"
+
+#: ../widgets/misc/e-dateedit.c:544
+msgid "Click this button to show a calendar"
+msgstr "Feu clic a este botó per mostrar un calendari"
+
+#: ../widgets/misc/e-dateedit.c:591
+msgid "Drop-down combination box to select time"
+msgstr "Quadre combinat per seleccionar l'hora"
+
+#: ../widgets/misc/e-dateedit.c:663
+msgid "No_w"
+msgstr "A_ra"
+
+#: ../widgets/misc/e-dateedit.c:669
+msgid "_Today"
+msgstr "A_vui"
+
+#. Note that we don't show this here, since by default a 'None' date
+#. * is not permitted.
+#: ../widgets/misc/e-dateedit.c:677
+msgid "_None"
+msgstr "_Cap"
+
+#. Translators: "None" for date field of a date edit, shown when
+#. * there is no date set.
+#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1921
+msgctxt "date"
+msgid "None"
+msgstr "Cap"
+
+#: ../widgets/misc/e-dateedit.c:1815
+msgid "Invalid Date Value"
+msgstr "El valor de la data no és vàlid"
+
+#: ../widgets/misc/e-dateedit.c:1859
+msgid "Invalid Time Value"
+msgstr "El valor de l'hora no és vàlid"
+
+#: ../widgets/misc/e-import-assistant.c:249
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr ""
+"Trieu el fitxer que vulgueu importar a l'Evolution i seleccioneu-ne el tipus "
+"de la llista."
+
+#: ../widgets/misc/e-import-assistant.c:266
+msgid "F_ilename:"
+msgstr "Nom del f_itxer:"
+
+#: ../widgets/misc/e-import-assistant.c:276
+msgid "Select a file"
+msgstr "Seleccioneu un fitxer"
+
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
+msgid "File _type:"
+msgstr "_Tipus de fitxer:"
+
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:913
+msgid "Choose the destination for this import"
+msgstr "Trieu la destinació per a esta importació"
+
+#: ../widgets/misc/e-import-assistant.c:358
+msgid "Choose the type of importer to run:"
+msgstr "Trieu el tipus d'importador a executar:"
+
+#: ../widgets/misc/e-import-assistant.c:366
+msgid "Import data and settings from _older programs"
+msgstr "Importador de les dades i la configuració de pr_ogrames vells"
+
+#: ../widgets/misc/e-import-assistant.c:374
+msgid "Import a _single file"
+msgstr "Impo_rtador de fitxers individuals"
+
+#: ../widgets/misc/e-import-assistant.c:526
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"L'Evolution ha cercat configuracions del Pine, el Netscape, l'Elm i "
+"l'iCalendar per importar-les. No s'ha trobat cap configuració que es puga "
+"importar. Si ho voleu tornar a intentar, feu clic al botó «Arrere»."
+
+#. Install a custom "Cancel Import" button.
+#: ../widgets/misc/e-import-assistant.c:768
+msgid "_Cancel Import"
+msgstr "Cancel·la la _importació"
+
+#: ../widgets/misc/e-import-assistant.c:912
+msgid "Preview data to be imported"
+msgstr "Previsualitza les dades a importar"
+
+#: ../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 "Importació de dades"
+
+#: ../widgets/misc/e-import-assistant.c:926
+msgid "Select what type of file you want to import from the list."
+msgstr "Seleccioneu a la llista quin tipus de fitxer voleu importar."
+
+#: ../widgets/misc/e-import-assistant.c:1266
+#: ../widgets/misc/e-import-assistant.c:1301
+msgid "Evolution Import Assistant"
+msgstr "Auxiliar d'importació de l'Evolution"
+
+#: ../widgets/misc/e-import-assistant.c:1283
+#: ../widgets/misc/e-import-assistant.c:1339
+msgid "Import Location"
+msgstr "Importa una ubicació"
+
+#: ../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."
+msgstr ""
+"Vos donem la benvinguda a l'auxiliar d'importació de l'Evolution.\n"
+"Este auxiliar vos guiarà a través dels passos necessaris per importar "
+"fitxers externs a l'Evolution."
+
+#: ../widgets/misc/e-import-assistant.c:1311
+msgid "Importer Type"
+msgstr "Tipus d'importador"
+
+#: ../widgets/misc/e-import-assistant.c:1321
+msgid "Select Information to Import"
+msgstr "Seleccioneu la informació a importar"
+
+#: ../widgets/misc/e-import-assistant.c:1330
+msgid "Select a File"
+msgstr "Seleccioneu un fitxer"
+
+#: ../widgets/misc/e-import-assistant.c:1347
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr ""
+"Feu clic a «Aplica» per iniciar la importació del fitxer a l'Evolution."
+
+#: ../widgets/misc/e-map.c:883
+msgid "World Map"
+msgstr "Mapa del món"
+
+#: ../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 ""
+"Mapa interactiu per seleccionar el fus horari amb el ratolí. Els usuaris amb "
+"teclat haurien de seleccionar el fus horari amb el quadre combinat de sota."
+
+#: ../widgets/misc/e-online-button.c:27
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr ""
+"L'Evolution està en línia. Feu clic en este botó per treballar fora de línia."
+
+#: ../widgets/misc/e-online-button.c:30
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr ""
+"L'Evolution està fora de línia. Feu clic en este botó per treballar en línia."
+
+#: ../widgets/misc/e-online-button.c:33
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr ""
+"L'Evolution està fora de línia. Feu clic en este botó per treballar en línia."
+
+#: ../widgets/misc/e-preferences-window.c:279
+msgid "Evolution Preferences"
+msgstr "Preferències de l'Evolution"
+
+#: ../widgets/misc/e-search-bar.c:81
+#, c-format
+msgid "Matches: %d"
+msgstr "Concordances: %d"
+
+#: ../widgets/misc/e-search-bar.c:563
+msgid "Close the find bar"
+msgstr "Tanca la barra de cerca"
+
+#: ../widgets/misc/e-search-bar.c:571
+msgid "Fin_d:"
+msgstr "Ce_rca:"
+
+#: ../widgets/misc/e-search-bar.c:583
+msgid "Clear the search"
+msgstr "Neteja la cerca"
+
+#: ../widgets/misc/e-search-bar.c:607
+msgid "_Previous"
+msgstr "_Anterior"
+
+#: ../widgets/misc/e-search-bar.c:613
+msgid "Find the previous occurrence of the phrase"
+msgstr "Cerca l'ocurrència anterior de la frase"
+
+#: ../widgets/misc/e-search-bar.c:626
+msgid "_Next"
+msgstr "_Següent"
+
+#: ../widgets/misc/e-search-bar.c:632
+msgid "Find the next occurrence of the phrase"
+msgstr "Cerca l'ocurrència posterior de la frase"
+
+#: ../widgets/misc/e-search-bar.c:645
+msgid "Mat_ch case"
+msgstr "Concord_ança de majúscules i minúscules"
+
+#: ../widgets/misc/e-search-bar.c:673
+msgid "Reached bottom of page, continued from top"
+msgstr "S'ha arribat al final de la pàgina, es continua des de l'inici"
+
+#: ../widgets/misc/e-search-bar.c:695
+msgid "Reached top of page, continued from bottom"
+msgstr "S'ha arribat a l'inici de la pàgina, es continua des del final"
+
+#: ../widgets/misc/e-send-options.c:552
+msgid "When de_leted:"
+msgstr "_En suprimir:"
+
+#: ../widgets/misc/e-send-options.ui.h:1
+msgid "A_uto-delete sent item"
+msgstr "S_uprimeix l'element enviat automàticament"
+
+#: ../widgets/misc/e-send-options.ui.h:3
+msgid "Creat_e a sent item to track information"
+msgstr "Cr_ea un element enviat per seguir la informació"
+
+#: ../widgets/misc/e-send-options.ui.h:4
+msgid "Deli_vered and opened"
+msgstr "Entre_gat i obert"
+
+#: ../widgets/misc/e-send-options.ui.h:5
+msgid "Delivery Options"
+msgstr "Opcions d'entrega"
+
+#: ../widgets/misc/e-send-options.ui.h:6
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Fins a"
+
+#: ../widgets/misc/e-send-options.ui.h:7
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "D_esprés de"
+
+#: ../widgets/misc/e-send-options.ui.h:8
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "dies"
+
+#: ../widgets/misc/e-send-options.ui.h:9
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "Di_ns del termini"
+
+#: ../widgets/misc/e-send-options.ui.h:10
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "dies"
+
+#: ../widgets/misc/e-send-options.ui.h:11
+msgid "For Your Eyes Only"
+msgstr "Només per a vós"
+
+#: ../widgets/misc/e-send-options.ui.h:12
+msgid "Gene_ral Options"
+msgstr "Opcions gene_rals"
+
+#: ../widgets/misc/e-send-options.ui.h:15
+msgid "Mail Receipt"
+msgstr "Rebut de correu"
+
+#: ../widgets/misc/e-send-options.ui.h:17
+msgid "Proprietary"
+msgstr "De propietat"
+
+#: ../widgets/misc/e-send-options.ui.h:18
+msgid "R_eply requested"
+msgstr "S'ha d_emanat resposta"
+
+#: ../widgets/misc/e-send-options.ui.h:20
+msgid "Return Notification"
+msgstr "Notificació de retorn"
+
+#: ../widgets/misc/e-send-options.ui.h:21
+msgid "Secret"
+msgstr "Secret"
+
+#: ../widgets/misc/e-send-options.ui.h:23
+msgid "Sta_tus Tracking"
+msgstr "Seguimen_t de l'estat"
+
+#: ../widgets/misc/e-send-options.ui.h:24
+msgid "Standard"
+msgstr "Estàndard"
+
+#: ../widgets/misc/e-send-options.ui.h:25
+msgid "Status Tracking"
+msgstr "Seguiment de l'estat"
+
+#: ../widgets/misc/e-send-options.ui.h:26
+msgid "Top Secret"
+msgstr "Alt secret"
+
+#: ../widgets/misc/e-send-options.ui.h:28
+msgid "When acce_pted:"
+msgstr "En acce_ptar:"
+
+#: ../widgets/misc/e-send-options.ui.h:29
+msgid "When co_mpleted:"
+msgstr "En co_mpletar:"
+
+#: ../widgets/misc/e-send-options.ui.h:30
+msgid "When decli_ned:"
+msgstr "E_n rebutjar:"
+
+#: ../widgets/misc/e-send-options.ui.h:31
+msgid "_All information"
+msgstr "Tota la inform_ació"
+
+#: ../widgets/misc/e-send-options.ui.h:32
+msgid "_Classification:"
+msgstr "_Classificació:"
+
+#: ../widgets/misc/e-send-options.ui.h:33
+msgid "_Delay message delivery"
+msgstr "Retarda l'entrega _del missatge"
+
+#: ../widgets/misc/e-send-options.ui.h:34
+msgid "_Delivered"
+msgstr "_Entregat"
+
+#: ../widgets/misc/e-send-options.ui.h:36
+msgid "_Set expiration date"
+msgstr "E_stableix la data de venciment"
+
+#: ../widgets/misc/e-send-options.ui.h:37
+msgid "_When convenient"
+msgstr "_Quan convingui"
+
+#: ../widgets/misc/e-send-options.ui.h:38
+msgid "_When opened:"
+msgstr "En _obrir:"
+
+#. Translators: Used in send options dialog
+#: ../widgets/misc/e-send-options.ui.h:40
+msgctxt "send-options"
+msgid "None"
+msgstr "Cap"
+
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:564
+#: ../widgets/misc/e-signature-manager.c:372
+#: ../widgets/misc/e-signature-script-dialog.c:219
+msgid "Unnamed"
+msgstr "Sense nom"
+
+#: ../widgets/misc/e-signature-editor.c:214
+msgid "_Save and Close"
+msgstr "Al_ça i tanca"
+
+#: ../widgets/misc/e-signature-editor.c:431
+msgid "Edit Signature"
+msgstr "Edita la signatura"
+
+#: ../widgets/misc/e-signature-editor.c:446
+msgid "_Signature Name:"
+msgstr "Nom de la _signatura:"
+
+#: ../widgets/misc/e-signature-manager.c:317
+msgid "Add Signature Script"
+msgstr "Afig un script de signatura"
+
+#: ../widgets/misc/e-signature-manager.c:382
+msgid "Edit Signature Script"
+msgstr "Edita l'script de signatura"
+
+#: ../widgets/misc/e-signature-manager.c:602
+msgid "Add _Script"
+msgstr "Afig un _script"
+
+#: ../widgets/misc/e-signature-script-dialog.c:268
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"La eixida d'este script serà utilitzada per a la vostra signatura.\n"
+"El nom que especifiqueu només s'utilitzarà per mostrar-lo."
+
+#: ../widgets/misc/e-signature-script-dialog.c:313
+msgid "S_cript:"
+msgstr "_Script:"
+
+#: ../widgets/misc/e-signature-script-dialog.c:344
+msgid "Script file must be executable."
+msgstr "El fitxer de l'script ha de ser executable."
+
+#: ../widgets/misc/e-url-entry.c:78
+msgid "Click here to go to URL"
+msgstr "Feu clic per anar a l'URL"
+
+#: ../widgets/misc/e-web-view.c:410
+msgid "_Copy Link Location"
+msgstr "_Copia la ubicació de l'enllaç"
+
+#: ../widgets/misc/e-web-view.c:412
+msgid "Copy the link to the clipboard"
+msgstr "Copia l'enllaç al porta-retalls"
+
+#: ../widgets/misc/e-web-view.c:420
+msgid "_Open Link in Browser"
+msgstr "_Obri l'enllaç en el navegador"
+
+#: ../widgets/misc/e-web-view.c:422
+msgid "Open the link in a web browser"
+msgstr "Obri l'enllaç en el navegador"
+
+#: ../widgets/misc/e-web-view.c:430
+msgid "_Copy Email Address"
+msgstr "Copia l'adr_eça electrònica"
+
+#: ../widgets/misc/e-web-view.c:447
+msgid "_Copy Image"
+msgstr "_Copia la imatge"
+
+#: ../widgets/misc/e-web-view.c:449
+msgid "Copy the image to the clipboard"
+msgstr "Copia la imatge al porta-retalls"
+
+#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
+msgid "Select all text and images"
+msgstr "Selecciona tot el text i les imatges"
+
+#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
+#: ../widgets/misc/e-web-view.c:986
+#, c-format
+msgid "Click to call %s"
+msgstr "Feu clic per trucar en/na %s"
+
+#: ../widgets/misc/e-web-view.c:988
+msgid "Click to hide/unhide addresses"
+msgstr "Feu clic per mostrar/amagar adreces"
+
+#: ../widgets/misc/e-web-view.c:990
+#, c-format
+msgid "Click to open %s"
+msgstr "Feu clic per obrir %s"
+
+#: ../widgets/misc/ea-calendar-item.c:306
+#: ../widgets/misc/ea-calendar-item.c:315
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../widgets/misc/ea-calendar-item.c:318
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Calendari: de %s a %s"
+
+#: ../widgets/misc/ea-calendar-item.c:354
+msgid "evolution calendar item"
+msgstr "element de calendari de l'Evolution"
+
+#: ../widgets/table/e-cell-combo.c:187
+msgid "popup list"
+msgstr "llista desplegable"
+
+#: ../widgets/table/e-cell-date-edit.c:299
+msgid "Now"
+msgstr "Ara"
+
+#. Translators: "None" as a label of a button to unset date in a date table cell
+#: ../widgets/table/e-cell-date-edit.c:316
+msgctxt "table-date"
+msgid "None"
+msgstr "Cap"
+
+#: ../widgets/table/e-cell-date-edit.c:324
+msgid "OK"
+msgstr "D'acord"
+
+#: ../widgets/table/e-cell-date-edit.c:868
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "L'hora ha d'estar en el format: %s"
+
+#: ../widgets/table/e-cell-percent.c:80
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "El valor del percentatge ha d'estar entre 0 i 100, ambdós inclosos"
+
+#: ../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:143
+msgid "click to add"
+msgstr "feu clic per afegir"
+
+# gal/e-table/e-table-config.c:300 gal/e-table/e-table-config.c:342
+#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
+msgid "(Ascending)"
+msgstr "(Ascendent)"
+
+# gal/e-table/e-table-config.c:300 gal/e-table/e-table-config.c:342
+#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
+msgid "(Descending)"
+msgstr "(Descendent)"
+
+# gal/e-table/e-table-config.c:307
+#: ../widgets/table/e-table-config.c:400
+msgid "Not sorted"
+msgstr "Sense orde"
+
+# gal/e-table/e-table-config.c:348
+#: ../widgets/table/e-table-config.c:441
+msgid "No grouping"
+msgstr "Sense agrupar"
+
+#: ../widgets/table/e-table-config.c:666
+#: ../widgets/table/e-table-config.ui.h:11
+msgid "Show Fields"
+msgstr "Mostra els camps"
+
+#: ../widgets/table/e-table-config.c:686
+msgid "Available Fields"
+msgstr "Camps disponibles"
+
+#: ../widgets/table/e-table-config.ui.h:1
+msgid "A_vailable Fields:"
+msgstr "Camps disponi_bles:"
+
+# gal/e-table/e-table-config.glade.h:3
+# gal/e-table/e-table-config-no-group.glade.h:3
+#: ../widgets/table/e-table-config.ui.h:2
+#: ../widgets/table/e-table-header-item.c:1717
+msgid "Ascending"
+msgstr "Ascendent"
+
+#: ../widgets/table/e-table-config.ui.h:3
+msgid "Clear All"
+msgstr "Neteja-ho tot"
+
+#: ../widgets/table/e-table-config.ui.h:4
+msgid "Clear _All"
+msgstr "Neteja-ho _tot"
+
+# gal/e-table/e-table-config.glade.h:5
+# gal/e-table/e-table-config-no-group.glade.h:5
+#: ../widgets/table/e-table-config.ui.h:5
+#: ../widgets/table/e-table-header-item.c:1717
+msgid "Descending"
+msgstr "Descendent"
+
+# gal/e-table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.ui.h:8
+msgid "Group Items By"
+msgstr "Agrupa segons"
+
+#: ../widgets/table/e-table-config.ui.h:9
+msgid "Move _Down"
+msgstr "Mo_u avall"
+
+#: ../widgets/table/e-table-config.ui.h:10
+msgid "Move _Up"
+msgstr "Mou am_unt"
+
+#: ../widgets/table/e-table-config.ui.h:12
+msgid "Show _field in View"
+msgstr "Mostra el _camp en la visualització"
+
+#: ../widgets/table/e-table-config.ui.h:13
+msgid "Show field i_n View"
+msgstr "Mostra el cam_p en la visualització"
+
+#: ../widgets/table/e-table-config.ui.h:14
+msgid "Show field in _View"
+msgstr "Mostra el camp en la _visualització"
+
+# gal/e-table/e-table-config.glade.h:14
+# gal/e-table/e-table-config-no-group.glade.h:14
+#: ../widgets/table/e-table-config.ui.h:15
+msgid "Sort"
+msgstr "Ordena"
+
+# gal/e-table/e-table-config.glade.h:14
+# gal/e-table/e-table-config-no-group.glade.h:14
+#: ../widgets/table/e-table-config.ui.h:16
+msgid "Sort Items By"
+msgstr "Ordena els elements segons"
+
+# gal/e-table/e-table-config.glade.h:16
+# gal/e-table/e-table-config-no-group.glade.h:16
+#: ../widgets/table/e-table-config.ui.h:17
+msgid "Then By"
+msgstr "Després"
+
+#: ../widgets/table/e-table-config.ui.h:19
+msgid "_Fields Shown..."
+msgstr "Camps _mostrats..."
+
+# gal/e-table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.ui.h:20
+msgid "_Group By..."
+msgstr "A_grupa segons..."
+
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "Sup_rimeix"
+
+#: ../widgets/table/e-table-config.ui.h:22
+msgid "_Show field in View"
+msgstr "Mos_tra el camp en la visualització"
+
+#: ../widgets/table/e-table-config.ui.h:23
+msgid "_Show these fields in order:"
+msgstr "Mo_stra estos camps en orde:"
+
+#: ../widgets/table/e-table-config.ui.h:24
+msgid "_Sort..."
+msgstr "_Ordena..."
+
+# gal/e-table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-field-chooser-dialog.c:119
+msgid "Add a Column"
+msgstr "Afig una columna"
+
+#: ../widgets/table/e-table-field-chooser.c:153
+msgid ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
+msgstr ""
+"Per afegir una columna a la vostra taula, arrossegueu-la\n"
+"a la ubicació on vulgueu que aparega."
+
+#. 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)"
+#.
+#: ../widgets/table/e-table-group-container.c:361
+#, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+msgstr[0] "%s: %s (%d element)"
+msgstr[1] "%s: %s (%d elements)"
+
+#. 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)"
+#.
+#: ../widgets/table/e-table-group-container.c:373
+#, c-format
+msgid "%s (%d item)"
+msgid_plural "%s (%d items)"
+msgstr[0] "%s (%d element)"
+msgstr[1] "%s (%d elements)"
+
+# gal/e-table/e-table-header-item.c:1444
+#: ../widgets/table/e-table-header-item.c:1557
+msgid "Customize Current View"
+msgstr "Personalitza la visualització actual"
+
+# gal/e-table/e-table-header-item.c:1465
+#: ../widgets/table/e-table-header-item.c:1579
+msgid "Sort _Ascending"
+msgstr "Ordena en sentit _ascendent"
+
+# gal/e-table/e-table-header-item.c:1466
+#: ../widgets/table/e-table-header-item.c:1582
+msgid "Sort _Descending"
+msgstr "Ordena en sentit _descendent"
+
+# gal/e-table/e-table-header-item.c:1467
+#: ../widgets/table/e-table-header-item.c:1585
+msgid "_Unsort"
+msgstr "De_sordena"
+
+# gal/e-table/e-table-header-item.c:1469
+#: ../widgets/table/e-table-header-item.c:1588
+msgid "Group By This _Field"
+msgstr "Agrupa per este _camp"
+
+# gal/e-table/e-table-header-item.c:1470
+#: ../widgets/table/e-table-header-item.c:1591
+msgid "Group By _Box"
+msgstr "Agrupa per _quadre"
+
+# gal/e-table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1595
+msgid "Remove This _Column"
+msgstr "Suprimeix esta co_lumna"
+
+# gal/e-table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1598
+msgid "Add a C_olumn..."
+msgstr "Afig una c_olumna..."
+
+# gal/e-table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1602
+msgid "A_lignment"
+msgstr "Ali_neació"
+
+# gal/e-table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1605
+msgid "B_est Fit"
+msgstr "Aj_ust automàtic"
+
+# gal/e-table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1608
+msgid "Format Column_s..."
+msgstr "Formata les columne_s..."
+
+# gal/e-table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1612
+msgid "Custo_mize Current View..."
+msgstr "Personalit_za la visualització actual..."
+
+#: ../widgets/table/e-table-header-item.c:1674
+msgid "_Sort By"
+msgstr "_Ordena per"
+
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1692
+msgid "_Custom"
+msgstr "_Personalitzat"
+
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:125
+msgid "popup a child"
+msgstr "desplega un fill"
+
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:178
+msgid "toggle the cell"
+msgstr "commuta la cel·la"
+
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:214
+msgid "expands the row in the ETree containing this cell"
+msgstr "expandeix la fila en l'ETree que conté la cel·la"
+
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:221
+msgid "collapses the row in the ETree containing this cell"
+msgstr "contreu la fila de l'ETree que conté esta cel·la"
+
+#: ../widgets/table/gal-a11y-e-cell.c:123
+msgid "Table Cell"
+msgstr "Cel·la de taula"
+
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
+msgid "click"
+msgstr "feu clic"
+
+#: ../widgets/table/gal-a11y-e-table-column-header.c:158
+msgid "sort"
+msgstr "ordena"
+
+#: ../widgets/text/e-text.c:2327
+msgid "Select All"
+msgstr "Selecciona-ho tot"
+
+#: ../widgets/text/e-text.c:2339
+msgid "Input Methods"
+msgstr "Mètodes d'entrada"
+
+#~ msgid "Invalid object"
+#~ msgstr "Objecte no vàlid"
+
+#~ msgid "Edit Alarm"
+#~ msgstr "Edita l'alarma"
+
+#~ msgid "Add Alarm"
+#~ msgstr "Afegeix una alarma"
+
+#~ msgid "Alarm"
+#~ msgstr "Alarma"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarmes"
+
+#~ msgid "Click here to close the current window"
+#~ msgstr "Feu clic per tancar la finestra actual"
+
+#~ msgid "Click here to view help available"
+#~ msgstr "Feu clic per veure l'ajuda disponible"
+
+#~ msgid "Click here to save the current window"
+#~ msgstr "Feu clic per desar la finestra actual"
+
+#~ msgid "Click here to attach a file"
+#~ msgstr "Feu clic per adjuntar un fitxer"
+
+#~ msgid "_Alarms"
+#~ msgstr "_Alarmes"
+
+#~ msgid "The organizer selected no longer has an account."
+#~ msgstr "L'organitzador seleccionat ja no té cap compte."
+
+#~ msgctxt "cal-alarms"
+#~ msgid "None"
+#~ msgstr "Cap"
+
+#~ msgid "Custom Alarm:"
+#~ msgstr "Alarma personalitzada:"
+
+#~ msgid "_Alarm"
+#~ msgstr "_Alarma"
+
+#~ msgid "_Group:"
+#~ msgstr "_Grup:"
+
+#~ msgid "It has alarms."
+#~ msgstr "Té alarmes."
+
+#~ msgctxt "iCalImp"
+#~ msgid "has alarms"
+#~ msgstr "té alarmes"
+
+#~ msgid "Opening folder '%s'"
+#~ msgstr "S'està obrint la carpeta «%s»"
+
+#~ msgid "Please select a folder from the current account."
+#~ msgstr "Seleccioneu una carpeta del compte actual."
+
+#~ msgid "Scanning folders in \"%s\""
+#~ msgstr "S'estan analitzant les carpetes a «%s»"
+
+#~ msgid "Creating folder '%s'"
+#~ msgstr "S'està creant la carpeta «%s»"
+
+#~ msgid "_Default junk plugin:"
+#~ msgstr "Connector de correu brossa per _defecte:"
+
+#~ msgid "_Use Secure Connection:"
+#~ msgstr "E_mpra una connexió segura:"
+
+#~ msgid "Scanning folders in '%s'"
+#~ msgstr "S'estan analitzant les carpetes a «%s»"
+
+# FIXME (dpm)
+#~ msgid "Retrieving quota information for folder '%s'"
+#~ msgstr ""
+#~ "S'està recuperant la informació de la quota d'espai per a la carpeta «%s»"
+
+#~ msgid "Opening store '%s'"
+#~ msgstr "S'està obrint el magatzem «%s»"
+
+#~ msgid "Local Folders"
+#~ msgstr "Carpetes locals"
+
+#~ msgid "Error saving messages to: %s:\n"
+#~ msgstr "S'ha produït un error en desar els missatges a: %s.\n"
+
+#~ msgid "Checking Service"
+#~ msgstr "Comprovació del servei"
+
+#~ msgid "Updating Search Folders for '%s'"
+#~ msgstr "S'estan actualitzant les carpetes de cerca per a «%s»"
+
+#~ msgid "Delete messages in Search Folder \"{0}\"?"
+#~ msgstr "Voleu suprimir els missatges de la carpeta de cerca «{0}»?"
+
+#~ msgid "Alarm programs"
+#~ msgstr "Programes d'alarma"
+
+#~ msgid "Save as iCalendar..."
+#~ msgstr "Anomena i desa com a iCalendar..."
+
+#~ msgctxt "mail-junk-hook"
+#~ msgid "None"
+#~ msgstr "Cap"
+
+#~ msgid "Header Value Contains:"
+#~ msgstr "El valor de la capçalera conté:"
+
+#~ msgid "%s plugin is available and the binary is installed."
+#~ msgstr "El connector %s està disponible i el fitxer binari està instal·lat."
+
+#~ msgid ""
+#~ "%s plugin is not available. Please check whether the package is installed."
+#~ msgstr ""
+#~ "El connector %s no està disponible. Comproveu que el seu paquet estigui "
+#~ "instal·lat."
+
+#~ msgid "No junk plugin available"
+#~ msgstr "No hi ha cap connector de correu brossa disponible"
+
+#~ msgid "Bogofilter is not available. Please install it first."
+#~ msgstr ""
+#~ "El Bogofilter no està disponible, per la qual cosa l'hauríeu d'instal·lar "
+#~ "abans."
+
+#~ msgid "Error occurred while spawning %s: %s."
+#~ msgstr "S'ha produït un error en executar %s: %s."
+
+#~ msgid "Bogofilter child process does not respond, killing..."
+#~ msgstr "El procés fill del Bogofilter no respon; se suprimirà..."
+
+#~ msgid "Wait for Bogofilter child process interrupted, terminating..."
+#~ msgstr ""
+#~ "S'ha interromput l'espera per al procés fill del Bogofilter; es "
+#~ "terminarà..."
+
+#~ msgid "Pipe to Bogofilter failed, error code: %d."
+#~ msgstr ""
+#~ "Ha fallat la creació d'un conducte cap al Bogofilter; el codi d'error "
+#~ "fou: %d."
+
+#~ msgid "Bogofilter Junk Filter"
+#~ msgstr "Filtrador de correu brossa Bogofilter"
+
+#~ msgid "Filter junk messages using Bogofilter."
+#~ msgstr "Filtra els missatges de correu brossa amb el Bogofilter."
+
+#~ msgid "Use _SSL"
+#~ msgstr "Utilitza l'_SSL"
+
+#~ msgid "_Secure connection"
+#~ msgstr "Utilitza una connexió _segura"
+
+#~ msgid "Show a map of all the contacts"
+#~ msgstr "Mostra un mapa de tots els contactes"
+
+#~ msgid "Add a map showing the location of contacts when possible."
+#~ msgstr ""
+#~ "Afegeix un mapa que mostri la ubicació dels contactes quan sigui possible."
+
+#~ msgid "Map for contacts"
+#~ msgstr "Mapa dels contactes"
+
+#~ msgid "Checklist"
+#~ msgstr "Llista de comprovació"
+
+#~ msgid "Enter password for %s (user %s)"
+#~ msgstr "Introduïu la contrasenya per a %s (usuari %s)"
+
+#~ msgid "Failed to authenticate.\n"
+#~ msgstr "S'ha produït un error en l'autenticació.\n"
+
+#~ msgid "New _Shared Folder..."
+#~ msgstr "_Carpeta compartida nova..."
+
+#~ msgid "_Proxy Login..."
+#~ msgstr "Entrada com a _delegat..."
+
+#~ msgid "Junk Mail Settings..."
+#~ msgstr "Configuració del correu brossa..."
+
+#~ msgid "Track Message Status..."
+#~ msgstr "Segueix l'estat del missatge..."
+
+#~ msgid "Retract Mail"
+#~ msgstr "Retira el correu"
+
+#~ msgid "Accept"
+#~ msgstr "Accepta"
+
+#~ msgid "Accept Tentatively"
+#~ msgstr "Accepta provisionalment"
+
+#~ msgid "Decline"
+#~ msgstr "Declina"
+
+#~ msgid "Rese_nd Meeting..."
+#~ msgstr "Tor_na a enviar una reunió..."
+
+#~ msgid "Create folder"
+#~ msgstr "Crea una carpeta"
+
+#~ msgid ""
+#~ "The user '%s' has shared a folder with you\n"
+#~ "\n"
+#~ "Message from '%s'\n"
+#~ "\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "\n"
+#~ "Click 'Apply' to install the shared folder\n"
+#~ "\n"
+#~ msgstr ""
+#~ "L'usuari «%s» comparteix una carpeta amb vós\n"
+#~ "\n"
+#~ "El missatge de «%s»\n"
+#~ "\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "\n"
+#~ "Feu clic a «Aplica» per instal·lar la carpeta compartida\n"
+
+#~ msgid "Install the shared folder"
+#~ msgstr "Instal·la la carpeta compartida"
+
+#~ msgid "Shared Folder Installation"
+#~ msgstr "Instal·lació de la carpeta compartida"
+
+#~ msgid "Junk Settings"
+#~ msgstr "Configuració del correu brossa"
+
+#~ msgid "Junk Mail Settings"
+#~ msgstr "Configuració del correu brossa"
+
+#~ msgid "Email:"
+#~ msgstr "Adreça electrònica:"
+
+#~ msgid "Junk List:"
+#~ msgstr "Llista de correu brossa:"
+
+#~ msgid "_Enable"
+#~ msgstr "_Habilita"
+
+#~ msgid "_Junk List"
+#~ msgstr "_Llista de correu brossa"
+
+#~ msgid "Message Retract"
+#~ msgstr "Retirada de missatges"
+
+#~ msgid ""
+#~ "Retracting a message may remove it from the recipient's mailbox. Are you "
+#~ "sure you want to do this?"
+#~ msgstr ""
+#~ "Si retireu un missatge és probable que se suprimeixi de la bústia de "
+#~ "correu del destinatari. Segur que voleu fer-ho?"
+
+#~ msgid "Message retracted successfully"
+#~ msgstr "S'ha retirat el correu amb èxit"
+
+#~ msgid "Insert Send options"
+#~ msgstr "Insereix opcions d'enviament"
+
+#~ msgid "The participants will receive the following notification.\n"
+#~ msgstr "Els participants rebran la següent notificació.\n"
+
+#~ msgid "Add Send Options to GroupWise messages"
+#~ msgstr "Afegeix opcions d'enviament als missatges del GroupWise"
+
+#~ msgid "Fine-tune your GroupWise accounts."
+#~ msgstr "Ajusteu els paràmetres dels comptes GroupWise."
+
+#~ msgid "GroupWise Features"
+#~ msgstr "Característiques GroupWise"
+
+#~ msgid "Message retract failed"
+#~ msgstr "Ha fallat la retirada del correu"
+
+#~ msgid "The server did not allow the selected message to be retracted."
+#~ msgstr "El servidor no ha permès retirar el missatge seleccionat."
+
+#~ msgid ""
+#~ "Account &quot;{0}&quot; already exists. Please check your folder tree."
+#~ msgstr ""
+#~ "Ja existeix un compte anomenat «{0}». Hauríeu de comprovar l'arbre de "
+#~ "carpetes."
+
+#~ msgid "Account Already Exists"
+#~ msgstr "Ja existeix el compte"
+
+#~ msgid "Invalid user"
+#~ msgstr "L'usuari no és vàlid"
+
+#~ msgid ""
+#~ "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+#~ "address and try again."
+#~ msgstr ""
+#~ "No s'ha pogut entrar al servidor intermediari com a «{0}». Hauríeu de "
+#~ "comprovar l'adreça electrònica introduïda i tornar-ho a intentar."
+
+#~ msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+#~ msgstr "No es pot atorgar accés al servidor intermediari a l'usuari «{0}»"
+
+#~ msgid "Specify User"
+#~ msgstr "Seleccioneu l'usuari"
+
+#~ msgid "You have already given proxy permissions to this user."
+#~ msgstr ""
+#~ "Ja heu atorgat permisos d'accés al servidor intermediari a aquest usuari."
+
+#~ msgid "You have to specify a valid user name to give proxy rights."
+#~ msgstr ""
+#~ "Heu d'especificar un nom d'usuari vàlid per atorgar-li permisos de "
+#~ "servidor intermediari."
+
+#~ msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+#~ msgstr ""
+#~ "No podeu compartir aquesta carpeta amb l'usuari que heu especificat "
+#~ "(«{0}»)"
+
+#~ msgid "You have to specify a user name which you want to add to the list"
+#~ msgstr ""
+#~ "Heu d'especificar el nom de l'usuari al qual vulgueu afegir a la llista"
+
+#~ msgid "Do you want to resend the meeting?"
+#~ msgstr "Voleu tornar a enviar la reunió?"
+
+#~ msgid "Do you want to resend the recurring meeting?"
+#~ msgstr "Voleu tornar a enviar la reunió periòdica?"
+
+#~ msgid "Do you want to retract the original item?"
+#~ msgstr "Voleu retirar l'element original?"
+
+#~ msgid "The original will be removed from the recipient's mailbox."
+#~ msgstr "Se suprimirà l'original de la bústia de correu del destinatari."
+
+#~ msgid "This is a recurring meeting"
+#~ msgstr "Aquesta és una reunió periòdica"
+
+#~ msgid "This will create a new meeting using the existing meeting details."
+#~ msgstr ""
+#~ "Aquesta acció crearà una reunió nova a partir dels detalls de la reunió "
+#~ "existent."
+
+#~ msgid ""
+#~ "This will create a new meeting with the existing meeting details. The "
+#~ "recurrence rule needs to be re-entered."
+#~ msgstr ""
+#~ "Aquesta acció crearà una reunió nova a partir dels detalls de la reunió "
+#~ "existent. Haureu de tornar a introduir la regla de periodicitat."
+
+#~ msgid "Would you like to accept it?"
+#~ msgstr "Ho voleu acceptar?"
+
+#~ msgid "Would you like to decline it?"
+#~ msgstr "Ho voleu cancel·lar?"
+
+#~ msgid "C_ustomize notification message"
+#~ msgstr "Personalitza el missatge de notifi_cació"
+
+#~ msgid "Con_tacts..."
+#~ msgstr "Con_tactes..."
+
+#~ msgid "Users:"
+#~ msgstr "Usuaris:"
+
+#~ msgid "_Not Shared"
+#~ msgstr "No e_s comparteix"
+
+#~ msgid "_Shared With..."
+#~ msgstr "E_s comparteix amb..."
+
+#~ msgid "Access Rights"
+#~ msgstr "Drets d'accés"
+
+#~ msgid "Add/Edit"
+#~ msgstr "Afegeix/edita"
+
+#~ msgid "Con_tacts"
+#~ msgstr "Con_tactes"
+
+#~ msgid "Modify _folders/options/rules/"
+#~ msgstr "Modi_fica carpetes/opcions/regles"
+
+#~ msgid "Read items marked _private"
+#~ msgstr "Llegeix elements marcats _privats"
+
+#~ msgid "Subscribe to my _alarms"
+#~ msgstr "Subscriu a les meves _alarmes"
+
+#~ msgid "Subscribe to my _notifications"
+#~ msgstr "Subscriu a les meves _notificacions"
+
+#~ msgid "_Write"
+#~ msgstr "_Escriptura"
+
+#~ msgid "permission to read|_Read"
+#~ msgstr "_Lectura"
+
+#~ msgid "Proxy"
+#~ msgstr "Servidor intermediari"
+
+# Vegeu el comentari de sota referent a aquesta mateixa cadena (dpm)
+#~ msgid "Proxy Login"
+#~ msgstr "Entrada com a delegat"
+
+#~ msgid "%sEnter password for %s (user %s)"
+#~ msgstr "%s Introduïu la contrasenya per a %s (usuari %s)"
+
+#~ msgid "The Proxy tab will be available only when the account is online."
+#~ msgstr ""
+#~ "La pestanya del delegat només estarà disponible quan el compte estigui en "
+#~ "línia."
+
+#~ msgid "The Proxy tab will be available only when the account is enabled."
+#~ msgstr ""
+#~ "La pestanya del delegat només estarà disponible quan el compte estigui "
+#~ "habilitat."
+
+#~ msgctxt "GW"
+#~ msgid "Proxy"
+#~ msgstr "Servidor intermediari"
+
+#~ msgid "Add User"
+#~ msgstr "Afegeix un usuari"
+
+#~ msgid "Advanced send options"
+#~ msgstr "Opcions avançades d'enviament"
+
+#~ msgid "Users"
+#~ msgstr "Usuaris"
+
+#~ msgid "Enter the users and set permissions"
+#~ msgstr "Introduïu els usuaris i establiu els permisos"
+
+#~ msgid "Sharing"
+#~ msgstr "Compartició"
+
+#~ msgid "Custom Notification"
+#~ msgstr "Notificació personalitzada"
+
+#~ msgid "Add   "
+#~ msgstr "Afegeix   "
+
+#~ msgid "Modify"
+#~ msgstr "Modifica"
+
+#~ msgid "Message Status"
+#~ msgstr "Estat del missatge"
+
+#~ msgid "Subject:"
+#~ msgstr "Assumpte:"
+
+#~ msgid "From:"
+#~ msgstr "De:"
+
+#~ msgid "Creation date:"
+#~ msgstr "Data de creació:"
+
+#~ msgid "Recipient: "
+#~ msgstr "Destinatari: "
+
+#~ msgid "Delivered: "
+#~ msgstr "Entregat: "
+
+#~ msgid "Opened: "
+#~ msgstr "Obert: "
+
+#~ msgid "Accepted: "
+#~ msgstr "Acceptat: "
+
+#~ msgid "Deleted: "
+#~ msgstr "Suprimit: "
+
+#~ msgid "Declined: "
+#~ msgstr "Declinat: "
+
+#~ msgid "Completed: "
+#~ msgstr "Completat: "
+
+#~ msgid "Undelivered: "
+#~ msgstr "No entregat: "
+
+#~ msgid "Enable D-Bus messages."
+#~ msgstr "Habilita els missatges del D-Bus."
+
+#~ msgid "Generates a D-Bus message when new mail messages arrive."
+#~ msgstr "Genera un missatge del D-Bus quan arribi correu nou."
+
+#~ msgid "Popup message together with the icon."
+#~ msgstr "Mostra un missatge emergent juntament amb la icona."
+
+#~ msgid "Whether show message over the icon when new messages arrive."
+#~ msgstr ""
+#~ "Si s'ha de mostrar un missatge sobre la icona quan arribin correus nous."
+
+#~ msgid "Show icon in _notification area"
+#~ msgstr "Mostra una icona a l'àrea de _notificació"
+
+#~ msgid "Popup _message together with the icon"
+#~ msgstr "Mostra un _missatge emergent juntament amb la icona"
+
+#~ msgid "Generate a _D-Bus message"
+#~ msgstr "Genera un missatge del _D-Bus"
+
+#~ msgid ""
+#~ "Selected calendar contains some events for the given mails already. Would "
+#~ "you like to create new events anyway?"
+#~ msgstr ""
+#~ "El calendari seleccionat ja conté alguns esdeveniments per als correus "
+#~ "proporcionats. Voleu crear esdeveniments nous de totes maneres?"
+
+#~ msgid ""
+#~ "Selected task list contains some tasks for the given mails already. Would "
+#~ "you like to create new tasks anyway?"
+#~ msgstr ""
+#~ "La llista de tasques seleccionada ja conté algunes tasques per als "
+#~ "correus proporcionats. Voleu crear tasques noves de totes maneres?"
+
+#~ msgid ""
+#~ "Selected memo list contains some memos for the given mails already. Would "
+#~ "you like to create new memos anyway?"
+#~ msgstr ""
+#~ "La llista d'anotacions seleccionada ja conté algunes anotacions per als "
+#~ "correus proporcionats. Voleu crear anotacions noves de totes maneres?"
+
+#~ msgid ""
+#~ "Selected calendar contains an event for the given mail already. Would you "
+#~ "like to create new event anyway?"
+#~ msgid_plural ""
+#~ "Selected calendar contains events for the given mails already. Would you "
+#~ "like to create new events anyway?"
+#~ msgstr[0] ""
+#~ "El calendari seleccionat ja conté un esdeveniment per al correu "
+#~ "proporcionat. Voleu crear un esdeveniment nou de totes maneres?"
+#~ msgstr[1] ""
+#~ "El calendari seleccionat ja conté alguns esdeveniments per als correus "
+#~ "proporcionats. Voleu crear esdeveniments nous de totes maneres?"
+
+#~ msgid ""
+#~ "Selected task list contains a task for the given mail already. Would you "
+#~ "like to create new task anyway?"
+#~ msgid_plural ""
+#~ "Selected task list contains tasks for the given mails already. Would you "
+#~ "like to create new tasks anyway?"
+#~ msgstr[0] ""
+#~ "La llista de tasques seleccionada ja conté una tasca per al correu "
+#~ "proporcionat. Voleu crear una tasca nova de totes maneres?"
+#~ msgstr[1] ""
+#~ "La llista de tasques seleccionada ja conté algunes tasques per als "
+#~ "correus proporcionats. Voleu crear tasques noves de totes maneres?"
+
+#~ msgid ""
+#~ "Selected memo list contains a memo for the given mail already. Would you "
+#~ "like to create new memo anyway?"
+#~ msgid_plural ""
+#~ "Selected memo list contains memos for the given mails already. Would you "
+#~ "like to create new memos anyway?"
+#~ msgstr[0] ""
+#~ "La llista d'anotacions seleccionada ja conté una anotació per al correu "
+#~ "proporcionat. Voleu crear una anotació nova de totes maneres?"
+#~ msgstr[1] ""
+#~ "La llista d'anotacions seleccionada ja conté algunes anotacions per als "
+#~ "correus proporcionats. Voleu crear anotacions noves de totes maneres?"
+
+#~ msgid "SpamAssassin not found, code: %d"
+#~ msgstr "No s'ha trobat l'SpamAssassin, codi retornat: %d"
+
+#~ msgid "Failed to create pipe: %s"
+#~ msgstr "No s'ha pogut crear el conducte («pipe»): %s"
+
+#~ msgid "Error after fork: %s"
+#~ msgstr "S'ha produït un error després de la crida «fork»: %s"
+
+#~ msgid "SpamAssassin child process does not respond, killing..."
+#~ msgstr "El procés fill de l'SpamAssassin no respon; se suprimirà..."
+
+#~ msgid "Wait for SpamAssassin child process interrupted, terminating..."
+#~ msgstr ""
+#~ "S'ha interromput l'espera per al procés fill del SpamAssassin; es "
+#~ "terminarà..."
+
+#~ msgid "Pipe to SpamAssassin failed, error code: %d"
+#~ msgstr ""
+#~ "Ha fallat la creació d'un conducte cap al SpamAssassin; el codi d'error "
+#~ "fou: %d"
+
+#~ msgid "SpamAssassin is not available. Please install it first."
+#~ msgstr ""
+#~ "L'SpamAssassin no està disponible. Instal·leu-lo abans de continuar."
+
+#~ msgid "SpamAssassin Junk Filter"
+#~ msgstr "Filtrador de correu brossa SpamAssassin"
+
+#~ msgid "iCalendar format (.ics)"
+#~ msgstr "Format de l'iCalendar (.ics)"
+
+# FIXME (dpm)
+#~ msgid "Drafts based template plugin"
+#~ msgstr "Connector de plantilles basat en esborranys"
+
+#~ msgid "Evolution _FAQ"
+#~ msgstr "_PMF de l'Evolution"
+
+#~ msgid "Open the Frequently Asked Questions webpage"
+#~ msgstr "Obre la pàgina web de les Preguntes Més Freqüents"
+
+#~ msgid "Failed to import contact's certificate"
+#~ msgstr "Ha fallat la importació del certificat del contacte"
+
+#~ msgid "E-Mail Address"
+#~ msgstr "Adreça electrònica"
+
+#~ msgid "Failed to import certificate authority's certificate"
+#~ msgstr ""
+#~ "Ha fallat la importació del certificat de l'autoritat de certificació"
+>>>>>>> master
 
 #~ msgid "Run Anjal in a window"
 #~ msgstr "Executa l'Anjal en una finestra"
 
 #~ msgid "Make Anjal the default email client"
+<<<<<<< HEAD
 #~ msgstr "Fes que l'Anjal sigui el client de correu electrònic predeterminat"
+=======
+#~ msgstr "Fes que l'Anjal sigui el client de correu electrònic per defecte"
+>>>>>>> master
 
 #~ msgid "Anjal email client"
 #~ msgstr "Client de correu Anjal"
@@ -22068,11 +43114,19 @@ msgstr "Mètodes d'entrada"
 
 #~ msgid "Count of default recurrence for a new event. -1 means forever."
 #~ msgstr ""
+<<<<<<< HEAD
 #~ "Nombre de la periodicitat predeterminada dels esdeveniments nous. -1 "
 #~ "significa per sempre."
 
 #~ msgid "Default recurrence count"
 #~ msgstr "Nombre predeterminat de la periodicitat"
+=======
+#~ "Nombre de la periodicitat per defecte dels esdeveniments nous. -1 "
+#~ "significa per sempre."
+
+#~ msgid "Default recurrence count"
+#~ msgstr "Nombre per defecte de la periodicitat"
+>>>>>>> master
 
 #~ msgid "Event Gradient"
 #~ msgstr "Degradat de l'esdeveniment"
@@ -22181,6 +43235,7 @@ msgstr "Mètodes d'entrada"
 #~ msgid "%s has published meeting information."
 #~ msgstr "En/na %s ha publicat la informació de la reunió."
 
+<<<<<<< HEAD
 #~ msgid "Meeting Information"
 #~ msgstr "Informació de la reunió"
 
@@ -22226,11 +43281,56 @@ msgstr "Mètodes d'entrada"
 #~ msgid "%s has published task information."
 #~ msgstr "En/na %s ha publicat la informació de la tasca."
 
+=======
+#~ msgid "%s requests the presence of %s at a meeting."
+#~ msgstr "En/na %s sol·licita la presència de %s a la reunió."
+
+#~ msgid "%s requests your presence at a meeting."
+#~ msgstr "En/na %s sol·licita la vostra presència a una reunió."
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "Proposició de reunió"
+
+#~ msgid "%s wishes to be added to an existing meeting."
+#~ msgstr "En/na %s es voldria afegir a una reunió existent."
+
+#~ msgid "Meeting Update"
+#~ msgstr "Actualització de la reunió"
+
+#~ msgid "%s wishes to receive the latest meeting information."
+#~ msgstr "En/na %s voldria rebre l'última informació de la reunió."
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "Sol·licitud d'actualització de la reunió"
+
+#~ msgid "%s has replied to a meeting request."
+#~ msgstr "En/na %s ha contestat a la sol·licitud d'una reunió."
+
+#~ msgid "Meeting Reply"
+#~ msgstr "Resposta de la reunió"
+
+#~ msgid "%s has canceled a meeting."
+#~ msgstr "En/na %s ha cancel·lat la reunió."
+
+#~ msgid "Meeting Cancelation"
+#~ msgstr "Cancel·lació de la reunió"
+
+#~ msgid "%s has sent an unintelligible message."
+#~ msgstr "En/na %s ha enviat un missatge inintel·ligible."
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Missatge de reunió erroni"
+
+#~ msgid "%s has published task information."
+#~ msgstr "En/na %s ha publicat la informació de la tasca."
+
+>>>>>>> master
 #~ msgid "Task Information"
 #~ msgstr "Informació de la tasca"
 
 #~ msgid "%s requests %s to perform a task."
 #~ msgstr "En/na %s sol·licita que en/na %s realitzi una tasca."
+<<<<<<< HEAD
 
 #~ msgid "%s requests you perform a task."
 #~ msgstr "En/na %s us sol·licita que realitzeu una tasca."
@@ -22515,6 +43615,292 @@ msgstr "Mètodes d'entrada"
 #~ msgid "Prompt when mailing list redirects private reply back to list"
 #~ msgstr "Pregunta quan la llista de correu segresti les respostes privades"
 
+=======
+
+#~ msgid "%s requests you perform a task."
+#~ msgstr "En/na %s us sol·licita que realitzeu una tasca."
+
+#~ msgid "Task Proposal"
+#~ msgstr "Proposició d'una tasca"
+
+#~ msgid "%s wishes to be added to an existing task."
+#~ msgstr "En/na %s es voldria afegir a una tasca existent."
+
+#~ msgid "Task Update"
+#~ msgstr "Actualització de la tasca"
+
+#~ msgid "%s wishes to receive the latest task information."
+#~ msgstr "En/na %s voldria rebre l'última informació de la tasca."
+
+#~ msgid "Task Update Request"
+#~ msgstr "Sol·licitud d'actualització de la tasca"
+
+#~ msgid "%s has replied to a task assignment."
+#~ msgstr "En/na %s ha contestat a l'assignació d'una tasca."
+
+#~ msgid "Task Reply"
+#~ msgstr "Resposta de la tasca"
+
+#~ msgid "%s has canceled a task."
+#~ msgstr "En/na %s ha cancel·lat una tasca."
+
+#~ msgid "Task Cancelation"
+#~ msgstr "Cancel·lació de la tasca"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "Missatge de tasca erroni"
+
+#~ msgid "%s has published free/busy information."
+#~ msgstr "En/na %s ha publicat la informació de lliure/ocupat."
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Informació de lliure/ocupat"
+
+#~ msgid "%s requests your free/busy information."
+#~ msgstr "En/na %s us sol·licita la informació de lliure/ocupat."
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Sol·licitud de lliure/ocupat"
+
+#~ msgid "%s has replied to a free/busy request."
+#~ msgstr "En/na %s ha contestat a la sol·licitud de lliure/ocupat."
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Resposta de lliure/ocupat"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Missatge de lliure/ocupat erroni"
+
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "El missatge no està ben format"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "El missatge només conté sol·licituds no compatibles."
+
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "El fitxer adjunt no té cap element de calendari visualitzable"
+
+#~ msgid "Update complete\n"
+#~ msgstr "S'ha completat l'actualització\n"
+
+#~ msgid "Object is invalid and cannot be updated\n"
+#~ msgstr "L'objecte no és vàlid i no es pot actualitzar\n"
+
+#~ msgid "This response is not from a current attendee.  Add as an attendee?"
+#~ msgstr ""
+#~ "Aquesta resposta no està associada a cap assistent actual. Voleu afegir-"
+#~ "lo com a assistent?"
+
+#~ msgid "Attendee status could not be updated because of an invalid status!\n"
+#~ msgstr ""
+#~ "No s'ha pogut actualitzar l'estat de l'assistent perquè l'estat és no "
+#~ "vàlid\n"
+
+#~ msgid "Attendee status updated\n"
+#~ msgstr "S'ha actualitzat l'estat de l'assistent\n"
+
+#~ msgid "Item sent!\n"
+#~ msgstr "S'ha enviat l'element.\n"
+
+#~ msgid "The item could not be sent!\n"
+#~ msgstr "No s'ha pogut enviar l'element.\n"
+
+#~ msgid "Choose an action:"
+#~ msgstr "Trieu una acció:"
+
+#~ msgid "Update"
+#~ msgstr "Actualitza"
+
+#~ msgid "Tentatively accept"
+#~ msgstr "Accepta provisionalment"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Envia la informació lliure/ocupat"
+
+#~ msgid "Update respondent status"
+#~ msgstr "Actualitza l'estat de la resposta"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "Envia l'última informació"
+
+#~ msgid "--to--"
+#~ msgstr "--per a--"
+
+#~ msgid "Calendar Message"
+#~ msgstr "Missatge del calendari"
+
+#~ msgid "Date:"
+#~ msgstr "Data:"
+
+#~ msgid "Loading Calendar"
+#~ msgstr "S'està carregant el calendari"
+
+#~ msgid "Loading calendar..."
+#~ msgstr "S'està carregant el calendari..."
+
+#~ msgid "Organizer:"
+#~ msgstr "Organitzador:"
+
+#~ msgid "Server Message:"
+#~ msgstr "Missatge del servidor:"
+
+#~ msgid "Could not create composer window."
+#~ msgstr "No s'ha pogut crear la finestra del redactor."
+
+#~ msgid ""
+#~ "Unable to activate the HTML editor control.\n"
+#~ "\n"
+#~ "Please make sure that you have the correct version of gtkhtml and "
+#~ "libgtkhtml installed."
+#~ msgstr ""
+#~ "No s'ha pogut activar el control editor d'HTML.\n"
+#~ "\n"
+#~ "Assegureu-vos que teniu instal·lades les versions correctes del GtkHTML i "
+#~ "la libgtkhtml."
+
+#~ msgid "Unable to activate the address selector control."
+#~ msgstr "No s'ha pogut activar el control de selecció d'adreces."
+
+#~ msgid "%s..."
+#~ msgstr "%s..."
+
+#~ msgid "Evolution Error"
+#~ msgstr "Error de l'Evolution"
+
+#~ msgid "Evolution Warning"
+#~ msgstr "Avís de l'Evolution"
+
+#~ msgid "Internal error, unknown error '%s' requested"
+#~ msgstr "Error intern, s'ha sol·licitat l'error desconegut «%s»"
+
+#~ msgid "%d day from now"
+#~ msgid_plural "%d days from now"
+#~ msgstr[0] "%d dia a partir d'ara"
+#~ msgstr[1] "%d dies a partir d'ara"
+
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "fa %d dia"
+#~ msgstr[1] "fa %d dies"
+
+#~ msgid "Debug Logs"
+#~ msgstr "Registres de depuració"
+
+#~ msgid "Show _errors in the status bar for"
+#~ msgstr "Mostra els e_rrors a la barra d'estat per a"
+
+#~ msgid "second(s)."
+#~ msgstr "segons."
+
+#~ msgid "Log Messages:"
+#~ msgstr "Missatges de registre:"
+
+#~ msgid "Log Level"
+#~ msgstr "Nivell de registre"
+
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#~ msgid "Errors"
+#~ msgstr "Errors"
+
+#~ msgid "Warnings and Errors"
+#~ msgstr "Avisos i errors"
+
+#~ msgid "Debug"
+#~ msgstr "Depuració"
+
+#~ msgid "Error, Warnings and Debug messages"
+#~ msgstr "Errors, avisos i missatges de depuració"
+
+#~ msgid "%s License Agreement"
+#~ msgstr "Acord de llicència de %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "Please read carefully the license agreement\n"
+#~ "for %s displayed below\n"
+#~ "and tick the check box for accepting it\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Llegiu detingudament l'acord de llicència\n"
+#~ "per a %s que es mostra a sota\n"
+#~ "i marqueu la casella de verificació per acceptar-lo\n"
+
+#~ msgid "Account Management"
+#~ msgstr "Gestió de comptes"
+
+#~ msgid "This store does not support subscriptions, or they are not enabled."
+#~ msgstr "El magatzem no permet subscripcions, o no estan habilitades."
+
+#~ msgid "Subscribed"
+#~ msgstr "Subscrit"
+
+#~ msgid "Folder"
+#~ msgstr "Carpeta"
+
+#~ msgid "Please select a server."
+#~ msgstr "Seleccioneu un servidor."
+
+#~ msgid "No server has been selected"
+#~ msgstr "No s'ha seleccionat cap servidor"
+
+#~ msgid "Default height of the subscribe dialog."
+#~ msgstr "Alçada per defecte del diàleg de subscripció."
+
+#~ msgid "Default width of the subscribe dialog."
+#~ msgstr "Amplada per defecte del diàleg de subscripció."
+
+#~ msgid "Subscribe dialog default height"
+#~ msgstr "Alçada per defecte de la finestra de subscripció"
+
+#~ msgid "Subscribe dialog default width"
+#~ msgstr "Amplada per defecte de la finestra de subscripció"
+
+#~ msgid "(Not Recommended)"
+#~ msgstr "(no es recomana)"
+
+#~ msgid "(Note: Requires restart of the application)"
+#~ msgstr "(Nota: s'haurà de reiniciar l'aplicació)"
+
+#~ msgid "Checks incoming mail messages to be Junk"
+#~ msgstr "Comprova si els missatges d'entrada són brossa"
+
+#~ msgid "Do not display messages when text si_ze exceeds"
+#~ msgstr "No mostris els missatges si la mida e_xcedeix"
+
+#~ msgid "Enable Magic S_pacebar"
+#~ msgstr "Habilita la te_cla d'espai màgica"
+
+#~ msgid "Enable Sea_rch Folders"
+#~ msgstr "Habilita les _carpetes de cerca"
+
+#~ msgid "Fi_xed-width:"
+#~ msgstr "Amplada fi_xa:"
+
+#~ msgid "Font Properties"
+#~ msgstr "Propietats del tipus de lletra"
+
+#~ msgid "KB"
+#~ msgstr "KB"
+
+#~ msgid "Message Fonts"
+#~ msgstr "Tipus de lletra dels missatge"
+
+#~ msgid ""
+#~ "Note: you will not be prompted for a password until you connect for the "
+#~ "first time"
+#~ msgstr ""
+#~ "Nota: no se us demanarà la contrasenya fins que us connecteu per primera "
+#~ "vegada"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "Tipus de lletra d'impressió"
+
+#~ msgid "Prompt when mailing list redirects private reply back to list"
+#~ msgstr "Pregunta quan la llista de correu segresti les respostes privades"
+
+>>>>>>> master
 #~ msgid "Prompt when sending private replies to mailing _list messages"
 #~ msgstr ""
 #~ "Pregunta en respondre privadament a missatges d'una _llista de correu"
@@ -22693,7 +44079,7 @@ msgstr "Mètodes d'entrada"
 #~ "commutador."
 
 #~ msgid "Default Sync Address:"
-#~ msgstr "Adreça de sincronització predeterminada:"
+#~ msgstr "Adreça de sincronització per defecte:"
 
 #~ msgid "Could not load address book"
 #~ msgstr "No s'ha pogut carregar la llibreta d'adreces"
@@ -22786,7 +44172,7 @@ msgstr "Mètodes d'entrada"
 #~ msgstr "No s'ha pogut escriure el bloc d'aplicació d'anotacions del Pilot"
 
 #~ msgid "Default Priority:"
-#~ msgstr "Prioritat predeterminada:"
+#~ msgstr "Prioritat per defecte:"
 
 #~ msgid "Could not read pilot's ToDo application block"
 #~ msgstr "No s'ha pogut llegir el bloc d'aplicació de tasques del Pilot"
@@ -22884,9 +44270,6 @@ msgstr "Mètodes d'entrada"
 #~ msgid "Toggles whether the From chooser is displayed"
 #~ msgstr "Commuta la visualització del camp «De»"
 
-#~ msgid "Show"
-#~ msgstr "Mostra"
-
 #~ msgid "Hide"
 #~ msgstr "Oculta"
 
@@ -22955,10 +44338,10 @@ msgstr "Mètodes d'entrada"
 
 #~ msgid "Check whether Evolution is the default mail client on startup."
 #~ msgstr ""
-#~ "Comprova si l'Evolution és el gestor de correu predeterminat en iniciar."
+#~ "Comprova si l'Evolution és el gestor de correu per defecte en iniciar."
 
 #~ msgid "Default Mail Client"
-#~ msgstr "Client de correu predeterminat"
+#~ msgstr "Client de correu per defecte"
 
 #~ msgid "<b>Server</b>"
 #~ msgstr "<b>Servidor</b>"
@@ -23008,9 +44391,6 @@ msgstr "Mètodes d'entrada"
 #~ msgid "Import"
 #~ msgstr "Importa"
 
-#~ msgid "View"
-#~ msgstr "Visualitza"
-
 #~ msgid "Show _Attachment Bar"
 #~ msgstr "Mostra la barra _de fitxers adjunts"
 
@@ -23120,7 +44500,7 @@ msgstr "Mètodes d'entrada"
 #~ msgstr "{0}."
 
 #~ msgid "Default Client"
-#~ msgstr "Client predeterminat"
+#~ msgstr "Client per defecte"
 
 #~ msgid "New Tab"
 #~ msgstr "Pestanya nova"
@@ -23335,10 +44715,10 @@ msgstr "Mètodes d'entrada"
 #~ msgstr "Aquest giny mostra un calendari en miniatura"
 
 #~ msgid "Default Calendar Client"
-#~ msgstr "Client de calendari predeterminat"
+#~ msgstr "Client de calendari per defecte"
 
 #~ msgid "Default client for calendar operations"
-#~ msgstr "Client predeterminat per a les operacions de calendari"
+#~ msgstr "Client per defecte per a les operacions de calendari"
 
 #~ msgid "This widget displays groups of calendars"
 #~ msgstr "Aquest giny mostra grups de calendaris"
@@ -23350,10 +44730,10 @@ msgstr "Mètodes d'entrada"
 #~ msgstr "El model de la taula d'anotacions"
 
 #~ msgid "Default Memo Client"
-#~ msgstr "Client d'anotacions predeterminat"
+#~ msgstr "Client d'anotacions per defecte"
 
 #~ msgid "Default client for memo operations"
-#~ msgstr "El client predeterminat per a les operacions d'anotacions"
+#~ msgstr "El client per defecte per a les operacions d'anotacions"
 
 #~ msgid "This widget displays groups of memo lists"
 #~ msgstr "Aquest giny mostra un grup de llistes d'anotacions"
@@ -23379,10 +44759,10 @@ msgstr "Mètodes d'entrada"
 #~ msgstr "No s'han pogut actualitzar les tasques «%s»"
 
 #~ msgid "Default Task Client"
-#~ msgstr "Client de tasques predeterminat"
+#~ msgstr "Client de tasques per defecte"
 
 #~ msgid "Default client for task operations"
-#~ msgstr "Client predeterminat per les tasques d'operacions"
+#~ msgstr "Client per defecte per les tasques d'operacions"
 
 #~ msgid "This widget displays groups of task lists"
 #~ msgstr "Aquest giny mostra grups de llistes de tasques"
@@ -24065,7 +45445,7 @@ msgstr "Mètodes d'entrada"
 #~ msgstr "<span weight=\"bold\">Format de la data i hora</span>"
 
 #~ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-#~ msgstr "<span weight=\"bold\">Servidor lliure/ocupat predeterminat</span>"
+#~ msgstr "<span weight=\"bold\">Servidor lliure/ocupat per defecte</span>"
 
 #~ msgid "<span weight=\"bold\">Task List</span>"
 #~ msgstr "<span weight=\"bold\">Llista de tasques</span>"
@@ -24268,9 +45648,6 @@ msgstr "Mètodes d'entrada"
 #~ msgid "message"
 #~ msgstr "missatge"
 
-#~ msgid "Save Message..."
-#~ msgstr "Desa el missatge..."
-
 #~ msgid "Show the \"Preview\" pane"
 #~ msgstr "Mostra la subfinestra «Previsualització»"
 
@@ -24299,7 +45676,7 @@ msgstr "Mètodes d'entrada"
 #~ msgstr "<span weight=\"bold\">Configuració</span>"
 
 #~ msgid "<span weight=\"bold\">Default Behavior</span>"
-#~ msgstr "<span weight=\"bold\">Comportament predeterminat</span>"
+#~ msgstr "<span weight=\"bold\">Comportament per defecte</span>"
 
 #~ msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
 #~ msgstr "<span weight=\"bold\">Ca_pçaleres del correu mostrades</span>"
@@ -24657,7 +46034,7 @@ msgstr "Mètodes d'entrada"
 #~ msgstr "Botó combinat"
 
 #~ msgid "Activate Default"
-#~ msgstr "Activa el predeterminat"
+#~ msgstr "Activa el per defecte"
 
 #~ msgid "Popup Menu"
 #~ msgstr "Menú emergent"
@@ -24996,7 +46373,7 @@ msgstr "Mètodes d'entrada"
 #~ msgstr "Control de configuració de la xarxa de l'Evolution"
 
 #~ msgid "[Default]"
-#~ msgstr "[Predeterminat]"
+#~ msgstr "[Per defecte]"
 
 #~ msgid "Signature(s)"
 #~ msgstr "Signatures"
@@ -25071,10 +46448,10 @@ msgstr "Mètodes d'entrada"
 #~ msgstr "Afegeix una adreça"
 
 #~ msgid "Default height of the message window."
-#~ msgstr "Amplada predeterminada de la finestra de missatge."
+#~ msgstr "Amplada per defecte de la finestra de missatge."
 
 #~ msgid "Default width of the message window."
-#~ msgstr "Amplada predeterminada de la finestra dels missatges."
+#~ msgstr "Amplada per defecte de la finestra dels missatges."
 
 #~ msgid ""
 #~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
@@ -25084,10 +46461,10 @@ msgstr "Mètodes d'entrada"
 #~ "costat en comptes de verticalment."
 
 #~ msgid "Message Window default height"
-#~ msgstr "Alçada predeterminada de la finestra de missatges"
+#~ msgstr "Alçada per defecte de la finestra de missatges"
 
 #~ msgid "Message Window default width"
-#~ msgstr "Amplada predeterminada de la finestra de missatges"
+#~ msgstr "Amplada per defecte de la finestra de missatges"
 
 #~ msgid "Prompt to check if the user wants to go offline immediately"
 #~ msgstr "Pregunta si l'usuari vol treballar fora de línia immediatament"
@@ -25821,9 +47198,6 @@ msgstr "Mètodes d'entrada"
 #~ msgid "{0} is already a delegate"
 #~ msgstr "{0} ja és un delegat"
 
-#~ msgid "{0} is already in the list"
-#~ msgstr "{0} ja és a la llista"
-
 #~ msgid "Subscribe to Other User's Tasks"
 #~ msgstr "Subscriviu-vos a les tasques d'un altre usuari"
 
@@ -27278,8 +48652,8 @@ msgstr "Mètodes d'entrada"
 #~ "Provides functionality for marking a calendar or an address book as the "
 #~ "default one."
 #~ msgstr ""
-#~ "Proporciona funcionalitat per a marcar com a predeterminats un calendari "
-#~ "o una llibreta d'adreces."
+#~ "Proporciona funcionalitat per a marcar com a per defecte un calendari o "
+#~ "una llibreta d'adreces."
 
 #~ msgid "S_pecify the mailbox name"
 #~ msgstr "Es_pecifiqueu el nom de la bústia de correu"
@@ -28019,6 +49393,7 @@ msgstr "Mètodes d'entrada"
 #~ msgstr "_Adreça:"
 
 #, fuzzy
+<<<<<<< HEAD
 #~ msgid ""
 #~ "The changed email or name of this contact already\n"
 #~ "exists in this folder.  Would you like to add it anyway?"
@@ -28027,14 +49402,12 @@ msgstr "Mètodes d'entrada"
 #~ "carpeta. Voleu afegir-l'hi de totes maneres?"
 
 #, fuzzy
+=======
+>>>>>>> master
 #~ msgid "Print cards"
 #~ msgstr "Imprimeix les tasques"
 
 #, fuzzy
-#~ msgid "Organization"
-#~ msgstr "_Organització:"
-
-#, fuzzy
 #~ msgid "E-mail"
 #~ msgstr "Adreça electrònica"
 
@@ -28441,8 +49814,8 @@ msgstr "Mètodes d'entrada"
 #, fuzzy
 #~ msgid "Mark attachment to be shown inline by default."
 #~ msgstr ""
-#~ "Identificador o sobrenom del component a mostrar per defecte a l'inici de "
-#~ "manera predeterminada."
+#~ "Identificador o sobrenom del component a mostrar per defecte a l'inici "
+#~ "per defecte."
 
 #, fuzzy
 #~ msgid "_Edit..."
@@ -28795,9 +50168,6 @@ msgstr "Mètodes d'entrada"
 #~ msgid "Create a new contact \"%s\""
 #~ msgstr "Crea un contacte nou"
 
-#~ msgid "Add address to existing contact \"%s\""
-#~ msgstr "Afegeix l'adreça al contacte existent «%s»"
-
 #, fuzzy
 #~ msgid "Merge E-Mail Address"
 #~ msgstr "Adreça electrònica"
@@ -28945,7 +50315,7 @@ msgstr "Mètodes d'entrada"
 
 #, fuzzy
 #~ msgid "option menu to choose reminder units"
-#~ msgstr "Unitats predeterminades pels recordatoris"
+#~ msgstr "Unitats per defecte pels recordatoris"
 
 #~ msgid "option menu to choose time units"
 #~ msgstr "menú d'opcions per triar la unitat del temps"
diff --git a/po/es.po b/po/es.po
index cf7612c88c..de03cbf048 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,23 +9,37 @@
 # Héctor García �lvarez <hector@scouts-es.org>, 2002.
 # Pablo Gonzalo del Campo <pablodc@bigfoot.com>,2003 (revisión).
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2003, 2004, 2005, 2006.
+<<<<<<< HEAD
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
 # Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011.
 #
 #: ../shell/main.c:569
+=======
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011.
+# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
+#
+#: ../shell/main.c:570
+>>>>>>> master
 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"
+<<<<<<< HEAD
 "POT-Creation-Date: 2011-08-31 15:48+0000\n"
 "PO-Revision-Date: 2011-09-12 18:23+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
+=======
+"POT-Creation-Date: 2011-09-28 08:36+0000\n"
+"PO-Revision-Date: 2011-09-28 10:39+0200\n"
+"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
+"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
+>>>>>>> master
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. For Translators: {0} is the name of the address book source
@@ -109,7 +123,11 @@ msgid "Delete address book '{0}'?"
 msgstr "¿Quiere eliminar la libreta de direcciones «{0}»?"
 
 #: ../addressbook/addressbook.error.xml.h:15
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+=======
+#: ../calendar/calendar.error.xml.h:37 ../mail/mail.error.xml.h:45
+>>>>>>> master
 msgid "Do _Not Delete"
 msgstr "_No eliminar"
 
@@ -122,7 +140,11 @@ msgid "Failed to authenticate with LDAP server."
 msgstr "No es posible autenticar con el servidor LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:18
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1273
+=======
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
+>>>>>>> master
 msgid "Failed to delete contact"
 msgstr "Falló al eliminar el contacto"
 
@@ -261,7 +283,11 @@ msgstr ""
 "Los contactos para {0} no estarán disponibles hasta que Evolution se "
 "reinicie."
 
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:608
+=======
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:594
+>>>>>>> master
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Añadir"
@@ -283,8 +309,13 @@ msgid "_Use as it is"
 msgstr "_Usar tal cual es"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
+<<<<<<< HEAD
 #: ../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
+>>>>>>> master
 msgid "Anniversary"
 msgstr "Aniversario"
 
@@ -294,8 +325,13 @@ msgstr "Aniversario"
 #. * 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
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:709
 #: ../calendar/gui/e-calendar-view.c:2077 ../capplet/anjal-settings-main.c:79
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:714
+#: ../calendar/gui/e-calendar-view.c:2063 ../capplet/anjal-settings-main.c:79
+>>>>>>> master
 #: ../shell/main.c:140
 msgid "Birthday"
 msgstr "Cumpleaños"
@@ -316,24 +352,43 @@ msgid "Calendar:"
 msgstr "Calendario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+<<<<<<< HEAD
 #: ../addressbook/importers/evolution-vcard-importer.c:979
+=======
+#: ../addressbook/importers/evolution-vcard-importer.c:991
+>>>>>>> master
 msgid "Contact"
 msgstr "Contacto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+<<<<<<< HEAD
 #: ../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:2925
+>>>>>>> master
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+<<<<<<< HEAD
 #: ../addressbook/gui/merging/eab-contact-merging.c:382
 #: ../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/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
+>>>>>>> master
 msgid "Email"
 msgstr "Correo-e"
 
@@ -348,7 +403,11 @@ msgstr "_Nombre completo…"
 #: ../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
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:1306
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:1323
+>>>>>>> master
 #: ../widgets/misc/e-contact-map.c:295
 msgid "Home"
 msgstr "Domicilio"
@@ -389,8 +448,13 @@ msgstr "Notas"
 #: ../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
+<<<<<<< HEAD
 #: ../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
+>>>>>>> master
 msgid "Other"
 msgstr "Otro"
 
@@ -417,8 +481,13 @@ msgstr "Direcciones web"
 #: ../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
+<<<<<<< HEAD
 #: ../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
+>>>>>>> master
 #: ../widgets/misc/e-contact-map.c:303
 msgid "Work"
 msgstr "Trabajo"
@@ -446,7 +515,11 @@ msgstr "_Blog:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 #: ../calendar/gui/dialogs/event-page.c:710
 #: ../calendar/gui/dialogs/event-page.ui.h:10
+<<<<<<< HEAD
 #: ../plugins/itip-formatter/itip-view.c:1923
+=======
+#: ../plugins/itip-formatter/itip-view.c:1963
+>>>>>>> master
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
@@ -525,47 +598,83 @@ msgid "_Zip/Postal Code:"
 msgstr "_Código postal:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:652
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
+>>>>>>> master
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
+>>>>>>> master
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
+>>>>>>> master
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:658
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:661
+>>>>>>> master
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
+>>>>>>> master
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:654
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
+>>>>>>> master
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:653
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
+>>>>>>> master
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:659
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:662
+>>>>>>> master
 msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:220
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:451
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:473
+>>>>>>> master
 msgid "Error adding contact"
 msgstr "Error al añadir el contacto"
 
@@ -577,12 +686,18 @@ msgstr "Error al modificar el contacto"
 msgid "Error removing contact"
 msgstr "Error al eliminar el contacto"
 
+<<<<<<< HEAD
 #: ../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:2919
+>>>>>>> master
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactos: %s"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3383
 msgid "Please select an image for this contact"
 msgstr "Seleccione una imagen para este contacto"
@@ -592,6 +707,17 @@ msgid "_No image"
 msgstr "_Sin imagen"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3714
+=======
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3398
+msgid "Please select an image for this contact"
+msgstr "Seleccione una imagen para este contacto"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3399
+msgid "_No image"
+msgstr "_Sin imagen"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3730
+>>>>>>> master
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -599,22 +725,36 @@ msgstr ""
 "Los datos del contacto son inválidos:\n"
 "\n"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3719
+=======
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
+>>>>>>> master
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» tiene un formato inválido"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3727
+=======
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3743
+>>>>>>> master
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» tiene un formato inválido"
 
+<<<<<<< HEAD
 #: ../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:3756
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3770
+>>>>>>> master
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» está vacío"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3769
 msgid "Invalid contact."
 msgstr "Contacto inválido."
@@ -636,6 +776,29 @@ msgid "E_mail"
 msgstr "Correo-_e"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:504
+=======
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3785
+msgid "Invalid contact."
+msgstr "Contacto inválido."
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
+msgid "Contact Quick-Add"
+msgstr "Añadir contacto rápido"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+msgid "_Edit Full"
+msgstr "_Editar todo"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:490
+msgid "_Full name"
+msgstr "Nombre co_mpleto"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:501
+msgid "E_mail"
+msgstr "Correo-_e"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:512
+>>>>>>> master
 msgid "_Select Address Book"
 msgstr "_Seleccionar la libreta de direcciones"
 
@@ -705,7 +868,11 @@ msgid "_Suffix:"
 msgstr "_Sufijo:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+<<<<<<< HEAD
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:740
+=======
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:746
+>>>>>>> master
 msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
@@ -731,6 +898,7 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:863
 msgid "Contact List Members"
 msgstr "Miembros de la lista de contactos"
@@ -744,6 +912,25 @@ msgid "Error modifying list"
 msgstr "Error al modificar la lista"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1468
+=======
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:869
+msgid "Contact List Members"
+msgstr "Miembros de la lista de contactos"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1402
+msgid "_Members"
+msgstr "_Miembros"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1514
+msgid "Error adding list"
+msgstr "Error al añadir la lista"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1529
+msgid "Error modifying list"
+msgstr "Error al modificar la lista"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1544
+>>>>>>> master
 msgid "Error removing list"
 msgstr "Error al eliminar la lista"
 
@@ -790,11 +977,19 @@ msgstr ""
 "en esta carpeta. ¿Quiere añadirlo de todos modos?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+<<<<<<< HEAD
 #: ../addressbook/gui/merging/eab-contact-merging.c:328
 msgid "_Merge"
 msgstr "Co_mbinar"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:311
+=======
+#: ../addressbook/gui/merging/eab-contact-merging.c:336
+msgid "_Merge"
+msgstr "Co_mbinar"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:319
+>>>>>>> master
 msgid "Merge Contact"
 msgstr "Combinar contacto"
 
@@ -802,9 +997,15 @@ 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
+<<<<<<< HEAD
 #: ../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:1727
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
+>>>>>>> master
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
@@ -829,6 +1030,7 @@ msgid_plural "%d contacts"
 msgstr[0] "%d contacto"
 msgstr[1] "%d contactos"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-addressbook-model.c:354
 msgid "Error getting book view"
 msgstr "Error al obtener la vista de libro"
@@ -838,6 +1040,17 @@ msgid "Search Interrupted"
 msgstr "Búsqueda interrumpida"
 
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:156
+=======
+#: ../addressbook/gui/widgets/e-addressbook-model.c:357
+msgid "Error getting book view"
+msgstr "Error al obtener la vista de libro"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:774
+msgid "Search Interrupted"
+msgstr "Búsqueda interrumpida"
+
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:158
+>>>>>>> master
 msgid "Error modifying card"
 msgstr "Error al modificar la tarjeta"
 
@@ -862,6 +1075,7 @@ msgstr "Eliminar los contactos seleccionados"
 msgid "Select all visible contacts"
 msgstr "Seleccionar todos los contactos visibles"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1321
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "¿Seguro que quiere eliminar estas listas de contactos?"
@@ -871,10 +1085,22 @@ msgid "Are you sure you want to delete this contact list?"
 msgstr "¿Seguro que quiere eliminar esta lista de contactos?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1329
+=======
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
+msgid "Are you sure you want to delete these contact lists?"
+msgstr "¿Seguro que quiere eliminar estas listas de contactos?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+msgid "Are you sure you want to delete this contact list?"
+msgstr "¿Seguro que quiere eliminar esta lista de contactos?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
+>>>>>>> master
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "¿Seguro que quiere eliminar esta lista de contactos (%s)?"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1335
 msgid "Are you sure you want to delete these contacts?"
 msgstr "¿Seguro que quiere eliminar estos contactos?"
@@ -884,12 +1110,27 @@ msgid "Are you sure you want to delete this contact?"
 msgstr "¿Seguro que quiere eliminar este contacto?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1343
+=======
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1340
+msgid "Are you sure you want to delete these contacts?"
+msgstr "¿Seguro que quiere eliminar estos contactos?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1344
+msgid "Are you sure you want to delete this contact?"
+msgstr "¿Seguro que quiere eliminar este contacto?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1348
+>>>>>>> master
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "¿Seguro que quiere eliminar este contacto (%s)?"
 
 #. Translators: This is shown for > 5 contacts.
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1498
+=======
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1504
+>>>>>>> master
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -904,16 +1145,28 @@ msgstr[1] ""
 "Abrir %d contactos abrirá también %d ventanas nuevas.\n"
 "¿Quiere realmente mostrar todos estos contactos?"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1506
 msgid "_Don't Display"
 msgstr "_No mostrar"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1507
+=======
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1512
+msgid "_Don't Display"
+msgstr "_No mostrar"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
+>>>>>>> master
 msgid "Display _All Contacts"
 msgstr "Mostrar t_odos los contactos"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:681
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
+>>>>>>> master
 msgid "Assistant"
 msgstr "Secretario"
 
@@ -950,7 +1203,11 @@ msgid "Categories"
 msgstr "Categorías"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:676
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
+>>>>>>> master
 msgid "Company"
 msgstr "Empresa"
 
@@ -999,22 +1256,38 @@ msgid "Journal"
 msgstr "Diario"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:680
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
+>>>>>>> master
 msgid "Manager"
 msgstr "Jefe"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:707
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:712
+>>>>>>> master
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:645
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+>>>>>>> master
 msgid "Nickname"
 msgstr "Apodo"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:733
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:739
+>>>>>>> master
 msgid "Note"
 msgstr "Nota"
 
@@ -1043,13 +1316,21 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+<<<<<<< HEAD
 #: ../calendar/gui/e-meeting-list-view.c:585
+=======
+#: ../calendar/gui/e-meeting-list-view.c:610
+>>>>>>> master
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Papel"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:711
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:716
+>>>>>>> master
 msgid "Spouse"
 msgstr "Cónyuge"
 
@@ -1146,13 +1427,21 @@ msgid "Home Email"
 msgstr "Correo-e de casa"
 
 #: ../addressbook/gui/widgets/e-minicard.c:102
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-minicard.c:807
+=======
+#: ../addressbook/gui/widgets/e-minicard.c:819
+>>>>>>> master
 msgid "Other Email"
 msgstr "Otro correo-e"
 
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:97
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/ea-minicard-view.c:187
+=======
+#: ../addressbook/gui/widgets/ea-minicard-view.c:189
+>>>>>>> master
 msgid "evolution address book"
 msgstr "libreta de direcciones de Evolution"
 
@@ -1164,7 +1453,11 @@ msgstr "Contacto nuevo"
 msgid "New Contact List"
 msgstr "Lista de contactos nueva"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/ea-minicard-view.c:170
+=======
+#: ../addressbook/gui/widgets/ea-minicard-view.c:172
+>>>>>>> master
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1206,6 +1499,7 @@ msgstr "_Enviar un correo nuevo a…"
 msgid "Send a mail message to this address"
 msgstr "Enviar un correo a esta dirección"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:213
 msgid "Open map"
 msgstr "Abrir mapa"
@@ -1243,12 +1537,52 @@ msgid "Calendar"
 msgstr "Calendario"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:684
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:215
+msgid "Open map"
+msgstr "Abrir mapa"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
+msgid "List Members:"
+msgstr "Listar miembros:"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
+msgid "Department"
+msgstr "Departamento"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
+msgid "Profession"
+msgstr "Profesión"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
+msgid "Position"
+msgstr "Posición"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
+msgid "Video Chat"
+msgstr "Charla por vídeo"
+
+#: ../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:517
+#: ../modules/online-accounts/e-online-accounts-google.c:294
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:528
+msgid "Calendar"
+msgstr "Calendario"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:688
+>>>>>>> master
 #: ../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 "Disponibilidad"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:685
 #: ../addressbook/gui/widgets/eab-contact-display.c:706
 msgid "Phone"
@@ -1268,6 +1602,27 @@ msgid "Home Page"
 msgstr "Página personal"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:704
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:689
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
+msgid "Phone"
+msgstr "Teléfono"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
+msgid "Fax"
+msgstr "Fax"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:691
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
+msgid "Address"
+msgstr "Dirección"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:708
+msgid "Home Page"
+msgstr "Página personal"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
+>>>>>>> master
 msgid "Web Log"
 msgstr "Diario web"
 
@@ -1275,8 +1630,13 @@ msgstr "Diario web"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
+<<<<<<< HEAD
 #: ../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
+>>>>>>> master
 #: ../modules/addressbook/e-book-shell-backend.c:120
 #: ../modules/addressbook/e-book-shell-migrate.c:144
 #: ../modules/calendar/e-cal-shell-backend.c:138
@@ -1288,6 +1648,7 @@ msgstr "Diario web"
 msgid "Personal"
 msgstr "Privado"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:971
 msgid "List Members"
 msgstr "Listar miembros"
@@ -1305,12 +1666,35 @@ msgid "Blog"
 msgstr "Diario web"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1233
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:986
+msgid "List Members"
+msgstr "Listar miembros"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1004
+msgid "Job Title"
+msgstr "Puesto"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1041
+msgid "Home page"
+msgstr "Página personal"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1050
+msgid "Blog"
+msgstr "Diario web"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1248
+>>>>>>> master
 #: ../widgets/misc/e-web-view.c:980
 #, c-format
 msgid "Click to mail %s"
 msgstr "Pulse para enviar correo a %s"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:113
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
+>>>>>>> master
 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 "
@@ -1321,7 +1705,11 @@ msgstr ""
 "uso desconectado. Cargue la libreta de direcciones una vez que esté en modo "
 "conectado para descargar su contenido"
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:140
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+>>>>>>> master
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1330,7 +1718,11 @@ msgstr ""
 "No se puede abrir esta libreta de direcciones. Compruebe que la ruta %s "
 "existe y que tiene permisos para acceder a ella."
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:153
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
+>>>>>>> master
 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."
@@ -1339,7 +1731,11 @@ msgstr ""
 "LDAP en Evolution debe tener instalado un paquete Evolution con LDAP "
 "activado."
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:162
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
+>>>>>>> master
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1347,11 +1743,19 @@ msgstr ""
 "No se puede abrir esta libreta de direcciones. Esto significa que ha "
 "introducido un URI erróneo o que el servidor LDAP es inaccesible."
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Detailed error message:"
 msgstr "Detalle del mensaje de error:"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:200
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid "Detailed error message:"
+msgstr "Detalle del mensaje de error:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:209
+>>>>>>> master
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1364,7 +1768,11 @@ msgstr ""
 "el límite de resultados en las preferencias del servidor\n"
 "de directorios para esta libreta de direcciones."
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:207
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:216
+>>>>>>> master
 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"
@@ -1377,27 +1785,41 @@ msgstr ""
 "opciones del servidor de directorios para esta libreta de direcciones."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:215
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
+>>>>>>> master
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr ""
 "El backend de esta libreta de direcciones no pudo analizar esta consulta. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:220
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+>>>>>>> master
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr ""
 "El backend para esta libreta de direcciones rehusó efectuar esta consulta. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+<<<<<<< HEAD
 #: ../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
+>>>>>>> master
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "Esta consulta no se completó con éxito. %s"
 
 #. This is a filename. Translators take note.
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-gui-util.c:254
 msgid "card.vcf"
 msgstr "tarjeta.vcf"
@@ -1423,6 +1845,33 @@ msgid "Move contacts to"
 msgstr "Mover contactos a"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:540
+=======
+#: ../addressbook/gui/widgets/eab-gui-util.c:263
+msgid "card.vcf"
+msgstr "tarjeta.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
+msgid "Select Address Book"
+msgstr "Seleccione la libreta de direcciones"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:375
+msgid "list"
+msgstr "lista"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:559
+msgid "Move contact to"
+msgstr "Mover contacto a"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:561
+msgid "Copy contact to"
+msgstr "Copiar contacto a"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:564
+msgid "Move contacts to"
+msgstr "Mover contactos a"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:566
+>>>>>>> master
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
@@ -1430,6 +1879,7 @@ msgstr "Copiar contactos a"
 msgid "Card View"
 msgstr "Vista de la tarjeta"
 
+<<<<<<< HEAD
 #: ../addressbook/importers/evolution-csv-importer.c:741
 #: ../addressbook/importers/evolution-ldif-importer.c:539
 #: ../addressbook/importers/evolution-vcard-importer.c:282
@@ -1476,18 +1926,75 @@ msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:649
+=======
+#: ../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 "Importando…"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1075
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr "VSC o Tab de Outlook (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1076
+msgid "Outlook CSV and Tab Importer"
+msgstr "Importador de VSC y Tab"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1084
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr "VSC o Tab de Mozilla (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1085
+msgid "Mozilla CSV and Tab Importer"
+msgstr "Importador de VSC y Tab de Mozilla"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1093
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr "VSC o Tab de Evolution (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1094
+msgid "Evolution CSV and Tab Importer"
+msgstr "Importador de VSC y Tab de Evolution"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:796
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "Formato de intercambio de datos LDAP (.ldif)"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:797
+msgid "Evolution LDIF importer"
+msgstr "Importador de LDIF de Evolution"
+
+#: ../addressbook/importers/evolution-vcard-importer.c:658
+msgid "vCard (.vcf, .gcrd)"
+msgstr "vCard (.vcf, .gcrd)"
+
+#: ../addressbook/importers/evolution-vcard-importer.c:659
+>>>>>>> master
 msgid "Evolution vCard Importer"
 msgstr "Importador de vCard de Evolution"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
+<<<<<<< HEAD
 #: ../addressbook/printing/e-contact-print.c:716
+=======
+#: ../addressbook/printing/e-contact-print.c:719
+>>>>>>> master
 #, c-format
 msgid "Page %d"
 msgstr "Página %d"
 
+<<<<<<< HEAD
 #: ../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
+>>>>>>> master
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
 msgid "Can not open file"
 msgstr "No es posible abrir el archivo"
@@ -1499,6 +2006,7 @@ msgstr "No se pudo obtener la lista de libretas de direcciones: %s"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+<<<<<<< HEAD
 #: ../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
@@ -1506,6 +2014,13 @@ msgstr "No se pudo obtener la lista de libretas de direcciones: %s"
 #: ../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
+=======
+#: ../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
+>>>>>>> master
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -1550,13 +2065,18 @@ msgstr ""
 msgid "NUMBER"
 msgstr "NÚMERO"
 
+<<<<<<< HEAD
 #: ../addressbook/tools/evolution-addressbook-export.c:138
+=======
+#: ../addressbook/tools/evolution-addressbook-export.c:139
+>>>>>>> master
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Error en los argumentos de la línea de comandos, use la opción --help para "
 "ver el uso."
 
+<<<<<<< HEAD
 #: ../addressbook/tools/evolution-addressbook-export.c:152
 msgid "Only support csv or vcard format."
 msgstr "Sólo se soportan los los formatos csv o vcard."
@@ -1570,12 +2090,35 @@ msgid "In normal mode, there is no need for the size option."
 msgstr "En modo normal, no hay necesidad de la opción de tamaño."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:200
+=======
+#: ../addressbook/tools/evolution-addressbook-export.c:153
+msgid "Only support csv or vcard format."
+msgstr "Sólo se soportan los los formatos csv o vcard."
+
+#: ../addressbook/tools/evolution-addressbook-export.c:162
+msgid "In async mode, output must be file."
+msgstr "En modo asíncrono, la salida debe ser un archivo."
+
+#: ../addressbook/tools/evolution-addressbook-export.c:170
+msgid "In normal mode, there is no need for the size option."
+msgstr "En modo normal, no hay necesidad de la opción de tamaño."
+
+#: ../addressbook/tools/evolution-addressbook-export.c:201
+>>>>>>> master
 msgid "Unhandled error"
 msgstr "Error no tratado"
 
 #. 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}» no soporta asignación de tareas, seleccione una lista de tareas "
+"diferentes."
+
+#. 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 ""
@@ -1583,7 +2126,7 @@ msgstr ""
 "calendario diferente de la barra lateral en la vista del calendario."
 
 #. 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."
@@ -1591,7 +2134,7 @@ msgstr ""
 "«{0}» es calendario de sólo lectura y no se puede modificar. Seleccione un "
 "calendario diferente que pueda aceptar citas."
 
-#: ../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."
@@ -1599,7 +2142,7 @@ msgstr ""
 "Añadir un resumen con sentido a su cita dará a sus destinatarios una idea de "
 "qué trata su cita."
 
-#: ../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."
@@ -1607,149 +2150,168 @@ msgstr ""
 "Añadir un resumen con sentido a su tarea dará a sus destinatarios una idea "
 "de qué trata su tarea."
 
-#: ../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 ""
 "Toda la información de estas notas se eliminará y no se podrá recuperar."
 
-#: ../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 "Toda la información en esta nota se eliminará y no se podrá recuperar."
 
-#: ../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 ""
 "Toda la información de estas citas se eliminará y no se podrá recuperar."
 
-#: ../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 ""
 "Toda la información de estas tareas se eliminará y no se podrá recuperar."
 
-#: ../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 "Toda la información de esta cita se eliminará y no se podrá recuperar."
 
-#: ../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 ""
 "Toda la información acerca de esta reunión se eliminará y no se podrá "
 "recuperar."
 
-#: ../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 ""
 "Toda la información acerca de esta nota se eliminará y no se podrá recuperar."
 
-#: ../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 ""
 "Toda la información acerca de esta tarea se eliminará y no se podrá "
 "recuperar."
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "¿Seguro que quiere eliminar la tarea «{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 "¿Seguro que quiere eliminar la cita titulada «{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 "¿Seguro que quiere eliminar la reunión titulada «{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 "¿Seguro que quiere eliminar la nota «{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 "¿Seguro que quiere eliminar estas {0} citas?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "¿Seguro que quiere eliminar estas {0} notas?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:23
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "¿Seguro que quiere eliminar estas {0} tareas?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:24
 msgid "Are you sure you want to delete this appointment?"
 msgstr "¿Seguro que quiere eliminar esta cita?"
 
+<<<<<<< HEAD
 #: ../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:191
+>>>>>>> master
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "¿Seguro que quiere eliminar esta reunión?"
 
+<<<<<<< HEAD
 #: ../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:197
+>>>>>>> master
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "¿Seguro que quiere eliminar esta nota?"
 
+<<<<<<< HEAD
 #: ../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:194
+>>>>>>> master
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "¿Seguro que quiere eliminar esta tarea?"
 
-#: ../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 "¿Seguro que quiere guardar la cita sin un resumen?"
 
-#: ../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 "¿Seguro que quiere guardar la nota sin un resumen?"
 
-#: ../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 "¿Seguro que quiere guardar la tarea sin un resumen?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:31
 msgid "Cannot create a new event"
 msgstr "No es posible crear un acontecimiento nuevo"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:32
 msgid "Cannot save event"
 msgstr "No se puede guardar el acontecimiento"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:33
+msgid "Cannot save task"
+msgstr "No se puede guardar la tarea"
+
+#: ../calendar/calendar.error.xml.h:34
 msgid "Delete calendar '{0}'?"
 msgstr "¿Quiere eliminar el calendario «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Delete memo list '{0}'?"
 msgstr "¿Quiere la lista de notas «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Delete task list '{0}'?"
 msgstr "¿Quiere eliminar la lista de tareas «{0}»?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
 msgid "Do _not Send"
 msgstr "_No enviar"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Descarga en progreso. ¿Desea guardar la cita?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Descarga en progreso. ¿Desea guardar la tarea?"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Editor could not be loaded."
 msgstr "No es posible cargar el editor."
 
-#: ../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."
@@ -1757,32 +2319,40 @@ msgstr ""
 "Se enviarán invitaciones por correo-e a todos los participantes y se les "
 "permitirá aceptar esta tarea."
 
-#: ../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 ""
 "Se enviarán invitaciones por correo-e a todos los participantes y se les "
 "permitirá responder."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:44
 msgid "Error loading calendar"
 msgstr "Error al cargar el calendario"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid "Error loading memo list"
 msgstr "Error al cargar la lista de notas"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid "Error loading task list"
 msgstr "Error al cargar la lista de tareas"
 
 #. 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
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:46
 msgid "Error on {0}: {1}"
 msgstr "Error en {0}: {1}"
 
 #: ../calendar/calendar.error.xml.h:47
+=======
+#: ../calendar/calendar.error.xml.h:49
+msgid "Error on {0}: {1}"
+msgstr "Error en {0}: {1}"
+
+#: ../calendar/calendar.error.xml.h:50
+>>>>>>> master
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -1790,7 +2360,11 @@ msgstr ""
 "Si no envía una notificación de cancelación, los otros participantes quizá "
 "no sepan que la reunión se ha cancelado."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:48
+=======
+#: ../calendar/calendar.error.xml.h:51
+>>>>>>> master
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -1798,7 +2372,11 @@ msgstr ""
 "Si no envía una notificación de cancelación, los otros participantes quizá "
 "no sepan que la nota se ha borrado."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:49
+=======
+#: ../calendar/calendar.error.xml.h:52
+>>>>>>> master
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -1806,7 +2384,11 @@ msgstr ""
 "Si no envía una notificación de cancelación, los otros participantes quizá "
 "no sepan que la tarea ha sido borrada."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:50
+=======
+#: ../calendar/calendar.error.xml.h:53
+>>>>>>> master
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -1814,7 +2396,11 @@ msgstr ""
 "Al enviar información actualizada permite que otros participantes mantengan "
 "sus calendarios al día."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:51
+=======
+#: ../calendar/calendar.error.xml.h:54
+>>>>>>> master
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -1822,7 +2408,11 @@ msgstr ""
 "El envío de información actualizada permite que otros participantes "
 "mantengan su lista de tareas al día."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:52
+=======
+#: ../calendar/calendar.error.xml.h:55
+>>>>>>> master
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -1830,7 +2420,11 @@ msgstr ""
 "Hay algunos adjuntos descargándose. Guardar la cita podría resultar en la "
 "pérdida de esos adjuntos."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:53
+=======
+#: ../calendar/calendar.error.xml.h:56
+>>>>>>> master
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -1838,12 +2432,17 @@ msgstr ""
 "Hay algunos adjuntos descargándose. Guardar la tarea podría resultar en la "
 "pérdida de esos adjuntos."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:54
+=======
+#: ../calendar/calendar.error.xml.h:57
+>>>>>>> master
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Algunas características quizá no funcionen correctamente con su servidor "
 "actual."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "El calendario de Evolution ha terminado inesperadamente."
@@ -1905,10 +2504,74 @@ msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "¿Quiere enviar una notificación de cancelación para esta nota?"
 
 #: ../calendar/calendar.error.xml.h:70
+=======
+#: ../calendar/calendar.error.xml.h:58
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "El calendario de Evolution ha terminado inesperadamente."
+
+#: ../calendar/calendar.error.xml.h:59
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "El calendario de Evolution ha terminado inesperadamente."
+
+#: ../calendar/calendar.error.xml.h:60
+msgid "The Evolution memo has quit unexpectedly."
+msgstr "Las notas de Evolution han terminado inesperadamente."
+
+#: ../calendar/calendar.error.xml.h:61
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr "Las tareas de Evolution han terminado inesperadamente."
+
+#: ../calendar/calendar.error.xml.h:62
+msgid "The calendar is not marked for offline usage."
+msgstr "El calendario no está marcado para usarse sin conexión."
+
+#: ../calendar/calendar.error.xml.h:63
+msgid "The memo list is not marked for offline usage."
+msgstr "La lista de notas no está marcada para usarse sin conexión."
+
+#: ../calendar/calendar.error.xml.h:64
+msgid "The task list is not marked for offline usage."
+msgstr "La lista de tareas no está marcada para usarse sin conexión."
+
+#: ../calendar/calendar.error.xml.h:65
+msgid "This calendar will be removed permanently."
+msgstr "Este calendario se eliminará permanentemente."
+
+#: ../calendar/calendar.error.xml.h:66
+msgid "This memo list will be removed permanently."
+msgstr "Esta lista de notas se eliminará permanentemente."
+
+#: ../calendar/calendar.error.xml.h:67
+msgid "This task list will be removed permanently."
+msgstr "Esta lista de tareas se eliminará permanentemente."
+
+#: ../calendar/calendar.error.xml.h:68
+msgid "Would you like to save your changes to this appointment?"
+msgstr "¿Desea guardar los cambios de esta cita?"
+
+#: ../calendar/calendar.error.xml.h:69
+msgid "Would you like to save your changes to this meeting?"
+msgstr "¿Quiere guardar los cambios de esta reunión?"
+
+#: ../calendar/calendar.error.xml.h:70
+msgid "Would you like to save your changes to this memo?"
+msgstr "¿Quiere guardar los cambios de esta nota?"
+
+#: ../calendar/calendar.error.xml.h:71
+msgid "Would you like to save your changes to this task?"
+msgstr "¿Quiere guardar los cambios de esta tarea?"
+
+#: ../calendar/calendar.error.xml.h:72
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr "¿Quiere enviar una notificación de cancelación para esta nota?"
+
+#: ../calendar/calendar.error.xml.h:73
+>>>>>>> master
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr ""
 "¿Quiere enviar a todos los participantes una notificación de cancelación?"
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "¿Quiere enviar invitaciones a la reunión a los participantes?"
@@ -1918,16 +2581,35 @@ msgid "Would you like to send this task to participants?"
 msgstr "¿Quiere enviar esta tarea a los participantes?"
 
 #: ../calendar/calendar.error.xml.h:73
+=======
+#: ../calendar/calendar.error.xml.h:74
+msgid "Would you like to send meeting invitations to participants?"
+msgstr "¿Quiere enviar invitaciones a la reunión a los participantes?"
+
+#: ../calendar/calendar.error.xml.h:75
+msgid "Would you like to send this task to participants?"
+msgstr "¿Quiere enviar esta tarea a los participantes?"
+
+#: ../calendar/calendar.error.xml.h:76
+>>>>>>> master
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 "¿Quiere enviar información de la reunión actualizada a los participantes?"
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:74
+=======
+#: ../calendar/calendar.error.xml.h:77
+>>>>>>> master
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 "¿Quiere enviar información actualizada de las tareas a los participantes?"
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:75
+=======
+#: ../calendar/calendar.error.xml.h:78
+>>>>>>> master
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -1937,6 +2619,7 @@ msgstr ""
 "problemas usando Evolution. Para los mejores resultados el servidor debería "
 "actualizarse a una versión soportada."
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:76
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Ha cambiado esta cita, pero no la ha guardado aún."
@@ -1966,10 +2649,42 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Sus tareas no estarán disponibles hasta que reinicie Evolution."
 
 #: ../calendar/calendar.error.xml.h:83
+=======
+#: ../calendar/calendar.error.xml.h:79
+msgid "You have changed this appointment, but not yet saved it."
+msgstr "Ha cambiado esta cita, pero no la ha guardado aún."
+
+#: ../calendar/calendar.error.xml.h:80
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "Ha realizado cambios en esta reunión, pero no la ha guardado aún."
+
+#: ../calendar/calendar.error.xml.h:81
+msgid "You have changed this task, but not yet saved it."
+msgstr "Ha realizado cambios en esta tarea, pero no la ha guardado aún."
+
+#: ../calendar/calendar.error.xml.h:82
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr "Ha realizado cambios en esta nota, pero no los ha guardado aún."
+
+#: ../calendar/calendar.error.xml.h:83
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr "Sus calendarios no estarán disponibles hasta que reinicie Evolution."
+
+#: ../calendar/calendar.error.xml.h:84
+msgid "Your memos will not be available until Evolution is restarted."
+msgstr "Sus notas no estarán disponibles hasta que reinicie Evolution."
+
+#: ../calendar/calendar.error.xml.h:85
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr "Sus tareas no estarán disponibles hasta que reinicie Evolution."
+
+#: ../calendar/calendar.error.xml.h:86
+>>>>>>> master
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "_Descartar cambios"
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:317
 msgid "_Save"
 msgstr "_Guardar"
@@ -1979,38 +2694,72 @@ msgid "_Save Changes"
 msgstr "_Guardar cambios"
 
 #: ../calendar/calendar.error.xml.h:86
+=======
+#: ../calendar/calendar.error.xml.h:87 ../composer/e-composer-actions.c:317
+msgid "_Save"
+msgstr "_Guardar"
+
+#: ../calendar/calendar.error.xml.h:88
+msgid "_Save Changes"
+msgstr "_Guardar cambios"
+
+#: ../calendar/calendar.error.xml.h:89
+>>>>>>> master
 #: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Enviar"
 
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:87
 msgid "_Send Notice"
 msgstr "_Enviar notificación"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
+=======
+#: ../calendar/calendar.error.xml.h:90
+msgid "_Send Notice"
+msgstr "_Enviar notificación"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:107
+>>>>>>> master
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+=======
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+>>>>>>> master
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+<<<<<<< HEAD
 #. (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:1190
+>>>>>>> master
 msgid "day"
 msgid_plural "days"
 msgstr[0] "día"
 msgstr[1] "días"
 
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:303
+=======
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:313
+>>>>>>> master
 msgid "Start time"
 msgstr "Hora de inicio"
 
@@ -2024,9 +2773,15 @@ msgstr "Descartar _todo"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
+<<<<<<< HEAD
 #: ../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:1739
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1749
+#: ../plugins/itip-formatter/itip-view.c:1052
+>>>>>>> master
 msgid "Location:"
 msgstr "Lugar:"
 
@@ -2034,7 +2789,11 @@ msgstr "Lugar:"
 msgid "Snooze _time:"
 msgstr "_Posponer durante:"
 
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:916
+=======
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:919
+>>>>>>> master
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "_Descartar"
@@ -2046,18 +2805,28 @@ msgstr "_Posponer"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:428
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
 #: ../plugins/google-account-setup/google-contacts-source.c:379
+=======
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../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:387
+>>>>>>> master
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "days"
 msgstr "días"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:453
 #: ../filter/filter.ui.h:15
+<<<<<<< HEAD
 #: ../plugins/google-account-setup/google-contacts-source.c:378
+=======
+#: ../plugins/google-account-setup/google-contacts-source.c:386
+>>>>>>> master
 msgid "hours"
 msgstr "horas"
 
@@ -2068,8 +2837,9 @@ msgstr "lugar de la cita"
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../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
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:452
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
+<<<<<<< HEAD
 #: ../plugins/google-account-setup/google-contacts-source.c:377
 msgid "minutes"
 msgstr "minutos"
@@ -2089,18 +2859,48 @@ msgid "No location information available."
 msgstr "No hay información del lugar disponible."
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1649
+=======
+#: ../plugins/google-account-setup/google-contacts-source.c:385
+msgid "minutes"
+msgstr "minutos"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+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
+msgid "No description available."
+msgstr "No hay descripción disponible."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1607
+msgid "No location information available."
+msgstr "No hay información del lugar disponible."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
+>>>>>>> master
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "Tiene un recordatorio"
 msgstr[1] "Tiene %d recordatorios"
 
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1848
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1882
 msgid "Warning"
 msgstr "Advertencia"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1852
+=======
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1853
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
+msgid "Warning"
+msgstr "Advertencia"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1857
+>>>>>>> master
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2112,7 +2912,11 @@ msgstr ""
 "configurado para enviar un mensaje de correo-e.  En su lugar\n"
 "Evolution mostrará un diálogo de recordatorio normal."
 
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1888
+=======
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1894
+>>>>>>> master
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2129,17 +2933,26 @@ msgstr ""
 "\n"
 "¿Está seguro que quiere ejecutar este programa?"
 
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1903
+=======
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1909
+>>>>>>> master
 msgid "Do not ask me about this program again."
 msgstr "No preguntar otra vez sobre este programa."
 
-#: ../calendar/gui/alarm-notify/util.c:44
+#: ../calendar/gui/alarm-notify/util.c:45
 msgid "invalid time"
 msgstr "hora inválida"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:396
 #: ../calendar/gui/misc.c:116
+=======
+#: ../calendar/gui/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/misc.c:118
+>>>>>>> master
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -2147,8 +2960,13 @@ msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:402
 #: ../calendar/gui/misc.c:122
+=======
+#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:411
+#: ../calendar/gui/misc.c:124
+>>>>>>> master
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2158,8 +2976,13 @@ msgstr[1] "%d minutos"
 #. 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")
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:408
 #: ../calendar/gui/misc.c:126
+=======
+#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:417
+#: ../calendar/gui/misc.c:128
+>>>>>>> master
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -2169,6 +2992,21 @@ msgstr[1] "%d segundos"
 #: ../calendar/gui/calendar-view-factory.c:116
 msgid "Day View"
 msgstr "Vista diaria"
+<<<<<<< HEAD
+
+#: ../calendar/gui/calendar-view-factory.c:119
+msgid "Work Week View"
+msgstr "Vista de la semana laboral"
+
+#: ../calendar/gui/calendar-view-factory.c:122
+msgid "Week View"
+msgstr "Vista semanal"
+
+#: ../calendar/gui/calendar-view-factory.c:125
+msgid "Month View"
+msgstr "Vista mensual"
+
+=======
 
 #: ../calendar/gui/calendar-view-factory.c:119
 msgid "Work Week View"
@@ -2182,6 +3020,7 @@ msgstr "Vista semanal"
 msgid "Month View"
 msgstr "Vista mensual"
 
+>>>>>>> master
 #: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
@@ -2207,15 +3046,24 @@ msgstr "Categoría"
 msgid "Classification"
 msgstr "Clasificación"
 
+<<<<<<< HEAD
 #: ../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/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:243
+#: ../calendar/gui/e-cal-model.c:779 ../calendar/gui/e-task-table.c:504
+>>>>>>> master
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Confidencial"
 
 #: ../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
+<<<<<<< HEAD
 #: ../modules/plugin-manager/evolution-plugin-manager.c:71
+=======
+#: ../modules/plugin-manager/evolution-plugin-manager.c:70
+>>>>>>> master
 #: ../widgets/misc/e-attachment-tree-view.c:526
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
@@ -2238,9 +3086,15 @@ msgstr "Existen"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
+<<<<<<< HEAD
 #: ../plugins/publish-calendar/publish-calendar.c:835
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:386
+=======
+#: ../plugins/publish-calendar/publish-calendar.c:863
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../plugins/save-calendar/csv-format.c:397
+>>>>>>> master
 msgid "Location"
 msgstr "Lugar"
 
@@ -2249,15 +3103,26 @@ msgstr "Lugar"
 msgid "Organizer"
 msgstr "Organizador"
 
+<<<<<<< HEAD
 #: ../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:14 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:777 ../calendar/gui/e-task-table.c:503
+>>>>>>> master
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privado"
 
+<<<<<<< HEAD
 #: ../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/memotypes.xml.h:13
+=======
+#: ../calendar/gui/caltypes.xml.h:15 ../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
+>>>>>>> master
 msgid "Public"
 msgstr "Público"
 
@@ -2273,7 +3138,11 @@ msgstr "Repetición"
 #: ../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
+<<<<<<< HEAD
 #: ../plugins/save-calendar/csv-format.c:372
+=======
+#: ../plugins/save-calendar/csv-format.c:383
+>>>>>>> master
 msgid "Summary"
 msgstr "Resumen"
 
@@ -2302,6 +3171,7 @@ msgstr "es"
 msgid "is not"
 msgstr "no es"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/alarm-dialog.c:626
 msgid "Edit Reminder"
 msgstr "Editar recordatorio"
@@ -2323,6 +3193,29 @@ msgstr "Ejecutar un programa"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:820
 #: ../calendar/gui/e-alarm-list.c:442
+=======
+#: ../calendar/gui/dialogs/alarm-dialog.c:636
+msgid "Edit Reminder"
+msgstr "Editar recordatorio"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:827
+#: ../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/e-alarm-list.c:443
+msgid "Play a sound"
+msgstr "Reproducir un sonido"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:829
+#: ../calendar/gui/e-alarm-list.c:455
+msgid "Run a program"
+msgstr "Ejecutar un programa"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:830
+#: ../calendar/gui/e-alarm-list.c:451
+>>>>>>> master
 msgid "Send an email"
 msgstr "Enviar un correo-e"
 
@@ -2412,7 +3305,11 @@ msgstr "minuto(s)"
 msgid "start of appointment"
 msgstr "inicio de la cita"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:240
+=======
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:245
+>>>>>>> master
 msgid "Action/Trigger"
 msgstr "Acción/Disparador"
 
@@ -2426,6 +3323,7 @@ msgstr "Aña_dir"
 msgid "Reminders"
 msgstr "Recordatorios"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/calendar-setup.c:164
 msgid "Type:"
 msgstr "Tipo:"
@@ -2436,29 +3334,54 @@ msgid "_Type:"
 msgstr "_Tipo:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:242 ../mail/mail-config.ui.h:155
+=======
+#: ../calendar/gui/dialogs/calendar-setup.c:169
+msgid "Type:"
+msgstr "Tipo:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:185
+#: ../modules/addressbook/addressbook-config.c:530
+msgid "_Type:"
+msgstr "_Tipo:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:155
+>>>>>>> master
 #: ../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 "_Nombre:"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/calendar-setup.c:291
+=======
+#: ../calendar/gui/dialogs/calendar-setup.c:300
+>>>>>>> master
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 "C_opiar el contenido del calendario localmente para trabajar desconectado"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/calendar-setup.c:293
+=======
+#: ../calendar/gui/dialogs/calendar-setup.c:302
+>>>>>>> master
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "Co_piar el contenido del la lista de tareas localmente para trabajar "
 "desconectado"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/calendar-setup.c:295
+=======
+#: ../calendar/gui/dialogs/calendar-setup.c:304
+>>>>>>> master
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 "Copia_r el contenido de la lista de notas localmente para trabajar "
 "desconectado"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/calendar-setup.c:340
 msgid "Sh_ow reminder notifications"
 msgstr "M_ostrar notificaciones de recordatorios"
@@ -2475,16 +3398,39 @@ msgstr "Colo_r:"
 #: ../modules/addressbook/autocompletion-config.c:218
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
 #: ../plugins/itip-formatter/itip-formatter.c:3001
+=======
+#: ../calendar/gui/dialogs/calendar-setup.c:350
+msgid "Sh_ow reminder notifications"
+msgstr "M_ostrar notificaciones de recordatorios"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:425
+msgid "Colo_r:"
+msgstr "Colo_r:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:448
+#: ../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/calendar/e-calendar-preferences.ui.h:17
+#: ../plugins/itip-formatter/itip-formatter.c:3045
+>>>>>>> master
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "General"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/calendar-setup.c:449
+=======
+#: ../calendar/gui/dialogs/calendar-setup.c:461
+>>>>>>> master
 #: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Task List"
 msgstr "Lista de tareas"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/calendar-setup.c:460
 msgid "Memo List"
 msgstr "Lista de notas"
@@ -2526,15 +3472,63 @@ msgid "This memo has been deleted."
 msgstr "Se ha borrado esta nota."
 
 #: ../calendar/gui/dialogs/changed-comp.c:76
+=======
+#: ../calendar/gui/dialogs/calendar-setup.c:472
+msgid "Memo List"
+msgstr "Lista de notas"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:564
+msgid "Calendar Properties"
+msgstr "Propiedades del calendario"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:564
+msgid "New Calendar"
+msgstr "Calendario nuevo"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:624
+msgid "Task List Properties"
+msgstr "Propiedades de lista de tareas"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:624
+msgid "New Task List"
+msgstr "Lista de tareas nueva"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:684
+msgid "Memo List Properties"
+msgstr "Propiedades de lista de notas"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:684
+msgid "New Memo List"
+msgstr "Lista de notas nueva"
+
+#: ../calendar/gui/dialogs/changed-comp.c:62
+msgid "This event has been deleted."
+msgstr "Se ha borrado este acontecimiento."
+
+#: ../calendar/gui/dialogs/changed-comp.c:66
+msgid "This task has been deleted."
+msgstr "Se ha borrado esta tarea."
+
+#: ../calendar/gui/dialogs/changed-comp.c:70
+msgid "This memo has been deleted."
+msgstr "Se ha borrado esta nota."
+
+#: ../calendar/gui/dialogs/changed-comp.c:79
+>>>>>>> master
 #, 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?"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/changed-comp.c:78
+=======
+#: ../calendar/gui/dialogs/changed-comp.c:81
+>>>>>>> master
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  No ha hecho cambios, ¿quiere cerrar el editor?"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
 msgstr "Este acontecimiento ha cambiado."
@@ -2548,22 +3542,46 @@ msgid "This memo has been changed."
 msgstr "Esta nota ha cambiado."
 
 #: ../calendar/gui/dialogs/changed-comp.c:100
+=======
+#: ../calendar/gui/dialogs/changed-comp.c:86
+msgid "This event has been changed."
+msgstr "Este acontecimiento ha cambiado."
+
+#: ../calendar/gui/dialogs/changed-comp.c:90
+msgid "This task has been changed."
+msgstr "Esta tarea ha cambiado."
+
+#: ../calendar/gui/dialogs/changed-comp.c:94
+msgid "This memo has been changed."
+msgstr "Esta nota ha cambiado."
+
+#: ../calendar/gui/dialogs/changed-comp.c:103
+>>>>>>> master
 #, 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?"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/changed-comp.c:102
+=======
+#: ../calendar/gui/dialogs/changed-comp.c:105
+>>>>>>> master
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No ha realizado cambios, ¿quiere actualizar el editor?"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor-page.c:458
+=======
+#: ../calendar/gui/dialogs/comp-editor-page.c:461
+>>>>>>> master
 #, c-format
 msgid "Validation error: %s"
 msgstr "Error de validación: %s"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:273
 msgid "Could not save attachments"
 msgstr "No se pudieron guardar los adjuntos"
@@ -2577,30 +3595,62 @@ msgid "Edit Appointment"
 msgstr "Editar cita"
 
 #: ../calendar/gui/dialogs/comp-editor.c:746
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:274
+msgid "Could not save attachments"
+msgstr "No se pudieron guardar los adjuntos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:620
+msgid "Could not update object"
+msgstr "No es posible actualizar el objeto"
+
+#: ../calendar/gui/dialogs/comp-editor.c:748
+msgid "Edit Appointment"
+msgstr "Editar cita"
+
+#: ../calendar/gui/dialogs/comp-editor.c:755
+>>>>>>> master
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunión: %s"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:748
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:757
+>>>>>>> master
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita: %s"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:754
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:763
+>>>>>>> master
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarea asignada: %s"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:756
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:765
+>>>>>>> master
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea: %s"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:761
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:770
+>>>>>>> master
 #, c-format
 msgid "Memo - %s"
 msgstr "Nota - %s"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:777
 msgid "No Summary"
 msgstr "Sin resumen"
@@ -2614,51 +3664,98 @@ msgid "Close the current window"
 msgstr "Cerrar la ventana actual"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1106 ../mail/e-mail-browser.c:141
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:786
+msgid "No Summary"
+msgstr "Sin resumen"
+
+#: ../calendar/gui/dialogs/comp-editor.c:907
+msgid "Keep original item?"
+msgstr "¿Mantener el elemento original?"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1120
+msgid "Close the current window"
+msgstr "Cerrar la ventana actual"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1127 ../mail/e-mail-browser.c:141
+>>>>>>> master
 #: ../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 "Copiar la selección"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:1113 ../mail/e-mail-browser.c:148
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:148
+>>>>>>> master
 #: ../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 "Cortar la selección"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:1120
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:1141
+>>>>>>> master
 #: ../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 "Eliminar la selección"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:1127
 msgid "View help"
 msgstr "Ver la ayuda"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:155
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:1148
+msgid "View help"
+msgstr "Ver la ayuda"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1155 ../mail/e-mail-browser.c:155
+>>>>>>> master
 #: ../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 "Pega el contenido del porta papeles"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:1155
 msgid "Save current changes"
 msgstr "Guardar los cambios actuales"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1162 ../mail/e-mail-browser.c:162
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:1176
+msgid "Save current changes"
+msgstr "Guardar los cambios actuales"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:162
+>>>>>>> master
 #: ../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 "Selecciona todo el texto"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:1169
 msgid "_Classification"
 msgstr "_Clasificación"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1176
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:1190
+msgid "_Classification"
+msgstr "_Clasificación"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1197
+>>>>>>> master
 #: ../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
@@ -2667,42 +3764,71 @@ msgstr "_Clasificación"
 msgid "_Edit"
 msgstr "_Editar"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:169
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:1204 ../mail/e-mail-browser.c:169
+>>>>>>> master
 #: ../shell/e-shell-window-actions.c:1609
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "_Archivo"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:1190
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:1211
+>>>>>>> master
 #: ../shell/e-shell-window-actions.c:1616
 msgid "_Help"
 msgstr "Ay_uda"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:1197
 msgid "_Insert"
 msgstr "_Insertar"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1204
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:1218
+msgid "_Insert"
+msgstr "_Insertar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1225
+>>>>>>> master
 #: ../composer/e-composer-actions.c:340
 msgid "_Options"
 msgstr "_Opciones"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:1211 ../mail/e-mail-browser.c:183
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:1232 ../mail/e-mail-browser.c:183
+>>>>>>> master
 #: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "_Ver"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:1221
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:1242
+>>>>>>> master
 #: ../composer/e-composer-actions.c:289
 msgid "_Attachment..."
 msgstr "_Adjunto…"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:1223
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:1244
+>>>>>>> master
 #: ../composer/e-composer-actions.c:291
 #: ../widgets/misc/e-attachment-view.c:439
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:1231
 msgid "_Categories"
 msgstr "_Categorías"
@@ -2776,23 +3902,109 @@ msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Conmuta indicando si se muestra el campo «Tipo de participante»"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1324
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:1252
+msgid "_Categories"
+msgstr "_Categorías"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1254
+msgid "Toggles whether to display categories"
+msgstr "Conmuta cuando se muestran las categorías"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1260
+msgid "Time _Zone"
+msgstr "_Zona horaria"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Toggles whether the time zone is displayed"
+msgstr "Conmuta cuando se muestra la «Zona horaria»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1271
+msgid "Pu_blic"
+msgstr "Pú_blico"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1273
+msgid "Classify as public"
+msgstr "Clasificar como público"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1278
+msgid "_Private"
+msgstr "_Privado"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1280
+msgid "Classify as private"
+msgstr "Clasificar como privado"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1285
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1287
+msgid "Classify as confidential"
+msgstr "Clasificar como confidencial"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1295
+msgid "R_ole Field"
+msgstr "Campo «_Rol»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1297
+msgid "Toggles whether the Role field is displayed"
+msgstr "Conmuta cuando se muestra el campo «Rol»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1303
+msgid "_RSVP"
+msgstr "_Confirmar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1305
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Conmuta cuando se muestra el campo «Confirmar»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "_Status Field"
+msgstr "Campo de _estado"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1313
+msgid "Toggles whether the Status field is displayed"
+msgstr "Conmuta cuando se muestra el campo «Estado»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1319
+msgid "_Type Field"
+msgstr "Campo de _tipo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1321
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Conmuta indicando si se muestra el campo «Tipo de participante»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+>>>>>>> master
 #: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "_Documentos recientes"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:2053
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:2078
+>>>>>>> master
 #: ../composer/e-composer-actions.c:508
 msgid "Attach"
 msgstr "Adjuntar"
 
+<<<<<<< HEAD
 #: ../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:2428
+#: ../calendar/gui/dialogs/comp-editor.c:2591
+#: ../calendar/gui/dialogs/comp-editor.c:3581
+>>>>>>> master
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Los cambios efectuados a este elemento pueden descartarse si llega una "
 "actualización por correo"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/comp-editor.c:3497
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
@@ -2823,33 +4035,82 @@ 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:213
+=======
+#: ../calendar/gui/dialogs/comp-editor.c:3545
+#: ../plugins/prefer-plain/prefer-plain.c:67
+msgid "attachment"
+msgstr "adjunto"
+
+#: ../calendar/gui/dialogs/comp-editor.c:3613
+msgid "Unable to use current version!"
+msgstr "Imposible usar la versión actual."
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:114
+msgid "Could not open destination"
+msgstr "No se puede abrir el destino"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+msgid "Destination is read only"
+msgstr "El destino es de sólo lectura"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:164
+msgid "Cannot create object"
+msgstr "No se puede crear el objeto"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:193
+msgid "Could not open source"
+msgstr "No se puede abrir el origen"
+
+#: ../calendar/gui/dialogs/delete-comp.c:214
+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
+>>>>>>> master
 msgid "_Retract comment"
 msgstr "Co_ntraer comentario"
 
 #. Translators: The '%s' is replaced with a detailed error message
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/delete-error.c:56
+=======
+#: ../calendar/gui/dialogs/delete-error.c:57
+>>>>>>> master
 #, 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
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/delete-error.c:60
+=======
+#: ../calendar/gui/dialogs/delete-error.c:61
+>>>>>>> master
 #, 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
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/delete-error.c:64
+=======
+#: ../calendar/gui/dialogs/delete-error.c:65
+>>>>>>> master
 #, 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
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/delete-error.c:68
+=======
+#: ../calendar/gui/dialogs/delete-error.c:69
+>>>>>>> master
 #, 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"
 
+<<<<<<< HEAD
 #: ../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"
@@ -2863,29 +4124,60 @@ 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:84
+=======
+#: ../calendar/gui/dialogs/delete-error.c:76
+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
+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
+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
+>>>>>>> master
 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
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/delete-error.c:92
+=======
+#: ../calendar/gui/dialogs/delete-error.c:93
+>>>>>>> master
 #, 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
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/delete-error.c:96
+=======
+#: ../calendar/gui/dialogs/delete-error.c:97
+>>>>>>> master
 #, 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
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/delete-error.c:100
+=======
+#: ../calendar/gui/dialogs/delete-error.c:101
+>>>>>>> master
 #, 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
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/delete-error.c:104
+=======
+#: ../calendar/gui/dialogs/delete-error.c:105
+>>>>>>> master
 #, 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"
@@ -2952,13 +4244,21 @@ msgstr "_Disponibilidad"
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar información de disponibilidad para los participantes"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3184
+=======
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3310
+>>>>>>> master
 msgid "Appointment"
 msgstr "Cita"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
 #: ../calendar/gui/dialogs/event-page.ui.h:2
+<<<<<<< HEAD
 #: ../calendar/gui/e-meeting-list-view.c:160
+=======
+#: ../calendar/gui/e-meeting-list-view.c:161
+>>>>>>> master
 msgid "Attendees"
 msgstr "Participantes"
 
@@ -2981,7 +4281,11 @@ msgstr ""
 "organizador"
 
 #: ../calendar/gui/dialogs/event-page.c:651
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/event-page.c:3049
+=======
+#: ../calendar/gui/dialogs/event-page.c:3082
+>>>>>>> master
 msgid "This event has reminders"
 msgstr "Este acontecimiento tiene recordatorios."
 
@@ -2991,6 +4295,7 @@ msgstr "Este acontecimiento tiene recordatorios."
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/event-page.c:1262
 msgid "Event with no start date"
 msgstr "Acontecimiento sin fecha de inicio"
@@ -3076,18 +4381,113 @@ msgstr[0] "%d minuto antes de la cita"
 msgstr[1] "%d minutos antes de la cita"
 
 #: ../calendar/gui/dialogs/event-page.c:3309
+=======
+#: ../calendar/gui/dialogs/event-page.c:1263
+msgid "Event with no start date"
+msgstr "Acontecimiento sin fecha de inicio"
+
+#: ../calendar/gui/dialogs/event-page.c:1266
+msgid "Event with no end date"
+msgstr "Acontecimiento sin fecha de finalización"
+
+#: ../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 "La fecha de inicio está equivocada"
+
+#: ../calendar/gui/dialogs/event-page.c:1449
+msgid "End date is wrong"
+msgstr "La fecha de finalización está equivocada"
+
+#: ../calendar/gui/dialogs/event-page.c:1472
+msgid "Start time is wrong"
+msgstr "La hora de inicio está equivocada"
+
+#: ../calendar/gui/dialogs/event-page.c:1479
+msgid "End time is wrong"
+msgstr "La hora de finalización está equivocada"
+
+#: ../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 "Se requiere un organizador."
+
+#: ../calendar/gui/dialogs/event-page.c:1678
+#: ../calendar/gui/dialogs/task-page.c:913
+msgid "At least one attendee is required."
+msgstr "Es necesario por lo menos un participante."
+
+#: ../calendar/gui/dialogs/event-page.c:1885
+msgid "_Delegatees"
+msgstr "_Delegados"
+
+#: ../calendar/gui/dialogs/event-page.c:1887
+msgid "Atte_ndees"
+msgstr "_Participantes"
+
+#: ../calendar/gui/dialogs/event-page.c:2922
+#, c-format
+msgid "Unable to open the calendar '%s': %s"
+msgstr "No es posible abrir el calendario «%s»: %s"
+
+#. Translators: This string is used when we are creating an Event
+#. * (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
+#. Translators: This string is used when we are creating a Task
+#. * 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 "Está actuando en nombre de %s"
+
+#: ../calendar/gui/dialogs/event-page.c:3327
+#, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "%d día antes de la cita"
+msgstr[1] "%d días antes de la cita"
+
+#: ../calendar/gui/dialogs/event-page.c:3333
+#, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "%d hora antes de la cita"
+msgstr[1] "%d horas antes de la cita"
+
+#: ../calendar/gui/dialogs/event-page.c:3339
+#, c-format
+msgid "%d minute before appointment"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "%d minuto antes de la cita"
+msgstr[1] "%d minutos antes de la cita"
+
+#: ../calendar/gui/dialogs/event-page.c:3358
+>>>>>>> master
 msgid "Customize"
 msgstr "Personalizar"
 
 #. Translators: "None" for "No reminder set"
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/event-page.c:3315
+=======
+#: ../calendar/gui/dialogs/event-page.c:3364
+>>>>>>> master
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ninguno"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:1
 #: ../calendar/gui/dialogs/task-page.ui.h:1
+<<<<<<< HEAD
 #: ../calendar/gui/e-meeting-time-sel.c:563
+=======
+#: ../calendar/gui/e-meeting-time-sel.c:564
+>>>>>>> master
 msgid "Atte_ndees..."
 msgstr "_Participantes…"
 
@@ -3112,7 +4512,11 @@ msgid "_Description:"
 msgstr "_Descripción:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:12
+<<<<<<< HEAD
 #: ../plugins/calendar-weather/calendar-weather.c:366
+=======
+#: ../plugins/calendar-weather/calendar-weather.c:381
+>>>>>>> master
 msgid "_Location:"
 msgstr "_Lugar:"
 
@@ -3207,7 +4611,11 @@ msgid "Select Date"
 msgstr "Seleccionar fecha"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:13
+<<<<<<< HEAD
 #: ../modules/calendar/e-cal-shell-view-actions.c:1362
+=======
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+>>>>>>> master
 msgid "Select _Today"
 msgstr "Seleccionar _hoy"
 
@@ -3215,7 +4623,11 @@ msgstr "Seleccionar _hoy"
 msgid "September"
 msgstr "Septiembre"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3188
+=======
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3314
+>>>>>>> master
 msgid "Memo"
 msgstr "Nota"
 
@@ -3235,14 +4647,24 @@ msgstr "La nota no se puede editar porque es de sólo lectura"
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "La nota no se puede editar completamente porque no es el organizador"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/memo-page.c:930
+=======
+#: ../calendar/gui/dialogs/memo-page.c:936
+>>>>>>> master
 #, c-format
 msgid "Unable to open memos in '%s': %s"
 msgstr "No es posible abrir las notas en «%s»: %s"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/memo-page.c:1138 ../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
+=======
+#: ../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:2626
+#: ../mail/em-format-html.c:2691 ../mail/em-format-html.c:2715
+>>>>>>> master
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "Para"
@@ -3262,32 +4684,53 @@ msgid "T_o:"
 msgstr "_Para:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/task-page.c:333
+=======
+#: ../calendar/gui/dialogs/task-page.c:339
+>>>>>>> master
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_List:"
 msgstr "_Lista:"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/recur-comp.c:54
+=======
+#: ../calendar/gui/dialogs/recur-comp.c:55
+>>>>>>> master
 #, 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?"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/recur-comp.c:56
+=======
+#: ../calendar/gui/dialogs/recur-comp.c:57
+>>>>>>> master
 #, 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?"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/recur-comp.c:60
+=======
+#: ../calendar/gui/dialogs/recur-comp.c:61
+>>>>>>> master
 #, 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?"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/recur-comp.c:64
+=======
+#: ../calendar/gui/dialogs/recur-comp.c:65
+>>>>>>> master
 #, 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?"
 
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "Esta instancia únicamente"
@@ -3313,10 +4756,38 @@ msgid "Recurrence date is invalid"
 msgstr "La fecha de repetición es inválida"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1008
+=======
+#: ../calendar/gui/dialogs/recur-comp.c:91
+msgid "This Instance Only"
+msgstr "Esta instancia únicamente"
+
+#: ../calendar/gui/dialogs/recur-comp.c:95
+msgid "This and Prior Instances"
+msgstr "Esta instancia y las anteriores"
+
+#: ../calendar/gui/dialogs/recur-comp.c:101
+msgid "This and Future Instances"
+msgstr "Esta instancia y las futuras"
+
+#: ../calendar/gui/dialogs/recur-comp.c:106
+msgid "All Instances"
+msgstr "Todas las instancias"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:575
+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
+msgid "Recurrence date is invalid"
+msgstr "La fecha de repetición es inválida"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1004
+>>>>>>> master
 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 "
 "acontecimiento"
+<<<<<<< HEAD
 
 #. 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.
@@ -4058,6 +5529,757 @@ msgstr "%a %e/%m/%Y %H:%M:%S"
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %e/%m/%Y %I:%M:%S %p"
 
+=======
+
+#. 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
+msgid "on"
+msgstr "en"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
+msgid "first"
+msgstr "primer"
+
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1103
+msgid "second"
+msgstr "segundo"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
+msgid "third"
+msgstr "tercer"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+msgid "fourth"
+msgstr "cuarto"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (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
+msgid "fifth"
+msgstr "quinto"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
+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
+msgid "Other Date"
+msgstr "Otra fecha"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1153
+msgid "1st to 10th"
+msgstr "del 1 al 10"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1159
+msgid "11th to 20th"
+msgstr "del 11 al 20"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
+msgid "21st to 31st"
+msgstr "del 21 al 31"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
+msgid "Monday"
+msgstr "lunes"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "Tuesday"
+msgstr "martes"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
+msgid "Wednesday"
+msgstr "miércoles"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+msgid "Thursday"
+msgstr "jueves"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+msgid "Friday"
+msgstr "viernes"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1196
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
+msgid "Saturday"
+msgstr "sábado"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1197
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
+msgid "Sunday"
+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
+msgid "on the"
+msgstr "en el"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1496
+msgid "occurrences"
+msgstr "repeticiones"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2214
+msgid "Add exception"
+msgstr "Añadir excepción"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2255
+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
+msgid "Modify exception"
+msgstr "Modificar excepción"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2305
+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
+msgid "Date/Time"
+msgstr "Fecha/Hora"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
+msgid "Every"
+msgstr "Cada"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
+msgid "Exceptions"
+msgstr "Excepciones"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
+msgid "Preview"
+msgstr "Vista previa"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
+msgid "This appointment rec_urs"
+msgstr "Esta cita se _repite"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "día(s)"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgctxt "recurrpage"
+msgid "for"
+msgstr "durante"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+msgctxt "recurrpage"
+msgid "forever"
+msgstr "para siempre"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
+msgctxt "recurrpage"
+msgid "month(s)"
+msgstr "mes(es)"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+msgctxt "recurrpage"
+msgid "until"
+msgstr "hasta"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
+msgctxt "recurrpage"
+msgid "week(s)"
+msgstr "semana(s)"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+msgctxt "recurrpage"
+msgid "year(s)"
+msgstr "año(s)"
+
+#: ../calendar/gui/dialogs/send-comp.c:198
+msgid "Send my reminders with this event"
+msgstr "Enviar mis recordatorios con este evento"
+
+#: ../calendar/gui/dialogs/send-comp.c:200
+msgid "Notify new attendees _only"
+msgstr "Notificar sól_o a los participantes"
+
+#: ../calendar/gui/dialogs/task-details-page.c:351
+#: ../calendar/gui/dialogs/task-details-page.c:373
+msgid "Completed date is wrong"
+msgstr "La fecha de terminación es errónea"
+
+#: ../calendar/gui/dialogs/task-details-page.c:488
+msgid "Web Page"
+msgstr "Página web"
+
+#. 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: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
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
+#, c-format
+msgid "Canceled"
+msgstr "Cancelado"
+
+#. 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: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:217 ../calendar/gui/e-task-table.c:232
+#: ../calendar/gui/e-task-table.c:605 ../calendar/gui/print.c:3397
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:387
+msgid "Completed"
+msgstr "Terminado"
+
+#. 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:526 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1274 ../widgets/misc/e-send-options.ui.h:13
+msgid "High"
+msgstr "Alta"
+
+#. 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: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:3394
+msgid "In Progress"
+msgstr "En proceso"
+
+#. 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:528 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1272 ../widgets/misc/e-send-options.ui.h:14
+msgid "Low"
+msgstr "Baja"
+
+#. 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: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"
+msgstr "Normal"
+
+#. 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: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
+msgid "Not Started"
+msgstr "Sin comenzar"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
+msgid "P_ercent complete:"
+msgstr "_Porcentaje completado:"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
+msgid "Stat_us:"
+msgstr "_Estado:"
+
+#. 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-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
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Estado"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:20
+#: ../calendar/gui/e-task-table.c:529 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:27
+msgid "Undefined"
+msgstr "Sin definir"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:21
+msgid "_Date completed:"
+msgstr "_Fecha de terminación:"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:35
+msgid "_Priority:"
+msgstr "_Prioridad:"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:23
+msgid "_Web Page:"
+msgstr "Página _web:"
+
+#: ../calendar/gui/dialogs/task-editor.c:116
+msgid "_Status Details"
+msgstr "Detalles de _estado"
+
+#: ../calendar/gui/dialogs/task-editor.c:118
+msgid "Click to change or view the status details of the task"
+msgstr "Pulse para cambiar o ver los detalles del estado de la tarea"
+
+#: ../calendar/gui/dialogs/task-editor.c:126
+msgid "_Send Options"
+msgstr "Opciones de _envío"
+
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3312
+#: ../widgets/misc/e-send-options.c:535
+msgid "Task"
+msgstr "Tarea"
+
+#: ../calendar/gui/dialogs/task-editor.c:324
+msgid "Task Details"
+msgstr "Detalles"
+
+#: ../calendar/gui/dialogs/task-editor.c:366
+msgid "Print this task"
+msgstr "Imprimir esta tarea"
+
+#: ../calendar/gui/dialogs/task-page.c:251
+msgid "Task's start date is in the past"
+msgstr "La hora de inicio de la tarea esta� en el pasado"
+
+#: ../calendar/gui/dialogs/task-page.c:252
+msgid "Task's due date is in the past"
+msgstr "La fecha de vencimiento de la tarea está en el pasado"
+
+#: ../calendar/gui/dialogs/task-page.c:286
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "No se puede editar la tarea porque es de sólo lectura"
+
+#: ../calendar/gui/dialogs/task-page.c:290
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "No se puede editar completamente la tarea porque no es el organizador"
+
+#: ../calendar/gui/dialogs/task-page.c:294
+msgid ""
+"Task cannot be edited, because the selected task list does not support "
+"assigned tasks"
+msgstr ""
+"No se puede editar la tarea porque la lista de tareas seleccionada no "
+"soporta asignación de tareas"
+
+#: ../calendar/gui/dialogs/task-page.c:347
+#: ../calendar/gui/dialogs/task-page.ui.h:4
+msgid "Organi_zer:"
+msgstr "Organi_zador:"
+
+#: ../calendar/gui/dialogs/task-page.c:807
+msgid "Due date is wrong"
+msgstr "La fecha de vencimiento es errónea"
+
+#: ../calendar/gui/dialogs/task-page.c:1764
+#, c-format
+msgid "Unable to open tasks in '%s': %s"
+msgstr "No se pueden abrir las tareas en «%s»: %s"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:2
+msgid "Categor_ies..."
+msgstr "_Categorías…"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:3
+msgid "D_ue date:"
+msgstr "Fecha de _vencimiento:"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:7
+msgid "Time zone:"
+msgstr "Zona horaria:"
+
+#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d día"
+msgstr[1] "%d días"
+
+#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:399
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d semana"
+msgstr[1] "%d semanas"
+
+#: ../calendar/gui/e-alarm-list.c:461
+msgid "Unknown action to be performed"
+msgstr "Acción que realizar desconocida"
+
+#. 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:475
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s antes de comenzar la cita"
+
+#. 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:480
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s tras el comienzo de la cita"
+
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s al comienzo de la cita"
+
+#. 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:498
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s antes del fin de la cita"
+
+#. 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:503
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s tras el fin de la cita"
+
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:510
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s al fin de la cita"
+
+#. 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:534
+#, c-format
+msgid "%s at %s"
+msgstr "%s a %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:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s para un tipo de disparador desconocido"
+
+#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:671
+msgid "Untitled"
+msgstr "Sin título"
+
+#: ../calendar/gui/e-cal-component-preview.c:200
+msgid "Categories:"
+msgstr "Categorías:"
+
+#: ../calendar/gui/e-cal-component-preview.c:239
+msgid "Summary:"
+msgstr "Resumen:"
+
+#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:263
+msgid "Start Date:"
+msgstr "Fecha de inicio:"
+
+#: ../calendar/gui/e-cal-component-preview.c:277
+msgid "Due Date:"
+msgstr "Fecha de vencimiento:"
+
+#. Status
+#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../plugins/itip-formatter/itip-view.c:1083
+msgid "Status:"
+msgstr "Estado:"
+
+#: ../calendar/gui/e-cal-component-preview.c:317
+msgid "Priority:"
+msgstr "Prioridad:"
+
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
+msgid "Description:"
+msgstr "Descripción:"
+
+#: ../calendar/gui/e-cal-component-preview.c:373
+msgid "Web Page:"
+msgstr "Página web:"
+
+#: ../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:388
+msgid "Created"
+msgstr "Creado"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
+msgid "End Date"
+msgstr "Fecha de terminación"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:4
+msgid "Last modified"
+msgstr "Modificado por última vez"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:5
+msgid "Start Date"
+msgstr "Fecha de inicio"
+
+#: ../calendar/gui/e-cal-model-calendar.c:188
+#: ../calendar/gui/e-task-table.c:580
+msgid "Free"
+msgstr "Libre"
+
+#: ../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 "Ocupada"
+
+#: ../calendar/gui/e-cal-model-tasks.c:665
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"La posición geográfica debe introducirse con el formato: \n"
+"\n"
+"45.436845,125.862501"
+
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:717
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "Ninguna"
+
+#: ../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 "Sí"
+
+#: ../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 "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
+#: ../modules/plugin-manager/evolution-plugin-manager.c:101
+#: ../plugins/itip-formatter/itip-formatter.c:469
+#: ../plugins/itip-formatter/itip-formatter.c:2697
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: ../calendar/gui/e-cal-model.c:1585
+msgid "Recurring"
+msgstr "Repetición"
+
+#: ../calendar/gui/e-cal-model.c:1587
+msgid "Assigned"
+msgstr "Asignado"
+
+#: ../calendar/gui/e-cal-model.c:2971
+#, c-format
+msgid "Opening %s"
+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
+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
+msgid "Declined"
+msgstr "Rehusado"
+
+#: ../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 "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
+msgid "Delegated"
+msgstr "Delegado"
+
+#: ../calendar/gui/e-cal-model.c:3420
+msgid "Needs action"
+msgstr "Necesita una acción"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% Terminado"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "Pulse para añadir una tarea"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:5
+msgid "Complete"
+msgstr "Terminado"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:6
+msgid "Completion date"
+msgstr "Fecha de terminación"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due date"
+msgstr "Fecha de vencimiento"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:20
+#: ../plugins/save-calendar/csv-format.c:394
+msgid "Priority"
+msgstr "Prioridad"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+msgid "Start date"
+msgstr "Fecha de inicio"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../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 "Tipo"
+
+#: ../calendar/gui/e-calendar-view.c:423
+msgid "Cut selected events to the clipboard"
+msgstr "Cortar los acontecimientos seleccionados al portapapeles"
+
+#: ../calendar/gui/e-calendar-view.c:429
+msgid "Copy selected events to the clipboard"
+msgstr "Copiar los acontecimientos seleccionados al portapapeles"
+
+#: ../calendar/gui/e-calendar-view.c:435
+msgid "Paste events from the clipboard"
+msgstr "Pega los acontecimientos desde el portapapeles"
+
+#: ../calendar/gui/e-calendar-view.c:441
+msgid "Delete selected events"
+msgstr "Borra los acontecimientos seleccionados"
+
+#: ../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 "Borrando los objetos seleccionados"
+
+#: ../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 "Actualizando objetos"
+
+#. 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:1908 ../calendar/gui/e-memo-table.c:539
+#: ../calendar/gui/e-task-table.c:771
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organizador: %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:1912 ../calendar/gui/e-memo-table.c:544
+#: ../calendar/gui/e-task-table.c:775
+#, c-format
+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
+#, c-format
+msgid "Location: %s"
+msgstr "Lugar: %s"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:1959
+#, c-format
+msgid "Time: %s %s"
+msgstr "Hora: %s %s"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: ../calendar/gui/e-cell-date-edit-text.c:156
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %e/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: ../calendar/gui/e-cell-date-edit-text.c:159
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %e/%m/%Y %I:%M:%S %p"
+
+>>>>>>> master
 #: ../calendar/gui/e-cell-date-edit-text.c:167
 #, c-format
 msgid ""
@@ -4071,31 +6293,53 @@ 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"
 #.
+<<<<<<< HEAD
 #: ../calendar/gui/e-day-view-time-item.c:806
+=======
+#: ../calendar/gui/e-day-view-time-item.c:809
+>>>>>>> master
 #, c-format
 msgid "%02i minute divisions"
 msgstr "divisiones de %02i minutos"
 
+<<<<<<< HEAD
 #: ../calendar/gui/e-day-view-time-item.c:827
+=======
+#: ../calendar/gui/e-day-view-time-item.c:830
+>>>>>>> master
 msgid "Show the second time zone"
 msgstr "Muestra la segunda zona horaria"
 
 #. Translators: "None" indicates no second time zone set for a day view
+<<<<<<< HEAD
 #: ../calendar/gui/e-day-view-time-item.c:844
 #: ../modules/calendar/e-calendar-preferences.ui.h:77
 #: ../modules/calendar/e-calendar-preferences.c:179
 #: ../modules/calendar/e-calendar-preferences.c:228
+=======
+#: ../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:231
+>>>>>>> master
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ninguno"
 
+<<<<<<< HEAD
 #: ../calendar/gui/e-day-view-time-item.c:876
 #: ../calendar/gui/e-timezone-entry.c:319
 #: ../modules/calendar/e-calendar-preferences.c:255
+=======
+#: ../calendar/gui/e-day-view-time-item.c:879
+#: ../calendar/gui/e-timezone-entry.c:319
+#: ../modules/calendar/e-calendar-preferences.c:258
+>>>>>>> master
 msgid "Select..."
 msgstr "Seleccionar…"
 
 #. strftime format %A = full weekday name, %d = day of month,
+<<<<<<< HEAD
 #. %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
@@ -4103,10 +6347,20 @@ msgstr "Seleccionar…"
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1793
 #: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1875
+=======
+#. * %B = full month name. Don't use any other specifiers.
+#. strftime format %A = full weekday name, %d = day of
+#. * month, %B = full month name. You can change the
+#. * order but don't change the specifiers or add
+#. * anything.
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1821
+#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1968
+>>>>>>> master
 msgid "%A %d %B"
 msgstr "%A %e de %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
+<<<<<<< HEAD
 #. %b = abbreviated month name. Don't use any other specifiers.
 #. strftime format %a = abbreviated weekday name,
 #. %d = day of month, %b = abbreviated month name.
@@ -4116,10 +6370,22 @@ msgstr "%A %e de %B"
 #: ../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
+=======
+#. * %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.
+#: ../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
+>>>>>>> master
 msgid "%a %d %b"
 msgstr "%a, %e de %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
+<<<<<<< HEAD
 #. Don't use any other specifiers.
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
@@ -4128,25 +6394,51 @@ msgstr "%a, %e de %b"
 #: ../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
+=======
+#. * 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.
+#: ../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
+>>>>>>> master
 msgid "%d %b"
 msgstr "%e de %b"
 
 #. String to use in 12-hour time format for times in the morning.
+<<<<<<< HEAD
 #: ../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:977 ../calendar/gui/print.c:996
+#: ../calendar/gui/print.c:2484 ../calendar/gui/print.c:2504
+>>>>>>> master
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
+<<<<<<< HEAD
 #: ../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:982 ../calendar/gui/print.c:998
+#: ../calendar/gui/print.c:2489 ../calendar/gui/print.c:2506
+>>>>>>> master
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+<<<<<<< HEAD
 #: ../calendar/gui/e-day-view.c:2606
+=======
+#: ../calendar/gui/e-day-view.c:2638
+>>>>>>> master
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
@@ -4167,6 +6459,7 @@ msgstr "Participantes opcionales"
 msgid "Resources"
 msgstr "Recursos"
 
+<<<<<<< HEAD
 #: ../calendar/gui/e-meeting-list-view.c:173
 #: ../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
@@ -4218,16 +6511,77 @@ msgstr "No participan"
 #: ../calendar/gui/e-meeting-list-view.c:212
 #: ../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-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
+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
+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
+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
+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
+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
+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
+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
+msgid "Non-Participant"
+msgstr "No participan"
+
+#: ../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:1060
+>>>>>>> master
 msgid "Needs Action"
 msgstr "Necesita acción"
 
 #. The extra space is just a hack to occupy more space for Attendee
+<<<<<<< HEAD
 #: ../calendar/gui/e-meeting-list-view.c:553
+=======
+#: ../calendar/gui/e-meeting-list-view.c:578
+>>>>>>> master
 msgid "Attendee                          "
 msgstr "Participante                          "
 
 #. To translators: RSVP means "please reply"
+<<<<<<< HEAD
 #: ../calendar/gui/e-meeting-list-view.c:598
+=======
+#: ../calendar/gui/e-meeting-list-view.c:623
+>>>>>>> master
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Confirmar"
@@ -4236,43 +6590,74 @@ msgstr "Confirmar"
 msgid "In Process"
 msgstr "En proceso"
 
+<<<<<<< HEAD
 #: ../calendar/gui/e-meeting-store.c:1841
+=======
+#: ../calendar/gui/e-meeting-store.c:1876
+>>>>>>> master
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Introduzca la contraseña para la información de disponibilidad en el "
 "servidor %s como usuario %s"
 
+<<<<<<< HEAD
 #: ../calendar/gui/e-meeting-store.c:1851
+=======
+#: ../calendar/gui/e-meeting-store.c:1886
+>>>>>>> master
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Razón del fallo: %s"
 
+<<<<<<< HEAD
 #: ../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:345
+#: ../smime/gui/component.c:54
+>>>>>>> master
 msgid "Enter password"
 msgstr "Introduzca contraseña"
 
 #. This is a strftime() format string %A = full weekday name,
+<<<<<<< HEAD
 #. %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
+>>>>>>> master
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
+<<<<<<< HEAD
 #. 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
+=======
+#. * 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:449
+#: ../calendar/gui/e-meeting-time-sel.c:2410
+>>>>>>> master
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
+<<<<<<< HEAD
 #. %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:439
 msgid "%m/%d/%Y"
@@ -4335,6 +6720,70 @@ msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
 #: ../calendar/gui/e-meeting-time-sel.c:813
+=======
+#. * %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:453
+msgid "%m/%d/%Y"
+msgstr "%e/%m/%Y"
+
+#: ../calendar/gui/e-meeting-time-sel.c:548
+msgid "Out of Office"
+msgstr "Fuera de la oficina"
+
+#: ../calendar/gui/e-meeting-time-sel.c:549
+msgid "No Information"
+msgstr "Sin información"
+
+#: ../calendar/gui/e-meeting-time-sel.c:585
+msgid "O_ptions"
+msgstr "O_pciones"
+
+#: ../calendar/gui/e-meeting-time-sel.c:603
+msgid "Show _only working hours"
+msgstr "Mostrar _sólo las horas de trabajo"
+
+#: ../calendar/gui/e-meeting-time-sel.c:614
+msgid "Show _zoomed out"
+msgstr "Mostrar quitando _ampliación"
+
+#: ../calendar/gui/e-meeting-time-sel.c:630
+msgid "_Update free/busy"
+msgstr "_Actualizar disponibilidad"
+
+#: ../calendar/gui/e-meeting-time-sel.c:645
+msgid "_<<"
+msgstr "_<<"
+
+#: ../calendar/gui/e-meeting-time-sel.c:663
+msgid "_Autopick"
+msgstr "_Auto-seleccionar"
+
+#: ../calendar/gui/e-meeting-time-sel.c:678
+msgid ">_>"
+msgstr "_>>"
+
+#: ../calendar/gui/e-meeting-time-sel.c:696
+msgid "_All people and resources"
+msgstr "_Todas las personas y los recursos"
+
+#: ../calendar/gui/e-meeting-time-sel.c:706
+msgid "All _people and one resource"
+msgstr "Todas las _personas y un recurso"
+
+#: ../calendar/gui/e-meeting-time-sel.c:716
+msgid "_Required people"
+msgstr "Personas _requeridas"
+
+#: ../calendar/gui/e-meeting-time-sel.c:725
+msgid "Required people and _one resource"
+msgstr "Personas requeridas y _un recurso"
+
+#: ../calendar/gui/e-meeting-time-sel.c:774
+msgid "_Start time:"
+msgstr "Hora de _inicio:"
+
+#: ../calendar/gui/e-meeting-time-sel.c:814
+>>>>>>> master
 msgid "_End time:"
 msgstr "Hora de _fin:"
 
@@ -4363,6 +6812,7 @@ msgid "Member"
 msgstr "Miembro"
 
 #: ../calendar/gui/e-memo-table.c:420
+<<<<<<< HEAD
 #: ../modules/calendar/e-cal-shell-content.c:472
 #: ../modules/calendar/e-memo-shell-view-actions.c:231
 #: ../modules/calendar/e-memo-shell-view-actions.c:246
@@ -4372,16 +6822,35 @@ msgid "Memos"
 msgstr "Notas"
 
 #: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:724
+=======
+#: ../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:458
+msgid "Memos"
+msgstr "Notas"
+
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:734
+>>>>>>> master
 msgid "* No Summary *"
 msgstr "* Sin resumen *"
 
 #. Translators: This is followed by an event's start date/time
+<<<<<<< HEAD
 #: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:808
+=======
+#: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:818
+>>>>>>> master
 msgid "Start: "
 msgstr "Empieza: "
 
 #. Translators: This is followed by an event's due date/time
+<<<<<<< HEAD
 #: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:826
+=======
+#: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:836
+>>>>>>> master
 msgid "Due: "
 msgstr "Vence: "
 
@@ -4398,7 +6867,11 @@ msgid "Paste memos from the clipboard"
 msgstr "Pegar las notas desde el portapapeles"
 
 #: ../calendar/gui/e-memo-table.c:744
+<<<<<<< HEAD
 #: ../modules/calendar/e-memo-shell-view-actions.c:587
+=======
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
+>>>>>>> master
 msgid "Delete selected memos"
 msgstr "Borra las notas seleccionadas"
 
@@ -4411,14 +6884,22 @@ msgid "Click to add a memo"
 msgstr "Pulse aquí para añadir una nota"
 
 #. Translators: "%d%%" is the percentage of a task done.
+<<<<<<< HEAD
 #. %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
+=======
+#. * %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:555
+>>>>>>> master
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
+<<<<<<< HEAD
 #: ../calendar/gui/e-task-table.c:643 ../calendar/gui/print.c:2168
 #: ../calendar/importers/icalendar-importer.c:85
 #: ../calendar/importers/icalendar-importer.c:1003
@@ -4449,6 +6930,38 @@ msgid "Delete selected tasks"
 msgstr "Borra las tareas seleccionadas"
 
 #: ../calendar/gui/e-task-table.c:983
+=======
+#: ../calendar/gui/e-task-table.c:652 ../calendar/gui/print.c:2273
+#: ../calendar/importers/icalendar-importer.c:85
+#: ../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
+#: ../modules/calendar/e-task-shell-view-actions.c:269
+#: ../modules/calendar/e-task-shell-view.c:448
+#: ../plugins/caldav/caldav-browse-server.c:456
+msgid "Tasks"
+msgstr "Tareas"
+
+#: ../calendar/gui/e-task-table.c:969
+msgid "Cut selected tasks to the clipboard"
+msgstr "Cortar las tareas seleccionadas al portapapeles"
+
+#: ../calendar/gui/e-task-table.c:975
+msgid "Copy selected tasks to the clipboard"
+msgstr "Copiar las tareas seleccionadas al portapapeles"
+
+#: ../calendar/gui/e-task-table.c:981
+msgid "Paste tasks from the clipboard"
+msgstr "Pega las tareas del portapapeles"
+
+#: ../calendar/gui/e-task-table.c:987
+#: ../modules/calendar/e-task-shell-view-actions.c:710
+msgid "Delete selected tasks"
+msgstr "Borra las tareas seleccionadas"
+
+#: ../calendar/gui/e-task-table.c:993
+>>>>>>> master
 msgid "Select all visible tasks"
 msgstr "Seleccionar todas las tareas visibles"
 
@@ -4457,9 +6970,15 @@ msgid "Select Timezone"
 msgstr "Seleccione la zona horaria"
 
 #. strftime format %d = day of month, %B = full
+<<<<<<< HEAD
 #. 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
+=======
+#. * 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
+>>>>>>> master
 msgid "%d %B"
 msgstr "%e de %B"
 
@@ -4492,6 +7011,7 @@ msgstr "vista de acontecimientos del calendario"
 msgid "Grab Focus"
 msgstr "Obtener el foco"
 
+<<<<<<< HEAD
 #: ../calendar/gui/ea-cal-view.c:303
 msgid "New Appointment"
 msgstr "Cita nueva"
@@ -4652,24 +7172,201 @@ msgstr "Información de calendario"
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Aceptado"
+=======
+#: ../calendar/gui/ea-cal-view.c:315
+msgid "New Appointment"
+msgstr "Cita nueva"
+
+#: ../calendar/gui/ea-cal-view.c:316
+msgid "New All Day Event"
+msgstr "Acontecimiento nuevo para todo el día"
+
+#: ../calendar/gui/ea-cal-view.c:317
+msgid "New Meeting"
+msgstr "Reunión nueva"
+
+#: ../calendar/gui/ea-cal-view.c:318
+msgid "Go to Today"
+msgstr "Ir a hoy"
+
+#: ../calendar/gui/ea-cal-view.c:319
+msgid "Go to Date"
+msgstr "Ir a una fecha"
+
+#: ../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 "una tabla para ver y seleccionar el rango de tiempo actual"
+
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
+#, c-format
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "Tiene %d acontecimiento."
+msgstr[1] "Tiene %d acontecimientos."
+
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:154
+msgid "It has no events."
+msgstr "No tiene acontecimientos."
+
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:163
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "Vista de la semana laboral: %s. %s"
+
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:169
+#, c-format
+msgid "Day View: %s. %s"
+msgstr "Vista diaria: %s. %s"
+
+#: ../calendar/gui/ea-day-view.c:203
+msgid "calendar view for a work week"
+msgstr "vista de calendario para una semana laboral"
+
+#: ../calendar/gui/ea-day-view.c:205
+msgid "calendar view for one or more days"
+msgstr "vista de calendario para uno o más días"
+
+#: ../calendar/gui/ea-gnome-calendar.c:50
+#: ../calendar/gui/ea-gnome-calendar.c:58
+#: ../calendar/importers/icalendar-importer.c:1078
+msgid "Gnome Calendar"
+msgstr "Calendario de GNOME"
+
+#: ../calendar/gui/ea-gnome-calendar.c:201
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
+msgid "%A %d %b %Y"
+msgstr "%A, %e de %b de %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: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, %e de %b de %Y"
+
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../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: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 "%e de %B de %Y"
+
+#: ../calendar/gui/ea-jump-button.c:150
+msgid "Jump button"
+msgstr "Botón de salto"
+
+#: ../calendar/gui/ea-jump-button.c:159
+msgid "Click here, you can find more events."
+msgstr "Pulse aquí para buscar más acontecimientos."
+
+#: ../calendar/gui/ea-week-view.c:159
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "Vista mensual: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:163
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "Vista semanal: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:197
+msgid "calendar view for a month"
+msgstr "vista de calendario para un mes"
+
+#: ../calendar/gui/ea-week-view.c:199
+msgid "calendar view for one or more weeks"
+msgstr "vista de calendario para una o más semanas"
+
+#: ../calendar/gui/gnome-cal.c:2262
+msgid "Purging"
+msgstr "Compactando"
+
+#: ../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 "Debe especificar un organizador."
+
+#: ../calendar/gui/itip-utils.c:558
+msgid "At least one attendee is necessary"
+msgstr "Es necesario por lo menos un participante"
+
+#: ../calendar/gui/itip-utils.c:755 ../calendar/gui/itip-utils.c:916
+msgid "Event information"
+msgstr "Información del acontecimiento"
+
+#: ../calendar/gui/itip-utils.c:758 ../calendar/gui/itip-utils.c:919
+msgid "Task information"
+msgstr "Información de la tarea"
+
+#: ../calendar/gui/itip-utils.c:761 ../calendar/gui/itip-utils.c:922
+msgid "Memo information"
+msgstr "Información de la nota"
+
+#: ../calendar/gui/itip-utils.c:764 ../calendar/gui/itip-utils.c:940
+msgid "Free/Busy information"
+msgstr "Información de disponibilidad"
+
+#: ../calendar/gui/itip-utils.c:767
+msgid "Calendar information"
+msgstr "Información de calendario"
+>>>>>>> master
 
 #. Translators: This is part of the subject
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
+<<<<<<< HEAD
 #. * "Tentatively Accepted: Meeting Name".
 #: ../calendar/gui/itip-utils.c:810
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
+=======
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:804
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "Aceptado"
+>>>>>>> master
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+<<<<<<< HEAD
+=======
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:811
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "Aceptado provisionalmente"
 
 #. Translators: This is part of the subject
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
+>>>>>>> master
 #. * "Declined: Meeting Name".
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:817 ../calendar/gui/itip-utils.c:865
+=======
+#: ../calendar/gui/itip-utils.c:818 ../calendar/gui/itip-utils.c:866
+>>>>>>> master
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Rehusado"
@@ -4678,7 +7375,11 @@ msgstr "Rehusado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:824
+=======
+#: ../calendar/gui/itip-utils.c:825
+>>>>>>> master
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegado"
@@ -4686,7 +7387,11 @@ msgstr "Delegado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:837
+=======
+#: ../calendar/gui/itip-utils.c:838
+>>>>>>> master
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Actualizado"
@@ -4694,7 +7399,11 @@ msgstr "Actualizado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:844
+=======
+#: ../calendar/gui/itip-utils.c:845
+>>>>>>> master
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -4702,7 +7411,11 @@ msgstr "Cancelar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:851
+=======
+#: ../calendar/gui/itip-utils.c:852
+>>>>>>> master
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Actualizar"
@@ -4710,26 +7423,43 @@ msgstr "Actualizar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:858
+=======
+#: ../calendar/gui/itip-utils.c:859
+>>>>>>> master
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contra-propuesta"
 
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:936
+=======
+#: ../calendar/gui/itip-utils.c:937
+>>>>>>> master
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Información de disponibilidad (de %s a %s)"
 
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:944
 msgid "iCalendar information"
 msgstr "Información de iCalendar"
 
 #: ../calendar/gui/itip-utils.c:969
+=======
+#: ../calendar/gui/itip-utils.c:945
+msgid "iCalendar information"
+msgstr "Información de iCalendar"
+
+#: ../calendar/gui/itip-utils.c:970
+>>>>>>> master
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "No se pudo reservar un recurso, el nuevo acontecimiento coincide con algún "
 "otro."
 
+<<<<<<< HEAD
 #: ../calendar/gui/itip-utils.c:973
 msgid "Unable to book a resource, error: "
 msgstr "No se pudo reservar un recurso, error: "
@@ -4859,10 +7589,142 @@ msgid "30th"
 msgstr "30"
 
 #: ../calendar/gui/print.c:554
+=======
+#: ../calendar/gui/itip-utils.c:974
+msgid "Unable to book a resource, error: "
+msgstr "No se pudo reservar un recurso, error: "
+
+#: ../calendar/gui/itip-utils.c:1137
+msgid "You must be an attendee of the event."
+msgstr "Debe ser un participante en el acontecimiento."
+
+#: ../calendar/gui/print.c:581
+msgid "1st"
+msgstr "1"
+
+#: ../calendar/gui/print.c:581
+msgid "2nd"
+msgstr "2"
+
+#: ../calendar/gui/print.c:581
+msgid "3rd"
+msgstr "3"
+
+#: ../calendar/gui/print.c:581
+msgid "4th"
+msgstr "4"
+
+#: ../calendar/gui/print.c:581
+msgid "5th"
+msgstr "5"
+
+#: ../calendar/gui/print.c:582
+msgid "6th"
+msgstr "6"
+
+#: ../calendar/gui/print.c:582
+msgid "7th"
+msgstr "7"
+
+#: ../calendar/gui/print.c:582
+msgid "8th"
+msgstr "8"
+
+#: ../calendar/gui/print.c:582
+msgid "9th"
+msgstr "9"
+
+#: ../calendar/gui/print.c:582
+msgid "10th"
+msgstr "10"
+
+#: ../calendar/gui/print.c:583
+msgid "11th"
+msgstr "11"
+
+#: ../calendar/gui/print.c:583
+msgid "12th"
+msgstr "12"
+
+#: ../calendar/gui/print.c:583
+msgid "13th"
+msgstr "13"
+
+#: ../calendar/gui/print.c:583
+msgid "14th"
+msgstr "14"
+
+#: ../calendar/gui/print.c:583
+msgid "15th"
+msgstr "15"
+
+#: ../calendar/gui/print.c:584
+msgid "16th"
+msgstr "16"
+
+#: ../calendar/gui/print.c:584
+msgid "17th"
+msgstr "17"
+
+#: ../calendar/gui/print.c:584
+msgid "18th"
+msgstr "18"
+
+#: ../calendar/gui/print.c:584
+msgid "19th"
+msgstr "19"
+
+#: ../calendar/gui/print.c:584
+msgid "20th"
+msgstr "20"
+
+#: ../calendar/gui/print.c:585
+msgid "21st"
+msgstr "21"
+
+#: ../calendar/gui/print.c:585
+msgid "22nd"
+msgstr "22"
+
+#: ../calendar/gui/print.c:585
+msgid "23rd"
+msgstr "23"
+
+#: ../calendar/gui/print.c:585
+msgid "24th"
+msgstr "24"
+
+#: ../calendar/gui/print.c:585
+msgid "25th"
+msgstr "25"
+
+#: ../calendar/gui/print.c:586
+msgid "26th"
+msgstr "26"
+
+#: ../calendar/gui/print.c:586
+msgid "27th"
+msgstr "27"
+
+#: ../calendar/gui/print.c:586
+msgid "28th"
+msgstr "28"
+
+#: ../calendar/gui/print.c:586
+msgid "29th"
+msgstr "29"
+
+#: ../calendar/gui/print.c:586
+msgid "30th"
+msgstr "30"
+
+#: ../calendar/gui/print.c:587
+>>>>>>> master
 msgid "31st"
 msgstr "31"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+<<<<<<< HEAD
 #: ../calendar/gui/print.c:611
 msgid "Su"
 msgstr "Do"
@@ -4982,10 +7844,132 @@ msgstr "es mayor que"
 msgid "is less than"
 msgstr "es menor que"
 
+=======
+#: ../calendar/gui/print.c:644
+msgid "Su"
+msgstr "Do"
+
+#: ../calendar/gui/print.c:644
+msgid "Mo"
+msgstr "Lu"
+
+#: ../calendar/gui/print.c:644
+msgid "Tu"
+msgstr "Ma"
+
+#: ../calendar/gui/print.c:644
+msgid "We"
+msgstr "Mi"
+
+#: ../calendar/gui/print.c:645
+msgid "Th"
+msgstr "Ju"
+
+#: ../calendar/gui/print.c:645
+msgid "Fr"
+msgstr "Vi"
+
+#: ../calendar/gui/print.c:645
+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
+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
+msgid " (Completed "
+msgstr " (Completado "
+
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:3155
+msgid "Completed "
+msgstr "Completado "
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:3165
+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
+msgid "Due "
+msgstr "Vence "
+
+#: ../calendar/gui/print.c:3337
+#, c-format
+msgid "Summary: %s"
+msgstr "Resumen: %s"
+
+#: ../calendar/gui/print.c:3364
+msgid "Attendees: "
+msgstr "Participantes: "
+
+#: ../calendar/gui/print.c:3407
+#, c-format
+msgid "Status: %s"
+msgstr "Estado: %s"
+
+#: ../calendar/gui/print.c:3422
+#, c-format
+msgid "Priority: %s"
+msgstr "Prioridad: %s"
+
+#: ../calendar/gui/print.c:3440
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Porcentaje completado: %i"
+
+#: ../calendar/gui/print.c:3451
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: ../calendar/gui/print.c:3464
+#, c-format
+msgid "Categories: %s"
+msgstr "Categorías: %s"
+
+#: ../calendar/gui/print.c:3475
+msgid "Contacts: "
+msgstr "Contactos: "
+
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% terminado"
+
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#: ../calendar/gui/tasktypes.xml.h:15
+msgid "In progress"
+msgstr "En proceso"
+
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+msgid "is greater than"
+msgstr "es mayor que"
+
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
+msgid "is less than"
+msgstr "es menor que"
+
+>>>>>>> master
 #: ../calendar/importers/icalendar-importer.c:84
 msgid "Appointments and Meetings"
 msgstr "Reuniones y citas"
 
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:421
 #: ../calendar/importers/icalendar-importer.c:834
 #: ../plugins/itip-formatter/itip-formatter.c:2135
@@ -5022,125 +8006,245 @@ msgstr "Importador inteligente del calendario de Evolution"
 
 #: ../calendar/importers/icalendar-importer.c:1101
 #: ../calendar/importers/icalendar-importer.c:1418
+=======
+#: ../calendar/importers/icalendar-importer.c:435
+#: ../calendar/importers/icalendar-importer.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:2170
+msgid "Opening calendar"
+msgstr "Apertura del calendario"
+
+#: ../calendar/importers/icalendar-importer.c:583
+msgid "iCalendar files (.ics)"
+msgstr "Archivos iCalendar (.ics)"
+
+#: ../calendar/importers/icalendar-importer.c:584
+msgid "Evolution iCalendar importer"
+msgstr "Importador de iCalendar de Evolution"
+
+#: ../calendar/importers/icalendar-importer.c:674
+msgid "Reminder!"
+msgstr "¡Recuerde!"
+
+#: ../calendar/importers/icalendar-importer.c:758
+msgid "vCalendar files (.vcs)"
+msgstr "Archivos vCalendar (.vcs)"
+
+#: ../calendar/importers/icalendar-importer.c:759
+msgid "Evolution vCalendar importer"
+msgstr "Importador de vCalendar de Evolution"
+
+#: ../calendar/importers/icalendar-importer.c:1039
+msgid "Calendar Events"
+msgstr "Acontecimientos de calendario"
+
+#: ../calendar/importers/icalendar-importer.c:1079
+msgid "Evolution Calendar intelligent importer"
+msgstr "Importador inteligente del calendario de Evolution"
+
+#: ../calendar/importers/icalendar-importer.c:1147
+#: ../calendar/importers/icalendar-importer.c:1465
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Reunión"
 
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1101
 #: ../calendar/importers/icalendar-importer.c:1418
+=======
+#: ../calendar/importers/icalendar-importer.c:1147
+#: ../calendar/importers/icalendar-importer.c:1465
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Acontecimiento"
 
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1104
 #: ../calendar/importers/icalendar-importer.c:1419
+=======
+#: ../calendar/importers/icalendar-importer.c:1150
+#: ../calendar/importers/icalendar-importer.c:1466
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tarea"
 
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1107
 #: ../calendar/importers/icalendar-importer.c:1420
+=======
+#: ../calendar/importers/icalendar-importer.c:1153
+#: ../calendar/importers/icalendar-importer.c:1467
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Nota"
 
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1116
+=======
+#: ../calendar/importers/icalendar-importer.c:1162
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "tiene repeticiones"
 
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1121
+=======
+#: ../calendar/importers/icalendar-importer.c:1167
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "es una instancia"
 
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1126
+=======
+#: ../calendar/importers/icalendar-importer.c:1172
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "tiene recordatorios"
 
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1131
+=======
+#: ../calendar/importers/icalendar-importer.c:1177
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "tiene adjuntos"
 
 #. Translators: Appointment's classification
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1144
+=======
+#: ../calendar/importers/icalendar-importer.c:1190
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Pública"
 
 #. Translators: Appointment's classification
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1147
+=======
+#: ../calendar/importers/icalendar-importer.c:1193
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Privado"
 
 #. Translators: Appointment's classification
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1150
+=======
+#: ../calendar/importers/icalendar-importer.c:1196
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Confidencial"
 
 #. Translators: Appointment's classification section name
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1154
+=======
+#: ../calendar/importers/icalendar-importer.c:1200
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Clasificación"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1159
 #: ../calendar/importers/icalendar-importer.c:1459
+=======
+#: ../calendar/importers/icalendar-importer.c:1205
+#: ../calendar/importers/icalendar-importer.c:1506
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Resumen"
 
 #. Translators: Appointment's location
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1165
+=======
+#: ../calendar/importers/icalendar-importer.c:1211
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Lugar"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1173
 #: ../calendar/importers/icalendar-importer.c:1455
+=======
+#: ../calendar/importers/icalendar-importer.c:1219
+#: ../calendar/importers/icalendar-importer.c:1502
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Empieza"
 
 #. Translators: 'Due' like the time due a task should be finished
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1184
+=======
+#: ../calendar/importers/icalendar-importer.c:1230
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Vence"
 
 #. Translators: Appointment's end time
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1196
+=======
+#: ../calendar/importers/icalendar-importer.c:1242
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Termina"
 
 #. Translators: Appointment's categories
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1206
+=======
+#: ../calendar/importers/icalendar-importer.c:1252
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Categorías"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1230
+=======
+#: ../calendar/importers/icalendar-importer.c:1276
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Completada"
 
 #. Translators: Appointment's URL
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1238
+=======
+#: ../calendar/importers/icalendar-importer.c:1284
+>>>>>>> master
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
+<<<<<<< HEAD
 #: ../calendar/importers/icalendar-importer.c:1249
 #: ../calendar/importers/icalendar-importer.c:1252
 msgctxt "iCalImp"
@@ -5213,6 +8317,80 @@ msgstr "�frica/Asmera"
 msgid "Africa/Bamako"
 msgstr "�frica/Bamako"
 
+=======
+#: ../calendar/importers/icalendar-importer.c:1295
+#: ../calendar/importers/icalendar-importer.c:1298
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "Organizador"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1318
+#: ../calendar/importers/icalendar-importer.c:1321
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "Participantes"
+
+#: ../calendar/importers/icalendar-importer.c:1335
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "Descripción"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1498
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "Tipo"
+
+#.
+#. *
+#. * This program is free software; you can redistribute it and/or
+#. * modify it under the terms of the GNU Lesser General Public
+#. * License as published by the Free Software Foundation; either
+#. * version 2 of the License, or (at your option) version 3.
+#. *
+#. * This program is distributed in the hope that it will be useful,
+#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#. * Lesser General Public License for more details.
+#. *
+#. * You should have received a copy of the GNU Lesser General Public
+#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. *
+#. *
+#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+#. *
+#.
+#.
+#. * These are the timezone names from the Olson timezone data.
+#. * We only place them here so gettext picks them up for translation.
+#. * Don't include in any C files.
+#.
+#: ../calendar/zones.h:26
+msgid "Africa/Abidjan"
+msgstr "�frica/Abidjan"
+
+#: ../calendar/zones.h:27
+msgid "Africa/Accra"
+msgstr "�frica/Accra"
+
+#: ../calendar/zones.h:28
+msgid "Africa/Addis_Ababa"
+msgstr "�frica/Addis Abeba"
+
+#: ../calendar/zones.h:29
+msgid "Africa/Algiers"
+msgstr "�frica/Argel"
+
+#: ../calendar/zones.h:30
+msgid "Africa/Asmera"
+msgstr "�frica/Asmera"
+
+#: ../calendar/zones.h:31
+msgid "Africa/Bamako"
+msgstr "�frica/Bamako"
+
+>>>>>>> master
 #: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "�frica/Bangui"
@@ -5584,6 +8762,7 @@ msgstr "América/Halifax"
 #: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "América/La Habana"
+<<<<<<< HEAD
 
 #: ../calendar/zones.h:125
 msgid "America/Hermosillo"
@@ -8181,10 +11360,2614 @@ msgid ""
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
+=======
+
+#: ../calendar/zones.h:125
+msgid "America/Hermosillo"
+msgstr "América/Hermosillo"
+
+#: ../calendar/zones.h:126
+msgid "America/Indiana/Indianapolis"
+msgstr "América/Indiana/Indianápolis"
+
+#: ../calendar/zones.h:127
+msgid "America/Indiana/Knox"
+msgstr "América/Indiana/Knox"
+
+#: ../calendar/zones.h:128
+msgid "America/Indiana/Marengo"
+msgstr "América/Indiana/Marengo"
+
+#: ../calendar/zones.h:129
+msgid "America/Indiana/Vevay"
+msgstr "América/Indiana/Vevay"
+
+#: ../calendar/zones.h:130
+msgid "America/Indianapolis"
+msgstr "América/Indianápolis"
+
+#: ../calendar/zones.h:131
+msgid "America/Inuvik"
+msgstr "América/Inuvik"
+
+#: ../calendar/zones.h:132
+msgid "America/Iqaluit"
+msgstr "América/Iqaluit"
+
+#: ../calendar/zones.h:133
+msgid "America/Jamaica"
+msgstr "América/Jamaica"
+
+#: ../calendar/zones.h:134
+msgid "America/Jujuy"
+msgstr "América/Jujuy"
+
+#: ../calendar/zones.h:135
+msgid "America/Juneau"
+msgstr "América/Juneau"
+
+#: ../calendar/zones.h:136
+msgid "America/Kentucky/Louisville"
+msgstr "América/Kentucky/Louisville"
+
+#: ../calendar/zones.h:137
+msgid "America/Kentucky/Monticello"
+msgstr "América/Kentucky/Monticello"
+
+#: ../calendar/zones.h:138
+msgid "America/La_Paz"
+msgstr "América/La Paz"
+
+#: ../calendar/zones.h:139
+msgid "America/Lima"
+msgstr "América/Lima"
+
+#: ../calendar/zones.h:140
+msgid "America/Los_Angeles"
+msgstr "América/Los �ngeles"
+
+#: ../calendar/zones.h:141
+msgid "America/Louisville"
+msgstr "América/Louisville"
+
+#: ../calendar/zones.h:142
+msgid "America/Maceio"
+msgstr "América/Maceio"
+
+#: ../calendar/zones.h:143
+msgid "America/Managua"
+msgstr "América/Managua"
+
+#: ../calendar/zones.h:144
+msgid "America/Manaus"
+msgstr "América/Manaus"
+
+#: ../calendar/zones.h:145
+msgid "America/Martinique"
+msgstr "América/Martinica"
+
+#: ../calendar/zones.h:146
+msgid "America/Mazatlan"
+msgstr "América/Mazatlán"
+
+#: ../calendar/zones.h:147
+msgid "America/Mendoza"
+msgstr "América/Mendoza"
+
+#: ../calendar/zones.h:148
+msgid "America/Menominee"
+msgstr "América/Menominee"
+
+#: ../calendar/zones.h:149
+msgid "America/Merida"
+msgstr "América/Mérida"
+
+#: ../calendar/zones.h:150
+msgid "America/Mexico_City"
+msgstr "América/Ciudad de México"
+
+#: ../calendar/zones.h:151
+msgid "America/Miquelon"
+msgstr "América/Miquelon"
+
+#: ../calendar/zones.h:152
+msgid "America/Monterrey"
+msgstr "América/Monterrey"
+
+#: ../calendar/zones.h:153
+msgid "America/Montevideo"
+msgstr "América/Montevideo"
+
+#: ../calendar/zones.h:154
+msgid "America/Montreal"
+msgstr "América/Montreal"
+
+#: ../calendar/zones.h:155
+msgid "America/Montserrat"
+msgstr "América/Montserrat"
+
+#: ../calendar/zones.h:156
+msgid "America/Nassau"
+msgstr "América/Nassau"
+
+#: ../calendar/zones.h:157
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
+msgid "America/New_York"
+msgstr "América/Nueva York"
+
+#: ../calendar/zones.h:158
+msgid "America/Nipigon"
+msgstr "América/Nipigon"
+
+#: ../calendar/zones.h:159
+msgid "America/Nome"
+msgstr "América/Nome"
+
+#: ../calendar/zones.h:160
+msgid "America/Noronha"
+msgstr "América/Noronha"
+
+#: ../calendar/zones.h:161
+msgid "America/North_Dakota/Center"
+msgstr "América/Dakota del Norte/Centro"
+
+#: ../calendar/zones.h:162
+msgid "America/Panama"
+msgstr "América/Panamá"
+
+#: ../calendar/zones.h:163
+msgid "America/Pangnirtung"
+msgstr "América/Pangnirtung"
+
+#: ../calendar/zones.h:164
+msgid "America/Paramaribo"
+msgstr "América/Paramaribo"
+
+#: ../calendar/zones.h:165
+msgid "America/Phoenix"
+msgstr "América/Phoenix"
+
+#: ../calendar/zones.h:166
+msgid "America/Port-au-Prince"
+msgstr "América/Port-au-Prince"
+
+#: ../calendar/zones.h:167
+msgid "America/Port_of_Spain"
+msgstr "América/Puerto de España"
+
+#: ../calendar/zones.h:168
+msgid "America/Porto_Velho"
+msgstr "América/Porto Velho"
+
+#: ../calendar/zones.h:169
+msgid "America/Puerto_Rico"
+msgstr "América/Puerto Rico"
+
+#: ../calendar/zones.h:170
+msgid "America/Rainy_River"
+msgstr "América/Rainy River"
+
+#: ../calendar/zones.h:171
+msgid "America/Rankin_Inlet"
+msgstr "América/Rankin Inlet"
+
+#: ../calendar/zones.h:172
+msgid "America/Recife"
+msgstr "América/Recife"
+
+#: ../calendar/zones.h:173
+msgid "America/Regina"
+msgstr "América/Regina"
+
+#: ../calendar/zones.h:174
+msgid "America/Rio_Branco"
+msgstr "América/Río Branco"
+
+#: ../calendar/zones.h:175
+msgid "America/Rosario"
+msgstr "América/Rosario"
+
+#: ../calendar/zones.h:176
+msgid "America/Santiago"
+msgstr "América/Santiago"
+
+#: ../calendar/zones.h:177
+msgid "America/Santo_Domingo"
+msgstr "América/Santo Domingo"
+
+#: ../calendar/zones.h:178
+msgid "America/Sao_Paulo"
+msgstr "América/Sao Paulo"
+
+#: ../calendar/zones.h:179
+msgid "America/Scoresbysund"
+msgstr "América/Scoresbysund"
+
+#: ../calendar/zones.h:180
+msgid "America/Shiprock"
+msgstr "América/Shiprock"
+
+#: ../calendar/zones.h:181
+msgid "America/St_Johns"
+msgstr "América/St. Johns"
+
+#: ../calendar/zones.h:182
+msgid "America/St_Kitts"
+msgstr "América/St. Kitts"
+
+#: ../calendar/zones.h:183
+msgid "America/St_Lucia"
+msgstr "América/St. Lucía"
+
+#: ../calendar/zones.h:184
+msgid "America/St_Thomas"
+msgstr "América/St. Tomás"
+
+#: ../calendar/zones.h:185
+msgid "America/St_Vincent"
+msgstr "América/San Vincente"
+
+#: ../calendar/zones.h:186
+msgid "America/Swift_Current"
+msgstr "América/Swift Current"
+
+#: ../calendar/zones.h:187
+msgid "America/Tegucigalpa"
+msgstr "América/Tegucigalpa"
+
+#: ../calendar/zones.h:188
+msgid "America/Thule"
+msgstr "América/Thule"
+
+#: ../calendar/zones.h:189
+msgid "America/Thunder_Bay"
+msgstr "América/Thunder Bay"
+
+#: ../calendar/zones.h:190
+msgid "America/Tijuana"
+msgstr "América/Tijuana"
+
+#: ../calendar/zones.h:191
+msgid "America/Tortola"
+msgstr "América/Tórtola"
+
+#: ../calendar/zones.h:192
+msgid "America/Vancouver"
+msgstr "América/Vancouver"
+
+#: ../calendar/zones.h:193
+msgid "America/Whitehorse"
+msgstr "América/Whitehorse"
+
+#: ../calendar/zones.h:194
+msgid "America/Winnipeg"
+msgstr "América/Winnipeg"
+
+#: ../calendar/zones.h:195
+msgid "America/Yakutat"
+msgstr "América/Yakutat"
+
+#: ../calendar/zones.h:196
+msgid "America/Yellowknife"
+msgstr "América/Yellowknife"
+
+#: ../calendar/zones.h:197
+msgid "Antarctica/Casey"
+msgstr "Antártida/Casey"
+
+#: ../calendar/zones.h:198
+msgid "Antarctica/Davis"
+msgstr "Antártida/Davis"
+
+#: ../calendar/zones.h:199
+msgid "Antarctica/DumontDUrville"
+msgstr "Antártida/DumontDUrville"
+
+#: ../calendar/zones.h:200
+msgid "Antarctica/Mawson"
+msgstr "Antártida/Mawson"
+
+#: ../calendar/zones.h:201
+msgid "Antarctica/McMurdo"
+msgstr "Antártida/McMurdo"
+
+#: ../calendar/zones.h:202
+msgid "Antarctica/Palmer"
+msgstr "Antártida/Palmer"
+
+#: ../calendar/zones.h:203
+msgid "Antarctica/South_Pole"
+msgstr "Antártida/Polo Sur"
+
+#: ../calendar/zones.h:204
+msgid "Antarctica/Syowa"
+msgstr "Antártida/Syowa"
+
+#: ../calendar/zones.h:205
+msgid "Antarctica/Vostok"
+msgstr "Antártida/Vostok"
+
+#: ../calendar/zones.h:206
+msgid "Arctic/Longyearbyen"
+msgstr "�rtico/Longyearbyen"
+
+#: ../calendar/zones.h:207
+msgid "Asia/Aden"
+msgstr "Asia/Aden"
+
+#: ../calendar/zones.h:208
+msgid "Asia/Almaty"
+msgstr "Asia/Almaty"
+
+#: ../calendar/zones.h:209
+msgid "Asia/Amman"
+msgstr "Asia/Ammán"
+
+#: ../calendar/zones.h:210
+msgid "Asia/Anadyr"
+msgstr "Asia/Anadyr"
+
+#: ../calendar/zones.h:211
+msgid "Asia/Aqtau"
+msgstr "Asia/Aqtau"
+
+#: ../calendar/zones.h:212
+msgid "Asia/Aqtobe"
+msgstr "Asia/Aqtobe"
+
+#: ../calendar/zones.h:213
+msgid "Asia/Ashgabat"
+msgstr "Asia/Ashgabat"
+
+#: ../calendar/zones.h:214
+msgid "Asia/Baghdad"
+msgstr "Asia/Baghdad"
+
+#: ../calendar/zones.h:215
+msgid "Asia/Bahrain"
+msgstr "Asia/Bahrein"
+
+#: ../calendar/zones.h:216
+msgid "Asia/Baku"
+msgstr "Asia/Baku"
+
+#: ../calendar/zones.h:217
+msgid "Asia/Bangkok"
+msgstr "Asia/Bangkok"
+
+#: ../calendar/zones.h:218
+msgid "Asia/Beirut"
+msgstr "Asia/Beirut"
+
+#: ../calendar/zones.h:219
+msgid "Asia/Bishkek"
+msgstr "Asia/Bishkek"
+
+#: ../calendar/zones.h:220
+msgid "Asia/Brunei"
+msgstr "Asia/Brunei"
+
+#: ../calendar/zones.h:221
+msgid "Asia/Calcutta"
+msgstr "Asia/Calcuta"
+
+#: ../calendar/zones.h:222
+msgid "Asia/Choibalsan"
+msgstr "Asia/Choibalsan"
+
+#: ../calendar/zones.h:223
+msgid "Asia/Chongqing"
+msgstr "Asia/Chongqing"
+
+#: ../calendar/zones.h:224
+msgid "Asia/Colombo"
+msgstr "Asia/Colombo"
+
+#: ../calendar/zones.h:225
+msgid "Asia/Damascus"
+msgstr "Asia/Damasco"
+
+#: ../calendar/zones.h:226
+msgid "Asia/Dhaka"
+msgstr "Asia/Dhaka"
+
+#: ../calendar/zones.h:227
+msgid "Asia/Dili"
+msgstr "Asia/Dili"
+
+#: ../calendar/zones.h:228
+msgid "Asia/Dubai"
+msgstr "Asia/Dubai"
+
+#: ../calendar/zones.h:229
+msgid "Asia/Dushanbe"
+msgstr "Asia/Dushanbe"
+
+#: ../calendar/zones.h:230
+msgid "Asia/Gaza"
+msgstr "Asia/Gaza"
+
+#: ../calendar/zones.h:231
+msgid "Asia/Harbin"
+msgstr "Asia/Harbin"
+
+#: ../calendar/zones.h:232
+msgid "Asia/Hong_Kong"
+msgstr "Asia/Hong Kong"
+
+#: ../calendar/zones.h:233
+msgid "Asia/Hovd"
+msgstr "Asia/Hovd"
+
+#: ../calendar/zones.h:234
+msgid "Asia/Irkutsk"
+msgstr "Asia/Irkutsk"
+
+#: ../calendar/zones.h:235
+msgid "Asia/Istanbul"
+msgstr "Asia/Estambul"
+
+#: ../calendar/zones.h:236
+msgid "Asia/Jakarta"
+msgstr "Asia/Jakarta"
+
+#: ../calendar/zones.h:237
+msgid "Asia/Jayapura"
+msgstr "Asia/Jayapura"
+
+#: ../calendar/zones.h:238
+msgid "Asia/Jerusalem"
+msgstr "Asia/Jerusalén"
+
+#: ../calendar/zones.h:239
+msgid "Asia/Kabul"
+msgstr "Asia/Kabul"
+
+#: ../calendar/zones.h:240
+msgid "Asia/Kamchatka"
+msgstr "Asia/Kamchatka"
+
+#: ../calendar/zones.h:241
+msgid "Asia/Karachi"
+msgstr "Asia/Karachi"
+
+#: ../calendar/zones.h:242
+msgid "Asia/Kashgar"
+msgstr "Asia/Kashgar"
+
+#: ../calendar/zones.h:243
+msgid "Asia/Katmandu"
+msgstr "Asia/Katmandú"
+
+#: ../calendar/zones.h:244
+msgid "Asia/Krasnoyarsk"
+msgstr "Asia/Krasnoyarsk"
+
+#: ../calendar/zones.h:245
+msgid "Asia/Kuala_Lumpur"
+msgstr "Asia/Kuala Lumpur"
+
+#: ../calendar/zones.h:246
+msgid "Asia/Kuching"
+msgstr "Asia/Kuching"
+
+#: ../calendar/zones.h:247
+msgid "Asia/Kuwait"
+msgstr "Asia/Kuwait"
+
+#: ../calendar/zones.h:248
+msgid "Asia/Macao"
+msgstr "Asia/Macao"
+
+#: ../calendar/zones.h:249
+msgid "Asia/Macau"
+msgstr "Asia/Macau"
+
+#: ../calendar/zones.h:250
+msgid "Asia/Magadan"
+msgstr "Asia/Magadán"
+
+#: ../calendar/zones.h:251
+msgid "Asia/Makassar"
+msgstr "Asia/Makassar"
+
+#: ../calendar/zones.h:252
+msgid "Asia/Manila"
+msgstr "Asia/Manila"
+
+#: ../calendar/zones.h:253
+msgid "Asia/Muscat"
+msgstr "Asia/Muscat"
+
+#: ../calendar/zones.h:254
+msgid "Asia/Nicosia"
+msgstr "Asia/Nicosia"
+
+#: ../calendar/zones.h:255
+msgid "Asia/Novosibirsk"
+msgstr "Asia/Novosibirsk"
+
+#: ../calendar/zones.h:256
+msgid "Asia/Omsk"
+msgstr "Asia/Omsk"
+
+#: ../calendar/zones.h:257
+msgid "Asia/Oral"
+msgstr "Asia/Oral"
+
+#: ../calendar/zones.h:258
+msgid "Asia/Phnom_Penh"
+msgstr "Asia/Phnom Penh"
+
+#: ../calendar/zones.h:259
+msgid "Asia/Pontianak"
+msgstr "Asia/Pontianak"
+
+#: ../calendar/zones.h:260
+msgid "Asia/Pyongyang"
+msgstr "Asia/Pyongyang"
+
+#: ../calendar/zones.h:261
+msgid "Asia/Qatar"
+msgstr "Asia/Qatar"
+
+#: ../calendar/zones.h:262
+msgid "Asia/Qyzylorda"
+msgstr "Asia/Qyzylorda"
+
+#: ../calendar/zones.h:263
+msgid "Asia/Rangoon"
+msgstr "Asia/Rangún"
+
+#: ../calendar/zones.h:264
+msgid "Asia/Riyadh"
+msgstr "Asia/Riyadh"
+
+#: ../calendar/zones.h:265
+msgid "Asia/Saigon"
+msgstr "Asia/Saigón"
+
+#: ../calendar/zones.h:266
+msgid "Asia/Sakhalin"
+msgstr "Asia/Sakhalin"
+
+#: ../calendar/zones.h:267
+msgid "Asia/Samarkand"
+msgstr "Asia/Samarcanda"
+
+#: ../calendar/zones.h:268
+msgid "Asia/Seoul"
+msgstr "Asia/Seúl"
+
+#: ../calendar/zones.h:269
+msgid "Asia/Shanghai"
+msgstr "Asia/Shanghai"
+
+#: ../calendar/zones.h:270
+msgid "Asia/Singapore"
+msgstr "Asia/Singapur"
+
+#: ../calendar/zones.h:271
+msgid "Asia/Taipei"
+msgstr "Asia/Taipei"
+
+#: ../calendar/zones.h:272
+msgid "Asia/Tashkent"
+msgstr "Asia/Tashkent"
+
+#: ../calendar/zones.h:273
+msgid "Asia/Tbilisi"
+msgstr "Asia/Tbilisi"
+
+#: ../calendar/zones.h:274
+msgid "Asia/Tehran"
+msgstr "Asia/Teherán"
+
+#: ../calendar/zones.h:275
+msgid "Asia/Thimphu"
+msgstr "Asia/Thimphu"
+
+#: ../calendar/zones.h:276
+msgid "Asia/Tokyo"
+msgstr "Asia/Tokio"
+
+#: ../calendar/zones.h:277
+msgid "Asia/Ujung_Pandang"
+msgstr "Asia/Ujung Pandang"
+
+#: ../calendar/zones.h:278
+msgid "Asia/Ulaanbaatar"
+msgstr "Asia/Ulaanbaatar"
+
+#: ../calendar/zones.h:279
+msgid "Asia/Urumqi"
+msgstr "Asia/Urumqi"
+
+#: ../calendar/zones.h:280
+msgid "Asia/Vientiane"
+msgstr "Asia/Vientiane"
+
+#: ../calendar/zones.h:281
+msgid "Asia/Vladivostok"
+msgstr "Asia/Vladivostok"
+
+#: ../calendar/zones.h:282
+msgid "Asia/Yakutsk"
+msgstr "Asia/Yakutsk"
+
+#: ../calendar/zones.h:283
+msgid "Asia/Yekaterinburg"
+msgstr "Asia/Yekaterinburg"
+
+#: ../calendar/zones.h:284
+msgid "Asia/Yerevan"
+msgstr "Asia/Yerevan"
+
+#: ../calendar/zones.h:285
+msgid "Atlantic/Azores"
+msgstr "Atlántico/Azores"
+
+#: ../calendar/zones.h:286
+msgid "Atlantic/Bermuda"
+msgstr "Atlántico/Bermudas"
+
+#: ../calendar/zones.h:287
+msgid "Atlantic/Canary"
+msgstr "Atlántico/Canarias"
+
+#: ../calendar/zones.h:288
+msgid "Atlantic/Cape_Verde"
+msgstr "Atlántico/Cabo Verde"
+
+#: ../calendar/zones.h:289
+msgid "Atlantic/Faeroe"
+msgstr "Atlántico/Feroe"
+
+#: ../calendar/zones.h:290
+msgid "Atlantic/Jan_Mayen"
+msgstr "Atlántico/Jan Mayen"
+
+#: ../calendar/zones.h:291
+msgid "Atlantic/Madeira"
+msgstr "Atlántico/Madeira"
+
+#: ../calendar/zones.h:292
+msgid "Atlantic/Reykjavik"
+msgstr "Atlántico/Reykjavik"
+
+#: ../calendar/zones.h:293
+msgid "Atlantic/South_Georgia"
+msgstr "Atlántico/South Georgia"
+
+#: ../calendar/zones.h:294
+msgid "Atlantic/St_Helena"
+msgstr "Atlántico/St. Helena"
+
+#: ../calendar/zones.h:295
+msgid "Atlantic/Stanley"
+msgstr "Atlántico/Stanley"
+
+#: ../calendar/zones.h:296
+msgid "Australia/Adelaide"
+msgstr "Australia/Adelaida"
+
+#: ../calendar/zones.h:297
+msgid "Australia/Brisbane"
+msgstr "Australia/Brisbane"
+
+#: ../calendar/zones.h:298
+msgid "Australia/Broken_Hill"
+msgstr "Australia/Broken Hill"
+
+#: ../calendar/zones.h:299
+msgid "Australia/Darwin"
+msgstr "Australia/Darwin"
+
+#: ../calendar/zones.h:300
+msgid "Australia/Hobart"
+msgstr "Australia/Hobart"
+
+#: ../calendar/zones.h:301
+msgid "Australia/Lindeman"
+msgstr "Australia/Lindeman"
+
+#: ../calendar/zones.h:302
+msgid "Australia/Lord_Howe"
+msgstr "Australia/Lord Howe"
+
+#: ../calendar/zones.h:303
+msgid "Australia/Melbourne"
+msgstr "Australia/Melbourne"
+
+#: ../calendar/zones.h:304
+msgid "Australia/Perth"
+msgstr "Australia/Perth"
+
+#: ../calendar/zones.h:305
+msgid "Australia/Sydney"
+msgstr "Australia/Sydney"
+
+#: ../calendar/zones.h:306
+msgid "Europe/Amsterdam"
+msgstr "Europa/Amsterdam"
+
+#: ../calendar/zones.h:307
+msgid "Europe/Andorra"
+msgstr "Europa/Andorra"
+
+#: ../calendar/zones.h:308
+msgid "Europe/Athens"
+msgstr "Europa/Atenas"
+
+#: ../calendar/zones.h:309
+msgid "Europe/Belfast"
+msgstr "Europa/Belfast"
+
+#: ../calendar/zones.h:310
+msgid "Europe/Belgrade"
+msgstr "Europa/Belgrado"
+
+#: ../calendar/zones.h:311
+msgid "Europe/Berlin"
+msgstr "Europa/Berlín"
+
+#: ../calendar/zones.h:312
+msgid "Europe/Bratislava"
+msgstr "Europa/Bratislava"
+
+#: ../calendar/zones.h:313
+msgid "Europe/Brussels"
+msgstr "Europa/Bruselas"
+
+#: ../calendar/zones.h:314
+msgid "Europe/Bucharest"
+msgstr "Europa/Bucarest"
+
+#: ../calendar/zones.h:315
+msgid "Europe/Budapest"
+msgstr "Europa/Budapest"
+
+#: ../calendar/zones.h:316
+msgid "Europe/Chisinau"
+msgstr "Europa/Chisinau"
+
+#: ../calendar/zones.h:317
+msgid "Europe/Copenhagen"
+msgstr "Europa/Copenhague"
+
+#: ../calendar/zones.h:318
+msgid "Europe/Dublin"
+msgstr "Europa/Dublín"
+
+#: ../calendar/zones.h:319
+msgid "Europe/Gibraltar"
+msgstr "Europa/Gibraltar"
+
+#: ../calendar/zones.h:320
+msgid "Europe/Helsinki"
+msgstr "Europa/Helsinki"
+
+#: ../calendar/zones.h:321
+msgid "Europe/Istanbul"
+msgstr "Europa/Estanbul"
+
+#: ../calendar/zones.h:322
+msgid "Europe/Kaliningrad"
+msgstr "Europa/Kaliningrado"
+
+#: ../calendar/zones.h:323
+msgid "Europe/Kiev"
+msgstr "Europa/Kiev"
+
+#: ../calendar/zones.h:324
+msgid "Europe/Lisbon"
+msgstr "Europa/Lisboa"
+
+#: ../calendar/zones.h:325
+msgid "Europe/Ljubljana"
+msgstr "Europa/Ljubljana"
+
+#: ../calendar/zones.h:326
+msgid "Europe/London"
+msgstr "Europa/Londres"
+
+#: ../calendar/zones.h:327
+msgid "Europe/Luxembourg"
+msgstr "Europa/Luxemburgo"
+
+#: ../calendar/zones.h:328
+msgid "Europe/Madrid"
+msgstr "Europa/Madrid"
+
+#: ../calendar/zones.h:329
+msgid "Europe/Malta"
+msgstr "Europa/Malta"
+
+#: ../calendar/zones.h:330
+msgid "Europe/Minsk"
+msgstr "Europa/Minsk"
+
+#: ../calendar/zones.h:331
+msgid "Europe/Monaco"
+msgstr "Europa/Mónaco"
+
+#: ../calendar/zones.h:332
+msgid "Europe/Moscow"
+msgstr "Europa/Moscú"
+
+#: ../calendar/zones.h:333
+msgid "Europe/Nicosia"
+msgstr "Europa/Nicosia"
+
+#: ../calendar/zones.h:334
+msgid "Europe/Oslo"
+msgstr "Europa/Oslo"
+
+#: ../calendar/zones.h:335
+msgid "Europe/Paris"
+msgstr "Europa/París"
+
+#: ../calendar/zones.h:336
+msgid "Europe/Prague"
+msgstr "Europa/Praga"
+
+#: ../calendar/zones.h:337
+msgid "Europe/Riga"
+msgstr "Europa/Riga"
+
+#: ../calendar/zones.h:338
+msgid "Europe/Rome"
+msgstr "Europa/Roma"
+
+#: ../calendar/zones.h:339
+msgid "Europe/Samara"
+msgstr "Europa/Samara"
+
+#: ../calendar/zones.h:340
+msgid "Europe/San_Marino"
+msgstr "Europa/San Marino"
+
+#: ../calendar/zones.h:341
+msgid "Europe/Sarajevo"
+msgstr "Europa/Sarajevo"
+
+#: ../calendar/zones.h:342
+msgid "Europe/Simferopol"
+msgstr "Europa/Simferopol"
+
+#: ../calendar/zones.h:343
+msgid "Europe/Skopje"
+msgstr "Europa/Skopje"
+
+#: ../calendar/zones.h:344
+msgid "Europe/Sofia"
+msgstr "Europa/Sofía"
+
+#: ../calendar/zones.h:345
+msgid "Europe/Stockholm"
+msgstr "Europa/Estocolmo"
+
+#: ../calendar/zones.h:346
+msgid "Europe/Tallinn"
+msgstr "Europa/Tallinn"
+
+#: ../calendar/zones.h:347
+msgid "Europe/Tirane"
+msgstr "Europa/Tirana"
+
+#: ../calendar/zones.h:348
+msgid "Europe/Uzhgorod"
+msgstr "Europa/Uzhgorod"
+
+#: ../calendar/zones.h:349
+msgid "Europe/Vaduz"
+msgstr "Europa/Vaduz"
+
+#: ../calendar/zones.h:350
+msgid "Europe/Vatican"
+msgstr "Europa/Ciudad del Vaticano"
+
+#: ../calendar/zones.h:351
+msgid "Europe/Vienna"
+msgstr "Europa/Viena"
+
+#: ../calendar/zones.h:352
+msgid "Europe/Vilnius"
+msgstr "Europa/Vilnius"
+
+#: ../calendar/zones.h:353
+msgid "Europe/Warsaw"
+msgstr "Europa/Varsovia"
+
+#: ../calendar/zones.h:354
+msgid "Europe/Zagreb"
+msgstr "Europa/Zagreb"
+
+#: ../calendar/zones.h:355
+msgid "Europe/Zaporozhye"
+msgstr "Europa/Zaporozhye"
+
+#: ../calendar/zones.h:356
+msgid "Europe/Zurich"
+msgstr "Europa/Zúrich"
+
+#: ../calendar/zones.h:357
+msgid "Indian/Antananarivo"
+msgstr "�ndico/Antananarivo"
+
+#: ../calendar/zones.h:358
+msgid "Indian/Chagos"
+msgstr "�ndico/Chagos"
+
+#: ../calendar/zones.h:359
+msgid "Indian/Christmas"
+msgstr "�ndico/Christmas"
+
+#: ../calendar/zones.h:360
+msgid "Indian/Cocos"
+msgstr "�ndico/Cocos"
+
+#: ../calendar/zones.h:361
+msgid "Indian/Comoro"
+msgstr "�ndico/Comores"
+
+#: ../calendar/zones.h:362
+msgid "Indian/Kerguelen"
+msgstr "�ndico/Kerguelen"
+
+#: ../calendar/zones.h:363
+msgid "Indian/Mahe"
+msgstr "�ndico/Mahe"
+
+#: ../calendar/zones.h:364
+msgid "Indian/Maldives"
+msgstr "�ndico/Maldivas"
+
+#: ../calendar/zones.h:365
+msgid "Indian/Mauritius"
+msgstr "�ndico/Mauricio"
+
+#: ../calendar/zones.h:366
+msgid "Indian/Mayotte"
+msgstr "�ndico/Mayotte"
+
+#: ../calendar/zones.h:367
+msgid "Indian/Reunion"
+msgstr "�ndico/Reunión"
+
+#: ../calendar/zones.h:368
+msgid "Pacific/Apia"
+msgstr "Pacífico/Apia"
+
+#: ../calendar/zones.h:369
+msgid "Pacific/Auckland"
+msgstr "Pacífico/Auckland"
+
+#: ../calendar/zones.h:370
+msgid "Pacific/Chatham"
+msgstr "Pacífico/Chatham"
+
+#: ../calendar/zones.h:371
+msgid "Pacific/Easter"
+msgstr "Pacífico/Pascua"
+
+#: ../calendar/zones.h:372
+msgid "Pacific/Efate"
+msgstr "Pacífico/Efate"
+
+#: ../calendar/zones.h:373
+msgid "Pacific/Enderbury"
+msgstr "Pacífico/Enderbury"
+
+#: ../calendar/zones.h:374
+msgid "Pacific/Fakaofo"
+msgstr "Pacífico/Fakaofo"
+
+#: ../calendar/zones.h:375
+msgid "Pacific/Fiji"
+msgstr "Pacífico/Fiji"
+
+#: ../calendar/zones.h:376
+msgid "Pacific/Funafuti"
+msgstr "Pacífico/Funafuti"
+
+#: ../calendar/zones.h:377
+msgid "Pacific/Galapagos"
+msgstr "Pacífico/Galápagos"
+
+#: ../calendar/zones.h:378
+msgid "Pacific/Gambier"
+msgstr "Pacífico/Gambier"
+
+#: ../calendar/zones.h:379
+msgid "Pacific/Guadalcanal"
+msgstr "Pacífico/Guadalcanal"
+
+#: ../calendar/zones.h:380
+msgid "Pacific/Guam"
+msgstr "Pacífico/Guam"
+
+#: ../calendar/zones.h:381
+msgid "Pacific/Honolulu"
+msgstr "Pacífico/Honolulú"
+
+#: ../calendar/zones.h:382
+msgid "Pacific/Johnston"
+msgstr "Pacífico/Johnston"
+
+#: ../calendar/zones.h:383
+msgid "Pacific/Kiritimati"
+msgstr "Pacífico/Kiritimati"
+
+#: ../calendar/zones.h:384
+msgid "Pacific/Kosrae"
+msgstr "Pacífico/Kosrae"
+
+#: ../calendar/zones.h:385
+msgid "Pacific/Kwajalein"
+msgstr "Pacífico/Kwajalein"
+
+#: ../calendar/zones.h:386
+msgid "Pacific/Majuro"
+msgstr "Pacífico/Majuro"
+
+#: ../calendar/zones.h:387
+msgid "Pacific/Marquesas"
+msgstr "Pacífico/Marquesas"
+
+#: ../calendar/zones.h:388
+msgid "Pacific/Midway"
+msgstr "Pacífico/Midway"
+
+#: ../calendar/zones.h:389
+msgid "Pacific/Nauru"
+msgstr "Pacífico/Nauru"
+
+#: ../calendar/zones.h:390
+msgid "Pacific/Niue"
+msgstr "Pacífico/Niue"
+
+#: ../calendar/zones.h:391
+msgid "Pacific/Norfolk"
+msgstr "Pacífico/Norfolk"
+
+#: ../calendar/zones.h:392
+msgid "Pacific/Noumea"
+msgstr "Pacífico/Noumea"
+
+#: ../calendar/zones.h:393
+msgid "Pacific/Pago_Pago"
+msgstr "Pacífico/Pago Pago"
+
+#: ../calendar/zones.h:394
+msgid "Pacific/Palau"
+msgstr "Pacífico/Palau"
+
+#: ../calendar/zones.h:395
+msgid "Pacific/Pitcairn"
+msgstr "Pacífico/Pitcairn"
+
+#: ../calendar/zones.h:396
+msgid "Pacific/Ponape"
+msgstr "Pacífico/Ponape"
+
+#: ../calendar/zones.h:397
+msgid "Pacific/Port_Moresby"
+msgstr "Pacífico/Port Moresby"
+
+#: ../calendar/zones.h:398
+msgid "Pacific/Rarotonga"
+msgstr "Pacífico/Rarotonga"
+
+#: ../calendar/zones.h:399
+msgid "Pacific/Saipan"
+msgstr "Pacífico/Saipan"
+
+#: ../calendar/zones.h:400
+msgid "Pacific/Tahiti"
+msgstr "Pacífico/Tahití"
+
+#: ../calendar/zones.h:401
+msgid "Pacific/Tarawa"
+msgstr "Pacífico/Tarawa"
+
+#: ../calendar/zones.h:402
+msgid "Pacific/Tongatapu"
+msgstr "Pacífico/Tongatapu"
+
+#: ../calendar/zones.h:403
+msgid "Pacific/Truk"
+msgstr "Pacífico/Truk"
+
+#: ../calendar/zones.h:404
+msgid "Pacific/Wake"
+msgstr "Pacífico/Wake"
+
+#: ../calendar/zones.h:405
+msgid "Pacific/Wallis"
+msgstr "Pacífico/Wallis"
+
+#: ../calendar/zones.h:406
+msgid "Pacific/Yap"
+msgstr "Pacífico/Yap"
+
+#: ../composer/e-composer-actions.c:208
+msgid "Save as..."
+msgstr "Guardar como…"
+
+#: ../composer/e-composer-actions.c:296
+#: ../widgets/misc/e-signature-editor.c:207
+msgid "_Close"
+msgstr "_Cerrar"
+
+#: ../composer/e-composer-actions.c:298
+msgid "Close the current file"
+msgstr "Cierra el archivo actual"
+
+#: ../composer/e-composer-actions.c:303
+msgid "New _Message"
+msgstr "_Mensaje nuevo"
+
+#: ../composer/e-composer-actions.c:305
+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
+msgid "Configure Evolution"
+msgstr "Configurar Evolution"
+
+#: ../composer/e-composer-actions.c:319
+msgid "Save the current file"
+msgstr "Guardar archivo actual"
+
+#: ../composer/e-composer-actions.c:324
+msgid "Save _As..."
+msgstr "Guardar _como…"
+
+#: ../composer/e-composer-actions.c:326
+msgid "Save the current file with a different name"
+msgstr "Guardar el archivo actual con un nombre diferente"
+
+#: ../composer/e-composer-actions.c:333
+msgid "Character _Encoding"
+msgstr "_Codificación de caracteres"
+
+#: ../composer/e-composer-actions.c:350
+msgid "_Print..."
+msgstr "_Imprimir…"
+
+#: ../composer/e-composer-actions.c:357
+msgid "Print Pre_view"
+msgstr "Vist_a previa de impresión"
+
+#: ../composer/e-composer-actions.c:364
+msgid "Save as _Draft"
+msgstr "Guardar como _borrador"
+
+#: ../composer/e-composer-actions.c:366
+msgid "Save as draft"
+msgstr "Guardar como borrador"
+
+#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:353
+msgid "S_end"
+msgstr "_Enviar"
+
+#: ../composer/e-composer-actions.c:373
+msgid "Send this message"
+msgstr "Enviar este mensaje"
+
+#: ../composer/e-composer-actions.c:381
+msgid "PGP _Encrypt"
+msgstr "Cif_rar con PGP"
+
+#: ../composer/e-composer-actions.c:383
+msgid "Encrypt this message with PGP"
+msgstr "Cifrar este mensaje con PGP"
+
+#: ../composer/e-composer-actions.c:389
+msgid "PGP _Sign"
+msgstr "_Firmar con PGP"
+
+#: ../composer/e-composer-actions.c:391
+msgid "Sign this message with your PGP key"
+msgstr "Firmar este mensaje con su clave GPG"
+
+#: ../composer/e-composer-actions.c:397
+msgid "_Picture Gallery"
+msgstr "_Galería de imágenes"
+
+#: ../composer/e-composer-actions.c:399
+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
+msgid "_Prioritize Message"
+msgstr "_Priorizar mensaje"
+
+#: ../composer/e-composer-actions.c:407
+msgid "Set the message priority to high"
+msgstr "Establecer la prioridad del mensaje a alta"
+
+#: ../composer/e-composer-actions.c:413
+msgid "Re_quest Read Receipt"
+msgstr "_Solicitar confirmación de lectura"
+
+#: ../composer/e-composer-actions.c:415
+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
+msgid "S/MIME En_crypt"
+msgstr "C_ifrar con S/MIME"
+
+#: ../composer/e-composer-actions.c:423
+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
+msgid "S/MIME Sig_n"
+msgstr "Fi_rmar con S/MIME"
+
+#: ../composer/e-composer-actions.c:431
+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
+msgid "_Bcc Field"
+msgstr "Campo «Cc_o»"
+
+#: ../composer/e-composer-actions.c:439
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Conmutador que indica si se muestra el campo «Cco»"
+
+#: ../composer/e-composer-actions.c:445
+msgid "_Cc Field"
+msgstr "Campo «_Cc»"
+
+#: ../composer/e-composer-actions.c:447
+msgid "Toggles whether the CC field is displayed"
+msgstr "Conmutador que indica si se muestra el campo «Cc»"
+
+#: ../composer/e-composer-actions.c:453
+msgid "_Reply-To Field"
+msgstr "Campo «_Responder a»"
+
+#: ../composer/e-composer-actions.c:455
+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
+msgid "Save Draft"
+msgstr "Guardar borrador"
+
+#: ../composer/e-composer-header-table.c:40
+msgid "Enter the recipients of the message"
+msgstr "Escriba los destinatarios del mensaje"
+
+#: ../composer/e-composer-header-table.c:42
+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
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message"
+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
+msgid "Fr_om:"
+msgstr "_De:"
+
+#: ../composer/e-composer-header-table.c:1030
+msgid "_Reply-To:"
+msgstr "_Responder a:"
+
+#: ../composer/e-composer-header-table.c:1034
+msgid "_To:"
+msgstr "_Para:"
+
+#: ../composer/e-composer-header-table.c:1039
+msgid "_Cc:"
+msgstr "_Cc:"
+
+#: ../composer/e-composer-header-table.c:1044
+msgid "_Bcc:"
+msgstr "Cc_o:"
+
+#: ../composer/e-composer-header-table.c:1049
+msgid "_Post To:"
+msgstr "_Publicar en:"
+
+#: ../composer/e-composer-header-table.c:1053
+msgid "S_ubject:"
+msgstr "_Asunto:"
+
+#: ../composer/e-composer-header-table.c:1062
+msgid "Si_gnature:"
+msgstr "_Firma:"
+
+#: ../composer/e-composer-name-header.c:141
+msgid "Click here for the address book"
+msgstr "Pulse aquí para la libreta de direcciones"
+
+#: ../composer/e-composer-post-header.c:131
+msgid "Click here to select folders to post to"
+msgstr "Pulse aquí para seleccionar carpetas en las que publicar"
+
+#: ../composer/e-composer-private.c:250
+msgid "Undo the last action"
+msgstr "Deshacer la última acción"
+
+#: ../composer/e-composer-private.c:254
+msgid "Redo the last undone action"
+msgstr "Rehacer la última acción deshecha"
+
+#: ../composer/e-composer-private.c:258
+msgid "Search for text"
+msgstr "Buscar texto"
+
+#: ../composer/e-composer-private.c:262
+msgid "Search for and replace text"
+msgstr "Buscar y reemplazar texto"
+
+#: ../composer/e-composer-private.c:373
+msgid "Save draft"
+msgstr "Guardar borrador"
+
+#: ../composer/e-msg-composer.c:813
+#, c-format
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"No es posible firmar el mensaje saliente: No hay establecido un certificado "
+"de firma para esta cuenta"
+
+#: ../composer/e-msg-composer.c:822
+#, c-format
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+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
+msgid "Compose Message"
+msgstr "Redactar un mensaje"
+
+#: ../composer/e-msg-composer.c:4231
+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
+msgid "Untitled Message"
+msgstr "Mensaje sin título"
+
+#: ../composer/mail-composer.error.xml.h:1
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr ""
+"Hay algunos adjuntos descargándose. Enviar el correo hará que se envíe son "
+"esos adjuntos pendientes"
+
+#: ../composer/mail-composer.error.xml.h:2
+msgid "All accounts have been removed."
+msgstr "Todas las cuentas han sido eliminadas."
+
+#: ../composer/mail-composer.error.xml.h:3
+msgid "An error occurred while saving to your Drafts folder."
+msgstr "Ocurrió un error al guardar en su carpeta de Borradores."
+
+#: ../composer/mail-composer.error.xml.h:4
+msgid "An error occurred while saving to your Outbox folder."
+msgstr "Ocurrio� un error al guardar en su carpeta de Bandeja de salida."
+
+#: ../composer/mail-composer.error.xml.h:5
+msgid "An error occurred while sending. How do you want to proceed?"
+msgstr "Ocurrió un error al enviar. ¿Cómo quiere proceder?"
+
+#: ../composer/mail-composer.error.xml.h:6
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr ""
+"¿Seguro que quiere descartar el mensaje titulado «{0}» que está redactando?"
+
+#: ../composer/mail-composer.error.xml.h:7
+msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+msgstr ""
+"Debido a «{0}», quizá necesite seleccionar diferentes opciones de correo."
+
+#: ../composer/mail-composer.error.xml.h:8
+msgid "Because &quot;{1}&quot;."
+msgstr "Porque «{1}»."
+
+#: ../composer/mail-composer.error.xml.h:9
+msgid ""
+"Because you are working offline, the message will be saved to your local "
+"Outbox folder. When you are back online you can send the message by clicking "
+"the Send/Receive button in Evolution's toolbar."
+msgstr ""
+"Se guardará el mensaje en su carpeta local de Bandeja de salida debido a que "
+"está sin conexión. Puede enviar el mensaje cuando vuelva a tener conexión, "
+"pulsando el botón Enviar/Recibir en la barra de herramientas de Evolution."
+
+#: ../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 "
+"continue the message at a later date."
+msgstr ""
+"Al cerrar esta ventana de redacción, se descartará el mensaje "
+"permanentemente, a no ser que elija guardar el mensaje en la carpeta "
+"«Borradores». Esto le permitirá continuar el mensaje más tarde."
+
+#: ../composer/mail-composer.error.xml.h:11
+msgid "Could not create message."
+msgstr "No es posible crear un mensaje."
+
+#: ../composer/mail-composer.error.xml.h:12
+msgid "Could not read signature file &quot;{0}&quot;."
+msgstr "No es posible leer el archivo de firma «{0}»."
+
+#: ../composer/mail-composer.error.xml.h:13
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "No se pudo obtener un mensaje al que adjuntar desde {0}."
+
+#: ../composer/mail-composer.error.xml.h:14
+msgid "Could not save to autosave file &quot;{0}&quot;."
+msgstr "No es posible autoguardar el archivo «{0}»."
+
+#: ../composer/mail-composer.error.xml.h:15
+msgid "Do you want to recover unfinished messages?"
+msgstr "¿Quiere recuperar los mensajes no terminados?"
+
+#: ../composer/mail-composer.error.xml.h:16
+msgid "Download in progress. Do you want to send the mail?"
+msgstr "Descarga en progreso. ¿Quiere enviar el correo?"
+
+#: ../composer/mail-composer.error.xml.h:17
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr "Error al autoguardar debido a «{1}»."
+
+#: ../composer/mail-composer.error.xml.h:18
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+"Evolution terminó inesperadamente mientras estaba redactando un mensaje "
+"nuevo. La recuperación del mensaje le permitirá continuar donde lo dejó."
+
+#: ../composer/mail-composer.error.xml.h:19
+msgid "Saving message to Outbox."
+msgstr "Guardando mensaje en la Bandeja de salida."
+
+#: ../composer/mail-composer.error.xml.h:20
+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
+msgid "The reported error was &quot;{0}&quot;."
+msgstr "El error devuelto fue «{0}»."
+
+#: ../composer/mail-composer.error.xml.h:22
+msgid ""
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
+msgstr "El error devuelto fue «{0}». Seguramente no se ha guardado el mensaje."
+
+#: ../composer/mail-composer.error.xml.h:23
+msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
+msgstr "El error devuelto fue «{0}». No se ha enviado el mensaje."
+
+#: ../composer/mail-composer.error.xml.h:24
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "No puede adjuntar el archivo «{0}» a este mensaje."
+
+#: ../composer/mail-composer.error.xml.h:25
+msgid "You need to configure an account before you can compose mail."
+msgstr "Necesita configurar una cuenta antes de poder escribir correo."
+
+#: ../composer/mail-composer.error.xml.h:26
+msgid "Your message was sent, but an error occurred during post-processing."
+msgstr "Se envió su mensaje pero ocurrió un error en el posprocesado."
+
+#. Response codes were chosen somewhat arbitrarily.
+#: ../composer/mail-composer.error.xml.h:28
+msgid "_Continue Editing"
+msgstr "_Continuar editando"
+
+#: ../composer/mail-composer.error.xml.h:30
+msgid "_Do not Recover"
+msgstr "_No recuperar"
+
+#: ../composer/mail-composer.error.xml.h:31
+msgid "_Recover"
+msgstr "_Recuperar"
+
+#: ../composer/mail-composer.error.xml.h:32
+msgid "_Save Draft"
+msgstr "Guardar _borrador"
+
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save to Outbox"
+msgstr "_Guardar en la bandeja de salida"
+
+#: ../composer/mail-composer.error.xml.h:35
+msgid "_Try Again"
+msgstr "I_ntentarlo de nuevo"
+
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplet/anjal-settings-main.c:154
+msgid "ID of the socket to embed in"
+msgstr "El ID del socket en el que empotrarse"
+
+#: ../capplet/anjal-settings-main.c:155
+msgid "socket"
+msgstr "socket"
+
+#: ../capplet/settings/mail-account-view.c:77
+msgid "Please enter your full name."
+msgstr "Introduzca su nombre completo."
+
+#: ../capplet/settings/mail-account-view.c:78
+msgid "Please enter your email address."
+msgstr "Introduzca su dirección de correo-e."
+
+#: ../capplet/settings/mail-account-view.c:79
+msgid "The email address you have entered is invalid."
+msgstr "La dirección de correo-e que ha introducido no es válida."
+
+#: ../capplet/settings/mail-account-view.c:80
+msgid "Please enter your password."
+msgstr "Introduzca su contraseña."
+
+#: ../capplet/settings/mail-account-view.c:259
+#: ../plugins/caldav/caldav-source.c:67
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:413
+#: ../modules/online-accounts/e-online-accounts-google.c:287
+#: ../modules/online-accounts/e-online-accounts-google.c:359
+#: ../plugins/google-account-setup/google-contacts-source.c:55
+#: ../plugins/google-account-setup/google-source.c:87
+msgid "Google"
+msgstr "Google"
+
+#: ../capplet/settings/mail-account-view.c:480
+msgid "Personal details:"
+msgstr "Detalles personales:"
+
+#: ../capplet/settings/mail-account-view.c:487
+msgid "Name:"
+msgstr "Nombre:"
+
+#: ../capplet/settings/mail-account-view.c:496
+msgid "Email address:"
+msgstr "Dirección de correo-e:"
+
+#: ../capplet/settings/mail-account-view.c:506
+msgid "Details:"
+msgstr "Detalles:"
+
+#: ../capplet/settings/mail-account-view.c:514
+msgid "Receiving"
+msgstr "Recepción de correo"
+
+#: ../capplet/settings/mail-account-view.c:521
+msgid "Server type:"
+msgstr "Tipo de servidor:"
+
+#: ../capplet/settings/mail-account-view.c:530
+msgid "Server address:"
+msgstr "Dirección del servidor:"
+
+#: ../capplet/settings/mail-account-view.c:539
+msgid "Username:"
+msgstr "Nombre de usuario:"
+
+#: ../capplet/settings/mail-account-view.c:548
+msgid "Use encryption:"
+msgstr "Usar cifrado:"
+
+#: ../capplet/settings/mail-account-view.c:553
+#: ../capplet/settings/mail-account-view.c:588
+msgid "never"
+msgstr "nunca"
+
+#: ../capplet/settings/mail-account-view.c:565
+msgid "Sending"
+msgstr "Opciones de envío"
+
+#: ../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."
+msgstr ""
+"Para usar la aplicación de correo electrónico debe configurar una cuenta. "
+"Escriba su dirección de correo-e y su contraseña debajo y se intentarán "
+"averiguar los ajustes. Si no se puede hacer automáticamente necesitará "
+"también los detalles del servidor."
+
+#: ../capplet/settings/mail-account-view.c:609
+msgid ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
+msgstr ""
+"No se pudieron averiguar automáticamente los ajustes para su correo. "
+"Intrdúzcalos debajo. Se ha intentado hacer una aproximación inicial con los "
+"detallas que ha introducido pero puede que tenga que cambiarlos."
+
+#: ../capplet/settings/mail-account-view.c:611
+msgid "You can specify more options to configure the account."
+msgstr "Puede especificar más opciones para configurar la cuenta."
+
+#: ../capplet/settings/mail-account-view.c:613
+msgid ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
+msgstr ""
+"Ahora se necesitan sus ajustes para el envío de correo. Se intentaron hacer "
+"algunas averiguaciones pero debería comprobarlas para asegurarse."
+
+#: ../capplet/settings/mail-account-view.c:614
+msgid "You can specify your default settings for your account."
+msgstr "Puede especificar sus ajustes predeterminados para su cuenta."
+
+#: ../capplet/settings/mail-account-view.c:615
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
+msgstr ""
+"Hora de comprobar los ajustes antes de intentar conectar con el servidor y "
+"obtener su correo."
+
+#: ../capplet/settings/mail-account-view.c:630
+#: ../mail/em-account-editor.c:2289 ../mail/em-account-editor.c:2425
+msgid "Identity"
+msgstr "Identidad"
+
+#: ../capplet/settings/mail-account-view.c:630
+msgid "Next - Receiving mail"
+msgstr "Siguiente - Recepción de correo"
+
+#: ../capplet/settings/mail-account-view.c:631
+msgid "Receiving mail"
+msgstr "Recepción de correo"
+
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:632
+msgid "Next - Sending mail"
+msgstr "Siguiente - Envío de correo"
+
+#: ../capplet/settings/mail-account-view.c:631
+msgid "Back - Identity"
+msgstr "Atrás - Identidad"
+
+#: ../capplet/settings/mail-account-view.c:631
+msgid "Next - Receiving options"
+msgstr "Siguiente - Opciones de recepción"
+
+#: ../capplet/settings/mail-account-view.c:632
+msgid "Receiving options"
+msgstr "Opciones de recepción"
+
+#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:634
+msgid "Back - Receiving mail"
+msgstr "Siguiente - Recepción de correo"
+
+#: ../capplet/settings/mail-account-view.c:634
+msgid "Sending mail"
+msgstr "Envío de correo"
+
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
+msgid "Next - Review account"
+msgstr "Siguiente - Revisar la cuenta"
+
+#: ../capplet/settings/mail-account-view.c:634
+msgid "Next - Defaults"
+msgstr "Siguiente - Predeterminados"
+
+#: ../capplet/settings/mail-account-view.c:634
+msgid "Back - Receiving options"
+msgstr "Atrás - Opciones de recepción"
+
+#: ../capplet/settings/mail-account-view.c:635
+#: ../mail/em-account-editor.c:3377
+msgid "Defaults"
+msgstr "Predeterminados"
+
+#: ../capplet/settings/mail-account-view.c:635
+msgid "Back - Sending mail"
+msgstr "Atrás - Envío de correo"
+
+#: ../capplet/settings/mail-account-view.c:637
+msgid "Review account"
+msgstr "Revisar la cuenta"
+
+#: ../capplet/settings/mail-account-view.c:637
+msgid "Finish"
+msgstr "Finalizar"
+
+#: ../capplet/settings/mail-account-view.c:637
+msgid "Back - Sending"
+msgstr "Atras - Envío"
+
+#: ../capplet/settings/mail-account-view.c:760
+msgid "Setup Google contacts with Evolution"
+msgstr "Configurar los contactos de Google con Evolution"
+
+#: ../capplet/settings/mail-account-view.c:761
+msgid "Setup Google calendar with Evolution"
+msgstr "Configurar el calendario de Google con Evolution"
+
+#: ../capplet/settings/mail-account-view.c:766
+msgid "You may need to enable IMAP access."
+msgstr "Puede que deba activar el acceso IMAP."
+
+#: ../capplet/settings/mail-account-view.c:774
+msgid "Google account settings:"
+msgstr "Configuración de la cuenta de Google:"
+
+#: ../capplet/settings/mail-account-view.c:800
+msgid "Setup Yahoo calendar with Evolution"
+msgstr "Configurar el calendario de Yahoo con Evolution"
+
+#: ../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 ""
+"Los calendarios de Yahoo se llaman nombre_apellido. Se ha intentado formar "
+"el nombre del calendario. Confirme y vuelva a introducir el nombre del "
+"calendario si no es correcto."
+
+#: ../capplet/settings/mail-account-view.c:813
+msgid "Yahoo account settings:"
+msgstr "Configuración de la cuenta de Yahoo:"
+
+#: ../capplet/settings/mail-account-view.c:827
+msgid "Yahoo Calendar name:"
+msgstr "Nombre del calendario de Yahoo:"
+
+#: ../capplet/settings/mail-account-view.c:1098
+msgid "Password:"
+msgstr "Contraseña:"
+
+#: ../capplet/settings/mail-account-view.c:1150
+#: ../capplet/settings/mail-settings-view.c:254
+msgid "Close Tab"
+msgstr "Cerrar pestaña"
+
+#: ../capplet/settings/mail-account-view.c:1160
+msgid "Account Wizard"
+msgstr "Asistente de cuentas"
+
+#: ../capplet/settings/mail-capplet-shell.c:215
+msgid "Evolution account assistant"
+msgstr "Asistente de cuentas de Evolution"
+
+#. create the local source group
+#: ../capplet/settings/mail-capplet-shell.c:377 ../mail/e-mail-local.c:81
+#: ../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
+#: ../modules/calendar/e-cal-shell-migrate.c:154
+#: ../modules/calendar/e-memo-shell-backend.c:102
+#: ../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 "En este equipo"
+
+#: ../capplet/settings/mail-settings-view.c:150
+#, c-format
+msgid "Modify %s..."
+msgstr "Modificar %s…"
+
+#: ../capplet/settings/mail-settings-view.c:152
+msgid "Add a new account"
+msgstr "Añadir una cuenta nueva"
+
+#: ../capplet/settings/mail-settings-view.c:188
+msgid "Account management"
+msgstr "Gestión de cuentas"
+
+#: ../capplet/settings/mail-settings-view.c:264
+msgid "Settings"
+msgstr "Ajustes"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+msgid "Calendar event notifications"
+msgstr "Notificaciones de acontecimientos del calendario"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Evolution Alarm Notify"
+msgstr "Notificador de alertas de Evolution"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:999
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../shell/e-shell-window-private.c:257
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/evolution.desktop.in.in.h:2
+msgid "Evolution Mail and Calendar"
+msgstr "Correo y calendario de Evolution"
+
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
+msgid "Groupware Suite"
+msgstr "Suite de trabajo en grupo"
+
+#: ../data/evolution.desktop.in.in.h:4
+msgid "Manage your email, contacts and schedule"
+msgstr "Gestione su correo-e, contactos y calendario"
+
+#: ../data/evolution-settings.desktop.in.in.h:1
+msgid "Configure email accounts"
+msgstr "Configurar cuentas de correo-e"
+
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "Ajustes del correo"
+
+#. Translators: This is a cancelled activity.
+#: ../e-util/e-activity.c:227
+#, c-format
+msgid "%s (cancelled)"
+msgstr "%s (cancelado)"
+
+#. Translators: This is a completed activity.
+#: ../e-util/e-activity.c:230
+#, c-format
+msgid "%s (completed)"
+msgstr "%s (completado)"
+
+#. Translators: This is an activity waiting to run.
+#: ../e-util/e-activity.c:233
+#, c-format
+msgid "%s (waiting)"
+msgstr "%s (esperando)"
+
+#. Translators: This is a running activity which
+#. *              the user has requested to cancel.
+#: ../e-util/e-activity.c:237
+#, c-format
+msgid "%s (cancelling)"
+msgstr "%s (cancelado)"
+
+#: ../e-util/e-activity.c:239
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../e-util/e-activity.c:244
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% completado)"
+
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
+msgstr "�rabe"
+
+#: ../e-util/e-charset.c:54
+msgid "Baltic"
+msgstr "Báltico"
+
+#: ../e-util/e-charset.c:55
+msgid "Central European"
+msgstr "Centroeuropeo"
+
+#: ../e-util/e-charset.c:56
+msgid "Chinese"
+msgstr "Chino"
+
+#: ../e-util/e-charset.c:57
+msgid "Cyrillic"
+msgstr "Cirílico"
+
+#: ../e-util/e-charset.c:58
+msgid "Greek"
+msgstr "Griego"
+
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "Hebreo"
+
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "Japonés"
+
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "Coreano"
+
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "Tailandés"
+
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "Turco"
+
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../e-util/e-charset.c:65
+msgid "Western European"
+msgstr "Europeo occidental"
+
+#: ../e-util/e-charset.c:66
+msgid "Western European, New"
+msgstr "Europeo occidental, nuevo"
+
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
+msgid "Traditional"
+msgstr "tradicional"
+
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
+msgid "Simplified"
+msgstr "simplificado"
+
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
+msgid "Ukrainian"
+msgstr "Ucraniano"
+
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
+msgid "Visual"
+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
+#: ../plugins/itip-formatter/itip-view.c:191
+#: ../widgets/table/e-cell-date-edit.c:307
+msgid "Today"
+msgstr "Hoy"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:219
+msgid "Tomorrow"
+msgstr "Mañana"
+
+#: ../e-util/e-datetime-format.c:219
+msgid "Yesterday"
+msgstr "Ayer"
+
+#. 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:227
+msgctxt "DateFmt"
+msgid "Next Mon"
+msgstr "Siguiente lun"
+
+#. 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:233
+msgctxt "DateFmt"
+msgid "Next Tue"
+msgstr "Siguiente mar"
+
+#. 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:239
+msgctxt "DateFmt"
+msgid "Next Wed"
+msgstr "Siguiente mie"
+
+#. 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:245
+msgctxt "DateFmt"
+msgid "Next Thu"
+msgstr "Siguiente jue"
+
+#. 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:251
+msgctxt "DateFmt"
+msgid "Next Fri"
+msgstr "Siguiente vie"
+
+#. 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:257
+msgctxt "DateFmt"
+msgid "Next Sat"
+msgstr "Siguiente sab"
+
+#. 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:263
+msgctxt "DateFmt"
+msgid "Next Sun"
+msgstr "Siguiente dom"
+
+#: ../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 "Usar los valores predeterminados del sistema"
+
+#: ../e-util/e-datetime-format.c:574
+msgid "Format:"
+msgstr "Formato:"
+
+#: ../e-util/e-file-utils.c:151
+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
+#, 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
+#, c-format
+msgid "Writing \"%s\" to %s"
+msgstr "Escribiendo «%s» a «%s»"
+
+#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:388
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "semanas"
+
+#: ../e-util/e-print.c:161
+msgid "An error occurred while printing"
+msgstr "Ocurrió un error al imprimir"
+
+#: ../e-util/e-print.c:168
+msgid "The printing system reported the following details about the error:"
+msgstr ""
+"El sistema de impresión informó de los siguientes detalles sobre el error:"
+
+#: ../e-util/e-print.c:174
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr ""
+"El sistema de impresión no proporcionó ningún detalle adicional acerca del "
+"error."
+
+#: ../e-util/e-signature.c:708
+msgid "Autogenerated"
+msgstr "Autogenerado"
+
+#: ../e-util/e-system.error.xml.h:1
+msgid "Because \"{1}\"."
+msgstr "Porque «{1}»."
+
+#: ../e-util/e-system.error.xml.h:2
+msgid "Cannot open file \"{0}\"."
+msgstr "No se puede abrir el archivo «{0}»."
+
+#: ../e-util/e-system.error.xml.h:3
+msgid "Cannot save file \"{0}\"."
+msgstr "No se puede guardar el archivo «{0}»."
+
+#: ../e-util/e-system.error.xml.h:4
+msgid "Do you wish to overwrite it?"
+msgstr "¿Quiere sobreescribirlo?"
+
+#: ../e-util/e-system.error.xml.h:5
+msgid "File exists \"{0}\"."
+msgstr "El archivo existe «{0}»."
+
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
+msgid "_Overwrite"
+msgstr "_Sobreescribir"
+
+#: ../e-util/e-util.c:117
+msgid "Could not open the link."
+msgstr "No se pudo abrir el enlace."
+
+#: ../e-util/e-util.c:164
+msgid "Could not display help for Evolution."
+msgstr "No se pudo mostrar la ayuda de Evolution."
+
+#: ../e-util/gconf-bridge.c:1332
+#, c-format
+msgid "GConf error: %s"
+msgstr "Error de GConf: %s"
+
+#: ../e-util/gconf-bridge.c:1343
+msgid "All further errors shown only on terminal."
+msgstr "En adelante todos los errores sólo se mostrarán en el terminal."
+
+#: ../em-format/em-format-quote.c:319 ../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
+msgid "From"
+msgstr "De"
+
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1061
+#: ../modules/mail/em-mailer-prefs.c:73
+msgid "Reply-To"
+msgstr "Responder a"
+
+#: ../em-format/em-format-quote.c:319 ../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 "Cc"
+
+#: ../em-format/em-format-quote.c:319 ../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 "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
+msgid "Subject"
+msgstr "Asunto"
+
+#. pseudo-header
+#: ../em-format/em-format-quote.c:475 ../mail/em-format-html.c:2820
+#: ../modules/mail/em-mailer-prefs.c:1028
+msgid "Mailer"
+msgstr "Transporte"
+
+#: ../em-format/em-format-quote.c:565 ../mail/em-composer-utils.c:1207
+msgid "-------- Forwarded Message --------"
+msgstr "--------- Mensaje reenviado --------"
+
+#: ../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
+#: ../widgets/misc/e-dateedit.c:545
+msgid "Date"
+msgstr "Fecha"
+
+#: ../em-format/em-format.c:1067 ../modules/mail/em-mailer-prefs.c:79
+msgid "Newsgroups"
+msgstr "Grupos de noticias"
+
+#: ../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 "Cara"
+
+#: ../em-format/em-format.c:1472
+#, c-format
+msgid "%s attachment"
+msgstr "%s adjunto"
+
+#: ../em-format/em-format.c:1583
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "No es posible interpretar el mensaje S/MIME: Error desconocido"
+
+#: ../em-format/em-format.c:1777 ../em-format/em-format.c:2005
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "No es posible analizar el mensaje MIME. Mostrando la fuente."
+
+#: ../em-format/em-format.c:1788
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Tipo de cifrado no soportado para multipart/encrypted"
+
+#: ../em-format/em-format.c:1808
+msgid "Could not parse PGP/MIME message"
+msgstr "No es posible interpretar el mensaje PGP/MIME"
+
+#: ../em-format/em-format.c:1809
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "No se pudo interpretar el mensaje PGP/MIME: Error desconocido"
+
+#: ../em-format/em-format.c:2030
+msgid "Unsupported signature format"
+msgstr "Formato de firma no soportado"
+
+#: ../em-format/em-format.c:2043 ../em-format/em-format.c:2225
+msgid "Error verifying signature"
+msgstr "Error al verificar la firma"
+
+#: ../em-format/em-format.c:2044 ../em-format/em-format.c:2210
+#: ../em-format/em-format.c:2226
+msgid "Unknown error verifying signature"
+msgstr "Error desconocido al verificar la firma"
+
+#: ../em-format/em-format.c:2318
+msgid "Could not parse PGP message: "
+msgstr "No se pudo analizar el mensaje PGP: "
+
+#. Don't delete this code, since it is needed so that xgettext can extract the translations.
+#. * Please, keep these strings in sync with the strings in the timespans array
+#: ../filter/e-filter-datespec.c:66
+#, c-format
+msgid "1 second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "hace un segundo"
+msgstr[1] "hace %d segundos"
+
+#: ../filter/e-filter-datespec.c:67
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] "dentro de un segundo"
+msgstr[1] "dentro de %d segundos"
+
+#: ../filter/e-filter-datespec.c:68
+#, c-format
+msgid "1 minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "hace un minuto"
+msgstr[1] "hace %d minutos"
+
+#: ../filter/e-filter-datespec.c:69
+#, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] "dentro de un minuto"
+msgstr[1] "dentro de %d minutos"
+
+#: ../filter/e-filter-datespec.c:70
+#, c-format
+msgid "1 hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "hace una hora"
+msgstr[1] "hace %d horas"
+
+#: ../filter/e-filter-datespec.c:71
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] "dentro de una hora"
+msgstr[1] "dentro de %d horas"
+
+#: ../filter/e-filter-datespec.c:72
+#, c-format
+msgid "1 day ago"
+msgid_plural "%d days ago"
+msgstr[0] "hace un día"
+msgstr[1] "hace %d días"
+
+#: ../filter/e-filter-datespec.c:73
+#, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] "dentro de un día"
+msgstr[1] "dentro de %d días"
+
+#: ../filter/e-filter-datespec.c:74
+#, c-format
+msgid "1 week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "hace una semana"
+msgstr[1] "hace %d semanas"
+
+#: ../filter/e-filter-datespec.c:75
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] "dentro de una semana"
+msgstr[1] "dentro de %d semanas"
+
+#: ../filter/e-filter-datespec.c:76
+#, c-format
+msgid "1 month ago"
+msgid_plural "%d months ago"
+msgstr[0] "hace un mes"
+msgstr[1] "hace %d meses"
+
+#: ../filter/e-filter-datespec.c:77
+#, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] "dentro de un mes"
+msgstr[1] "dentro de %d meses"
+
+#: ../filter/e-filter-datespec.c:78
+#, c-format
+msgid "1 year ago"
+msgid_plural "%d years ago"
+msgstr[0] "hace un año"
+msgstr[1] "hace %d años"
+
+#: ../filter/e-filter-datespec.c:79
+#, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] "dentro de un años"
+msgstr[1] "dentro de %d años"
+
+#: ../filter/e-filter-datespec.c:129
+msgid "<click here to select a date>"
+msgstr "<pulse aquí para seleccionar una fecha>"
+
+#: ../filter/e-filter-datespec.c:132 ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:154
+msgid "now"
+msgstr "ahora"
+
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: ../filter/e-filter-datespec.c:139
+msgid "%d-%b-%Y"
+msgstr "%e/%b/%Y"
+
+# Aquí time se refiere a fecha
+#: ../filter/e-filter-datespec.c:286
+msgid "Select a time to compare against"
+msgstr "Seleccione una fecha con la que comparar"
+
+#: ../filter/e-filter-file.c:190
+msgid "Choose a File"
+msgstr "Elegir un archivo"
+
+#: ../filter/e-filter-rule.c:666
+msgid "R_ule name:"
+msgstr "Nombre de la _regla:"
+
+#: ../filter/e-filter-rule.c:696
+msgid "Find items that meet the following conditions"
+msgstr "Buscar elementos que cumplen con estos criterios"
+
+#: ../filter/e-filter-rule.c:721
+msgid "If all conditions are met"
+msgstr "Si se cumplen todos los criterios"
+
+#: ../filter/e-filter-rule.c:722
+msgid "If any conditions are met"
+msgstr "Si se cumple algún criterio"
+
+#: ../filter/e-filter-rule.c:725
+msgid "_Find items:"
+msgstr "_Buscar elementos:"
+
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#: ../filter/e-filter-rule.c:754
+msgid "None"
+msgstr "Ninguna"
+
+#: ../filter/e-filter-rule.c:755
+msgid "All related"
+msgstr "Todas las relacionadas"
+
+#: ../filter/e-filter-rule.c:756 ../widgets/misc/e-send-options.ui.h:19
+msgid "Replies"
+msgstr "Respuestas"
+
+#: ../filter/e-filter-rule.c:757
+msgid "Replies and parents"
+msgstr "Respuestas y antecesores"
+
+#: ../filter/e-filter-rule.c:758
+msgid "No reply or parent"
+msgstr "Sin respuesta o antecesor"
+
+#: ../filter/e-filter-rule.c:761
+msgid "I_nclude threads:"
+msgstr "I_ncluir conversaciones:"
+
+#: ../filter/e-filter-rule.c:786
+msgid "A_dd Condition"
+msgstr "Añadir a_cción"
+
+#: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:323
+msgid "Incoming"
+msgstr "Entrante"
+
+#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:324
+msgid "Outgoing"
+msgstr "Saliente"
+
+#: ../filter/e-rule-editor.c:270
+msgid "Add Rule"
+msgstr "Añadir regla"
+
+#: ../filter/e-rule-editor.c:359
+msgid "Edit Rule"
+msgstr "Editar regla"
+
+#: ../filter/filter.error.xml.h:1
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr "Error en la expresión regular «{0}»."
+
+#: ../filter/filter.error.xml.h:2
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr "No es posible compilar la expresión regular «{1}»."
+
+#: ../filter/filter.error.xml.h:3
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr "El archivo «{0}» no existe o no es un archivo regular."
+
+#: ../filter/filter.error.xml.h:4
+msgid "Missing date."
+msgstr "Falta la fecha."
+
+#: ../filter/filter.error.xml.h:5
+msgid "Missing file name."
+msgstr "Falta el nombre de archivo."
+
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
+msgid "Missing name."
+msgstr "Falta el nombre."
+
+#: ../filter/filter.error.xml.h:7
+msgid "Name &quot;{0}&quot; already used."
+msgstr "El nombre «{0}» ya se está usando."
+
+#: ../filter/filter.error.xml.h:8
+msgid "Please choose another name."
+msgstr "Elija otro nombre."
+
+#: ../filter/filter.error.xml.h:9
+msgid "You must choose a date."
+msgstr "Debe elegir una fecha."
+
+#: ../filter/filter.error.xml.h:10
+msgid "You must name this filter."
+msgstr "Debe dar un nombre a este filtro."
+
+#: ../filter/filter.error.xml.h:11
+msgid "You must specify a file name."
+msgstr "Debe especificar un nombre de archivo."
+
+#: ../filter/filter.ui.h:1
+msgid "Compare against"
+msgstr "Comparar con"
+
+#: ../filter/filter.ui.h:3
+msgid "Show filters for mail:"
+msgstr "Mostrar filtros para el correo:"
+
+#: ../filter/filter.ui.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"La fecha del mensaje se comparará con las\n"
+"00:00 de la fecha aquí especificada."
+
+#: ../filter/filter.ui.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"La fecha del mensaje se comparará con una\n"
+"fecha relativa al momento del filtrado."
+
+#: ../filter/filter.ui.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"La fecha del mensaje se comparará con la\n"
+"fecha actual del momento del filtrado."
+
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:194
+msgid "_Filter Rules"
+msgstr "Reglas de _filtrado"
+
+#: ../filter/filter.ui.h:12
+msgid "a time relative to the current time"
+msgstr "una fecha relativa al momento actual"
+
+#: ../filter/filter.ui.h:13
+msgid "ago"
+msgstr "atrás"
+
+#: ../filter/filter.ui.h:16
+msgid "in the future"
+msgstr "en el futuro"
+
+#: ../filter/filter.ui.h:18
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+msgid "months"
+msgstr "meses"
+
+#: ../filter/filter.ui.h:19
+msgid "seconds"
+msgstr "segundos"
+
+#: ../filter/filter.ui.h:20
+msgid "the current time"
+msgstr "la hora actual"
+
+#: ../filter/filter.ui.h:21
+msgid "the time you specify"
+msgstr "la fecha que especifique"
+
+#: ../filter/filter.ui.h:23
+msgid "years"
+msgstr "años"
+
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:863 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "Ninguna"
+
+#: ../mail/em-account-editor.c:946
+msgid "Never"
+msgstr "Nunca"
+
+#: ../mail/em-account-editor.c:947
+msgid "Always"
+msgstr "Siempre"
+
+#: ../mail/em-account-editor.c:948
+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
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "Ninguna"
+
+#: ../mail/em-account-editor.c:2237
+msgid "Fil_e:"
+msgstr "_Archivo:"
+
+#: ../mail/em-account-editor.c:2237 ../mail/mail-config.ui.h:157
+msgid "_Path:"
+msgstr "R_uta:"
+
+#: ../mail/em-account-editor.c:2286
+msgid "Mail Configuration"
+msgstr "Configuración del correo"
+
+#: ../mail/em-account-editor.c:2287
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"Bienvenido al asistente de configuración de correo de Evolution.\n"
+"\n"
+"Para comenzar, pulse «Continuar»."
+
+#: ../mail/em-account-editor.c:2290
+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 ""
+>>>>>>> master
 "Escriba debajo su nombre y dirección de correo-e. Los campos «opcionales» no "
 "hace falta que los rellene, a menos que quiera incluir esta información en "
 "el correo-e que envíe."
 
+<<<<<<< HEAD
 #: ../mail/em-account-editor.c:2240 ../mail/em-account-editor.c:2429
 msgid "Receiving Email"
 msgstr "Recepción de correo"
@@ -8198,6 +13981,21 @@ msgid "Sending Email"
 msgstr "Envío de correo"
 
 #: ../mail/em-account-editor.c:2244
+=======
+#: ../mail/em-account-editor.c:2292 ../mail/em-account-editor.c:2484
+msgid "Receiving Email"
+msgstr "Recepción de correo"
+
+#: ../mail/em-account-editor.c:2293
+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
+msgid "Sending Email"
+msgstr "Envío de correo"
+
+#: ../mail/em-account-editor.c:2296
+>>>>>>> master
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -8206,11 +14004,19 @@ msgstr ""
 "seguro, pregúntele a su administrador de sistemas o a su Proveedor de "
 "Servicios de Internet."
 
+<<<<<<< HEAD
 #: ../mail/em-account-editor.c:2246 ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "Información de la cuenta"
 
 #: ../mail/em-account-editor.c:2247
+=======
+#: ../mail/em-account-editor.c:2298 ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "Información de la cuenta"
+
+#: ../mail/em-account-editor.c:2299
+>>>>>>> master
 msgid ""
 "Please enter a descriptive name for this account below.\n"
 "This name will be used for display purposes only."
@@ -8218,11 +14024,19 @@ msgstr ""
 "Introduzca un nombre descriptivo para esta cuenta en el espacio de abajo.\n"
 "Este nombre se usará sólo para mostrarlo."
 
+<<<<<<< HEAD
 #: ../mail/em-account-editor.c:2251
 msgid "Done"
 msgstr "Hecho"
 
 #: ../mail/em-account-editor.c:2252
+=======
+#: ../mail/em-account-editor.c:2303
+msgid "Done"
+msgstr "Hecho"
+
+#: ../mail/em-account-editor.c:2304
+>>>>>>> master
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8235,6 +14049,7 @@ msgstr ""
 "Ahora está listo para enviar y recibir correo usando Evolution. \n"
 "\n"
 "Pulse «Aplicar» para guardar su configuración."
+<<<<<<< HEAD
 
 #: ../mail/em-account-editor.c:2788
 msgid "Check for _new messages every"
@@ -8463,15 +14278,253 @@ msgid "Migration"
 msgstr "Migración"
 
 #: ../mail/e-mail-migrate.c:209
+=======
+
+#: ../mail/em-account-editor.c:2843
+msgid "Check for _new messages every"
+msgstr "Comprobar si hay mensajes _nuevos cada"
+
+#: ../mail/em-account-editor.c:2851
+msgid "minu_tes"
+msgstr "minuto_s"
+
+#: ../mail/em-account-editor.c:3520 ../mail/mail-config.ui.h:101
+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
+msgid "Receiving Options"
+msgstr "Opciones de recepción"
+
+#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
+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
+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
+msgid "Icon View"
+msgstr "Vista de icono"
+
+#: ../mail/e-mail-attachment-bar.c:610
+#: ../widgets/misc/e-attachment-paned.c:625
+msgid "List View"
+msgstr "Vista de lista"
+
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1441
+msgid "Close this window"
+msgstr "Cierra esta ventana"
+
+#: ../mail/e-mail-browser.c:293
+msgid "(No Subject)"
+msgstr "(Sin asunto)"
+
+#: ../mail/e-mail-display.c:66
+msgid "_Add to Address Book..."
+msgstr "_Añadir a la libreta de direcciones…"
+
+#: ../mail/e-mail-display.c:73
+msgid "_To This Address"
+msgstr "_A esta dirección"
+
+#: ../mail/e-mail-display.c:80
+msgid "_From This Address"
+msgstr "_Desde esta dirección"
+
+#: ../mail/e-mail-display.c:87
+msgid "Send _Reply To..."
+msgstr "Enviar _respuesta a…"
+
+#: ../mail/e-mail-display.c:89
+msgid "Send a reply message to this address"
+msgstr "Enviar un mensaje de respuesta a esta dirección"
+
+#: ../mail/e-mail-display.c:96
+msgid "Create Search _Folder"
+msgstr "Crear carpeta de _búsqueda"
+
+#: ../mail/e-mail-folder-utils.c:111
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr "Guardando mensaje en la carpeta «%s»"
+
+#: ../mail/e-mail-folder-utils.c:274
+msgid "Forwarded messages"
+msgstr "Mensajes reenviados"
+
+#: ../mail/e-mail-folder-utils.c:391
+msgid "Scanning messages for duplicates"
+msgstr "Buscando mensajes duplicados"
+
+#: ../mail/e-mail-folder-utils.c:584
+#, 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
+#, c-format
+msgid "Removing folder '%s'"
+msgstr "Eliminando carpeta «%s»"
+
+#: ../mail/e-mail-folder-utils.c:968
+#, c-format
+msgid "File \"%s\" has been removed."
+msgstr "Se ha quitado el archivo «%s»."
+
+#: ../mail/e-mail-folder-utils.c:972
+msgid "File has been removed."
+msgstr "Se quitó el archivo."
+
+#: ../mail/e-mail-folder-utils.c:1031
+msgid "Removing attachments"
+msgstr "Quitando adjuntos"
+
+#: ../mail/e-mail-folder-utils.c:1195
+#, 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
+#, c-format
+msgid "Invalid folder URI '%s'"
+msgstr "URI « %s» de la carpeta no válida"
+
+#. Label + combo box has a 12px left margin so it's
+#. * aligned with the junk mail options above it.
+#: ../mail/e-mail-junk-options.c:252
+msgid "Junk filtering software:"
+msgstr "Software de filtrado de SPAM:"
+
+#: ../mail/e-mail-label-dialog.c:223
+msgid "_Label name:"
+msgstr "_Nombre de la etiqueta:"
+
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "_Importante"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:42
+msgid "_Work"
+msgstr "_Trabajo"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:43
+msgid "_Personal"
+msgstr "_Privado"
+
+#. green
+#: ../mail/e-mail-label-list-store.c:44
+msgid "_To Do"
+msgstr "Ta_reas pendientes"
+
+#. blue
+#: ../mail/e-mail-label-list-store.c:45
+msgid "_Later"
+msgstr "_Más tarde"
+
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:677
+msgid "Add Label"
+msgstr "Añadir etiqueta"
+
+#: ../mail/e-mail-label-manager.c:216
+msgid "Edit Label"
+msgstr "Editar etiqueta"
+
+#: ../mail/e-mail-label-manager.c:350
+msgid ""
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
+msgstr ""
+"Nota: El guión bajo en el nombre de la etiqueta se usa\n"
+"como un identificador mnemónico en el menú."
+
+#: ../mail/e-mail-label-tree-view.c:88
+msgid "Color"
+msgstr "Color"
+
+#: ../mail/e-mail-label-tree-view.c:98
+#: ../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 "Nombre"
+
+#: ../mail/e-mail-local.c:41 ../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 "Bandeja de entrada"
+
+#: ../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 "Borradores"
+
+#: ../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 "Bandeja de salida"
+
+#: ../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 "Correo enviado"
+
+#: ../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
+#: ../plugins/templates/templates.c:1322
+msgid "Templates"
+msgstr "Plantillas"
+
+#: ../mail/e-mail-migrate.c:134
+msgid "Migrating..."
+msgstr "Migrando…"
+
+#: ../mail/e-mail-migrate.c:169
+msgid "Migration"
+msgstr "Migración"
+
+#: ../mail/e-mail-migrate.c:210
+>>>>>>> master
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Migrando «%s»:"
 
+<<<<<<< HEAD
 #: ../mail/e-mail-migrate.c:722
 msgid "Migrating Folders"
 msgstr "Migrando carpetas"
 
 #: ../mail/e-mail-migrate.c:723
+=======
+#: ../mail/e-mail-migrate.c:726
+msgid "Migrating Folders"
+msgstr "Migrando carpetas"
+
+#: ../mail/e-mail-migrate.c:727
+>>>>>>> master
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -8488,7 +14541,11 @@ msgstr ""
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "No se pueden crear las carpetas de correo local en: «%s»: %s"
 
+<<<<<<< HEAD
 #: ../mail/e-mail-notebook-view.c:619
+=======
+#: ../mail/e-mail-notebook-view.c:621
+>>>>>>> master
 msgid "Please select a folder"
 msgstr "Seleccionar una carpeta"
 
@@ -8496,6 +14553,7 @@ msgstr "Seleccionar una carpeta"
 msgid "Copy to Folder"
 msgstr "Copiar a la carpeta"
 
+<<<<<<< HEAD
 #: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:486
 msgid "C_opy"
 msgstr "C_opiar"
@@ -8876,10 +14934,393 @@ msgstr "Comprobar los mensajes seleccionados para buscar duplicados"
 
 #: ../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:308 ../mail/em-folder-utils.c:487
+msgid "C_opy"
+msgstr "C_opiar"
+
+#: ../mail/e-mail-reader.c:823 ../mail/em-filter-i18n.h:51
+msgid "Move to Folder"
+msgstr "Mover a la carpeta"
+
+#: ../mail/e-mail-reader.c:823 ../mail/em-folder-utils.c:487
+msgid "_Move"
+msgstr "_Mover"
+
+#: ../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 "_No preguntarme de nuevo."
+
+#: ../mail/e-mail-reader.c:1418
+msgid "_Always ignore Reply-To: for mailing lists."
+msgstr "_Ignorar siempre «Responder a:» para las listas de correo."
+
+#: ../mail/e-mail-reader.c:1784
+msgid "A_dd Sender to Address Book"
+msgstr "_Añadir remitente a la libreta"
+
+#: ../mail/e-mail-reader.c:1786
+msgid "Add sender to address book"
+msgstr "Añadir el remitente a la libreta de direcciones"
+
+#: ../mail/e-mail-reader.c:1791
+msgid "Check for _Junk"
+msgstr "Detectar _SPAM"
+
+#: ../mail/e-mail-reader.c:1793
+msgid "Filter the selected messages for junk status"
+msgstr "Filtra los mensajes seleccionados por el estado de SPAM"
+
+#: ../mail/e-mail-reader.c:1798
+msgid "_Copy to Folder..."
+msgstr "Copiar a la c_arpeta…"
+
+#: ../mail/e-mail-reader.c:1800
+msgid "Copy selected messages to another folder"
+msgstr "Copia mensajes seleccionados a otra carpeta"
+
+#: ../mail/e-mail-reader.c:1805
+msgid "_Delete Message"
+msgstr "_Eliminar el mensaje"
+
+#: ../mail/e-mail-reader.c:1807
+msgid "Mark the selected messages for deletion"
+msgstr "Marcar los mensajes seleccionados para eliminar"
+
+#: ../mail/e-mail-reader.c:1812
+msgid "Filter on Mailing _List..."
+msgstr "Filtro según la _lista de correo…"
+
+#: ../mail/e-mail-reader.c:1814
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Crea una regla para filtrar los mensajes de esta lista de correo"
+
+#: ../mail/e-mail-reader.c:1819
+msgid "Filter on _Recipients..."
+msgstr "Filtro según los _destinatarios…"
+
+#: ../mail/e-mail-reader.c:1821
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Crea una regla para filtrar los mensajes de estos destinatarios"
+
+#: ../mail/e-mail-reader.c:1826
+msgid "Filter on Se_nder..."
+msgstr "Filtro según el _remitente…"
+
+#: ../mail/e-mail-reader.c:1828
+msgid "Create a rule to filter messages from this sender"
+msgstr "Crea una regla para filtrar los mensajes de este remitente"
+
+#: ../mail/e-mail-reader.c:1833
+msgid "Filter on _Subject..."
+msgstr "Filtro según el _asunto…"
+
+#: ../mail/e-mail-reader.c:1835
+msgid "Create a rule to filter messages with this subject"
+msgstr "Crea una regla para filtrar los mensajes con este asunto"
+
+# Colisión en la A
+#: ../mail/e-mail-reader.c:1840
+msgid "A_pply Filters"
+msgstr "Aplicar _filtros"
+
+#: ../mail/e-mail-reader.c:1842
+msgid "Apply filter rules to the selected messages"
+msgstr "Aplica filtros a los mensajes seleccionados"
+
+#: ../mail/e-mail-reader.c:1847
+msgid "_Find in Message..."
+msgstr "B_uscar en el mensaje…"
+
+#: ../mail/e-mail-reader.c:1849
+msgid "Search for text in the body of the displayed message"
+msgstr "Busca un texto en el cuerpo del mensaje mostrado"
+
+#: ../mail/e-mail-reader.c:1854
+msgid "_Clear Flag"
+msgstr "_Quitar marca"
+
+#: ../mail/e-mail-reader.c:1856
+msgid "Remove the follow-up flag from the selected messages"
+msgstr "Quitar la marca de seguimiento de los mensajes seleccionados"
+
+#: ../mail/e-mail-reader.c:1861
+msgid "_Flag Completed"
+msgstr "Ma_rcar como terminado"
+
+#: ../mail/e-mail-reader.c:1863
+msgid "Set the follow-up flag to completed on the selected messages"
+msgstr "Establecer la marca de completado en los mensajes seleccionados"
+
+#: ../mail/e-mail-reader.c:1868
+msgid "Follow _Up..."
+msgstr "Se_guimiento…"
+
+#: ../mail/e-mail-reader.c:1870
+msgid "Flag the selected messages for follow-up"
+msgstr "Marcar los mensajes seleccionados para seguimiento"
+
+#: ../mail/e-mail-reader.c:1875
+msgid "_Attached"
+msgstr "_Adjunto"
+
+#: ../mail/e-mail-reader.c:1877 ../mail/e-mail-reader.c:1884
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Reenvía a alguien el mensaje seleccionado como un adjunto"
+
+#: ../mail/e-mail-reader.c:1882
+msgid "Forward As _Attached"
+msgstr "Reenviar como _adjunto"
+
+#: ../mail/e-mail-reader.c:1889
+msgid "_Inline"
+msgstr "_Incluido en línea"
+
+#: ../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 "Reenvía el mensaje seleccionado en el cuerpo de un mensaje nuevo"
+
+#: ../mail/e-mail-reader.c:1896
+msgid "Forward As _Inline"
+msgstr "Reenviar en _línea"
+
+#: ../mail/e-mail-reader.c:1903
+msgid "_Quoted"
+msgstr "_Citado"
+
+#: ../mail/e-mail-reader.c:1905 ../mail/e-mail-reader.c:1912
+msgid "Forward the selected message quoted like a reply"
+msgstr "Reenvía el mensaje seleccionado citado como una respuesta"
+
+#: ../mail/e-mail-reader.c:1910
+msgid "Forward As _Quoted"
+msgstr "Reenviar como ci_tado"
+
+#: ../mail/e-mail-reader.c:1917
+msgid "_Load Images"
+msgstr "Cargar _imágenes"
+
+#: ../mail/e-mail-reader.c:1919
+msgid "Force images in HTML mail to be loaded"
+msgstr "Fuerza la carga de imágenes en el correo HTML"
+
+#: ../mail/e-mail-reader.c:1924
+msgid "_Important"
+msgstr "_Importante"
+
+#: ../mail/e-mail-reader.c:1926
+msgid "Mark the selected messages as important"
+msgstr "Marcar los mensajes seleccionados como importantes"
+
+#: ../mail/e-mail-reader.c:1931
+msgid "_Junk"
+msgstr "_SPAM"
+
+#: ../mail/e-mail-reader.c:1933
+msgid "Mark the selected messages as junk"
+msgstr "Marcar los mensajes seleccionados como SPAM"
+
+#: ../mail/e-mail-reader.c:1938
+msgid "_Not Junk"
+msgstr "No es SPA_M"
+
+#: ../mail/e-mail-reader.c:1940
+msgid "Mark the selected messages as not being junk"
+msgstr "Marcar los mensajes seleccionados como no SPAM"
+
+#: ../mail/e-mail-reader.c:1945
+msgid "_Read"
+msgstr "_Leído"
+
+#: ../mail/e-mail-reader.c:1947
+msgid "Mark the selected messages as having been read"
+msgstr "Marcar los mensajes seleccionados como leídos"
+
+#: ../mail/e-mail-reader.c:1952
+msgid "Uni_mportant"
+msgstr "N_o importante"
+
+#: ../mail/e-mail-reader.c:1954
+msgid "Mark the selected messages as unimportant"
+msgstr "Marcar los mensajes seleccionados como no importantes"
+
+#: ../mail/e-mail-reader.c:1959
+msgid "_Unread"
+msgstr "_No leído"
+
+#: ../mail/e-mail-reader.c:1961
+msgid "Mark the selected messages as not having been read"
+msgstr "Marcar los mensajes seleccionados como no leídos"
+
+#: ../mail/e-mail-reader.c:1966
+msgid "_Edit as New Message..."
+msgstr "_Editar como un mensaje nuevo…"
+
+#: ../mail/e-mail-reader.c:1968
+msgid "Open the selected messages in the composer for editing"
+msgstr "Abre los mensajes seleccionados en el editor para editarlo"
+
+#: ../mail/e-mail-reader.c:1973
+msgid "Compose _New Message"
+msgstr "Redactar un mensaje _nuevo"
+
+#: ../mail/e-mail-reader.c:1975
+msgid "Open a window for composing a mail message"
+msgstr "Abre una ventana para escribir un mensaje de correo"
+
+#: ../mail/e-mail-reader.c:1980
+msgid "_Open in New Window"
+msgstr "_Abrir en una ventana nueva"
+
+#: ../mail/e-mail-reader.c:1982
+msgid "Open the selected messages in a new window"
+msgstr "Abre los mensajes seleccionados en una ventana nueva"
+
+#: ../mail/e-mail-reader.c:1987
+msgid "_Move to Folder..."
+msgstr "_Mover a la carpeta…"
+
+#: ../mail/e-mail-reader.c:1989
+msgid "Move selected messages to another folder"
+msgstr "Mueve los mensajes seleccionados a otra carpeta"
+
+#: ../mail/e-mail-reader.c:1994
+msgid "_Switch to Folder"
+msgstr "_Cambiar a la carpeta"
+
+#: ../mail/e-mail-reader.c:1996
+msgid "Display the parent folder"
+msgstr "Mostrar la carpeta padre"
+
+#: ../mail/e-mail-reader.c:2001
+msgid "Switch to _next tab"
+msgstr "Cambiar a la _siguiente pestaña"
+
+#: ../mail/e-mail-reader.c:2003
+msgid "Switch to the next tab"
+msgstr "Cambiar a la siguiente pestaña"
+
+#: ../mail/e-mail-reader.c:2008
+msgid "Switch to _previous tab"
+msgstr "Cambiar a la pestaña _anterior"
+
+#: ../mail/e-mail-reader.c:2010
+msgid "Switch to the previous tab"
+msgstr "Cambiar a la pestaña anterior"
+
+#: ../mail/e-mail-reader.c:2015
+msgid "Cl_ose current tab"
+msgstr "C_errar la pestaña actual"
+
+#: ../mail/e-mail-reader.c:2017
+msgid "Close current tab"
+msgstr "Cerrar la pestaña actual"
+
+#: ../mail/e-mail-reader.c:2022
+msgid "_Next Message"
+msgstr "Mensaje _siguiente"
+
+#: ../mail/e-mail-reader.c:2024
+msgid "Display the next message"
+msgstr "Mostrar el mensaje siguiente"
+
+#: ../mail/e-mail-reader.c:2029
+msgid "Next _Important Message"
+msgstr "Mensaje siguiente _importante"
+
+#: ../mail/e-mail-reader.c:2031
+msgid "Display the next important message"
+msgstr "Mostrar el mensaje siguiente importante"
+
+#: ../mail/e-mail-reader.c:2036
+msgid "Next _Thread"
+msgstr "_Conversación siguiente"
+
+#: ../mail/e-mail-reader.c:2038
+msgid "Display the next thread"
+msgstr "Mostrar la siguiente conversación"
+
+#: ../mail/e-mail-reader.c:2043
+msgid "Next _Unread Message"
+msgstr "Mensaje siguiente _no leído"
+
+#: ../mail/e-mail-reader.c:2045
+msgid "Display the next unread message"
+msgstr "Mostrar el siguiente mensaje no leído"
+
+#: ../mail/e-mail-reader.c:2050
+msgid "_Previous Message"
+msgstr "Mensaje _anterior"
+
+#: ../mail/e-mail-reader.c:2052
+msgid "Display the previous message"
+msgstr "Mostrar el mensaje anterior"
+
+#: ../mail/e-mail-reader.c:2057
+msgid "Pr_evious Important Message"
+msgstr "Mensaje anterior i_mportante"
+
+#: ../mail/e-mail-reader.c:2059
+msgid "Display the previous important message"
+msgstr "Mostrar el anterior mensaje importante"
+
+#: ../mail/e-mail-reader.c:2064
+msgid "Previous T_hread"
+msgstr "Con_versación anterior"
+
+#: ../mail/e-mail-reader.c:2066
+msgid "Display the previous thread"
+msgstr "Mostrar la conversación anterior"
+
+#: ../mail/e-mail-reader.c:2071
+msgid "P_revious Unread Message"
+msgstr "Mensaje anterior n_o leído"
+
+#: ../mail/e-mail-reader.c:2073
+msgid "Display the previous unread message"
+msgstr "Mostrar el anterior mensaje no leído"
+
+#: ../mail/e-mail-reader.c:2080
+msgid "Print this message"
+msgstr "Imprime este mensaje"
+
+#: ../mail/e-mail-reader.c:2087
+msgid "Preview the message to be printed"
+msgstr "Vista previa del mensaje que va a imprimirse"
+
+#: ../mail/e-mail-reader.c:2092
+msgid "Re_direct"
+msgstr "Re_dirigir"
+
+#: ../mail/e-mail-reader.c:2094
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Redirige (rebotar) el mensaje seleccionado a alguien"
+
+#: ../mail/e-mail-reader.c:2099
+msgid "Remo_ve Attachments"
+msgstr "Q_uitar adjuntos"
+
+#: ../mail/e-mail-reader.c:2101
+msgid "Remove attachments"
+msgstr "Quitar adjuntos"
+
+#: ../mail/e-mail-reader.c:2106
+msgid "Remove Du_plicate Messages"
+msgstr "Quitar correos _duplicados"
+
+#: ../mail/e-mail-reader.c:2108
+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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+>>>>>>> master
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
+<<<<<<< HEAD
 #: ../mail/e-mail-reader.c:2106
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Responder a todos los destinatarios del mensaje seleccionado"
@@ -8893,10 +15334,26 @@ msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Responde a la lista de correo remitente del mensaje seleccionado"
 
 #: ../mail/e-mail-reader.c:2118
+=======
+#: ../mail/e-mail-reader.c:2115
+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
+msgid "Reply to _List"
+msgstr "Responder a la _lista"
+
+#: ../mail/e-mail-reader.c:2122
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "Responde a la lista de correo remitente del mensaje seleccionado"
+
+#: ../mail/e-mail-reader.c:2127
+>>>>>>> master
 #: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
+<<<<<<< HEAD
 #: ../mail/e-mail-reader.c:2120
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Responde al remitente del mensaje seleccionado"
@@ -9058,11 +15515,175 @@ msgid "Show messages with all email headers"
 msgstr "Mostrar los mensajes con todas las cabeceras de correo-e"
 
 #: ../mail/e-mail-reader.c:2659
+=======
+#: ../mail/e-mail-reader.c:2129
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Responde al remitente del mensaje seleccionado"
+
+#: ../mail/e-mail-reader.c:2134
+msgid "_Save as mbox..."
+msgstr "_Guardar como mbox…"
+
+#: ../mail/e-mail-reader.c:2136
+msgid "Save selected messages as an mbox file"
+msgstr "Guarda los mensajes como un archivo mbox"
+
+#: ../mail/e-mail-reader.c:2141
+msgid "_Message Source"
+msgstr "Me_nsaje en bruto"
+
+#: ../mail/e-mail-reader.c:2143
+msgid "Show the raw email source of the message"
+msgstr "Mostrar mensaje de correo-e en bruto"
+
+#: ../mail/e-mail-reader.c:2155
+msgid "_Undelete Message"
+msgstr "_Recuperar mensaje"
+
+#: ../mail/e-mail-reader.c:2157
+msgid "Undelete the selected messages"
+msgstr "Recupera los mensajes seleccionados"
+
+#: ../mail/e-mail-reader.c:2162
+msgid "_Normal Size"
+msgstr "Tamaño _normal"
+
+#: ../mail/e-mail-reader.c:2164
+msgid "Reset the text to its original size"
+msgstr "Restablecer el texto a su tamaño original"
+
+#: ../mail/e-mail-reader.c:2169
+msgid "_Zoom In"
+msgstr "_Ampliar"
+
+#: ../mail/e-mail-reader.c:2171
+msgid "Increase the text size"
+msgstr "Incrementar el tamaño del texto"
+
+#: ../mail/e-mail-reader.c:2176
+msgid "Zoom _Out"
+msgstr "_Reducir"
+
+#: ../mail/e-mail-reader.c:2178
+msgid "Decrease the text size"
+msgstr "Reduce el tamaño del texto"
+
+#: ../mail/e-mail-reader.c:2185
+msgid "Create R_ule"
+msgstr "Crear _regla"
+
+#: ../mail/e-mail-reader.c:2192
+msgid "Ch_aracter Encoding"
+msgstr "C_odificación de caracteres"
+
+#: ../mail/e-mail-reader.c:2199
+msgid "F_orward As"
+msgstr "Reenviar _como"
+
+#: ../mail/e-mail-reader.c:2206
+msgid "_Group Reply"
+msgstr "_Responder al grupo"
+
+#: ../mail/e-mail-reader.c:2213
+msgid "_Go To"
+msgstr "_Ir a"
+
+#: ../mail/e-mail-reader.c:2220
+msgid "Mar_k As"
+msgstr "Mar_car como"
+
+#: ../mail/e-mail-reader.c:2227
+msgid "_Message"
+msgstr "_Mensaje"
+
+#: ../mail/e-mail-reader.c:2234
+msgid "_Zoom"
+msgstr "_Ampliar"
+
+#: ../mail/e-mail-reader.c:2244
+msgid "Search Folder from Mailing _List..."
+msgstr "Carpeta de búsqueda según la l_ista de correo…"
+
+#: ../mail/e-mail-reader.c:2246
+msgid "Create a search folder for this mailing list"
+msgstr "Crear una carpeta de búsqueda para esta lista de correo"
+
+#: ../mail/e-mail-reader.c:2251
+msgid "Search Folder from Recipien_ts..."
+msgstr "Carpeta de búsqueda según los des_tinatarios…"
+
+#: ../mail/e-mail-reader.c:2253
+msgid "Create a search folder for these recipients"
+msgstr "Crear una carpeta de búsqueda para estos destinatarios"
+
+#: ../mail/e-mail-reader.c:2258
+msgid "Search Folder from Sen_der..."
+msgstr "Carpeta de búsqueda según el r_emitente…"
+
+#: ../mail/e-mail-reader.c:2260
+msgid "Create a search folder for this sender"
+msgstr "Crear una carpeta de búsqueda para este remitente"
+
+#: ../mail/e-mail-reader.c:2265
+msgid "Search Folder from S_ubject..."
+msgstr "Carpeta de búsqueda según el a_sunto…"
+
+#: ../mail/e-mail-reader.c:2267
+msgid "Create a search folder for this subject"
+msgstr "Crear una carpeta de búsqueda para este asunto"
+
+#: ../mail/e-mail-reader.c:2290
+msgid "Mark for Follo_w Up..."
+msgstr "Marcar para se_guimiento…"
+
+#: ../mail/e-mail-reader.c:2298
+msgid "Mark as _Important"
+msgstr "Marcar como imp_ortante"
+
+#: ../mail/e-mail-reader.c:2302
+msgid "Mark as _Junk"
+msgstr "Marcar como _SPAM"
+
+#: ../mail/e-mail-reader.c:2306
+msgid "Mark as _Not Junk"
+msgstr "Marcar como no _SPAM"
+
+#: ../mail/e-mail-reader.c:2310
+msgid "Mar_k as Read"
+msgstr "Marcar como _leído"
+
+#: ../mail/e-mail-reader.c:2314
+msgid "Mark as Uni_mportant"
+msgstr "Marcar como no imp_ortante"
+
+#: ../mail/e-mail-reader.c:2318
+msgid "Mark as _Unread"
+msgstr "Marcar como no _leído"
+
+#: ../mail/e-mail-reader.c:2362
+msgid "_Caret Mode"
+msgstr "Activar cu_rsor"
+
+#: ../mail/e-mail-reader.c:2364
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Mostrar un cursor parpadeante en el cuerpo de los mensajes mostrados"
+
+#: ../mail/e-mail-reader.c:2370
+msgid "All Message _Headers"
+msgstr "_Todas las cabeceras del mensaje"
+
+#: ../mail/e-mail-reader.c:2372
+msgid "Show messages with all email headers"
+msgstr "Mostrar los mensajes con todas las cabeceras de correo-e"
+
+#: ../mail/e-mail-reader.c:2668
+>>>>>>> master
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Obteniendo mensaje «%s»"
 
 #. we changed user, thus reset the chosen calendar combo too, because
+<<<<<<< HEAD
 #. other user means other calendars subscribed
 #: ../mail/e-mail-reader.c:3246 ../mail/mail-config.ui.h:32
 #: ../plugins/google-account-setup/google-source.c:310
@@ -9073,10 +15694,23 @@ msgid "Default"
 msgstr "Predeterminado"
 
 #: ../mail/e-mail-reader.c:3415
+=======
+#. * 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: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 "Predeterminado"
+
+#: ../mail/e-mail-reader.c:3424
+>>>>>>> master
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "Reen_viar"
 
+<<<<<<< HEAD
 #: ../mail/e-mail-reader.c:3416
 msgid "Forward the selected message to someone"
 msgstr "Reenvía a alguien el mensaje seleccionado"
@@ -9095,21 +15729,54 @@ msgstr "Eliminar"
 
 #: ../mail/e-mail-reader.c:3522
 #: ../modules/calendar/e-cal-shell-view-actions.c:1355
+=======
+#: ../mail/e-mail-reader.c:3425
+msgid "Forward the selected message to someone"
+msgstr "Reenvía a alguien el mensaje seleccionado"
+
+#: ../mail/e-mail-reader.c:3444
+msgid "Group Reply"
+msgstr "Responder al grupo"
+
+#: ../mail/e-mail-reader.c:3445
+msgid "Reply to the mailing list, or to all recipients"
+msgstr "Responder a la lista de correo o a todos los destinatarios"
+
+#: ../mail/e-mail-reader.c:3498 ../mail/em-filter-i18n.h:14
+msgid "Delete"
+msgstr "Eliminar"
+
+#: ../mail/e-mail-reader.c:3531
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+>>>>>>> master
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "Siguiente"
 
+<<<<<<< HEAD
 #: ../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
+>>>>>>> master
 #: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "Anterior"
 
+<<<<<<< HEAD
 #: ../mail/e-mail-reader.c:3535 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "Responder"
 
 #: ../mail/e-mail-reader.c:4205
+=======
+#: ../mail/e-mail-reader.c:3544 ../mail/mail-dialogs.ui.h:17
+msgid "Reply"
+msgstr "Responder"
+
+#: ../mail/e-mail-reader.c:4214
+>>>>>>> master
 #, c-format
 msgid "Folder '%s'"
 msgstr "Carpeta «%s»"
@@ -9120,7 +15787,11 @@ msgstr "No advertirme de nuevo"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
+<<<<<<< HEAD
 #: ../mail/e-mail-reader-utils.c:669
+=======
+#: ../mail/e-mail-reader-utils.c:667
+>>>>>>> master
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -9135,7 +15806,11 @@ msgstr[1] ""
 "La carpeta «%s» contiene %u correos duplicados. ¿Está seguro de que quiere "
 "eliminarlos?"
 
+<<<<<<< HEAD
 #: ../mail/e-mail-reader-utils.c:1046
+=======
+#: ../mail/e-mail-reader-utils.c:1044
+>>>>>>> master
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Guardar mensaje"
@@ -9146,17 +15821,26 @@ msgstr[1] "Guardar mensajes"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
+<<<<<<< HEAD
 #: ../mail/e-mail-reader-utils.c:1067
+=======
+#: ../mail/e-mail-reader-utils.c:1065
+>>>>>>> master
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mensaje"
 msgstr[1] "Mensajes"
 
+<<<<<<< HEAD
 #: ../mail/e-mail-session.c:863
+=======
+#: ../mail/e-mail-session.c:878
+>>>>>>> master
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduzca la contraseña para %s"
 
+<<<<<<< HEAD
 #: ../mail/e-mail-session.c:867
 msgid "Enter Passphrase"
 msgstr "Introduzca la contraseña"
@@ -10070,6 +16754,925 @@ msgstr "Comprobar si el correo entrante es SPAM"
 msgid "Citation highlight color"
 msgstr "Color de resaltado de citas"
 
+=======
+#: ../mail/e-mail-session.c:882
+msgid "Enter Passphrase"
+msgstr "Introduzca la contraseña"
+
+#: ../mail/e-mail-session.c:886
+#, c-format
+msgid "Enter Password for %s"
+msgstr "Introduzca su contraseña para %s"
+
+#: ../mail/e-mail-session.c:890
+msgid "Enter Password"
+msgstr "Introduzca contraseña"
+
+#: ../mail/e-mail-session.c:941
+#, c-format
+msgid "User canceled operation."
+msgstr "El usuario canceló la operación."
+
+#: ../mail/e-mail-session.c:1054
+#, c-format
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+"No se proporcionó ninguna dirección de destino, se canceló el reenvío del "
+"mensaje."
+
+#: ../mail/e-mail-session.c:1063
+#, 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
+#, 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
+#, 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/mail-ops.c:657 ../mail/mail-ops.c:691
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+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
+#, 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/mail-ops.c:928
+msgid "Sending message"
+msgstr "Enviando mensaje"
+
+#: ../mail/e-mail-session-utils.c:873
+#, c-format
+msgid "Unsubscribing from folder '%s'"
+msgstr "Desuscribiéndose de la carpeta «%s»"
+
+#: ../mail/e-mail-store-utils.c:168
+#, c-format
+msgid "Disconnecting from '%s'"
+msgstr "Desconectando de «%s»"
+
+#: ../mail/e-mail-store-utils.c:259
+#, c-format
+msgid "Reconnecting to '%s'"
+msgstr "Reconectándose con «%s»"
+
+#: ../mail/e-mail-store-utils.c:334
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "Preparando la cuenta «%s» para desconexión"
+
+#: ../mail/e-mail-tag-editor.c:291
+msgid "Flag to Follow Up"
+msgstr "Marcar para seguimiento"
+
+#. Note to translators: this is the attribution string used
+#. * when quoting messages.  Each ${Variable} gets replaced
+#. * with a value.  To see a full list of available variables,
+#. * see mail/em-composer-utils.c:attribvars array.
+#: ../mail/em-composer-utils.c:1201
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a las ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} escribió:"
+
+#: ../mail/em-composer-utils.c:1212
+msgid "-----Original Message-----"
+msgstr "-----Mensaje original-----"
+
+#. 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:2001
+#, c-format
+msgid "Your message to %s about \"%s\" on %s has been read."
+msgstr "Su mensaje para %s acerca de «%s» se ha leído el «%s»"
+
+#: ../mail/em-composer-utils.c:2061
+#, c-format
+msgid "Delivery Notification for: \"%s\""
+msgstr "Notificación de entrega para: «%s»"
+
+#: ../mail/em-composer-utils.c:2600
+msgid "an unknown sender"
+msgstr "un remitente desconocido"
+
+#: ../mail/em-composer-utils.c:3006
+msgid "Posting destination"
+msgstr "Destino de publicación"
+
+#: ../mail/em-composer-utils.c:3007
+msgid "Choose folders to post the message to."
+msgstr "Elija las carpetas en las que publicar el mensaje."
+
+#: ../mail/em-filter-folder-element.c:241
+msgid "Select Folder"
+msgstr "Seleccionar carpeta"
+
+#. Automatically generated. Do not edit.
+#: ../mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Ajustar puntuación"
+
+#: ../mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Asignar color"
+
+#: ../mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Asignar puntuación"
+
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "Cco"
+
+#: ../mail/em-filter-i18n.h:7
+msgid "Beep"
+msgstr "Pitar"
+
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "Cc"
+
+#: ../mail/em-filter-i18n.h:9
+msgid "Completed On"
+msgstr "Completado en"
+
+#: ../mail/em-filter-i18n.h:12
+msgid "Date received"
+msgstr "Fecha de recepción"
+
+#: ../mail/em-filter-i18n.h:13
+msgid "Date sent"
+msgstr "Fecha de envío"
+
+#: ../mail/em-filter-i18n.h:15
+msgid "Deleted"
+msgstr "Borrado"
+
+#: ../mail/em-filter-i18n.h:17
+msgid "does not end with"
+msgstr "no acaba en"
+
+#: ../mail/em-filter-i18n.h:18
+msgid "does not exist"
+msgstr "no existe"
+
+#: ../mail/em-filter-i18n.h:19
+msgid "does not return"
+msgstr "no devuelve"
+
+#: ../mail/em-filter-i18n.h:20
+msgid "does not sound like"
+msgstr "no suena como"
+
+#: ../mail/em-filter-i18n.h:21
+msgid "does not start with"
+msgstr "no comienza por"
+
+#: ../mail/em-filter-i18n.h:23
+msgid "Draft"
+msgstr "Borrador"
+
+#: ../mail/em-filter-i18n.h:24
+msgid "ends with"
+msgstr "acaba en"
+
+#: ../mail/em-filter-i18n.h:26
+msgid "exists"
+msgstr "existe"
+
+#: ../mail/em-filter-i18n.h:27
+msgid "Expression"
+msgstr "Expresión"
+
+#: ../mail/em-filter-i18n.h:28
+msgid "Follow Up"
+msgstr "Seguimiento"
+
+#: ../mail/em-filter-i18n.h:29
+msgid "Forward to"
+msgstr "Reenviar a"
+
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Importante"
+
+#: ../mail/em-filter-i18n.h:32
+msgid "is after"
+msgstr "es posterior a"
+
+#: ../mail/em-filter-i18n.h:33
+msgid "is before"
+msgstr "es anterior a"
+
+#: ../mail/em-filter-i18n.h:34
+msgid "is Flagged"
+msgstr "está marcado"
+
+#: ../mail/em-filter-i18n.h:38
+msgid "is not Flagged"
+msgstr "no está marcado"
+
+#: ../mail/em-filter-i18n.h:39
+msgid "is not set"
+msgstr "no está configurado"
+
+#: ../mail/em-filter-i18n.h:40
+msgid "is set"
+msgstr "está configurado"
+
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
+msgid "Junk"
+msgstr "SPAM"
+
+#: ../mail/em-filter-i18n.h:42
+msgid "Junk Test"
+msgstr "Detección de SPAM"
+
+#: ../mail/em-filter-i18n.h:43
+msgid "Label"
+msgstr "Etiqueta"
+
+#: ../mail/em-filter-i18n.h:44
+msgid "Mailing list"
+msgstr "Lista de correo"
+
+#: ../mail/em-filter-i18n.h:45
+msgid "Match All"
+msgstr "Coincidir con todo"
+
+#: ../mail/em-filter-i18n.h:46
+msgid "Message Body"
+msgstr "Cuerpo del mensaje"
+
+#: ../mail/em-filter-i18n.h:47
+msgid "Message Header"
+msgstr "Cabecera del mensaje"
+
+#: ../mail/em-filter-i18n.h:48
+msgid "Message is Junk"
+msgstr "El mensaje es SPAM"
+
+#: ../mail/em-filter-i18n.h:49
+msgid "Message is not Junk"
+msgstr "El mensaje no es SPAM"
+
+#: ../mail/em-filter-i18n.h:50
+msgid "Message Location"
+msgstr "Ubicación del mensaje"
+
+#: ../mail/em-filter-i18n.h:52
+msgid "Pipe to Program"
+msgstr "Encauzar al programa"
+
+#: ../mail/em-filter-i18n.h:53
+msgid "Play Sound"
+msgstr "Reproducir un sonido"
+
+#. Past tense, as in "has been read".
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
+msgid "Read"
+msgstr "Leído"
+
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+msgid "Recipients"
+msgstr "Destinatarios"
+
+#: ../mail/em-filter-i18n.h:56
+msgid "Regex Match"
+msgstr "Coincide con la expresión regular"
+
+#: ../mail/em-filter-i18n.h:57
+msgid "Replied to"
+msgstr "Respondió a"
+
+#: ../mail/em-filter-i18n.h:58
+msgid "returns"
+msgstr "devuelve"
+
+#: ../mail/em-filter-i18n.h:59
+msgid "returns greater than"
+msgstr "devuelve mayor que"
+
+#: ../mail/em-filter-i18n.h:60
+msgid "returns less than"
+msgstr "devuelve menor que"
+
+#: ../mail/em-filter-i18n.h:61
+msgid "Run Program"
+msgstr "Ejecutar programa"
+
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
+msgid "Score"
+msgstr "Puntuación"
+
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
+msgid "Sender"
+msgstr "Remitente"
+
+#: ../mail/em-filter-i18n.h:64
+msgid "Sender or Recipients"
+msgstr "Remitente o destinatarios"
+
+#: ../mail/em-filter-i18n.h:65
+msgid "Set Label"
+msgstr "Establecer etiqueta"
+
+#: ../mail/em-filter-i18n.h:66
+msgid "Set Status"
+msgstr "Poner estado"
+
+#: ../mail/em-filter-i18n.h:67
+msgid "Size (kB)"
+msgstr "Tamaño (Kib)"
+
+#: ../mail/em-filter-i18n.h:68
+msgid "sounds like"
+msgstr "suena como"
+
+#: ../mail/em-filter-i18n.h:69
+msgid "Source Account"
+msgstr "Cuenta de origen"
+
+#: ../mail/em-filter-i18n.h:70
+msgid "Specific header"
+msgstr "Cabecera específica"
+
+#: ../mail/em-filter-i18n.h:71
+msgid "starts with"
+msgstr "comienza por"
+
+#: ../mail/em-filter-i18n.h:73
+msgid "Stop Processing"
+msgstr "Parar de procesar"
+
+#: ../mail/em-filter-i18n.h:75
+msgid "Unset Status"
+msgstr "Quitar estado"
+
+#. and now for the action area
+#: ../mail/em-filter-rule.c:561
+msgid "Then"
+msgstr "Luego"
+
+#: ../mail/em-filter-rule.c:592
+msgid "Add Ac_tion"
+msgstr "Añadir a_cción"
+
+#: ../mail/em-folder-properties.c:145
+msgid "Unread messages:"
+msgid_plural "Unread messages:"
+msgstr[0] "Mensajes no leído:"
+msgstr[1] "Mensajes no leídos:"
+
+#: ../mail/em-folder-properties.c:156
+msgid "Total messages:"
+msgid_plural "Total messages:"
+msgstr[0] "Mensajes en total:"
+msgstr[1] "Mensajes en total:"
+
+#: ../mail/em-folder-properties.c:177
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "Uso de cuota (%s):"
+
+#: ../mail/em-folder-properties.c:179
+#, c-format
+msgid "Quota usage"
+msgstr "Uso de cuota"
+
+#: ../mail/em-folder-properties.c:317
+msgid "Folder Properties"
+msgstr "Propiedades de la carpeta"
+
+#: ../mail/em-folder-selection-button.c:79
+msgid "<click here to select a folder>"
+msgstr "<pulse aquí para seleccionar una carpeta>"
+
+#: ../mail/em-folder-selector.c:436
+msgid "C_reate"
+msgstr "C_rear"
+
+#: ../mail/em-folder-selector.c:442
+msgid "Folder _name:"
+msgstr "_Nombre de la carpeta:"
+
+#: ../mail/em-folder-tree.c:647
+msgid "Folder names cannot contain '/'"
+msgstr "Los nombres de carpetas no pueden contener el carácter «/»"
+
+#: ../mail/em-folder-tree.c:768
+#, c-format
+msgctxt "folder-display"
+msgid "%s (%u%s)"
+msgstr "%s (%u%s)"
+
+#: ../mail/em-folder-tree.c:1590
+msgid "Mail Folder Tree"
+msgstr "�rbol de carpetas de correo"
+
+#: ../mail/em-folder-tree.c:2067 ../mail/em-folder-utils.c:115
+#, c-format
+msgid "Moving folder %s"
+msgstr "Moviendo la carpeta %s"
+
+#: ../mail/em-folder-tree.c:2070 ../mail/em-folder-utils.c:117
+#, c-format
+msgid "Copying folder %s"
+msgstr "Copiando la carpeta %s"
+
+#: ../mail/em-folder-tree.c:2077 ../mail/message-list.c:2303
+#, c-format
+msgid "Moving messages into folder %s"
+msgstr "Moviendo los mensajes a la carpeta %s"
+
+#: ../mail/em-folder-tree.c:2081 ../mail/message-list.c:2305
+#, c-format
+msgid "Copying messages into folder %s"
+msgstr "Copiando los mensajes a la carpeta %s"
+
+#: ../mail/em-folder-tree.c:2100
+#, c-format
+msgid "Cannot drop message(s) into toplevel store"
+msgstr "No se puede dejar el(los) mensaje(s) en el almacén de nivel superior"
+
+#: ../mail/em-folder-tree-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 "Carpetas de búsqueda"
+
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
+msgid "UNMATCHED"
+msgstr "NO COINCIDENTE"
+
+#: ../mail/em-folder-tree-model.c:986 ../mail/em-folder-tree-model.c:1278
+msgid "Loading..."
+msgstr "Cargando…"
+
+#: ../mail/em-folder-utils.c:488
+msgid "Move Folder To"
+msgstr "Mover carpeta a"
+
+#: ../mail/em-folder-utils.c:488
+msgid "Copy Folder To"
+msgstr "Copiar carpeta a"
+
+#: ../mail/em-folder-utils.c:605
+msgid "Create Folder"
+msgstr "Crear carpeta"
+
+#: ../mail/em-folder-utils.c:606
+msgid "Specify where to create the folder:"
+msgstr "Especifique donde crear la carpeta:"
+
+#: ../mail/em-format-html.c:167
+msgid "Formatting message"
+msgstr "Formateando el mensaje"
+
+#: ../mail/em-format-html.c:379
+msgid "Formatting Message..."
+msgstr "Formateando el mensaje…"
+
+#: ../mail/em-format-html.c:1596 ../mail/em-format-html.c:1606
+#, c-format
+msgid "Retrieving '%s'"
+msgstr "Obteniendo «%s»"
+
+#: ../mail/em-format-html.c:1757 ../mail/em-format-html-display.c:89
+msgid "Unsigned"
+msgstr "No firmado"
+
+#: ../mail/em-format-html.c:1758 ../mail/em-format-html-display.c:90
+msgid "Valid signature"
+msgstr "Firma válida"
+
+#: ../mail/em-format-html.c:1759 ../mail/em-format-html-display.c:91
+msgid "Invalid signature"
+msgstr "Firma no válida"
+
+#: ../mail/em-format-html.c:1760 ../mail/em-format-html-display.c:92
+msgid "Valid signature, but cannot verify sender"
+msgstr "Firma válida, pero no se puede verificar el remitente"
+
+#: ../mail/em-format-html.c:1761 ../mail/em-format-html-display.c:93
+msgid "Signature exists, but need public key"
+msgstr "La firma existe pero se necesita la clave pública"
+
+#: ../mail/em-format-html.c:1767 ../mail/em-format-html-display.c:100
+msgid "Unencrypted"
+msgstr "Descifrado"
+
+#: ../mail/em-format-html.c:1768 ../mail/em-format-html-display.c:101
+msgid "Encrypted, weak"
+msgstr "Cifrado, débil"
+
+#: ../mail/em-format-html.c:1769 ../mail/em-format-html-display.c:102
+msgid "Encrypted"
+msgstr "Cifrado"
+
+#: ../mail/em-format-html.c:1770 ../mail/em-format-html-display.c:103
+msgid "Encrypted, strong"
+msgstr "Cifrado, fuerte"
+
+#: ../mail/em-format-html.c:2170
+msgid "Unknown external-body part."
+msgstr "Parte externa al cuerpo del mensaje desconocida."
+
+#: ../mail/em-format-html.c:2180
+msgid "Malformed external-body part."
+msgstr "Parte externa al cuerpo del mensaje mal escrita."
+
+#: ../mail/em-format-html.c:2211
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Puntero a sitio FTP (%s)"
+
+#: ../mail/em-format-html.c:2222
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Puntero a archivo local (%s) válido en el sitio «%s»"
+
+#: ../mail/em-format-html.c:2224
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Puntero a archivo local (%s)"
+
+#: ../mail/em-format-html.c:2245
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Puntero a datos remotos (%s)"
+
+#: ../mail/em-format-html.c:2260
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+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
+#, c-format
+msgid "From: %s"
+msgstr "De: %s"
+
+#: ../mail/em-format-html.c:2990
+msgid "(no subject)"
+msgstr "(sin asunto)"
+
+#: ../mail/em-format-html.c:3066
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "%s envió este mensaje en nombre de %s"
+
+#: ../mail/em-format-html-display.c:89
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"Este mensaje no está firmado. No hay garantía de que el mensaje sea "
+"auténtico."
+
+#: ../mail/em-format-html-display.c:90
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"Este mensaje está firmado y es válido, lo que significa que es muy probable "
+"que el mensaje sea auténtico."
+
+#: ../mail/em-format-html-display.c:91
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+"La firma de este mensaje no se puede verificar, pudo haber sido alterada en "
+"tránsito."
+
+#: ../mail/em-format-html-display.c:92
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"Este mensaje está firmado con una firma válida, pero el remitente del "
+"mensaje no se pudo verificar."
+
+#: ../mail/em-format-html-display.c:93
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr ""
+"Este mensaje está firmado con una firma pero no existe una clave pública "
+"correspondiente."
+
+#: ../mail/em-format-html-display.c:100
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+"Este mensaje no está cifrado. Su contenido puede verse en tránsito a través "
+"de Internet."
+
+#: ../mail/em-format-html-display.c:101
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+"Este mensaje está cifrado pero con un algoritmo de cifrado débil. Debería "
+"ser difícil, pero no imposible para un espía ver el contenido de este "
+"mensaje empleando algo de tiempo."
+
+#: ../mail/em-format-html-display.c:102
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+"Este mensaje está cifrado. Sería difícil para un espía ver el contenido de "
+"este mensaje."
+
+#: ../mail/em-format-html-display.c:103
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+"Este mensaje está cifrado con un algoritmo de cifrado fuerte. Sería muy "
+"difícil que un espía vea el contenido de este mensaje en empleando un tiempo "
+"razonable."
+
+#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
+msgid "_View Certificate"
+msgstr "_Ver certificado"
+
+#: ../mail/em-format-html-display.c:254
+msgid "This certificate is not viewable"
+msgstr "Certificado no es visible"
+
+#: ../mail/em-format-html-display.c:566
+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 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
+msgid "Save Image"
+msgstr "Guardar imagen"
+
+#: ../mail/em-format-html-display.c:804
+msgid "Save _Image..."
+msgstr "Guardar _imagen…"
+
+#: ../mail/em-format-html-display.c:806
+msgid "Save the image to a file"
+msgstr "Guardar la imagen en un archivo"
+
+#: ../mail/em-format-html-display.c:1034
+msgid "Completed on"
+msgstr "Completado en"
+
+#: ../mail/em-format-html-display.c:1046
+msgid "Overdue:"
+msgstr "Atrasado:"
+
+#: ../mail/em-format-html-display.c:1054
+msgid "by"
+msgstr "por"
+
+#: ../mail/em-format-html-display.c:1335 ../mail/em-format-html-display.c:1386
+msgid "View _Unformatted"
+msgstr "Ver _sin formato"
+
+#: ../mail/em-format-html-display.c:1337
+msgid "Hide _Unformatted"
+msgstr "Ocultar _sin formato"
+
+#: ../mail/em-format-html-display.c:1408
+msgid "O_pen With"
+msgstr "Abrir c_on"
+
+#: ../mail/em-format-html-print.c:176
+#, c-format
+msgid "Page %d of %d"
+msgstr "Página %d de %d"
+
+#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:122
+#, c-format
+msgid "No HTML stream available"
+msgstr "No hay un flujo HTML disponible"
+
+#: ../mail/em-subscription-editor.c:1165
+msgid "Folder Subscriptions"
+msgstr "Suscripciones de carpetas"
+
+#: ../mail/em-subscription-editor.c:1204
+msgid "_Account:"
+msgstr "_Cuenta:"
+
+#: ../mail/em-subscription-editor.c:1219
+msgid "Clear Search"
+msgstr "Limpiar búsqueda"
+
+#: ../mail/em-subscription-editor.c:1237
+msgid "Sho_w items that contain:"
+msgstr "Sólo _mostrar elementos que contengan:"
+
+#: ../mail/em-subscription-editor.c:1276
+msgid "Subscribe to the selected folder"
+msgstr "Suscribirse a la carpeta seleccionada"
+
+#: ../mail/em-subscription-editor.c:1277
+msgid "Su_bscribe"
+msgstr "_Suscribirse"
+
+#: ../mail/em-subscription-editor.c:1288
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
+msgid "Unsubscribe from the selected folder"
+msgstr "Desuscribirse de la carpeta seleccionada"
+
+#: ../mail/em-subscription-editor.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
+msgid "_Unsubscribe"
+msgstr "Des_uscribir"
+
+#: ../mail/em-subscription-editor.c:1300
+msgid "Collapse all folders"
+msgstr "Contraer todas las carpetas"
+
+#: ../mail/em-subscription-editor.c:1301
+msgid "C_ollapse All"
+msgstr "Contraer t_odas"
+
+#: ../mail/em-subscription-editor.c:1311
+msgid "Expand all folders"
+msgstr "Expandir todas las carpetas"
+
+#: ../mail/em-subscription-editor.c:1312
+msgid "E_xpand All"
+msgstr "E_xpandir todas"
+
+#: ../mail/em-subscription-editor.c:1322
+msgid "Refresh the folder list"
+msgstr "Actualizar la lista de carpetas"
+
+#: ../mail/em-subscription-editor.c:1334
+msgid "Stop the current operation"
+msgstr "Detener la operación de correo"
+
+#. Translators: This message is shown only for ten or more
+#. * 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: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] "¿Está seguro de que quiere abrir %d mensaje a la vez?"
+msgstr[1] "¿Está seguro de que quiere abrir %d mensajes a la vez?"
+
+#: ../mail/em-utils.c:160
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
+msgid "_Do not show this message again"
+msgstr "_No mostrar otra vez este mensaje."
+
+#: ../mail/em-utils.c:335
+msgid "Message Filters"
+msgstr "Filtros de mensajes"
+
+#: ../mail/em-utils.c:920
+#, c-format
+msgid "Messages from %s"
+msgstr "Mensajes de %s"
+
+#: ../mail/em-vfolder-editor.c:108
+msgid "Search _Folders"
+msgstr "Carpetas de _búsqueda"
+
+#: ../mail/em-vfolder-rule.c:594
+msgid "Add Folder"
+msgstr "Añadir carpeta"
+
+#: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Filter Editor\" window height"
+msgstr "Altura de la ventana «Editor de filtros»"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Filter Editor\" window maximize state"
+msgstr "Estado maximizado de la ventana «Editor de filtros»"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Filter Editor\" window width"
+msgstr "Anchura de la ventana «Editor de filtros»"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "\"Folder Subscriptions\" window height"
+msgstr "Altura de la ventana «Suscripciones de carpetas»"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "\"Folder Subscriptions\" window maximize state"
+msgstr "Estado maximizado de la ventana «Suscripciones de carpetas»"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "\"Folder Subscriptions\" window width"
+msgstr "Anchura de la ventana «Suscripciones de carpetas»"
+
+#: ../mail/evolution-mail.schemas.in.h:7
+msgid "\"Search Folder Editor\" window height"
+msgstr "Altura de la ventana «Editor de carpetas de búsqueda»"
+
+#: ../mail/evolution-mail.schemas.in.h:8
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "Estado maximizado de la ventana «Editor de filtros»"
+
+#: ../mail/evolution-mail.schemas.in.h:9
+msgid "\"Search Folder Editor\" window width"
+msgstr "Anchura de la ventana «Editor de carpetas de búsqueda»"
+
+#: ../mail/evolution-mail.schemas.in.h:10
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Altura de la ventana «Enviar y recibir correo»"
+
+#: ../mail/evolution-mail.schemas.in.h:11
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "Estado maximizado de la ventana «Enviar y recibir correo»"
+
+#: ../mail/evolution-mail.schemas.in.h:12
+msgid "\"Send and Receive Mail\" window width"
+msgstr "Anchura de la ventana «Enviar y recibir correo»"
+
+#: ../mail/evolution-mail.schemas.in.h:13
+msgid "Always request read receipt"
+msgstr "Siempre solicitar confirmación de lectura"
+
+#: ../mail/evolution-mail.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr ""
+"Tiempo en segundos que deberá mostrarse el error en la barra de estado."
+
+#: ../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"
+msgstr ""
+"Preguntar si cerrar la ventana del mensaje cuando el usuario reenvía o "
+"responde al mensaje mostrado en la ventana"
+
+#: ../mail/evolution-mail.schemas.in.h:16
+msgid "Attribute message."
+msgstr "Atribuir mensaje."
+
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid "Automatic emoticon recognition"
+msgstr "Reconocimiento automático de emoticonos"
+
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid "Automatic link recognition"
+msgstr "Reconocimiento automático de enlaces"
+
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Check for new messages in all active accounts"
+msgstr "Comprobar si hay mensajes nuevos en todas las cuentas activas"
+
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Check for new messages on start"
+msgstr "Comprobar si hay mensajes nuevos al inicio"
+
+#: ../mail/evolution-mail.schemas.in.h:21
+msgid "Check incoming mail being junk"
+msgstr "Comprobar si el correo entrante es SPAM"
+
+#: ../mail/evolution-mail.schemas.in.h:22
+msgid "Citation highlight color"
+msgstr "Color de resaltado de citas"
+
+>>>>>>> master
 #: ../mail/evolution-mail.schemas.in.h:23
 msgid "Citation highlight color."
 msgstr "Color de resaltado de citas."
@@ -10174,7 +17777,12 @@ msgid ""
 "expanded by default. \"0\" = expanded \"1\" = collapsed"
 msgstr ""
 "Describe si las cabeceras del mensajes en la vista con paneles se deben "
+<<<<<<< HEAD
 "contraer o expandir de manera predeterminada. «0» = expandidas «1» = contraídas"
+=======
+"contraer o expandir de manera predeterminada. «0» = expandidas «1» = "
+"contraídas"
+>>>>>>> master
 
 #: ../mail/evolution-mail.schemas.in.h:45
 msgid ""
@@ -10222,8 +17830,13 @@ msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
+<<<<<<< HEAD
 "Determina si se debe usar la misma tipografía para las líneas «De» y «Asunto» "
 "en la columna «Mensajes» de la vista vertical."
+=======
+"Determina si se debe usar la misma tipografía para las líneas «De» y "
+"«Asunto» en la columna «Mensajes» de la vista vertical."
+>>>>>>> master
 
 #: ../mail/evolution-mail.schemas.in.h:51
 msgid "Directory for loading/attaching files to composer."
@@ -10264,6 +17877,7 @@ msgstr "Vaciar papeleras al salir"
 #: ../mail/evolution-mail.schemas.in.h:59
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Vaciar todas las carpetas SPAM al salir de Evolution."
+<<<<<<< HEAD
 
 #: ../mail/evolution-mail.schemas.in.h:60
 msgid "Empty all Trash folders when exiting Evolution."
@@ -10302,6 +17916,51 @@ msgid "Enable search folders on startup."
 msgstr "Activar las carpetas de búsqueda al inicio."
 
 #: ../mail/evolution-mail.schemas.in.h:68
+=======
+
+#: ../mail/evolution-mail.schemas.in.h:60
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Vaciar todas las papeleras al salir de Evolution."
+
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+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
+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"
+msgid "Enable local folders"
+msgstr "Activar carpetas locales"
+
+#: ../mail/evolution-mail.schemas.in.h:64
+msgid "Enable or disable magic space bar"
+msgstr "Activa o desactiva la barra espaciadora mágica"
+
+#: ../mail/evolution-mail.schemas.in.h:65
+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
+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
+msgid "Enable search folders"
+msgstr "Activar las carpetas de búsqueda"
+
+#: ../mail/evolution-mail.schemas.in.h:68
+msgid "Enable search folders on startup."
+msgstr "Activar las carpetas de búsqueda al inicio."
+
+#: ../mail/evolution-mail.schemas.in.h:69
+>>>>>>> master
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -10309,7 +17968,11 @@ msgstr ""
 "Activar la característica barra de búsqueda lateral para permitir búsquedas "
 "interactivas de nombres de carpetas."
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:69
+=======
+#: ../mail/evolution-mail.schemas.in.h:70
+>>>>>>> master
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -10317,7 +17980,11 @@ msgstr ""
 "Activar esto para usar la barra espaciadora para desplazarse en la vista "
 "previa del mensaje, lista de mensajes y carpetas."
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:70
+=======
+#: ../mail/evolution-mail.schemas.in.h:71
+>>>>>>> master
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
@@ -10325,18 +17992,27 @@ msgstr ""
 "Activar el mostrado exclusivo de mensajes de texto que no excedan el tamaño "
 "definido en la clave «message_text_part_limit»."
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:71
+=======
+#: ../mail/evolution-mail.schemas.in.h:72
+>>>>>>> master
 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"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:72
+=======
+#: ../mail/evolution-mail.schemas.in.h:73
+>>>>>>> master
 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."
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:73
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar modo cursor"
@@ -10346,6 +18022,17 @@ 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:75
+=======
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid "Enable/disable caret mode"
+msgstr "Activar/desactivar modo cursor"
+
+#: ../mail/evolution-mail.schemas.in.h:75 ../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
+>>>>>>> master
 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, "
@@ -10357,6 +18044,7 @@ msgstr ""
 "localizados enviados por Evolution, ya que no siguen el RFC 2231, pero usan "
 "el estándar incorrecto RFC 2047."
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:76
 msgid "Flush Outbox after filtering"
 msgstr "Limpiar la bandeja de salida después de filtrar"
@@ -10382,6 +18070,33 @@ 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:82
+=======
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "Flush Outbox after filtering"
+msgstr "Limpiar la bandeja de salida después de filtrar"
+
+#: ../mail/evolution-mail.schemas.in.h:78
+msgid "Forward message."
+msgstr "Reenviar mensaje."
+
+#: ../mail/evolution-mail.schemas.in.h:79
+msgid "Group Reply replies to list"
+msgstr "Responder al grupo responde a la lista"
+
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid "Height of the message-list pane"
+msgstr "Altura del panel de lista de mensajes"
+
+#: ../mail/evolution-mail.schemas.in.h:81
+msgid "Height of the message-list pane."
+msgstr "Altura del panel de vista de mensajes."
+
+#: ../mail/evolution-mail.schemas.in.h:82
+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
+>>>>>>> master
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -10389,7 +18104,11 @@ msgstr ""
 "Si el usuario intenta abrir diez o más mensajes al mismo tiempo, preguntar "
 "al usuario si quiere realmente hacerlo."
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:83
+=======
+#: ../mail/evolution-mail.schemas.in.h:84
+>>>>>>> master
 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 "
@@ -10400,19 +18119,34 @@ msgstr ""
 "visor de componentes bonobo en la base de datos de GNOME puede usarse para "
 "mostrar el contenido."
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:84
 msgid "Ignore list Reply-To:"
 msgstr "Ignorar «Responder a:» para listas:"
 
 #: ../mail/evolution-mail.schemas.in.h:85
+=======
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid "Ignore list Reply-To:"
+msgstr "Ignorar «Responder a:» para listas:"
+
+#: ../mail/evolution-mail.schemas.in.h:86
+>>>>>>> master
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
 msgstr ""
+<<<<<<< HEAD
 "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:86
+=======
+"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
+>>>>>>> master
 msgid ""
 "Initial height of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10420,7 +18154,11 @@ msgstr ""
 "Altura inicial de la ventana «Suscripciones de carpetas». El valor se "
 "actualiza según el usuario redimensiona verticalmente la ventana."
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:87
+=======
+#: ../mail/evolution-mail.schemas.in.h:88
+>>>>>>> master
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10428,15 +18166,26 @@ msgstr ""
 "Altura inicial de la ventana «Editor de carpetas de búsqueda». El valor se "
 "actualiza según el usuario redimensiona verticalmente la ventana."
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:88
+=======
+#: ../mail/evolution-mail.schemas.in.h:89
+>>>>>>> master
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
+<<<<<<< HEAD
 "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:89
+=======
+"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
+>>>>>>> master
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -10448,13 +18197,18 @@ 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."
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:90
+=======
+#: ../mail/evolution-mail.schemas.in.h:91
+>>>>>>> master
 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 ""
+<<<<<<< HEAD
 "Estado inicial maximizado de la ventana «Suscripciones de carpetas». El valor "
 "se actualiza cuando el usuario maximiza o reduce la ventana. Nota: Evolution "
 "no usa este valor en particular ya que la ventana «Suscripciones de carpetas» "
@@ -12955,6 +20709,2530 @@ msgstr ""
 "Esto marcará todos los mensajes como leídos en la carpeta seleccionada y sus "
 "subcarpetas."
 
+=======
+"Estado inicial maximizado de la ventana «Suscripciones de carpetas». El "
+"valor se actualiza cuando el usuario maximiza o reduce la ventana. Nota: "
+"Evolution no usa este valor en particular ya que la ventana «Suscripciones "
+"de carpetas» no se puede maximizar. Esta clave existe sólo como un detalle "
+"de implementación."
+
+#: ../mail/evolution-mail.schemas.in.h:92
+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 ""
+"Estado inicial maximizado de la ventana «Editor de carpetas de búsqueda». El "
+"valor se actualiza cuando el usuario maximiza o reduce la ventana. Nota: "
+"Evolution no usa este valor en particular ya que la ventana «Editor de "
+"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
+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 ""
+"Estado inicial maximizado de la ventana «Enviar y recibir correo». El valor "
+"se actualiza cuando el usuario maximiza o reduce la ventana. Nota: Evolution "
+"no usa este valor en particular ya que la ventana «Enviar y recibir correo» "
+"no se puede maximizar. Esta clave existe sólo como un detalle de "
+"implementación."
+
+#: ../mail/evolution-mail.schemas.in.h:94
+msgid ""
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+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
+msgid ""
+"Initial width of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window horizontally."
+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
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
+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
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+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
+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 ""
+"En lugar del comportamiento normal de «Responder a todos», esta opción hará "
+"que el botón «Responder al grupo» de la barra de herramientas intente "
+"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
+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 ""
+"Desactiva o activa los mensajes repetitivos de advertencia de que eliminar "
+"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
+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 ""
+"Desactiva o activa los mensajes repetitivos de advertencia para avisarle de "
+"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
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+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
+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 ""
+"Desactiva o activa los mensajes repetitivos para avisarle de que está "
+"intentando enviar una respuesta privada a un correo que llegó a través de "
+"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
+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 ""
+"Desactiva o activa los mensajes repetitivos de advertencia para avisarle de "
+"que está enviando un mensaje a destinatarios no introducidos como una "
+"dirección de correo"
+
+#: ../mail/evolution-mail.schemas.in.h:104
+msgid "Last time Empty Junk was run"
+msgstr "Última vez que se vació el SPAM"
+
+#: ../mail/evolution-mail.schemas.in.h:105
+msgid "Last time Empty Trash was run"
+msgstr "Última vez que se vació la papelera"
+
+#: ../mail/evolution-mail.schemas.in.h:106
+msgid "Layout style"
+msgstr "Estilo de la distribución"
+
+#: ../mail/evolution-mail.schemas.in.h:107
+#: ../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
+msgid "List of Labels and their associated colors"
+msgstr "Lista de etiquetas y sus colores asociados"
+
+#: ../mail/evolution-mail.schemas.in.h:109
+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
+msgid "List of accepted licenses"
+msgstr "Lista de licencias aceptadas"
+
+#: ../mail/evolution-mail.schemas.in.h:111
+msgid "List of accounts"
+msgstr "Lista de cuentas"
+
+#: ../mail/evolution-mail.schemas.in.h:112
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+"Lista de cuentas conocidas para el componente de correo de Evolution. La "
+"lista contiene cadenas nombrando subcarpetas relativas a /apps/evolution/"
+"mail/accounts."
+
+#: ../mail/evolution-mail.schemas.in.h:113
+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
+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
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
+msgstr ""
+"Lista de etiquetas conocidas para el componente de correo de Evolution. La "
+"lista contiene cadenas con el nombre:color donde color usa la codificación "
+"hex HTML."
+
+#: ../mail/evolution-mail.schemas.in.h:116
+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
+msgid "Load images for HTML messages over HTTP"
+msgstr "Cargar imágenes para mensajes HTML sobre HTTP"
+
+#: ../mail/evolution-mail.schemas.in.h:118
+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 ""
+"Cargar imágenes de los mensajes HTML sobre http(s). Los valores posibles "
+"son: «0»: Nunca cargar imágenes desde la red; «1»: Cargar imágenes si el "
+"remitente está en la libreta de direcciones; «2»: Siempre cargar imágenes "
+"desde la red."
+
+#: ../mail/evolution-mail.schemas.in.h:119
+msgid "Log filter actions"
+msgstr "Registrar acciones de filtrado"
+
+#: ../mail/evolution-mail.schemas.in.h:120
+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
+msgid "Logfile to log filter actions"
+msgstr "Archivo de registro para registrar las acciones de filtrado"
+
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid "Logfile to log filter actions."
+msgstr "Archivo de registro para registrar las acciones de filtrado."
+
+#: ../mail/evolution-mail.schemas.in.h:123
+msgid "Mail browser height"
+msgstr "Altura del examinador de correo"
+
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Mail browser maximized"
+msgstr "Examinador de correo maximizado"
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Mail browser width"
+msgstr "Anchura del examinador de correo"
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Mark as Seen after specified timeout"
+msgstr "Marcar como visto después del tiempo especificado"
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Mark as Seen after specified timeout."
+msgstr "Marcar como visto después del tiempo especificado."
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Mark citations in the message \"Preview\""
+msgstr "Marcar citas textuales en la vista previa del mensaje"
+
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Mark citations in the message \"Preview\"."
+msgstr "Marcar citas textuales en la «vista previa» del mensaje."
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Message text limit for display"
+msgstr "Límite del texto del mensaje para mostrarlo"
+
+#: ../mail/evolution-mail.schemas.in.h:131
+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
+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
+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
+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
+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
+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
+msgid "Original message."
+msgstr "Mensaje original."
+
+#: ../mail/evolution-mail.schemas.in.h:138
+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
+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 ""
+"Los valores posibles son: «never» (nunca) para no cerrar nunca la ventana "
+"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
+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
+msgid "Prompt on empty subject"
+msgstr "Preguntar si el asunto está en blanco"
+
+#: ../mail/evolution-mail.schemas.in.h:142
+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
+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
+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
+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
+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
+msgid "Prompt when replying to many recipients"
+msgstr "Preguntar al responder a muchos desinatarios"
+
+#: ../mail/evolution-mail.schemas.in.h:148
+msgid "Prompt when user expunges"
+msgstr "Preguntar cuando el usuario compacte"
+
+#: ../mail/evolution-mail.schemas.in.h:149
+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
+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
+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
+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
+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
+msgid "Prompt while marking multiple messages"
+msgstr "Preguntar cuando se marquen varios correos"
+
+#: ../mail/evolution-mail.schemas.in.h:155
+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
+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
+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
+msgid "Recognize links in text and replace them."
+msgstr "Reconocer enlaces en el texto y reemplazarlos."
+
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid "Run junk test on incoming mail."
+msgstr "Ejecutar la prueba de SPAM en el correo entrante."
+
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid "Save directory"
+msgstr "Carpeta donde guardar"
+
+#: ../mail/evolution-mail.schemas.in.h:161
+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
+msgid "Send HTML mail by default"
+msgstr "Enviar correo en HTML de forma predeterminada"
+
+#: ../mail/evolution-mail.schemas.in.h:163
+msgid "Send HTML mail by default."
+msgstr "Enviar el correo en HTML de forma predeterminada."
+
+#: ../mail/evolution-mail.schemas.in.h:164
+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
+msgid "Server synchronization interval"
+msgstr "Intervalo de sincronización con el servidor"
+
+#: ../mail/evolution-mail.schemas.in.h:166
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+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
+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
+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
+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
+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
+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
+msgid "Show Animations"
+msgstr "Mostrar animaciones"
+
+#: ../mail/evolution-mail.schemas.in.h:173
+msgid "Show all message headers"
+msgstr "Mostrar todas las cabeceras del mensaje"
+
+#: ../mail/evolution-mail.schemas.in.h:174
+msgid "Show all the headers when viewing a messages."
+msgstr "Mostrar todas las cabeceras al ver mensajes."
+
+#: ../mail/evolution-mail.schemas.in.h:175
+msgid "Show animated images as animations."
+msgstr "Mostrar las imágenes animadas como animaciones."
+
+#: ../mail/evolution-mail.schemas.in.h:176
+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
+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
+msgid "Show image animations"
+msgstr "Mostrar imágenes animadas"
+
+#: ../mail/evolution-mail.schemas.in.h:179
+msgid "Show original \"Date\" header value."
+msgstr "Mostrar el valor original de la cabecera «Fecha»."
+
+#: ../mail/evolution-mail.schemas.in.h:180
+msgid "Show photo of the sender"
+msgstr "Mostrar la foto del remitente"
+
+#: ../mail/evolution-mail.schemas.in.h:181
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+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
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+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
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+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
+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 ""
+"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
+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 ""
+"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
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr ""
+"Mostrar el correo-e del remitente en una columna separada en la lista de "
+"mensajes."
+
+#: ../mail/evolution-mail.schemas.in.h:187
+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 ""
+"Mostrar el valor original de la cabecera «Fecha» (sólo con la hora local si "
+"las zonas horarias difieren). De otra forma mostrar siempre el valor de la "
+"cabecera «Fecha» en el formato preferido por el usuario para la fecha y hora "
+"locales."
+
+#: ../mail/evolution-mail.schemas.in.h:188
+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
+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 ""
+"Algunas listas de correo establecen una cabecera «Responder a:» para forzar "
+"a los usuarios a responder a la lista, incluso cuando los usuarios piden que "
+"Evolution envíe una respuesta privada. Establecer esta opción a cierta "
+"intentará ignorar tales cabeceras «Responder a:», de tal forma que Evolution "
+"haga lo que se le pide. Si usa la acción de respuesta privada, responderá de "
+"forma privada, mientras que si usa la acción «Responder a la lista» hará eso "
+"mismo. Funciona comparando la cabecera «Responder a:» con una cabecara «List-"
+"Post:», si existe."
+
+#: ../mail/evolution-mail.schemas.in.h:190
+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
+msgid "Spell check inline"
+msgstr "Comprobación ortográfica en línea"
+
+#: ../mail/evolution-mail.schemas.in.h:192
+msgid "Spell checking color"
+msgstr "Color de la corrección ortográfica"
+
+#: ../mail/evolution-mail.schemas.in.h:193
+msgid "Spell checking languages"
+msgstr "Comprobación ortográfica de idiomas"
+
+#: ../mail/evolution-mail.schemas.in.h:194
+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
+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 ""
+"Indica cómo ordenar cuentas en un árbol de carpetas usado en una vista de "
+"Correo. Cuando está establecido a cierto las cuentas se ordenan "
+"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
+msgid "Terminal font"
+msgstr "Tipografía del terminal"
+
+#: ../mail/evolution-mail.schemas.in.h:197
+msgid "The default plugin for Junk hook"
+msgstr "El complemento predeterminado para SPAM"
+
+#: ../mail/evolution-mail.schemas.in.h:198
+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
+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
+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 ""
+"El estilo de la distribución determina dónde ubicar el panel de vista previa "
+"en relación con la lista de correos. «0» (vista clásica) ubica el panel de "
+"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
+msgid "The terminal font for mail display."
+msgstr "La tipografía de terminal para mostrar el correo."
+
+#: ../mail/evolution-mail.schemas.in.h:202
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows."
+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
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows."
+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
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author."
+msgstr ""
+"El texto insertado al responder a un mensaje, atribuyendo el mensaje a su "
+"autor original."
+
+#: ../mail/evolution-mail.schemas.in.h:205
+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
+msgid ""
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+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
+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 ""
+"Esto decide el tamaño máximo de la parte de texto que se puede formatear "
+"bajo Evolution, especificado en términos de KB. Lo predeterminado son 4096 "
+"(4MiB). Este valor sólo se usa cuando la clave 'force_message_limit' está "
+"activada."
+
+#: ../mail/evolution-mail.schemas.in.h:208
+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 ""
+"Este es el complemento predeterminado para el correo basura, aunque hay "
+"varios complementos activados. Si el complemento predeterminado listado está "
+"desactivado, entonces no usará los otros complementos disponibles."
+
+#: ../mail/evolution-mail.schemas.in.h:209
+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 ""
+"Esta clave es de una sola lectura y después de leerla se establece a "
+"«false». Esto deselecciona el correo en la lista y elimina la vista previa "
+"para esa carpeta."
+
+#: ../mail/evolution-mail.schemas.in.h:210
+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 ""
+"Esta clave debería contener una lista de estructuras XML especificando "
+"cabeceras personalizadas, e indicando si deben mostrarse. El formato de la "
+"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
+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 ""
+"Esta opción está relacionada con la clave lookup_addressbook y se usa para "
+"determinar si se deben buscar direcciones sólo en la libreta de direcciones "
+"local para excluir de los filtros de correo basura el correo enviado por "
+"contactos conocidos."
+
+#: ../mail/evolution-mail.schemas.in.h:212
+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
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr ""
+"Esto establece el número de direcciones a mostrar en la vista de lista de "
+"mensajes predeterminada, más allá de los cuales se muestra un «…»."
+
+#: ../mail/evolution-mail.schemas.in.h:214
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Requires a restart to apply."
+msgstr ""
+"Este ajuste especifica si las conversaciones, de forma predeterminada, "
+"deberían estar en estado expandido o contraído. Evolution necesita "
+"reiniciarse para aplicarlo."
+
+#: ../mail/evolution-mail.schemas.in.h:215
+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 ""
+"Este ajuste especifica si las conversaciones se deberían ordenar en base al "
+"ú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
+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 ""
+"Este valor puede ser una cadena vacía, lo que significa que usará la carpeta "
+"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
+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
+msgid "Timeout for marking message as seen"
+msgstr "Tiempo para marcar un mensaje como visto"
+
+#: ../mail/evolution-mail.schemas.in.h:219
+msgid "Timeout for marking message as seen."
+msgstr "Tiempo para marcar un mensaje como visto."
+
+#: ../mail/evolution-mail.schemas.in.h:220
+msgid "UID string of the default account."
+msgstr "Cadena UID para la cuenta predeterminada."
+
+#: ../mail/evolution-mail.schemas.in.h:221
+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
+msgid "Use custom fonts"
+msgstr "Usar tipografía personalizada"
+
+#: ../mail/evolution-mail.schemas.in.h:223
+msgid "Use custom fonts for displaying mail."
+msgstr "Usar tipografía personalizada para mostrar el correo."
+
+#: ../mail/evolution-mail.schemas.in.h:224
+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 ""
+"Los usuarios se indignan acerca de dónde debe ir el cursor al responder un "
+"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
+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 ""
+"Los usuarios se indignan acerca de dónde debe ir el la firma al responder un "
+"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
+msgid "Variable width font"
+msgstr "Tipografía de anchura variable"
+
+#: ../mail/evolution-mail.schemas.in.h:227
+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
+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 ""
+"Indica si se debe comprobar si hay mensajes nuevos en todas las cuentas "
+"activas independientemente del conteo en la opción «Comprobar si hay "
+"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
+msgid ""
+"Whether check for new messages when Evolution is started. This includes also "
+"sending messages from Outbox."
+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
+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
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+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
+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
+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 ""
+"Indica si se debe limpiar la bandeja de salida después de finalizar el "
+"filtrado. La limpieza de la bandeja de salida sólo sucede cuando se usó "
+"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
+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
+msgid "Width of the message-list pane"
+msgstr "Anchura del panel de lista de mensajes"
+
+#: ../mail/evolution-mail.schemas.in.h:236
+msgid "Width of the message-list pane."
+msgstr "Anchura del panel de lista de mensajes."
+
+#: ../mail/importers/elm-importer.c:181
+msgid "Importing Elm data"
+msgstr "Importando datos de Elm"
+
+#: ../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:520
+msgid "Mail"
+msgstr "Correo"
+
+#: ../mail/importers/elm-importer.c:396
+msgid "Evolution Elm importer"
+msgstr "Importador de Elm de Evolution"
+
+#: ../mail/importers/elm-importer.c:397
+msgid "Import mail from Elm."
+msgstr "Importar correo de Elm."
+
+#: ../mail/importers/evolution-mbox-importer.c:138
+#: ../plugins/dbx-import/dbx-importer.c:250
+msgid "_Destination folder:"
+msgstr "Carpeta de _destino:"
+
+#: ../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 "Seleccionar carpeta"
+
+#: ../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 "Seleccione la carpeta en la que importar"
+
+#: ../mail/importers/evolution-mbox-importer.c:433
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "Asunto"
+
+#: ../mail/importers/evolution-mbox-importer.c:438
+msgctxt "mboxImp"
+msgid "From"
+msgstr "De"
+
+#: ../mail/importers/evolution-mbox-importer.c:482
+#: ../shell/e-shell-utils.c:221
+msgid "Berkeley Mailbox (mbox)"
+msgstr "Buzón Berkeley (mbox)"
+
+#: ../mail/importers/evolution-mbox-importer.c:483
+msgid "Importer Berkeley Mailbox format folders"
+msgstr "Importador de carpetas en formato buzón de Berkeley"
+
+#: ../mail/importers/mail-importer.c:64
+msgid "Importing mailbox"
+msgstr "Importando buzón de correo"
+
+#. 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:663
+#, c-format
+msgid "Importing '%s'"
+msgstr "Importando «%s»"
+
+#: ../mail/importers/mail-importer.c:316
+#, c-format
+msgid "Scanning %s"
+msgstr "Analizando %s"
+
+#: ../mail/importers/pine-importer.c:260
+msgid "Importing Pine data"
+msgstr "Importando datos de Pine"
+
+#: ../mail/importers/pine-importer.c:463
+#: ../modules/addressbook/addressbook-config.c:1081
+msgid "Address Book"
+msgstr "Libreta de direcciones"
+
+#: ../mail/importers/pine-importer.c:509
+msgid "Evolution Pine importer"
+msgstr "Importador de Pine de Evolution"
+
+#: ../mail/importers/pine-importer.c:510
+msgid "Import mail from Pine."
+msgstr "Importar correo de Pine."
+
+#: ../mail/mail-autofilter.c:72
+#, c-format
+msgid "Mail to %s"
+msgstr "Correo para %s"
+
+#: ../mail/mail-autofilter.c:228 ../mail/mail-autofilter.c:271
+#, c-format
+msgid "Mail from %s"
+msgstr "Correo de %s"
+
+#: ../mail/mail-autofilter.c:254
+#, c-format
+msgid "Subject is %s"
+msgstr "Asunto es %s"
+
+#: ../mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "Lista de correo %s"
+
+#: ../mail/mail-autofilter.c:404
+msgid "Add Filter Rule"
+msgstr "Añadir regla de filtrado"
+
+#. Translators: The first %s is name of the affected
+#. * filter rule(s), the second %s is URI of the removed
+#. * 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:507
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been modified to account for the deleted folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"La regla de filtrado «%s» se ha modificado debido a la carpeta eliminada\n"
+"«%s»."
+msgstr[1] ""
+"Se han modificado las siguientes reglas de filtrado\n"
+"«%s» debiado a la carpeta eliminada\n"
+"«%s»."
+
+#: ../mail/mail-config.ui.h:2
+msgid "Add Ne_w Signature..."
+msgstr "Añadir firma _nueva…"
+
+#: ../mail/mail-config.ui.h:3
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "_Firmar siempre los mensajes salientes cuando se use esta cuenta"
+
+#: ../mail/mail-config.ui.h:4
+msgid ""
+"All new emails with header that matches given content will be automatically "
+"filtered as junk"
+msgstr ""
+"Todos los correos-e nuevos con cabeceras que coincidan con en contenido dado "
+"se filtrarán automáticamente como SPAM"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:6
+msgid "Allowing a _mailing list to redirect a private reply to the list"
+msgstr ""
+"Permitir a una li_sta de correo redireccionar una respuesta privada a la "
+"lista"
+
+#: ../mail/mail-config.ui.h:7
+msgid "Also encrypt to sel_f when sending encrypted messages"
+msgstr "También cifrar a _mí mismo cuando envíe correo cifrado"
+
+#: ../mail/mail-config.ui.h:8
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Siempre enviar _copia de carbón (Cc) a:"
+
+#: ../mail/mail-config.ui.h:9
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Siempre enviar copia de carbón _oculta (Cco) a:"
+
+#: ../mail/mail-config.ui.h:10
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr "Siempre _confiar en las claves de mi almacén al cifrar"
+
+#: ../mail/mail-config.ui.h:11
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr "Siempre cifrar a _mí mismo cuando envíe correo cifrado"
+
+#: ../mail/mail-config.ui.h:12
+msgid "Always request rea_d receipt"
+msgstr "Siempre _solicitar confirmación de lectura"
+
+#: ../mail/mail-config.ui.h:13
+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
+msgid "Authentication"
+msgstr "Autenticación"
+
+#: ../mail/mail-config.ui.h:16
+msgid "Automatically insert _emoticon images"
+msgstr "Insertar imágenes de _emoticonos automáticamente"
+
+#: ../mail/mail-config.ui.h:17
+msgid "C_haracter set:"
+msgstr "Conjunto de carac_teres:"
+
+#: ../mail/mail-config.ui.h:18
+msgid "Ch_eck for Supported Types"
+msgstr "C_omprobar tipos soportados"
+
+#: ../mail/mail-config.ui.h:19
+msgid "Check cu_stom headers for junk"
+msgstr "Compro_bar las cabeceras personalizadas contra SPAM"
+
+#: ../mail/mail-config.ui.h:20
+msgid "Check for new _messages on start"
+msgstr "Comprobar si hay mensajes _nuevos al inicio"
+
+#: ../mail/mail-config.ui.h:21
+msgid "Check for new messa_ges in all active accounts"
+msgstr "Comprobar si hay _mensajes nuevos en todas las cuentas activas"
+
+#: ../mail/mail-config.ui.h:22
+msgid "Check incoming _messages for junk"
+msgstr "Comprobar si los _mensajes entrantes son basura"
+
+#: ../mail/mail-config.ui.h:23
+msgid "Check spelling while I _type"
+msgstr "Comprobar orto_grafía mientras se escribe"
+
+#: ../mail/mail-config.ui.h:24
+msgid "Cle_ar"
+msgstr "_Vaciar"
+
+#: ../mail/mail-config.ui.h:25
+msgid "Clea_r"
+msgstr "Vacia_r"
+
+#: ../mail/mail-config.ui.h:26
+msgid "Color for _misspelled words:"
+msgstr "Color para las palabras _mal escritas:"
+
+#: ../mail/mail-config.ui.h:27
+msgid "Composing Messages"
+msgstr "Redactar mensajes"
+
+#: ../mail/mail-config.ui.h:28
+#: ../modules/plugin-manager/evolution-plugin-manager.c:160
+msgid "Configuration"
+msgstr "Configuración"
+
+#: ../mail/mail-config.ui.h:29
+msgid "Confirm _when expunging a folder"
+msgstr "_Confirmar antes de purgar una carpeta"
+
+#: ../mail/mail-config.ui.h:30
+msgid "Confirmations"
+msgstr "Confirmaciones"
+
+#: ../mail/mail-config.ui.h:31
+#: ../modules/addressbook/autocompletion-config.c:188
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
+msgid "Date/Time Format"
+msgstr "Formato de la fecha y hora"
+
+#: ../mail/mail-config.ui.h:33
+msgid "Default Behavior"
+msgstr "Comportamiento predeterminado"
+
+#: ../mail/mail-config.ui.h:34
+msgid "Default character e_ncoding:"
+msgstr "_Codificación de caracteres predeterminada:"
+
+#: ../mail/mail-config.ui.h:35
+msgid "Delete Mail"
+msgstr "Eliminar correo-e"
+
+#: ../mail/mail-config.ui.h:36
+msgid "Delete junk messages on e_xit"
+msgstr "Eliminar los mensajes SPAM al _salir"
+
+#: ../mail/mail-config.ui.h:38
+msgid "Digitally sign o_utgoing messages (by default)"
+msgstr "Firmar digitalmente los mensajes s_alientes (por omisión)"
+
+#: ../mail/mail-config.ui.h:39
+msgid "Displayed Message Headers"
+msgstr "Cabeceras mostradas del mensaje"
+
+#: ../mail/mail-config.ui.h:40
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr ""
+"_No marcar los mensajes como basura si el remitente está en mi libreta de "
+"direcciones"
+
+#: ../mail/mail-config.ui.h:41
+msgid "Do not quote"
+msgstr "No entrecomillar"
+
+#: ../mail/mail-config.ui.h:42
+msgid "Drafts _Folder:"
+msgstr "Carpeta de _borradores:"
+
+#: ../mail/mail-config.ui.h:43
+msgid "Email _Address:"
+msgstr "Dir_ección de correo-e:"
+
+#: ../mail/mail-config.ui.h:44
+msgid "Empty trash folders on e_xit"
+msgstr "Vaciar _papelera al salir"
+
+#: ../mail/mail-config.ui.h:46
+msgid "Encry_ption certificate:"
+msgstr "Certificado de ci_frado:"
+
+#: ../mail/mail-config.ui.h:47
+msgid "Encrypt out_going messages (by default)"
+msgstr "Cifrar mensajes _salientes (por omisión)"
+
+#: ../mail/mail-config.ui.h:48
+msgid "F_all back to threading messages by subject"
+msgstr "Agrupar los mensajes por _asunto"
+
+#: ../mail/mail-config.ui.h:49
+msgid "Fix_ed Width Font:"
+msgstr "Tipografía de anchura _fija:"
+
+#: ../mail/mail-config.ui.h:50
+msgid "Format messages in _HTML"
+msgstr "Dar formato _HTML a los mensajes"
+
+#: ../mail/mail-config.ui.h:51
+msgid "Full Nam_e:"
+msgstr "Nombre co_mpleto:"
+
+#: ../mail/mail-config.ui.h:53
+msgid "Group Reply goes only to mailing list, if possible"
+msgstr "Responder al grupo sólo envía a la lista de correo, si es posible"
+
+#: ../mail/mail-config.ui.h:54
+msgid "HTML Messages"
+msgstr "Mensajes HTML"
+
+#: ../mail/mail-config.ui.h:55
+msgid "H_TTP Proxy:"
+msgstr "Proxy H_TTP:"
+
+#: ../mail/mail-config.ui.h:56
+msgid "Header content"
+msgstr "Contenido de la cabecera"
+
+#: ../mail/mail-config.ui.h:57
+msgid "Header name"
+msgstr "Nombre de la cabecera"
+
+#: ../mail/mail-config.ui.h:58
+msgid "Headers"
+msgstr "Cabeceras"
+
+# Esta cadena debe permanecer así
+#: ../mail/mail-config.ui.h:59
+msgid "Highlight _quotations with"
+msgstr "Resaltar texto _citado con este color:"
+
+#: ../mail/mail-config.ui.h:60
+msgid "Ignore Reply-To: for mailing lists"
+msgstr "Ignorar «Responder a:» para listas de correo"
+
+#: ../mail/mail-config.ui.h:61
+msgid "Inline"
+msgstr "En línea"
+
+#: ../mail/mail-config.ui.h:62
+msgid "Inline (Outlook style)"
+msgstr "En línea (estilo Outlook)"
+
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
+msgid "Labels"
+msgstr "Etiquetas"
+
+#: ../mail/mail-config.ui.h:65
+msgid "Languages Table"
+msgstr "Tabla de idiomas"
+
+#: ../mail/mail-config.ui.h:66
+msgid "Loading Images"
+msgstr "Cargando imágenes"
+
+#: ../mail/mail-config.ui.h:67
+msgid "Mail Headers Table"
+msgstr "Tabla de cabeceras de correo"
+
+#: ../mail/mail-config.ui.h:68
+msgid "Mailbox location"
+msgstr "Dirección del buzón"
+
+#: ../mail/mail-config.ui.h:69
+msgid "Message Display"
+msgstr "Mostrado de mensajes"
+
+#: ../mail/mail-config.ui.h:70
+msgid "Message Receipts"
+msgstr "Destinatarios del mensaje"
+
+#: ../mail/mail-config.ui.h:71
+msgid "No _Proxy for:"
+msgstr "Sin _proxy para:"
+
+#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr "Sin cifrado"
+
+#: ../mail/mail-config.ui.h:73
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+"Esta opción se omitirá si se encuentra alguna coincidencia para una cabecera "
+"de SPAM personalizada."
+
+#: ../mail/mail-config.ui.h:74
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+msgid "Optional Information"
+msgstr "Información opcional"
+
+#: ../mail/mail-config.ui.h:76
+msgid "Or_ganization:"
+msgstr "Organi_zación:"
+
+#: ../mail/mail-config.ui.h:77
+msgid "PGP/GPG _Key ID:"
+msgstr "ID de c_lave GPG/PGP:"
+
+#: ../mail/mail-config.ui.h:78
+msgid "Pass_word:"
+msgstr "_Contraseña:"
+
+#: ../mail/mail-config.ui.h:79
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
+msgid "Pick a color"
+msgstr "Elija un color"
+
+#: ../mail/mail-config.ui.h:80
+msgid "Port:"
+msgstr "Puerto:"
+
+#: ../mail/mail-config.ui.h:81
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "Pretty Good Privacy (PGP/GPG)"
+
+#: ../mail/mail-config.ui.h:83
+msgid "Proxy Settings"
+msgstr "Ajustes del proxy"
+
+#: ../mail/mail-config.ui.h:84
+msgid "Quoted"
+msgstr "Citado"
+
+#: ../mail/mail-config.ui.h:85
+msgid "Re_member password"
+msgstr "_Recordar contraseña"
+
+#: ../mail/mail-config.ui.h:86
+msgid "Re_ply-To:"
+msgstr "Res_ponder a:"
+
+#: ../mail/mail-config.ui.h:87
+msgid "Remember _password"
+msgstr "Recordar contrase_ña"
+
+#: ../mail/mail-config.ui.h:88
+msgid "Replies and Forwards"
+msgstr "Respuestas y reenvíos"
+
+#: ../mail/mail-config.ui.h:89
+msgid "Required Information"
+msgstr "Información requerida"
+
+#: ../mail/mail-config.ui.h:90
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/mail-config.ui.h:91
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/mail-config.ui.h:92
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/mail-config.ui.h:93
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "Cifrado SSL"
+
+#: ../mail/mail-config.ui.h:95
+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
+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
+msgid "S_elect..."
+msgstr "S_eleccionar…"
+
+#: ../mail/mail-config.ui.h:98
+msgid "S_end message receipts:"
+msgstr "_Enviar confirmaciones de mensajes:"
+
+#: ../mail/mail-config.ui.h:99
+msgid "S_tandard Font:"
+msgstr "Tipografía _estándar:"
+
+#: ../mail/mail-config.ui.h:100
+msgid "Secure MIME (S/MIME)"
+msgstr "MIME seguro (S/MIME)"
+
+#: ../mail/mail-config.ui.h:102
+msgid "Select HTML fixed width font"
+msgstr "Selecciona letra de anchura fija para HTML"
+
+#: ../mail/mail-config.ui.h:103
+msgid "Select HTML variable width font"
+msgstr "Selecciona letra de anchura variable en HTML"
+
+#: ../mail/mail-config.ui.h:104
+msgid "Sender Photograph"
+msgstr "Foto del remitente"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:106
+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
+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
+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
+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
+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
+msgid "Sent _Messages Folder:"
+msgstr "Carpeta de _mensajes enviados:"
+
+#: ../mail/mail-config.ui.h:116
+msgid "Ser_ver requires authentication"
+msgstr "El ser_vidor requiere autenticación"
+
+#: ../mail/mail-config.ui.h:117
+msgid "Server Configuration"
+msgstr "Configuración del servidor"
+
+#: ../mail/mail-config.ui.h:118
+msgid "Server _Type:"
+msgstr "_Tipo de servidor:"
+
+#: ../mail/mail-config.ui.h:119
+msgid "Set custom junk header"
+msgstr "Establecer cabecera de SPAM personalizada"
+
+#: ../mail/mail-config.ui.h:120
+msgid "Si_gning algorithm:"
+msgstr "Algoritmo de _firma:"
+
+#: ../mail/mail-config.ui.h:121
+msgid "Sig_natures"
+msgstr "_Firmas"
+
+#: ../mail/mail-config.ui.h:122
+msgid "Sig_ning certificate:"
+msgstr "Certificado de _firma:"
+
+#: ../mail/mail-config.ui.h:123
+msgid "Signat_ure:"
+msgstr "_Firma:"
+
+#: ../mail/mail-config.ui.h:124
+msgid "Signatures"
+msgstr "Firmas"
+
+#: ../mail/mail-config.ui.h:125
+msgid "Signing _algorithm:"
+msgstr "_Algoritmo de firma:"
+
+#: ../mail/mail-config.ui.h:126
+msgid "Special Folders"
+msgstr "Carpetas especiales"
+
+#: ../mail/mail-config.ui.h:127
+msgid "Spell Checking"
+msgstr "Ortografía"
+
+#: ../mail/mail-config.ui.h:128
+msgid "Start _typing at the bottom on replying"
+msgstr "Comenzar a _escribir en la parte final al responder"
+
+#: ../mail/mail-config.ui.h:129
+msgid "Start up"
+msgstr "Inicio"
+
+#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "Cifrado TLS"
+
+#: ../mail/mail-config.ui.h:131
+msgid "T_ype:"
+msgstr "T_ipo:"
+
+#: ../mail/mail-config.ui.h:132
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+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
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+"La salida de este script se usará como su firma. \n"
+"El nombre que especifique se usará únicamente \n"
+"para mostrarlo por pantalla. "
+
+#: ../mail/mail-config.ui.h:136
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
+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
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+"Teclee el nombre por el que quiere identificar a esta cuenta.\n"
+"Por ejemplo: «Trabajo» o «Personal»"
+
+#: ../mail/mail-config.ui.h:139
+msgid "Us_ername:"
+msgstr "_Usuario:"
+
+#: ../mail/mail-config.ui.h:140
+msgid "Use Authe_ntication"
+msgstr "Usar aute_nticación"
+
+#: ../mail/mail-config.ui.h:141
+msgid "User _Name:"
+msgstr "_Nombre de usuario:"
+
+#: ../mail/mail-config.ui.h:142
+msgid "_Add Signature"
+msgstr "_Añadir firma"
+
+#: ../mail/mail-config.ui.h:143
+msgid "_Always load images from the Internet"
+msgstr "_Siempre cargar las imágenes desde Internet"
+
+#: ../mail/mail-config.ui.h:144
+msgid "_Authentication Type"
+msgstr "Tipo de _autenticación"
+
+#: ../mail/mail-config.ui.h:145
+msgid "_Direct connection to the Internet"
+msgstr "Conexión _directa a Internet"
+
+#: ../mail/mail-config.ui.h:146
+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
+msgid "_Forward style:"
+msgstr "_Estilo de reenvío:"
+
+#: ../mail/mail-config.ui.h:148
+msgid "_Junk Folder:"
+msgstr "Carpeta de _SPAM:"
+
+#: ../mail/mail-config.ui.h:149
+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
+msgid "_Languages"
+msgstr "_Idiomas"
+
+#: ../mail/mail-config.ui.h:151
+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
+msgid "_Lookup in local address book only"
+msgstr "_Buscar sólo en la libreta de direcciones local"
+
+#: ../mail/mail-config.ui.h:153
+msgid "_Make this my default account"
+msgstr "_Hacer que ésta sea mi cuenta predeterminada"
+
+#: ../mail/mail-config.ui.h:154
+msgid "_Manual proxy configuration:"
+msgstr "Configuración _manual del proxy:"
+
+#: ../mail/mail-config.ui.h:156
+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
+msgid "_Port:"
+msgstr "_Puerto:"
+
+#: ../mail/mail-config.ui.h:159
+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
+msgid "_Reply style:"
+msgstr "Estilo de _respuesta:"
+
+#: ../mail/mail-config.ui.h:161
+msgid "_Script:"
+msgstr "_Script:"
+
+#: ../mail/mail-config.ui.h:162
+msgid "_Secure HTTP Proxy:"
+msgstr "Proxy HTTP _seguro:"
+
+#: ../mail/mail-config.ui.h:164 ../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
+msgid "_Show animated images"
+msgstr "_Mostrar las imágenes animadas"
+
+#: ../mail/mail-config.ui.h:167
+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
+msgid "_Trash Folder:"
+msgstr "Carpeta de p_apelera:"
+
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
+msgstr "Usar _conexión segura:"
+
+#: ../mail/mail-config.ui.h:170
+msgid "_Use system defaults"
+msgstr "_Usar los valores predeterminados del sistema"
+
+#: ../mail/mail-config.ui.h:171
+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
+msgid "a"
+msgstr "am"
+
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
+msgid "b"
+msgstr "por"
+
+# Esta traducción debe mantenerse así
+#: ../mail/mail-config.ui.h:174
+msgid "color"
+msgstr "color"
+
+#: ../mail/mail-config.ui.h:175
+msgid "description"
+msgstr "descripción"
+
+#: ../mail/mail-dialogs.ui.h:1
+msgid "All active remote folders"
+msgstr "Todas las carpetas remotas activas"
+
+#: ../mail/mail-dialogs.ui.h:2
+msgid "All local and active remote folders"
+msgstr "Todas las carpetas locales y remotas activas"
+
+#: ../mail/mail-dialogs.ui.h:3
+msgid "All local folders"
+msgstr "Todas las carpetas locales"
+
+#: ../mail/mail-dialogs.ui.h:4
+msgid "Call"
+msgstr "Llamar"
+
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
+msgid "Co_mpleted"
+msgstr "_Terminado"
+
+#: ../mail/mail-dialogs.ui.h:7
+msgid "Digital Signature"
+msgstr "Firma digital"
+
+#: ../mail/mail-dialogs.ui.h:8
+msgid "Do Not Forward"
+msgstr "No reenviar"
+
+#: ../mail/mail-dialogs.ui.h:9
+msgid "Encryption"
+msgstr "Cifrado"
+
+#: ../mail/mail-dialogs.ui.h:10
+msgid "Follow-Up"
+msgstr "Seguimiento"
+
+#: ../mail/mail-dialogs.ui.h:11
+msgid "For Your Information"
+msgstr "Para su información"
+
+#: ../mail/mail-dialogs.ui.h:12
+msgid "Forward"
+msgstr "Reenviar"
+
+#: ../mail/mail-dialogs.ui.h:13
+msgid "License Agreement"
+msgstr "Acuerdo de licencia"
+
+#: ../mail/mail-dialogs.ui.h:14
+msgid "No Response Necessary"
+msgstr "No es necesaria una respuesta"
+
+#: ../mail/mail-dialogs.ui.h:18
+msgid "Reply to All"
+msgstr "Responder a todos"
+
+#: ../mail/mail-dialogs.ui.h:19
+msgid "Review"
+msgstr "Revisar"
+
+#: ../mail/mail-dialogs.ui.h:20
+msgid "Search Folder Sources"
+msgstr "Orígenes de las carpetas de búsqueda"
+
+#: ../mail/mail-dialogs.ui.h:21
+msgid "Security Information"
+msgstr "Información de seguridad"
+
+#: ../mail/mail-dialogs.ui.h:22
+msgid "Specific folders"
+msgstr "Carpetas específicas"
+
+#: ../mail/mail-dialogs.ui.h:23
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Los mensajes que ha seleccionado para seguir se listan abajo.\n"
+"Seleccione una acción de seguimiento desde el menú «Marcar»."
+
+#: ../mail/mail-dialogs.ui.h:25
+msgid "_Accept License"
+msgstr "_Aceptar licencia"
+
+#: ../mail/mail-dialogs.ui.h:26
+msgid "_Due By:"
+msgstr "_Vence el:"
+
+#: ../mail/mail-dialogs.ui.h:27
+msgid "_Flag:"
+msgstr "_Marca:"
+
+#: ../mail/mail-dialogs.ui.h:28
+msgid "_Tick this to accept the license agreement"
+msgstr "_Marque esto para aceptar el acuerdo de licencia"
+
+#: ../mail/mail-folder-cache.c:779
+#, c-format
+msgid "Pinging %s"
+msgstr "Haciendo ping a %s"
+
+#: ../mail/mail-ops.c:86
+msgid "Filtering Selected Messages"
+msgstr "Filtrado de mensajes seleccionados"
+
+#: ../mail/mail-ops.c:206
+msgid "Fetching Mail"
+msgstr "Obteniendo mensajes"
+
+#: ../mail/mail-ops.c:843
+#, c-format
+msgid "Sending message %d of %d"
+msgstr "Enviando mensaje %d de %d"
+
+#: ../mail/mail-ops.c:891
+#, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "Falló al enviar %d de %d mensajes"
+
+#: ../mail/mail-ops.c:895 ../mail/mail-send-recv.c:840
+msgid "Canceled."
+msgstr "Cancelado."
+
+#: ../mail/mail-ops.c:897 ../mail/mail-send-recv.c:842
+msgid "Complete."
+msgstr "Completado."
+
+#: ../mail/mail-ops.c:1012
+#, c-format
+msgid "Moving messages to '%s'"
+msgstr "Moviendo mensajes a «%s»"
+
+#: ../mail/mail-ops.c:1013
+#, c-format
+msgid "Copying messages to '%s'"
+msgstr "Copiando mensajes a «%s»"
+
+#: ../mail/mail-ops.c:1131
+#, c-format
+msgid "Storing folder '%s'"
+msgstr "Guardando carpeta «%s»"
+
+#: ../mail/mail-ops.c:1206
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr "Compactando y almacenando cuenta «%s»"
+
+#: ../mail/mail-ops.c:1207
+#, c-format
+msgid "Storing account '%s'"
+msgstr "Almacenando cuenta «%s»"
+
+#: ../mail/mail-ops.c:1269
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr "Actualizando carpeta «%s»"
+
+#: ../mail/mail-ops.c:1459
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr "Compactando carpeta «%s»"
+
+#: ../mail/mail-ops.c:1544
+#, c-format
+msgid "Emptying trash in '%s'"
+msgstr "Vaciando papelera en «%s»"
+
+#: ../mail/mail-ops.c:1646
+#, c-format
+msgid "Disconnecting %s"
+msgstr "Desconectando de «%s»"
+
+#: ../mail/mail-send-recv.c:198
+msgid "Canceling..."
+msgstr "Cancelando…"
+
+#: ../mail/mail-send-recv.c:454
+msgid "Send & Receive Mail"
+msgstr "Enviar y recibir correo"
+
+#: ../mail/mail-send-recv.c:470
+msgid "Cancel _All"
+msgstr "Cancelar _todo"
+
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:988
+msgid "Updating..."
+msgstr "Actualizando…"
+
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:691
+msgid "Waiting..."
+msgstr "Esperando…"
+
+#: ../mail/mail-send-recv.c:967
+#, c-format
+msgid "Checking for new mail"
+msgstr "Comprobando correo nuevo"
+
+#: ../mail/mail-tools.c:72
+#, c-format
+msgid "Could not create spool directory '%s': %s"
+msgstr "No se pudo crear la carpeta spool «%s»: %s"
+
+#: ../mail/mail-tools.c:106
+#, c-format
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr "Intentando mover correo desde un origen que no es un buzón «%s»"
+
+#: ../mail/mail-tools.c:215
+#, c-format
+msgid "Forwarded message - %s"
+msgstr "Mensaje reenviado: %s"
+
+#: ../mail/mail-tools.c:217
+msgid "Forwarded message"
+msgstr "Mensaje reenviado"
+
+#: ../mail/mail-vfolder.c:92
+#, c-format
+msgid "Setting up Search Folder: %s"
+msgstr "Configurando carpeta de búsqueda: %s"
+
+#: ../mail/mail-vfolder.c:232
+#, c-format
+msgid "Updating Search Folders for '%s' : %s"
+msgstr "Actualizando carpetas de búsqueda para «%s»: %s"
+
+#. Translators: The first %s is name of the affected
+#. * search folder(s), the second %s is the URI of the
+#. * 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:678
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been modified to account for the deleted "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"La carpeta de búsqueda «%s» se ha modificado debido a la carpeta eliminada\n"
+"«%s»."
+msgstr[1] ""
+"Las siguientes carpetas de búsqueda\n"
+"«%s» se han modificado para dar cuenta de la carpeta eliminada\n"
+"«%s»."
+
+#: ../mail/mail-vfolder.c:1314
+msgid "Edit Search Folder"
+msgstr "Editar carpeta de búsqueda"
+
+#: ../mail/mail-vfolder.c:1423
+msgid "New Search Folder"
+msgstr "Carpeta de búsqueda nueva"
+
+#: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "Falló la comprobación de SPAM"
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "Falló al informar de que es SPAM"
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "Falló al informar de que no es SPAM"
+
+#: ../mail/mail.error.xml.h:4
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "Ya existe una carpeta llamada «{0}». Use un nombre diferente."
+
+#: ../mail/mail.error.xml.h:5
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "Ya existe una carpeta llamada «{1}». Use un nombre diferente."
+
+#: ../mail/mail.error.xml.h:6
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
+msgstr ""
+"Ya existe una carpeta no vacía en «{1}».\n"
+"\n"
+"Puede elegir ignorar esta carpeta, sobreescribirla o añadir su contenido, o "
+"salir."
+
+#: ../mail/mail.error.xml.h:9
+msgid ""
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
+msgstr ""
+"Se ha solicitado una notificación de recepción para «{1}». ¿Quiere enviar "
+"una notificación de recepción a {0}?"
+
+#: ../mail/mail.error.xml.h:10
+msgid ""
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr ""
+"Ya existe una firma con el nombre «{0}». Especifique un nombre diferente."
+
+#: ../mail/mail.error.xml.h:11
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+"Añadir una línea de Asunto con significado al mensaje dará a sus "
+"destinatarios una idea de qué trata su correo."
+
+#: ../mail/mail.error.xml.h:12
+msgid "Are you sure you want to delete this account and all its proxies?"
+msgstr "¿Seguro que quiere eliminar esta cuenta y todos sus proxies?"
+
+#: ../mail/mail.error.xml.h:13
+msgid "Are you sure you want to delete this account?"
+msgstr "¿Seguro que quiere eliminar esta cuenta?"
+
+#: ../mail/mail.error.xml.h:14
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr ""
+"¿Seguro que quiere desactivar esta esta cuenta y eliminar todos sus proxies?"
+
+#: ../mail/mail.error.xml.h:15
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+"¿Seguro que quiere eliminar permanentemente todos los mensajes borrados en "
+"todas las carpetas?"
+
+#: ../mail/mail.error.xml.h:16
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
+msgstr ""
+"¿Seguro que quiere eliminar permanentemente todos los mensajes borrados en "
+"la carpeta «{0}»?"
+
+#: ../mail/mail.error.xml.h:17
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "¿Seguro que quiere enviar un mensaje en formato HTML?"
+
+#: ../mail/mail.error.xml.h:18
+msgid "Are you sure you want to send a message with invalid address?"
+msgstr "¿Seguro que quiere enviar un mensaje con una dirección no válida?"
+
+#: ../mail/mail.error.xml.h:19
+msgid "Are you sure you want to send a message with invalid addresses?"
+msgstr "¿Seguro que quiere enviar un mensaje con direcciones no válidas?"
+
+#: ../mail/mail.error.xml.h:20
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "¿Seguro que quiere enviar un mensaje con sólo destinatarios Cco?"
+
+#: ../mail/mail.error.xml.h:21
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "¿Seguro que quiere enviar un mensaje sin un asunto?"
+
+#: ../mail/mail.error.xml.h:22
+msgid "Blank Signature"
+msgstr "Firma en blanco"
+
+#: ../mail/mail.error.xml.h:23
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "No se puede añadir la carpeta de búsqueda «{0}»."
+
+#: ../mail/mail.error.xml.h:24
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "No se puede copiar la carpeta: «{0}» a «{1}»."
+
+#: ../mail/mail.error.xml.h:25
+msgid "Cannot create folder \"{0}\"."
+msgstr "No se puede crear la carpeta: «{0}»."
+
+#: ../mail/mail.error.xml.h:26
+msgid "Cannot create temporary save directory."
+msgstr "No se puede crear la carpeta de guardado temporal."
+
+#: ../mail/mail.error.xml.h:27
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "No se puede crear la carpeta de guardado, debido a «{1}»"
+
+#: ../mail/mail.error.xml.h:28
+msgid "Cannot delete folder \"{0}\"."
+msgstr "No se puede eliminar la carpeta «{0}»."
+
+#: ../mail/mail.error.xml.h:29
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "No se puede eliminar la carpeta del sistema «{0}»."
+
+#: ../mail/mail.error.xml.h:30
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "No se puede editar la carpeta de búsqueda «{0}» ya que no existe."
+
+#: ../mail/mail.error.xml.h:31
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "No se puede mover la carpeta «{0}» a «{1}»."
+
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{1}\"."
+msgstr "No se puede abrir el origen «{1}»."
+
+#: ../mail/mail.error.xml.h:33
+msgid "Cannot open source \"{2}\"."
+msgstr "No se puede abrir el origen «{2}»."
+
+#: ../mail/mail.error.xml.h:34
+msgid "Cannot open target \"{2}\"."
+msgstr "No se puede abrir el destino «{2}»."
+
+#: ../mail/mail.error.xml.h:35
+msgid ""
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
+msgstr ""
+"No se puede leer el archivo de licencia «{0}», debido a un problema de "
+"instalación. No podrá usar este proveedor hasta que pueda aceptar esta "
+"licencia."
+
+#: ../mail/mail.error.xml.h:36
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "No se puede renombrar «{0}» a «{1}»."
+
+#: ../mail/mail.error.xml.h:37
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "No se puede renombrar o mover la carpeta del sistema «{0}»."
+
+#: ../mail/mail.error.xml.h:38
+msgid "Cannot save changes to account."
+msgstr "No se pueden guardar los cambios en la cuenta."
+
+#: ../mail/mail.error.xml.h:39
+msgid "Cannot save to directory \"{0}\"."
+msgstr "No se puede guardar en la carpeta «{0}»."
+
+#: ../mail/mail.error.xml.h:40
+msgid "Cannot save to file \"{0}\"."
+msgstr "No se puede guardar al archivo «{0}»."
+
+#: ../mail/mail.error.xml.h:41
+msgid "Cannot set signature script \"{0}\"."
+msgstr "No se puede establecer el script de firma «{0}»."
+
+#: ../mail/mail.error.xml.h:42
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"Verifique que su contraseña está escrita correctamente. Recuerde que muchas "
+"contraseñas distinguen las mayúsculas, su tecla de bloqueo de mayúsculas "
+"puede estar activada."
+
+#: ../mail/mail.error.xml.h:43
+msgid "Close message window."
+msgstr "Cerrar la ventana de mensaje."
+
+#: ../mail/mail.error.xml.h:44
+msgid "Could not save signature file."
+msgstr "No es posible guardar el archivo de firma."
+
+#: ../mail/mail.error.xml.h:46
+msgid "Do _Not Disable"
+msgstr "_No desactivar"
+
+#: ../mail/mail.error.xml.h:47
+msgid "Do _Not Send"
+msgstr "_No enviar"
+
+#: ../mail/mail.error.xml.h:48
+msgid "Do _Not Synchronize"
+msgstr "_No sincronizar"
+
+#: ../mail/mail.error.xml.h:49
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
+"¿Quiere sincronizar localmente las carpetas marcadas para uso en desconexión?"
+
+#: ../mail/mail.error.xml.h:50
+msgid "Do you want to mark all messages as read?"
+msgstr "¿Quiere marcar todos los mensajes como leídos?"
+
+#: ../mail/mail.error.xml.h:51
+msgid "Do you wish to save your changes?"
+msgstr "¿Desea guardar los cambios?"
+
+#: ../mail/mail.error.xml.h:52
+msgid "Enter password."
+msgstr "Introduzca la contraseña."
+
+#: ../mail/mail.error.xml.h:53
+msgid "Error loading filter definitions."
+msgstr "Error al cargar las definiciones de filtros."
+
+#: ../mail/mail.error.xml.h:54
+msgid "Error while performing operation."
+msgstr "Error al efectuar operación."
+
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:58
+msgid "Error while {0}."
+msgstr "Error mientras estaba {0}."
+
+#: ../mail/mail.error.xml.h:59
+msgid ""
+"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"mail must be migrated to the new format before Evolution can proceed. Do you "
+"want to migrate now?\n"
+"\n"
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
+msgstr ""
+"El formato de correo local de Evolution ha cambiado de mbox a maildir. Se "
+"debe migrar su correo local al formato nuevo antes de que Evolution pueda "
+"proceder ¿Quiere migrar ahora?\n"
+"\n"
+"Se creará una cuenta mbox para preservar las antiguas carpetas mbox. Puede "
+"eliminarla después de asegurarse que sus datos se han migrado correctamente. "
+"Asegúrese de que existe espacio suficiente si elige migrar."
+
+#: ../mail/mail.error.xml.h:62
+msgid "Evolution's local mail format has changed."
+msgstr "El formato de correo local de Evolution ha cambiado"
+
+#: ../mail/mail.error.xml.h:63
+msgid "Failed to download messages for offline viewing."
+msgstr "Falló al descargar los mensajes para trabajar sin conexión"
+
+#: ../mail/mail.error.xml.h:64
+msgid "Failed to find duplicate messages."
+msgstr "Falló al buscar mensajes duplicados."
+
+#: ../mail/mail.error.xml.h:65
+msgid "Failed to open folder."
+msgstr "Falló al abrir la carpeta."
+
+#: ../mail/mail.error.xml.h:66
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr ""
+"Falló al consultar al servidor para la lista de mecanismos de autenticación "
+"soportados."
+
+#: ../mail/mail.error.xml.h:67
+msgid "Failed to remove attachments from messages."
+msgstr "Falló al quitar los adjuntos de los mensajes."
+
+#: ../mail/mail.error.xml.h:68
+msgid "Failed to retrieve messages."
+msgstr "Fallo� al obtener los mensajes."
+
+#: ../mail/mail.error.xml.h:69
+msgid "Failed to save messages to disk."
+msgstr "Fallo� al guardar los mensajes al disco."
+
+#: ../mail/mail.error.xml.h:70
+msgid "Failed to unsubscribe from folder."
+msgstr "Falló al desuscribirse de la carpeta."
+
+#: ../mail/mail.error.xml.h:71
+msgid "File exists but cannot overwrite it."
+msgstr "El archivo existe pero no se puede sobreescribir."
+
+#: ../mail/mail.error.xml.h:72
+msgid "File exists but is not a regular file."
+msgstr "El archivo existe pero no es un archivo regular."
+
+#. Translators: {0} is replaced with a folder name
+#: ../mail/mail.error.xml.h:74
+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 "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
+msgid ""
+"If you delete the folder, all of its contents and its subfolders' contents "
+"will be deleted permanently."
+msgstr ""
+"Si elimina la carpeta, todo su contenido y el de sus subcarpetas se "
+"eliminará permanentemente."
+
+#: ../mail/mail.error.xml.h:77
+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
+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
+msgid ""
+"If you proceed, the account information and\n"
+"all proxy information will be deleted permanently."
+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
+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
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+"Si sale, estos mensajes no se enviarán hasta que Evolution sea iniciado de "
+"nuevo."
+
+#: ../mail/mail.error.xml.h:83
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: ../mail/mail.error.xml.h:84
+msgid "Invalid authentication"
+msgstr "Autenticación inválida"
+
+#: ../mail/mail.error.xml.h:85
+msgid "Mail Deletion Failed"
+msgstr "Ha fallado el borrado del correo"
+
+#: ../mail/mail.error.xml.h:86
+msgid "Mail filters automatically updated."
+msgstr "Filtros de correo actualizados automáticamente."
+
+#: ../mail/mail.error.xml.h:87
+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 ""
+"Muchos sistemas de correo-e añaden una cabecera «Apparentely-To» a los "
+"mensajes que sólo tienen destinatarios Cco. Esta cabecera, si se añade, "
+"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
+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 ""
+"Los mensajes mostrados en las carpetas de búsqueda no son copias. Si los "
+"borra de la carpeta de búsqueda, se borrarán físicamente de la carpeta o "
+"carpetas en las que están físicamente. ¿Realmente quiere borrar estos "
+"mensajes?"
+
+#: ../mail/mail.error.xml.h:89
+msgid "Missing folder."
+msgstr "Falta la carpeta."
+
+#: ../mail/mail.error.xml.h:91
+msgid "N_ever"
+msgstr "_Nunca"
+
+#: ../mail/mail.error.xml.h:92
+msgid "No duplicate messages found."
+msgstr "No se encontró ningún correo duplicado."
+
+#: ../mail/mail.error.xml.h:93
+msgid "No sources selected."
+msgstr "No se ha seleccionado ningún origen."
+
+#: ../mail/mail.error.xml.h:94
+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
+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
+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
+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 ""
+"Introduzca una dirección de correo válida en el campo «Para:» Puede buscar "
+"direcciones de correo pulsando en el botón «Para:» al lado de la caja de "
+"entrada."
+
+#: ../mail/mail.error.xml.h:98
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}"
+msgstr ""
+"Asegúrese de que los siguientes destinatarios desean y son capaces de "
+"recibir correo-e en HTML:\n"
+"{0}"
+
+#: ../mail/mail.error.xml.h:100
+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
+msgid "Please wait."
+msgstr "Por favor espere."
+
+#: ../mail/mail.error.xml.h:102
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "Problema al migrar la carpeta antigua de correo «{0}»."
+
+#: ../mail/mail.error.xml.h:103
+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
+msgid "Read receipt requested."
+msgstr "Se solicitó una notificación de lectura."
+
+#: ../mail/mail.error.xml.h:105
+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
+msgid "Really delete folder \"{0}\"?"
+msgstr "¿Realmente quiere borrar la carpeta «{0}»?"
+
+#: ../mail/mail.error.xml.h:107
+msgid "Remove duplicate messages?"
+msgstr "¿Quitar mensajes duplicados?"
+
+#: ../mail/mail.error.xml.h:108
+msgid "Reply _Privately"
+msgstr "Responder pri_vadamente"
+
+#: ../mail/mail.error.xml.h:111
+msgid "Search Folders automatically updated."
+msgstr "Carpetas de búsqueda autoactualizadas."
+
+#: ../mail/mail.error.xml.h:112
+msgid "Send private reply?"
+msgstr "¿Enviar una respuesta privada?"
+
+#: ../mail/mail.error.xml.h:113
+msgid "Send reply to all recipients?"
+msgstr "¿Enviar respuesta a todos los destinatarios?"
+
+#: ../mail/mail.error.xml.h:114
+msgid "Signature Already Exists"
+msgstr "La firma ya existe"
+
+#: ../mail/mail.error.xml.h:115
+msgid "Synchronize folders locally for offline usage?"
+msgstr "¿Sincronizar las carpetas localmente para usarse sin conexión?"
+
+#: ../mail/mail.error.xml.h:116
+msgid ""
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
+msgstr ""
+"Evolution requiere las carpetas de sistema para funcionar correctamente y no "
+"pueden renombrarse, moverse o eliminarse."
+
+#: ../mail/mail.error.xml.h:117
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
+msgstr ""
+"La lista de contactos que está enviando está configurada para ocultar los "
+"destinatarios de la lista.\n"
+"Muchos sistemas de correo añaden una cabecera Apparentely-To a los mensajes "
+"que sólo tienen destinatarios Cco. Esta cabecera listará todos los "
+"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
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
+msgstr ""
+"No se reconoció el siguiente destinatario como dirección de correo válida:\n"
+"{0}"
+
+#: ../mail/mail.error.xml.h:122
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
+msgstr ""
+"No se reconocieron los siguientes destinatarios como direcciones de correo "
+"válidas:\n"
+"{0}"
+
+#: ../mail/mail.error.xml.h:125
+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
+msgid "These messages are not copies."
+msgstr "Estos mensajes no son copias."
+
+#: ../mail/mail.error.xml.h:127
+msgid ""
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
+msgstr ""
+"Esta carpeta puede haber sido añadida implícitamente,\n"
+"vaya al editor de carpetas de búsqueda para añadirla explícitamente, si es "
+"necesario."
+
+#: ../mail/mail.error.xml.h:129
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr ""
+"El mensaje no puede enviarse porque la cuenta con la que eligió enviar no "
+"está activada"
+
+#: ../mail/mail.error.xml.h:130
+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
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+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
+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
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr ""
+"Esto marcará todos los mensajes como leídos en la carpeta seleccionada y sus "
+"subcarpetas."
+
+>>>>>>> master
 #: ../mail/mail.error.xml.h:134
 msgid "This will mark all messages as read in the selected folder."
 msgstr ""
@@ -13067,7 +23345,11 @@ msgid "_Append"
 msgstr "_Agregar"
 
 #: ../mail/mail.error.xml.h:156
+<<<<<<< HEAD
 #: ../plugins/publish-calendar/publish-calendar.c:600
+=======
+#: ../plugins/publish-calendar/publish-calendar.c:619
+>>>>>>> master
 msgid "_Disable"
 msgstr "_Desactivar"
 
@@ -13076,7 +23358,11 @@ msgid "_Discard changes"
 msgstr "_Descartar los cambios"
 
 #: ../mail/mail.error.xml.h:158
+<<<<<<< HEAD
 #: ../modules/mail/e-mail-shell-view-actions.c:1122
+=======
+#: ../modules/mail/e-mail-shell-view-actions.c:1112
+>>>>>>> master
 msgid "_Empty Trash"
 msgstr "_Vaciar papelera"
 
@@ -13103,6 +23389,7 @@ msgstr "_Abrir mensajes"
 #: ../mail/mail.error.xml.h:166
 msgid "_Send Receipt"
 msgstr "_Enviar confirmación"
+<<<<<<< HEAD
 
 #: ../mail/mail.error.xml.h:167
 msgid "_Synchronize"
@@ -13366,6 +23653,271 @@ msgstr "Propiedades de la libreta de direcciones"
 msgid "New Address Book"
 msgstr "Libreta de direcciones nueva"
 
+=======
+
+#: ../mail/mail.error.xml.h:167
+msgid "_Synchronize"
+msgstr "_Sincronizar"
+
+#: ../mail/mail.error.xml.h:168
+msgid "_Yes"
+msgstr "_Sí"
+
+#: ../mail/mail.error.xml.h:169
+msgid "{0}"
+msgstr "{0}"
+
+#: ../mail/message-list.c:1261
+msgid "Unseen"
+msgstr "Sin leer"
+
+#: ../mail/message-list.c:1262
+msgid "Seen"
+msgstr "Visto"
+
+#: ../mail/message-list.c:1263
+msgid "Answered"
+msgstr "Contestado"
+
+#: ../mail/message-list.c:1264
+msgid "Forwarded"
+msgstr "Reenviado"
+
+#: ../mail/message-list.c:1265
+msgid "Multiple Unseen Messages"
+msgstr "Múltiples mensajes sin leer"
+
+#: ../mail/message-list.c:1266
+msgid "Multiple Messages"
+msgstr "Múltiples mensajes"
+
+#: ../mail/message-list.c:1270
+msgid "Lowest"
+msgstr "La más baja"
+
+#: ../mail/message-list.c:1271
+msgid "Lower"
+msgstr "Más baja"
+
+#: ../mail/message-list.c:1275
+msgid "Higher"
+msgstr "Más alta"
+
+#: ../mail/message-list.c:1276
+msgid "Highest"
+msgstr "La más alta"
+
+#: ../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:1916 ../plugins/itip-formatter/itip-view.c:205
+msgid "Today %l:%M %p"
+msgstr "Hoy %l:%M %p"
+
+#: ../mail/message-list.c:1925
+msgid "Yesterday %l:%M %p"
+msgstr "Ayer %l:%M %p"
+
+#: ../mail/message-list.c:1937
+msgid "%a %l:%M %p"
+msgstr "%a %l:%M %p"
+
+#: ../mail/message-list.c:1945
+msgid "%b %d %l:%M %p"
+msgstr "%e de %b %l:%M %p"
+
+#: ../mail/message-list.c:1947
+msgid "%b %d %Y"
+msgstr "%e de %b de %Y"
+
+#: ../mail/message-list.c:2752
+msgid "Select all visible messages"
+msgstr "Selecciona todos los mensajes visibles"
+
+#: ../mail/message-list.c:2912 ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Mensajes"
+
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:4160
+msgid "Follow-up"
+msgstr "Seguimiento"
+
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:4675 ../mail/message-list.c:5098
+msgid "Generating message list"
+msgstr "Generando la lista de mensajes"
+
+#: ../mail/message-list.c:4912
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"Ningún mensaje satisface su criterio de búsqueda. Limpie el criterio de "
+"selección con el elemento del menú Buscar->Limpiar o cámbielo."
+
+#: ../mail/message-list.c:4914
+msgid "There are no messages in this folder."
+msgstr "No hay mensajes en esta carpeta."
+
+#: ../mail/message-list.etspec.h:3
+msgid "Due By"
+msgstr "Vence en"
+
+#: ../mail/message-list.etspec.h:4
+msgid "Flag Status"
+msgstr "Marca de estado"
+
+#: ../mail/message-list.etspec.h:5
+msgid "Flagged"
+msgstr "Marcado"
+
+#: ../mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr "Marca de seguimiento"
+
+#: ../mail/message-list.etspec.h:11
+msgid "Received"
+msgstr "Recibido"
+
+#: ../mail/message-list.etspec.h:15
+msgid "Sent Messages"
+msgstr "Mensajes enviados"
+
+#: ../mail/message-list.etspec.h:16
+#: ../widgets/misc/e-attachment-tree-view.c:572
+msgid "Size"
+msgstr "Tamaño"
+
+#: ../mail/message-list.etspec.h:19
+msgid "Subject - Trimmed"
+msgstr "Asunto recortado"
+
+#: ../mail/searchtypes.xml.h:1
+#: ../modules/mail/e-mail-shell-view-actions.c:1552
+msgid "Body contains"
+msgstr "El cuerpo contiene"
+
+#: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1559
+msgid "Message contains"
+msgstr "El mensaje contiene"
+
+#: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1566
+msgid "Recipients contain"
+msgstr "El destinatario contiene"
+
+#: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
+msgid "Sender contains"
+msgstr "El remitente contiene"
+
+#: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1580
+msgid "Subject contains"
+msgstr "El asunto contiene"
+
+#: ../mail/searchtypes.xml.h:6
+msgid "Subject or Addresses contains"
+msgstr "El asunto o las direcciones contienen"
+
+#: ../modules/addressbook/addressbook-config.c:207
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+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
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+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
+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 ""
+"Seleccionar esta opción significa que su servidor no soporta ni SSL ni TLS. "
+"Esto significa que su conexión será insegura, y que usted será vulnerable a "
+"fallos de seguridad."
+
+#: ../modules/addressbook/addressbook-config.c:641
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "U_sar en el calendario Cumpleaños y aniversarios"
+
+#: ../modules/addressbook/addressbook-config.c:683
+msgid "Copy _book content locally for offline operation"
+msgstr "Copiar la li_breta localmente para trabajar desconectado"
+
+#: ../modules/addressbook/addressbook-config.c:798
+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 ""
+"Este es el puerto del servidor LDAP al que Evolution intentará conectarse. "
+"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
+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 ""
+"Este es el método que usará Evolution para autenticarle a usted.  Note que "
+"establecer esto a «Dirección de correo-e» requiere acceso anónimo a su "
+"servidor ldap."
+
+#: ../modules/addressbook/addressbook-config.c:962
+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 ""
+"El ámbito de búsqueda define hasta qué profundidad desea que la búsqueda se "
+"extienda a lo largo de un árbol de carpetas. Un ámbito de búsqueda de «sub» "
+"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
+msgid "Server Information"
+msgstr "Información del servidor"
+
+#: ../modules/addressbook/addressbook-config.c:1091
+#: ../smime/gui/smime-ui.ui.h:13
+msgid "Details"
+msgstr "Detalles"
+
+#: ../modules/addressbook/addressbook-config.c:1092
+#: ../modules/mail/e-mail-shell-view.c:58
+msgid "Searching"
+msgstr "Búsqueda"
+
+#: ../modules/addressbook/addressbook-config.c:1094
+msgid "Downloading"
+msgstr "Descargando"
+
+#: ../modules/addressbook/addressbook-config.c:1309
+msgid "Address Book Properties"
+msgstr "Propiedades de la libreta de direcciones"
+
+#: ../modules/addressbook/addressbook-config.c:1311
+msgid "New Address Book"
+msgstr "Libreta de direcciones nueva"
+
+>>>>>>> master
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
 msgstr "Longitud del autocompletado"
@@ -13475,6 +24027,7 @@ msgid "Whether to show the preview pane."
 msgstr "Indica si se muestra el panel de vista previa."
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
+<<<<<<< HEAD
 #: ../modules/addressbook/autocompletion-config.c:184
 #: ../modules/mail/em-mailer-prefs.c:1029
 msgid "_Table column:"
@@ -13485,6 +24038,18 @@ msgid "Autocompletion"
 msgstr "Autocompletado"
 
 #: ../modules/addressbook/autocompletion-config.c:190
+=======
+#: ../modules/addressbook/autocompletion-config.c:194
+#: ../modules/mail/em-mailer-prefs.c:1049
+msgid "_Table column:"
+msgstr "Columna de _tabla:"
+
+#: ../modules/addressbook/autocompletion-config.c:197
+msgid "Autocompletion"
+msgstr "Autocompletado"
+
+#: ../modules/addressbook/autocompletion-config.c:200
+>>>>>>> master
 msgid "Always _show address of the autocompleted contact"
 msgstr "_Siempre mostrar la dirección del contacto autocompletado"
 
@@ -13542,6 +24107,7 @@ msgstr "Certificados"
 #: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "Save as vCard"
 msgstr "Guardar como vCard"
+<<<<<<< HEAD
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:812
 msgid "Co_py All Contacts To..."
@@ -13825,6 +24391,291 @@ msgstr "Información de contacto"
 msgid "Contact information for %s"
 msgstr "Información de contacto de %s"
 
+=======
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
+msgid "Co_py All Contacts To..."
+msgstr "Co_piar todos los contactos a…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+msgid "Copy the contacts of the selected address book to another"
+msgstr "Copiar el contenido de la libreta de direcciones seleccionada a otra"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
+msgid "D_elete Address Book"
+msgstr "_Eliminar la libreta de direcciones"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
+msgid "Delete the selected address book"
+msgstr "Eliminar la libreta de direcciones seleccionada"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
+msgid "Mo_ve All Contacts To..."
+msgstr "Mo_ver todos los contactos a…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
+msgid "Move the contacts of the selected address book to another"
+msgstr "Mover los contactos de la libreta de direcciones seleccionada a otra"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:833
+msgid "_New Address Book"
+msgstr "Libreta de direcciones _nueva"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
+msgid "Address _Book Properties"
+msgstr "Propiedades de la _libreta de direcciones"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
+msgid "Show properties of the selected address book"
+msgstr "Mostrar las propiedades de la libreta de direcciones seleccionada"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
+msgid "Address Book _Map"
+msgstr "_Mapa de la libreta de direcciones"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+msgid "Show map with all contacts from selected address book"
+msgstr ""
+"Mostrar el mapa con todos los contactos de la libreta de direcciones "
+"seleccionada"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:854
+#: ../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 "_Renombrar…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
+msgid "Rename the selected address book"
+msgstr "Renombrar la libreta de direcciones seleccionada"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
+msgid "Stop loading"
+msgstr "Parar la carga"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
+msgid "_Copy Contact To..."
+msgstr "_Copiar contacto a…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+msgid "Copy selected contacts to another address book"
+msgstr "Copiar los contactos seleccionados a otra libreta de direcciones"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
+msgid "_Delete Contact"
+msgstr "_Eliminar contacto"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:882
+msgid "_Find in Contact..."
+msgstr "_Buscar en el contacto…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
+msgid "Search for text in the displayed contact"
+msgstr "Buscar el texto en el contacto mostrado"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:889
+msgid "_Forward Contact..."
+msgstr "_Reenviar contacto…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
+msgid "Send selected contacts to another person"
+msgstr "Enviar los contactos seleccionados a otra persona"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
+msgid "_Move Contact To..."
+msgstr "_Mover contacto a…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
+msgid "Move selected contacts to another address book"
+msgstr "Mover los contactos seleccionados a otra libreta de direcciones"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
+msgid "_New Contact..."
+msgstr "Contacto _nuevo…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:910
+msgid "New Contact _List..."
+msgstr "_Lista de contactos nueva…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:917
+msgid "_Open Contact"
+msgstr "_Abrir contacto"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
+msgid "View the current contact"
+msgstr "Ver el contacto actual"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:924
+msgid "_Send Message to Contact..."
+msgstr "Enviar _mensaje al contacto…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
+msgid "Send a message to the selected contacts"
+msgstr "Enviar un mensaje a los contactos seleccionados"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:933
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-task-shell-view-actions.c:822
+msgid "_Actions"
+msgstr "A_cciones"
+
+#: ../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:1347
+msgid "_Preview"
+msgstr "Vista _previa"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../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 "_Eliminar"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
+msgid "_Properties"
+msgstr "_Propiedades"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
+msgid "Address Book Map"
+msgstr "Mapa de la libreta de direcciones"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
+msgid "Contact _Preview"
+msgstr "Vista _previa de contactos"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:991
+msgid "Show contact preview window"
+msgstr "Mostrar una ventana de vista previa de contactos"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
+msgid "Show _Maps"
+msgstr "Mostrar _mapas"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:999
+msgid "Show maps in contact preview window"
+msgstr "Mostrar mapas en la ventana de vista previa de contactos"
+
+#: ../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:1462
+msgid "_Classic View"
+msgstr "Vista _clásica"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1020
+msgid "Show contact preview below the contact list"
+msgstr "Mostrar la vista previa del contacto bajo la lista de mensajes"
+
+#: ../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:1469
+msgid "_Vertical View"
+msgstr "Vista _vertical"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1027
+msgid "Show contact preview alongside the contact list"
+msgstr "Mostrar la vista previa del contacto junto a la lista de contactos"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../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 "Cualquier categoría"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../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-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
+msgid "Advanced Search"
+msgstr "Búsqueda avanzada"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1085
+msgid "Print all shown contacts"
+msgstr "Imprimir todos los contactos mostrados"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1092
+msgid "Preview the contacts to be printed"
+msgstr "Previsualizar los contactos que imprimir"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1099
+msgid "Print selected contacts"
+msgstr "Imprimir los contactos seleccionados"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1114
+msgid "S_ave Address Book as vCard"
+msgstr "G_uardar la libreta de direcciones como VCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr ""
+"Guardar los contactos de la libreta de direcciones seleccionada como VCard"
+
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:1122
+#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+msgid "_Save as vCard..."
+msgstr "G_uardar como vCard…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1124
+msgid "Save selected contacts as a vCard"
+msgstr "Guardar los contactos seleccionados como VCard"
+
+#: ../modules/addressbook/e-book-shell-view.c:349
+msgid "_Forward Contacts"
+msgstr "_Reenviar contactos"
+
+#: ../modules/addressbook/e-book-shell-view.c:351
+msgid "_Forward Contact"
+msgstr "_Reenviar contacto"
+
+#: ../modules/addressbook/e-book-shell-view.c:382
+msgid "_Send Message to Contacts"
+msgstr "_Enviar un correo a los contactos"
+
+#: ../modules/addressbook/e-book-shell-view.c:384
+msgid "_Send Message to List"
+msgstr "_Enviar un correo a la lista"
+
+#: ../modules/addressbook/e-book-shell-view.c:386
+msgid "_Send Message to Contact"
+msgstr "_Enviar un correo al contacto"
+
+#: ../modules/addressbook/eab-composer-util.c:149
+msgid "Multiple vCards"
+msgstr "vCards múltiples"
+
+#: ../modules/addressbook/eab-composer-util.c:157
+#, c-format
+msgid "vCard for %s"
+msgstr "vCard para %s"
+
+#: ../modules/addressbook/eab-composer-util.c:169
+#: ../modules/addressbook/eab-composer-util.c:196
+#, c-format
+msgid "Contact information"
+msgstr "Información de contacto"
+
+#: ../modules/addressbook/eab-composer-util.c:198
+#, c-format
+msgid "Contact information for %s"
+msgstr "Información de contacto de %s"
+
+>>>>>>> master
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
@@ -13990,6 +24841,7 @@ msgstr "Alertas"
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "Day _ends:"
 msgstr "La jornada _acaba a las:"
+<<<<<<< HEAD
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:12
 msgid "Days"
@@ -14046,6 +24898,64 @@ msgstr "Mos_\ttrar un recordatorio"
 msgid "Show a _reminder"
 msgstr "Mostrar un _recordatorio"
 
+=======
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
+msgid "Days"
+msgstr "Días"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Default Free/Busy Server"
+msgstr "Servidor de disponibilidad predeterminado"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
+msgid "Display"
+msgstr "Mostrar"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+msgid "Display reminders in _notification area only"
+msgstr "Mostrar recordatorios sólo en el área de _notificación"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+msgid "Hours"
+msgstr "Horas"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
+msgid "Minutes"
+msgstr "Minutos"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+msgid "Publishing Information"
+msgstr "Información de publicación"
+
+#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+msgid "S_un"
+msgstr "_Dom"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
+msgid "Sc_roll Month View by a week"
+msgstr "Desplazar la vista mens_ual una semana"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Se_cond zone:"
+msgstr "Zona se_cundaria:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
+msgid "Select the calendars for reminder notification"
+msgstr "Seleccione los calendarios para los recordatorios de notificación"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Sh_ow a reminder"
+msgstr "Mos_\ttrar un recordatorio"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
+msgid "Show a _reminder"
+msgstr "Mostrar un _recordatorio"
+
+>>>>>>> master
 #: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr ""
@@ -14088,7 +24998,11 @@ msgid "Wee_k starts on:"
 msgstr "La sema_na empieza en:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:52
+<<<<<<< HEAD
 #: ../modules/calendar/e-cal-shell-view-actions.c:1678
+=======
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+>>>>>>> master
 msgid "Work Week"
 msgstr "Semana laboral"
 
@@ -14409,6 +25323,7 @@ msgstr ""
 "verticalmente."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+<<<<<<< HEAD
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -14478,6 +25393,78 @@ msgstr ""
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Mostrar el campo «Rol» en el editor de acontecimientos/tareas/reuniones"
 
+=======
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr ""
+"Posición del panel vertical, entre las listas del calendario el calendario "
+"del navegador de fechas."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"Posición de la hoja vertical, entre la vista y el navegador del calendario y "
+"la lista de tareas en la vista mensual, en píxeles."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+"Posición de la hoja vertical, entre la vista y el navegador de fechas del "
+"calendario y la lista de tareas cuando no está en la vista mensual, en "
+"píxeles."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+msgid "Primary calendar"
+msgstr "Calendario primario"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+msgid "Primary memo list"
+msgstr "Lista de notas primaria"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+msgid "Primary task list"
+msgstr "Lista de tareas primaria"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Programs that are allowed to be run by reminders."
+msgstr "Programas que se permite que ejecuten por los recordatorios."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+msgid "Recently used second time zones in a Day View"
+msgstr "Zonas horarias secundarias recientemente usadas en una Vista diaria"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+msgid "Recurrent Events in Italic"
+msgstr "Los acontecimientos que se repiten en cursiva"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+msgid "Reminder programs"
+msgstr "Notas de recordatorios"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
+msgid "Save directory for reminder audio"
+msgstr "Carpeta donde guardar los sonidos de los recordatorios"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
+msgid "Scroll Month View by a week"
+msgstr "Desplazar la vista mensual una semana"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr ""
+"Mostrar el campo «Confirmar» en el editor de acontecimientos/tareas/reuniones"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+msgid "Show Role field in the event/task/meeting editor"
+msgstr ""
+"Mostrar el campo «Rol» en el editor de acontecimientos/tareas/reuniones"
+
+>>>>>>> master
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
 msgstr ""
@@ -14566,8 +25553,13 @@ msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view."
 msgstr ""
+<<<<<<< HEAD
 "El UID de la nota seleccionada (o «primaria») en la barra lateral de la vista "
 "de «Notas»."
+=======
+"El UID de la nota seleccionada (o «primaria») en la barra lateral de la "
+"vista de «Notas»."
+>>>>>>> master
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
 msgid ""
@@ -14586,6 +25578,7 @@ msgstr ""
 "La plantilla URL para usar como datos de resguardo de disponibilidad, %u se "
 "reemplaza por la parte del usuario de la dirección de correo y %d se "
 "reemplaza por el dominio."
+<<<<<<< HEAD
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
 msgid ""
@@ -19029,6 +30022,4451 @@ msgstr "Última versión de la configuración actualizada"
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
+=======
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"La zona horaria predeterminada que se usará en las fechas y horas en el "
+"calendario, como una localización sin correspondencia en una base de datos "
+"de franjas horarias Olsen, como en \"América/Nueva York\"."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+"El estilo de la distribución determina dónde ubicar el panel de vista previa "
+"en relación con la lista de notas. «0» (vista clásica) ubica el panel de "
+"vista previa debajo de la lista de notas. «1» (vista vertical) ubica el "
+"panel de vista previa junto a la lista de notas."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"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 ""
+"El estilo de la distribución determina dónde ubicar el panel de vista previa "
+"en relación con la lista de tareas. «0» (vista clásica) ubica el panel de "
+"vista previa debajo de la lista de tareas. «1» (vista vertical) ubica el "
+"panel de vista previa junto a la lista de tareas."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
+msgid "The second timezone for a Day View"
+msgstr "La segunda zona horaria para una Vista diaria"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+"Esto puede tener tres valores posibles. «0» para errores. «1» para avisos. "
+"«2» para mensajes de depuración."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
+msgid "Time divisions"
+msgstr "Divisiones de hora"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
+msgid "Time the last reminder ran, in time_t."
+msgstr "La hora en que el último recordatorio sonó, en time_t."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+msgid "Timezone"
+msgstr "Zona horaria"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
+msgid "Twenty four hour time format"
+msgstr "Formato de hora de veinticuatro horas"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\"."
+msgstr ""
+"Unidades para el recordatorio de cumpleaños o aniversarios, «minutes», "
+"«hours» o «days»."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"Unidades para el recordatorio predeterminado, «minutes», «hours» o «days»."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"Unidades para determinar cuándo ocultar tareas, «minutes», «hours» o «days»."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
+msgid "Use system timezone"
+msgstr "Usar la hora del sistema"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr ""
+"Usar la zona horaria del sistema en lugar de la zona horaria seleccionada en "
+"Evolution."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
+msgid "Vertical pane position"
+msgstr "Posición del panel vertical"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
+msgid "Week start"
+msgstr "Comienzo de la semana"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgstr ""
+"El día en que empieza la semana, desde el domingo (0) hasta el sábado (6)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
+msgid "Whether or not to use the notification tray for display reminders."
+msgstr ""
+"Indica si se debe usar o no la bandeja de notificación para mostrar "
+"recordatorios."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr "Indica si debe pedir confirmación al eliminar una cita o tarea."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr "Indica si debe pedir confirmación al purgar citas y tareas."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+"Indica si se deben comprimir los fines de semana, lo cual pone al sábado y "
+"al domingo en el mismo espacio que un día laborable."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
+msgid "Whether to display the end time of events in the week and month views."
+msgstr ""
+"Indica si debe mostrar la hora de finalización de los acontecimientos en las "
+"vistas semanales y mensuales."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr ""
+"Indica si debe dibujar la línea Marcus Bains (línea a la hora actual) en el "
+"calendario."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr "Indica si debe ocultar las tareas terminadas en la vista de tareas."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr "Indica si se debe desplazar la vista mensual una semana, no un mes."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
+msgid "Whether to set a default reminder for appointments."
+msgstr ""
+"Indica si debe establecer un recordatorio predeterminado para las citas."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
+msgid "Whether to set a reminder for birthdays and anniversaries."
+msgstr ""
+"Indica si debe establecer un recordatorio para cumpleaños y aniversarios."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr ""
+"Indica si debe mostrar el campo «Confirmar» en el editor de acontecimiento/"
+"tareas/reuniones"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr ""
+"Indica si debe mostrar el campo «Categorías» en el editor de acontecimientos/"
+"reuniones"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr ""
+"Indica si debe mostrar el campo «Rol» en el editor de acontecimientos/tareas/"
+"reuniones"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr ""
+"Indica si debe mostrar el campo «Estado» en el editor de acontecimientos/"
+"tareas/reuniones"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
+msgstr ""
+"Indica si debe mostrar las horas en formato de veinticuatro horas en vez de "
+"usar am/pm."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr ""
+"Indica si debe mostrar el campo «Zona horaria» en el editor de "
+"acontecimientos/reuniones"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr ""
+"Indica si debe mostrar el campo «Tipo» en el editor de acontecimientos/"
+"tareas/reuniones"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr ""
+"Indica si debe mostrar los números de la semana en varias partes del "
+"calendario."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
+msgid "Work days"
+msgstr "Días laborables"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
+msgid "Workday end hour"
+msgstr "Hora de finalización de la jornada laboral"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+msgid "Workday end minute"
+msgstr "Minuto de finalización de la jornada laboral"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+msgid "Workday start hour"
+msgstr "Hora de comienzo de la jornada laboral"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
+msgid "Workday start minute"
+msgstr "Minuto de comienzo de la jornada laboral"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:312
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "I_mport"
+msgstr "I_mportar"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:393
+msgid "Select a Calendar"
+msgstr "Seleccionar un calendario"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:420
+msgid "Select a Task List"
+msgstr "Seleccionar una lista de tareas"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:430
+msgid "I_mport to Calendar"
+msgstr "I_mportar al calendario"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:437
+msgid "I_mport to Tasks"
+msgstr "I_mportar a las tareas"
+
+#: ../modules/calendar/e-calendar-preferences.c:461
+msgid "Selected Calendars for Reminders"
+msgstr "Calendarios seleccionados para recordatorios"
+
+#: ../modules/calendar/e-calendar-preferences.c:863
+msgid "Ti_me and date:"
+msgstr "Fecha y _hora:"
+
+#: ../modules/calendar/e-calendar-preferences.c:864
+msgid "_Date only:"
+msgstr "Sólo _fecha:"
+
+#. Create the Webcal source group
+#: ../modules/calendar/e-cal-shell-backend.c:117
+#: ../modules/calendar/e-cal-shell-migrate.c:198
+#: ../modules/calendar/e-memo-shell-backend.c:104
+#: ../modules/calendar/e-memo-shell-migrate.c:152
+#: ../modules/calendar/e-task-shell-backend.c:104
+#: ../modules/calendar/e-task-shell-migrate.c:164
+msgid "On The Web"
+msgstr "En la web"
+
+#: ../modules/calendar/e-cal-shell-backend.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:127
+msgid "Weather"
+msgstr "Meteorología"
+
+#: ../modules/calendar/e-cal-shell-backend.c:206
+#: ../modules/calendar/e-cal-shell-migrate.c:66
+msgid "Birthdays & Anniversaries"
+msgstr "Cumpleaños y aniversarios"
+
+#: ../modules/calendar/e-cal-shell-backend.c:439
+msgctxt "New"
+msgid "_Appointment"
+msgstr "_Cita"
+
+#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+msgid "Create a new appointment"
+msgstr "Crea una cita nueva"
+
+#: ../modules/calendar/e-cal-shell-backend.c:446
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "Cita para todo el _día"
+
+#: ../modules/calendar/e-cal-shell-backend.c:448
+msgid "Create a new all-day appointment"
+msgstr "Crea una cita nueva para todo el día"
+
+#: ../modules/calendar/e-cal-shell-backend.c:453
+msgctxt "New"
+msgid "M_eeting"
+msgstr "_Reunión"
+
+#: ../modules/calendar/e-cal-shell-backend.c:455
+msgid "Create a new meeting request"
+msgstr "Crea una solicitud de reunión nueva"
+
+#: ../modules/calendar/e-cal-shell-backend.c:463
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "Cale_ndario"
+
+#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+msgid "Create a new calendar"
+msgstr "Crea un calendario nuevo"
+
+#: ../modules/calendar/e-cal-shell-backend.c:788
+msgid "Calendar and Tasks"
+msgstr "Calendario y tareas"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:184
+msgid "Loading calendars"
+msgstr "Cargando calendarios"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:755
+msgid "_New Calendar..."
+msgstr "Calendario _nuevo…"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:772
+msgid "Calendar Selector"
+msgstr "Selector de calendarios"
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-cal-shell-sidebar.c:1123
+#, c-format
+msgid "Opening calendar at %s"
+msgstr "Abriendo el calendario en «%s»"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
+msgid "Print"
+msgstr "Imprimir"
+
+#: ../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."
+msgstr ""
+"Esta operación eliminará permanentemente todos los acontecimientos marcados "
+"más antiguos que el tiempo seleccionado. Si continúa, no podrá recuperar "
+"esos acontecimientos."
+
+#. Translators: This is the first part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:337
+msgid "Purge events older than"
+msgstr "Purgar acontecimientos anteriores a"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:564
+msgid "Copying Items"
+msgstr "Copiando elementos"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:848
+msgid "Moving Items"
+msgstr "Moviendo elementos"
+
+#. Translators: Default filename part saving an event to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-actions.c:1175
+msgid "event"
+msgstr "acontecimiento"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1177
+#: ../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 "Guardar como iCalendar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
+msgid "_Copy..."
+msgstr "_Copiar…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+msgid "D_elete Calendar"
+msgstr "_Eliminar calendario"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+msgid "Delete the selected calendar"
+msgstr "Eliminar el calendario seleccionado"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+msgid "Go Back"
+msgstr "Retroceder"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+msgid "Go Forward"
+msgstr "Avanzar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+msgid "Select today"
+msgstr "Selecciona hoy"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+msgid "Select _Date"
+msgstr "Seleccionar _fecha"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+msgid "Select a specific date"
+msgstr "Selecciona una fecha específica"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+msgid "_New Calendar"
+msgstr "Calendario _nuevo"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-task-shell-view-actions.c:813
+msgid "Purg_e"
+msgstr "Purg_ar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+msgid "Purge old appointments and meetings"
+msgstr "Purgar reuniones y acontecimientos antiguos"
+
+#: ../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 "Actuali_zar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+msgid "Refresh the selected calendar"
+msgstr "Actualizar el calendario seleccionado"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+msgid "Rename the selected calendar"
+msgstr "Renombrar el calendario seleccionado"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+msgid "Show _Only This Calendar"
+msgstr "Mostrar _sólo este calendario"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+msgid "Cop_y to Calendar..."
+msgstr "Cop_iar al calendario…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+msgid "_Delegate Meeting..."
+msgstr "_Delegar reunión…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+msgid "_Delete Appointment"
+msgstr "_Eliminar cita"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+msgid "Delete selected appointments"
+msgstr "Eliminar las citas seleccionadas"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+msgid "Delete This _Occurrence"
+msgstr "Eliminar esta _repetición"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+msgid "Delete this occurrence"
+msgstr "Eliminar esta repetición"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+msgid "Delete All Occ_urrences"
+msgstr "Eliminar tod_as las repeticiones"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+msgid "Delete all occurrences"
+msgstr "Eliminar todas las repeticiones"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+msgid "New All Day _Event..."
+msgstr "Acont_ecimiento nuevo para todo el día"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+msgid "Create a new all day event"
+msgstr "Crear un acontecimiento nuevo para todo el día"
+
+#: ../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 "Reenviar como i_Calendar…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+msgid "New _Meeting..."
+msgstr "_Reunión nueva…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+msgid "Create a new meeting"
+msgstr "Crear una reunión nueva"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+msgid "Mo_ve to Calendar..."
+msgstr "Mo_ver al calendario…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+msgid "New _Appointment..."
+msgstr "_Cita nueva…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1489
+msgid "Make this Occurrence _Movable"
+msgstr "Hacer esta repetición _movible"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+msgid "_Open Appointment"
+msgstr "_Abrir cita"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+msgid "View the current appointment"
+msgstr "Ver la cita actual"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+msgid "_Reply"
+msgstr "_Responder"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+msgid "_Schedule Meeting..."
+msgstr "_Concertar una reunión…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+msgid "Converts an appointment to a meeting"
+msgstr "Convierte una cita en una reunión"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+msgid "Conv_ert to Appointment..."
+msgstr "Con_vertir en una cita…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+msgid "Converts a meeting to an appointment"
+msgstr "Convierte una reunión en una cita"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+msgid "Quit"
+msgstr "Salir"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1651
+msgid "Day"
+msgstr "Día"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+msgid "Show one day"
+msgstr "Mostrar un día"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
+msgid "List"
+msgstr "Lista"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+msgid "Show as list"
+msgstr "Mostrar como una lista"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1665
+msgid "Month"
+msgstr "Mes"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+msgid "Show one month"
+msgstr "Mostrar un mes"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1672
+msgid "Week"
+msgstr "Semana"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+msgid "Show one week"
+msgstr "Mostrar una semana"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1681
+msgid "Show one work week"
+msgstr "Mostrar una semana de trabajo"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+msgid "Active Appointments"
+msgstr "Citas activas"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+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-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-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
+msgid "Print this calendar"
+msgstr "Imprime este calendario"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+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-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 "G_uardar como iCalendar…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1859
+msgid "Go To"
+msgstr "Ir a"
+
+#. 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:217
+#: ../modules/calendar/e-memo-shell-view-actions.c:522
+msgid "memo"
+msgstr "nota"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
+msgid "New _Memo"
+msgstr "_Nota nueva"
+
+#: ../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:656
+msgid "Create a new memo"
+msgstr "Crea una nota nueva"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:661
+msgid "_Open Memo"
+msgstr "_Abrir nota"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:269
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
+msgid "View the selected memo"
+msgstr "Ver la nota seleccionada"
+
+#: ../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 "Abrir página _web"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:286
+#: ../modules/calendar/e-memo-shell-view-actions.c:828
+msgid "Print the selected memo"
+msgstr "Imprimir la nota seleccionada"
+
+#. Translators: Default filename part saving a task to a file when
+#. * 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:284
+#: ../modules/calendar/e-task-shell-view-actions.c:639
+msgid "task"
+msgstr "tarea"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
+#: ../modules/calendar/e-task-shell-view-actions.c:701
+msgid "_Assign Task"
+msgstr "_Asignar tarea"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:778
+msgid "_Mark as Complete"
+msgstr "_Marcar como terminado"
+
+#: ../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 "Marcar tareas seleccionadas como terminadas"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+msgid "_Mark as Incomplete"
+msgstr "_Marcar como incompleta"
+
+#: ../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 "Marcar las tareas seleccionadas como incompletas"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:792
+msgid "New _Task"
+msgstr "_Tarea nueva"
+
+#: ../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:794
+msgid "Create a new task"
+msgstr "Crea una tarea nueva"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
+#: ../modules/calendar/e-task-shell-view-actions.c:799
+msgid "_Open Task"
+msgstr "_Abrir tarea"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
+#: ../modules/calendar/e-task-shell-view-actions.c:801
+msgid "View the selected task"
+msgstr "Ver la tarea seleccionada"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-task-shell-view-actions.c:1027
+msgid "Print the selected task"
+msgstr "Imprimir la tarea seleccionada"
+
+#: ../modules/calendar/e-memo-shell-backend.c:298
+msgctxt "New"
+msgid "Mem_o"
+msgstr "_Nota"
+
+#: ../modules/calendar/e-memo-shell-backend.c:305
+msgctxt "New"
+msgid "_Shared Memo"
+msgstr "Nota _compartida"
+
+#: ../modules/calendar/e-memo-shell-backend.c:307
+msgid "Create a new shared memo"
+msgstr "Crea una nota compartida nueva"
+
+#: ../modules/calendar/e-memo-shell-backend.c:315
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "Li_sta de notas"
+
+#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
+msgid "Create a new memo list"
+msgstr "Crea una lista de notas nueva"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:179
+msgid "Loading memos"
+msgstr "Cargando notas"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:696
+msgid "Memo List Selector"
+msgstr "Selector de lista de notas"
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-memo-shell-sidebar.c:1009
+#, c-format
+msgid "Opening memos at %s"
+msgstr "Abriendo notas en %s"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
+msgid "Print Memos"
+msgstr "Imprimir notas"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+msgid "_Delete Memo"
+msgstr "_Eliminar nota"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
+msgid "_Find in Memo..."
+msgstr "_Buscar en la nota…"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
+msgid "Search for text in the displayed memo"
+msgstr "Buscar el texto en la nota mostrada"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
+msgid "D_elete Memo List"
+msgstr "Eli_minar la lista de notas"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
+msgid "Delete the selected memo list"
+msgstr "Eliminar la lista de notas seleccionada"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
+msgid "_New Memo List"
+msgstr "Lista de notas _nueva"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+msgid "Refresh the selected memo list"
+msgstr "Actualizar la lista de notas seleccionada"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
+msgid "Rename the selected memo list"
+msgstr "Renombrar la lista de notas seleccionada"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+msgid "Show _Only This Memo List"
+msgstr "Mostrar _sólo esta lista de notas"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
+msgid "Memo _Preview"
+msgstr "Vista pre_via de notas"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
+msgid "Show memo preview pane"
+msgstr "Mostrar el panel de vista previa de notas"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:749
+msgid "Show memo preview below the memo list"
+msgstr "Mostrar la vista previa de la nota bajo la lista de notas"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:756
+msgid "Show memo preview alongside the memo list"
+msgstr "Mostrar la vista previa de la nota junto a la lista de notas"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
+msgid "Print the list of memos"
+msgstr "Imprime la lista de notas"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:821
+msgid "Preview the list of memos to be printed"
+msgstr "Vista previa de la lista de notas para imprimir"
+
+#: ../modules/calendar/e-memo-shell-view.c:227
+msgid "Delete Memos"
+msgstr "Eliminar notas"
+
+#: ../modules/calendar/e-memo-shell-view.c:229
+msgid "Delete Memo"
+msgstr "Eliminar nota"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:424
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d nota"
+msgstr[1] "%d notas"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:428
+#: ../modules/calendar/e-task-shell-view-private.c:585
+#, c-format
+msgid "%d selected"
+msgstr "%d seleccionada"
+
+#: ../modules/calendar/e-task-shell-backend.c:297
+msgctxt "New"
+msgid "_Task"
+msgstr "_Tarea"
+
+#: ../modules/calendar/e-task-shell-backend.c:304
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "Tarea _asignada"
+
+#: ../modules/calendar/e-task-shell-backend.c:306
+msgid "Create a new assigned task"
+msgstr "Crea una tarea nueva asignada"
+
+#: ../modules/calendar/e-task-shell-backend.c:314
+msgctxt "New"
+msgid "Tas_k List"
+msgstr "Lista de _tareas"
+
+#: ../modules/calendar/e-task-shell-backend.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:745
+msgid "Create a new task list"
+msgstr "Crea una lista de tareas nueva"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:179
+msgid "Loading tasks"
+msgstr "Cargando tareas"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:696
+msgid "Task List Selector"
+msgstr "Selector de listas de tareas"
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-task-shell-sidebar.c:1010
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Abriendo tareas en %s"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
+msgid "Print Tasks"
+msgstr "Imprimir tareas"
+
+#: ../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"
+"Really erase these tasks?"
+msgstr ""
+"Esta operación eliminará permanentemente todos las tareas marcados como "
+"terminadas. Si continúa, no podrá recuperar esas tareas.\n"
+"\n"
+"¿Eliminar realmente esas tareas?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:590
+msgid "Do not ask me again"
+msgstr "No preguntarme de nuevo"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:708
+msgid "_Delete Task"
+msgstr "_Eliminar tarea"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:715
+msgid "_Find in Task..."
+msgstr "_Buscar en la tarea…"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:717
+msgid "Search for text in the displayed task"
+msgstr "Buscar el texto en la tarea mostrada"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:729
+msgid "Copy..."
+msgstr "_Copiar…"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:736
+msgid "D_elete Task List"
+msgstr "_Eliminar lista de tareas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:738
+msgid "Delete the selected task list"
+msgstr "Eliminar la lista de tareas seleccionada"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:743
+msgid "_New Task List"
+msgstr "Lista de tareas _nueva"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:759
+msgid "Refresh the selected task list"
+msgstr "Actualizar la lista de tareas seleccionada"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:766
+msgid "Rename the selected task list"
+msgstr "Renombrar la lista de tareas seleccionada"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:771
+msgid "Show _Only This Task List"
+msgstr "Mostrar _sólo esta lista de tareas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:785
+msgid "Mar_k as Incomplete"
+msgstr "_Marcar como incompleto"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:815
+msgid "Delete completed tasks"
+msgstr "Eliminar tareas completadas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:890
+msgid "Task _Preview"
+msgstr "_Vista previa de tarea"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:892
+msgid "Show task preview pane"
+msgstr "Mostrar el panel de vista previa"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:913
+msgid "Show task preview below the task list"
+msgstr "Mostrar la vista previa de tareas bajo la lista de tareas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:920
+msgid "Show task preview alongside the task list"
+msgstr "Mostrar la vista previa de tareas junto a la lista de tareas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:928
+msgid "Active Tasks"
+msgstr "Tareas activas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:942
+msgid "Completed Tasks"
+msgstr "Tareas completadas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:949
+msgid "Next 7 Days' Tasks"
+msgstr "Tareas de los próximos 7 días"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:956
+msgid "Overdue Tasks"
+msgstr "Tareas fuera de plazo"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:963
+msgid "Tasks with Attachments"
+msgstr "Tareas con adjuntos"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
+msgid "Print the list of tasks"
+msgstr "Imprime la lista de tareas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1020
+msgid "Preview the list of tasks to be printed"
+msgstr "Vista previa de la lista de tareas para imprimir"
+
+#: ../modules/calendar/e-task-shell-view.c:362
+msgid "Delete Tasks"
+msgstr "Eliminar tareas"
+
+#: ../modules/calendar/e-task-shell-view.c:364
+msgid "Delete Task"
+msgstr "Eliminar tarea"
+
+#: ../modules/calendar/e-task-shell-view-private.c:472
+msgid "Expunging"
+msgstr "Compactando"
+
+#: ../modules/calendar/e-task-shell-view-private.c:581
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d tarea"
+msgstr[1] "%d tareas"
+
+#: ../modules/mail/em-account-prefs.c:258
+msgid "Evolution Account Assistant"
+msgstr "Asistente de cuentas de Evolution"
+
+#: ../modules/mail/em-account-prefs.c:307
+msgid "Account Editor"
+msgstr "Editor de cuentas"
+
+#. Translators: This is only for multiple messages.
+#: ../modules/mail/e-mail-attachment-handler.c:384
+#, c-format
+msgid "%d attached messages"
+msgstr "%d mensajes adjuntos"
+
+#: ../modules/mail/e-mail-shell-backend.c:195
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "_Mensaje de correo"
+
+#: ../modules/mail/e-mail-shell-backend.c:197
+msgid "Compose a new mail message"
+msgstr "Redacta un mensaje de correo nuevo"
+
+#: ../modules/mail/e-mail-shell-backend.c:205
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "_Carpeta de correo"
+
+#: ../modules/mail/e-mail-shell-backend.c:207
+msgid "Create a new mail folder"
+msgstr "Crea una carpeta de correo nueva"
+
+#: ../modules/mail/e-mail-shell-backend.c:408
+msgid "Mail Accounts"
+msgstr "Cuentas de correo"
+
+#: ../modules/mail/e-mail-shell-backend.c:416
+msgid "Mail Preferences"
+msgstr "Opciones de correo"
+
+#: ../modules/mail/e-mail-shell-backend.c:424
+msgid "Composer Preferences"
+msgstr "Preferencias del editor"
+
+#: ../modules/mail/e-mail-shell-backend.c:432
+msgid "Network Preferences"
+msgstr "Preferencias de red"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1105
+#: ../modules/mail/e-mail-shell-view.c:960
+msgid "_Disable Account"
+msgstr "_Desactivar cuenta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
+msgid "Disable this account"
+msgstr "Desactivar esta cuenta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1114
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr ""
+"Eliminar permanentemente todos los correos borrados de todas las carpetas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1119
+msgid "_Download Messages for Offline Usage"
+msgstr "_Descargar correos para trabajar sin conexión"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1121
+msgid "Download messages of accounts and folders marked for offline usage"
+msgstr ""
+"Descargar correos para las cuentas y carpetas marcadas para usar sin conexión"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
+msgid "Fl_ush Outbox"
+msgstr "Enviar correos pe_ndientes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
+msgid "_Copy Folder To..."
+msgstr "_Copiar carpeta a…"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
+msgid "Copy the selected folder into another folder"
+msgstr "Copia la carpeta seleccionada en otra carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1142
+msgid "Permanently remove this folder"
+msgstr "Elimina permanentemente esta carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
+msgid "E_xpunge"
+msgstr "_Purgar"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1149
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Elimina permanentemente todos los mensajes borrados de esta carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
+msgid "Mar_k All Messages as Read"
+msgstr "Marcar todos los mensajes como _leídos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
+msgid "Mark all messages in the folder as read"
+msgstr "Marcar todos los mensajes en la carpeta como leídos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
+msgid "_Move Folder To..."
+msgstr "_Mover carpeta a…"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1163
+msgid "Move the selected folder into another folder"
+msgstr "Mueve la carpeta seleccionada a otra carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
+msgid "_New..."
+msgstr "_Nueva…"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1170
+msgid "Create a new folder for storing mail"
+msgstr "Crea una carpeta nueva para almacenar correo"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1177
+msgid "Change the properties of this folder"
+msgstr "Cambia las propiedades de esta carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1184
+msgid "Refresh the folder"
+msgstr "Actualizar la carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1191
+msgid "Change the name of this folder"
+msgstr "Cambia el nombre de esta carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
+msgid "Select Message _Thread"
+msgstr "Seleccionar con_versación del mensaje"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1198
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
+"Selecciona todos los correos en la misma conversación que el correo "
+"seleccionado"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
+msgid "Select Message S_ubthread"
+msgstr "Seleccionar s_ubconversación del mensaje"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+msgid "Select all replies to the currently selected message"
+msgstr "Seleccionar todas las respuestas al mensaje actualmente seleccionado"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
+msgid "Empty _Trash"
+msgstr "_Vaciar papelera"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
+msgid "Permanently remove all the deleted messages from all accounts"
+msgstr ""
+"Eliminar permanentemente todos los correos borrados de todas las cuentas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
+msgid "_New Label"
+msgstr "Etiqueta n_ueva"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
+msgid "N_one"
+msgstr "Ning_uno"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
+msgid "_Manage Subscriptions"
+msgstr "Gestionar _suscripciones"
+
+#: ../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 "Suscribirse o desuscribirse de carpetas alojadas en servidores remotos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
+msgid "Send / _Receive"
+msgstr "Enviar / Reci_bir"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1256
+msgid "Send queued items and retrieve new items"
+msgstr "Envía el correo en la cola y obtiene el nuevo"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
+msgid "R_eceive All"
+msgstr "R_ecibir todo"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
+msgid "Receive new items from all accounts"
+msgstr "Recibir correo nuevo para todas las cuentas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
+msgid "_Send All"
+msgstr "_Enviar todo"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
+msgid "Send queued items in all accounts"
+msgstr "Enviar todos los elementos en la cola de todas las cuentas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../widgets/misc/e-activity-proxy.c:310
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1298
+msgid "Cancel the current mail operation"
+msgstr "Cancela la operación de correo actual"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
+msgid "Collapse All _Threads"
+msgstr "_Contraer todas las conversaciones"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1305
+msgid "Collapse all message threads"
+msgstr "Contrae todas las conversaciones"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
+msgid "E_xpand All Threads"
+msgstr "E_xpandir todas las conversaciones"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1312
+msgid "Expand all message threads"
+msgstr "Expandir todas las conversaciones"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
+msgid "_Message Filters"
+msgstr "_Filtros de correos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1319
+msgid "Create or edit rules for filtering new mail"
+msgstr "Crear o editar reglas para el filtrado de correos nuevos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
+msgid "_Subscriptions..."
+msgstr "_Suscripciones…"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1333
+msgid "F_older"
+msgstr "_Carpeta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1340
+msgid "_Label"
+msgstr "Etiq_ueta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
+msgid "C_reate Search Folder From Search..."
+msgstr "_Crear una carpeta de búsqueda desde la búsqueda…"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1364
+msgid "Search F_olders"
+msgstr "Carpetas de búsque_da"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1366
+msgid "Create or edit search folder definitions"
+msgstr "Crear o edita definiciones para carpetas de búsqueda"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1397
+msgid "_New Folder..."
+msgstr "Carpeta _nueva…"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1425
+msgid "Show Message _Preview"
+msgstr "Mostrar vista _previa del correo"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1427
+msgid "Show message preview pane"
+msgstr "Mostrar el correo en el panel de vista previa"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1433
+msgid "Show _Deleted Messages"
+msgstr "Mostrar los mensajes _eliminados"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
+msgid "Show deleted messages with a line through them"
+msgstr "Mostrar los mensajes eliminados tachándolos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1441
+msgid "_Group By Threads"
+msgstr "A_grupar por conversaciones"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
+msgid "Threaded message list"
+msgstr "Lista de correos por conversaciones"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1464
+msgid "Show message preview below the message list"
+msgstr "Mostrar la vista previa del correo bajo la lista de mensajes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1471
+msgid "Show message preview alongside the message list"
+msgstr "Mostrar la vista previa del correo junto a la lista de mensajes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1479
+msgid "All Messages"
+msgstr "Todos los correos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1486
+msgid "Important Messages"
+msgstr "Mensajes importantes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1493
+msgid "Last 5 Days' Messages"
+msgstr "Mensajes de los últimos 5 días"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1500
+msgid "Messages Not Junk"
+msgstr "Mensajes que no son SPAM"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1507
+msgid "Messages with Attachments"
+msgstr "Mensajes con adjuntos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1514
+msgid "No Label"
+msgstr "Sin etiqueta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
+msgid "Read Messages"
+msgstr "Mensajes leídos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1528
+msgid "Recent Messages"
+msgstr "Mensajes recientes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1535
+msgid "Unread Messages"
+msgstr "Mensajes no leídos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1587
+msgid "Subject or Addresses contain"
+msgstr "El asunto o las direcciones contienen"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1597
+msgid "All Accounts"
+msgstr "Todas las cuentas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1604
+msgid "Current Account"
+msgstr "Cuenta actual"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1611
+msgid "Current Folder"
+msgstr "Carpeta actual"
+
+#: ../modules/mail/e-mail-shell-view.c:563
+msgid "All Account Search"
+msgstr "Búsqueda en todas las cuentas"
+
+#: ../modules/mail/e-mail-shell-view.c:736
+msgid "Account Search"
+msgstr "Búsqueda en la cuenta"
+
+#: ../modules/mail/e-mail-shell-view.c:958
+msgid "Proxy _Logout"
+msgstr "_Cerrar sesión proxy"
+
+#: ../modules/mail/e-mail-shell-view-private.c:997
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "%d seleccionado, "
+msgstr[1] "%d seleccionados, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:1008
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d borrado"
+msgstr[1] "%d borrados"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d SPAM"
+msgstr[1] "%d SPAM"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1027
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d borrador"
+msgstr[1] "%d borradores"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1033
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d sin enviar"
+msgstr[1] "%d sin enviar"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1039
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d enviado"
+msgstr[1] "%d enviados"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1051
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d no leído, "
+msgstr[1] "%d no leídos, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:1054
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d en total"
+msgstr[1] "%d en total"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1074
+msgid "Trash"
+msgstr "Papelera"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1544
+msgid "Send / Receive"
+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
+#: ../widgets/misc/e-account-tree-view.c:385
+msgid "Enabled"
+msgstr "Activado"
+
+#: ../modules/mail/em-composer-prefs.c:502
+msgid "Language(s)"
+msgstr "Idioma(s)"
+
+#: ../modules/mail/em-mailer-prefs.c:91
+msgid "Every time"
+msgstr "Cada vez"
+
+#: ../modules/mail/em-mailer-prefs.c:92
+msgid "Once per day"
+msgstr "Una vez por día"
+
+#: ../modules/mail/em-mailer-prefs.c:93
+msgid "Once per week"
+msgstr "Una vez por semana"
+
+#: ../modules/mail/em-mailer-prefs.c:94
+msgid "Once per month"
+msgstr "Una vez por mes"
+
+#: ../modules/mail/em-mailer-prefs.c:293
+msgid "Header"
+msgstr "Cabecera"
+
+#: ../modules/mail/em-mailer-prefs.c:297
+msgid "Contains Value"
+msgstr "Contiene el valor"
+
+#. 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:1051
+msgid "_Date header:"
+msgstr "Cabecera de _fecha:"
+
+#: ../modules/mail/em-mailer-prefs.c:1052
+msgid "Show _original header value"
+msgstr "Mostrar el valor _original de la cabecera"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Comprobar si Evolution es la aplicación de correo predeterminada"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+"Cada vez que Evolution se inicie, comprobar si es o no el cliente de correo "
+"predeterminado."
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+msgid "Do you want to make Evolution your default email client?"
+msgstr "¿Quiere que Evolution sea su cliente de correo predeterminado?"
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+msgid "Click 'Work Online' to return to online mode."
+msgstr "Pulsar «Trabajar conectado» para volver al modo conectado."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
+msgid "Evolution is currently offline due to a network outage."
+msgstr ""
+"Actualmente Evolution está desconectado debido a una desconexión de red."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
+msgid "Evolution is currently offline."
+msgstr "Actualmente Evolution está desconectado."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
+msgid ""
+"Evolution will return to online mode once a network connection is "
+"established."
+msgstr ""
+"Evolution volverá al modo conectado una vez que se establezca la conexión de "
+"red."
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an authentication token."
+msgstr ""
+"No se puede encontrar la correspondiente cuenta en el servicio org.gnome."
+"OnlineAccounts de la que obtener un «token» de autenticación."
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+msgid "OAuth"
+msgstr "OAuth"
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+msgid ""
+"This option will connect to the server by way of the GNOME Online Accounts "
+"service"
+msgstr ""
+"Esta opción conectará con el servidor a través del servicio de Cuentas en "
+"línea de GNOME («OAuth»)"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+msgid "Author(s)"
+msgstr "Autores(s)"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:255
+msgid "Plugin Manager"
+msgstr "Administrador de complementos"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:270
+msgid "Note: Some changes will not take effect until restart"
+msgstr "Nota: Algunos cambios no tendrán efecto hasta que reinicie"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:299
+msgid "Overview"
+msgstr "Vista general"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:368
+#: ../modules/plugin-manager/evolution-plugin-manager.c:451
+msgid "Plugin"
+msgstr "Complemento"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+msgid "_Plugins"
+msgstr "Com_plementos"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:490
+msgid "Enable and disable plugins"
+msgstr "Activar y desactivar complementos"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Complemento de prueba Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Probar el complemento para el cargador Python EPlugin."
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hello Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Pruebas de carga de los complementos Python"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:191
+#, c-format
+msgid "Failed to spawn SpamAssassin (%s): "
+msgstr "Falló al iniciar SpamAssasin (%s): "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:214
+msgid "Failed to stream mail message content to SpamAssassin: "
+msgstr "Falló al enviar el flujo del contenido de los correos a SpamAssassin: "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:233
+#, c-format
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "Falló al escribir «%s» a SpamAssassin: "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:261
+msgid "Failed to read output from SpamAssassin: "
+msgstr "Falló al leer la salida de SpamAssassin: "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:316
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr "SpamAssassin se colgó o falló al procesar un mensaje de correo"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:835
+msgid "SpamAssassin Options"
+msgstr "Opciones de SpamAssasin"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:850
+msgid "I_nclude remote tests"
+msgstr "I_ncluir tests remotos"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:864
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr "Esto hará que SpamAssasin sea más exacto, pero más lento."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:1073
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use SpamAssassin daemon and client"
+msgstr "Usar el demonio y cliente de SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "Usar el demonio y cliente de SpamAssassin (spamc/spamd)."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
+msgid "Use only local spam tests."
+msgstr "Usar sólo comprobaciones de SPAM locales."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
+msgid "Use only the local spam tests (no DNS)."
+msgstr "Usa sólo comprobaciones de SPAM locales (sin DNS)."
+
+#: ../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 "Seleccione la información que quiera importar:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:312
+#: ../widgets/misc/e-import-assistant.c:552
+#, c-format
+msgid "From %s:"
+msgstr "De %s:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:323
+#: ../modules/startup-wizard/evolution-startup-wizard.c:421
+msgid "Importing Files"
+msgstr "Importando archivos"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:399
+msgid "Import cancelled. Click \"Forward\" to continue."
+msgstr "Se canceló la importación. Pulse «Adelante» para continuar."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:417
+msgid "Import complete. Click \"Forward\" to continue."
+msgstr "Finalizó la importación. Pulse «Adelante» para continuar."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:497
+msgid "Evolution Setup Assistant"
+msgstr "Asistente de configuración de Evolution"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:503
+msgid "Welcome"
+msgstr "Bienvenido"
+
+#: ../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"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"Bienvenido a Evolution. Las siguientes pantallas permitirán a Evolution "
+"conectarse a sus cuentas de correo e importar archivos desde otras "
+"aplicaciones.\n"
+"\n"
+"Pulse el botón «Adelante» para continuar."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:613
+msgid "Loading accounts..."
+msgstr "Cargando cuentas…"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+msgid "Add local address books to Evolution."
+msgstr "Añadir las libretas de direcciones locales a Evolution."
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Local Address Books"
+msgstr "Libretas locales de direcciones"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
+"Lista de indicios para que el complemento de recuerdo de adjuntos busque en "
+"el cuerpo de un mensaje"
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
+msgid "_Do not show this message again."
+msgstr "_No mostrar otra vez este mensaje."
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:464
+#: ../plugins/templates/templates.c:462
+msgid "Keywords"
+msgstr "Palabras clave"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr ""
+"Evolution ha encontrado algunas palabras clave que sugieren que este mensaje "
+"debería contener un adjunto pero no puede encontrarlo."
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+msgid "Message has no attachments"
+msgstr "El mensaje no tiene adjuntos"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+msgid "_Add Attachment..."
+msgstr "_Añadir adjunto…"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Edit Message"
+msgstr "_Editar mensaje"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+msgid "Attachment Reminder"
+msgstr "Recuerdo de adjuntos"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr ""
+"Le recuerda cuando se le olvida añadir un adjunto a un mensaje de correo."
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+msgid "Inline Audio"
+msgstr "Sonido en línea"
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+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
+msgid "Select name of the Evolution backup file"
+msgstr "Seleccione el nombre de archivo de respaldo Evolution"
+
+#: ../plugins/backup-restore/backup-restore.c:225
+msgid "_Restart Evolution after backup"
+msgstr "_Reiniciar Evolution después del respaldo"
+
+#: ../plugins/backup-restore/backup-restore.c:251
+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
+msgid "_Restart Evolution after restore"
+msgstr "_Reiniciar Evolution después de la restauración"
+
+#: ../plugins/backup-restore/backup-restore.c:337
+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 ""
+"Puede restaurar Evolution desde su archivo de respaldo. Puede restaurar "
+"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
+msgid "_Restore Evolution from the backup file"
+msgstr "_Restaurar Evolution desde el archivo de respaldo"
+
+#: ../plugins/backup-restore/backup-restore.c:351
+msgid "Please select an Evolution Archive to restore:"
+msgstr "Seleccione un archivador de Evolution para restaurar:"
+
+#: ../plugins/backup-restore/backup-restore.c:354
+msgid "Choose a file to restore"
+msgstr "Elija un archivador para restaurar"
+
+#: ../plugins/backup-restore/backup-restore.c:362
+msgid "Restore from backup"
+msgstr "Restaurar desde un respaldo"
+
+#: ../plugins/backup-restore/backup-restore.c:402
+msgid "_Back up Evolution Data..."
+msgstr "Re_spaldar datos de Evolution…"
+
+#: ../plugins/backup-restore/backup-restore.c:404
+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
+msgid "R_estore Evolution Data..."
+msgstr "R_estaurar datos de Evolution…"
+
+#: ../plugins/backup-restore/backup-restore.c:411
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "Respaldar y restaurar los datos y la configuración desde un archivador"
+
+#: ../plugins/backup-restore/backup.c:77
+msgid "Back up Evolution directory"
+msgstr "Respaldar la carpeta de Evolution"
+
+#: ../plugins/backup-restore/backup.c:79
+msgid "Restore Evolution directory"
+msgstr "Restaurar la carpeta de Evolution"
+
+#: ../plugins/backup-restore/backup.c:81
+msgid "Check Evolution Back up"
+msgstr "Comprobar el respaldo de Evolution"
+
+#: ../plugins/backup-restore/backup.c:83
+msgid "Restart Evolution"
+msgstr "Reiniciar Evolution"
+
+#: ../plugins/backup-restore/backup.c: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
+msgid "Shutting down Evolution"
+msgstr "Cerrando Evolution"
+
+#: ../plugins/backup-restore/backup.c:308
+msgid "Backing Evolution accounts and settings"
+msgstr "Respaldar las cuentas y la configuración de Evolution"
+
+#: ../plugins/backup-restore/backup.c:318
+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
+msgid "Back up complete"
+msgstr "Respaldo completado"
+
+#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:527
+msgid "Restarting Evolution"
+msgstr "Reiniciando Evolution"
+
+#: ../plugins/backup-restore/backup.c:424
+msgid "Back up current Evolution data"
+msgstr "Respaldar los datos actuales de Evolution"
+
+#: ../plugins/backup-restore/backup.c:432
+msgid "Extracting files from back up"
+msgstr "Extrayendo archivos del respaldo"
+
+#: ../plugins/backup-restore/backup.c:491
+msgid "Loading Evolution settings"
+msgstr "Carga la configuración de Evolution"
+
+#: ../plugins/backup-restore/backup.c:508
+msgid "Removing temporary back up files"
+msgstr "Eliminando archivos temporales de respaldo"
+
+#: ../plugins/backup-restore/backup.c:520
+msgid "Ensuring local sources"
+msgstr "Asegurando fuentes locales"
+
+#: ../plugins/backup-restore/backup.c:707
+#, c-format
+msgid "Backing up to the folder %s"
+msgstr "Respaldando a la carpeta %s"
+
+#: ../plugins/backup-restore/backup.c:712
+#, 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
+msgid "Backing up Evolution Data"
+msgstr "Respaldando los datos de Evolution"
+
+#: ../plugins/backup-restore/backup.c:775
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Espere mientras Evolution respalda sus datos."
+
+#: ../plugins/backup-restore/backup.c:777
+msgid "Restoring Evolution Data"
+msgstr "Restaurando los datos de Evolution"
+
+#: ../plugins/backup-restore/backup.c:778
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Espere mientras Evolution restaura sus datos."
+
+#: ../plugins/backup-restore/backup.c:796
+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."
+
+#. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+msgid "Back up and Restore"
+msgstr "Respaldar y restaurar"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+msgid "Back up and restore your Evolution data and settings."
+msgstr "Respaldar y restaurar los datos y la configuración de Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Are you sure you want to close Evolution?"
+msgstr "¿Seguro que quiere cerrar Evolution?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+msgid ""
+"Are you sure you want to restore Evolution from the selected back up file?"
+msgstr ""
+"¿Está seguro de que quiere restaurar Evolution desde el archivo de respaldo "
+"seleccionado?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid "Close and Back up Evolution"
+msgstr "Cerrar y respaldar Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Close and Restore Evolution"
+msgstr "Cerrar y restaurar Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Insufficient Permissions"
+msgstr "Permisos insuficientes"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid "Invalid Evolution back up file"
+msgstr "Archivo de respaldo de Evolution no válido"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid "Please select a valid back up file to restore."
+msgstr "Seleccione un archivo de respaldo válido para restaurar."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid "The selected folder is not writable."
+msgstr "No se puede escribir en la carpeta seleccionada."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid ""
+"To back up your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
+msgstr ""
+"Para respaldar sus datos y ajustes, primero debe cerrar Evolution. Asegúrese "
+"de que guarda todo dato sin guardar antes de proceder."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+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 ""
+"Para restaurar sus datos y ajustes, primero debe cerrar Evolution. Asegúrese "
+"de que guarda todos sus datos sin guardar antes de proceder. Esto eliminará "
+"todos sus datos y configuración actual de Evolution y los restaurará de su "
+"respaldo."
+
+#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+msgid "Automatic Contacts"
+msgstr "Contactos automáticos"
+
+#. Enable BBDB checkbox
+#: ../plugins/bbdb/bbdb.c:710
+msgid "Create _address book entries when sending mails"
+msgstr ""
+"Crear entradas _automáticamente en la libreta de direcciones al enviar "
+"correos"
+
+#: ../plugins/bbdb/bbdb.c:716
+msgid "Select Address book for Automatic Contacts"
+msgstr "Seleccione la libreta para contactos automáticos"
+
+#: ../plugins/bbdb/bbdb.c:731
+msgid "Instant Messaging Contacts"
+msgstr "Contactos de mensajería instantánea"
+
+#. Enable Gaim Checkbox
+#: ../plugins/bbdb/bbdb.c:746
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr ""
+"_Sincronizar información e imágenes de contactos desde la lista de contactos "
+"de Pidgin"
+
+#: ../plugins/bbdb/bbdb.c:752
+msgid "Select Address book for Pidgin buddy list"
+msgstr ""
+"Seleccione la libreta de direcciones para la lista de contactos de Pidgin"
+
+#. Synchronize now button.
+#: ../plugins/bbdb/bbdb.c:763
+msgid "Synchronize with _buddy list now"
+msgstr "Sincronizar con la lista de _contactos de MI ahora"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
+"lists."
+msgstr ""
+"Se encarga del trabajo de gestionar su libreta de direcciones.\n"
+"\n"
+"Rellena automáticamente su libreta de contactos con los nombres y "
+"direcciones de correo-e cuando contesta a los correos. También rellena la "
+"información de contacto de MI de su lista de amigos."
+
+#: ../plugins/caldav/caldav-browse-server.c:214
+msgid "Authentication failed. Server requires correct login."
+msgstr ""
+"Falló la autenticación. El servidor requiere un inicio de sesión correcto."
+
+#: ../plugins/caldav/caldav-browse-server.c:216
+msgid "Given URL cannot be found."
+msgstr "No se puede encontrar el URL proporcionado."
+
+#: ../plugins/caldav/caldav-browse-server.c:220
+#, c-format
+msgid ""
+"Server returned unexpected data.\n"
+"%d - %s"
+msgstr ""
+"El servidor devolvió datos inesperados.\n"
+"%d - %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:360
+#: ../plugins/caldav/caldav-browse-server.c:694
+msgid "Failed to parse server response."
+msgstr "Falló al analizar la respuesta del servidor."
+
+#: ../plugins/caldav/caldav-browse-server.c:454
+msgid "Events"
+msgstr "Acontecimientos"
+
+#: ../plugins/caldav/caldav-browse-server.c:476
+msgid "User's calendars"
+msgstr "Calendarios del usuario"
+
+#: ../plugins/caldav/caldav-browse-server.c:588
+#: ../plugins/caldav/caldav-browse-server.c:763
+msgid "Failed to get server URL."
+msgstr "Falló al obtener el URL del servidor."
+
+#: ../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 "Buscando los calendarios del usuario…"
+
+#: ../plugins/caldav/caldav-browse-server.c:800
+msgid "Could not find any user calendar."
+msgstr "No se pudo encontrar ningún calendario del usuario."
+
+#: ../plugins/caldav/caldav-browse-server.c:938
+#, c-format
+msgid "Previous attempt failed: %s"
+msgstr "Falló el intento anterior: %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:940
+#, c-format
+msgid "Previous attempt failed with code %d"
+msgstr "El intento anterior falló con el código %d"
+
+#: ../plugins/caldav/caldav-browse-server.c:945
+#, c-format
+msgid "Enter password for user %s on server %s"
+msgstr "Introduzca la contraseña para el usuario %s en el servidor %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:1008
+#, c-format
+msgid "Cannot create soup message for URL '%s'"
+msgstr "No se puede crear el mensaje «soup» para el URL «%s»"
+
+#. fetch content
+#: ../plugins/caldav/caldav-browse-server.c:1266
+msgid "Searching folder content..."
+msgstr "Buscando el contenido de la carpeta…"
+
+#: ../plugins/caldav/caldav-browse-server.c:1325
+#: ../plugins/caldav/caldav-source.c:261
+msgid "Server _handles meeting invitations"
+msgstr "El servidor gesti_ona las invitaciones a reuniones"
+
+#: ../plugins/caldav/caldav-browse-server.c:1332
+msgid "List of available calendars:"
+msgstr "Lista de calendarios disponibles:"
+
+#: ../plugins/caldav/caldav-browse-server.c:1370
+msgid "Supports"
+msgstr "Soporta"
+
+#: ../plugins/caldav/caldav-browse-server.c:1397
+#: ../plugins/caldav/caldav-source.c:259
+msgid "User e_mail:"
+msgstr "Correo-_e del usuario:"
+
+#: ../plugins/caldav/caldav-browse-server.c:1469
+#, c-format
+msgid "Failed to create thread: %s"
+msgstr "Falló al crear la conversación: %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:1585
+#, c-format
+msgid "Server URL '%s' is not a valid URL"
+msgstr "El URL del servidor «%s» no es un URL válido"
+
+#: ../plugins/caldav/caldav-browse-server.c:1591
+msgid "Browse for a CalDAV calendar"
+msgstr "Examinar para calendarios CalDAV"
+
+#: ../plugins/caldav/caldav-source.c:240
+#: ../plugins/calendar-http/calendar-http.c:107
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../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 "Usar _conexión segura"
+
+#: ../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 "_Usuario:"
+
+#: ../plugins/caldav/caldav-source.c:264
+msgid "Brows_e server for a calendar"
+msgstr "_Examinar el servidor para un calendario"
+
+#: ../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 "A_ctualizar:"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+msgid "Add CalDAV support to Evolution."
+msgstr "Añadir soporte CalDAV a Evolution."
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "CalDAV Support"
+msgstr "Soporte CalDAV"
+
+#: ../plugins/calendar-file/calendar-file.c:134
+msgid "_Customize options"
+msgstr "Opciones de personali_zación"
+
+#: ../plugins/calendar-file/calendar-file.c:153
+msgid "File _name:"
+msgstr "_Nombre del archivo:"
+
+#: ../plugins/calendar-file/calendar-file.c:157
+msgid "Choose calendar file"
+msgstr "Elegir un archivo de calendario"
+
+#: ../plugins/calendar-file/calendar-file.c:209
+msgid "On open"
+msgstr "Al abrir"
+
+#: ../plugins/calendar-file/calendar-file.c:210
+msgid "On file change"
+msgstr "Al cambiar un archivo"
+
+#: ../plugins/calendar-file/calendar-file.c:211
+msgid "Periodically"
+msgstr "Periodicamente"
+
+#: ../plugins/calendar-file/calendar-file.c:228
+msgid "Force read _only"
+msgstr "Forzar _sólo lectura"
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
+msgid "Add local calendars to Evolution."
+msgstr "Añadir calendarios locales a Evolution."
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+msgid "Local Calendars"
+msgstr "Calendarios locales"
+
+#: ../plugins/calendar-http/calendar-http.c:207
+msgid "Userna_me:"
+msgstr "Nombre de _usuario:"
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
+msgid "Add web calendars to Evolution."
+msgstr "Añadir calendarios web a Evolution."
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+msgid "Web Calendars"
+msgstr "Calendarios web"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Fog"
+msgstr "Meteorología: Niebla"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
+msgid "Weather: Cloudy"
+msgstr "Meteorología: Nuboso"
+
+#: ../plugins/calendar-weather/calendar-weather.c:67
+msgid "Weather: Cloudy Night"
+msgstr "Meteorología: Noche nubosa"
+
+#: ../plugins/calendar-weather/calendar-weather.c:68
+msgid "Weather: Overcast"
+msgstr "Meteorología: Cubierto"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
+msgid "Weather: Showers"
+msgstr "Meteorología: Chubascos"
+
+#: ../plugins/calendar-weather/calendar-weather.c:70
+msgid "Weather: Snow"
+msgstr "Meteorología: Nieve"
+
+#: ../plugins/calendar-weather/calendar-weather.c:71
+msgid "Weather: Sunny"
+msgstr "Meteorología: Soleado"
+
+#: ../plugins/calendar-weather/calendar-weather.c:72
+msgid "Weather: Clear Night"
+msgstr "Meteorología: Noche despejada"
+
+#: ../plugins/calendar-weather/calendar-weather.c:73
+msgid "Weather: Thunderstorms"
+msgstr "Meteorología: Tormenta"
+
+#: ../plugins/calendar-weather/calendar-weather.c:239
+msgid "Select a location"
+msgstr "Seleccione un lugar"
+
+#. Translators: "None" location for a weather calendar
+#: ../plugins/calendar-weather/calendar-weather.c:350
+#: ../plugins/calendar-weather/calendar-weather.c:398
+msgctxt "weather-cal-location"
+msgid "None"
+msgstr "Ninguna"
+
+#: ../plugins/calendar-weather/calendar-weather.c:477
+msgid "_Units:"
+msgstr "_Unidades:"
+
+#: ../plugins/calendar-weather/calendar-weather.c:486
+msgid "Metric (Celsius, cm, etc)"
+msgstr "Métrica (Celsius, cm, etc)"
+
+#: ../plugins/calendar-weather/calendar-weather.c:489
+msgid "Imperial (Fahrenheit, inches, etc)"
+msgstr "Imperial (Fahrenheit, pulgadas, etc)"
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
+msgid "Add weather calendars to Evolution."
+msgstr "Añadir calendarios meteorológicos a Evolution."
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
+msgid "Weather Calendars"
+msgstr "Calendario meteorológico"
+
+#: ../plugins/dbx-import/dbx-importer.c:284
+msgid "Importing Outlook Express data"
+msgstr "Importando datos de Outlook Express"
+
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+msgid "Import Outlook Express messages from DBX file"
+msgstr "Importar mensajes de Outlook Express desde un archivo DBX"
+
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+msgid "Outlook DBX import"
+msgstr "Importador DBX de Outlook"
+
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+msgid "Outlook Express 5/6 personal folders (.dbx)"
+msgstr "Carpetas personales de Outlook Express 5/6 (.dbx)"
+
+#: ../plugins/default-source/default-source.c:169
+msgid "Mark as _default address book"
+msgstr "Marcar como libreta de direcciones pre_determinada"
+
+#: ../plugins/default-source/default-source.c:183
+msgid "A_utocomplete with this address book"
+msgstr "A_utocompletar con esta libreta de direcciones"
+
+#: ../plugins/default-source/default-source.c:192
+msgid "Mark as _default calendar"
+msgstr "Marcar como calendario pre_determinado"
+
+#: ../plugins/default-source/default-source.c:193
+msgid "Mark as _default task list"
+msgstr "Marcar como lista de tareas pre_determinada"
+
+#: ../plugins/default-source/default-source.c:194
+msgid "Mark as _default memo list"
+msgstr "Marcar como lista de notas pre_determinada"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+msgid "Default Sources"
+msgstr "Fuentes predeterminadas"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid "Mark your preferred address book and calendar as default."
+msgstr ""
+"Marque como predeterminados su libreta de direcciones y calendario "
+"preferidos."
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "Lista de cabeceras personalizadas"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"La clave especifica la lista de cabeceras personalizadas que puede añadir a "
+"un mensaje saliente. El formato para especificar una cabecera y el valor de "
+"la cabecera es: el nombre de la cabecera personalizada seguido de un «=» y "
+"los valores separados por «;»."
+
+#: ../plugins/email-custom-header/email-custom-header.c:322
+msgctxt "email-custom-header-Security"
+msgid "Security:"
+msgstr "Seguridad:"
+
+#: ../plugins/email-custom-header/email-custom-header.c:326
+msgctxt "email-custom-header-Security"
+msgid "Personal"
+msgstr "Privado"
+
+#: ../plugins/email-custom-header/email-custom-header.c:327
+msgctxt "email-custom-header-Security"
+msgid "Unclassified"
+msgstr "Sin clasificar"
+
+#: ../plugins/email-custom-header/email-custom-header.c:328
+msgctxt "email-custom-header-Security"
+msgid "Protected"
+msgstr "Protegido"
+
+#: ../plugins/email-custom-header/email-custom-header.c:329
+msgctxt "email-custom-header-Security"
+msgid "Confidential"
+msgstr "Confidencial"
+
+#: ../plugins/email-custom-header/email-custom-header.c:330
+msgctxt "email-custom-header-Security"
+msgid "Secret"
+msgstr "Secreto"
+
+#: ../plugins/email-custom-header/email-custom-header.c:331
+msgctxt "email-custom-header-Security"
+msgid "Top secret"
+msgstr "Alto secreto"
+
+#: ../plugins/email-custom-header/email-custom-header.c:388
+msgctxt "email-custom-header"
+msgid "None"
+msgstr "Ninguna"
+
+#: ../plugins/email-custom-header/email-custom-header.c:584
+msgid "_Custom Header"
+msgstr "_Cabeceras personalizadas"
+
+#. 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:847
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+"El formato para especificar el valor de una clave de cabecera personalizada "
+"es:\n"
+"Valores clave del nombre de la cabecera personalizada separados por «;»."
+
+#: ../plugins/email-custom-header/email-custom-header.c:901
+msgid "Key"
+msgstr "Clave"
+
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:468
+msgid "Values"
+msgstr "Valores"
+
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Add custom headers to outgoing mail messages."
+msgstr "Añadir una cabecera personalizada a los mensajes salientes."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "Cabecera personalizada"
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
+msgid "Email Custom Header"
+msgstr "Cabeceras personalizadas del correo-e"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr ""
+"Lanzar el editor automáticamente al pulsar una tecla en el editor de correos"
+
+#: ../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 "Lanzar automáticamente al editar un correo nuevo"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
+msgid "Default External Editor"
+msgstr "Editor externo predeterminado"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
+msgid "The default command that must be used as the editor."
+msgstr "El comando predeterminado que usar como editor."
+
+#: ../plugins/external-editor/external-editor.c:121
+msgid "Command to be executed to launch the editor: "
+msgstr "Comando que ejecutar para lanzar el editor: "
+
+#: ../plugins/external-editor/external-editor.c:122
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
+msgstr ""
+"Para Emacs use «xemacs»\n"
+"Para VI use «gvim -f»"
+
+#: ../plugins/external-editor/external-editor.c:402
+#: ../plugins/external-editor/external-editor.c:404
+msgid "Compose in External Editor"
+msgstr "Redactar en un editor externo"
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+msgid "External Editor"
+msgstr "Editor externo"
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr "Usar un editor externo para editar mensajes de correo en texto plano."
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr "No se puede crear la carpeta de guardado temporal"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
+msgid "Editor not launchable"
+msgstr "No se puede lanzar el editor"
+
+#: ../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."
+msgstr ""
+"Evolution no puede crear un archivo temporal para guardar su correo. "
+"Inténtelo más tarde."
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+msgid "External editor still running"
+msgstr "El editor externo aún se está ejecutando"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr ""
+"El editor externo aún se está ejecutando. La ventana del editor de correos "
+"no se puede cerrar mientras el editor esté activo."
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"No se puede lanzar el editor externo ajustado en las preferencias del "
+"complemento. Inténtelo estableciendo un editor diferente."
+
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
+msgid "Insert Face picture by default"
+msgstr "Insertar imagen de rostro de forma predeterminada"
+
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
+msgid ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+msgstr ""
+"Indica si se debe insertar una imagen de rostro a los correos salientes de "
+"forma predeterminada. La imagen debería establecerse antes de seleccionar "
+"esto, de otra forma no sucederá nada."
+
+#: ../plugins/face/face.c:292
+msgid "Select a Face Picture"
+msgstr "Seleccionar una imagen facial"
+
+#: ../plugins/face/face.c:302
+msgid "Image files"
+msgstr "Archivos de imágenes"
+
+#: ../plugins/face/face.c:359
+msgid "_Insert Face picture by default"
+msgstr "_Insertar imagen de rostro de forma predeterminada"
+
+#: ../plugins/face/face.c:370
+msgid "Load new _Face picture"
+msgstr "Cargar una nueva imagen de _rostro"
+
+#: ../plugins/face/face.c:429
+msgid "Include _Face"
+msgstr "Incluir _rostro"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid "Attach a small picture of your face to outgoing messages."
+msgstr "Adjuntar una imagen pequeña de su rostro en mensajes salientes."
+
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+msgid "Failed Read"
+msgstr "Lectura fallida"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+msgid "Invalid Image Size"
+msgstr "Tamaño de imagen no válido"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:3
+msgid "Not an image"
+msgstr "No es una imagen"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:4
+msgid "Please select an image of size 48 * 48"
+msgstr "Seleccione una imagen de tamaño 48 * 48"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+msgid "The file cannot be read"
+msgstr "El archivo no se puede leer"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid "The file you selected does not look like a valid .png image. Error: {0}"
+msgstr ""
+"El archivo que ha seleccionado no parece una imagen .png válida. Error: {0}"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:325
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+msgid "Server"
+msgstr "Servidor"
+
+#: ../plugins/google-account-setup/google-source.c:459
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr ""
+"Introduzca la contraseña para que el usuario %s acceda a la lista de "
+"calendarios suscritos."
+
+#: ../plugins/google-account-setup/google-source.c:576
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"No se pueden leer los datos del servidor de Google.\n"
+"%s"
+
+#: ../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 "Error desconocido."
+
+#: ../plugins/google-account-setup/google-source.c:679
+msgid "Cal_endar:"
+msgstr "Cal_endario:"
+
+#: ../plugins/google-account-setup/google-source.c:714
+msgid "Retrieve _List"
+msgstr "Obtener _lista"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+msgid "Add Google Calendars to Evolution."
+msgstr "Añadir un calendario de Google a Evolution."
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Google Calendars"
+msgstr "Calendarios de Google"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+msgid "Inline Image"
+msgstr "Imagen en línea"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+msgid "View image attachments directly in mail messages."
+msgstr "Ver los adjuntos directamente en los mensajes de correo."
+
+#: ../plugins/imap-features/imap-headers.c:337
+#: ../plugins/imap-features/imap-headers.ui.h:2
+msgid "Custom Headers"
+msgstr "Cabeceras personalizadas"
+
+#: ../plugins/imap-features/imap-headers.c:349
+#: ../plugins/imap-features/imap-headers.ui.h:5
+msgid "IMAP Headers"
+msgstr "Cabeceras IMAP"
+
+#: ../plugins/imap-features/imap-headers.ui.h:1
+msgid "Basic and _Mailing List Headers (Default)"
+msgstr "Cabeceras básicas y de _listas de correo predeterminadas"
+
+#: ../plugins/imap-features/imap-headers.ui.h:3
+msgid ""
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
+"You can ignore this if you choose \"All Headers\"."
+msgstr ""
+"Proporcione las cabeceras extra que necesite obtener además de las cabeceras "
+"estándar anteriores.\n"
+"Puede ignorar esto si elige «Todas las cabeceras»"
+
+#: ../plugins/imap-features/imap-headers.ui.h:6
+msgid ""
+"Select your IMAP Header Preferences. \n"
+"The more headers you have the more time it will take to download."
+msgstr ""
+"Seleccione sus preferencias para las cabeceras IMAP. \n"
+"Cuantas más cabeceras tenga más tiempo se tardará en descargar."
+
+#: ../plugins/imap-features/imap-headers.ui.h:8
+msgid ""
+"_Basic Headers (Fastest) \n"
+"Use this if you do not have filters based on mailing lists"
+msgstr ""
+"Cabeceras _básicas - (rápido) \n"
+"Use esto si no tiene filtros basados en listas de correo"
+
+#: ../plugins/imap-features/imap-headers.ui.h:10
+msgid "_Fetch All Headers"
+msgstr "Obtener _todas las cabeceras"
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
+msgid "Fine-tune your IMAP accounts."
+msgstr "Configurar sus cuentas IMAP."
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+msgid "IMAP Features"
+msgstr "Características IMAP"
+
+#. Translators: The first '%s' is replaced with a calendar name,
+#. * 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 "Falló al cargar el calendario «%s» (%s)"
+
+#: ../plugins/itip-formatter/itip-formatter.c:659
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr "Una cita en el calendario «%s» entra en conflicto con esta reunión"
+
+#: ../plugins/itip-formatter/itip-formatter.c:683
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "Se encontró la cita en el calendario «%s»"
+
+#: ../plugins/itip-formatter/itip-formatter.c:789
+msgid "Unable to find any calendars"
+msgstr "No se puede encontrar ningún calendario"
+
+#: ../plugins/itip-formatter/itip-formatter.c:796
+msgid "Unable to find this meeting in any calendar"
+msgstr "No se puede encontrar esta reunión en ningún calendario"
+
+#: ../plugins/itip-formatter/itip-formatter.c:800
+msgid "Unable to find this task in any task list"
+msgstr "No se puede encontrar esta tarea en ninguna lista de tareas"
+
+#: ../plugins/itip-formatter/itip-formatter.c:804
+msgid "Unable to find this memo in any memo list"
+msgstr "No se puede encontrar esta nota en ninguna lista de notas"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1082
+msgid "Opening the calendar. Please wait..."
+msgstr "Abriendo el calendario. Espere…"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1085
+msgid "Searching for an existing version of this appointment"
+msgstr "Buscando una versión existente de esta cita"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1362
+msgid "Unable to parse item"
+msgstr "No es posible interpretar el elemento"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1451
+#, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr "No es posible enviar el elemento al calendario «%s»: %s"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1463
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr "Enviado al calendario «%s» como aceptado"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1467
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr "Enviado al calendario «%s» como tentativa"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1472
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr "Enviado al calendario «%s» como rehusado"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1477
+#, c-format
+msgid "Sent to calendar '%s' as canceled"
+msgstr "Enviado al calendario «%s» como cancelado"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1579
+#, c-format
+msgid "Organizer has removed the delegate %s "
+msgstr "El organizador ha quitado al delegado %s"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+msgid "Sent a cancelation notice to the delegate"
+msgstr "Enviar una notificación de cancelación al delegado"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1588
+msgid "Could not send the cancelation notice to the delegate"
+msgstr "No es posible enviar una notificación de cancelación al delegado"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1700
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr ""
+"El estado de asistencia no pudo actualizarse debido a que el estado es "
+"inválido"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1729
+#, c-format
+msgid "Unable to update attendee. %s"
+msgstr "No es posible actualizar la asistencia. %s"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1733
+msgid "Attendee status updated"
+msgstr "Estado de asistencia actualizado"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1737
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+"El estado del participante no pudo actualizarse porque ya no existe el "
+"elemento"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1759
+msgid "Meeting information sent"
+msgstr "Información de reunión enviada"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1762
+msgid "Task information sent"
+msgstr "Información de la tarea enviada"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1765
+msgid "Memo information sent"
+msgstr "Información de la nota enviada"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1774
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr "No se puede enviar la información de la reunión, la reunión no existe"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1777
+msgid "Unable to send task information, the task does not exist"
+msgstr "No se puede enviar la información de la tarea, la tarea no existe"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1780
+msgid "Unable to send memo information, the memo does not exist"
+msgstr "No se puede enviar la información de la nota, la nota no existe"
+
+#. Translators: This is a default filename for a calendar.
+#: ../plugins/itip-formatter/itip-formatter.c:1846
+msgid "calendar.ics"
+msgstr "calendario.ics"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1851
+msgid "Save Calendar"
+msgstr "Guardar calendario"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1914
+#: ../plugins/itip-formatter/itip-formatter.c:1925
+msgid "The calendar attached is not valid"
+msgstr "El calendario adjunto no es válido"
+
+#: ../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 ""
+"El mensaje dice contener un calendario, pero el calendario no es un "
+"iCalendar válido."
+
+#: ../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 "El elemento en el calendario no es válido"
+
+#: ../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 ""
+"El mensaje contiene un calendario, pero el calendario no contiene ningún "
+"acontecimiento, tarea o información de disponibilidad"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2008
+msgid "The calendar attached contains multiple items"
+msgstr "El calendario adjunto contiene elementos múltiples"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2009
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr ""
+"Para procesar todos estos elementos, el archivo debería guardarse y el "
+"calendario importarse"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2672
+msgctxt "cal-itip"
+msgid "None"
+msgstr "Ninguno"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2688
+msgid "Tentatively Accepted"
+msgstr "Aceptado provisionalmente"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2806
+msgid "This meeting recurs"
+msgstr "Esta reunión se repite"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2809
+msgid "This task recurs"
+msgstr "Esta tarea se repite"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2812
+msgid "This memo recurs"
+msgstr "Esta nota se repite"
+
+#: ../plugins/itip-formatter/itip-formatter.c:3036
+msgid "Meeting Invitations"
+msgstr "Invitaciones a reuniones"
+
+#. Delete message after acting
+#. FIXME Need a schema for this
+#: ../plugins/itip-formatter/itip-formatter.c:3061
+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
+msgid "Conflict Search"
+msgstr "Búsqueda de conflictos"
+
+#. Source selector
+#: ../plugins/itip-formatter/itip-formatter.c:3086
+msgid "Select the calendars to search for meeting conflicts"
+msgstr "Seleccione los calendario en los que buscar conflictos entre reuniones"
+
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:196
+msgid "Today %H:%M"
+msgstr "Hoy a las %H:%M"
+
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:200
+msgid "Today %H:%M:%S"
+msgstr "Hoy a las %H:%M %S"
+
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:209
+msgid "Today %l:%M:%S %p"
+msgstr "Hoy a las %l:%M:%S %p"
+
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:224
+msgid "Tomorrow %H:%M"
+msgstr "Mañana a las %H:%M"
+
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:228
+msgid "Tomorrow %H:%M:%S"
+msgstr "Mañana a las %H:%M %S"
+
+#. strftime format of a time,
+#. * in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:233
+msgid "Tomorrow %l:%M %p"
+msgstr "Mañana a las %l:%M %p"
+
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:237
+msgid "Tomorrow %l:%M:%S %p"
+msgstr "Mañana a las %l:%M:%S %p"
+
+#. strftime format of a weekday.
+#: ../plugins/itip-formatter/itip-view.c:256
+#, c-format
+msgid "%A"
+msgstr "%A"
+
+#. strftime format of a weekday and a
+#. * time, in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:261
+msgid "%A %H:%M"
+msgstr "%A %H:%M"
+
+#. strftime format of a weekday and a
+#. * time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:265
+msgid "%A %H:%M:%S"
+msgstr "%A, %H:%M:%S"
+
+#. strftime format of a weekday and a
+#. * time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:270
+msgid "%A %l:%M %p"
+msgstr "%A %l:%M %p"
+
+#. strftime format of a weekday and a
+#. * time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:274
+msgid "%A %l:%M:%S %p"
+msgstr "%A %l:%M:%S %p"
+
+#. strftime format of a weekday and a date
+#. * without a year.
+#: ../plugins/itip-formatter/itip-view.c:283
+msgid "%A, %B %e"
+msgstr "%A, %e de %B"
+
+#. strftime format of a weekday, a date
+#. * without a year and a time,
+#. * in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:289
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %e de %B a las %H:%M"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:293
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%A, %e de %B a las %H:%M:%S"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:298
+msgid "%A, %B %e %l:%M %p"
+msgstr "%A, %e de %B a las %l:%M %p"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:302
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %e de %B a las %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: ../plugins/itip-formatter/itip-view.c:308
+msgid "%A, %B %e, %Y"
+msgstr "%A, %e de %B de %Y"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:313
+msgid "%A, %B %e, %Y %H:%M"
+msgstr "%A, %e de %B de %Y a las %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:317
+msgid "%A, %B %e, %Y %H:%M:%S"
+msgstr "%A, %e de %B de %Y, a las %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:322
+msgid "%A, %B %e, %Y %l:%M %p"
+msgstr "%A, %e de %B de %Y, a las %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:326
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%A, %B %e, %Y a las %l:%M:%S %p"
+
+#: ../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 "Una persona desconocida"
+
+#: ../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 "Responda en nombre de %s"
+
+#: ../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 "Recibido en nombre de %s"
+
+#: ../plugins/itip-formatter/itip-view.c:376
+#, c-format
+msgid "%s through %s has published the following meeting information:"
+msgstr "%s ha publicado información de reunión a través de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:378
+#, c-format
+msgid "%s has published the following meeting information:"
+msgstr "%s ha publicado la siguiente información de reunión:"
+
+#: ../plugins/itip-formatter/itip-view.c:383
+#, c-format
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s ha delegado la reunión siguiente en usted:"
+
+#: ../plugins/itip-formatter/itip-view.c:386
+#, c-format
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s solicita su presencia en la siguiente reunión a través de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:388
+#, c-format
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s solicita su presencia en la siguiente reunión:"
+
+#: ../plugins/itip-formatter/itip-view.c:394
+#, c-format
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%s desea apuntarse a una reunión existente a través de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:396
+#, c-format
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%s desea apuntarse a una reunión existente:"
+
+#: ../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 desea recibir la última información de la siguiente reunión a través de "
+"%s:"
+
+#: ../plugins/itip-formatter/itip-view.c:402
+#, c-format
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%s desea recibir la última información para la siguiente reunión:"
+
+#: ../plugins/itip-formatter/itip-view.c:406
+#, c-format
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%s ha devuelto la siguiente respuesta a la reunión a través de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:408
+#, c-format
+msgid "%s has sent back the following meeting response:"
+msgstr "%s ha devuelto la siguiente respuesta a la reunión:"
+
+#: ../plugins/itip-formatter/itip-view.c:412
+#, c-format
+msgid "%s through %s has canceled the following meeting:"
+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."
+
+#: ../plugins/itip-formatter/itip-view.c:418
+#, c-format
+msgid "%s through %s has proposed the following meeting changes."
+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."
+
+#: ../plugins/itip-formatter/itip-view.c:424
+#, c-format
+msgid "%s through %s has declined the following meeting changes:"
+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."
+
+#: ../plugins/itip-formatter/itip-view.c:464
+#, c-format
+msgid "%s through %s has published the following task:"
+msgstr "%s ha publicado la siguiente tarea a través de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:466
+#, c-format
+msgid "%s has published the following task:"
+msgstr "%s ha publicado la siguiente tarea:"
+
+#: ../plugins/itip-formatter/itip-view.c:471
+#, c-format
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s solicita la asignación de %s para la siguiente tarea:"
+
+#: ../plugins/itip-formatter/itip-view.c:474
+#, c-format
+msgid "%s through %s has assigned you a task:"
+msgstr "%s le ha asignado una tarea a través de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:476
+#, c-format
+msgid "%s has assigned you a task:"
+msgstr "%s le ha asignado a usted una tarea:"
+
+#: ../plugins/itip-formatter/itip-view.c:482
+#, c-format
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%s desea añadirse a una tarea existente a través de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:484
+#, c-format
+msgid "%s wishes to add to an existing task:"
+msgstr "%s desea añadirse a una tarea existente:"
+
+#: ../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 desea recibir la última información para la siguiente tarea asignada a "
+"través de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:490
+#, c-format
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr ""
+"%s quiere recibir la última información para la siguiente tarea asignada:"
+
+#: ../plugins/itip-formatter/itip-view.c:494
+#, c-format
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr ""
+"%s ha devuelto la siguiente respuesta a la tarea asignada a través de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:496
+#, c-format
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s ha devuelto la siguiente respuesta a la tarea:"
+
+#: ../plugins/itip-formatter/itip-view.c:500
+#, c-format
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s ha cancelado la siguiente asignación de tarea a través de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:502
+#, c-format
+msgid "%s has canceled the following assigned task:"
+msgstr "%s ha cancelado la siguiente tarea asignada:"
+
+#: ../plugins/itip-formatter/itip-view.c:506
+#, c-format
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr ""
+"%s ha propuesto los siguientes cambios en la asignación de tareas a través "
+"de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:508
+#, c-format
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s ha propuesto los siguientes cambios en la asignación de tareas:"
+
+#: ../plugins/itip-formatter/itip-view.c:512
+#, c-format
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s ha rehusado la siguiente tarea asignada a través de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:514
+#, c-format
+msgid "%s has declined the following assigned task:"
+msgstr "%s ha rehusado la siguiente tarea asignada:"
+
+#: ../plugins/itip-formatter/itip-view.c:551
+#, c-format
+msgid "%s through %s has published the following memo:"
+msgstr "%s ha publicado la siguiente nota a través de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:553
+#, c-format
+msgid "%s has published the following memo:"
+msgstr "%s ha publicado la siguiente nota:"
+
+#: ../plugins/itip-formatter/itip-view.c:558
+#, c-format
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%s desea añadir algo a una nota existente a través de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:560
+#, c-format
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s desea añadir algo a una nota existente:"
+
+#: ../plugins/itip-formatter/itip-view.c:564
+#, c-format
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s ha cancelado la siguiente nota compartida a través de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:566
+#, c-format
+msgid "%s has canceled the following shared memo:"
+msgstr "%s ha cancelado la siguiente nota compartida:"
+
+#: ../plugins/itip-formatter/itip-view.c:690
+msgid "All day:"
+msgstr "Todo el día:"
+
+#: ../plugins/itip-formatter/itip-view.c:700
+msgid "Start day:"
+msgstr "Día de inicio:"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:700
+#: ../plugins/itip-formatter/itip-view.c:1062
+msgid "Start time:"
+msgstr "Hora de inicio:"
+
+#: ../plugins/itip-formatter/itip-view.c:712
+msgid "End day:"
+msgstr "Día de fin:"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:712
+#: ../plugins/itip-formatter/itip-view.c:1073
+msgid "End time:"
+msgstr "Hora de fin:"
+
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:848
+msgid "_Open Calendar"
+msgstr "_Abrir calendario"
+
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../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 "_Rechazar"
+
+#: ../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 "A_ceptar"
+
+#: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Decline all"
+msgstr "_Rechazar todo"
+
+#: ../plugins/itip-formatter/itip-view.c:859
+msgid "_Tentative all"
+msgstr "_Provisional todo"
+
+#: ../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 "_Provisional"
+
+#: ../plugins/itip-formatter/itip-view.c:860
+msgid "A_ccept all"
+msgstr "A_ceptar todo"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:871
+msgid "_Send Information"
+msgstr "_Enviar información"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:875
+msgid "_Update Attendee Status"
+msgstr "_Actualizar el estado del participante"
+
+#: ../plugins/itip-formatter/itip-view.c:878
+msgid "_Update"
+msgstr "_Actualizar"
+
+#. Comment
+#: ../plugins/itip-formatter/itip-view.c:1093
+#: ../plugins/itip-formatter/itip-view.c:1147
+msgid "Comment:"
+msgstr "Comentario:"
+
+#: ../plugins/itip-formatter/itip-view.c:1132
+msgid "Send _reply to sender"
+msgstr "_Responder al remitente"
+
+#: ../plugins/itip-formatter/itip-view.c:1162
+msgid "Send _updates to attendees"
+msgstr "Mandar _actualizaciones a los participantes"
+
+#: ../plugins/itip-formatter/itip-view.c:1171
+msgid "_Apply to all instances"
+msgstr "_Aplicar a todas las instancias"
+
+#: ../plugins/itip-formatter/itip-view.c:1180
+msgid "Show time as _free"
+msgstr "Mostrar hora como _libre"
+
+#: ../plugins/itip-formatter/itip-view.c:1183
+msgid "_Preserve my reminder"
+msgstr "Conser_var mi recordatorio"
+
+#. To Translators: This is a check box to inherit a reminder.
+#: ../plugins/itip-formatter/itip-view.c:1189
+msgid "_Inherit reminder"
+msgstr "_Heredar recordatorio"
+
+#: ../plugins/itip-formatter/itip-view.c:1965
+msgid "_Tasks:"
+msgstr "_Tareas:"
+
+#: ../plugins/itip-formatter/itip-view.c:1967
+msgid "_Memos:"
+msgstr "_Notas:"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "Mostrar las partes MIME de texto/calendario en los mensajes."
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Itip Formatter"
+msgstr "Formateador iTip"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr "«{0}» ha delegado la reunión. ¿Quiere añadir al delegado «{1}»?"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+msgid "This meeting has been delegated"
+msgstr "Esta reunión se ha delegado"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr "Esta respuesta no es de un asistente. ¿Desea añadirlo como asistente?"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Beep or play sound file."
+msgstr "Pitar o reproducir un archivo de sonido."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Enable icon in notification area."
+msgstr "Activar el icono en el área de notificación."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr ""
+"Si está activado pitará, de otra manera reproducirá un archivo de sonido "
+"cuando lleguen mensajes nuevos."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Notify new messages for Inbox only."
+msgstr "Notificar nuevos correos sólo para la bandeja de entrada."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+msgid "Play sound when new messages arrive."
+msgstr "Reproducir un sonido cuando llegue correo nuevo."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr ""
+"Reproducir el tema de sonido cuando llega un correo nuevo, si no se está en "
+"el modo pitido."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr ""
+"Mostrar el icono de correo nuevo en el área de notificación cuando llegan "
+"nuevos mensajes."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+msgid "Sound file name to be played."
+msgstr "Nombre del archivo de sonido que reproducir."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr ""
+"Archivo que reproducir cuando llega un mensaje nuevo, si no se debe "
+"reproducir un pitido."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+msgid "Use sound theme"
+msgstr "Usar un tema de sonido"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid "Whether play sound or beep when new messages arrive."
+msgstr ""
+"Indica si se debe reproducir un sonido o pitar cuando llega un mensaje nuevo."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr ""
+"Indica si se deben notificar sólo los mensajes en la carpeta bandeja de "
+"entrada."
+
+#: ../plugins/mail-notification/mail-notification.c:390
+#, c-format
+msgid ""
+"You have received %d new message\n"
+"in %s."
+msgid_plural ""
+"You have received %d new messages\n"
+"in %s."
+msgstr[0] ""
+"Ha recibido %d mensaje nuevo\n"
+"en %s."
+msgstr[1] ""
+"Ha recibido %d mensajes nuevos\n"
+"en %s."
+
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:415
+#, c-format
+msgid "Subject: %s"
+msgstr "Asunto: %s"
+
+#: ../plugins/mail-notification/mail-notification.c:426
+#, 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
+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
+#, c-format
+msgid "Show %s"
+msgstr "Mostrar %s"
+
+#: ../plugins/mail-notification/mail-notification.c:672
+msgid "_Play sound when a new message arrives"
+msgstr "_Reproducir un sonido cuando llegue correo nuevo"
+
+#: ../plugins/mail-notification/mail-notification.c:702
+msgid "_Beep"
+msgstr "_Pitar"
+
+#: ../plugins/mail-notification/mail-notification.c:715
+msgid "Use sound _theme"
+msgstr "Usar un _tema de sonido"
+
+#: ../plugins/mail-notification/mail-notification.c:734
+msgid "Play _file:"
+msgstr "_Reproducir un archivo:"
+
+#: ../plugins/mail-notification/mail-notification.c:743
+msgid "Select sound file"
+msgstr "Seleccione un arhivo de sonido"
+
+#: ../plugins/mail-notification/mail-notification.c:800
+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
+msgid "Show _notification when a new message arrives"
+msgstr "Mostrar _notificaciones cuando llegue correo nuevo"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid "Mail Notification"
+msgstr "Notificación de correo"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Notifies you when new mail messages arrive."
+msgstr "Le notifica cuando llega un mensaje de correo nuevo."
+
+#. 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:239
+#, c-format
+msgid "Created from a mail by %s"
+msgstr "Creado desde un correo de %s"
+
+#: ../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 ""
+"El calendario seleccionado ya contiene el acontecimiento «%s». ¿Quiere "
+"editar el acontecimiento antiguo?"
+
+#: ../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 ""
+"La lista de tareas seleccionada ya contiene la tarea «%s». ¿Quiere editar la "
+"tarea antigua?"
+
+#: ../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 ""
+"La lista de notas seleccionada ya contiene la nota «%s». ¿Quiere editar la "
+"nota antigua?"
+
+#: ../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 ""
+"Ha seleccionado %d correos para convertirlos en eventos. ¿Realmente quiere "
+"añadirlos todos?"
+
+#: ../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 ""
+"Ha seleccionado %d correos para convertirlos en tareas. ¿Realmente quiere "
+"añadirlos todos?"
+
+#: ../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 ""
+"Ha seleccionado %d correos para convertirlos en notas. ¿Realmente quiere "
+"añadirlos todos?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:658
+msgid "Do you wish to continue converting remaining mails?"
+msgstr "¿Quiere continuar convirtiendo los correos restantes?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:733
+msgid "[No Summary]"
+msgstr "[Sin resumen]"
+
+#: ../plugins/mail-to-task/mail-to-task.c:745
+msgid "Invalid object returned from a server"
+msgstr "Un servidor devolvió un objeto no válido"
+
+#: ../plugins/mail-to-task/mail-to-task.c:795
+#, c-format
+msgid "An error occurred during processing: %s"
+msgstr "Ocurrió un error al procesar: %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:820
+#, c-format
+msgid "Cannot open calendar. %s"
+msgstr "No se puede abrir el calendario. %s"
+
+#: ../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 ""
+"El origen seleccionado es de sólo lectura, por ello no se puede crear un "
+"acontecimiento en él. Seleccione otro origen."
+
+#: ../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 ""
+"El origen seleccionado es de sólo lectura, por ello no se puede crear una "
+"tarea en él. Seleccione otro origen."
+
+#: ../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 ""
+"El origen seleccionado es de sólo lectura, por ello no se puede crear una "
+"nota en él. Seleccione otro origen."
+
+#: ../plugins/mail-to-task/mail-to-task.c:1084
+#, c-format
+msgid "Cannot get source list. %s"
+msgstr "No se pudo obtener la lista de origen. %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1147
+msgid "No writable calendar is available."
+msgstr "No hay ningún calendario escribible disponible."
+
+#: ../plugins/mail-to-task/mail-to-task.c:1239
+msgid "Create an _Event"
+msgstr "Crear un _acontecimiento"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1241
+msgid "Create a new event from the selected message"
+msgstr "Crear un acontecimiento nuevo del mensaje seleccionado"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1246
+msgid "Create a Mem_o"
+msgstr "Crear una _nota"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1248
+msgid "Create a new memo from the selected message"
+msgstr "Crear una nota nueva del mensaje seleccionado"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1253
+msgid "Create a _Task"
+msgstr "Crear una _tarea"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1255
+msgid "Create a new task from the selected message"
+msgstr "Crear una tarea nueva del mensaje seleccionado"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1263
+msgid "Create a _Meeting"
+msgstr "Crear una _reunión"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1265
+msgid "Create a new meeting from the selected message"
+msgstr "Crear una reunión nueva del mensaje seleccionado"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "Convertir el mensaje de correo en una tarea."
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:346
+msgid "Get List _Archive"
+msgstr "Obtener _archivador de la lista"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:348
+msgid "Get an archive of the list this message belongs to"
+msgstr "Obtener un archivador de la lista a la que pertenece este mensaje"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:353
+msgid "Get List _Usage Information"
+msgstr "Obtener información de _uso de la lista"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:355
+msgid "Get information about the usage of the list this message belongs to"
+msgstr ""
+"Obtiene información sobre el uso de la lista a la que pertenece este mensaje"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:360
+msgid "Contact List _Owner"
+msgstr "_Responsable de la lista de contactos"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:362
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr ""
+"Contactar con el responsable de la lista de correo a la que pertenece este "
+"mensaje"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
+msgid "_Post Message to List"
+msgstr "_Publicar un mensaje a la lista"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
+msgid "Post a message to the mailing list this message belongs to"
+msgstr ""
+"Publicar un mensaje en la lista de correo a la que pertenece este mensaje"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
+msgid "_Subscribe to List"
+msgstr "_Suscribirse a la lista"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "Suscribirse a la lista de correo a la que pertenece este mensaje"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
+msgid "_Unsubscribe from List"
+msgstr "_Desuscribirse de la lista"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
+msgid "Unsubscribe from the mailing list this message belongs to"
+msgstr "Desuscribirse de la lista de correo a la que pertenece este correo"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
+msgid "Mailing _List"
+msgstr "_Lista de correo"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Mailing List Actions"
+msgstr "Acciones de las listas de correo"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr ""
+"Realizar acciones típicas de listas de correo (suscribirse, desuscribirse…)."
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+msgid "Action not available"
+msgstr "Acción no disponible"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
+msgid ""
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
+msgstr ""
+"Se enviará un mensaje de correo-e a la URL «{0}». Puede enviar el mensaje "
+"automáticamente , o verlo y cambiarlo primero.\n"
+"\n"
+"Debería recibir una respuesta desde la lista de correo al poco tiempo "
+"después de que este mensaje sea enviado."
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
+msgid "Malformed header"
+msgstr "Cabecera mal formada"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+msgid "No e-mail action"
+msgstr "Sin acción de correo-e"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
+msgid "Posting not allowed"
+msgstr "Publicación no permitida"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+"No está permitido publicar en esta lista de correo. Posiblemente esta es una "
+"lista de correo de sólo lectura. contacte con el responsable de la lista "
+"para más detalles."
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+msgid "Send e-mail message to mailing list?"
+msgstr "¿Desea enviar un mensaje a la lista de correo?"
+
+#: ../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"
+"\n"
+"Header: {0}"
+msgstr ""
+"La acción no se pudo realizar. La cabecera para esta acción no contenía "
+"ninguna acción que se pudiese procesar.\n"
+"\n"
+"Cabecera: {0}"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
+msgid ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+msgstr ""
+"La cabecera {0} de este mensaje está mal formada y no se pudo procesar.\n"
+"\n"
+"Cabecera: {1}"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+msgid ""
+"This message does not contain the header information required for this "
+"action."
+msgstr ""
+"Este mensaje no contiene la información de cabecera requerida para esta "
+"acción."
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
+msgid "_Edit message"
+msgstr "_Editar mensaje"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
+msgid "_Send message"
+msgstr "_Enviar mensaje"
+
+#: ../plugins/mark-all-read/mark-all-read.c:42
+msgid "Also mark messages in subfolders?"
+msgstr "¿Marcar también los mensajes en las subcarpetas?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:44
+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 ""
+"¿Quiere marcar los mensajes como leídos sólo en la carpeta actual o en la "
+"capeta actual y todas sus subcarpetas?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:215
+msgid "In Current Folder and _Subfolders"
+msgstr "En la carpeta actual y _subcarpetas"
+
+#: ../plugins/mark-all-read/mark-all-read.c:229
+msgid "In Current _Folder Only"
+msgstr "Sólo en la carpeta _actual"
+
+#: ../plugins/mark-all-read/mark-all-read.c:575
+msgid "Mark Me_ssages as Read"
+msgstr "Marcar los mensajes como _leídos"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+msgid "Mark All Read"
+msgstr "Marcar todo como leído"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+msgid "Mark all messages in a folder as read."
+msgstr "Marcar todos los mensajes en una carpeta como leídos."
+
+#. but then we also need to create our own section frame
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
+msgid "Plain Text Mode"
+msgstr "Modo de texto sin formato"
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Prefer Plain Text"
+msgstr "Preferir texto plano"
+
+#: ../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 "Ver los mensajes de correo en texto plano, incluso si contienen HTML."
+
+#: ../plugins/prefer-plain/prefer-plain.c:251
+msgid "Show HTML if present"
+msgstr "Mostrar HTML si está presente"
+
+#: ../plugins/prefer-plain/prefer-plain.c:252
+msgid "Let Evolution choose the best part to show."
+msgstr "Permitir que Evolution elija la mejor parte para mostrar."
+
+#: ../plugins/prefer-plain/prefer-plain.c:255
+msgid "Show plain text if present"
+msgstr "Mostrar texto plano si está presente"
+
+#: ../plugins/prefer-plain/prefer-plain.c:256
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
+"Mostrar la parte en texto plano si está presente, de otra forma dejar que "
+"Evolution elija la mejor parte para mostrar."
+
+#: ../plugins/prefer-plain/prefer-plain.c:260
+msgid "Only ever show plain text"
+msgstr "Sólo mostrar texto plano"
+
+#: ../plugins/prefer-plain/prefer-plain.c:261
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr ""
+"Mostrar siempre parte en texto plano y, si se solicita, crear adjuntos de "
+"otras partes."
+
+#: ../plugins/prefer-plain/prefer-plain.c:313
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr "Mostrar las partes HTML s_uprimidas como adjuntos"
+
+#: ../plugins/prefer-plain/prefer-plain.c:333
+msgid "HTML _Mode"
+msgstr "_Modo HTML"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+msgid "Import Outlook messages from PST file"
+msgstr "Importar mensajes de Outlook desde un archivo PST"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook PST import"
+msgstr "Importador PST de Outlook"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr "Carpetas personales de Outlook (.pst)"
+
+#: ../plugins/pst-import/pst-importer.c:452
+msgid "_Mail"
+msgstr "Co_rreo"
+
+#: ../plugins/pst-import/pst-importer.c:471
+msgid "Destination folder:"
+msgstr "Carpeta de destino:"
+
+#: ../plugins/pst-import/pst-importer.c:478
+msgid "_Address Book"
+msgstr "Libreta de _direcciones"
+
+#: ../plugins/pst-import/pst-importer.c:482
+msgid "A_ppointments"
+msgstr "Ci_tas"
+
+#: ../plugins/pst-import/pst-importer.c:486 ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tareas"
+
+#: ../plugins/pst-import/pst-importer.c:490
+msgid "_Journal entries"
+msgstr "Entradas del dia_rio"
+
+#: ../plugins/pst-import/pst-importer.c:600
+msgid "Importing Outlook data"
+msgstr "_Importando datos de Outlook"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../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 "Publicación de calendarios"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+msgid "Locations"
+msgstr "Lugares"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+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
+#, c-format
+msgid "Could not open %s:"
+msgstr "No se pudo abrir «%s»:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:218
+#, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "No se ha podido abrir «%s»: Error desconocido"
+
+#: ../plugins/publish-calendar/publish-calendar.c:238
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr "Hubo un error al publicar en %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:240
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr "La publicación en %s finalizó correctamente"
+
+#: ../plugins/publish-calendar/publish-calendar.c:288
+#, c-format
+msgid "Mount of %s failed:"
+msgstr "Falló al montar %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:619
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "E_nable"
+msgstr "_Activar"
+
+#: ../plugins/publish-calendar/publish-calendar.c:767
+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
+msgid "Could not create publish thread."
+msgstr "No se pudo publicar el hilo de publicación."
+
+#: ../plugins/publish-calendar/publish-calendar.c:1107
+msgid "_Publish Calendar Information"
+msgstr "_Publicar información del calendario"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Custom Location"
+msgstr "Ubicación personalizado"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+msgid "Daily"
+msgstr "Diariamente"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+msgid "FTP (with login)"
+msgstr "FTP (con registro)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+msgid "Manual (via Actions menu)"
+msgstr "Manual (por medio del menú Acciones)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
+msgid "P_ort:"
+msgstr "_Puerto:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+msgid "Public FTP"
+msgstr "FTP público"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
+msgid "Publishing Location"
+msgstr "Lugar de publicación"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
+msgid "Publishing _Frequency:"
+msgstr "_Frecuencia de publicación:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Secure FTP (SSH)"
+msgstr "FTP seguro (SSH)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "Secure WebDAV (HTTPS)"
+msgstr "WebDAV serguro (HTTPS)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:17
+msgid "Service _type:"
+msgstr "_Tipo de servicio:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+msgid "Sources"
+msgstr "Orígenes"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:19
+msgid "Time _duration:"
+msgstr "_Duración:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (HTTP)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Weekly"
+msgstr "Semanalmente"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+msgid "Windows share"
+msgstr "Compartición Windows"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+msgid "_File:"
+msgstr "_Archivo:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
+msgid "_Password:"
+msgstr "_Contraseña:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+msgid "_Publish as:"
+msgstr "_Publicar como:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+msgid "_Remember password"
+msgstr "_Recordar contraseña"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
+msgid "_Username:"
+msgstr "_Usuario:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+msgid "iCal"
+msgstr "iCal"
+
+#: ../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 ""
+"No se pudo publicar el calendario: El «backend» del calendario ya no existe."
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:518
+msgid "New Location"
+msgstr "Ubicación nueva"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:520
+msgid "Edit Location"
+msgstr "Editar ubicación"
+
+#. 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:168
+msgid "%F %T"
+msgstr "%F %T"
+
+#: ../plugins/save-calendar/csv-format.c:382
+msgid "UID"
+msgstr "UID"
+
+#: ../plugins/save-calendar/csv-format.c:384
+msgid "Description List"
+msgstr "Lista de descripción"
+
+#: ../plugins/save-calendar/csv-format.c:385
+msgid "Categories List"
+msgstr "Lista de categorías"
+
+#: ../plugins/save-calendar/csv-format.c:386
+msgid "Comment List"
+msgstr "Lista de comentarios"
+
+#: ../plugins/save-calendar/csv-format.c:389
+msgid "Contact List"
+msgstr "Lista de contactos"
+
+#: ../plugins/save-calendar/csv-format.c:390
+msgid "Start"
+msgstr "Empieza"
+
+#: ../plugins/save-calendar/csv-format.c:391
+msgid "End"
+msgstr "Termina"
+
+#: ../plugins/save-calendar/csv-format.c:392
+msgid "Due"
+msgstr "Vence"
+
+#: ../plugins/save-calendar/csv-format.c:393
+msgid "percent Done"
+msgstr "porcentaje terminado"
+
+#: ../plugins/save-calendar/csv-format.c:395
+msgid "URL"
+msgstr "URL"
+
+#: ../plugins/save-calendar/csv-format.c:396
+msgid "Attendees List"
+msgstr "Lista de participantes"
+
+#: ../plugins/save-calendar/csv-format.c:398
+msgid "Modified"
+msgstr "Modificado"
+
+#: ../plugins/save-calendar/csv-format.c:573
+msgid "A_dvanced options for the CSV format"
+msgstr "Opciones avan_zadas para el formato CSV"
+
+#: ../plugins/save-calendar/csv-format.c:581
+msgid "Prepend a _header"
+msgstr "Anteponer una ca_becera"
+
+#: ../plugins/save-calendar/csv-format.c:590
+msgid "_Value delimiter:"
+msgstr "Delimitador de _valor:"
+
+#: ../plugins/save-calendar/csv-format.c:601
+msgid "_Record delimiter:"
+msgstr "Delimitador de _registro:"
+
+#: ../plugins/save-calendar/csv-format.c:612
+msgid "_Encapsulate values with:"
+msgstr "_Encapsular valores con:"
+
+#: ../plugins/save-calendar/csv-format.c:638
+msgid "Comma separated values (.csv)"
+msgstr "Valores separados por comas (.csv)"
+
+#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:225
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
+msgid "Save Selected"
+msgstr "Guardar seleccionados"
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+msgid "Save a calendar or task list to disk."
+msgstr "Guardar un calendario o una lista de tareas al disco."
+
+#.
+#. * Translator: the %FT%T is the thirth argument for a strftime function.
+#. * It lets you define the formatting of the date in the rdf-file.
+#. * Also check out http://www.w3.org/2002/12/cal/tzd
+#. *
+#: ../plugins/save-calendar/rdf-format.c:156
+msgid "%FT%T"
+msgstr "%FT%T"
+
+#: ../plugins/save-calendar/rdf-format.c:389
+msgid "RDF (.rdf)"
+msgstr "RDF (.rdf)"
+
+#: ../plugins/save-calendar/save-calendar.c:127
+msgid "_Format:"
+msgstr "_Formato:"
+
+#: ../plugins/save-calendar/save-calendar.c:189
+msgid "Select destination file"
+msgstr "Seleccione el archivo de destino"
+
+#: ../plugins/save-calendar/save-calendar.c:344
+msgid "Save the selected calendar to disk"
+msgstr "Guardar el calendario seleccionado al disco"
+
+#: ../plugins/save-calendar/save-calendar.c:375
+msgid "Save the selected memo list to disk"
+msgstr "Guardar la lista de notas seleccionada al disco"
+
+#: ../plugins/save-calendar/save-calendar.c:406
+msgid "Save the selected task list to disk"
+msgstr "Guardar la lista de tareas seleccionada al disco"
+
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Lista de pares de palabras clave y valores para que el complemento de "
+"plantillas sustituya en el cuerpo del mensaje."
+
+#: ../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."
+msgstr ""
+"Borradores basados en un complemento de plantilla. Puede usar variables como "
+"$ORIG[subject], $ORIG[from], $ORIG[to] or $ORIG[body], que se reemplazarán "
+"con valores del correo-e al que está respondiendo."
+
+#: ../plugins/templates/templates.c:1094
+msgid "No Title"
+msgstr "Sin título"
+
+#: ../plugins/templates/templates.c:1195
+msgid "Save as _Template"
+msgstr "Guardar como plan_tilla"
+
+#: ../plugins/templates/templates.c:1197
+msgid "Save as Template"
+msgstr "Guardar como plantilla"
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr ""
+"Decodificar adjuntos TNEF (.dat de correo de Windows) de Microsoft Outlook."
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "TNEF Decoder"
+msgstr "Decodificador TNEF"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+msgid "Inline vCards"
+msgstr "vCards en línea"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr "Mostrar vCards directamente en los mensajes de correo."
+
+#: ../plugins/vcard-inline/vcard-inline.c:208
+#: ../plugins/vcard-inline/vcard-inline.c:293
+msgid "Show Full vCard"
+msgstr "Mostrar vCard completa"
+
+#: ../plugins/vcard-inline/vcard-inline.c:211
+msgid "Show Compact vCard"
+msgstr "Mostrar vCard compacta"
+
+#: ../plugins/vcard-inline/vcard-inline.c:272
+msgid "There is one other contact."
+msgstr "Hay otro contacto más."
+
+#: ../plugins/vcard-inline/vcard-inline.c:281
+#, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "Hay %d contacto más."
+msgstr[1] "Hay otros %d contactos."
+
+#: ../plugins/vcard-inline/vcard-inline.c:302
+msgid "Save in Address Book"
+msgstr "Guardar en la libreta de direcciones"
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "Add WebDAV contacts to Evolution."
+msgstr "Añadir contactos WebDAV a Evolution."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "Contactos WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:283
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
+msgstr "_Evitar IfMatch (necesario en Apache < 2.2.8)"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:1
+msgid "Authenticate proxy server connections"
+msgstr "Autenticar las conexiones del servidor proxy"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:2
+msgid "Automatic proxy configuration URL"
+msgstr "URL para la configuración automática del proxy"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Configuration version"
+msgstr "Versión de la configuración"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:4
+msgid "Default sidebar width"
+msgstr "Anchura predeterminada de la barra lateral"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:5
+msgid "Default window X coordinate"
+msgstr "Coordenada X predeterminada de la ventana"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+msgid "Default window Y coordinate"
+msgstr "Coordenada Y predeterminada de la ventana"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
+msgid "Default window height"
+msgstr "Altura predeterminada de la ventana"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid "Default window state"
+msgstr "Estado predeterminado de la ventana"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "Default window width"
+msgstr "Anchura predeterminada de la ventana"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "Enable express mode"
+msgstr "Activar modo exprés"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+"Activa los ajustes del proxy al acceder a HTTP/Secure HTTP en Internet."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "Flag that enables a much simplified user interface."
+msgstr "Opción que activa una interfaz mucho más simple."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "HTTP proxy host name"
+msgstr "Nombre del servidor proxy HTtP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14
+msgid "HTTP proxy password"
+msgstr "Contraseña del proxy HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:15
+msgid "HTTP proxy port"
+msgstr "Puerto del proxy HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid "HTTP proxy username"
+msgstr "Usuario del proxy HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Id o alias del componente que se mostrará al iniciar."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
+"Si está activada entonces las conexiones con el proxy requerirán "
+"autenticación. El usuario se obtiene de la clave de GConf \"/apps/evolution/"
+"shell/network_config/authentication_user\" y la contraseña de gnome-keyring "
+"o bien del archivo de contrasñeas ~/.gnome2_private/Evolution."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+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."
+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
+msgid "Last upgraded configuration version"
+msgstr "Última versión de la configuración actualizada"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+>>>>>>> master
 "Lista de rutas a las carpetas que se sincronizarán al disco para usar "
 "desconectado"
 
@@ -19240,11 +34678,19 @@ msgstr "Estilo de los botones de ventana"
 msgid "Window buttons are visible"
 msgstr "Los botones de la ventana son visibles"
 
+<<<<<<< HEAD
 #: ../shell/e-shell-content.c:729 ../shell/e-shell-content.c:730
 msgid "Searches"
 msgstr "Búsquedas"
 
 #: ../shell/e-shell-content.c:773
+=======
+#: ../shell/e-shell-content.c:728 ../shell/e-shell-content.c:729
+msgid "Searches"
+msgstr "Búsquedas"
+
+#: ../shell/e-shell-content.c:772
+>>>>>>> master
 msgid "Save Search"
 msgstr "Guardar búsqueda"
 
@@ -19277,7 +34723,11 @@ msgstr "vCard (.vcf)"
 msgid "All Files (*)"
 msgstr "Todos los archivos (*)"
 
+<<<<<<< HEAD
 #: ../shell/e-shell-view.c:295
+=======
+#: ../shell/e-shell-view.c:296
+>>>>>>> master
 msgid "Saving user interface state"
 msgstr "Guardando el estado de la interfaz de usuario"
 
@@ -19556,12 +35006,20 @@ msgstr "La vista actual es una vista personalizada"
 msgid "Change the page settings for your current printer"
 msgstr "Cambiar la configuración de página para la impresora actual"
 
+<<<<<<< HEAD
 #: ../shell/e-shell-window-actions.c:2189
+=======
+#: ../shell/e-shell-window-actions.c:2194
+>>>>>>> master
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
+<<<<<<< HEAD
 #: ../shell/e-shell-window-actions.c:2404
+=======
+#: ../shell/e-shell-window-actions.c:2414
+>>>>>>> master
 msgid "Execute these search parameters"
 msgstr "Ejecutar estos parámetros de búsqueda"
 
@@ -19575,6 +35033,7 @@ msgstr "%s - Evolution"
 msgid "New"
 msgstr "Nuevo"
 
+<<<<<<< HEAD
 #: ../shell/e-shell.c:361
 msgid "Preparing to go offline..."
 msgstr "Preparándose para desconectarse…"
@@ -19584,6 +35043,17 @@ msgid "Preparing to go online..."
 msgstr "Preparándose para conectarse…"
 
 #: ../shell/e-shell.c:476
+=======
+#: ../shell/e-shell.c:365
+msgid "Preparing to go offline..."
+msgstr "Preparándose para desconectarse…"
+
+#: ../shell/e-shell.c:418
+msgid "Preparing to go online..."
+msgstr "Preparándose para conectarse…"
+
+#: ../shell/e-shell.c:480
+>>>>>>> master
 msgid "Preparing to quit..."
 msgstr "Preparándose para salir…"
 
@@ -19686,11 +35156,19 @@ msgstr "Importar URI o nombres de archivos proporcionados como argumentos."
 msgid "Request a running Evolution process to quit"
 msgstr "Solicitar que el proceso de ejecución de Evolution finalice"
 
+<<<<<<< HEAD
 #: ../shell/main.c:511 ../shell/main.c:519
 msgid "- The Evolution PIM and Email Client"
 msgstr "El cliente de correo-e y GIP Evolution"
 
 #: ../shell/main.c:582
+=======
+#: ../shell/main.c:512 ../shell/main.c:520
+msgid "- The Evolution PIM and Email Client"
+msgstr "El cliente de correo-e y GIP Evolution"
+
+#: ../shell/main.c:583
+>>>>>>> master
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19699,7 +35177,11 @@ msgstr ""
 "%s: --online y --offline no se pueden usar a la vez.\n"
 "  Ejecute «%s --help» para obtener más información\n"
 
+<<<<<<< HEAD
 #: ../shell/main.c:588
+=======
+#: ../shell/main.c:589
+>>>>>>> master
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -19707,6 +35189,7 @@ msgid ""
 msgstr ""
 "%s: --force-online y --offline no se pueden usar a la vez.\n"
 "  Ejecute «%s --help» para obtener más información\n"
+<<<<<<< HEAD
 
 #: ../shell/shell.error.xml.h:1
 msgid "Are you sure you want to forget all remembered passwords?"
@@ -21314,6 +36797,1619 @@ msgstr "Mostrar campo en la _vista"
 msgid "Sort"
 msgstr "Ordenar"
 
+=======
+
+#: ../shell/shell.error.xml.h:1
+msgid "Are you sure you want to forget all remembered passwords?"
+msgstr "¿Seguro que quiere olvidar todas las contraseñas almacenadas?"
+
+#: ../shell/shell.error.xml.h:2
+msgid "Cannot upgrade directly from version {0}"
+msgstr "No se puede actualizar directamente desde la versión {0}"
+
+#: ../shell/shell.error.xml.h:3
+msgid "Continue Anyway"
+msgstr "Continuar de todas formas"
+
+#: ../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."
+msgstr ""
+"Evolution ya no soporta actualizar directamente desde la versión {0}. No "
+"obstante, como solución puede intentar actualizar primero a Evolution 2 y "
+"después a Evolution 3."
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed."
+msgstr ""
+"Olvidar sus contraseñas eliminará todas las contraseñas recordadas. Se le "
+"volverá a preguntar la próxima vez que se necesiten."
+
+#: ../shell/shell.error.xml.h:7
+msgid "Quit Now"
+msgstr "Salir ahora"
+
+#: ../shell/shell.error.xml.h:8
+msgid "Upgrade from previous version failed:"
+msgstr "Falló la actualización desde la versión anterior:"
+
+#: ../shell/shell.error.xml.h:9
+msgid "_Forget"
+msgstr "_Olvidar"
+
+#: ../shell/shell.error.xml.h:10
+msgid ""
+"{0}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+"{0}\n"
+"\n"
+"Si elige continuar, quizá no tenga acceso a algunos de sus datos antiguos.\n"
+
+#: ../shell/test/e-test-shell-backend.c:56
+msgctxt "New"
+msgid "_Test Item"
+msgstr "_Probar elemento"
+
+#: ../shell/test/e-test-shell-backend.c:58
+msgid "Create a new test item"
+msgstr "Crea una elemento de prueba nuevo"
+
+#: ../shell/test/e-test-shell-backend.c:66
+msgctxt "New"
+msgid "Test _Source"
+msgstr "Probar _recurso"
+
+#: ../shell/test/e-test-shell-backend.c:68
+msgid "Create a new test source"
+msgstr "Crea una recurso de prueba nuevo"
+
+#: ../smclient/eggdesktopfile.c:166
+#, c-format
+msgid "File is not a valid .desktop file"
+msgstr "El archivo no es un archivo .desktop válido"
+
+#: ../smclient/eggdesktopfile.c:189
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr "No se reconoce la versión «%s» del archivo desktop"
+
+#: ../smclient/eggdesktopfile.c:959
+#, c-format
+msgid "Starting %s"
+msgstr "Iniciando %s"
+
+#: ../smclient/eggdesktopfile.c:1102
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr "La aplicación no acepta documentos en la línea de comandos"
+
+#: ../smclient/eggdesktopfile.c:1170
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr "Opción de lanzamiento no reconocida: %d"
+
+#: ../smclient/eggdesktopfile.c:1370
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr ""
+"No se pueden pasar los URI de documentos a entradas de escritorio «Type=Link»"
+
+#: ../smclient/eggdesktopfile.c:1391
+#, c-format
+msgid "Not a launchable item"
+msgstr "No es un elemento lanzable"
+
+#: ../smclient/eggsmclient.c:226
+msgid "Disable connection to session manager"
+msgstr "Desactivar la conexión con el gestor de sesiones"
+
+#: ../smclient/eggsmclient.c:229
+msgid "Specify file containing saved configuration"
+msgstr "Especificar el archivo que contiene la configuración guardada"
+
+#: ../smclient/eggsmclient.c:229
+msgid "FILE"
+msgstr "ARCHIVO"
+
+#: ../smclient/eggsmclient.c:232
+msgid "Specify session management ID"
+msgstr "Especificar el ID de gestión de la sesión"
+
+#: ../smclient/eggsmclient.c:232
+msgid "ID"
+msgstr "ID"
+
+#: ../smclient/eggsmclient.c:253
+msgid "Session management options:"
+msgstr "Opciones de gestión de la sesión:"
+
+#: ../smclient/eggsmclient.c:254
+msgid "Show session management options"
+msgstr "Mostrar las opciones de gestión de la sesión"
+
+#: ../smime/gui/ca-trust-dialog.c:107
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+"El certificado «%s» es un certificado de AC.\n"
+"\n"
+"Edite la configuración de confianza:"
+
+#: ../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 ""
+"Debido a que usted confía en la autoridad de certificación que emitió este "
+"certificado, entonces confía en la autenticidad de este certificado a no ser "
+"que se indique otra cosa aquí"
+
+#: ../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 ""
+"Debido a que usted no confía en la autoridad de certificación que emitió "
+"este certificado, entonces usted no confía en la autenticidad de este "
+"certificado a no ser que se indique otra cosa aquí"
+
+#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+msgid "Certificate Name"
+msgstr "Nombre del certificado"
+
+#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+msgid "Issued To Organization"
+msgstr "Expedido a la organización:"
+
+#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+msgid "Issued To Organizational Unit"
+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
+msgid "Serial Number"
+msgstr "Número de serie"
+
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:115
+msgid "Purposes"
+msgstr "Propósito"
+
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+msgid "Issued By"
+msgstr "Emitido por"
+
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:117
+msgid "Issued By Organization"
+msgstr "Expedido por la organización"
+
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118
+msgid "Issued By Organizational Unit"
+msgstr "Expedido por la unidad organizativa (OU)"
+
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
+msgid "Issued"
+msgstr "Emitido"
+
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120
+msgid "Expires"
+msgstr "Caduca"
+
+#: ../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 "Huella SHA1"
+
+#: ../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 "Huella MD5"
+
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
+msgid "Email Address"
+msgstr "Dirección de correo-e"
+
+#: ../smime/gui/certificate-manager.c:575
+msgid "Select a certificate to import..."
+msgstr "Seleccione un certificado para importar…"
+
+#: ../smime/gui/certificate-manager.c:588
+msgid "All files"
+msgstr "Todos los archivos"
+
+#: ../smime/gui/certificate-manager.c:623
+msgid "Failed to import certificate"
+msgstr "Falló al importar el certificado"
+
+#: ../smime/gui/certificate-manager.c:991
+msgid "All PKCS12 files"
+msgstr "Todos los archivos PKCS12"
+
+#: ../smime/gui/certificate-manager.c:1009
+msgid "All email certificate files"
+msgstr "Todos los archivos de certificado de correos-e"
+
+#: ../smime/gui/certificate-manager.c:1027
+msgid "All CA certificate files"
+msgstr "Todos los archivos de certificados AC"
+
+#: ../smime/gui/certificate-viewer.c:345
+#, c-format
+msgid "Certificate Viewer: %s"
+msgstr "Visor de certificados: %s"
+
+#: ../smime/gui/component.c:50
+#, c-format
+msgid "Enter the password for '%s'"
+msgstr "Introducir la contraseña para «%s»"
+
+#. we're setting the password initially
+#: ../smime/gui/component.c:76
+msgid "Enter new password for certificate database"
+msgstr "Introduzca una contraseña nueva para la base de datos de certificados"
+
+#: ../smime/gui/component.c:79
+msgid "Enter new password"
+msgstr "Introduzca la contraseña nueva"
+
+#. FIXME: add serial no, validity date, uses
+#: ../smime/gui/e-cert-selector.c:118
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+"Emitido a:\n"
+"  Asunto: %s\n"
+
+#: ../smime/gui/e-cert-selector.c:119
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+"Emitido por:\n"
+"  Asunto: %s\n"
+
+#: ../smime/gui/e-cert-selector.c:172
+msgid "Select certificate"
+msgstr "Seleccione el certificado"
+
+#: ../smime/gui/smime-ui.ui.h:1
+msgid "<Not Part of Certificate>"
+msgstr "<No es parte del certificado>"
+
+#: ../smime/gui/smime-ui.ui.h:2
+msgid "Authorities"
+msgstr "Autoridades"
+
+#: ../smime/gui/smime-ui.ui.h:3
+msgid "Backup _All"
+msgstr "Respaldar _todo"
+
+#: ../smime/gui/smime-ui.ui.h:4
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+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
+msgid "Certificate"
+msgstr "Certificado"
+
+#: ../smime/gui/smime-ui.ui.h:6
+msgid "Certificate Authority Trust"
+msgstr "Confianza en la autoridad certificadora"
+
+#: ../smime/gui/smime-ui.ui.h:7
+msgid "Certificate Fields"
+msgstr "Campos del certificado"
+
+#: ../smime/gui/smime-ui.ui.h:8
+msgid "Certificate Hierarchy"
+msgstr "Jerarquía del certificado"
+
+#: ../smime/gui/smime-ui.ui.h:9
+msgid "Certificate details"
+msgstr "Detalles del certificado"
+
+#: ../smime/gui/smime-ui.ui.h:10
+msgid "Certificates Table"
+msgstr "Tabla de certificados"
+
+#: ../smime/gui/smime-ui.ui.h:11
+msgid "Common Name (CN)"
+msgstr "Nombre común (CN)"
+
+#: ../smime/gui/smime-ui.ui.h:12
+msgid "Contact Certificates"
+msgstr "Certificados de contactos"
+
+#: ../smime/gui/smime-ui.ui.h:14
+msgid "Do not trust the authenticity of this certificate"
+msgstr "No confiar en la autenticidad de este certificado"
+
+#: ../smime/gui/smime-ui.ui.h:15
+msgid "Email Certificate Trust Settings"
+msgstr "Ajustes de confianza de certificados de correo-e"
+
+#: ../smime/gui/smime-ui.ui.h:16
+msgid "Email Recipient Certificate"
+msgstr "Certificado del destinatario del correo-e"
+
+#: ../smime/gui/smime-ui.ui.h:17
+msgid "Email Signer Certificate"
+msgstr "Certificado del firmante del correo-e"
+
+#: ../smime/gui/smime-ui.ui.h:18
+msgid "Expires On"
+msgstr "Caduca el"
+
+#: ../smime/gui/smime-ui.ui.h:19
+msgid "Field Value"
+msgstr "Valor del campo"
+
+#: ../smime/gui/smime-ui.ui.h:20
+msgid "Fingerprints"
+msgstr "Huellas"
+
+#: ../smime/gui/smime-ui.ui.h:24
+msgid "Issued On"
+msgstr "Emitido el"
+
+#: ../smime/gui/smime-ui.ui.h:25
+msgid "Issued To"
+msgstr "Emitido a"
+
+#: ../smime/gui/smime-ui.ui.h:27
+msgid "Organization (O)"
+msgstr "Organización (O)"
+
+#: ../smime/gui/smime-ui.ui.h:28
+msgid "Organizational Unit (OU)"
+msgstr "Unidad organizativa (OU)"
+
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:829
+msgid "SSL Client Certificate"
+msgstr "Certificado de cliente SSL"
+
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:833
+msgid "SSL Server Certificate"
+msgstr "Certificado de servidor SSL"
+
+#: ../smime/gui/smime-ui.ui.h:33
+msgid "This certificate has been verified for the following uses:"
+msgstr "Este certificado ha sido verificado para los siguientes usos:"
+
+#: ../smime/gui/smime-ui.ui.h:34
+msgid "Trust the authenticity of this certificate"
+msgstr "Confiar en la autenticidad de este certificado"
+
+#: ../smime/gui/smime-ui.ui.h:35
+msgid "Trust this CA to identify email users."
+msgstr "Confiar en esta AC para identificar a usuarios de correo-e."
+
+#: ../smime/gui/smime-ui.ui.h:36
+msgid "Trust this CA to identify software developers."
+msgstr "Confiar en esta AC para identificar a desarrolladores de software."
+
+#: ../smime/gui/smime-ui.ui.h:37
+msgid "Trust this CA to identify websites."
+msgstr "Confiar en esta AC para identificar sitios web."
+
+#: ../smime/gui/smime-ui.ui.h:38
+msgid "Validity"
+msgstr "Validez"
+
+#: ../smime/gui/smime-ui.ui.h:39
+msgid "You have certificates from these organizations that identify you:"
+msgstr "Tiene certificados de estas organizaciones que le identifican:"
+
+#: ../smime/gui/smime-ui.ui.h:40
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
+msgstr ""
+"Tiene archivados los certificados que identifican a estas autoridades de "
+"certificación:"
+
+#: ../smime/gui/smime-ui.ui.h:41
+msgid "You have certificates on file that identify these people:"
+msgstr "Tiene archivados los certificados que identifican a estas personas:"
+
+#: ../smime/gui/smime-ui.ui.h:42
+msgid "Your Certificates"
+msgstr "Sus certificados"
+
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:44
+msgid "_Backup"
+msgstr "_Respaldo"
+
+#: ../smime/gui/smime-ui.ui.h:45
+msgid "_Edit CA Trust"
+msgstr "_Editar confianza en la AC"
+
+#: ../smime/lib/e-cert-db.c:912
+msgid "Certificate already exists"
+msgstr "El certificado ya existe"
+
+#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
+msgid "%d/%m/%Y"
+msgstr "%e/%m/%Y"
+
+#. x509 certificate usage types
+#: ../smime/lib/e-cert.c:417
+msgid "Sign"
+msgstr "Firma"
+
+#: ../smime/lib/e-cert.c:418
+msgid "Encrypt"
+msgstr "Cifrado"
+
+#: ../smime/lib/e-cert.c:530
+msgid "Version"
+msgstr "Versión"
+
+#: ../smime/lib/e-cert.c:545
+msgid "Version 1"
+msgstr "Versión 1"
+
+#: ../smime/lib/e-cert.c:548
+msgid "Version 2"
+msgstr "Versión 2"
+
+#: ../smime/lib/e-cert.c:551
+msgid "Version 3"
+msgstr "Versión 3"
+
+#: ../smime/lib/e-cert.c:634
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr "PKCS #1 MD2 con cifrado RSA"
+
+#: ../smime/lib/e-cert.c:637
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr "PKCS #1 MD5 con cifrado RSA"
+
+#: ../smime/lib/e-cert.c:640
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr "PKCS #1 SHA-1 con cifrado RSA"
+
+#: ../smime/lib/e-cert.c:643
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-256 con cifrado RSA"
+
+#: ../smime/lib/e-cert.c:646
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-384 con cifrado RSA"
+
+#: ../smime/lib/e-cert.c:649
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-512 con cifrado RSA"
+
+#: ../smime/lib/e-cert.c:676
+msgid "PKCS #1 RSA Encryption"
+msgstr "PKCS #1 cifrado RSA"
+
+#: ../smime/lib/e-cert.c:679
+msgid "Certificate Key Usage"
+msgstr "Uso de la clave del certificado"
+
+#: ../smime/lib/e-cert.c:682
+msgid "Netscape Certificate Type"
+msgstr "Tipo de certificado Netscape"
+
+#: ../smime/lib/e-cert.c:685
+msgid "Certificate Authority Key Identifier"
+msgstr "Identificador de la clave de la autoridad del certificado"
+
+#: ../smime/lib/e-cert.c:697
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr "Identificador del objeto (%s)"
+
+#: ../smime/lib/e-cert.c:749
+msgid "Algorithm Identifier"
+msgstr "Identificador del algoritmo"
+
+#: ../smime/lib/e-cert.c:757
+msgid "Algorithm Parameters"
+msgstr "Parámetros del algoritmo"
+
+#: ../smime/lib/e-cert.c:779
+msgid "Subject Public Key Info"
+msgstr "Información del propósito de la clave pública"
+
+#: ../smime/lib/e-cert.c:784
+msgid "Subject Public Key Algorithm"
+msgstr "Propósito del algoritmo de clave pública"
+
+#: ../smime/lib/e-cert.c:799
+msgid "Subject's Public Key"
+msgstr "Clave pública del propósito"
+
+#: ../smime/lib/e-cert.c:820 ../smime/lib/e-cert.c:870
+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
+msgid "Object Signer"
+msgstr "Firmante del objeto"
+
+#: ../smime/lib/e-cert.c:845
+msgid "SSL Certificate Authority"
+msgstr "Autoridad certificadora SSL"
+
+#: ../smime/lib/e-cert.c:849
+msgid "Email Certificate Authority"
+msgstr "Autoridad certificadora de correo"
+
+#: ../smime/lib/e-cert.c:878
+msgid "Signing"
+msgstr "Firma"
+
+#: ../smime/lib/e-cert.c:882
+msgid "Non-repudiation"
+msgstr "No repudio"
+
+#: ../smime/lib/e-cert.c:886
+msgid "Key Encipherment"
+msgstr "Cifrado de la clave"
+
+#: ../smime/lib/e-cert.c:890
+msgid "Data Encipherment"
+msgstr "Cifrado de datos"
+
+#: ../smime/lib/e-cert.c:894
+msgid "Key Agreement"
+msgstr "Acuerdo de claves"
+
+#: ../smime/lib/e-cert.c:898
+msgid "Certificate Signer"
+msgstr "Firmante del certificado"
+
+#: ../smime/lib/e-cert.c:902
+msgid "CRL Signer"
+msgstr "Firmante de la LRC"
+
+#: ../smime/lib/e-cert.c:951
+msgid "Critical"
+msgstr "Crítico"
+
+#: ../smime/lib/e-cert.c:953 ../smime/lib/e-cert.c:956
+msgid "Not Critical"
+msgstr "No crítico"
+
+#: ../smime/lib/e-cert.c:977
+msgid "Extensions"
+msgstr "Extensiones"
+
+#. Translators: This string is used in Certificate
+#. * details for fields like Issuer or Subject, which
+#. * shows the field name on the left and its respective
+#. * value on the right, both as stored in the
+#. * certificate itself.  You probably do not need to
+#. * 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
+#, c-format
+msgid "%s = %s"
+msgstr "%s = %s"
+
+#: ../smime/lib/e-cert.c:1111 ../smime/lib/e-cert.c:1234
+msgid "Certificate Signature Algorithm"
+msgstr "Algoritmo de firma del certificado"
+
+#: ../smime/lib/e-cert.c:1120
+msgid "Issuer"
+msgstr "Emisor"
+
+#: ../smime/lib/e-cert.c:1175
+msgid "Issuer Unique ID"
+msgstr "ID único del emisor"
+
+#: ../smime/lib/e-cert.c:1194
+msgid "Subject Unique ID"
+msgstr "ID único del propósito"
+
+#: ../smime/lib/e-cert.c:1240
+msgid "Certificate Signature Value"
+msgstr "Valor de la firma del certificado"
+
+#: ../smime/lib/e-pkcs12.c:257
+msgid "PKCS12 File Password"
+msgstr "Contraseña del archivo PKCS12"
+
+#: ../smime/lib/e-pkcs12.c:258
+msgid "Enter password for PKCS12 file:"
+msgstr "Introduzca la contraseña para el archivo PKCS12:"
+
+#: ../smime/lib/e-pkcs12.c:364
+msgid "Imported Certificate"
+msgstr "Certificado importado"
+
+#: ../views/addressbook/galview.xml.h:1
+msgid "By _Company"
+msgstr "Por _compañía"
+
+#: ../views/addressbook/galview.xml.h:2
+msgid "_Address Cards"
+msgstr "_Tarjetas de visita"
+
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "Vista de _lista"
+
+#: ../views/calendar/galview.xml.h:1
+msgid "W_eek View"
+msgstr "Vista _semanal"
+
+#: ../views/calendar/galview.xml.h:2
+msgid "_Day View"
+msgstr "Vista _diaria"
+
+#: ../views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr "Vista _mensual"
+
+#: ../views/calendar/galview.xml.h:5
+msgid "_Work Week View"
+msgstr "Vista de la semana _laboral"
+
+#: ../views/mail/galview.xml.h:1
+msgid "As Sent Folder for Wi_de View"
+msgstr "Como carpeta de enviados para la vista anc_ha"
+
+#: ../views/mail/galview.xml.h:2
+msgid "As _Sent Folder"
+msgstr "Como carpeta de _enviados"
+
+#: ../views/mail/galview.xml.h:3
+msgid "By S_tatus"
+msgstr "Por es_tado"
+
+#: ../views/mail/galview.xml.h:4
+msgid "By Se_nder"
+msgstr "Por rem_itente"
+
+#: ../views/mail/galview.xml.h:5
+msgid "By Su_bject"
+msgstr "Por _asunto"
+
+#: ../views/mail/galview.xml.h:6
+msgid "By _Follow Up Flag"
+msgstr "Por marca de _seguimiento"
+
+#: ../views/mail/galview.xml.h:7
+msgid "For _Wide View"
+msgstr "Para la vista a_ncha"
+
+#: ../views/mail/galview.xml.h:8
+msgid "_Messages"
+msgstr "_Mensajes"
+
+#: ../views/memos/galview.xml.h:1
+msgid "_Memos"
+msgstr "_Notas"
+
+#: ../views/tasks/galview.xml.h:1
+msgid "With _Due Date"
+msgstr "Con fecha de _vencimiento"
+
+#: ../views/tasks/galview.xml.h:2
+msgid "With _Status"
+msgstr "Con _estado"
+
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../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:789
+msgid "UTC"
+msgstr "UTC"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
+msgid "Select a Time Zone"
+msgstr "Seleccione una zona horaria"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
+msgid "Time Zones"
+msgstr "Zonas horarias"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
+msgid "Timezone drop-down combination box"
+msgstr "Cada de combinación desplegable de la zona horaria"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+"Use el botón izquierdo del ratón para ampliar un área del mapa y seleccionar "
+"una zona horaria.\n"
+"Use el botón derecho del ratón para reducir el mapa al tamaño anterior."
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "_Selección"
+
+#: ../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 "Definir vistas para %s"
+
+#: ../widgets/menus/gal-define-views-dialog.c:367
+#: ../widgets/menus/gal-define-views-dialog.c:369
+msgid "Define Views"
+msgstr "Definir vistas"
+
+#: ../widgets/menus/gal-define-views.ui.h:2
+#, no-c-format
+msgid "Define Views for \"%s\""
+msgstr "Definir vistas para «%s»"
+
+#: ../widgets/menus/gal-view-factory-etable.c:111
+msgid "Table"
+msgstr "Tabla"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+msgid "Save Current View"
+msgstr "Guardar vista actual"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "_Crear vista nueva"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "_Reemplazar vista existente"
+
+#: ../widgets/menus/gal-view-new-dialog.c:108
+msgid "Define New View"
+msgstr "Definir vistas nuevas"
+
+#: ../widgets/menus/gal-view-new-dialog.ui.h:1
+msgid "Name of new view:"
+msgstr "Nombre de la vista nueva:"
+
+#: ../widgets/menus/gal-view-new-dialog.ui.h:2
+msgid "Type of View"
+msgstr "Tipo de vista"
+
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
+msgid "Type of view:"
+msgstr "Tipo de vista:"
+
+#: ../widgets/misc/e-account-manager.c:383
+msgid "Use default Evolution _sort order for accounts"
+msgstr "Usar _orden predeterminado de Evolution para las cuentas"
+
+#: ../widgets/misc/e-account-manager.c:438
+msgid "De_fault"
+msgstr "_Predeterminada"
+
+#: ../widgets/misc/e-account-tree-view.c:404
+msgid "Account Name"
+msgstr "Nombre de la cuenta"
+
+#: ../widgets/misc/e-account-tree-view.c:435
+msgid "Protocol"
+msgstr "Protocolo"
+
+#: ../widgets/misc/e-attachment-dialog.c:308
+msgid "Attachment Properties"
+msgstr "Propiedades de adjuntos"
+
+#: ../widgets/misc/e-attachment-dialog.c:330
+msgid "_Filename:"
+msgstr "Nombre del _archivo:"
+
+#: ../widgets/misc/e-attachment-dialog.c:365
+msgid "MIME Type:"
+msgstr "Tipo MIME:"
+
+#: ../widgets/misc/e-attachment-dialog.c:373
+#: ../widgets/misc/e-attachment-store.c:559
+msgid "_Suggest automatic display of attachment"
+msgstr "_Sugerir mostrar automáticamente el adjunto"
+
+#: ../widgets/misc/e-attachment-handler-image.c:95
+msgid "Could not set as background"
+msgstr "No se pudo establecer como fondo"
+
+#: ../widgets/misc/e-attachment-handler-image.c:145
+msgid "Set as _Background"
+msgstr "Establecer como _fondo"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:93
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "No se pudo emviar el adjunto"
+msgstr[1] "No se pudieron enviar los adjuntos"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:135
+msgid "_Send To..."
+msgstr "En_viar a…"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:137
+msgid "Send the selected attachments somewhere"
+msgstr "Enviar los adjuntos seleccionados a algún sitio"
+
+#: ../widgets/misc/e-attachment-icon-view.c:162
+#: ../widgets/misc/e-attachment-tree-view.c:547
+msgid "Loading"
+msgstr "Cargando"
+
+#: ../widgets/misc/e-attachment-icon-view.c:174
+#: ../widgets/misc/e-attachment-tree-view.c:559
+msgid "Saving"
+msgstr "Guardando"
+
+#: ../widgets/misc/e-attachment-paned.c:97
+msgid "Hide Attachment _Bar"
+msgstr "Ocultar _barra de adjuntos"
+
+#: ../widgets/misc/e-attachment-paned.c:99
+#: ../widgets/misc/e-attachment-paned.c:639
+msgid "Show Attachment _Bar"
+msgstr "Mostrar _barra de adjuntos"
+
+#: ../widgets/misc/e-attachment-store.c:547
+msgid "Add Attachment"
+msgstr "Añadir adjunto"
+
+#: ../widgets/misc/e-attachment-store.c:550
+msgid "A_ttach"
+msgstr "_Adjuntar"
+
+#: ../widgets/misc/e-attachment-store.c:613
+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
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../widgets/misc/e-attachment-view.c:404
+msgid "Open With Other Application..."
+msgstr "Abrir con otra aplicación…"
+
+#: ../widgets/misc/e-attachment-view.c:411
+msgid "S_ave All"
+msgstr "Guardar _todo"
+
+#: ../widgets/misc/e-attachment-view.c:437
+msgid "A_dd Attachment..."
+msgstr "_Añadir adjunto…"
+
+#: ../widgets/misc/e-attachment-view.c:461
+msgid "_Hide"
+msgstr "_Ocultar"
+
+#: ../widgets/misc/e-attachment-view.c:468
+msgid "Hid_e All"
+msgstr "_Ocular todo"
+
+#: ../widgets/misc/e-attachment-view.c:475
+msgid "_View Inline"
+msgstr "_Ver incluido"
+
+#: ../widgets/misc/e-attachment-view.c:482
+msgid "Vie_w All Inline"
+msgstr "_Ver tolo en línea"
+
+#: ../widgets/misc/e-attachment-view.c:803
+#, c-format
+msgid "Open With \"%s\""
+msgstr "Abrir con «%s»"
+
+#: ../widgets/misc/e-attachment-view.c:806
+#, c-format
+msgid "Open this attachment in %s"
+msgstr "Abrir este adjunto en %s"
+
+#. To Translators: This text is set as a description of an attached
+#. * 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:998
+msgid "Attached message"
+msgstr "Mensaje adjunto"
+
+#: ../widgets/misc/e-attachment.c:1853 ../widgets/misc/e-attachment.c:2654
+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
+msgid "A save operation is already in progress"
+msgstr "Existe una operación de guardado en progreso"
+
+#: ../widgets/misc/e-attachment.c:1953
+#, c-format
+msgid "Could not load '%s'"
+msgstr "No se pudo cargar «%s»"
+
+#: ../widgets/misc/e-attachment.c:1956
+#, c-format
+msgid "Could not load the attachment"
+msgstr "No se pudo cargar el adjunto"
+
+#: ../widgets/misc/e-attachment.c:2232
+#, c-format
+msgid "Could not open '%s'"
+msgstr "No se pudo abrir «%s»"
+
+#: ../widgets/misc/e-attachment.c:2235
+#, c-format
+msgid "Could not open the attachment"
+msgstr "No se pudo abrir el adjunto"
+
+#: ../widgets/misc/e-attachment.c:2670
+msgid "Attachment contents not loaded"
+msgstr "No se cargó el contenido del adjunto"
+
+#: ../widgets/misc/e-attachment.c:2746
+#, c-format
+msgid "Could not save '%s'"
+msgstr "No se pudo guardar «%s»"
+
+#: ../widgets/misc/e-attachment.c:2749
+#, c-format
+msgid "Could not save the attachment"
+msgstr "No se pudo guardar el adjunto"
+
+#. 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:387
+msgid "Ctrl-click to open a link"
+msgstr "Pulse Ctrl-botón del ratón para abrir un enlace"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../widgets/misc/e-calendar-item.c:1250
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../widgets/misc/e-calendar.c:226
+msgid "Month Calendar"
+msgstr "Calendario mensual"
+
+#: ../widgets/misc/e-charset-combo-box.c:96
+msgid "Character Encoding"
+msgstr "Codificación de caracteres"
+
+#: ../widgets/misc/e-charset-combo-box.c:119
+msgid "Enter the character set to use"
+msgstr "Introduzca el conjunto de caracteres a usar"
+
+#: ../widgets/misc/e-charset-combo-box.c:339
+msgid "Other..."
+msgstr "Otro…"
+
+#: ../widgets/misc/e-contact-map-window.c:355
+msgid "Contacts Map"
+msgstr "Mapa de los contactos"
+
+#: ../widgets/misc/e-dateedit.c:501
+msgid "Date and Time"
+msgstr "Fecha y hora"
+
+#: ../widgets/misc/e-dateedit.c:522
+msgid "Text entry to input date"
+msgstr "Entrada de texto para introducir la fecha"
+
+#: ../widgets/misc/e-dateedit.c:544
+msgid "Click this button to show a calendar"
+msgstr "Pulse este botón para mostrar un calendario"
+
+#: ../widgets/misc/e-dateedit.c:591
+msgid "Drop-down combination box to select time"
+msgstr "Caja combo desplegable para seleccionar la hora"
+
+#: ../widgets/misc/e-dateedit.c:663
+msgid "No_w"
+msgstr "_Ahora"
+
+#: ../widgets/misc/e-dateedit.c:669
+msgid "_Today"
+msgstr "_Hoy"
+
+#. Note that we don't show this here, since by default a 'None' date
+#. * is not permitted.
+#: ../widgets/misc/e-dateedit.c:677
+msgid "_None"
+msgstr "_Ninguna"
+
+#. Translators: "None" for date field of a date edit, shown when
+#. * there is no date set.
+#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1921
+msgctxt "date"
+msgid "None"
+msgstr "Ninguna"
+
+#: ../widgets/misc/e-dateedit.c:1815
+msgid "Invalid Date Value"
+msgstr "Valor de fecha inválido"
+
+#: ../widgets/misc/e-dateedit.c:1859
+msgid "Invalid Time Value"
+msgstr "Valor de hora inválido"
+
+#: ../widgets/misc/e-import-assistant.c:249
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr ""
+"Elija el archivo que quiere importar en Evolution y seleccione de la lista "
+"el tipo de archivo que es."
+
+#: ../widgets/misc/e-import-assistant.c:266
+msgid "F_ilename:"
+msgstr "Nombre del _archivo:"
+
+#: ../widgets/misc/e-import-assistant.c:276
+msgid "Select a file"
+msgstr "Elija un archivo"
+
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
+msgid "File _type:"
+msgstr "_Tipo de archivo:"
+
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:913
+msgid "Choose the destination for this import"
+msgstr "Elija el destino de esta importación"
+
+#: ../widgets/misc/e-import-assistant.c:358
+msgid "Choose the type of importer to run:"
+msgstr "Elija el tipo de importador a ejecutar:"
+
+#: ../widgets/misc/e-import-assistant.c:366
+msgid "Import data and settings from _older programs"
+msgstr "Importar datos y configuración de programas _antiguos"
+
+#: ../widgets/misc/e-import-assistant.c:374
+msgid "Import a _single file"
+msgstr "Importar un _único archivo"
+
+#: ../widgets/misc/e-import-assistant.c:526
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"Evolution comprobó la configuración para importar de las siguientes "
+"aplicaciones: Pine, Netscape, Elm, iCalendar. No se encontró ninguna "
+"configuración que se pueda importar. Si quiere intentarlo de nuevo, pulse el "
+"botón «Atrás»."
+
+#. Install a custom "Cancel Import" button.
+#: ../widgets/misc/e-import-assistant.c:768
+msgid "_Cancel Import"
+msgstr "_Cancelar la importación"
+
+#: ../widgets/misc/e-import-assistant.c:912
+msgid "Preview data to be imported"
+msgstr "Vista previa de los datos para importar"
+
+#: ../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 "Importar datos"
+
+#: ../widgets/misc/e-import-assistant.c:926
+msgid "Select what type of file you want to import from the list."
+msgstr "Seleccionar qué tipo de archivo quiere importar de la lista"
+
+#: ../widgets/misc/e-import-assistant.c:1266
+#: ../widgets/misc/e-import-assistant.c:1301
+msgid "Evolution Import Assistant"
+msgstr "Asistente de importación de Evolution"
+
+#: ../widgets/misc/e-import-assistant.c:1283
+#: ../widgets/misc/e-import-assistant.c:1339
+msgid "Import Location"
+msgstr "Lugar de importación"
+
+#: ../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."
+msgstr ""
+"Bienvenido al asistente de importación de Evolution.\n"
+"Este asistente le guiará a través del proceso de importación de archivos "
+"externos dentro de Evolution."
+
+#: ../widgets/misc/e-import-assistant.c:1311
+msgid "Importer Type"
+msgstr "Tipo de importador"
+
+#: ../widgets/misc/e-import-assistant.c:1321
+msgid "Select Information to Import"
+msgstr "Seleccione la imformación para importar"
+
+#: ../widgets/misc/e-import-assistant.c:1330
+msgid "Select a File"
+msgstr "Seleccione un archivo"
+
+#: ../widgets/misc/e-import-assistant.c:1347
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "Pulse «Aplicar» para comenzar a importar el archivo en Evolution."
+
+#: ../widgets/misc/e-map.c:883
+msgid "World Map"
+msgstr "Mapa mundial"
+
+#: ../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 ""
+"Widget con mapa interactivo basado en ratón para seleccionar la zona "
+"horaria. Los usuarios que sólo dispongan de teclado pueden, en su lugar, "
+"seleccionar la zona horaria desde la caja combinada desplegable inferior."
+
+#: ../widgets/misc/e-online-button.c:27
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr ""
+"Actualmente Evolution está conectado. Pulse este botón para trabajar "
+"desconectado."
+
+#: ../widgets/misc/e-online-button.c:30
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr ""
+"Actualmente Evolution está desconectado. Pulse este botón para trabajar "
+"conectado."
+
+#: ../widgets/misc/e-online-button.c:33
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr ""
+"Actualmente Evolution está desconectado porque la red no está disponible."
+
+#: ../widgets/misc/e-preferences-window.c:279
+msgid "Evolution Preferences"
+msgstr "Preferencias de Evolution"
+
+#: ../widgets/misc/e-search-bar.c:81
+#, c-format
+msgid "Matches: %d"
+msgstr "Coincide con: %d"
+
+#: ../widgets/misc/e-search-bar.c:563
+msgid "Close the find bar"
+msgstr "Cerrar la barra de búsqueda"
+
+#: ../widgets/misc/e-search-bar.c:571
+msgid "Fin_d:"
+msgstr "_Buscar:"
+
+#: ../widgets/misc/e-search-bar.c:583
+msgid "Clear the search"
+msgstr "Limpiar la búsqueda"
+
+#: ../widgets/misc/e-search-bar.c:607
+msgid "_Previous"
+msgstr "_Anterior"
+
+#: ../widgets/misc/e-search-bar.c:613
+msgid "Find the previous occurrence of the phrase"
+msgstr "Buscar la coincidencia anterior de la frase"
+
+#: ../widgets/misc/e-search-bar.c:626
+msgid "_Next"
+msgstr "_Siguiente"
+
+#: ../widgets/misc/e-search-bar.c:632
+msgid "Find the next occurrence of the phrase"
+msgstr "Buscar la siguiente coincidencia de la frase"
+
+#: ../widgets/misc/e-search-bar.c:645
+msgid "Mat_ch case"
+msgstr "_Coincidir con capitalización"
+
+#: ../widgets/misc/e-search-bar.c:673
+msgid "Reached bottom of page, continued from top"
+msgstr "Se llegó al final de la página, continuando desde el principio"
+
+#: ../widgets/misc/e-search-bar.c:695
+msgid "Reached top of page, continued from bottom"
+msgstr "Se llegó al principio de la página, continuando desde el final"
+
+#: ../widgets/misc/e-send-options.c:552
+msgid "When de_leted:"
+msgstr "Al e_liminar:"
+
+#: ../widgets/misc/e-send-options.ui.h:1
+msgid "A_uto-delete sent item"
+msgstr "_Autoeliminar el elemento enviado"
+
+#: ../widgets/misc/e-send-options.ui.h:3
+msgid "Creat_e a sent item to track information"
+msgstr "_Crear un elemento enviado para seguimiento de la información"
+
+#: ../widgets/misc/e-send-options.ui.h:4
+msgid "Deli_vered and opened"
+msgstr "_Entregado y abierto"
+
+#: ../widgets/misc/e-send-options.ui.h:5
+msgid "Delivery Options"
+msgstr "Opciones de entrega"
+
+#: ../widgets/misc/e-send-options.ui.h:6
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Hasta"
+
+#: ../widgets/misc/e-send-options.ui.h:7
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_Después"
+
+#: ../widgets/misc/e-send-options.ui.h:8
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "días"
+
+#: ../widgets/misc/e-send-options.ui.h:9
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "D_entro"
+
+#: ../widgets/misc/e-send-options.ui.h:10
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "días"
+
+#: ../widgets/misc/e-send-options.ui.h:11
+msgid "For Your Eyes Only"
+msgstr "Sólo para usted"
+
+#: ../widgets/misc/e-send-options.ui.h:12
+msgid "Gene_ral Options"
+msgstr "Opciones gene_rales"
+
+#: ../widgets/misc/e-send-options.ui.h:15
+msgid "Mail Receipt"
+msgstr "Destinatario del correo"
+
+#: ../widgets/misc/e-send-options.ui.h:17
+msgid "Proprietary"
+msgstr "Propietario"
+
+#: ../widgets/misc/e-send-options.ui.h:18
+msgid "R_eply requested"
+msgstr "_Respuesta solicitada"
+
+#: ../widgets/misc/e-send-options.ui.h:20
+msgid "Return Notification"
+msgstr "Devolver notificación"
+
+#: ../widgets/misc/e-send-options.ui.h:21
+msgid "Secret"
+msgstr "Secreto"
+
+#: ../widgets/misc/e-send-options.ui.h:23
+msgid "Sta_tus Tracking"
+msgstr "Seguimiento de es_tado"
+
+#: ../widgets/misc/e-send-options.ui.h:24
+msgid "Standard"
+msgstr "Estándar"
+
+#: ../widgets/misc/e-send-options.ui.h:25
+msgid "Status Tracking"
+msgstr "Seguimiento de estado"
+
+#: ../widgets/misc/e-send-options.ui.h:26
+msgid "Top Secret"
+msgstr "Alto secreto"
+
+#: ../widgets/misc/e-send-options.ui.h:28
+msgid "When acce_pted:"
+msgstr "Al ace_ptar:"
+
+#: ../widgets/misc/e-send-options.ui.h:29
+msgid "When co_mpleted:"
+msgstr "Al _terminar:"
+
+#: ../widgets/misc/e-send-options.ui.h:30
+msgid "When decli_ned:"
+msgstr "Al _rechazar:"
+
+#: ../widgets/misc/e-send-options.ui.h:31
+msgid "_All information"
+msgstr "_Toda la información"
+
+#: ../widgets/misc/e-send-options.ui.h:32
+msgid "_Classification:"
+msgstr "_Clasificación:"
+
+#: ../widgets/misc/e-send-options.ui.h:33
+msgid "_Delay message delivery"
+msgstr "_Retrasar la entrega del mensaje"
+
+#: ../widgets/misc/e-send-options.ui.h:34
+msgid "_Delivered"
+msgstr "_Entregado"
+
+#: ../widgets/misc/e-send-options.ui.h:36
+msgid "_Set expiration date"
+msgstr "_Establecer fecha de caducidad"
+
+#: ../widgets/misc/e-send-options.ui.h:37
+msgid "_When convenient"
+msgstr "_Cuando convenga"
+
+#: ../widgets/misc/e-send-options.ui.h:38
+msgid "_When opened:"
+msgstr "_Al abrir:"
+
+#. Translators: Used in send options dialog
+#: ../widgets/misc/e-send-options.ui.h:40
+msgctxt "send-options"
+msgid "None"
+msgstr "Ninguna"
+
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:564
+#: ../widgets/misc/e-signature-manager.c:372
+#: ../widgets/misc/e-signature-script-dialog.c:219
+msgid "Unnamed"
+msgstr "Sin nombre"
+
+#: ../widgets/misc/e-signature-editor.c:214
+msgid "_Save and Close"
+msgstr "_Guardar y cerrar"
+
+#: ../widgets/misc/e-signature-editor.c:431
+msgid "Edit Signature"
+msgstr "Editar firma"
+
+#: ../widgets/misc/e-signature-editor.c:446
+msgid "_Signature Name:"
+msgstr "Nombre de la _firma"
+
+#: ../widgets/misc/e-signature-manager.c:317
+msgid "Add Signature Script"
+msgstr "Añadir un script de firma"
+
+#: ../widgets/misc/e-signature-manager.c:382
+msgid "Edit Signature Script"
+msgstr "Editar script de firma"
+
+#: ../widgets/misc/e-signature-manager.c:602
+msgid "Add _Script"
+msgstr "Añadir _script"
+
+#: ../widgets/misc/e-signature-script-dialog.c:268
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"La salida de este script se usará como su firma.\n"
+"El nombre que especifique se usará únicamente\n"
+"para mostrarlo por pantalla. "
+
+#: ../widgets/misc/e-signature-script-dialog.c:313
+msgid "S_cript:"
+msgstr "S_cript:"
+
+#: ../widgets/misc/e-signature-script-dialog.c:344
+msgid "Script file must be executable."
+msgstr "El script debe ser ejecutable."
+
+#: ../widgets/misc/e-url-entry.c:78
+msgid "Click here to go to URL"
+msgstr "Pulse aquí para ir a la URL"
+
+#: ../widgets/misc/e-web-view.c:410
+msgid "_Copy Link Location"
+msgstr "_Copiar dirección del enlace"
+
+#: ../widgets/misc/e-web-view.c:412
+msgid "Copy the link to the clipboard"
+msgstr "Copiar el enlace al portapapeles"
+
+#: ../widgets/misc/e-web-view.c:420
+msgid "_Open Link in Browser"
+msgstr "_Abrir enlace en el navegador"
+
+#: ../widgets/misc/e-web-view.c:422
+msgid "Open the link in a web browser"
+msgstr "_Abrir enlace en el navegador"
+
+#: ../widgets/misc/e-web-view.c:430
+msgid "_Copy Email Address"
+msgstr "_Copiar dirección de correo-e"
+
+#: ../widgets/misc/e-web-view.c:447
+msgid "_Copy Image"
+msgstr "_Copiar imagen"
+
+#: ../widgets/misc/e-web-view.c:449
+msgid "Copy the image to the clipboard"
+msgstr "Copiar la imagen al portapapeles"
+
+#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
+msgid "Select all text and images"
+msgstr "Seleccionar todo el texto y las imágenes"
+
+#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
+#: ../widgets/misc/e-web-view.c:986
+#, c-format
+msgid "Click to call %s"
+msgstr "Pulse para llamar a %s"
+
+#: ../widgets/misc/e-web-view.c:988
+msgid "Click to hide/unhide addresses"
+msgstr "Pulse para ocultar/mostrar las direcciones"
+
+#: ../widgets/misc/e-web-view.c:990
+#, c-format
+msgid "Click to open %s"
+msgstr "Pulse para abrir %s"
+
+#: ../widgets/misc/ea-calendar-item.c:306
+#: ../widgets/misc/ea-calendar-item.c:315
+msgid "%d %B %Y"
+msgstr "%e de %B de %Y"
+
+#: ../widgets/misc/ea-calendar-item.c:318
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Calendario: desde %s a %s"
+
+#: ../widgets/misc/ea-calendar-item.c:354
+msgid "evolution calendar item"
+msgstr "elemento de calendario de Evolution"
+
+#: ../widgets/table/e-cell-combo.c:187
+msgid "popup list"
+msgstr "lista emergente"
+
+#: ../widgets/table/e-cell-date-edit.c:299
+msgid "Now"
+msgstr "Ahora"
+
+#. Translators: "None" as a label of a button to unset date in a date table cell
+#: ../widgets/table/e-cell-date-edit.c:316
+msgctxt "table-date"
+msgid "None"
+msgstr "Ninguna"
+
+#: ../widgets/table/e-cell-date-edit.c:324
+msgid "OK"
+msgstr "Aceptar"
+
+#: ../widgets/table/e-cell-date-edit.c:868
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "La fecha debe estar en el formato: %s"
+
+#: ../widgets/table/e-cell-percent.c:80
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "El valor del porcentaje debe estar entre 0 y 100, inclusive"
+
+#: ../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:143
+msgid "click to add"
+msgstr "pulse para añadir"
+
+#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
+msgid "(Ascending)"
+msgstr "(Ascendente)"
+
+#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
+msgid "(Descending)"
+msgstr "(Descendente)"
+
+#: ../widgets/table/e-table-config.c:400
+msgid "Not sorted"
+msgstr "Sin ordenar"
+
+#: ../widgets/table/e-table-config.c:441
+msgid "No grouping"
+msgstr "Sin agrupar"
+
+#: ../widgets/table/e-table-config.c:666
+#: ../widgets/table/e-table-config.ui.h:11
+msgid "Show Fields"
+msgstr "Mostrar campos"
+
+#: ../widgets/table/e-table-config.c:686
+msgid "Available Fields"
+msgstr "Campos disponibles"
+
+#: ../widgets/table/e-table-config.ui.h:1
+msgid "A_vailable Fields:"
+msgstr "Campos _disponibles:"
+
+#: ../widgets/table/e-table-config.ui.h:2
+#: ../widgets/table/e-table-header-item.c:1717
+msgid "Ascending"
+msgstr "Ascendente"
+
+#: ../widgets/table/e-table-config.ui.h:3
+msgid "Clear All"
+msgstr "Quitar todo"
+
+#: ../widgets/table/e-table-config.ui.h:4
+msgid "Clear _All"
+msgstr "Quitar _todo"
+
+#: ../widgets/table/e-table-config.ui.h:5
+#: ../widgets/table/e-table-header-item.c:1717
+msgid "Descending"
+msgstr "Descendente"
+
+#: ../widgets/table/e-table-config.ui.h:8
+msgid "Group Items By"
+msgstr "Agrupar elementos por"
+
+#: ../widgets/table/e-table-config.ui.h:9
+msgid "Move _Down"
+msgstr "_Bajar"
+
+#: ../widgets/table/e-table-config.ui.h:10
+msgid "Move _Up"
+msgstr "_Subir"
+
+#: ../widgets/table/e-table-config.ui.h:12
+msgid "Show _field in View"
+msgstr "Mostrar ca_mpo en la vista"
+
+#: ../widgets/table/e-table-config.ui.h:13
+msgid "Show field i_n View"
+msgstr "Mostrar campo e_n la vista"
+
+#: ../widgets/table/e-table-config.ui.h:14
+msgid "Show field in _View"
+msgstr "Mostrar campo en la _vista"
+
+#: ../widgets/table/e-table-config.ui.h:15
+msgid "Sort"
+msgstr "Ordenar"
+
+>>>>>>> master
 #: ../widgets/table/e-table-config.ui.h:16
 msgid "Sort Items By"
 msgstr "Ordenar elementos por"
@@ -21359,6 +38455,7 @@ msgstr ""
 "la ubicación en la cual quiere que aparezca."
 
 #. Translators: This text is used as a special row when an ETable
+<<<<<<< HEAD
 #. 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.
@@ -21366,6 +38463,15 @@ msgstr ""
 #. Example: "Family name: Smith (13 items)"
 #.
 #: ../widgets/table/e-table-group-container.c:353
+=======
+#. * 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:361
+>>>>>>> master
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -21373,18 +38479,28 @@ msgstr[0] "%s: %s (%d elemento)"
 msgstr[1] "%s: %s (%d elementos)"
 
 #. Translators: This text is used as a special row when an ETable
+<<<<<<< HEAD
 #. 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
+=======
+#. * 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:373
+>>>>>>> master
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d elemento)"
 msgstr[1] "%s (%d elementos)"
 
+<<<<<<< HEAD
 #: ../widgets/table/e-table-header-item.c:1523
 msgid "Customize Current View"
 msgstr "Personalizar vista actual"
@@ -21434,11 +38550,66 @@ msgid "Custo_mize Current View..."
 msgstr "Perso_nalizar vista actual…"
 
 #: ../widgets/table/e-table-header-item.c:1636
+=======
+#: ../widgets/table/e-table-header-item.c:1557
+msgid "Customize Current View"
+msgstr "Personalizar vista actual"
+
+#: ../widgets/table/e-table-header-item.c:1579
+msgid "Sort _Ascending"
+msgstr "Ordenar _ascendentemente"
+
+#: ../widgets/table/e-table-header-item.c:1582
+msgid "Sort _Descending"
+msgstr "Ordenar _descendentemente"
+
+#: ../widgets/table/e-table-header-item.c:1585
+msgid "_Unsort"
+msgstr "_Desordenar"
+
+#: ../widgets/table/e-table-header-item.c:1588
+msgid "Group By This _Field"
+msgstr "Agrupar por _este campo"
+
+#: ../widgets/table/e-table-header-item.c:1591
+msgid "Group By _Box"
+msgstr "Agrupar por _caja"
+
+#: ../widgets/table/e-table-header-item.c:1595
+msgid "Remove This _Column"
+msgstr "Quitar esta c_olumna"
+
+#: ../widgets/table/e-table-header-item.c:1598
+msgid "Add a C_olumn..."
+msgstr "Añadir una c_olumna…"
+
+#: ../widgets/table/e-table-header-item.c:1602
+msgid "A_lignment"
+msgstr "A_lineación"
+
+#: ../widgets/table/e-table-header-item.c:1605
+msgid "B_est Fit"
+msgstr "Ajust_e automático"
+
+#: ../widgets/table/e-table-header-item.c:1608
+msgid "Format Column_s..."
+msgstr "Formatear columna_s…"
+
+#: ../widgets/table/e-table-header-item.c:1612
+msgid "Custo_mize Current View..."
+msgstr "Perso_nalizar vista actual…"
+
+#: ../widgets/table/e-table-header-item.c:1674
+>>>>>>> master
 msgid "_Sort By"
 msgstr "_Ordenar por"
 
 #. Custom
+<<<<<<< HEAD
 #: ../widgets/table/e-table-header-item.c:1654
+=======
+#: ../widgets/table/e-table-header-item.c:1692
+>>>>>>> master
 msgid "_Custom"
 msgstr "_Personalizado"
 
@@ -21462,6 +38633,7 @@ msgstr "expande la fila en el ETree que contiene esta celda"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "contrae la fila en el ETree que contiene esta celda"
 
+<<<<<<< HEAD
 #: ../widgets/table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "Celda de la tabla"
@@ -21479,6 +38651,25 @@ msgid "Select All"
 msgstr "Seleccionar todo"
 
 #: ../widgets/text/e-text.c:2318
+=======
+#: ../widgets/table/gal-a11y-e-cell.c:123
+msgid "Table Cell"
+msgstr "Celda de la tabla"
+
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
+msgid "click"
+msgstr "pulsar"
+
+#: ../widgets/table/gal-a11y-e-table-column-header.c:158
+msgid "sort"
+msgstr "ordenar"
+
+#: ../widgets/text/e-text.c:2327
+msgid "Select All"
+msgstr "Seleccionar todo"
+
+#: ../widgets/text/e-text.c:2339
+>>>>>>> master
 msgid "Input Methods"
 msgstr "Métodos de entrada"
 
@@ -21589,6 +38780,7 @@ msgstr "Métodos de entrada"
 
 #~ msgid "Error occurred while spawning %s: %s."
 #~ msgstr "Ocurrió un error al crear %s: %s."
+<<<<<<< HEAD
 
 #~ msgid "Bogofilter child process does not respond, killing..."
 #~ msgstr "El proceso hijo de Bogofilter no está respondiendo, matándolo…"
@@ -22170,6 +39362,589 @@ msgstr "Métodos de entrada"
 #~ "Conteo de las repeticiones predeterminadas para un acontecimiento nuevo. -"
 #~ "1 significa para siempre."
 
+=======
+
+#~ msgid "Bogofilter child process does not respond, killing..."
+#~ msgstr "El proceso hijo de Bogofilter no está respondiendo, matándolo…"
+
+#~ msgid "Wait for Bogofilter child process interrupted, terminating..."
+#~ msgstr ""
+#~ "Espere a que el proceso hijo de Bogofilter se interrumpa, terminando…"
+
+#~ msgid "Pipe to Bogofilter failed, error code: %d."
+#~ msgstr "Falló la tubería hacia Bogofilter, código de error: %d"
+
+#~ msgid "Bogofilter Junk Filter"
+#~ msgstr "Filtro de SPAM Bogofilter"
+
+#~ msgid "Filter junk messages using Bogofilter."
+#~ msgstr "Filtra mensajes SPAM usando Bogofilter."
+
+#~ msgid "SpamAssassin not found, code: %d"
+#~ msgstr "No se encontró SpamAssasin, código: %d"
+
+#~ msgid "Failed to create pipe: %s"
+#~ msgstr "Falló al crear la tubería: %s"
+
+#~ msgid "Error after fork: %s"
+#~ msgstr "Error después de bifurcar: %s"
+
+#~ msgid "SpamAssassin child process does not respond, killing..."
+#~ msgstr "El proceso hijo de SpamAssasin no está respondiendo, matándolo…"
+
+#~ msgid "Wait for SpamAssassin child process interrupted, terminating..."
+#~ msgstr ""
+#~ "Espere a que el proceso hijo de SpamAssasin se interrumpa, terminando…"
+
+#~ msgid "Pipe to SpamAssassin failed, error code: %d"
+#~ msgstr "Falló la tubería hacia SpamAssasin, código de error: %d"
+
+#~ msgid "SpamAssassin is not available. Please install it first."
+#~ msgstr "SpamAssasin no está disponible. Instálelo primero."
+
+#~ msgid "SpamAssassin Junk Filter"
+#~ msgstr "Filtro de SPAM SpamAssassin"
+
+#~ msgid "Enable D-Bus messages."
+#~ msgstr "Activar los mensajes D-Bus."
+
+#~ msgid "Generates a D-Bus message when new mail messages arrive."
+#~ msgstr "Genera un mensaje D-BUS cuando llega un mensaje de correo nuevo."
+
+#~ msgid "Popup message together with the icon."
+#~ msgstr "Mensaje emergente junto con el icono."
+
+#~ msgid "Whether show message over the icon when new messages arrive."
+#~ msgstr ""
+#~ "Indica si se debe mostrar un mensaje sobre el icono cuando llega un "
+#~ "mensaje nuevo."
+
+#~ msgid "Show icon in _notification area"
+#~ msgstr "Mostrar icono en el área de _notificación"
+
+#~ msgid "Popup _message together with the icon"
+#~ msgstr "_Mensaje emergente junto con el icono"
+
+#~ msgid "Generate a _D-Bus message"
+#~ msgstr "Generar un mensaje _D-Bus"
+
+#~ msgid ""
+#~ "Selected calendar contains some events for the given mails already. Would "
+#~ "you like to create new events anyway?"
+#~ msgstr ""
+#~ "El calendario seleccionado ya contiene algunos acontecimientos para los "
+#~ "correos proporcionados. ¿Quiere crear acontecimientos nuevos de todas "
+#~ "formas?"
+
+#~ msgid ""
+#~ "Selected task list contains some tasks for the given mails already. Would "
+#~ "you like to create new tasks anyway?"
+#~ msgstr ""
+#~ "La lista de tareas seleccionada ya contiene algunas tareas para los "
+#~ "correos proporcionados. ¿Quiere crear tareas nuevas de todas formas?"
+
+#~ msgid ""
+#~ "Selected memo list contains some memos for the given mails already. Would "
+#~ "you like to create new memos anyway?"
+#~ msgstr ""
+#~ "La lista de notas seleccionada contiene algunas notas para los correos "
+#~ "proporcionados. ¿Quiere crear notas nuevas de todas formas?"
+
+#~ msgid ""
+#~ "Selected calendar contains an event for the given mail already. Would you "
+#~ "like to create new event anyway?"
+#~ msgid_plural ""
+#~ "Selected calendar contains events for the given mails already. Would you "
+#~ "like to create new events anyway?"
+#~ msgstr[0] ""
+#~ "El calendario seleccionado ya contiene un acontecimiento para el correo "
+#~ "proporcionado. ¿Quiere crear el acontecimiento nuevo de todas formas?"
+#~ msgstr[1] ""
+#~ "El calendario seleccionada ya contiene acontecimientos para los correos "
+#~ "proporcionados. ¿Quiere crear los acontecimientos nuevos de todas formas?"
+
+#~ msgid ""
+#~ "Selected task list contains a task for the given mail already. Would you "
+#~ "like to create new task anyway?"
+#~ msgid_plural ""
+#~ "Selected task list contains tasks for the given mails already. Would you "
+#~ "like to create new tasks anyway?"
+#~ msgstr[0] ""
+#~ "La lista de tareas seleccionada ya contiene una nota para el correo "
+#~ "proporcionado. ¿Quiere crear la tarea nueva de todas formas?"
+#~ msgstr[1] ""
+#~ "La lista de tareas seleccionada ya contiene notas para los correos "
+#~ "proporcionados. ¿Quiere crear las tareas nuevas de todas formas?"
+
+#~ msgid ""
+#~ "Selected memo list contains a memo for the given mail already. Would you "
+#~ "like to create new memo anyway?"
+#~ msgid_plural ""
+#~ "Selected memo list contains memos for the given mails already. Would you "
+#~ "like to create new memos anyway?"
+#~ msgstr[0] ""
+#~ "La lista de notas seleccionada ya contiene una nota para el correo "
+#~ "proporcionado. ¿Quiere crear la nota nueva de todas formas?"
+#~ msgstr[1] ""
+#~ "La lista de notas seleccionada ya contiene notas para los correos "
+#~ "proporcionados. ¿Quiere crear las notas nuevas de todas formas?"
+
+#~ msgid "failed to open book"
+#~ msgstr "falló al abrir libreta de direcciones"
+
+#~ msgid "Invalid object"
+#~ msgstr "Objeto no válido"
+
+#~ msgid "Failed to import contact's certificate"
+#~ msgstr "Falló al importar el certificado del contacto"
+
+#~ msgid "Failed to import certificate authority's certificate"
+#~ msgstr "Falló al importar el certificado de la autoridad de certificados"
+
+#~ msgid "Scanning folders in \"%s\""
+#~ msgstr "Analizando carpetas en «%s»"
+
+#~ msgid "Creating folder '%s'"
+#~ msgstr "Creando carpeta «%s»"
+
+#~ msgid "Show a map of all the contacts"
+#~ msgstr "Mostrar un mapa de todos los contactos"
+
+#~ msgid "Add a map showing the location of contacts when possible."
+#~ msgstr ""
+#~ "Añadir un mapa mostrando la ubicación de los contactos cuando sea posible."
+
+#~ msgid "Map for contacts"
+#~ msgstr "Mapa para los contactos"
+
+#~ msgid "Scanning folders in '%s'"
+#~ msgstr "Analizando carpetas en «%s»"
+
+#~ msgid "Error saving messages to: %s:\n"
+#~ msgstr "Error al guardar los mensajes en: %s:\n"
+
+#~ msgid "Checking Service"
+#~ msgstr "Comprobando el servicio"
+
+#~ msgid "Retrieving quota information for folder '%s'"
+#~ msgstr "Obteniendo la información de la cuota para la carpeta «%s»"
+
+#~ msgid "Opening folder '%s'"
+#~ msgstr "Abriendo carpeta «%s»"
+
+#~ msgid "Invalid folder: %s"
+#~ msgstr "Carpeta no válida: %s"
+
+#~ msgid "Updating Search Folders for '%s'"
+#~ msgstr "Actualizando carpetas de búsqueda para «%s»"
+
+#~ msgid "Checklist"
+#~ msgstr "Lista de comprobación"
+
+#~ msgid "Enter password for %s (user %s)"
+#~ msgstr "Introduzca la contraseña para %s (usuario %s)"
+
+#~ msgid "Failed to authenticate.\n"
+#~ msgstr "No es posible autenticar.\n"
+
+#~ msgid "New _Shared Folder..."
+#~ msgstr "Carpeta compartida _nueva…"
+
+#~ msgid "_Proxy Login..."
+#~ msgstr "Sesión _proxy…"
+
+#~ msgid "Junk Mail Settings..."
+#~ msgstr "Opciones de SPAM…"
+
+#~ msgid "Track Message Status..."
+#~ msgstr "Seguir el estado del mensaje…"
+
+#~ msgid "Retract Mail"
+#~ msgstr "Retractar correo"
+
+#~ msgid "Accept"
+#~ msgstr "Aceptar"
+
+#~ msgid "Accept Tentatively"
+#~ msgstr "Aceptar provisionalmente"
+
+#~ msgid "Decline"
+#~ msgstr "Rehusar"
+
+#~ msgid "Rese_nd Meeting..."
+#~ msgstr "Reen_viar reunión…"
+
+#~ msgid "Create folder"
+#~ msgstr "Crear carpeta"
+
+#~ msgid ""
+#~ "The user '%s' has shared a folder with you\n"
+#~ "\n"
+#~ "Message from '%s'\n"
+#~ "\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "\n"
+#~ "Click 'Apply' to install the shared folder\n"
+#~ "\n"
+#~ msgstr ""
+#~ "El usuario «%s» ha compartido una capeta con usted\n"
+#~ "\n"
+#~ "Mensaje de «%s»\n"
+#~ "\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "\n"
+#~ "Pulse «Aplicar» para instalar la carpeta compartida\n"
+#~ "\n"
+
+#~ msgid "Install the shared folder"
+#~ msgstr "Instalar la carpeta compartida"
+
+#~ msgid "Shared Folder Installation"
+#~ msgstr "Instalación de carpeta compartida"
+
+#~ msgid "Junk Settings"
+#~ msgstr "Opciones de SPAM"
+
+#~ msgid "Junk Mail Settings"
+#~ msgstr "Configuración de SPAM"
+
+#~ msgid "Email:"
+#~ msgstr "Correo-e:"
+
+#~ msgid "Junk List:"
+#~ msgstr "Lista de SPAM:"
+
+#~ msgid "_Enable"
+#~ msgstr "_Activar"
+
+#~ msgid "_Junk List"
+#~ msgstr "Lista de _SPAM"
+
+#~ msgid "Message Retract"
+#~ msgstr "Retirada de correo"
+
+#~ msgid ""
+#~ "Retracting a message may remove it from the recipient's mailbox. Are you "
+#~ "sure you want to do this?"
+#~ msgstr ""
+#~ "Retirar un correo puede eliminarlo del buzón de correo del destinatario. "
+#~ "¿Está seguro de que quiere hacer esto?"
+
+#~ msgid "Message retracted successfully"
+#~ msgstr "Correo retirado con éxito"
+
+#~ msgid "Insert Send options"
+#~ msgstr "Insertar opciones de envío"
+
+#~ msgid "The participants will receive the following notification.\n"
+#~ msgstr "Los participantes recibirán la notificación siguiente.\n"
+
+#~ msgid "Add Send Options to GroupWise messages"
+#~ msgstr "Añadir opciones de envío a los correos de GroupWise"
+
+#~ msgid "Fine-tune your GroupWise accounts."
+#~ msgstr "Configurar las cuentas GroupWise."
+
+#~ msgid "GroupWise Features"
+#~ msgstr "Características de GroupWise"
+
+#~ msgid "Message retract failed"
+#~ msgstr "Falló al retirar el correo"
+
+#~ msgid "The server did not allow the selected message to be retracted."
+#~ msgstr "El servidor no permitió que se retractase el mensaje seleccionado."
+
+#~ msgid ""
+#~ "Account &quot;{0}&quot; already exists. Please check your folder tree."
+#~ msgstr ""
+#~ "La cuenta &quot;{0}&quot; ya existe. Compruebe su árbol de carpetas."
+
+#~ msgid "Account Already Exists"
+#~ msgstr "La cuenta ya existe"
+
+#~ msgid "Invalid user"
+#~ msgstr "Usuario no válido"
+
+#~ msgid ""
+#~ "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+#~ "address and try again."
+#~ msgstr ""
+#~ "El inicio de sesion como &quot;{0}&quot; en el proxy ha fallado. "
+#~ "Compruebe su dirección de correo-e e inténtelo de nuevo."
+
+#~ msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+#~ msgstr "No se puede dar acceso proxy al usuario «{0}»"
+
+#~ msgid "Specify User"
+#~ msgstr "Especificar usuario"
+
+#~ msgid "You have already given proxy permissions to this user."
+#~ msgstr "Ya ha otorgado permisos proxy a este usuario."
+
+#~ msgid "You have to specify a valid user name to give proxy rights."
+#~ msgstr ""
+#~ "Tiene que especificar un nombre de usuario válido para concederle "
+#~ "permisos en el proxy."
+
+#~ msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+#~ msgstr ""
+#~ "No puede compartir la carpeta con el usuario &quot;{0}&quot; especificado"
+
+#~ msgid "You have to specify a user name which you want to add to the list"
+#~ msgstr "Debe especificar el nombre de usuario que quiere añadir a la lista"
+
+#~ msgid "Do you want to resend the meeting?"
+#~ msgstr "¿Quiere reenviar la reunión?"
+
+#~ msgid "Do you want to resend the recurring meeting?"
+#~ msgstr "¿Quiere reenviar la reunión repetitiva?"
+
+#~ msgid "Do you want to retract the original item?"
+#~ msgstr "¿Quiere retractar el elemento original?"
+
+#~ msgid "The original will be removed from the recipient's mailbox."
+#~ msgstr "El original se quitará del buzón de entrada del destinatario."
+
+#~ msgid "This is a recurring meeting"
+#~ msgstr "Esta es una cita repetitiva"
+
+#~ msgid "This will create a new meeting using the existing meeting details."
+#~ msgstr ""
+#~ "Esto creará un mensaje nuevo usando los detalles existentes de la reunión."
+
+#~ msgid ""
+#~ "This will create a new meeting with the existing meeting details. The "
+#~ "recurrence rule needs to be re-entered."
+#~ msgstr ""
+#~ "Esto creará una nueva reunión con los detalles existentes de la reunión. "
+#~ "Se debe introducir la regla de repetición."
+
+#~ msgid "Would you like to accept it?"
+#~ msgstr "¿Quiere aceptarlo?"
+
+#~ msgid "Would you like to decline it?"
+#~ msgstr "¿Quiere rechazarlo?"
+
+#~ msgid "C_ustomize notification message"
+#~ msgstr "_Personalizar el mensaje de notificación"
+
+#~ msgid "Con_tacts..."
+#~ msgstr "Con_tactos…"
+
+#~ msgid "Shared Folder Notification"
+#~ msgstr "Notificación de carpeta compartida"
+
+#~ msgid "Users:"
+#~ msgstr "Usuarios:"
+
+#~ msgid "_Not Shared"
+#~ msgstr "_Sin compartir"
+
+#~ msgid "_Shared With..."
+#~ msgstr "_Compartir con…"
+
+#~ msgid "Access Rights"
+#~ msgstr "Derechos de acceso"
+
+#~ msgid "Add/Edit"
+#~ msgstr "Añadir/Editar"
+
+#~ msgid "Con_tacts"
+#~ msgstr "Con_tactos"
+
+#~ msgid "Modify _folders/options/rules/"
+#~ msgstr "Modificar _carpetas/opciones/reglas/"
+
+#~ msgid "Read items marked _private"
+#~ msgstr "Leer elementos marcados como _privados"
+
+#~ msgid "Subscribe to my _alarms"
+#~ msgstr "Suscribirse a _mis alertas"
+
+#~ msgid "Subscribe to my _notifications"
+#~ msgstr "Suscribirse a _mis notificaciones"
+
+#~ msgid "_Write"
+#~ msgstr "_Escribir"
+
+#~ msgid "permission to read|_Read"
+#~ msgstr "_Lectura"
+
+#~ msgid "Proxy"
+#~ msgstr "Proxy"
+
+#~ msgid "Proxy Login"
+#~ msgstr "Sesión proxy"
+
+#~ msgid "%sEnter password for %s (user %s)"
+#~ msgstr "%s Introduzca la contraseña para %s (usuario %s)"
+
+#~ msgid "The Proxy tab will be available only when the account is online."
+#~ msgstr ""
+#~ "La pestaña del Proxy estará disponible sólo cuando la cuenta esté "
+#~ "conectada."
+
+#~ msgid "The Proxy tab will be available only when the account is enabled."
+#~ msgstr ""
+#~ "La pestaña del Proxy estará disponible sólo cuando la cuenta esté "
+#~ "activada."
+
+#~ msgctxt "GW"
+#~ msgid "Proxy"
+#~ msgstr "Proxy"
+
+#~ msgid "Add User"
+#~ msgstr "Añadir usuario"
+
+#~ msgid "Advanced send options"
+#~ msgstr "Opciones de envío avanzadas"
+
+#~ msgid "Users"
+#~ msgstr "Usuarios"
+
+#~ msgid "Enter the users and set permissions"
+#~ msgstr "Introduzca los usuarios y establezca permisos"
+
+#~ msgid "Sharing"
+#~ msgstr "Compartir"
+
+#~ msgid "Custom Notification"
+#~ msgstr "Notificación personalizada"
+
+#~ msgid "Add   "
+#~ msgstr "Añadir   "
+
+#~ msgid "Modify"
+#~ msgstr "Modificar"
+
+#~ msgid "Message Status"
+#~ msgstr "Estado del mensaje"
+
+#~ msgid "Subject:"
+#~ msgstr "Asunto:"
+
+#~ msgid "From:"
+#~ msgstr "De:"
+
+#~ msgid "Creation date:"
+#~ msgstr "Fecha de creación:"
+
+#~ msgid "Recipient: "
+#~ msgstr "Destinatario: "
+
+#~ msgid "Delivered: "
+#~ msgstr "Entregado: "
+
+#~ msgid "Opened: "
+#~ msgstr "Abierto: "
+
+#~ msgid "Accepted: "
+#~ msgstr "Aceptado: "
+
+#~ msgid "Deleted: "
+#~ msgstr "Borrado: "
+
+#~ msgid "Declined: "
+#~ msgstr "Rechazado: "
+
+#~ msgid "Completed: "
+#~ msgstr "Completado: "
+
+#~ msgid "Undelivered: "
+#~ msgstr "Sin entregar: "
+
+#~ msgid "Header Value Contains:"
+#~ msgstr "El valor de cabecera contiene:"
+
+#~ msgid "Drafts based template plugin"
+#~ msgstr "Borradores basados en el complemento de plantillas"
+
+#~ msgid "The organizer selected no longer has an account."
+#~ msgstr "El organizador seleccionado ya no tiene una cuenta."
+
+#~ msgid "Opening store '%s'"
+#~ msgstr "Abriendo almacén «%s»"
+
+#~ msgid "Delete messages in Search Folder \"{0}\"?"
+#~ msgstr "¿Eliminar los mensajes en la carpeta de búsqueda «{0}»?"
+
+#~ msgid "Run Anjal in a window"
+#~ msgstr "Ejecutar Anjal en una ventana"
+
+#~ msgid "Make Anjal the default email client"
+#~ msgstr "Hacer que Anjal sea el cliente de correo predeterminado"
+
+#~ msgid "Anjal email client"
+#~ msgstr "Cliente de correo Anjal"
+
+#~ msgid "Evolution Profiler"
+#~ msgstr "Perfilador de Evolution"
+
+#~ msgid "Profile data events in Evolution (for developers only)."
+#~ msgstr ""
+#~ "Perfiles de datos de eventos en Evolution (sólo para desarrolladores)."
+
+#~ msgid "(map)"
+#~ msgstr "(mapa)"
+
+#~ msgid "map"
+#~ msgstr "mapa"
+
+#~ msgid "Select folder to import OE folder into"
+#~ msgstr "Seleccionar la carpeta en la que importar la carpeta OE"
+
+#~ msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
+#~ msgstr "Seleccionar una imagen png (el mejor tamaño es 48*48 < 720bytes)"
+
+#~ msgid "Accessing LDAP Server anonymously"
+#~ msgstr "Accediendo al servidor LDAP anónimamente"
+
+#~ msgid "Account Management"
+#~ msgstr "Administración de cuentas"
+
+#~ msgid "Migrate local mbox folders to maildir"
+#~ msgstr "Migrar las carpetas mbox locales a maildir"
+
+#~ msgid ""
+#~ "Folder '%s' contains %d duplicate messages. Are you sure you want to "
+#~ "delete them?"
+#~ msgstr ""
+#~ "La carpeta «%s» contiene %d correos duplicados. ¿Está seguro de que "
+#~ "quiere eliminarlos?"
+
+#~ msgid ""
+#~ "Error on %s: %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Error en %s: %s\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error on %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Error en %s:\n"
+#~ " %s"
+
+#~ msgid "Start Evolution activating the specified component"
+#~ msgstr "Iniciar Evolution activando el componente especificado"
+
+#~ msgid "Remove all duplicate messages"
+#~ msgstr "Quitar todos los correos duplicados"
+
+#~ msgid "begin editing this cell"
+#~ msgstr "empezar a editar esta celda"
+
+#~ msgid "Count of default recurrence for a new event. -1 means forever."
+#~ msgstr ""
+#~ "Conteo de las repeticiones predeterminadas para un acontecimiento nuevo. "
+#~ "-1 significa para siempre."
+
+>>>>>>> master
 #~ msgid "Default recurrence count"
 #~ msgstr "Conteo de repeticiones predeterminado"
 
diff --git a/po/ga.po b/po/ga.po
index e11b4f08b1..8d55e21add 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -3,14 +3,24 @@
 # This file is distributed under the same license as the evolution package.
 # Alastair McKinstry <mckinstry@computer.org>, 2001.
 # David O'Callaghan <david.ocallaghan@cs.tcd.ie>, 2003.
+<<<<<<< HEAD
 # Seán de Búrca <leftmostcat@gmail.com>, 2007-2011.
+=======
+# Seán de Búrca <leftmostcat@gmail.com>, 2007-2011, 2011.
+>>>>>>> master
 #
+#: ../shell/main.c:570
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.master\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2011-05-23 04:48-0600\n"
 "PO-Revision-Date: 2011-05-23 05:47-0600\n"
+=======
+"POT-Creation-Date: 2011-09-26 20:46-0600\n"
+"PO-Revision-Date: 2011-09-26 21:48-0600\n"
+>>>>>>> master
 "Last-Translator: Seán de Búrca <leftmostcat@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
 "Language: ga\n"
@@ -34,74 +44,95 @@ msgid ""
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:4
-msgid "Address '{0}' already exists."
+msgid ""
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:5
-msgid "Cannot add new contact"
+msgid "Add with duplicates"
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:6
+msgid "Address '{0}' already exists."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:7
+msgid "Cannot add new contact"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Cannot move contact."
 msgstr "Ní féidir teagmháil a bhogadh."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Category editor not available."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:10
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
 "your caps lock might be on."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Could not get schema information for LDAP server."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Could not remove address book."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:13
 msgid ""
 "Currently you can only access the GroupWise System Address Book from "
 "Evolution. Please use some other GroupWise mail client once to get your "
 "GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Delete address book '{0}'?"
 msgstr "Scrios leabhar seoltaí '{0}'?"
 
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:13
 #: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+=======
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:37 ../mail/mail.error.xml.h:45
+>>>>>>> master
 msgid "Do _Not Delete"
 msgstr "_Ná Scrios"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Earráid agus {0} á shábháil go {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Failed to authenticate with LDAP server."
 msgstr ""
 
+<<<<<<< HEAD
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1277
+=======
+#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
+>>>>>>> master
 msgid "Failed to delete contact"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "GroupWise Address book creation:"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "LDAP server did not respond with valid schema information."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:19
 msgid "Some features may not work properly with your current server"
 msgstr ""
@@ -111,17 +142,45 @@ msgid "The Evolution address book has quit unexpectedly."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:21
+=======
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "List '{0}' is already in this contact list."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "Skip duplicates"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:23
+msgid "Some addresses already exist in this contact list."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:24
+msgid "Some features may not work properly with your current server"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:25
+msgid "The Evolution address book has quit unexpectedly."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:26
+>>>>>>> master
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:22
+=======
+#: ../addressbook/addressbook.error.xml.h:27
+>>>>>>> master
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book could not be opened."
 msgstr ""
@@ -131,11 +190,23 @@ msgid "This address book server does not have any suggested search bases."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:25
+=======
+#: ../addressbook/addressbook.error.xml.h:28
+msgid "This address book could not be opened."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:29
+msgid "This address book server does not have any suggested search bases."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:30
+>>>>>>> master
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:26
 msgid "This address book will be removed permanently."
 msgstr "Bainfear an leabhar seoltaí seo go buan."
@@ -161,58 +232,116 @@ msgid "Would you like to save your changes?"
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:32
+=======
+#: ../addressbook/addressbook.error.xml.h:31
+msgid "This address book will be removed permanently."
+msgstr "Bainfear an leabhar seoltaí seo go buan."
+
+#: ../addressbook/addressbook.error.xml.h:32
+msgid "This server does not support LDAPv3 schema information."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:33
+msgid "Unable to open address book"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:34
+msgid "Unable to perform search."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "Unable to save {0}."
+msgstr "Ní féidir {0} a shábháil."
+
+#: ../addressbook/addressbook.error.xml.h:36
+msgid "Would you like to save your changes?"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:37
+>>>>>>> master
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:33
+=======
+#: ../addressbook/addressbook.error.xml.h:38
+>>>>>>> master
 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 ""
 
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:34
 msgid "You do not have permission to delete contacts in this address book."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:35
+=======
+#: ../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?"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:40
+msgid "You do not have permission to delete contacts in this address book."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:41
+>>>>>>> master
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr ""
 
 #. Translators: {0} is replaced with an address book name which will not be available
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:37
+=======
+#: ../addressbook/addressbook.error.xml.h:43
+>>>>>>> master
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:611
+=======
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:618
+>>>>>>> master
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "Cuir _Leis"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "_Discard"
 msgstr "_Caith uait"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "_Do not save"
 msgstr "_Ná sábháil"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:47
 msgid "_Resize"
 msgstr "_Athraigh méid"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:48
 msgid "_Use as it is"
 msgstr "Ú_sáid mar atá sé"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:574
 #: ../calendar/gui/e-calendar-view.c:2080
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:715
+#: ../calendar/gui/e-calendar-view.c:2104
+>>>>>>> master
 msgid "Anniversary"
 msgstr "Cothrom Lae"
 
@@ -222,35 +351,57 @@ msgstr "Cothrom Lae"
 #. * 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
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:573
 #: ../calendar/gui/e-calendar-view.c:2079 ../capplet/anjal-settings-main.c:77
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:714
+#: ../calendar/gui/e-calendar-view.c:2103 ../capplet/anjal-settings-main.c:79
+>>>>>>> master
 #: ../shell/main.c:140
 msgid "Birthday"
 msgstr "Breithlá"
 
 #. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+<<<<<<< HEAD
 #, fuzzy
 msgid "Blog:"
 msgstr "Blag"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:4
+=======
+msgid "Blog:"
+msgstr "Blag:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:3
+>>>>>>> master
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "_Catagóirí..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+<<<<<<< HEAD
 #, fuzzy
 msgid "Calendar:"
 msgstr "_Féilire:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
 #: ../addressbook/importers/evolution-vcard-importer.c:968
+=======
+msgid "Calendar:"
+msgstr "Féilire:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/importers/evolution-vcard-importer.c:991
+>>>>>>> master
 msgid "Contact"
 msgstr "Teagmháil"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+<<<<<<< HEAD
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:644
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:664
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2836
@@ -874,6 +1025,626 @@ msgstr "Fón Gnó"
 msgid "Business Phone 2"
 msgstr "Fón Gnó 2"
 
+=======
+#: ../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
+msgid "Contact Editor"
+msgstr "Eagarthóir Teagmhálacha"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:386
+#: ../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
+msgid "Email"
+msgstr "Ríomhphost"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+msgid "Free/Busy:"
+msgstr "Saor/Gnóthach:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+msgid "Full _Name..."
+msgstr "Ainm _Iomlán..."
+
+#: ../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:1323
+#: ../widgets/misc/e-contact-map.c:295
+msgid "Home"
+msgstr "Baile"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+msgid "Home Page:"
+msgstr "Leathanach Baile:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+msgid "Image"
+msgstr "�omhá"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+msgid "Instant Messaging"
+msgstr "Cur Teachtaireachtaí Meandaracha"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+msgid "Job"
+msgstr "Post"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+msgid "Mailing Address"
+msgstr "Seoladh Poist"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../calendar/gui/dialogs/task-details-page.ui.h:11
+msgid "Miscellaneous"
+msgstr "Éagsúil"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+msgid "Nic_kname:"
+msgstr "_Leasainm:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+msgid "Notes"
+msgstr "Nótaí"
+
+#: ../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:409
+#: ../calendar/gui/e-calendar-view.c:1806
+msgid "Other"
+msgstr "Eile"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+msgid "Personal Information"
+msgstr "Eolas Pearsanta"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+msgid "Telephone"
+msgstr "Teileafón"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+msgid "Video Chat:"
+msgstr "Comhrá Físe:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+msgid "Web Addresses"
+msgstr "Seoltaí Gréasáin"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+msgid "Web addresses"
+msgstr "Seoltaí gréasáin"
+
+#: ../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:694
+#: ../addressbook/gui/widgets/eab-contact-display.c:1320
+#: ../widgets/misc/e-contact-map.c:303
+msgid "Work"
+msgstr "Obair"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+msgid "_Address:"
+msgstr "S_eoladh:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+msgid "_Anniversary:"
+msgstr "Cothrom _Lae:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+msgid "_Assistant:"
+msgstr "Cú_ntóir:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+msgid "_Birthday:"
+msgstr "_Breithlá:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+msgid "_Blog:"
+msgstr "_Blag:"
+
+#: ../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:1963
+msgid "_Calendar:"
+msgstr "_Féilire:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+msgid "_City:"
+msgstr "_Cathair:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+msgid "_Company:"
+msgstr "Co_mhlacht:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+msgid "_Country:"
+msgstr "_Tír:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+msgid "_Department:"
+msgstr "_Roinn:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+msgid "_File under:"
+msgstr "C_omhdaigh faoi:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+msgid "_Free/Busy:"
+msgstr "S_aor/Gnóthach:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+msgid "_Home Page:"
+msgstr "_Leathanach Baile:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+msgid "_Manager:"
+msgstr "_Bainisteoir:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+msgid "_Office:"
+msgstr "_Oifig:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+msgid "_PO Box:"
+msgstr "Bosca _Phoist:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+msgid "_Profession:"
+msgstr "_Gairm:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+msgid "_Spouse:"
+msgstr "Cé_ile:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+msgid "_State/Province:"
+msgstr "_Stát/Cúige:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
+msgid "_Title:"
+msgstr "_Teideal:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+msgid "_Video Chat:"
+msgstr "Comhrá _Físe:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+msgid "_Wants to receive HTML mail"
+msgstr "Ba _mhaith leis post HTML a fháil"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
+msgid "_Where:"
+msgstr "_Cén �it:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
+msgid "_Zip/Postal Code:"
+msgstr "_Cód Zip/Poist:"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../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:658
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../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:661
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../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:657
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../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:662
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
+#: ../addressbook/gui/widgets/eab-gui-util.c:469
+msgid "Error adding contact"
+msgstr "Earráid agus teagmháil á chur leis"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
+msgid "Error modifying contact"
+msgstr "Earráid agus teagmháil á athrú"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
+msgid "Error removing contact"
+msgstr "Earráid agus teagmháil á bhaint"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:670
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2919
+#, c-format
+msgid "Contact Editor - %s"
+msgstr "Eagarthóir Teagmhálacha - %s"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3398
+msgid "Please select an image for this contact"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3399
+msgid "_No image"
+msgstr "_Gan íomhá"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3730
+msgid ""
+"The contact data is invalid:\n"
+"\n"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3743
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3756
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3770
+#, c-format
+msgid "%s'%s' is empty"
+msgstr "Is folamh é %s'%s'"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3785
+msgid "Invalid contact."
+msgstr "Teagmháil neamhbhailí."
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:437
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:440
+msgid "_Edit Full"
+msgstr "Cuir Ainm Iomlán in _Eagar"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:488
+msgid "_Full name"
+msgstr "_Ainm iomlán"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:499
+msgid "E_mail"
+msgstr "_Ríomhphost"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:510
+msgid "_Select Address Book"
+msgstr "_Roghnaigh Leabhar Seoltaí"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:1
+msgid "Dr."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:2
+msgid "Esq."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Full Name"
+msgstr "Ainm Iomlán"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:4
+msgid "I"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:5
+msgid "II"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:6
+msgid "III"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:7
+msgid "Jr."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:8
+msgid "Miss"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:9
+msgid "Mr."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:10
+msgid "Mrs."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:11
+msgid "Ms."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:12
+msgid "Sr."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
+msgid "_First:"
+msgstr "Cé_adainm:"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+msgid "_Last:"
+msgstr "_Sloinne:"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
+msgid "_Middle:"
+msgstr "_Lárainm:"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
+msgid "_Suffix:"
+msgstr "_Iarmhír:"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:742
+msgid "Contact List Editor"
+msgstr "Eagarthóir Liosta Teagmhálacha"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+#, fuzzy
+msgid "Members"
+msgstr "_Baill"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+msgid "_Hide addresses when sending mail to this list"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
+msgid "_List name:"
+msgstr "Ainm _liosta:"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+#: ../mail/mail-config.ui.h:163
+msgid "_Select..."
+msgstr "_Roghnaigh..."
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
+msgid "_Type an email address or drag a contact into the list below:"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:865
+msgid "Contact List Members"
+msgstr "Baill Liosta Teagmhálacha"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1440
+msgid "Error adding list"
+msgstr "Earráid agus liosta á chur leis"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1455
+msgid "Error modifying list"
+msgstr "Earráid agus liosta á athrú"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1470
+msgid "Error removing list"
+msgstr "Earráid agus liosta á bhaint"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1601
+msgid "_Members"
+msgstr "_Baill"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
+msgid "Changed Contact:"
+msgstr ""
+
+#. Translators: Heading of the contact which has same name or email address in this folder already.
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+msgid "Conflicting Contact:"
+msgstr ""
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
+msgid "Duplicate Contact Detected"
+msgstr ""
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
+msgid ""
+"The name or email of this contact already exists in this folder. Would you "
+"like to save the changes anyway?"
+msgstr ""
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
+msgid "New Contact:"
+msgstr "Teagmháil Nua:"
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
+msgid "Original Contact:"
+msgstr "Bunteagmháil:"
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
+msgstr ""
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:332
+msgid "_Merge"
+msgstr "Cu_maisc"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:315
+msgid "Merge Contact"
+msgstr "Cumaisc Teagmháil"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../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-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
+msgid "Any field contains"
+msgstr "Aon réimse ina bhfuil"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
+msgid "Email begins with"
+msgstr "Tosaíonn ríomhphost le"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
+msgid "Name contains"
+msgstr "Ainm ina bhfuil"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:157
+msgid "No contacts"
+msgstr "Gan teagmhálacha"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:161
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "teagmháil"
+msgstr[1] "%d teagmháil"
+msgstr[2] "%d theagmháil"
+msgstr[3] "%d dteagmháil"
+msgstr[4] "%d teagmháil"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:357
+msgid "Error getting book view"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:771
+msgid "Search Interrupted"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:158
+msgid "Error modifying card"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
+#, fuzzy
+msgid "Cut selected contacts to the clipboard"
+msgstr "Gearr téacs roghnaithe go dtí an gearrthaisce"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
+#, fuzzy
+msgid "Copy selected contacts to the clipboard"
+msgstr "Cóipeáil téacs roghnaithe go dtí an gearrthaisce"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#, fuzzy
+msgid "Paste contacts from the clipboard"
+msgstr "Greamaigh tascanna ón ngearrthaisce"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
+msgid "Delete selected contacts"
+msgstr "Scrios teagmhálacha roghnaithe"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:648
+#, fuzzy
+msgid "Select all visible contacts"
+msgstr "Roghnaigh gach teagmháil"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
+#, fuzzy
+msgid "Are you sure you want to delete these contact lists?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an {0} tasc seo a scriosadh?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#, fuzzy
+msgid "Are you sure you want to delete this contact list?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an tasc seo a scriosadh?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
+#, fuzzy, c-format
+msgid "Are you sure you want to delete this contact list (%s)?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an tasc seo a scriosadh?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1340
+#, fuzzy
+msgid "Are you sure you want to delete these contacts?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an tasc seo a scriosadh?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1344
+#, fuzzy
+msgid "Are you sure you want to delete this contact?"
+msgstr ""
+"An bhfuil tú cinnte gur mian leat\n"
+"an cuntas \"%1\" a scriosadh?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1348
+#, fuzzy, c-format
+msgid "Are you sure you want to delete this contact (%s)?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an tasc seo a scriosadh?"
+
+#. Translators: This is shown for > 5 contacts.
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1504
+#, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgid_plural ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1512
+msgid "_Don't Display"
+msgstr "_Ná Taispeáin"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
+msgid "Display _All Contacts"
+msgstr "Taispeáin _Gach Teagmháil"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
+msgid "Assistant"
+msgstr "Cúntóir"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "Fón Chúntóir"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "Facs Gnó"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "Fón Gnó"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "Fón Gnó 2"
+
+>>>>>>> master
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Fón Aisghlaoigh"
@@ -883,12 +1654,17 @@ msgid "Car Phone"
 msgstr "Fón Cairr"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/event-page.ui.h:5
+=======
+#: ../calendar/gui/dialogs/event-page.ui.h:4
+>>>>>>> master
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
 msgid "Categories"
 msgstr "Catagóirí"
+<<<<<<< HEAD
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
@@ -1034,8 +1810,170 @@ msgid ""
 "Search for the Contact\n"
 "\n"
 "or double-click here to create a new Contact."
+=======
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
+msgid "Company"
+msgstr "Comhlacht"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Fón Comhlachta"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 2"
+msgstr "Ríomhphost 2"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Email 3"
+msgstr "Ríomhphost 3"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "Family Name"
+msgstr "Sloinne"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+msgid "File As"
+msgstr "Sábháil Mar"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Given Name"
+msgstr "Ainm"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Fax"
+msgstr "Facs Baile"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone"
+msgstr "Fón Baile"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone 2"
+msgstr "Fón Baile 2"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "ISDN Phone"
+msgstr "Fón ISDN"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Journal"
+msgstr "Iris"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
+msgid "Manager"
+msgstr "Bainisteoir"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:712
+msgid "Mobile Phone"
+msgstr "Fón Póca"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+msgid "Nickname"
+msgstr "Leasainm"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:739
+msgid "Note"
+msgstr "Nóta"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Oifig"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "Facs Eile"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "Fón Eile"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Glaoire"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "Príomhfhón"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Raidió"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: ../calendar/gui/e-meeting-list-view.c:610
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Ról"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-display.c:716
+msgid "Spouse"
+msgstr "Céile"
+
+#. Translators: This is a vcard standard and stands for the type of
+#. phone used by the hearing impaired. TTY stands for "teletype"
+#. (familiar from Unix device names), and TDD is "Telecommunications
+#. Device for Deaf". However, you probably want to leave this
+#. abbreviation unchanged unless you know that there is actually a
+#. different and established translation for this in your language.
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+msgid "Telex"
+msgstr "Telex"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+msgid "Title"
+msgstr "Teideal"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Unit"
+msgstr "Aonad"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Web Site"
+msgstr "Suíomh Gréasáin"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
+msgid ""
+"\n"
+"\n"
+"Search for the Contact\n"
+"\n"
+"or double-click here to create a new Contact."
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+>>>>>>> master
 msgstr ""
+"\n"
+"\n"
+"Níl aon mhír le taispeáint san amharc seo.\n"
+"\n"
+"Déchliceáil anseo chun Teagmháil nua a chruthú."
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
@@ -1043,6 +1981,13 @@ msgid ""
 "There are no items to show in this view.\n"
 "\n"
 "Double-click here to create a new Contact."
+=======
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
+msgid ""
+"\n"
+"\n"
+"Search for the Contact."
+>>>>>>> master
 msgstr ""
 "\n"
 "\n"
@@ -1050,6 +1995,7 @@ msgstr ""
 "\n"
 "Déchliceáil anseo chun Teagmháil nua a chruthú."
 
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
@@ -1480,8 +2426,557 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
+=======
+#: ../addressbook/gui/widgets/e-minicard-view.c:204
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard.c:100
+msgid "Work Email"
+msgstr "Ríomhphost Oibre"
+
+#: ../addressbook/gui/widgets/e-minicard.c:101
+msgid "Home Email"
+msgstr "Ríomhphost Baile"
+
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:819
+msgid "Other Email"
+msgstr "Ríomhphost Eile"
+
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+#: ../addressbook/gui/widgets/ea-minicard-view.c:187
+msgid "evolution address book"
+msgstr "leabhar seoltaí evolution"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact"
+msgstr "Teagmháil Nua"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:37
+msgid "New Contact List"
+msgstr "Liosta Teagmhálacha Nua"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:170
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../addressbook/gui/widgets/ea-minicard.c:34
+msgid "Open"
+msgstr "Oscail"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:156
+msgid "Contact List: "
+msgstr "Liosta Teagmhálacha: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:157
+msgid "Contact: "
+msgstr "Teagmháil: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:183
+msgid "evolution minicard"
+msgstr "mion-charta evolution"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:182
+msgid "Copy _Email Address"
+msgstr "Cóipeáil _Seoladh Ríomhphoist"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:184
+#: ../widgets/misc/e-web-view.c:432
+#, fuzzy
+msgid "Copy the email address to the clipboard"
+msgstr "Cóipeáil rudaí go dtí an gearrthaisce."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../widgets/misc/e-web-view.c:437
+msgid "_Send New Message To..."
+msgstr "_Seol Teachtaireacht Nua Chuig..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../widgets/misc/e-web-view.c:439
+#, fuzzy
+msgid "Send a mail message to this address"
+msgstr "Post an sceál seo"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:215
+#, fuzzy
+msgid "Open map"
+msgstr "_Oscail Meamram"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#, fuzzy
+msgid "List Members:"
+msgstr "Liosta Ball"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
+msgid "Department"
+msgstr "Roinn"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
+msgid "Profession"
+msgstr "Gairm"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
+msgid "Position"
+msgstr "Ionad"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
+msgid "Video Chat"
+msgstr "Comhrá Físe"
+
+#: ../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:517
+#: ../modules/online-accounts/e-online-accounts-google.c:294
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:528
+msgid "Calendar"
+msgstr "Féilire"
+
+#: ../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 "Saor/Gnóthach"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:689
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
+msgid "Phone"
+msgstr "Fón"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
+msgid "Fax"
+msgstr "Facs"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:691
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
+msgid "Address"
+msgstr "Seoladh"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:708
+msgid "Home Page"
+msgstr "Leathanach Baile"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
+msgid "Web Log"
+msgstr "Loga Gréasáin"
+
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person memo list
+#. Create the default Person task list
+#: ../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
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-memo-shell-backend.c:122
+#: ../modules/calendar/e-memo-shell-migrate.c:120
+#: ../modules/calendar/e-task-shell-backend.c:122
+#: ../modules/calendar/e-task-shell-migrate.c:132
+msgid "Personal"
+msgstr "Pearsanta"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:986
+msgid "List Members"
+msgstr "Liosta Ball"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1004
+msgid "Job Title"
+msgstr "Teideal Poist"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1041
+msgid "Home page"
+msgstr "Leathanach Baile"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1050
+msgid "Blog"
+msgstr "Blag"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1248
+#: ../widgets/misc/e-web-view.c:980
+#, fuzzy, c-format
+msgid "Click to mail %s"
+msgstr "Seol ríomhphost chuig '%1'"
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid "Detailed error message:"
+msgstr ""
+
+#: ../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"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+
+#: ../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"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this address book."
+msgstr ""
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../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 ""
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr ""
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../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 ""
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:263
+msgid "card.vcf"
+msgstr "carta.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
+msgid "Select Address Book"
+msgstr "Roghnaigh Leabhar Seoltaí"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
+msgid "list"
+msgstr "liosta"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:552
+msgid "Move contact to"
+msgstr "Bog teagmháil go"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:554
+msgid "Copy contact to"
+msgstr "Cóipeáil teagmháil go"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:557
+msgid "Move contacts to"
+msgstr "Bog teagmhálacha go"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:559
+msgid "Copy contacts to"
+msgstr "Cóipeáil teagmhálacha go"
+
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
+msgid "Card View"
+msgstr "Amharc Carta"
+
+#: ../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:902
+#: ../calendar/importers/icalendar-importer.c:941 ../shell/shell.error.xml.h:6
+msgid "Importing..."
+msgstr "� Iompórtáil..."
+
+#: ../addressbook/importers/evolution-csv-importer.c:1072
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr "CSV nó Táb Outlook (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1073
+msgid "Outlook CSV and Tab Importer"
+msgstr "Iompórtálaí CSV agus Táib Outlook"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1081
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr "CSV nó Táb Mozilla (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1082
+msgid "Mozilla CSV and Tab Importer"
+msgstr "Iompórtálaí CSV agus Táib Mozilla"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1090
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr "CSV nó Táb Evolution (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1091
+msgid "Evolution CSV and Tab Importer"
+msgstr "Iompórtálaí CSV agus Táib Evolution"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:796
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "LDAP Data Interchange Format (.ldif)"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:797
+msgid "Evolution LDIF importer"
+msgstr "Iompórtálaí LDIF Evolution"
+
+#: ../addressbook/importers/evolution-vcard-importer.c:658
+msgid "vCard (.vcf, .gcrd)"
+msgstr "vCard (.vcf, .gcrd)"
+
+#: ../addressbook/importers/evolution-vcard-importer.c:659
+msgid "Evolution vCard Importer"
+msgstr "Iompórtálaí vCard Evolution"
+
+#. 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:719
+#, c-format
+msgid "Page %d"
+msgstr "Leathanach %d"
+
+#: ../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 "Ní féidir comhad a oscailt"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#, fuzzy, c-format
+msgid "Couldn't get list of address books: %s"
+msgstr "Níorbh fhéidir liosta leabhar seoltaí a fháil"
+
+#: ../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:1765 ../em-format/em-format.c:2324
+#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:659
+#: ../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
+msgid "Unknown error"
+msgstr "Earráid anaithnid"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#, fuzzy, c-format
+msgid "Failed to open client '%s': %s"
+msgstr "Comhad féilire le luchtú"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:60
+msgid "Specify the output file instead of standard output"
+msgstr "Sonraigh an comhad aschurtha seachas aschur caighdeánach"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:61
+msgid "OUTPUTFILE"
+msgstr "COMHADASCHURTHA"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:64
+msgid "List local address book folders"
+msgstr "Liostáil fillteáin leabhar seoltaí logánta"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:67
+msgid "Show cards as vcard or csv file"
+msgstr "Taispeáin cartaí mar chomhad vcard nó csv"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:68
+msgid "[vcard|csv]"
+msgstr "[vcard|csv]"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:71
+msgid "Export in asynchronous mode"
+msgstr "Easpórtáil i mód aisioncronach"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:74
+msgid ""
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:76
+msgid "NUMBER"
+msgstr "UIMHIR"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:139
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:153
+msgid "Only support csv or vcard format."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:162
+msgid "In async mode, output must be file."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:170
+msgid "In normal mode, there is no need for the size option."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:201
+msgid "Unhandled error"
+msgstr "Earráid gan láimhseáil"
+
+#. 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 ""
+
+#. 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 ""
+
+#. For Translators: {0} is the name of the calendar source
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../calendar/calendar.error.xml.h:9
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:10
+msgid "All information in this memo will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:11
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:12
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:13
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:14
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:15
+msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
 
+#: ../calendar/calendar.error.xml.h:16
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an tasc '{0}' a scriosadh?"
+
+#: ../calendar/calendar.error.xml.h:18
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr ""
+"An bhfuil tú cinnte gur mhaith leat an choinne dar teideal '{0}' a scriosadh?"
+
+#: ../calendar/calendar.error.xml.h:19
+#, fuzzy
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr ""
+"An bhfuil tú cinnte gur mhaith leat an choinne dar teideal '{0}' a scriosadh?"
+
+#: ../calendar/calendar.error.xml.h:20
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an meamram '{0}' a scriosadh?"
+
+#: ../calendar/calendar.error.xml.h:21
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an {0} coinne seo a scriosadh?"
+
+#: ../calendar/calendar.error.xml.h:22
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an {0} meamram seo a scriosadh?"
+
+#: ../calendar/calendar.error.xml.h:23
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an {0} tasc seo a scriosadh?"
+
+#: ../calendar/calendar.error.xml.h:24
+msgid "Are you sure you want to delete this appointment?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an choinne seo a scriosadh?"
+
+#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/gui/dialogs/delete-comp.c:191
+#, c-format
+msgid "Are you sure you want to delete this meeting?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an cruinniú seo a scriosadh?"
+
+#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/gui/dialogs/delete-comp.c:197
+#, c-format
+msgid "Are you sure you want to delete this memo?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an meamram seo a scriosadh?"
+
+#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/gui/dialogs/delete-comp.c:194
+#, c-format
+msgid "Are you sure you want to delete this task?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an tasc seo a scriosadh?"
+
+#: ../calendar/calendar.error.xml.h:28
+#, fuzzy
+msgid "Are you sure you want to save the appointment without a summary?"
+>>>>>>> master
+msgstr ""
+"An bhfuil tú cinnte gur mhaith leat an choinne dar teideal '{0}' a scriosadh?"
+
+<<<<<<< HEAD
 #: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr ""
@@ -3315,8 +4810,1843 @@ msgstr "ar an"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1419
 msgid "occurrences"
+=======
+#: ../calendar/calendar.error.xml.h:29
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:30
+#, fuzzy
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "An bhfuil tú cinnte gur mhaith leat an tasc seo a scriosadh?"
+
+#: ../calendar/calendar.error.xml.h:31
+msgid "Cannot create a new event"
+msgstr "Ní féidir teagmhas nua a chruthú"
+
+#: ../calendar/calendar.error.xml.h:32
+msgid "Cannot save event"
+msgstr "Ní féidir teagmhas a shábháil"
+
+#: ../calendar/calendar.error.xml.h:33
+#, fuzzy
+msgid "Cannot save task"
+msgstr "Ní féidir teagmhas a shábháil"
+
+#: ../calendar/calendar.error.xml.h:34
+msgid "Delete calendar '{0}'?"
+msgstr "Scrios féilire '{0}'?"
+
+#: ../calendar/calendar.error.xml.h:35
+msgid "Delete memo list '{0}'?"
+msgstr "Scrios liosta meamram '{0}'?"
+
+#: ../calendar/calendar.error.xml.h:36
+msgid "Delete task list '{0}'?"
+msgstr "Scrios liosta tascanna '{0}'?"
+
+#: ../calendar/calendar.error.xml.h:38
+msgid "Do _not Send"
+msgstr "_Ná Seol"
+
+#: ../calendar/calendar.error.xml.h:39
+msgid "Download in progress. Do you want to save the appointment?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:40
+msgid "Download in progress. Do you want to save the task?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:41
+msgid "Editor could not be loaded."
+msgstr "Ní féidir eagarthóir a luchtú."
+
+#: ../calendar/calendar.error.xml.h:42
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:43
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:44
+msgid "Error loading calendar"
+msgstr "Earráid agus féilire á luchtú"
+
+#: ../calendar/calendar.error.xml.h:45
+msgid "Error loading memo list"
+msgstr "Earráid agus liosta meamram á luchtú"
+
+#: ../calendar/calendar.error.xml.h:46
+msgid "Error loading task list"
+msgstr "Earráid agus liosta tascanna á luchtú"
+
+#. 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:49
+#, fuzzy
+msgid "Error on {0}: {1}"
+msgstr "Earráid ar '{0}'"
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../calendar/calendar.error.xml.h:53
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:54
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:55
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:56
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:57
+msgid "Some features may not work properly with your current server."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:58
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:59
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:60
+msgid "The Evolution memo has quit unexpectedly."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:61
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:62
+msgid "The calendar is not marked for offline usage."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:63
+msgid "The memo list is not marked for offline usage."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:64
+msgid "The task list is not marked for offline usage."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:65
+msgid "This calendar will be removed permanently."
+msgstr "Bainfear an féilire seo go buan."
+
+#: ../calendar/calendar.error.xml.h:66
+msgid "This memo list will be removed permanently."
+msgstr "Bainfear an liosta meamram seo go buan."
+
+#: ../calendar/calendar.error.xml.h:67
+msgid "This task list will be removed permanently."
+msgstr "Bainfear an liosta tascanna seo go buan."
+
+#: ../calendar/calendar.error.xml.h:68
+msgid "Would you like to save your changes to this appointment?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:69
+#, fuzzy
+msgid "Would you like to save your changes to this meeting?"
+msgstr "Ar mhaith leat do chuid athruithe a shábháil?"
+
+#: ../calendar/calendar.error.xml.h:70
+msgid "Would you like to save your changes to this memo?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:71
+msgid "Would you like to save your changes to this task?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:72
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:73
+msgid "Would you like to send all the participants a cancelation notice?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:74
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:75
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:76
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:77
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:78
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:79
+msgid "You have changed this appointment, but not yet saved it."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:80
+msgid "You have changed this meeting, but not yet saved it."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:81
+msgid "You have changed this task, but not yet saved it."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:82
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:83
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:84
+msgid "Your memos will not be available until Evolution is restarted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:85
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:86
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Discard Changes"
+msgstr "Cuir Athruithe i _Leataobh"
+
+#: ../calendar/calendar.error.xml.h:87 ../composer/e-composer-actions.c:317
+msgid "_Save"
+msgstr "_Sábháil"
+
+#: ../calendar/calendar.error.xml.h:88
+msgid "_Save Changes"
+msgstr "_Sábháil Athruithe"
+
+#: ../calendar/calendar.error.xml.h:89
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Send"
+msgstr "_Seol"
+
+#: ../calendar/calendar.error.xml.h:90
+msgid "_Send Notice"
+msgstr "_Seol Fógra"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:107
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "nóiméad"
+msgstr[1] "nóiméad"
+msgstr[2] "nóiméad"
+msgstr[3] "nóiméad"
+msgstr[4] "nóiméad"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "uair"
+msgstr[1] "uair"
+msgstr[2] "uaire"
+msgstr[3] "n-uaire"
+msgstr[4] "uair"
+
+#. 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:133
+#: ../calendar/gui/dialogs/recurrence-page.c:1190
+msgid "day"
+msgid_plural "days"
+msgstr[0] "lá"
+msgstr[1] "lá"
+msgstr[2] "lá"
+msgstr[3] "lá"
+msgstr[4] "lá"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:313
+msgid "Start time"
+msgstr "Am tosaigh"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
+msgid "Appointments"
+msgstr "Coinní"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
+msgid "Dismiss _All"
+msgstr ""
+
+#. 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
+#: ../plugins/itip-formatter/itip-view.c:1052
+msgid "Location:"
+msgstr "Suíomh:"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
+msgid "Snooze _time:"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:919
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
+msgid "_Dismiss"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
+msgid "_Snooze"
+msgstr ""
+
+#. Translators: This is the last part of the sentence:
+#. * "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:454
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
+#: ../plugins/google-account-setup/google-contacts-source.c:387
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+msgid "days"
+msgstr "lá"
+
+#: ../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:453
+#: ../filter/filter.ui.h:15
+#: ../plugins/google-account-setup/google-contacts-source.c:386
+msgid "hours"
+msgstr "uair"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+msgid "location of appointment"
+msgstr ""
+
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../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:452
+#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/google-account-setup/google-contacts-source.c:385
+msgid "minutes"
+msgstr "nóiméad"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+msgid "No summary available."
+msgstr "Gan achoimre le fáil."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+msgid "No description available."
+msgstr "Gan chur síos le fáil."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1607
+msgid "No location information available."
+msgstr "Gan eolas suímh le fáil."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
+#, fuzzy, c-format
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] "Tá %d aláram agat"
+msgstr[1] "Tá %d aláram agat"
+msgstr[2] "Tá %d aláram agat"
+msgstr[3] "Tá %d n-aláram agat"
+msgstr[4] "Tá %d aláram agat"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1853
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
+msgid "Warning"
+msgstr "Rabhadh"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1857
+msgid ""
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email.  Evolution will display\n"
+"a normal reminder dialog box instead."
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1894
+#, c-format
+msgid ""
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1909
+msgid "Do not ask me about this program again."
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/util.c:45
+msgid "invalid time"
+msgstr "am neamhbhailí"
+
+#. 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
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d uair"
+msgstr[1] "%d uair"
+msgstr[2] "%d uaire"
+msgstr[3] "%d n-uaire"
+msgstr[4] "%d uair"
+
+#. 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
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d nóiméad"
+msgstr[1] "%d nóiméad"
+msgstr[2] "%d nóiméad"
+msgstr[3] "%d nóiméad"
+msgstr[4] "%d nóiméad"
+
+#. 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:81 ../calendar/gui/e-alarm-list.c:417
+#: ../calendar/gui/misc.c:128
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d soicind"
+msgstr[1] "%d shoicind"
+msgstr[2] "%d shoicind"
+msgstr[3] "%d soicind"
+msgstr[4] "%d soicind"
+
+#: ../calendar/gui/calendar-view-factory.c:116
+msgid "Day View"
+msgstr "Amharc Lae"
+
+#: ../calendar/gui/calendar-view-factory.c:119
+msgid "Work Week View"
+msgstr "Amharc Seachtaine Oibre"
+
+#: ../calendar/gui/calendar-view-factory.c:122
+msgid "Week View"
+msgstr "Amharc Seachtaine"
+
+#: ../calendar/gui/calendar-view-factory.c:125
+msgid "Month View"
+msgstr "Amharc Míosa"
+
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:3
+msgid "Any Field"
+msgstr "Aon Réimse"
+
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Iatáin"
+
+#: ../calendar/gui/caltypes.xml.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:6
+msgid "Attendee"
+msgstr "Rannpháirtí"
+
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:8
+msgid "Category"
+msgstr "Catagóir"
+
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
+msgid "Classification"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:7 ../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"
+msgstr ""
+
+#: ../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:70
+#: ../widgets/misc/e-attachment-tree-view.c:526
+#: ../widgets/table/e-table-config.ui.h:6
+msgid "Description"
+msgstr "Tuarascail"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Description Contains"
+msgstr "Cur Síos ina bhfuil"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../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.ui.h:8
+#: ../plugins/save-calendar/csv-format.c:397
+msgid "Location"
+msgstr "Suíomh"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Organizer"
+msgstr "Eagraí"
+
+#: ../calendar/gui/caltypes.xml.h:14 ../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 "Príobháideach"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../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 "Poiblí"
+
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../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 ""
+
+#: ../calendar/gui/caltypes.xml.h:17
+#: ../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
+msgid "Summary"
+msgstr "Achoimre"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Summary Contains"
+msgstr "Achoimre ina bhfuil"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "ina bhfuil"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "nach ina bhfuil"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
+msgid "is"
+msgstr "is"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
+msgid "is not"
+msgstr "nach bhfuil"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:636
+#, fuzzy
+msgid "Edit Reminder"
+msgstr "Meabhrúchán!"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:827
+#: ../calendar/gui/e-alarm-list.c:447
+msgid "Pop up an alert"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:828
+#: ../calendar/gui/e-alarm-list.c:443
+msgid "Play a sound"
+msgstr "Seinn fuaim"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:829
+#: ../calendar/gui/e-alarm-list.c:455
+msgid "Run a program"
+msgstr "Rith roghchlár"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:830
+#: ../calendar/gui/e-alarm-list.c:451
+msgid "Send an email"
+msgstr "Seol ríomhphost"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
+#, fuzzy
+msgid "Add Reminder"
+msgstr "Meabhrúchán!"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+msgid "Custom _message"
+msgstr "_Teachtaireacht saincheaptha"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+#, fuzzy
+msgid "Custom reminder sound"
+msgstr "Ceanntásca Saincheaptha"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
+msgid "Mes_sage:"
+msgstr "_Teachtaireacht:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
+msgid "Options"
+msgstr "Roghanna"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+#, fuzzy
+msgid "Reminder"
+msgstr "Meabhrúchán!"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+#, fuzzy
+msgid "Repeat"
+msgstr "<b>Athdhéan</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+msgid "Select A File"
+msgstr "Roghnaigh Comhad"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+msgid "Send To:"
+msgstr "Seol Chuig:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
+msgid "_Arguments:"
+msgstr "_Argóintí:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
+msgid "_Program:"
+msgstr "_Clár:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
+#, fuzzy
+msgid "_Repeat the reminder"
+msgstr "_Freagra don Seoltóir"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
+msgid "_Sound:"
+msgstr "_Fuaim:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+msgid "after"
+msgstr "i ndiaidh"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
+msgid "before"
+msgstr "roimh"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+msgid "day(s)"
+msgstr "lá"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+#, fuzzy
+msgid "end of appointment"
+msgstr "Coinne nua"
+
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+msgid "extra times every"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+msgid "hour(s)"
+msgstr "uair"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+msgid "minute(s)"
+msgstr "nóiméad"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
+#, fuzzy
+msgid "start of appointment"
+msgstr "Coinne nua"
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:245
+msgid "Action/Trigger"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
+msgid "A_dd"
+msgstr "Cuir _Leis"
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#, fuzzy
+msgid "Reminders"
+msgstr "Meabhrúchán!"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:169
+msgid "Type:"
+msgstr "Cineál:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:185
+#: ../modules/addressbook/addressbook-config.c:530
+msgid "_Type:"
+msgstr "C_ineál:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:155
+#: ../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 "_Ainm:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:300
+msgid "Cop_y calendar contents locally for offline operation"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:302
+msgid "Cop_y task list contents locally for offline operation"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:304
+msgid "Cop_y memo list contents locally for offline operation"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:350
+#, fuzzy
+msgid "Sh_ow reminder notifications"
+msgstr "Taispeáin deilbhín sa limistéar fógartha"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:425
+msgid "Colo_r:"
+msgstr "_Dath:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:448
+#: ../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/calendar/e-calendar-preferences.ui.h:17
+#: ../plugins/itip-formatter/itip-formatter.c:3045
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "General"
+msgstr "Ginearálta"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:461
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
+msgid "Task List"
+msgstr "Liosta Tascanna"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:472
+msgid "Memo List"
+msgstr "Liosta Meamram"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:564
+msgid "Calendar Properties"
+msgstr "Roghnachais na Fheilire"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:564
+msgid "New Calendar"
+msgstr "Féilire Nua"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:624
+msgid "Task List Properties"
+msgstr "Airíonna Liosta Tascanna"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:624
+msgid "New Task List"
+msgstr "Liosta Tascanna Nua"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:684
+msgid "Memo List Properties"
+msgstr "Airíonna Liosta Meamram"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:684
+msgid "New Memo List"
+msgstr "Liosta Meamram Nua"
+
+#: ../calendar/gui/dialogs/changed-comp.c:62
+msgid "This event has been deleted."
+msgstr "Scriosadh an teagmhas seo."
+
+#: ../calendar/gui/dialogs/changed-comp.c:66
+msgid "This task has been deleted."
+msgstr "Scriosadh an tasc seo."
+
+#: ../calendar/gui/dialogs/changed-comp.c:70
+msgid "This memo has been deleted."
+msgstr "Scriosadh an meamram seo."
+
+#: ../calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:81
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:86
+msgid "This event has been changed."
+msgstr "Athraíodh an teagmhas seo."
+
+#: ../calendar/gui/dialogs/changed-comp.c:90
+msgid "This task has been changed."
+msgstr "Athraíodh an tasc seo."
+
+#: ../calendar/gui/dialogs/changed-comp.c:94
+msgid "This memo has been changed."
+msgstr "Athraíodh an meamram seo."
+
+#: ../calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:105
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor-page.c:461
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:274
+msgid "Could not save attachments"
+msgstr "Níorbh fhéidir iatáin a shábháil"
+
+#: ../calendar/gui/dialogs/comp-editor.c:620
+msgid "Could not update object"
+msgstr "Níorbh fhéidir réad a nuashonrú"
+
+#: ../calendar/gui/dialogs/comp-editor.c:748
+msgid "Edit Appointment"
+msgstr "Eagar Coinne"
+
+#: ../calendar/gui/dialogs/comp-editor.c:755
+#, c-format
+msgid "Meeting - %s"
+msgstr "Cruinniú - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:757
+#, c-format
+msgid "Appointment - %s"
+msgstr "Coinne - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:763
+#, c-format
+msgid "Assigned Task - %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:765
+#, c-format
+msgid "Task - %s"
+msgstr "Tasc - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:770
+#, c-format
+msgid "Memo - %s"
+msgstr "Meamram - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:786
+msgid "No Summary"
+msgstr "Gan Achoimre"
+
+#: ../calendar/gui/dialogs/comp-editor.c:907
+msgid "Keep original item?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1120
+#, fuzzy
+msgid "Close the current window"
+msgstr "Dún an comhad reatha"
+
+#: ../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 "Cóipeáil an roghnú"
+
+#: ../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 "Gearr an roghnú"
+
+#: ../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
+#, fuzzy
+msgid "Delete the selection"
+msgstr "Gearr an roghnú"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1148
+msgid "View help"
+msgstr ""
+
+#: ../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 "Greamaigh an ghearrthaisce"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1176
+#, fuzzy
+msgid "Save current changes"
+msgstr "Sábháil Amharc Reatha"
+
+#: ../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 "Roghnaigh an téacs ar fad"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1190
+msgid "_Classification"
+msgstr ""
+
+#: ../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
+#: ../shell/e-shell-window-actions.c:1602
+#: ../widgets/menus/gal-define-views.ui.h:5
+msgid "_Edit"
+msgstr "_Eagar"
+
+#: ../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 "_Comhad"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1211
+#: ../shell/e-shell-window-actions.c:1616
+msgid "_Help"
+msgstr "Cab_hair"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1218
+msgid "_Insert"
+msgstr "_Ionsáigh"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1225
+#: ../composer/e-composer-actions.c:340
+msgid "_Options"
+msgstr "_Roghanna"
+
+#: ../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 "_Amharc"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1242
+#: ../composer/e-composer-actions.c:289
+msgid "_Attachment..."
+msgstr "_Iatán..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1244
+#: ../composer/e-composer-actions.c:291
+#: ../widgets/misc/e-attachment-view.c:439
+msgid "Attach a file"
+msgstr "Ceangail comhad"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1252
+msgid "_Categories"
+msgstr "_Catagóirí"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1254
+msgid "Toggles whether to display categories"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1260
+msgid "Time _Zone"
+msgstr "_Crios Ama"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Toggles whether the time zone is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1271
+msgid "Pu_blic"
+msgstr "Poi_blí"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1273
+msgid "Classify as public"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1278
+msgid "_Private"
+msgstr "_Príobháideach"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1280
+msgid "Classify as private"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1285
+msgid "_Confidential"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1287
+msgid "Classify as confidential"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1295
+msgid "R_ole Field"
+msgstr "Réimse _Róil"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1297
+msgid "Toggles whether the Role field is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1303
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1305
+msgid "Toggles whether the RSVP field is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "_Status Field"
+msgstr "Réimse _Stádais"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1313
+msgid "Toggles whether the Status field is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1319
+msgid "_Type Field"
+msgstr "Réimse _Cineáil"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1321
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../composer/e-composer-private.c:77
+msgid "Recent _Documents"
+msgstr "_Cáipéisí le Déanaí"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2078
+#: ../composer/e-composer-actions.c:508
+msgid "Attach"
+msgstr "Ceangail"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2428
+#: ../calendar/gui/dialogs/comp-editor.c:2591
+#: ../calendar/gui/dialogs/comp-editor.c:3580
+msgid "Changes made to this item may be discarded if an update arrives"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:3544
+#: ../plugins/prefer-plain/prefer-plain.c:67
+msgid "attachment"
+msgstr "iatán"
+
+#: ../calendar/gui/dialogs/comp-editor.c:3612
+msgid "Unable to use current version!"
+msgstr "Ní féidir an leagan reatha a úsáid!"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:114
+msgid "Could not open destination"
+msgstr "Níorbh fhéidir sprioc a oscailt"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+msgid "Destination is read only"
+msgstr "Tá an sprioc inléite amháin"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:164
+#, fuzzy
+msgid "Cannot create object"
+msgstr "Ní féidir teagmhas nua a chruthú"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:193
+msgid "Could not open source"
+msgstr "Níorbh fhéidir foinse a oscailt"
+
+#: ../calendar/gui/dialogs/delete-comp.c:214
+msgid "_Delete this item from all other recipient's mailboxes?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-comp.c:217
+#, fuzzy
+msgid "_Retract comment"
+msgstr "_Cáipéisí le Déanaí"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:57
+#, c-format
+msgid "The event could not be deleted due to a dbus error: %s"
+msgstr ""
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:61
+#, c-format
+msgid "The task could not be deleted due to a dbus error: %s"
+msgstr ""
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:65
+#, c-format
+msgid "The memo could not be deleted due to a dbus error: %s"
+msgstr ""
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:69
+#, c-format
+msgid "The item could not be deleted due to a dbus error: %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:76
+msgid "The event could not be deleted because permission was denied"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:79
+msgid "The task could not be deleted because permission was denied"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:82
+msgid "The memo could not be deleted because permission was denied"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:85
+msgid "The item could not be deleted because permission was denied"
+msgstr ""
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:93
+#, c-format
+msgid "The event could not be deleted due to an error: %s"
+msgstr ""
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:97
+#, c-format
+msgid "The task could not be deleted due to an error: %s"
+msgstr ""
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:101
+#, c-format
+msgid "The memo could not be deleted due to an error: %s"
+msgstr ""
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:105
+#, fuzzy, c-format
+msgid "The item could not be deleted due to an error: %s"
+msgstr "Níorbh fhéidir an mhír a sheoladh!\n"
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
+msgid "Contacts..."
+msgstr "Teagmhálacha..."
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
+msgid "Delegate To:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
+msgid "Enter Delegate"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:212
+#, fuzzy
+msgid "_Reminders"
+msgstr "Meabhrúchán!"
+
+#: ../calendar/gui/dialogs/event-editor.c:214
+msgid "Set or unset reminders for this event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Show Time as _Busy"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:224
+msgid "Toggles whether to show time as busy"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:233
+msgid "_Recurrence"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:235
+msgid "Make this a recurring event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../widgets/misc/e-send-options.ui.h:22
+msgid "Send Options"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:242
+#: ../calendar/gui/dialogs/task-editor.c:128
+msgid "Insert advanced send options"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:250
+msgid "All _Day Event"
+msgstr "Teagmhas an _Lae ar Fad"
+
+#: ../calendar/gui/dialogs/event-editor.c:252
+msgid "Toggles whether to have All Day Event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:261
+msgid "_Free/Busy"
+msgstr "_Saor/Gnóthach"
+
+#: ../calendar/gui/dialogs/event-editor.c:263
+msgid "Query free / busy information for the attendees"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3310
+msgid "Appointment"
+msgstr "Coinne"
+
+#: ../calendar/gui/dialogs/event-editor.c:384
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/e-meeting-list-view.c:161
+msgid "Attendees"
+msgstr "Rannpháirtithe"
+
+#: ../calendar/gui/dialogs/event-editor.c:582
+#, fuzzy
+msgid "Print this event"
+msgstr "Priontáil an teachtaireacht seo"
+
+#: ../calendar/gui/dialogs/event-page.c:558
+msgid "Event's start time is in the past"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:635
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:639
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:651
+#: ../calendar/gui/dialogs/event-page.c:3080
+#, fuzzy
+msgid "This event has reminders"
+msgstr "Scriosadh an teagmhas seo."
+
+#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
+msgid "Or_ganizer:"
+msgstr "_Eagraí:"
+
+#: ../calendar/gui/dialogs/event-page.c:1263
+msgid "Event with no start date"
+msgstr "Teagmhas gan dáta tosaithe"
+
+#: ../calendar/gui/dialogs/event-page.c:1266
+msgid "Event with no end date"
+msgstr "Teagmhas gan dáta deiridh"
+
+#: ../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 ""
+
+#: ../calendar/gui/dialogs/event-page.c:1449
+msgid "End date is wrong"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1472
+msgid "Start time is wrong"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1479
+msgid "End time is wrong"
+msgstr ""
+
+#: ../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 ""
+
+#: ../calendar/gui/dialogs/event-page.c:1678
+#: ../calendar/gui/dialogs/task-page.c:913
+msgid "At least one attendee is required."
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1885
+msgid "_Delegatees"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1887
+msgid "Atte_ndees"
+msgstr "_Rannpháirtithe"
+
+#: ../calendar/gui/dialogs/event-page.c:2921
+#, fuzzy, c-format
+msgid "Unable to open the calendar '%s': %s"
+msgstr "Ní féidir an féilire '%s' a oscailt."
+
+#. Translators: This string is used when we are creating an Event
+#. * (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
+#. 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/memo-page.c:1012
+#: ../calendar/gui/dialogs/task-page.c:1844
+#, c-format
+msgid "You are acting on behalf of %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:3325
+#, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: ../calendar/gui/dialogs/event-page.c:3331
+#, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/dialogs/event-page.c:3337
+#, c-format
+msgid "%d minute before appointment"
+msgid_plural "%d minutes before appointment"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/dialogs/event-page.c:3356
+msgid "Customize"
+msgstr "Saincheap"
+
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/dialogs/event-page.c:3362
+#, fuzzy
+msgctxt "cal-reminders"
+msgid "None"
+msgstr "Neamhní"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:564
+msgid "Atte_ndees..."
+msgstr "_Rannpháirtithe..."
+
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+#, fuzzy
+msgid "Custom Reminder:"
+msgstr "Ceanntásc Saincheaptha"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:6
+msgid "Event Description"
+msgstr "Cur Síos Teagmhais"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
+msgid "Time _zone:"
+msgstr "Cri_os ama:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:8
+#: ../widgets/misc/e-attachment-dialog.c:347
+msgid "_Description:"
+msgstr "_Cur síos:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../plugins/calendar-weather/calendar-weather.c:381
+msgid "_Location:"
+msgstr "_Suíomh:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#, fuzzy
+msgid "_Reminder"
+msgstr "Meabhrúchán!"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+#, fuzzy
+msgid "_Summary:"
+msgstr "Achoimre:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+msgid "_Time:"
+msgstr "_Am:"
+
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#, fuzzy
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "roimh gach coinne"
+
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#, fuzzy
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "roimh gach coinne"
+
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:21
+#, fuzzy
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "roimh gach coinne"
+
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+#, fuzzy
+msgctxt "eventpage"
+msgid "for"
+msgstr "ceathrú"
+
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+#, fuzzy
+msgctxt "eventpage"
+msgid "until"
+msgstr ""
+"go ceann\n"
+"go dtí"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
+msgid "April"
+msgstr ""
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
+msgid "August"
+msgstr ""
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
+#, fuzzy
+msgid "December"
+msgstr "Ball"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
+msgid "February"
+msgstr ""
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
+msgid "January"
+msgstr ""
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
+msgid "July"
+msgstr ""
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
+msgid "June"
+msgstr ""
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
+#, fuzzy
+msgid "March"
+msgstr "Cuardaigh"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
+#, fuzzy
+msgid "May"
+msgstr "lá"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
+#, fuzzy
+msgid "November"
+msgstr "Ball"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
+msgid "October"
+msgstr ""
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "Select Date"
+msgstr "Roghnaigh Dáta"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+msgid "Select _Today"
+msgstr "Roghnaigh an Lá _Inniu"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
+#, fuzzy
+msgid "September"
+msgstr "Ball"
+
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3314
+msgid "Memo"
+msgstr "Meamram"
+
+#: ../calendar/gui/dialogs/memo-editor.c:156
+#, fuzzy
+msgid "Print this memo"
+msgstr "Priontáil liosta meamram"
+
+#: ../calendar/gui/dialogs/memo-page.c:405
+msgid "Memo's start date is in the past"
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.c:442
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.c:446
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.c:936
+#, fuzzy, c-format
+msgid "Unable to open memos in '%s': %s"
+msgstr "Ní féidir meamraim i '%s' a oscailt."
+
+#: ../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: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 "Chuig"
+
+#: ../calendar/gui/dialogs/memo-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:5
+msgid "Sta_rt date:"
+msgstr "Dáta to_saigh:"
+
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "_Achoimre:"
+
+#: ../calendar/gui/dialogs/memo-page.ui.h:5
+msgid "T_o:"
+msgstr "_Chuig:"
+
+#: ../calendar/gui/dialogs/memo-page.ui.h:7
+#: ../calendar/gui/dialogs/task-page.c:339
+#: ../calendar/gui/dialogs/task-page.ui.h:9
+#, fuzzy
+msgid "_List:"
+msgstr "Liosta"
+
+#: ../calendar/gui/dialogs/recur-comp.c:55
+#, c-format
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:57
+#, c-format
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:61
+#, c-format
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:65
+#, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:91
+msgid "This Instance Only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:95
+msgid "This and Prior Instances"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:101
+msgid "This and Future Instances"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:106
+msgid "All Instances"
+msgstr "Gach �sc"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:575
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:964
+msgid "Recurrence date is invalid"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1004
+msgid "End time of the recurrence was before event's start"
+msgstr ""
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
+msgid "on"
+msgstr "ar"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
+msgid "first"
+msgstr "céad"
+
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1103
+msgid "second"
+msgstr "dara"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
+msgid "third"
+msgstr "tríú"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+msgid "fourth"
+msgstr "ceathrú"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (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
+msgid "fifth"
+msgstr "cúigiú"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
+msgid "last"
+msgstr "deireadh"
+
+#. 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
+msgid "Other Date"
+msgstr "Dáta Eile"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1153
+msgid "1st to 10th"
+msgstr "1ú go 10ú"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1159
+msgid "11th to 20th"
+msgstr "11ú go 20ú"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
+msgid "21st to 31st"
+msgstr "21ú go 31ú"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
+msgid "Monday"
+msgstr "Luan"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "Tuesday"
+msgstr "Máirt"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
+msgid "Wednesday"
+msgstr "Céadaoin"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+msgid "Thursday"
+msgstr "Déardaoin"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+msgid "Friday"
+msgstr "Aoine"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1196
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
+msgid "Saturday"
+msgstr "Sathain"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1197
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
+msgid "Sunday"
+msgstr "Domhnach"
+
+#. 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
+msgid "on the"
+msgstr "ar an"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1496
+msgid "occurrences"
 msgstr ""
 
+#: ../calendar/gui/dialogs/recurrence-page.c:2214
+msgid "Add exception"
+msgstr "Cuir eisceacht leis"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2255
+msgid "Could not get a selection to modify."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2261
+msgid "Modify exception"
+msgstr "Athraigh eisceacht"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2305
+msgid "Could not get a selection to delete."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2439
+msgid "Date/Time"
+msgstr "Dáta/Am"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
+msgid "Every"
+msgstr "Gach"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
+#, fuzzy
+msgid "Exceptions"
+msgstr "<b>Eisceachtaí</b>"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
+msgid "Preview"
+msgstr "Réamhamharc"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
+msgid "This appointment rec_urs"
+msgstr ""
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "lá"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+#, fuzzy
+msgctxt "recurrpage"
+msgid "for"
+msgstr "ceathrú"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+#, fuzzy
+msgctxt "recurrpage"
+msgid "forever"
+msgstr "Riamh"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
+msgctxt "recurrpage"
+msgid "month(s)"
+msgstr "m(h)í"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+#, fuzzy
+msgctxt "recurrpage"
+msgid "until"
+>>>>>>> master
+msgstr ""
+"go ceann\n"
+"go dtí"
+
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/recurrence-page.c:2123
 msgid "Add exception"
 msgstr "Cuir eisceacht leis"
@@ -3959,8 +7289,754 @@ msgstr ""
 #: ../calendar/gui/e-day-view-time-item.c:804
 #, c-format
 msgid "%02i minute divisions"
+=======
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
+msgctxt "recurrpage"
+msgid "week(s)"
+msgstr "s(h)eachtain"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+msgctxt "recurrpage"
+msgid "year(s)"
+msgstr "blia(in/na)"
+
+#: ../calendar/gui/dialogs/send-comp.c:198
+#, fuzzy
+msgid "Send my reminders with this event"
+msgstr "Priontáil an teachtaireacht seo"
+
+#: ../calendar/gui/dialogs/send-comp.c:200
+msgid "Notify new attendees _only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.c:351
+#: ../calendar/gui/dialogs/task-details-page.c:373
+msgid "Completed date is wrong"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.c:488
+msgid "Web Page"
+msgstr "Leathanach Gréasáin"
+
+#. 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: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
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
+#, c-format
+msgid "Canceled"
+msgstr "Cealaithe"
+
+#. 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: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:217 ../calendar/gui/e-task-table.c:232
+#: ../calendar/gui/e-task-table.c:605 ../calendar/gui/print.c:3397
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:387
+msgid "Completed"
+msgstr "Críochnaithe"
+
+#. 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:526 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1274 ../widgets/misc/e-send-options.ui.h:13
+msgid "High"
+msgstr "Ard"
+
+#. 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: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:3394
+msgid "In Progress"
+msgstr "Ar Siúl"
+
+#. 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:528 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1272 ../widgets/misc/e-send-options.ui.h:14
+msgid "Low"
+msgstr "�seal"
+
+#. 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: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"
+msgstr "Gnáth"
+
+#. 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: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
+msgid "Not Started"
+msgstr "Gan Tosú"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
+msgid "P_ercent complete:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
+msgid "Stat_us:"
+msgstr "_Stádas:"
+
+#. 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-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
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Stádas"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:20
+#: ../calendar/gui/e-task-table.c:529 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:27
+msgid "Undefined"
+msgstr "Gan sainmhiniú"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:21
+msgid "_Date completed:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:35
+msgid "_Priority:"
+msgstr "_Tosaíocht:"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:23
+msgid "_Web Page:"
+msgstr "Leathanach _Gréasáin:"
+
+#: ../calendar/gui/dialogs/task-editor.c:116
+msgid "_Status Details"
+msgstr "Sonraí _Stádais"
+
+#: ../calendar/gui/dialogs/task-editor.c:118
+msgid "Click to change or view the status details of the task"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-editor.c:126
+msgid "_Send Options"
+msgstr "_Seol Roghanna"
+
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3312
+#: ../widgets/misc/e-send-options.c:535
+msgid "Task"
+msgstr "Tasc"
+
+#: ../calendar/gui/dialogs/task-editor.c:324
+msgid "Task Details"
+msgstr "Sonraí Taisc"
+
+#: ../calendar/gui/dialogs/task-editor.c:366
+msgid "Print this task"
+msgstr "Priontáil an tasc seo"
+
+#: ../calendar/gui/dialogs/task-page.c:251
+msgid "Task's start date is in the past"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:252
+msgid "Task's due date is in the past"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:286
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:290
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:294
+msgid ""
+"Task cannot be edited, because the selected task list does not support "
+"assigned tasks"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:347
+#: ../calendar/gui/dialogs/task-page.ui.h:4
+msgid "Organi_zer:"
+msgstr "Ea_graí:"
+
+#: ../calendar/gui/dialogs/task-page.c:807
+msgid "Due date is wrong"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:1763
+#, fuzzy, c-format
+msgid "Unable to open tasks in '%s': %s"
+msgstr "Ní féidir tascanna i '%s' a oscailt."
+
+#: ../calendar/gui/dialogs/task-page.ui.h:2
+msgid "Categor_ies..."
+msgstr "Catagó_irí..."
+
+#: ../calendar/gui/dialogs/task-page.ui.h:3
+msgid "D_ue date:"
+msgstr "_Spriocdháta:"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:7
+msgid "Time zone:"
+msgstr "Crios ama:"
+
+#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d lá"
+msgstr[1] "%d lá"
+msgstr[2] "%d lá"
+msgstr[3] "%d lá"
+msgstr[4] "%d lá"
+
+#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:399
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d seachtain"
+msgstr[1] "%d seachtain"
+msgstr[2] "%d sheachtain"
+msgstr[3] "%d seachtain"
+msgstr[4] "%d seachtain"
+
+#: ../calendar/gui/e-alarm-list.c:461
+msgid "Unknown action to be performed"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:475
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:480
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr ""
+
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:498
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:503
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr ""
+
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:510
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr ""
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
+#: ../calendar/gui/e-alarm-list.c:534
+#, c-format
+msgid "%s at %s"
+msgstr "%s ag %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:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
+#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:671
+msgid "Untitled"
+msgstr "Gan Teideal"
+
+#: ../calendar/gui/e-cal-component-preview.c:200
+msgid "Categories:"
+msgstr "Catagóirí:"
+
+#: ../calendar/gui/e-cal-component-preview.c:239
+msgid "Summary:"
+msgstr "Achoimre:"
+
+#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:263
+msgid "Start Date:"
+msgstr "Dáta Tosaigh:"
+
+#: ../calendar/gui/e-cal-component-preview.c:277
+msgid "Due Date:"
+msgstr "Spriocdháta:"
+
+#. Status
+#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../plugins/itip-formatter/itip-view.c:1083
+msgid "Status:"
+msgstr "Stádas:"
+
+#: ../calendar/gui/e-cal-component-preview.c:317
+msgid "Priority:"
+msgstr "Tosaíocht:"
+
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
+msgid "Description:"
+msgstr "Cur Síos:"
+
+#: ../calendar/gui/e-cal-component-preview.c:373
+msgid "Web Page:"
+msgstr "Leathanach Gréasáin:"
+
+#: ../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:388
+msgid "Created"
+msgstr "Cruthaithe"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
+msgid "End Date"
+msgstr "Dáta Deiridh"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:4
+msgid "Last modified"
+msgstr "Athraithe"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:5
+msgid "Start Date"
+msgstr "Dáta Tosaigh"
+
+#: ../calendar/gui/e-cal-model-calendar.c:188
+#: ../calendar/gui/e-task-table.c:580
+msgid "Free"
+msgstr "Saor"
+
+#: ../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 "Gnóthach"
+
+#: ../calendar/gui/e-cal-model-tasks.c:665
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:717
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "Neamhní"
+
+#: ../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 "Déan"
+
+#: ../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 "Ná Déan"
+
+#: ../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:101
+#: ../plugins/itip-formatter/itip-formatter.c:469
+#: ../plugins/itip-formatter/itip-formatter.c:2697
+msgid "Unknown"
+msgstr "Anaithnid"
+
+#: ../calendar/gui/e-cal-model.c:1585
+msgid "Recurring"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model.c:1587
+msgid "Assigned"
+msgstr "Sannta"
+
+#: ../calendar/gui/e-cal-model.c:2963
+#, c-format
+msgid "Opening %s"
+msgstr "%s á Oscailt"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% Críochnaithe"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "Cliceáil chun tasc a chur leis"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:5
+msgid "Complete"
+msgstr "Críochnaithe"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:6
+msgid "Completion date"
+msgstr "Le críochnú"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due date"
+msgstr "Spriocdháta"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:20
+#: ../plugins/save-calendar/csv-format.c:394
+msgid "Priority"
+msgstr "Tosaíocht"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+msgid "Start date"
+msgstr "Dáta tosaigh"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../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 "Cineál"
+
+#: ../calendar/gui/e-calendar-view.c:420
+#, fuzzy
+msgid "Cut selected events to the clipboard"
+msgstr "Gearr téacs roghnaithe go dtí an gearrthaisce"
+
+#: ../calendar/gui/e-calendar-view.c:426
+#, fuzzy
+msgid "Copy selected events to the clipboard"
+msgstr "Cóipeáil téacs roghnaithe go dtí an gearrthaisce"
+
+#: ../calendar/gui/e-calendar-view.c:432
+#, fuzzy
+msgid "Paste events from the clipboard"
+msgstr "Greamaigh téacs ón ngearrthaisce"
+
+#: ../calendar/gui/e-calendar-view.c:438
+#, fuzzy
+msgid "Delete selected events"
+msgstr "Scrios meamraim roghnaithe"
+
+#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-task-table.c:269
+msgid "Deleting selected objects"
+msgstr "Réada roghnaithe á scriosadh"
+
+#: ../calendar/gui/e-calendar-view.c:650 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-task-table.c:1104
+msgid "Updating objects"
+msgstr "Réada á nuashonrú"
+
+#: ../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 "Glactha"
+
+#: ../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 "Diúltaithe"
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../calendar/gui/e-calendar-view.c:1805
+msgid "Needs action"
+msgstr "Gníomh de dhíth"
+
+#. 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
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Eagraí: %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
+#, c-format
+msgid "Organizer: %s"
+msgstr "Eagraí: %s"
+
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:1969 ../calendar/gui/print.c:3346
+#, c-format
+msgid "Location: %s"
+msgstr "Suíomh: %s"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:2000
+#, c-format
+msgid "Time: %s %s"
+msgstr "Am: %s %s"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: ../calendar/gui/e-cell-date-edit-text.c:156
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: ../calendar/gui/e-cell-date-edit-text.c:159
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: ../calendar/gui/e-cell-date-edit-text.c:167
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"%s"
+msgstr ""
+
+#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
+#. * to change the length of the time division in the calendar day view, e.g.
+#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
+#.
+#: ../calendar/gui/e-day-view-time-item.c:809
+#, c-format
+msgid "%02i minute divisions"
 msgstr ""
 
+#: ../calendar/gui/e-day-view-time-item.c:830
+msgid "Show the second time zone"
+msgstr ""
+
+#. Translators: "None" indicates no second time zone set for a day view
+#: ../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:231
+msgctxt "cal-second-zone"
+msgid "None"
+msgstr "Neamhní"
+
+#: ../calendar/gui/e-day-view-time-item.c:879
+#: ../calendar/gui/e-timezone-entry.c:319
+#: ../modules/calendar/e-calendar-preferences.c:258
+msgid "Select..."
+msgstr "Roghnaigh..."
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. * %B = full month name. Don't use any other specifiers.
+#. strftime format %A = full weekday name, %d = day of
+#. * month, %B = full month name. You can change the
+#. * order but don't change the specifiers or add
+#. * anything.
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1819
+#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1968
+msgid "%A %d %B"
+msgstr "%A %d %B"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1836
+#: ../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
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1852
+#: ../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
+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
+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
+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
+#, c-format
+msgid "Week %d"
+msgstr "Seachtain %d"
+
+#: ../calendar/gui/e-meeting-list-view.c:64
+msgid "Chair Persons"
+msgstr "Cathaoirligh"
+
+#: ../calendar/gui/e-meeting-list-view.c:65
+msgid "Required Participants"
+msgstr "Rannpháirtithe Riachtanacha"
+
+#: ../calendar/gui/e-meeting-list-view.c:66
+msgid "Optional Participants"
+msgstr "Rannpháirtithe Roghnacha"
+
+#: ../calendar/gui/e-meeting-list-view.c:67
+msgid "Resources"
+msgstr "Acmhainní"
+
+#: ../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
+msgid "Individual"
+msgstr "Aonar"
+
+#: ../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
+msgid "Group"
+msgstr "Grúpa"
+
+#: ../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
+msgid "Resource"
+msgstr "Acmhainn"
+
+#: ../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
+msgid "Room"
+msgstr "Seomra"
+
+#: ../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
+msgid "Chair"
+msgstr "Cathaoirleach"
+
+#: ../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
+msgid "Required Participant"
+msgstr "Rannpháirtí Riachtanach"
+
+#: ../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
+msgid "Optional Participant"
+msgstr "Rannpháirtí Roghnach"
+
+#: ../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
+msgid "Non-Participant"
+msgstr ""
+
+#: ../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:1060
+msgid "Needs Action"
+msgstr "Gníomh de Dhíth"
+
+#. The extra space is just a hack to occupy more space for Attendee
+#: ../calendar/gui/e-meeting-list-view.c:578
+msgid "Attendee                          "
+msgstr "Rannpháirtí"
+
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:623
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
+msgid "In Process"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-store.c:1876
+#, c-format
+msgid "Enter password to access free/busy information on server %s as user %s"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-store.c:1886
+#, fuzzy, c-format
+msgid "Failure reason: %s"
+>>>>>>> master
+msgstr ""
+"Teip ag cruthaigh eolaire '%s':\n"
+"%s"
+
+<<<<<<< HEAD
 #: ../calendar/gui/e-day-view-time-item.c:825
 msgid "Show the second time zone"
 msgstr ""
@@ -8135,8 +12211,4084 @@ msgstr ""
 
 #: ../filter/filter.ui.h:23
 msgid "years"
+=======
+#: ../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
+msgid "Enter password"
+msgstr "Iontráil focal faire"
+
+#. 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:445
+#: ../calendar/gui/e-meeting-time-sel.c:2379
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. * name, %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. * %m = month number, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:449
+#: ../calendar/gui/e-meeting-time-sel.c:2410
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. * %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:453
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: ../calendar/gui/e-meeting-time-sel.c:548
+msgid "Out of Office"
+msgstr "As Láthair ón Oifig"
+
+#: ../calendar/gui/e-meeting-time-sel.c:549
+msgid "No Information"
+msgstr "Gan Eolas"
+
+#: ../calendar/gui/e-meeting-time-sel.c:585
+msgid "O_ptions"
+msgstr "_Roghanna"
+
+#: ../calendar/gui/e-meeting-time-sel.c:603
+msgid "Show _only working hours"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:614
+msgid "Show _zoomed out"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:630
+msgid "_Update free/busy"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:645
+msgid "_<<"
+msgstr "_<<"
+
+#: ../calendar/gui/e-meeting-time-sel.c:663
+msgid "_Autopick"
+msgstr "_Uathpioc"
+
+#: ../calendar/gui/e-meeting-time-sel.c:678
+msgid ">_>"
+msgstr ">_>"
+
+#: ../calendar/gui/e-meeting-time-sel.c:696
+msgid "_All people and resources"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:706
+msgid "All _people and one resource"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:716
+msgid "_Required people"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:725
+msgid "Required people and _one resource"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:774
+msgid "_Start time:"
+msgstr "Am _tosaithe:"
+
+#: ../calendar/gui/e-meeting-time-sel.c:814
+msgid "_End time:"
+msgstr "Am _deiridh:"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Teanga"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Ball"
+
+#: ../calendar/gui/e-memo-table.c:420
+#: ../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:458
+msgid "Memos"
+msgstr "Meamraim"
+
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:733
+msgid "* No Summary *"
+msgstr "* Gan Achoimre *"
+
+#. 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
+msgid "Start: "
+msgstr "Tosaigh:"
+
+#. 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
+msgid "Due: "
+msgstr "Spriocdháta:"
+
+#: ../calendar/gui/e-memo-table.c:726
+#, fuzzy
+msgid "Cut selected memos to the clipboard"
+msgstr "Déan cóip den téacs roghnaithe sa ghearrthaisce."
+
+#: ../calendar/gui/e-memo-table.c:732
+#, fuzzy
+msgid "Copy selected memos to the clipboard"
+msgstr "Déan cóip den téacs nó mír(eanna) roghnaithe sa ghearrthaisce"
+
+#: ../calendar/gui/e-memo-table.c:738
+#, fuzzy
+msgid "Paste memos from the clipboard"
+msgstr "Greamaigh meamram ón ngearrthaisce"
+
+#: ../calendar/gui/e-memo-table.c:744
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
+msgid "Delete selected memos"
+msgstr "Scrios meamraim roghnaithe"
+
+#: ../calendar/gui/e-memo-table.c:750
+#, fuzzy
+msgid "Select all visible memos"
+msgstr "Taispeáin gach rabhadh"
+
+#: ../calendar/gui/e-memo-table.etspec.h:2
+msgid "Click to add a memo"
+msgstr "Cliceáil chun meamram a chur leis"
+
+#. 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%
+#.
+#: ../calendar/gui/e-task-table.c:555
+#, c-format
+msgid "%d%%"
+msgstr ""
+
+#: ../calendar/gui/e-task-table.c:652 ../calendar/gui/print.c:2273
+#: ../calendar/importers/icalendar-importer.c:85
+#: ../calendar/importers/icalendar-importer.c:1043
+#: ../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
+#: ../modules/calendar/e-task-shell-view-actions.c:269
+#: ../modules/calendar/e-task-shell-view.c:448
+#: ../plugins/caldav/caldav-browse-server.c:456
+msgid "Tasks"
+msgstr "Tascanna"
+
+#: ../calendar/gui/e-task-table.c:968
+#, fuzzy
+msgid "Cut selected tasks to the clipboard"
+msgstr "Gearr téacs roghnaithe go dtí an gearrthaisce"
+
+#: ../calendar/gui/e-task-table.c:974
+#, fuzzy
+msgid "Copy selected tasks to the clipboard"
+msgstr "Cóipeáil téacs roghnaithe go dtí an gearrthaisce"
+
+#: ../calendar/gui/e-task-table.c:980
+msgid "Paste tasks from the clipboard"
+msgstr "Greamaigh tascanna ón ngearrthaisce"
+
+#: ../calendar/gui/e-task-table.c:986
+#: ../modules/calendar/e-task-shell-view-actions.c:710
+msgid "Delete selected tasks"
+msgstr "Scrios tascanna roghnaithe"
+
+#: ../calendar/gui/e-task-table.c:992
+#, fuzzy
+msgid "Select all visible tasks"
+msgstr "Taispeáin gach rabhadh"
+
+#: ../calendar/gui/e-timezone-entry.c:330
+msgid "Select Timezone"
+msgstr "Roghnaigh Crios Ama"
+
+#. 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
+msgid "%d %B"
+msgstr "%d %B"
+
+#: ../calendar/gui/ea-cal-view-event.c:290
+#, fuzzy
+msgid "It has reminders."
+msgstr "Tá aláraim aige."
+
+#: ../calendar/gui/ea-cal-view-event.c:293
+msgid "It has recurrences."
+msgstr ""
+
+#: ../calendar/gui/ea-cal-view-event.c:296
+msgid "It is a meeting."
+msgstr "Is cruinniú é."
+
+#: ../calendar/gui/ea-cal-view-event.c:303
+#, c-format
+msgid "Calendar Event: Summary is %s."
+msgstr ""
+
+#: ../calendar/gui/ea-cal-view-event.c:306
+msgid "Calendar Event: It has no summary."
+msgstr ""
+
+#: ../calendar/gui/ea-cal-view-event.c:328
+msgid "calendar view event"
+msgstr ""
+
+#: ../calendar/gui/ea-cal-view-event.c:557
+msgid "Grab Focus"
+msgstr "Gabh Fócas"
+
+#: ../calendar/gui/ea-cal-view.c:315
+msgid "New Appointment"
+msgstr "Coinne Nua"
+
+#: ../calendar/gui/ea-cal-view.c:316
+msgid "New All Day Event"
+msgstr "Teagmhas an Lae ar Fad Nua"
+
+#: ../calendar/gui/ea-cal-view.c:317
+msgid "New Meeting"
+msgstr "Cruinniú Nua"
+
+#: ../calendar/gui/ea-cal-view.c:318
+msgid "Go to Today"
+msgstr "Téigh go Inniu"
+
+#: ../calendar/gui/ea-cal-view.c:319
+msgid "Go to Date"
+msgstr "Téigh go Dáta"
+
+#: ../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 ""
+
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
+#, c-format
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "Tá %d teagmhas aige."
+msgstr[1] "Tá %d teagmhas aige."
+msgstr[2] "Tá %d theagmhas aige."
+msgstr[3] "Tá %d dteagmhas aige."
+msgstr[4] "Tá %d teagmhas aige."
+
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:154
+msgid "It has no events."
+msgstr "Níl aon teagmhas aige."
+
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:163
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "Amharc Seachtaine Oibre; %s. %s"
+
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:169
+#, c-format
+msgid "Day View: %s. %s"
+msgstr "Amharc Lae: %s. %s"
+
+#: ../calendar/gui/ea-day-view.c:203
+msgid "calendar view for a work week"
+msgstr ""
+
+#: ../calendar/gui/ea-day-view.c:205
+msgid "calendar view for one or more days"
+msgstr ""
+
+#: ../calendar/gui/ea-gnome-calendar.c:50
+#: ../calendar/gui/ea-gnome-calendar.c:58
+#: ../calendar/importers/icalendar-importer.c:1077
+msgid "Gnome Calendar"
+msgstr "Féilire Gnome"
+
+#: ../calendar/gui/ea-gnome-calendar.c:201
+#: ../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: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 %d %b %Y"
+
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../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: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 "%d %b %Y"
+
+#: ../calendar/gui/ea-jump-button.c:150
+msgid "Jump button"
+msgstr ""
+
+#: ../calendar/gui/ea-jump-button.c:159
+msgid "Click here, you can find more events."
+msgstr ""
+
+#: ../calendar/gui/ea-week-view.c:159
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "Amharc Míosa: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:163
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "Amharc Seachtaine: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:197
+msgid "calendar view for a month"
+msgstr ""
+
+#: ../calendar/gui/ea-week-view.c:199
+msgid "calendar view for one or more weeks"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:2262
+msgid "Purging"
+msgstr ""
+
+#: ../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 ""
+
+#: ../calendar/gui/itip-utils.c:558
+msgid "At least one attendee is necessary"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:755 ../calendar/gui/itip-utils.c:916
+msgid "Event information"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:758 ../calendar/gui/itip-utils.c:919
+msgid "Task information"
+msgstr "Eolas Tasc"
+
+#: ../calendar/gui/itip-utils.c:761 ../calendar/gui/itip-utils.c:922
+msgid "Memo information"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:764 ../calendar/gui/itip-utils.c:940
+msgid "Free/Busy information"
+msgstr "Eolas Saor/Gnóthach"
+
+#: ../calendar/gui/itip-utils.c:767
+msgid "Calendar information"
+msgstr "Eolas féilire"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:804
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "Glactha"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:811
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr ""
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:818 ../calendar/gui/itip-utils.c:866
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "Diúltaithe"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:825
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr ""
+
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Updated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:838
+msgctxt "Meeting"
+msgid "Updated"
+msgstr "Nuashonraithe"
+
+#. 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:845
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "Cealaigh"
+
+#. 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:852
+msgctxt "Meeting"
+msgid "Refresh"
+msgstr "Athnuaigh"
+
+#. 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:859
+msgctxt "Meeting"
+msgid "Counter-proposal"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:937
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:945
+msgid "iCalendar information"
+msgstr "Eolas iCalendar"
+
+#: ../calendar/gui/itip-utils.c:970
+msgid "Unable to book a resource, the new event collides with some other."
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:974
+msgid "Unable to book a resource, error: "
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:1137
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: ../calendar/gui/print.c:581
+msgid "1st"
+msgstr "1ú"
+
+#: ../calendar/gui/print.c:581
+msgid "2nd"
+msgstr "2ú"
+
+#: ../calendar/gui/print.c:581
+msgid "3rd"
+msgstr "3ú"
+
+#: ../calendar/gui/print.c:581
+msgid "4th"
+msgstr "4ú"
+
+#: ../calendar/gui/print.c:581
+msgid "5th"
+msgstr "5ú"
+
+#: ../calendar/gui/print.c:582
+msgid "6th"
+msgstr "6ú"
+
+#: ../calendar/gui/print.c:582
+msgid "7th"
+msgstr "7ú"
+
+#: ../calendar/gui/print.c:582
+msgid "8th"
+msgstr "8ú"
+
+#: ../calendar/gui/print.c:582
+msgid "9th"
+msgstr "9ú"
+
+#: ../calendar/gui/print.c:582
+msgid "10th"
+msgstr "10ú"
+
+#: ../calendar/gui/print.c:583
+msgid "11th"
+msgstr "11ú"
+
+#: ../calendar/gui/print.c:583
+msgid "12th"
+msgstr "12ú"
+
+#: ../calendar/gui/print.c:583
+msgid "13th"
+msgstr "13ú"
+
+#: ../calendar/gui/print.c:583
+msgid "14th"
+msgstr "14ú"
+
+#: ../calendar/gui/print.c:583
+msgid "15th"
+msgstr "15ú"
+
+#: ../calendar/gui/print.c:584
+msgid "16th"
+msgstr "16ú"
+
+#: ../calendar/gui/print.c:584
+msgid "17th"
+msgstr "17ú"
+
+#: ../calendar/gui/print.c:584
+msgid "18th"
+msgstr "18ú"
+
+#: ../calendar/gui/print.c:584
+msgid "19th"
+msgstr "19ú"
+
+#: ../calendar/gui/print.c:584
+msgid "20th"
+msgstr "20ú"
+
+#: ../calendar/gui/print.c:585
+msgid "21st"
+msgstr "21ú"
+
+#: ../calendar/gui/print.c:585
+msgid "22nd"
+msgstr "22ú"
+
+#: ../calendar/gui/print.c:585
+msgid "23rd"
+msgstr "23ú"
+
+#: ../calendar/gui/print.c:585
+msgid "24th"
+msgstr "24ú"
+
+#: ../calendar/gui/print.c:585
+msgid "25th"
+msgstr "25ú"
+
+#: ../calendar/gui/print.c:586
+msgid "26th"
+msgstr "26ú"
+
+#: ../calendar/gui/print.c:586
+msgid "27th"
+msgstr "27ú"
+
+#: ../calendar/gui/print.c:586
+msgid "28th"
+msgstr "28ú"
+
+#: ../calendar/gui/print.c:586
+msgid "29th"
+msgstr "29ú"
+
+#: ../calendar/gui/print.c:586
+msgid "30th"
+msgstr "30ú"
+
+#: ../calendar/gui/print.c:587
+msgid "31st"
+msgstr "31ú"
+
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:644
+msgid "Su"
+msgstr "Do"
+
+#: ../calendar/gui/print.c:644
+msgid "Mo"
+msgstr "Lu"
+
+#: ../calendar/gui/print.c:644
+msgid "Tu"
+msgstr "Má"
+
+#: ../calendar/gui/print.c:644
+msgid "We"
+msgstr "Cé"
+
+#: ../calendar/gui/print.c:645
+msgid "Th"
+msgstr "Dé"
+
+#: ../calendar/gui/print.c:645
+msgid "Fr"
+msgstr "Ao"
+
+#: ../calendar/gui/print.c:645
+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
+msgid " to "
+msgstr " go "
+
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:3149
+msgid " (Completed "
+msgstr " (Críochnaithe "
+
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:3155
+msgid "Completed "
+msgstr "Críochnaithe "
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:3165
+msgid " (Due "
+msgstr " (Spriocdháta "
+
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:3172
+msgid "Due "
+msgstr "Spriocdháta"
+
+#: ../calendar/gui/print.c:3337
+#, c-format
+msgid "Summary: %s"
+msgstr "Achoimre: %s"
+
+#: ../calendar/gui/print.c:3364
+msgid "Attendees: "
+msgstr "Rannpháirtithe:"
+
+#: ../calendar/gui/print.c:3407
+#, c-format
+msgid "Status: %s"
+msgstr "Stádas: %s"
+
+#: ../calendar/gui/print.c:3422
+#, c-format
+msgid "Priority: %s"
+msgstr "Tosaíocht: %s"
+
+#: ../calendar/gui/print.c:3440
+#, c-format
+msgid "Percent Complete: %i"
+msgstr ""
+
+#: ../calendar/gui/print.c:3451
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: ../calendar/gui/print.c:3464
+#, c-format
+msgid "Categories: %s"
+msgstr "Catagóirí: %s"
+
+#: ../calendar/gui/print.c:3475
+msgid "Contacts: "
+msgstr "Teagmhálacha:"
+
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% Críochnaithe"
+
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Cancelled"
+msgstr "Cealaithe"
+
+#: ../calendar/gui/tasktypes.xml.h:15
+msgid "In progress"
+msgstr "Ar siúl"
+
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+msgid "is greater than"
+msgstr "atá níos mó ná"
+
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
+msgid "is less than"
+msgstr "atá níos lú ná"
+
+#: ../calendar/importers/icalendar-importer.c:84
+msgid "Appointments and Meetings"
+msgstr "Coinní agus Cruinnithe"
+
+#: ../calendar/importers/icalendar-importer.c:435
+#: ../calendar/importers/icalendar-importer.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:2170
+msgid "Opening calendar"
+msgstr "Féilire á oscailt"
+
+#: ../calendar/importers/icalendar-importer.c:583
+msgid "iCalendar files (.ics)"
+msgstr "Comhaid iCalendar (.ics)"
+
+#: ../calendar/importers/icalendar-importer.c:584
+msgid "Evolution iCalendar importer"
+msgstr "Iompórtálaí iCalendar Evolution"
+
+#: ../calendar/importers/icalendar-importer.c:674
+msgid "Reminder!"
+msgstr "Meabhrúchán!"
+
+#: ../calendar/importers/icalendar-importer.c:758
+msgid "vCalendar files (.vcs)"
+msgstr "Comhaid vCalendar (.vcs)"
+
+#: ../calendar/importers/icalendar-importer.c:759
+msgid "Evolution vCalendar importer"
+msgstr "Iompórtálaí vCalendar Evolution"
+
+#: ../calendar/importers/icalendar-importer.c:1038
+msgid "Calendar Events"
+msgstr "Teagmhais Féilire"
+
+#: ../calendar/importers/icalendar-importer.c:1078
+msgid "Evolution Calendar intelligent importer"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:1146
+#: ../calendar/importers/icalendar-importer.c:1464
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "Cruinniú"
+
+#: ../calendar/importers/icalendar-importer.c:1146
+#: ../calendar/importers/icalendar-importer.c:1464
+msgctxt "iCalImp"
+msgid "Event"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:1149
+#: ../calendar/importers/icalendar-importer.c:1465
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "Tasc"
+
+#: ../calendar/importers/icalendar-importer.c:1152
+#: ../calendar/importers/icalendar-importer.c:1466
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "Meamram"
+
+#: ../calendar/importers/icalendar-importer.c:1161
+#, fuzzy
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "Sainroghanna Poist"
+
+#: ../calendar/importers/icalendar-importer.c:1166
+#, fuzzy
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "�sc"
+
+#: ../calendar/importers/icalendar-importer.c:1171
+#, fuzzy
+msgctxt "iCalImp"
+msgid "has reminders"
+msgstr "&Scoránaigh Meabhrúchán"
+
+#: ../calendar/importers/icalendar-importer.c:1176
+#, fuzzy
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "iatán %s"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:1189
+#, fuzzy
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "Poiblí"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:1192
+#, fuzzy
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "Príobháideach"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:1195
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr ""
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:1199
+#, fuzzy
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "&Fógairt an Chórais"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:1204
+#: ../calendar/importers/icalendar-importer.c:1505
+#, fuzzy
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "Achoimre"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:1210
+#, fuzzy
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "Suíomh"
+
+#. 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
+#, fuzzy
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "Tús"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1229
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "Spriocdháta"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1241
+#, fuzzy
+msgctxt "iCalImp"
+msgid "End"
+msgstr "Deireadh"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1251
+#, fuzzy
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "Catagóirí"
+
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1275
+#, fuzzy
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "Críochnaithe"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1283
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "URL"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1294
+#: ../calendar/importers/icalendar-importer.c:1297
+#, fuzzy
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "Eagraí"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1317
+#: ../calendar/importers/icalendar-importer.c:1320
+#, fuzzy
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "Rannpháirtithe"
+
+#: ../calendar/importers/icalendar-importer.c:1334
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "Cur Síos"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1497
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "Cineál"
+
+#.
+#. *
+#. * This program is free software; you can redistribute it and/or
+#. * modify it under the terms of the GNU Lesser General Public
+#. * License as published by the Free Software Foundation; either
+#. * version 2 of the License, or (at your option) version 3.
+#. *
+#. * This program is distributed in the hope that it will be useful,
+#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#. * Lesser General Public License for more details.
+#. *
+#. * You should have received a copy of the GNU Lesser General Public
+#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. *
+#. *
+#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+#. *
+#.
+#.
+#. * These are the timezone names from the Olson timezone data.
+#. * We only place them here so gettext picks them up for translation.
+#. * Don't include in any C files.
+#.
+#: ../calendar/zones.h:26
+msgid "Africa/Abidjan"
+msgstr "An Afraic/Abidjan"
+
+#: ../calendar/zones.h:27
+msgid "Africa/Accra"
+msgstr "An Afraic/Accra"
+
+#: ../calendar/zones.h:28
+msgid "Africa/Addis_Ababa"
+msgstr "An Afraic/Addis_Ababa"
+
+#: ../calendar/zones.h:29
+msgid "Africa/Algiers"
+msgstr "An Afraic/Cathair_na_hAilgéire"
+
+#: ../calendar/zones.h:30
+msgid "Africa/Asmera"
+msgstr "An Afraic/Asmera"
+
+#: ../calendar/zones.h:31
+msgid "Africa/Bamako"
+msgstr "An Afraic/Bamako"
+
+#: ../calendar/zones.h:32
+msgid "Africa/Bangui"
+msgstr "An Afraic/Bangui"
+
+#: ../calendar/zones.h:33
+msgid "Africa/Banjul"
+msgstr "An Afraic/Banjul"
+
+#: ../calendar/zones.h:34
+msgid "Africa/Bissau"
+msgstr "An Afraic/Bissau"
+
+#: ../calendar/zones.h:35
+msgid "Africa/Blantyre"
+msgstr "An Afraic/Blantyre"
+
+#: ../calendar/zones.h:36
+msgid "Africa/Brazzaville"
+msgstr "An Afraic/Brazzaville"
+
+#: ../calendar/zones.h:37
+msgid "Africa/Bujumbura"
+msgstr "An Afraic/Bujumbura"
+
+#: ../calendar/zones.h:38
+msgid "Africa/Cairo"
+msgstr "An Afraic/Caireo"
+
+#: ../calendar/zones.h:39
+msgid "Africa/Casablanca"
+msgstr "An Afraic/Casablanca"
+
+#: ../calendar/zones.h:40
+msgid "Africa/Ceuta"
+msgstr "An Afraic/Ceuta"
+
+#: ../calendar/zones.h:41
+msgid "Africa/Conakry"
+msgstr "An Afraic/Conakry"
+
+#: ../calendar/zones.h:42
+msgid "Africa/Dakar"
+msgstr "An Afraic/Dakar"
+
+#: ../calendar/zones.h:43
+msgid "Africa/Dar_es_Salaam"
+msgstr "An Afraic/Dar_es_Salaam"
+
+#: ../calendar/zones.h:44
+msgid "Africa/Djibouti"
+msgstr "An Afraic/Djibouti"
+
+#: ../calendar/zones.h:45
+msgid "Africa/Douala"
+msgstr "An Afraic/Douala"
+
+#: ../calendar/zones.h:46
+msgid "Africa/El_Aaiun"
+msgstr "An Afraic/El_Aaiun"
+
+#: ../calendar/zones.h:47
+msgid "Africa/Freetown"
+msgstr "An Afraic/Freetown"
+
+#: ../calendar/zones.h:48
+msgid "Africa/Gaborone"
+msgstr "An Afraic/Gaborone"
+
+#: ../calendar/zones.h:49
+msgid "Africa/Harare"
+msgstr "An Afraic/Harare"
+
+#: ../calendar/zones.h:50
+msgid "Africa/Johannesburg"
+msgstr "An Afraic/Johannesburg"
+
+#: ../calendar/zones.h:51
+msgid "Africa/Kampala"
+msgstr "An Afraic/Kampala"
+
+#: ../calendar/zones.h:52
+msgid "Africa/Khartoum"
+msgstr "An Afraic/Khartoum"
+
+#: ../calendar/zones.h:53
+msgid "Africa/Kigali"
+msgstr "An Afraic/Kigali"
+
+#: ../calendar/zones.h:54
+msgid "Africa/Kinshasa"
+msgstr "An Afraic/Kinshasa"
+
+#: ../calendar/zones.h:55
+msgid "Africa/Lagos"
+msgstr "An Afraic/Lagos"
+
+#: ../calendar/zones.h:56
+msgid "Africa/Libreville"
+msgstr "An Afraic/Libreville"
+
+#: ../calendar/zones.h:57
+msgid "Africa/Lome"
+msgstr "An Afraic/Lome"
+
+#: ../calendar/zones.h:58
+msgid "Africa/Luanda"
+msgstr "An Afraic/Lúanda"
+
+#: ../calendar/zones.h:59
+msgid "Africa/Lubumbashi"
+msgstr "An Afraic/Lubumbashi"
+
+#: ../calendar/zones.h:60
+msgid "Africa/Lusaka"
+msgstr "An Afraic/Lusaka"
+
+#: ../calendar/zones.h:61
+msgid "Africa/Malabo"
+msgstr "An Afraic/Malabo"
+
+#: ../calendar/zones.h:62
+msgid "Africa/Maputo"
+msgstr "An Afraic/Maputo"
+
+#: ../calendar/zones.h:63
+msgid "Africa/Maseru"
+msgstr "An Afraic/Maseru"
+
+#: ../calendar/zones.h:64
+msgid "Africa/Mbabane"
+msgstr "An Afraic/Mbabane"
+
+#: ../calendar/zones.h:65
+msgid "Africa/Mogadishu"
+msgstr "An Afraic/Mogadishu"
+
+#: ../calendar/zones.h:66
+msgid "Africa/Monrovia"
+msgstr "An Afraic/Monrovia"
+
+#: ../calendar/zones.h:67
+msgid "Africa/Nairobi"
+msgstr "An Afraic/Nairobi"
+
+#: ../calendar/zones.h:68
+msgid "Africa/Ndjamena"
+msgstr "An Afraic/Ndjamena"
+
+#: ../calendar/zones.h:69
+msgid "Africa/Niamey"
+msgstr "An Afraic/Niamey"
+
+#: ../calendar/zones.h:70
+msgid "Africa/Nouakchott"
+msgstr "An Afraic/Nouakchott"
+
+#: ../calendar/zones.h:71
+msgid "Africa/Ouagadougou"
+msgstr "An Afraic/Ouagadougou"
+
+#: ../calendar/zones.h:72
+msgid "Africa/Porto-Novo"
+msgstr "An Afraic/Porto-Novo"
+
+#: ../calendar/zones.h:73
+msgid "Africa/Sao_Tome"
+msgstr "An Afraic/Sao_Tome"
+
+#: ../calendar/zones.h:74
+msgid "Africa/Timbuktu"
+msgstr "An Afraic/Timbuktu"
+
+#: ../calendar/zones.h:75
+msgid "Africa/Tripoli"
+msgstr "An Afraic/Tripoli"
+
+#: ../calendar/zones.h:76
+msgid "Africa/Tunis"
+msgstr "An Afraic/Túinis"
+
+#: ../calendar/zones.h:77
+msgid "Africa/Windhoek"
+msgstr "An Afraic/Windhoek"
+
+#: ../calendar/zones.h:78
+msgid "America/Adak"
+msgstr "Meiriceá/Adak"
+
+#: ../calendar/zones.h:79
+msgid "America/Anchorage"
+msgstr "Meiriceá/Anchorage"
+
+#: ../calendar/zones.h:80
+msgid "America/Anguilla"
+msgstr "Meiriceá/Anguilla"
+
+#: ../calendar/zones.h:81
+msgid "America/Antigua"
+msgstr "Meiriceá/Antigua"
+
+#: ../calendar/zones.h:82
+msgid "America/Araguaina"
+msgstr "Meiriceá/Araguaina"
+
+#: ../calendar/zones.h:83
+msgid "America/Aruba"
+msgstr "Meiriceá/Aruba"
+
+#: ../calendar/zones.h:84
+msgid "America/Asuncion"
+msgstr "Meiriceá/Asunción"
+
+#: ../calendar/zones.h:85
+msgid "America/Barbados"
+msgstr "Meiriceá/Barbadós"
+
+#: ../calendar/zones.h:86
+msgid "America/Belem"
+msgstr "Meiriceá/Belem"
+
+#: ../calendar/zones.h:87
+msgid "America/Belize"
+msgstr "Meiriceá/Belize"
+
+#: ../calendar/zones.h:88
+msgid "America/Boa_Vista"
+msgstr "Meiriceá/Boa_Vista"
+
+#: ../calendar/zones.h:89
+msgid "America/Bogota"
+msgstr "Meiriceá/Bogota"
+
+#: ../calendar/zones.h:90
+msgid "America/Boise"
+msgstr "Meiriceá/Boise"
+
+#: ../calendar/zones.h:91
+msgid "America/Buenos_Aires"
+msgstr "Meiriceá/Buenos Aires"
+
+#: ../calendar/zones.h:92
+msgid "America/Cambridge_Bay"
+msgstr "Meiriceá/Cambridge_Bay"
+
+#: ../calendar/zones.h:93
+msgid "America/Cancun"
+msgstr "Meiriceá/Cancún"
+
+#: ../calendar/zones.h:94
+msgid "America/Caracas"
+msgstr "Meiriceá/Caracas"
+
+#: ../calendar/zones.h:95
+msgid "America/Catamarca"
+msgstr "Meiriceá/Catamarca"
+
+#: ../calendar/zones.h:96
+msgid "America/Cayenne"
+msgstr "Meiriceá/Cayenne"
+
+#: ../calendar/zones.h:97
+msgid "America/Cayman"
+msgstr "Meiriceá/Cayman"
+
+#: ../calendar/zones.h:98
+msgid "America/Chicago"
+msgstr "Meiriceá/Chicago"
+
+#: ../calendar/zones.h:99
+msgid "America/Chihuahua"
+msgstr "Meiriceá/Chihuahua"
+
+#: ../calendar/zones.h:100
+msgid "America/Cordoba"
+msgstr "Meiriceá/Cordoba"
+
+#: ../calendar/zones.h:101
+msgid "America/Costa_Rica"
+msgstr "Meiriceá/Cósta_Rice"
+
+#: ../calendar/zones.h:102
+msgid "America/Cuiaba"
+msgstr "Meiriceá/Cuiaba"
+
+#: ../calendar/zones.h:103
+msgid "America/Curacao"
+msgstr "Meiriceá/Curacao"
+
+#: ../calendar/zones.h:104
+msgid "America/Danmarkshavn"
+msgstr "Meiriceá/Danmarkshavn"
+
+#: ../calendar/zones.h:105
+msgid "America/Dawson"
+msgstr "Meiriceá/Dawson"
+
+#: ../calendar/zones.h:106
+msgid "America/Dawson_Creek"
+msgstr "Meiriceá/Dawson_Creek"
+
+#: ../calendar/zones.h:107
+msgid "America/Denver"
+msgstr "Meiriceá/Denver"
+
+#: ../calendar/zones.h:108
+msgid "America/Detroit"
+msgstr "Meiriceá/Detroit"
+
+#: ../calendar/zones.h:109
+msgid "America/Dominica"
+msgstr "Meiriceá/Dominica"
+
+#: ../calendar/zones.h:110
+msgid "America/Edmonton"
+msgstr "Meiriceá/Edmonton"
+
+#: ../calendar/zones.h:111
+msgid "America/Eirunepe"
+msgstr "Meiriceá/Eirunepe"
+
+#: ../calendar/zones.h:112
+msgid "America/El_Salvador"
+msgstr "Meiriceá/An tSalvadóir"
+
+#: ../calendar/zones.h:113
+msgid "America/Fortaleza"
+msgstr "Meiriceá/Fortaleza"
+
+#: ../calendar/zones.h:114
+msgid "America/Glace_Bay"
+msgstr "Meiriceá/Glace_Bay"
+
+#: ../calendar/zones.h:115
+msgid "America/Godthab"
+msgstr "Meiriceá/Godthab"
+
+#: ../calendar/zones.h:116
+msgid "America/Goose_Bay"
+msgstr "Meiriceá/Goose_Bay"
+
+#: ../calendar/zones.h:117
+msgid "America/Grand_Turk"
+msgstr "Meiriceá/Grand_Turk"
+
+#: ../calendar/zones.h:118
+msgid "America/Grenada"
+msgstr "Meiriceá/Grenada"
+
+#: ../calendar/zones.h:119
+msgid "America/Guadeloupe"
+msgstr "Meiriceá/Guadalúip"
+
+#: ../calendar/zones.h:120
+msgid "America/Guatemala"
+msgstr "Meiriceá/Guatamala"
+
+#: ../calendar/zones.h:121
+msgid "America/Guayaquil"
+msgstr "Meiriceá/Guayaquil"
+
+#: ../calendar/zones.h:122
+msgid "America/Guyana"
+msgstr "Meiriceá/An Ghuáin"
+
+#: ../calendar/zones.h:123
+msgid "America/Halifax"
+msgstr "Meiriceá/Halifax"
+
+#: ../calendar/zones.h:124
+msgid "America/Havana"
+msgstr "Meiriceá/Havana"
+
+#: ../calendar/zones.h:125
+msgid "America/Hermosillo"
+msgstr "Meiriceá/Hermosillo"
+
+#: ../calendar/zones.h:126
+msgid "America/Indiana/Indianapolis"
+msgstr "Meiriceá/Indiana/Indianapolis"
+
+#: ../calendar/zones.h:127
+msgid "America/Indiana/Knox"
+msgstr "Meiriceá/Indiana/Knox"
+
+#: ../calendar/zones.h:128
+msgid "America/Indiana/Marengo"
+msgstr "Meiriceá/Indiana/Marengo"
+
+#: ../calendar/zones.h:129
+msgid "America/Indiana/Vevay"
+msgstr "Meiriceá/Indiana/Vevay"
+
+#: ../calendar/zones.h:130
+msgid "America/Indianapolis"
+msgstr "Meiriceá/Indianapolis"
+
+#: ../calendar/zones.h:131
+msgid "America/Inuvik"
+msgstr "Meiriceá/Inuvik"
+
+#: ../calendar/zones.h:132
+msgid "America/Iqaluit"
+msgstr "Meiriceá/Iqaluit"
+
+#: ../calendar/zones.h:133
+msgid "America/Jamaica"
+msgstr "Meiriceá/Iamáice"
+
+#: ../calendar/zones.h:134
+msgid "America/Jujuy"
+msgstr "Meiriceá/Jujuy"
+
+#: ../calendar/zones.h:135
+msgid "America/Juneau"
+msgstr "Meiriceá/Juneau"
+
+#: ../calendar/zones.h:136
+msgid "America/Kentucky/Louisville"
+msgstr "Meiriceá/Kentucky/Louisville"
+
+#: ../calendar/zones.h:137
+msgid "America/Kentucky/Monticello"
+msgstr "Meiriceá/Kentucky/Monticello"
+
+#: ../calendar/zones.h:138
+msgid "America/La_Paz"
+msgstr "Meiriceá/La_Paz"
+
+#: ../calendar/zones.h:139
+msgid "America/Lima"
+msgstr "Meiriceá/Lima"
+
+#: ../calendar/zones.h:140
+msgid "America/Los_Angeles"
+msgstr "Meiriceá/Los_Angeles"
+
+#: ../calendar/zones.h:141
+msgid "America/Louisville"
+msgstr "Meiriceá/Louisville"
+
+#: ../calendar/zones.h:142
+msgid "America/Maceio"
+msgstr "Meiriceá/Maceio"
+
+#: ../calendar/zones.h:143
+msgid "America/Managua"
+msgstr "Meiriceá/Managua"
+
+#: ../calendar/zones.h:144
+msgid "America/Manaus"
+msgstr "Meiriceá/Manaus"
+
+#: ../calendar/zones.h:145
+msgid "America/Martinique"
+msgstr "Meiriceá/Martinique"
+
+#: ../calendar/zones.h:146
+msgid "America/Mazatlan"
+msgstr "Meiriceá/Mazatlan"
+
+#: ../calendar/zones.h:147
+msgid "America/Mendoza"
+msgstr "Meiriceá/Mendoza"
+
+#: ../calendar/zones.h:148
+msgid "America/Menominee"
+msgstr "Meiriceá/Menominee"
+
+#: ../calendar/zones.h:149
+msgid "America/Merida"
+msgstr "Meiriceá/Merida"
+
+#: ../calendar/zones.h:150
+msgid "America/Mexico_City"
+msgstr "Meiriceá/Cathair_Mheicsiceo"
+
+#: ../calendar/zones.h:151
+msgid "America/Miquelon"
+msgstr "Meiriceá/Miquelon"
+
+#: ../calendar/zones.h:152
+msgid "America/Monterrey"
+msgstr "Meiriceá/Monterrey"
+
+#: ../calendar/zones.h:153
+msgid "America/Montevideo"
+msgstr "Meiriceá/Montevideo"
+
+#: ../calendar/zones.h:154
+msgid "America/Montreal"
+msgstr "Meiriceá/Montréal"
+
+#: ../calendar/zones.h:155
+msgid "America/Montserrat"
+msgstr "Meiriceá/Montserrat"
+
+#: ../calendar/zones.h:156
+msgid "America/Nassau"
+msgstr "Meiriceá/Nassau"
+
+#: ../calendar/zones.h:157
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
+msgid "America/New_York"
+msgstr "Meiriceá/Nua_Eabhrac"
+
+#: ../calendar/zones.h:158
+msgid "America/Nipigon"
+msgstr "Meiriceá/Nipigon"
+
+#: ../calendar/zones.h:159
+msgid "America/Nome"
+msgstr "Meiriceá/Nome"
+
+#: ../calendar/zones.h:160
+msgid "America/Noronha"
+msgstr "Meiriceá/Noronha"
+
+#: ../calendar/zones.h:161
+msgid "America/North_Dakota/Center"
+msgstr "Meiriceá/North_Dakota/Center"
+
+#: ../calendar/zones.h:162
+msgid "America/Panama"
+msgstr "Meiriceá/Panama"
+
+#: ../calendar/zones.h:163
+msgid "America/Pangnirtung"
+msgstr "Meiriceá/Pangnirtung"
+
+#: ../calendar/zones.h:164
+msgid "America/Paramaribo"
+msgstr "Meiriceá/Paramaribo"
+
+#: ../calendar/zones.h:165
+msgid "America/Phoenix"
+msgstr "Meiriceá/Phoenix"
+
+#: ../calendar/zones.h:166
+msgid "America/Port-au-Prince"
+msgstr "Meiriceá/Port-au-Prince"
+
+#: ../calendar/zones.h:167
+msgid "America/Port_of_Spain"
+msgstr "Meiriceá/Port_of_Spain"
+
+#: ../calendar/zones.h:168
+msgid "America/Porto_Velho"
+msgstr "Meiriceá/Porto_Velho"
+
+#: ../calendar/zones.h:169
+msgid "America/Puerto_Rico"
+msgstr "Meiriceá/Puerto_Rico"
+
+#: ../calendar/zones.h:170
+msgid "America/Rainy_River"
+msgstr "Meiriceá/Rainy_River"
+
+#: ../calendar/zones.h:171
+msgid "America/Rankin_Inlet"
+msgstr "Meiriceá/Rankin_Inlet"
+
+#: ../calendar/zones.h:172
+msgid "America/Recife"
+msgstr "Meiriceá/Recife"
+
+#: ../calendar/zones.h:173
+msgid "America/Regina"
+msgstr "Meiriceá/Regina"
+
+#: ../calendar/zones.h:174
+msgid "America/Rio_Branco"
+msgstr "Meiriceá/Rio_Branco"
+
+#: ../calendar/zones.h:175
+msgid "America/Rosario"
+msgstr "Meiriceá/Rosario"
+
+#: ../calendar/zones.h:176
+msgid "America/Santiago"
+msgstr "Meiriceá/Santiago"
+
+#: ../calendar/zones.h:177
+msgid "America/Santo_Domingo"
+msgstr "Meiriceá/Santo_Domingo"
+
+#: ../calendar/zones.h:178
+msgid "America/Sao_Paulo"
+msgstr "Meiriceá/Sao_Paulo"
+
+#: ../calendar/zones.h:179
+msgid "America/Scoresbysund"
+msgstr "Meiriceá/Scoresbysund"
+
+#: ../calendar/zones.h:180
+msgid "America/Shiprock"
+msgstr "Meiriceá/Shiprock"
+
+#: ../calendar/zones.h:181
+msgid "America/St_Johns"
+msgstr "Meiriceá/St_Johns"
+
+#: ../calendar/zones.h:182
+msgid "America/St_Kitts"
+msgstr "Meiriceá/St_Kitts"
+
+#: ../calendar/zones.h:183
+msgid "America/St_Lucia"
+msgstr "Meiriceá/St_Lucia"
+
+#: ../calendar/zones.h:184
+msgid "America/St_Thomas"
+msgstr "Meiriceá/St_Thomas"
+
+#: ../calendar/zones.h:185
+msgid "America/St_Vincent"
+msgstr "Meiriceá/St_Vincent"
+
+#: ../calendar/zones.h:186
+msgid "America/Swift_Current"
+msgstr "Meiriceá/Swift_Current"
+
+#: ../calendar/zones.h:187
+msgid "America/Tegucigalpa"
+msgstr "Meiriceá/Tegucigalpa"
+
+#: ../calendar/zones.h:188
+msgid "America/Thule"
+msgstr "Meiriceá/Thule"
+
+#: ../calendar/zones.h:189
+msgid "America/Thunder_Bay"
+msgstr "Meiriceá/Thunder_Bay"
+
+#: ../calendar/zones.h:190
+msgid "America/Tijuana"
+msgstr "Meiriceá/Tijuana"
+
+#: ../calendar/zones.h:191
+msgid "America/Tortola"
+msgstr "Meiriceá/Tortola"
+
+#: ../calendar/zones.h:192
+msgid "America/Vancouver"
+msgstr "Meiriceá/Vancouver"
+
+#: ../calendar/zones.h:193
+msgid "America/Whitehorse"
+msgstr "Meiriceá/Whitehorse"
+
+#: ../calendar/zones.h:194
+msgid "America/Winnipeg"
+msgstr "Meiriceá/Winnipeg"
+
+#: ../calendar/zones.h:195
+msgid "America/Yakutat"
+msgstr "Meiriceá/Yakutat"
+
+#: ../calendar/zones.h:196
+msgid "America/Yellowknife"
+msgstr "Meiriceá/Yellowknife"
+
+#: ../calendar/zones.h:197
+msgid "Antarctica/Casey"
+msgstr "An tAntartach/Casey"
+
+#: ../calendar/zones.h:198
+msgid "Antarctica/Davis"
+msgstr "an tAntartach/Davis"
+
+#: ../calendar/zones.h:199
+msgid "Antarctica/DumontDUrville"
+msgstr "An tAntartach/Dumont_DUrville"
+
+#: ../calendar/zones.h:200
+msgid "Antarctica/Mawson"
+msgstr "an tAntartach/Mawson"
+
+#: ../calendar/zones.h:201
+msgid "Antarctica/McMurdo"
+msgstr "an tAntartach/McMurdo"
+
+#: ../calendar/zones.h:202
+msgid "Antarctica/Palmer"
+msgstr "an tAntartach/Palmer"
+
+#: ../calendar/zones.h:203
+msgid "Antarctica/South_Pole"
+msgstr "an tAntartach/An Mhol Theas"
+
+#: ../calendar/zones.h:204
+msgid "Antarctica/Syowa"
+msgstr "an tAntartach/Síowa"
+
+#: ../calendar/zones.h:205
+msgid "Antarctica/Vostok"
+msgstr "an tAntartach/Vostok"
+
+#: ../calendar/zones.h:206
+msgid "Arctic/Longyearbyen"
+msgstr "Arctic/Longyearbyen"
+
+#: ../calendar/zones.h:207
+msgid "Asia/Aden"
+msgstr "An �ise/�idin"
+
+#: ../calendar/zones.h:208
+msgid "Asia/Almaty"
+msgstr "An �ise/Almaty"
+
+#: ../calendar/zones.h:209
+msgid "Asia/Amman"
+msgstr "An �ise/Amman"
+
+#: ../calendar/zones.h:210
+msgid "Asia/Anadyr"
+msgstr "An �ise/Anadyr"
+
+#: ../calendar/zones.h:211
+msgid "Asia/Aqtau"
+msgstr "An �ise/Aqtau"
+
+#: ../calendar/zones.h:212
+msgid "Asia/Aqtobe"
+msgstr "An �ise/Aqtobe"
+
+#: ../calendar/zones.h:213
+msgid "Asia/Ashgabat"
+msgstr "An �ise/Ashgabat"
+
+#: ../calendar/zones.h:214
+msgid "Asia/Baghdad"
+msgstr "An �ise/Baghdad"
+
+#: ../calendar/zones.h:215
+msgid "Asia/Bahrain"
+msgstr "An �ise/Bairéin"
+
+#: ../calendar/zones.h:216
+msgid "Asia/Baku"
+msgstr "An �ise/Baku"
+
+#: ../calendar/zones.h:217
+msgid "Asia/Bangkok"
+msgstr "An �ise/Bangkok"
+
+#: ../calendar/zones.h:218
+msgid "Asia/Beirut"
+msgstr "An �ise/Beirut"
+
+#: ../calendar/zones.h:219
+msgid "Asia/Bishkek"
+msgstr "An �ise/Bishkek"
+
+#: ../calendar/zones.h:220
+msgid "Asia/Brunei"
+msgstr "An �ise/Brunei"
+
+#: ../calendar/zones.h:221
+msgid "Asia/Calcutta"
+msgstr "An �ise/Calcúta"
+
+#: ../calendar/zones.h:222
+msgid "Asia/Choibalsan"
+msgstr "An �ise/Choibalsan"
+
+#: ../calendar/zones.h:223
+msgid "Asia/Chongqing"
+msgstr "An �ise/Chongqing"
+
+#: ../calendar/zones.h:224
+msgid "Asia/Colombo"
+msgstr "An �ise/Colombo"
+
+#: ../calendar/zones.h:225
+msgid "Asia/Damascus"
+msgstr "An �ise/An_Damaisc"
+
+#: ../calendar/zones.h:226
+msgid "Asia/Dhaka"
+msgstr "An �ise/Dhaka"
+
+#: ../calendar/zones.h:227
+msgid "Asia/Dili"
+msgstr "An �ise/Dili"
+
+#: ../calendar/zones.h:228
+msgid "Asia/Dubai"
+msgstr "An �ise/Dubai"
+
+#: ../calendar/zones.h:229
+msgid "Asia/Dushanbe"
+msgstr "An �ise/Dushanbe"
+
+#: ../calendar/zones.h:230
+msgid "Asia/Gaza"
+msgstr "An �ise/Gaza"
+
+#: ../calendar/zones.h:231
+msgid "Asia/Harbin"
+msgstr "An �ise/Harbin"
+
+#: ../calendar/zones.h:232
+msgid "Asia/Hong_Kong"
+msgstr "An �ise/Hong_Cong"
+
+#: ../calendar/zones.h:233
+msgid "Asia/Hovd"
+msgstr "An �ise/Hovd"
+
+#: ../calendar/zones.h:234
+msgid "Asia/Irkutsk"
+msgstr "An �ise/Irkutsk"
+
+#: ../calendar/zones.h:235
+msgid "Asia/Istanbul"
+msgstr "An �ise/Iostanbúl"
+
+#: ../calendar/zones.h:236
+msgid "Asia/Jakarta"
+msgstr "An �ise/Jakarta"
+
+#: ../calendar/zones.h:237
+msgid "Asia/Jayapura"
+msgstr "An �ise/Jayapura"
+
+#: ../calendar/zones.h:238
+msgid "Asia/Jerusalem"
+msgstr "An �ise/Iarúsailéim"
+
+#: ../calendar/zones.h:239
+msgid "Asia/Kabul"
+msgstr "An �ise/Kabul"
+
+#: ../calendar/zones.h:240
+msgid "Asia/Kamchatka"
+msgstr "An �ise/Kamchatka"
+
+#: ../calendar/zones.h:241
+msgid "Asia/Karachi"
+msgstr "An �ise/Karachi"
+
+#: ../calendar/zones.h:242
+msgid "Asia/Kashgar"
+msgstr "An �ise/Kashgar"
+
+#: ../calendar/zones.h:243
+msgid "Asia/Katmandu"
+msgstr "An �ise/Katmandu"
+
+#: ../calendar/zones.h:244
+msgid "Asia/Krasnoyarsk"
+msgstr "An �ise/Krasnoyarsk"
+
+#: ../calendar/zones.h:245
+msgid "Asia/Kuala_Lumpur"
+msgstr "An �ise/Kuala_Lumpur"
+
+#: ../calendar/zones.h:246
+msgid "Asia/Kuching"
+msgstr "An �ise/Kuching"
+
+#: ../calendar/zones.h:247
+msgid "Asia/Kuwait"
+msgstr "An �ise/Cuáit"
+
+#: ../calendar/zones.h:248
+msgid "Asia/Macao"
+msgstr "An �ise/Macao"
+
+#: ../calendar/zones.h:249
+msgid "Asia/Macau"
+msgstr "An �ise/Macau"
+
+#: ../calendar/zones.h:250
+msgid "Asia/Magadan"
+msgstr "An �ise/Magadan"
+
+#: ../calendar/zones.h:251
+msgid "Asia/Makassar"
+msgstr "An �ise/Makassar"
+
+#: ../calendar/zones.h:252
+msgid "Asia/Manila"
+msgstr "An �ise/Manila"
+
+#: ../calendar/zones.h:253
+msgid "Asia/Muscat"
+msgstr "An �ise/Muscat"
+
+#: ../calendar/zones.h:254
+msgid "Asia/Nicosia"
+msgstr "An �ise/Nicosia"
+
+#: ../calendar/zones.h:255
+msgid "Asia/Novosibirsk"
+msgstr "An �ise/Novosibirsk"
+
+#: ../calendar/zones.h:256
+msgid "Asia/Omsk"
+msgstr "An �ise/Omsk"
+
+#: ../calendar/zones.h:257
+msgid "Asia/Oral"
+msgstr "An �ise/Oral"
+
+#: ../calendar/zones.h:258
+msgid "Asia/Phnom_Penh"
+msgstr "An �ise/Phnom_Penh"
+
+#: ../calendar/zones.h:259
+msgid "Asia/Pontianak"
+msgstr "An �ise/Pontianak"
+
+#: ../calendar/zones.h:260
+msgid "Asia/Pyongyang"
+msgstr "An �ise/Pyongyang"
+
+#: ../calendar/zones.h:261
+msgid "Asia/Qatar"
+msgstr "An �ise/Catar"
+
+#: ../calendar/zones.h:262
+msgid "Asia/Qyzylorda"
+msgstr "An �ise/Qyzylorda"
+
+#: ../calendar/zones.h:263
+msgid "Asia/Rangoon"
+msgstr "An �ise/Rangoon"
+
+#: ../calendar/zones.h:264
+msgid "Asia/Riyadh"
+msgstr "An �ise/Riyadh"
+
+#: ../calendar/zones.h:265
+msgid "Asia/Saigon"
+msgstr "An �ise/Saigon"
+
+#: ../calendar/zones.h:266
+msgid "Asia/Sakhalin"
+msgstr "An �ise/Sakhalin"
+
+#: ../calendar/zones.h:267
+msgid "Asia/Samarkand"
+msgstr "An �ise/Samarkand"
+
+#: ../calendar/zones.h:268
+msgid "Asia/Seoul"
+msgstr "An �ise/Seoul"
+
+#: ../calendar/zones.h:269
+msgid "Asia/Shanghai"
+msgstr "An �ise/Shanghai"
+
+#: ../calendar/zones.h:270
+msgid "Asia/Singapore"
+msgstr "An �ise/Singeapór"
+
+#: ../calendar/zones.h:271
+msgid "Asia/Taipei"
+msgstr "An �ise/Taipei"
+
+#: ../calendar/zones.h:272
+msgid "Asia/Tashkent"
+msgstr "An �ise/Tashkent"
+
+#: ../calendar/zones.h:273
+msgid "Asia/Tbilisi"
+msgstr "An �ise/Tbilisi"
+
+#: ../calendar/zones.h:274
+msgid "Asia/Tehran"
+msgstr "An �ise/Tehran"
+
+#: ../calendar/zones.h:275
+msgid "Asia/Thimphu"
+msgstr "An �ise/Thimphu"
+
+#: ../calendar/zones.h:276
+msgid "Asia/Tokyo"
+msgstr "An �ise/Tóiceo"
+
+#: ../calendar/zones.h:277
+msgid "Asia/Ujung_Pandang"
+msgstr "An �ise/Ujung_Pandang"
+
+#: ../calendar/zones.h:278
+msgid "Asia/Ulaanbaatar"
+msgstr "An �ise/Ulaanbaatar"
+
+#: ../calendar/zones.h:279
+msgid "Asia/Urumqi"
+msgstr "An �ise/Urumqi"
+
+#: ../calendar/zones.h:280
+msgid "Asia/Vientiane"
+msgstr "An �ise/Vientiane"
+
+#: ../calendar/zones.h:281
+msgid "Asia/Vladivostok"
+msgstr "An �ise/Vladivostok"
+
+#: ../calendar/zones.h:282
+msgid "Asia/Yakutsk"
+msgstr "An �ise/Yakutsk"
+
+#: ../calendar/zones.h:283
+msgid "Asia/Yekaterinburg"
+msgstr "An �ise/Yekaterinburg"
+
+#: ../calendar/zones.h:284
+msgid "Asia/Yerevan"
+msgstr "An �ise/Yerevan"
+
+#: ../calendar/zones.h:285
+msgid "Atlantic/Azores"
+msgstr "An tAtlantach/Na_hAsóir"
+
+#: ../calendar/zones.h:286
+msgid "Atlantic/Bermuda"
+msgstr "An tAtlantach/Beirmiúda"
+
+#: ../calendar/zones.h:287
+msgid "Atlantic/Canary"
+msgstr "An tAtlantach/Oileáin_Chanáracha"
+
+#: ../calendar/zones.h:288
+msgid "Atlantic/Cape_Verde"
+msgstr "An tAtlantach/Cape_Verde"
+
+#: ../calendar/zones.h:289
+msgid "Atlantic/Faeroe"
+msgstr "An tAtlantach/Faró"
+
+#: ../calendar/zones.h:290
+msgid "Atlantic/Jan_Mayen"
+msgstr "An tAtlantach/Jan_Mayen"
+
+#: ../calendar/zones.h:291
+msgid "Atlantic/Madeira"
+msgstr "An tAtlantach/Maidéara"
+
+#: ../calendar/zones.h:292
+msgid "Atlantic/Reykjavik"
+msgstr "An tAtlantach/Reykjavik"
+
+#: ../calendar/zones.h:293
+msgid "Atlantic/South_Georgia"
+msgstr "An tAtlantach/Georgia_Theas"
+
+#: ../calendar/zones.h:294
+msgid "Atlantic/St_Helena"
+msgstr "An tAtlantach/San_Héilin"
+
+#: ../calendar/zones.h:295
+msgid "Atlantic/Stanley"
+msgstr "An tAtlantach/Stanley"
+
+#: ../calendar/zones.h:296
+msgid "Australia/Adelaide"
+msgstr "An Astráil/Adelaide"
+
+#: ../calendar/zones.h:297
+msgid "Australia/Brisbane"
+msgstr "An Astráil/Brisbane"
+
+#: ../calendar/zones.h:298
+msgid "Australia/Broken_Hill"
+msgstr "An Astráil/Broken_Hill"
+
+#: ../calendar/zones.h:299
+msgid "Australia/Darwin"
+msgstr "An Astráil/Darwin"
+
+#: ../calendar/zones.h:300
+msgid "Australia/Hobart"
+msgstr "An Astráil/Hobart"
+
+#: ../calendar/zones.h:301
+msgid "Australia/Lindeman"
+msgstr "An Astráil/Lindeman"
+
+#: ../calendar/zones.h:302
+msgid "Australia/Lord_Howe"
+msgstr "An Astráil/Lord_Howe"
+
+#: ../calendar/zones.h:303
+msgid "Australia/Melbourne"
+msgstr "An Astráil/Melbourne"
+
+#: ../calendar/zones.h:304
+msgid "Australia/Perth"
+msgstr "An Astráil/Perth"
+
+#: ../calendar/zones.h:305
+msgid "Australia/Sydney"
+msgstr "An Astráil/Sydney"
+
+#: ../calendar/zones.h:306
+msgid "Europe/Amsterdam"
+msgstr "An Eoraip/Amstardam"
+
+#: ../calendar/zones.h:307
+msgid "Europe/Andorra"
+msgstr "An Eoraip/Andóra"
+
+#: ../calendar/zones.h:308
+msgid "Europe/Athens"
+msgstr "An Eoraip/An_Aithin"
+
+#: ../calendar/zones.h:309
+msgid "Europe/Belfast"
+msgstr "An Eoraip/Béal Feirste"
+
+#: ../calendar/zones.h:310
+msgid "Europe/Belgrade"
+msgstr "An Eoraip/Béalgrád"
+
+#: ../calendar/zones.h:311
+msgid "Europe/Berlin"
+msgstr "An Eoraip/Beirlín"
+
+#: ../calendar/zones.h:312
+msgid "Europe/Bratislava"
+msgstr "An Eoraip/Bratislava"
+
+#: ../calendar/zones.h:313
+msgid "Europe/Brussels"
+msgstr "An Eoraip/An Bhruiséil"
+
+#: ../calendar/zones.h:314
+msgid "Europe/Bucharest"
+msgstr "An Eoraip/Búcairist"
+
+#: ../calendar/zones.h:315
+msgid "Europe/Budapest"
+msgstr "An Eoraip/Búdaipeist"
+
+#: ../calendar/zones.h:316
+msgid "Europe/Chisinau"
+msgstr "An Eoraip/Chisinau"
+
+#: ../calendar/zones.h:317
+msgid "Europe/Copenhagen"
+msgstr "An Eoraip/Cóbanhávan"
+
+#: ../calendar/zones.h:318
+msgid "Europe/Dublin"
+msgstr "An Eoraip/Baile �tha Cliath"
+
+#: ../calendar/zones.h:319
+msgid "Europe/Gibraltar"
+msgstr "An Eoraip/Giobráltar"
+
+#: ../calendar/zones.h:320
+msgid "Europe/Helsinki"
+msgstr "An Eoraip/Heilsincí"
+
+#: ../calendar/zones.h:321
+msgid "Europe/Istanbul"
+msgstr "An Eoraip/Iostanbúl"
+
+#: ../calendar/zones.h:322
+msgid "Europe/Kaliningrad"
+msgstr "An Eoraip/Kaliningrad"
+
+#: ../calendar/zones.h:323
+msgid "Europe/Kiev"
+msgstr "An Eoraip/Kiev"
+
+#: ../calendar/zones.h:324
+msgid "Europe/Lisbon"
+msgstr "An Eoraip/Liospóin"
+
+#: ../calendar/zones.h:325
+msgid "Europe/Ljubljana"
+msgstr "An Eoraip/Ljubljana"
+
+#: ../calendar/zones.h:326
+msgid "Europe/London"
+msgstr "An Eoraip/Londain"
+
+#: ../calendar/zones.h:327
+msgid "Europe/Luxembourg"
+msgstr "An Eoraip/Lucsamburg"
+
+#: ../calendar/zones.h:328
+msgid "Europe/Madrid"
+msgstr "An Eoraip/Maidrid"
+
+#: ../calendar/zones.h:329
+msgid "Europe/Malta"
+msgstr "An Eoraip/Málta"
+
+#: ../calendar/zones.h:330
+msgid "Europe/Minsk"
+msgstr "An Eoraip/Minsk"
+
+#: ../calendar/zones.h:331
+msgid "Europe/Monaco"
+msgstr "An Eoraip/Monacó"
+
+#: ../calendar/zones.h:332
+msgid "Europe/Moscow"
+msgstr "An Eoraip/Moscó"
+
+#: ../calendar/zones.h:333
+msgid "Europe/Nicosia"
+msgstr "An Eoraip/Nicosia"
+
+#: ../calendar/zones.h:334
+msgid "Europe/Oslo"
+msgstr "An Eoraip/Osló"
+
+#: ../calendar/zones.h:335
+msgid "Europe/Paris"
+msgstr "An Eoraip/Páras"
+
+#: ../calendar/zones.h:336
+msgid "Europe/Prague"
+msgstr "An Eoraip/Prág"
+
+#: ../calendar/zones.h:337
+msgid "Europe/Riga"
+msgstr "An Eoraip/Riga"
+
+#: ../calendar/zones.h:338
+msgid "Europe/Rome"
+msgstr "An Eoraip/An Róimh"
+
+#: ../calendar/zones.h:339
+msgid "Europe/Samara"
+msgstr "An Eoraip/Samara"
+
+#: ../calendar/zones.h:340
+msgid "Europe/San_Marino"
+msgstr "An Eoraip/San_Mairíne"
+
+#: ../calendar/zones.h:341
+msgid "Europe/Sarajevo"
+msgstr "An Eoraip/Sarajevo"
+
+#: ../calendar/zones.h:342
+msgid "Europe/Simferopol"
+msgstr "An Eoraip/Simferopol"
+
+#: ../calendar/zones.h:343
+msgid "Europe/Skopje"
+msgstr "An Eoraip/Skopje"
+
+#: ../calendar/zones.h:344
+msgid "Europe/Sofia"
+msgstr "An Eoraip/Sóifia"
+
+#: ../calendar/zones.h:345
+msgid "Europe/Stockholm"
+msgstr "An Eoraip/Stócólm"
+
+#: ../calendar/zones.h:346
+msgid "Europe/Tallinn"
+msgstr "An Eoraip/Tallinn"
+
+#: ../calendar/zones.h:347
+msgid "Europe/Tirane"
+msgstr "An Eoraip/Tirane"
+
+#: ../calendar/zones.h:348
+msgid "Europe/Uzhgorod"
+msgstr "An Eoraip/Uzhgorod"
+
+#: ../calendar/zones.h:349
+msgid "Europe/Vaduz"
+msgstr "An Eoraip/Vaduz"
+
+#: ../calendar/zones.h:350
+msgid "Europe/Vatican"
+msgstr "An Eoraip/Vatacáin"
+
+#: ../calendar/zones.h:351
+msgid "Europe/Vienna"
+msgstr "An Eoraip/Vín"
+
+#: ../calendar/zones.h:352
+msgid "Europe/Vilnius"
+msgstr "An Eoraip/Vilnius"
+
+#: ../calendar/zones.h:353
+msgid "Europe/Warsaw"
+msgstr "An Eoraip/Vársá"
+
+#: ../calendar/zones.h:354
+msgid "Europe/Zagreb"
+msgstr "An Eoraip/Zagreb"
+
+#: ../calendar/zones.h:355
+msgid "Europe/Zaporozhye"
+msgstr "An Eoraip/Zaporozhye"
+
+#: ../calendar/zones.h:356
+msgid "Europe/Zurich"
+msgstr "An Eoraip/Zürich"
+
+#: ../calendar/zones.h:357
+msgid "Indian/Antananarivo"
+msgstr "An tAigéan Indiach/Antananarivo"
+
+#: ../calendar/zones.h:358
+msgid "Indian/Chagos"
+msgstr "An tAigéan Indiach/Chagos"
+
+#: ../calendar/zones.h:359
+msgid "Indian/Christmas"
+msgstr "An tAigéan Indiach/Christmas"
+
+#: ../calendar/zones.h:360
+msgid "Indian/Cocos"
+msgstr "An tAigéan Indiach/Cocos"
+
+#: ../calendar/zones.h:361
+msgid "Indian/Comoro"
+msgstr "An tAigéan Indiach/Comoro"
+
+#: ../calendar/zones.h:362
+msgid "Indian/Kerguelen"
+msgstr "An tAigéan Indiach/Kerguelen"
+
+#: ../calendar/zones.h:363
+msgid "Indian/Mahe"
+msgstr "An tAigéan Indiach/Mahe"
+
+#: ../calendar/zones.h:364
+msgid "Indian/Maldives"
+msgstr "An tAigéan Indiach/Oileáin Mhaildíve"
+
+#: ../calendar/zones.h:365
+msgid "Indian/Mauritius"
+msgstr "An tAigéan Indiach/Oileán Mhuirís"
+
+#: ../calendar/zones.h:366
+msgid "Indian/Mayotte"
+msgstr "An tAigéan Indiach/Mayotte"
+
+#: ../calendar/zones.h:367
+msgid "Indian/Reunion"
+msgstr "An tAigéan Indiach/Réunion"
+
+#: ../calendar/zones.h:368
+msgid "Pacific/Apia"
+msgstr "An tAigéan Ciúin/Apia"
+
+#: ../calendar/zones.h:369
+msgid "Pacific/Auckland"
+msgstr "An tAigéan Ciúin/Auckland"
+
+#: ../calendar/zones.h:370
+msgid "Pacific/Chatham"
+msgstr "An tAigéan Ciúin/Chatham"
+
+#: ../calendar/zones.h:371
+msgid "Pacific/Easter"
+msgstr "An tAigéan Ciúin/Easter"
+
+#: ../calendar/zones.h:372
+msgid "Pacific/Efate"
+msgstr "An tAigéan Ciúin/Efate"
+
+#: ../calendar/zones.h:373
+msgid "Pacific/Enderbury"
+msgstr "An tAigéan Ciúin/Enderbury"
+
+#: ../calendar/zones.h:374
+msgid "Pacific/Fakaofo"
+msgstr "An tAigéan Ciúin/Fakaofo"
+
+#: ../calendar/zones.h:375
+msgid "Pacific/Fiji"
+msgstr "An tAigéan Ciúin/Fidsí"
+
+#: ../calendar/zones.h:376
+msgid "Pacific/Funafuti"
+msgstr "An tAigéan Ciúin/Funafuti"
+
+#: ../calendar/zones.h:377
+msgid "Pacific/Galapagos"
+msgstr "An tAigéan Ciúin/Galapagos"
+
+#: ../calendar/zones.h:378
+msgid "Pacific/Gambier"
+msgstr "An tAigéan Ciúin/Gambier"
+
+#: ../calendar/zones.h:379
+msgid "Pacific/Guadalcanal"
+msgstr "An tAigéan Ciúin/Guadalcanal"
+
+#: ../calendar/zones.h:380
+msgid "Pacific/Guam"
+msgstr "An tAigéan Ciúin/Guam"
+
+#: ../calendar/zones.h:381
+msgid "Pacific/Honolulu"
+msgstr "An tAigéan Ciúin/Honolulu"
+
+#: ../calendar/zones.h:382
+msgid "Pacific/Johnston"
+msgstr "An tAigéan Ciúin/Johnston"
+
+#: ../calendar/zones.h:383
+msgid "Pacific/Kiritimati"
+msgstr "An tAigéan Ciúin/Kiritimati"
+
+#: ../calendar/zones.h:384
+msgid "Pacific/Kosrae"
+msgstr "An tAigéan Ciúin/Kosrae"
+
+#: ../calendar/zones.h:385
+msgid "Pacific/Kwajalein"
+msgstr "An tAigéan Ciúin/Kwajalein"
+
+#: ../calendar/zones.h:386
+msgid "Pacific/Majuro"
+msgstr "An tAigéan Ciúin/Majuro"
+
+#: ../calendar/zones.h:387
+msgid "Pacific/Marquesas"
+msgstr "An tAigéan Ciúin/Marquesas"
+
+#: ../calendar/zones.h:388
+msgid "Pacific/Midway"
+msgstr "An tAigéan Ciúin/Midway"
+
+#: ../calendar/zones.h:389
+msgid "Pacific/Nauru"
+msgstr "An tAigéan Ciúin/Nárú"
+
+#: ../calendar/zones.h:390
+msgid "Pacific/Niue"
+msgstr "An tAigéan Ciúin/Niue"
+
+#: ../calendar/zones.h:391
+msgid "Pacific/Norfolk"
+msgstr "An tAigéan Ciúin/Norfolk"
+
+#: ../calendar/zones.h:392
+msgid "Pacific/Noumea"
+msgstr "An tAigéan Ciúin/Noumea"
+
+#: ../calendar/zones.h:393
+msgid "Pacific/Pago_Pago"
+msgstr "An tAigéan Ciúin/Pago_Pago"
+
+#: ../calendar/zones.h:394
+msgid "Pacific/Palau"
+msgstr "An tAigéan Ciúin/Palau"
+
+#: ../calendar/zones.h:395
+msgid "Pacific/Pitcairn"
+msgstr "An tAigéan Ciúin/Pitcairn"
+
+#: ../calendar/zones.h:396
+msgid "Pacific/Ponape"
+msgstr "An tAigéan Ciúin/Ponape"
+
+#: ../calendar/zones.h:397
+msgid "Pacific/Port_Moresby"
+msgstr "An tAigéan Ciúin/Port_Moresby"
+
+#: ../calendar/zones.h:398
+msgid "Pacific/Rarotonga"
+msgstr "An tAigéan Ciúin/Rarotonga"
+
+#: ../calendar/zones.h:399
+msgid "Pacific/Saipan"
+msgstr "An tAigéan Ciúin/Saipan"
+
+#: ../calendar/zones.h:400
+msgid "Pacific/Tahiti"
+msgstr "An tAigéan Ciúin/Taihítí"
+
+#: ../calendar/zones.h:401
+msgid "Pacific/Tarawa"
+msgstr "An tAigéan Ciúin/Tarawa"
+
+#: ../calendar/zones.h:402
+msgid "Pacific/Tongatapu"
+msgstr "An tAigéan Ciúin/Tongatapu"
+
+#: ../calendar/zones.h:403
+msgid "Pacific/Truk"
+msgstr "An tAigéan Ciúin/Truk"
+
+#: ../calendar/zones.h:404
+msgid "Pacific/Wake"
+msgstr "An tAigéan Ciúin/Wake"
+
+#: ../calendar/zones.h:405
+msgid "Pacific/Wallis"
+msgstr "An tAigéan Ciúin/Wallis"
+
+#: ../calendar/zones.h:406
+msgid "Pacific/Yap"
+msgstr "An tAigéan Ciúin/Yap"
+
+#: ../composer/e-composer-actions.c:208
+msgid "Save as..."
+msgstr "Sábháil mar..."
+
+#: ../composer/e-composer-actions.c:296
+#: ../widgets/misc/e-signature-editor.c:207
+msgid "_Close"
+msgstr "_Dún"
+
+#: ../composer/e-composer-actions.c:298
+msgid "Close the current file"
+msgstr "Dún an comhad reatha"
+
+#: ../composer/e-composer-actions.c:303
+msgid "New _Message"
+msgstr "_Teachtaireacht Nua"
+
+#: ../composer/e-composer-actions.c:305
+msgid "Open New Message window"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
+#, fuzzy
+msgid "Configure Evolution"
+msgstr "Cumraíocht"
+
+#: ../composer/e-composer-actions.c:319
+msgid "Save the current file"
+msgstr "Sábháil an comhad reatha"
+
+#: ../composer/e-composer-actions.c:324
+msgid "Save _As..."
+msgstr "Sábháil _Mar..."
+
+#: ../composer/e-composer-actions.c:326
+msgid "Save the current file with a different name"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:333
+msgid "Character _Encoding"
+msgstr "_Ionchódú Carachtar"
+
+#: ../composer/e-composer-actions.c:350
+msgid "_Print..."
+msgstr "_Priontáil..."
+
+#: ../composer/e-composer-actions.c:357
+msgid "Print Pre_view"
+msgstr "_Réamhamharc Priontála"
+
+#: ../composer/e-composer-actions.c:364
+msgid "Save as _Draft"
+msgstr "Sábháil mar _Dhréacht"
+
+#: ../composer/e-composer-actions.c:366
+msgid "Save as draft"
+msgstr "Sábháil mar dhréacht"
+
+#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
+msgid "S_end"
+msgstr "_Seol"
+
+#: ../composer/e-composer-actions.c:373
+msgid "Send this message"
+msgstr "Seol an teachtaireacht seo"
+
+#: ../composer/e-composer-actions.c:381
+msgid "PGP _Encrypt"
+msgstr "_Criptigh le PGP"
+
+#: ../composer/e-composer-actions.c:383
+msgid "Encrypt this message with PGP"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:389
+msgid "PGP _Sign"
+msgstr "_Sínigh le PGP"
+
+#: ../composer/e-composer-actions.c:391
+msgid "Sign this message with your PGP key"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:397
+msgid "_Picture Gallery"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:399
+msgid "Show a collection of pictures that you can drag to your message"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:405
+msgid "_Prioritize Message"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:407
+msgid "Set the message priority to high"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:413
+msgid "Re_quest Read Receipt"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:415
+msgid "Get delivery notification when your message is read"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:421
+msgid "S/MIME En_crypt"
+msgstr "_Criptigh le S/MIME"
+
+#: ../composer/e-composer-actions.c:423
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:429
+msgid "S/MIME Sig_n"
+msgstr "_Sínigh le S/MIME"
+
+#: ../composer/e-composer-actions.c:431
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:437
+msgid "_Bcc Field"
+msgstr "Réimse _Bcc"
+
+#: ../composer/e-composer-actions.c:439
+msgid "Toggles whether the BCC field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:445
+msgid "_Cc Field"
+msgstr "Réimse _Cc"
+
+#: ../composer/e-composer-actions.c:447
+msgid "Toggles whether the CC field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:453
+msgid "_Reply-To Field"
+msgstr "Réimse _Freagra-Chuig"
+
+#: ../composer/e-composer-actions.c:455
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:514
+msgid "Save Draft"
+msgstr "Sábháil Dréacht"
+
+#: ../composer/e-composer-header-table.c:40
+msgid "Enter the recipients of the message"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:42
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:45
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:1021
+msgid "Fr_om:"
+msgstr "Ó (_O):"
+
+#: ../composer/e-composer-header-table.c:1030
+msgid "_Reply-To:"
+msgstr "_Freagra-Chuig:"
+
+#: ../composer/e-composer-header-table.c:1034
+msgid "_To:"
+msgstr "C_huig:"
+
+#: ../composer/e-composer-header-table.c:1039
+msgid "_Cc:"
+msgstr "_Cc:"
+
+#: ../composer/e-composer-header-table.c:1044
+msgid "_Bcc:"
+msgstr "_Bcc:"
+
+#: ../composer/e-composer-header-table.c:1049
+msgid "_Post To:"
+msgstr ""
+
+#: ../composer/e-composer-header-table.c:1053
+msgid "S_ubject:"
+msgstr "�_bhar: "
+
+#: ../composer/e-composer-header-table.c:1062
+msgid "Si_gnature:"
+msgstr "_Síniú:"
+
+#: ../composer/e-composer-name-header.c:141
+msgid "Click here for the address book"
+msgstr ""
+
+#: ../composer/e-composer-post-header.c:131
+msgid "Click here to select folders to post to"
+msgstr ""
+
+#: ../composer/e-composer-private.c:249
+#, fuzzy
+msgid "Undo the last action"
+msgstr "Cóipeáil an roghnú"
+
+#: ../composer/e-composer-private.c:253
+msgid "Redo the last undone action"
+msgstr ""
+
+#: ../composer/e-composer-private.c:257
+#, fuzzy
+msgid "Search for text"
+msgstr "Fillteán foinseach: %1 - Spriocfhillteán: %2"
+
+#: ../composer/e-composer-private.c:261
+#, fuzzy
+msgid "Search for and replace text"
+msgstr ""
+"Theip ar chruthú mionsamhla: \n"
+"%1\n"
+" "
+
+#: ../composer/e-composer-private.c:372
+msgid "Save draft"
+msgstr "Sábháil dréacht"
+
+#: ../composer/e-msg-composer.c:812
+#, c-format
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:821
+#, c-format
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:1699 ../composer/e-msg-composer.c:2083
+msgid "Compose Message"
+msgstr "Cum Teachtaireacht"
+
+#: ../composer/e-msg-composer.c:4228
+msgid "The composer contains a non-text message body, which cannot be edited."
+msgstr ""
+
+#: ../composer/e-msg-composer.c:4933
+msgid "Untitled Message"
+msgstr "Teachtaireacht Gan Teideal"
+
+#: ../composer/mail-composer.error.xml.h:1
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:2
+msgid "All accounts have been removed."
+msgstr "Baineadh gach cuntas."
+
+#: ../composer/mail-composer.error.xml.h:3
+#, fuzzy
+msgid "An error occurred while saving to your Drafts folder."
+msgstr "Tharla earráid anaithnid le linn priontála."
+
+#: ../composer/mail-composer.error.xml.h:4
+#, fuzzy
+msgid "An error occurred while saving to your Outbox folder."
+msgstr "Tharla earráid agus á phriontáil"
+
+#: ../composer/mail-composer.error.xml.h:5
+#, fuzzy
+msgid "An error occurred while sending. How do you want to proceed?"
+msgstr "Tharla earráid agus á phriontáil"
+
+#: ../composer/mail-composer.error.xml.h:6
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:7
+msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:8
+msgid "Because &quot;{1}&quot;."
+msgstr "Mar &quot;{1}&quot;."
+
+#: ../composer/mail-composer.error.xml.h:9
+msgid ""
+"Because you are working offline, the message will be saved to your local "
+"Outbox folder. When you are back online you can send the message by clicking "
+"the Send/Receive button in Evolution's toolbar."
+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 "
+"continue the message at a later date."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:11
+msgid "Could not create message."
+msgstr "Níorbh fhéidir teachtaireacht a chruthú."
+
+#: ../composer/mail-composer.error.xml.h:12
+msgid "Could not read signature file &quot;{0}&quot;."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:13
+msgid "Could not retrieve messages to attach from {0}."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:14
+msgid "Could not save to autosave file &quot;{0}&quot;."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:15
+msgid "Do you want to recover unfinished messages?"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:16
+msgid "Download in progress. Do you want to send the mail?"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:17
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:18
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:19
+#, fuzzy
+msgid "Saving message to Outbox."
+msgstr "Teachtaireacht á sábháil go fillteán"
+
+#: ../composer/mail-composer.error.xml.h:20
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
+#, fuzzy
+msgid "The reported error was &quot;{0}&quot;."
+msgstr "GenericName=Eagarthóir Sloinn Ionadaíochta"
+
+#: ../composer/mail-composer.error.xml.h:22
+msgid ""
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:23
+msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:24
+#, fuzzy
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "Ní féidir an íomhá a shábháil - ní féidir comhad sealadach a chruthú."
+
+#: ../composer/mail-composer.error.xml.h:25
+msgid "You need to configure an account before you can compose mail."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:26
+#, fuzzy
+msgid "Your message was sent, but an error occurred during post-processing."
+msgstr "Tharla earráid anaithnid le linn priontála."
+
+#. Response codes were chosen somewhat arbitrarily.
+#: ../composer/mail-composer.error.xml.h:28
+msgid "_Continue Editing"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:30
+msgid "_Do not Recover"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:31
+msgid "_Recover"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:32
+msgid "_Save Draft"
+msgstr "_Sábháil Dréacht"
+
+#: ../composer/mail-composer.error.xml.h:33
+#, fuzzy
+msgid "_Save to Outbox"
+msgstr "_Sábháil chuig Diosca"
+
+#: ../composer/mail-composer.error.xml.h:35
+msgid "_Try Again"
+msgstr ""
+
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplet/anjal-settings-main.c:154
+msgid "ID of the socket to embed in"
+msgstr ""
+
+#: ../capplet/anjal-settings-main.c:155
+msgid "socket"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:77
+#, fuzzy
+msgid "Please enter your full name."
+msgstr "Roghnaigh ainm eile ar an riail"
+
+#: ../capplet/settings/mail-account-view.c:78
+msgid "Please enter your email address."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:79
+msgid "The email address you have entered is invalid."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:80
+#, fuzzy
+msgid "Please enter your password."
+msgstr "Iontráil focal faire."
+
+#: ../capplet/settings/mail-account-view.c:259
+#: ../plugins/caldav/caldav-source.c:67
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:413
+#: ../modules/online-accounts/e-online-accounts-google.c:287
+#: ../modules/online-accounts/e-online-accounts-google.c:359
+#: ../plugins/google-account-setup/google-contacts-source.c:55
+#: ../plugins/google-account-setup/google-source.c:87
+msgid "Google"
+msgstr "Google"
+
+#: ../capplet/settings/mail-account-view.c:480
+#, fuzzy
+msgid "Personal details:"
+msgstr "Pearsanta"
+
+#: ../capplet/settings/mail-account-view.c:487
+msgid "Name:"
+msgstr "Ainm:"
+
+#: ../capplet/settings/mail-account-view.c:496
+#, fuzzy
+msgid "Email address:"
+msgstr "_Seoladh Ríomhphoist:"
+
+#: ../capplet/settings/mail-account-view.c:506
+msgid "Details:"
+msgstr "Mionsonraí:"
+
+#: ../capplet/settings/mail-account-view.c:514
+#, fuzzy
+msgid "Receiving"
+msgstr "Fáil Ríomhphoist"
+
+#: ../capplet/settings/mail-account-view.c:521
+#, fuzzy
+msgid "Server type:"
+msgstr "C_ineál Freastalaí:"
+
+#: ../capplet/settings/mail-account-view.c:530
+#, fuzzy
+msgid "Server address:"
+msgstr "Teachtaireacht Freastalaí:"
+
+#: ../capplet/settings/mail-account-view.c:539
+#, fuzzy
+msgid "Username:"
+msgstr "_Ainm úsáideora:"
+
+#: ../capplet/settings/mail-account-view.c:548
+#, fuzzy
+msgid "Use encryption:"
+msgstr "Gan chriptiú"
+
+#: ../capplet/settings/mail-account-view.c:553
+#: ../capplet/settings/mail-account-view.c:588
+#, fuzzy
+msgid "never"
+msgstr "Riamh"
+
+#: ../capplet/settings/mail-account-view.c:565
+#, fuzzy
+msgid "Sending"
+msgstr "Ag dul suas"
+
+#: ../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."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:609
+msgid ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:611
+msgid "You can specify more options to configure the account."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:613
+msgid ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:614
+msgid "You can specify your default settings for your account."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:615
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:630
+#: ../mail/em-account-editor.c:2289 ../mail/em-account-editor.c:2425
+msgid "Identity"
+msgstr "Aitheantas"
+
+#: ../capplet/settings/mail-account-view.c:630
+#, fuzzy
+msgid "Next - Receiving mail"
+msgstr "Fáil Ríomhphoist"
+
+#: ../capplet/settings/mail-account-view.c:631
+#, fuzzy
+msgid "Receiving mail"
+msgstr "Fáil Ríomhphoist"
+
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:632
+#, fuzzy
+msgid "Next - Sending mail"
+msgstr "Seoladh Poist"
+
+#: ../capplet/settings/mail-account-view.c:631
+#, fuzzy
+msgid "Back - Identity"
+msgstr "Aitheantas"
+
+#: ../capplet/settings/mail-account-view.c:631
+#, fuzzy
+msgid "Next - Receiving options"
+msgstr "Roghanna Fála"
+
+#: ../capplet/settings/mail-account-view.c:632
+#, fuzzy
+msgid "Receiving options"
+msgstr "Roghanna Fála"
+
+#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:634
+#, fuzzy
+msgid "Back - Receiving mail"
+msgstr "Fáil Ríomhphoist"
+
+#: ../capplet/settings/mail-account-view.c:634
+#, fuzzy
+msgid "Sending mail"
+msgstr "Seoladh Poist"
+
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
+#, fuzzy
+msgid "Next - Review account"
+msgstr "Scrios cuntas?"
+
+#: ../capplet/settings/mail-account-view.c:634
+#, fuzzy
+msgid "Next - Defaults"
+msgstr "Réamhshocruithe"
+
+#: ../capplet/settings/mail-account-view.c:634
+#, fuzzy
+msgid "Back - Receiving options"
+msgstr "Roghanna Fála"
+
+#: ../capplet/settings/mail-account-view.c:635
+#: ../mail/em-account-editor.c:3377
+msgid "Defaults"
+msgstr "Réamhshocruithe"
+
+#: ../capplet/settings/mail-account-view.c:635
+#, fuzzy
+msgid "Back - Sending mail"
+msgstr "Seoladh Poist"
+
+#: ../capplet/settings/mail-account-view.c:637
+#, fuzzy
+msgid "Review account"
+msgstr "Scrios cuntas?"
+
+#: ../capplet/settings/mail-account-view.c:637
+msgid "Finish"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:637
+#, fuzzy
+msgid "Back - Sending"
+msgstr "Ag dul suas"
+
+#: ../capplet/settings/mail-account-view.c:760
+msgid "Setup Google contacts with Evolution"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:761
+msgid "Setup Google calendar with Evolution"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:766
+msgid "You may need to enable IMAP access."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:774
+#, fuzzy
+msgid "Google account settings:"
+msgstr "Socruithe Evolution á luchtú"
+
+#: ../capplet/settings/mail-account-view.c:800
+msgid "Setup Yahoo calendar with Evolution"
+msgstr ""
+
+#: ../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 ""
+
+#: ../capplet/settings/mail-account-view.c:813
+msgid "Yahoo account settings:"
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:827
+#, fuzzy
+msgid "Yahoo Calendar name:"
+msgstr "Roghnaigh comhad féilire"
+
+#: ../capplet/settings/mail-account-view.c:1098
+#, fuzzy
+msgid "Password:"
+msgstr "_Focal faire:"
+
+#: ../capplet/settings/mail-account-view.c:1150
+#: ../capplet/settings/mail-settings-view.c:254
+#, fuzzy
+msgid "Close Tab"
+msgstr "Dún"
+
+#: ../capplet/settings/mail-account-view.c:1160
+#, fuzzy
+msgid "Account Wizard"
+msgstr "Eagarthóir Cuntas"
+
+#: ../capplet/settings/mail-capplet-shell.c:215
+#, fuzzy
+msgid "Evolution account assistant"
+msgstr "Cúntóir Cuntais Evolution"
+
+#. 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: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
+#: ../modules/calendar/e-cal-shell-migrate.c:154
+#: ../modules/calendar/e-memo-shell-backend.c:102
+#: ../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:979
+#: ../widgets/misc/e-account-tree-view.c:1050
+#: ../widgets/misc/e-account-tree-view.c:1125
+#: ../widgets/misc/e-account-tree-view.c:1348
+msgid "On This Computer"
+msgstr "Ar an Ríomhaire Seo"
+
+#: ../capplet/settings/mail-settings-view.c:150
+#, fuzzy, c-format
+msgid "Modify %s..."
+msgstr "Athraigh"
+
+#: ../capplet/settings/mail-settings-view.c:152
+#, fuzzy
+msgid "Add a new account"
+msgstr "Cuir colún leis..."
+
+#: ../capplet/settings/mail-settings-view.c:188
+#, fuzzy
+msgid "Account management"
+msgstr "Bainistíocht Cuntas"
+
+#: ../capplet/settings/mail-settings-view.c:264
+#, fuzzy
+msgid "Settings"
+msgstr "Socruithe Dramhphoist"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+#, fuzzy
+msgid "Calendar event notifications"
+msgstr "Eolas féilire"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+#, fuzzy
+msgid "Evolution Alarm Notify"
+msgstr "&GNOME-PIM (Evolution)"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:999
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../shell/e-shell-window-private.c:257
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/evolution.desktop.in.in.h:2
+msgid "Evolution Mail and Calendar"
+msgstr "Post agus Féilire Evolution"
+
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
+msgid "Groupware Suite"
+msgstr "Sraith Feidhmchlár Grúpa-Earraí"
+
+#: ../data/evolution.desktop.in.in.h:4
+msgid "Manage your email, contacts and schedule"
+msgstr "Bainstigh do chuid ríomhphoist, do chuid teagmhálacha agus do sceideal"
+
+#: ../data/evolution-settings.desktop.in.in.h:1
+#, fuzzy
+msgid "Configure email accounts"
+msgstr "Cumraigh do chuid chuntais poist anseo"
+
+#: ../data/evolution-settings.desktop.in.in.h:2
+#, fuzzy
+msgid "Email Settings"
+msgstr "Socruithe Dramhphoist"
+
+#. Translators: This is a cancelled activity.
+#: ../e-util/e-activity.c:227
+#, c-format
+msgid "%s (cancelled)"
+msgstr "%s (cealaithe)"
+
+#. Translators: This is a completed activity.
+#: ../e-util/e-activity.c:230
+#, c-format
+msgid "%s (completed)"
+msgstr "%s (críochnaithe)"
+
+#. Translators: This is an activity waiting to run.
+#: ../e-util/e-activity.c:233
+#, c-format
+msgid "%s (waiting)"
+msgstr "%s (ag fanacht)"
+
+#. Translators: This is a running activity which
+#. *              the user has requested to cancel.
+#: ../e-util/e-activity.c:237
+#, c-format
+msgid "%s (cancelling)"
+msgstr "%s (á chealú)"
+
+#: ../e-util/e-activity.c:239
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../e-util/e-activity.c:244
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% críochnaithe)"
+
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
+msgstr "Arabach"
+
+#: ../e-util/e-charset.c:54
+msgid "Baltic"
+msgstr "Baltach"
+
+#: ../e-util/e-charset.c:55
+msgid "Central European"
+msgstr "Lár-Eorpach"
+
+#: ../e-util/e-charset.c:56
+msgid "Chinese"
+msgstr "Síneach"
+
+#: ../e-util/e-charset.c:57
+msgid "Cyrillic"
+msgstr "Coireallach"
+
+#: ../e-util/e-charset.c:58
+msgid "Greek"
+msgstr "Gréagach"
+
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "Eabhrach"
+
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "Seapánach"
+
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "Cóiréach"
+
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "Téalannach"
+
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "Turcach"
+
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../e-util/e-charset.c:65
+msgid "Western European"
+msgstr "Iarthar na hEorpa"
+
+#: ../e-util/e-charset.c:66
+msgid "Western European, New"
+msgstr "Iarthar na hEorpa, Nua"
+
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
+msgid "Traditional"
+msgstr "Traidisiúnta"
+
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
+msgid "Simplified"
+msgstr "Simplithe"
+
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
+msgid "Ukrainian"
+msgstr "Úcránach"
+
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
+msgid "Visual"
+msgstr "Infheicthe"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:206
+#: ../modules/calendar/e-cal-shell-view-actions.c:1856
+#: ../plugins/itip-formatter/itip-view.c:191
+#: ../widgets/table/e-cell-date-edit.c:307
+msgid "Today"
+msgstr "Inniu"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:219
+msgid "Tomorrow"
+msgstr "Amárach"
+
+#: ../e-util/e-datetime-format.c:219
+msgid "Yesterday"
+msgstr "Inné"
+
+#. 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:227
+#, fuzzy
+msgctxt "DateFmt"
+msgid "Next Mon"
+msgstr "Samhail Téacs"
+
+#. 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:233
+#, fuzzy
+msgctxt "DateFmt"
+msgid "Next Tue"
+msgstr "An Chéad _Snáithe Eile"
+
+#. 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:239
+#, fuzzy
+msgctxt "DateFmt"
+msgid "Next Wed"
+msgstr "An Chéad _Snáithe Eile"
+
+#. 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:245
+#, fuzzy
+msgctxt "DateFmt"
+msgid "Next Thu"
+msgstr "An Chéad _Snáithe Eile"
+
+#. 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:251
+#, fuzzy
+msgctxt "DateFmt"
+msgid "Next Fri"
+msgstr "Ar Aghaidh"
+
+#. 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:257
+#, fuzzy
+msgctxt "DateFmt"
+msgid "Next Sat"
+msgstr "Ar Aghaidh"
+
+#. 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:263
+#, fuzzy
+msgctxt "DateFmt"
+msgid "Next Sun"
+msgstr "Ar Aghaidh"
+
+#: ../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 "Úsáid réamhshocrú an logchaighdeáin"
+
+#: ../e-util/e-datetime-format.c:574
+msgid "Format:"
+msgstr "Formáid:"
+
+#: ../e-util/e-file-utils.c:151
+msgid "(Unknown Filename)"
+msgstr "(Ainm Comhaid Anaithnid)"
+
+#. Translators: The string value is the basename of a file.
+#: ../e-util/e-file-utils.c:155
+#, fuzzy, c-format
+msgid "Writing \"%s\""
+msgstr "%s á phingiú"
+
+#. 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
+#, fuzzy, c-format
+msgid "Writing \"%s\" to %s"
+msgstr "`%s' á chóipeáil go `%s'"
+
+#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:388
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "seachtain"
+
+#: ../e-util/e-print.c:161
+msgid "An error occurred while printing"
+msgstr "Tharla earráid agus á phriontáil"
+
+#: ../e-util/e-print.c:168
+msgid "The printing system reported the following details about the error:"
+msgstr ""
+
+#: ../e-util/e-print.c:174
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr ""
+
+#: ../e-util/e-signature.c:708
+msgid "Autogenerated"
+msgstr "Ginte go huathoibríoch"
+
+#: ../e-util/e-system.error.xml.h:1
+msgid "Because \"{1}\"."
+msgstr "Mar \"{1}\"."
+
+#: ../e-util/e-system.error.xml.h:2
+msgid "Cannot open file \"{0}\"."
+msgstr "Ní féidir comhad \"{0}\" a oscailt."
+
+#: ../e-util/e-system.error.xml.h:3
+msgid "Cannot save file \"{0}\"."
+msgstr "Ní féidir comhad \"{0}\" a shábháil."
+
+#: ../e-util/e-system.error.xml.h:4
+msgid "Do you wish to overwrite it?"
+msgstr "Ar mhaith leat é a fhorscríobh?"
+
+#: ../e-util/e-system.error.xml.h:5
+msgid "File exists \"{0}\"."
+msgstr "Tá an comhad \"{0}\" ann."
+
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
+msgid "_Overwrite"
+msgstr "_Forscríobh"
+
+#: ../e-util/e-util.c:117
+msgid "Could not open the link."
+msgstr "Níorbh fhéidir an nasc a oscailt."
+
+#: ../e-util/e-util.c:164
+msgid "Could not display help for Evolution."
+msgstr "Níorbh fhéidir cabhair d'Evolution a thaispeáint."
+
+#: ../e-util/gconf-bridge.c:1332
+#, c-format
+msgid "GConf error: %s"
+msgstr "Earráid GConf: %s"
+
+#: ../e-util/gconf-bridge.c:1343
+msgid "All further errors shown only on terminal."
+msgstr ""
+
+#: ../em-format/em-format-quote.c:319 ../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
+msgid "From"
+msgstr "Ó"
+
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1061
+#: ../modules/mail/em-mailer-prefs.c:73
+msgid "Reply-To"
+msgstr "Freagra-Chuig"
+
+#: ../em-format/em-format-quote.c:319 ../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 "Cc"
+
+#: ../em-format/em-format-quote.c:319 ../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 "Bcc"
+
+#: ../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
+msgid "Subject"
+msgstr "�bhar"
+
+#. pseudo-header
+#: ../em-format/em-format-quote.c:475 ../mail/em-format-html.c:2820
+#: ../modules/mail/em-mailer-prefs.c:1028
+msgid "Mailer"
+msgstr "Seoltóir Ríomhphoist"
+
+#: ../em-format/em-format-quote.c:565 ../mail/em-composer-utils.c:1203
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Teachtaireacht Curtha ar Aghaidh --------"
+
+#: ../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
+#: ../widgets/misc/e-dateedit.c:545
+msgid "Date"
+msgstr "Dáta"
+
+#: ../em-format/em-format.c:1067 ../modules/mail/em-mailer-prefs.c:79
+msgid "Newsgroups"
+msgstr "Grúpaí Nuachta"
+
+#: ../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 "Aghaidh"
+
+#: ../em-format/em-format.c:1472
+#, c-format
+msgid "%s attachment"
+msgstr "iatán %s"
+
+#: ../em-format/em-format.c:1583
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr ""
+
+#: ../em-format/em-format.c:1777 ../em-format/em-format.c:2005
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+
+#: ../em-format/em-format.c:1788
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: ../em-format/em-format.c:1808
+msgid "Could not parse PGP/MIME message"
+msgstr "Níorbh fhéidir teachtaireacht PGP/MIME a pharsáil"
+
+#: ../em-format/em-format.c:1809
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr ""
+
+#: ../em-format/em-format.c:2030
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Leasú na formáide comhaid gan tacaíocht."
+
+#: ../em-format/em-format.c:2043 ../em-format/em-format.c:2225
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Earráid agus an síniú á sheiceáil"
+
+#: ../em-format/em-format.c:2044 ../em-format/em-format.c:2210
+#: ../em-format/em-format.c:2226
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Earráid: Síniú gan deimhniú"
+
+#: ../em-format/em-format.c:2318
+#, fuzzy
+msgid "Could not parse PGP message: "
+msgstr "Níorbh fhéidir teachtaireacht PGP a pharsáil"
+
+#. Don't delete this code, since it is needed so that xgettext can extract the translations.
+#. * Please, keep these strings in sync with the strings in the timespans array
+#: ../filter/e-filter-datespec.c:66
+#, c-format
+msgid "1 second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d soicind ó shin"
+msgstr[1] "%d shoicind ó shin"
+msgstr[2] "%d soicind ó shin"
+msgstr[3] "%d soicind ó shin"
+msgstr[4] "%d soicind ó shin"
+
+#: ../filter/e-filter-datespec.c:67
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] "%d soicind sa todhchaí"
+msgstr[1] "%d shoicind sa todhchaí"
+msgstr[2] "%d shoicind sa todhchaí"
+msgstr[3] "%d soicind sa todhchaí"
+msgstr[4] "%d soicind sa todhchaí"
+
+#: ../filter/e-filter-datespec.c:68
+#, c-format
+msgid "1 minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d nóiméad ó shin"
+msgstr[1] "%d nóiméad ó shin"
+msgstr[2] "%d nóiméad ó shin"
+msgstr[3] "%d nóiméad ó shin"
+msgstr[4] "%d nóiméad ó shin"
+
+#: ../filter/e-filter-datespec.c:69
+#, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] "%d nóiméad sa todhchaí"
+msgstr[1] "%d nóiméad sa todhchaí"
+msgstr[2] "%d nóiméad sa todhchaí"
+msgstr[3] "%d nóiméad sa todhchaí"
+msgstr[4] "%d nóiméad sa todhchaí"
+
+#: ../filter/e-filter-datespec.c:70
+#, c-format
+msgid "1 hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d uair ó shin"
+msgstr[1] "%d uair ó shin"
+msgstr[2] "%d uaire ó shin"
+msgstr[3] "%d n-uaire ó shin"
+msgstr[4] "%d uair ó shin"
+
+#: ../filter/e-filter-datespec.c:71
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] "%d uair sa todhchaí"
+msgstr[1] "%d uair sa todhchaí"
+msgstr[2] "%d uaire sa todhchaí"
+msgstr[3] "%d n-uaire sa todhchaí"
+msgstr[4] "%d uair sa todhchaí"
+
+#: ../filter/e-filter-datespec.c:72
+#, c-format
+msgid "1 day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d lá ó shin"
+msgstr[1] "%d lá ó shin"
+msgstr[2] "%d lá ó shin"
+msgstr[3] "%d lá ó shin"
+msgstr[4] "%d lá ó shin"
+
+#: ../filter/e-filter-datespec.c:73
+#, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] "%d lá sa todhchaí"
+msgstr[1] "%d lá sa todhchaí"
+msgstr[2] "%d lá sa todhchaí"
+msgstr[3] "%d lá sa todhchaí"
+msgstr[4] "%d lá sa todhchaí"
+
+#: ../filter/e-filter-datespec.c:74
+#, c-format
+msgid "1 week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d seachtain ó shin"
+msgstr[1] "%d sheachtain ó shin"
+msgstr[2] "%d sheachtain ó shin"
+msgstr[3] "%d seachtain ó shin"
+msgstr[4] "%d seachtain ó shin"
+
+#: ../filter/e-filter-datespec.c:75
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] "%d seachtain sa todhchaí"
+msgstr[1] "%d sheachtain sa todhchaí"
+msgstr[2] "%d sheachtain sa todhchaí"
+msgstr[3] "%d seachtain sa todhchaí"
+msgstr[4] "%d seachtain sa todhchaí"
+
+#: ../filter/e-filter-datespec.c:76
+#, c-format
+msgid "1 month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d mhí ó shin"
+msgstr[1] "%d mhí ó shin"
+msgstr[2] "%d mhí ó shin"
+msgstr[3] "%d mí ó shin"
+msgstr[4] "%d mí ó shin"
+
+#: ../filter/e-filter-datespec.c:77
+#, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] "%d mhí sa todhchaí"
+msgstr[1] "%d mhí sa todhchaí"
+msgstr[2] "%d mhí sa todhchaí"
+msgstr[3] "%d mí sa todhchaí"
+msgstr[4] "%d mí sa todhchaí"
+
+#: ../filter/e-filter-datespec.c:78
+#, c-format
+msgid "1 year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d bhliain ó shin"
+msgstr[1] "%d bhliain ó shin"
+msgstr[2] "%d bliana ó shin"
+msgstr[3] "%d mbliana ó shin"
+msgstr[4] "%d bliain ó shin"
+
+#: ../filter/e-filter-datespec.c:79
+#, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] "%d bhliain sa todhchaí"
+msgstr[1] "%d bhliain sa todhchaí"
+msgstr[2] "%d bliana sa todhchaí"
+msgstr[3] "%d mbliana sa todhchaí"
+msgstr[4] "%d bliain sa todhchaí"
+
+#: ../filter/e-filter-datespec.c:129
+msgid "<click here to select a date>"
+msgstr "<cliceáil anseo chun dáta a roghnú>"
+
+#: ../filter/e-filter-datespec.c:132 ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:154
+msgid "now"
+msgstr "anois"
+
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: ../filter/e-filter-datespec.c:139
+msgid "%d-%b-%Y"
+msgstr "%d-%b-%Y"
+
+#: ../filter/e-filter-datespec.c:286
+msgid "Select a time to compare against"
+msgstr ""
+
+#: ../filter/e-filter-file.c:190
+msgid "Choose a File"
+msgstr "Roghnaigh Comhad"
+
+#: ../filter/e-filter-rule.c:666
+msgid "R_ule name:"
+msgstr "Ainm _rialach:"
+
+#: ../filter/e-filter-rule.c:696
+msgid "Find items that meet the following conditions"
+msgstr ""
+
+#: ../filter/e-filter-rule.c:721
+#, fuzzy
+msgid "If all conditions are met"
+msgstr "Aisfhilleann sé TRUE más TRUE iad na hargóintí go léir."
+
+#: ../filter/e-filter-rule.c:722
+#, fuzzy
+msgid "If any conditions are met"
+msgstr "Aisfhilleann sé TRUE más TRUE iad na hargóintí go léir."
+
+#: ../filter/e-filter-rule.c:725
+#, fuzzy
+msgid "_Find items:"
+msgstr "Míreanna Speisialta"
+
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#: ../filter/e-filter-rule.c:754
+msgid "None"
+msgstr "Neamhní"
+
+#: ../filter/e-filter-rule.c:755
+#, fuzzy
+msgid "All related"
+msgstr "Gníomhartha gaolmhara:"
+
+#: ../filter/e-filter-rule.c:756 ../widgets/misc/e-send-options.ui.h:19
+msgid "Replies"
+msgstr "Freagraí"
+
+#: ../filter/e-filter-rule.c:757
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Ceadaítear plé agus freagraí"
+
+#: ../filter/e-filter-rule.c:758
+#, fuzzy
+msgid "No reply or parent"
+msgstr "Níl;Tá;Máthairfhoirm"
+
+#: ../filter/e-filter-rule.c:761
+#, fuzzy
+msgid "I_nclude threads:"
+msgstr "Sná&itheanna ar a dtugtar neamhaird"
+
+#: ../filter/e-filter-rule.c:786
+#, fuzzy
+msgid "A_dd Condition"
+msgstr "Cuir _Gníomh Leis"
+
+#: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:323
+msgid "Incoming"
+msgstr "Isteach"
+
+#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:324
+msgid "Outgoing"
+msgstr "Amach"
+
+#: ../filter/e-rule-editor.c:270
+msgid "Add Rule"
+msgstr "Cuir Riail Leis"
+
+#: ../filter/e-rule-editor.c:359
+msgid "Edit Rule"
+msgstr "Cuir Riail in Eagar"
+
+#: ../filter/filter.error.xml.h:1
+#, fuzzy
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr "GenericName=Eagarthóir Sloinn Ionadaíochta"
+
+#: ../filter/filter.error.xml.h:2
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:3
+#, fuzzy
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr "<p>Níl an comhad <nobr>\"%1\"</nobr> ann, nó ní féidir é a léamh.</p>"
+
+#: ../filter/filter.error.xml.h:4
+#, fuzzy
+msgid "Missing date."
+msgstr "Breithlá"
+
+#: ../filter/filter.error.xml.h:5
+#, fuzzy
+msgid "Missing file name."
+msgstr "Ainm comhaid ar iarraidh.\n"
+
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
+#, fuzzy
+msgid "Missing name."
+msgstr "Ainm ar lár"
+
+#: ../filter/filter.error.xml.h:7
+#, fuzzy
+msgid "Name &quot;{0}&quot; already used."
+msgstr "Tá an t-ainm seo ann cheana."
+
+#: ../filter/filter.error.xml.h:8
+#, fuzzy
+msgid "Please choose another name."
+msgstr "Roghnaigh ainm eile ar an riail"
+
+#: ../filter/filter.error.xml.h:9
+#, fuzzy
+msgid "You must choose a date."
+msgstr "Roghnaigh dáta le hoscailt"
+
+#: ../filter/filter.error.xml.h:10
+#, fuzzy
+msgid "You must name this filter."
+msgstr "Caithfidh tú ainm a chur ar an scagaire seo."
+
+#: ../filter/filter.error.xml.h:11
+#, fuzzy
+msgid "You must specify a file name."
+msgstr "Is gá ainm comhaid ar a laghad a thabhairt."
+
+#: ../filter/filter.ui.h:1
+#, fuzzy
+msgid "Compare against"
+msgstr "Bailíochtaigh i ndiaidh:"
+
+#: ../filter/filter.ui.h:3
+#, fuzzy
+msgid "Show filters for mail:"
+msgstr "Seoladán Poist le haghaidh KPilot"
+
+#: ../filter/filter.ui.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: ../filter/filter.ui.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+
+#: ../filter/filter.ui.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:194
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Rialacha Scagtha"
+
+#: ../filter/filter.ui.h:12
+#, fuzzy
+msgid "a time relative to the current time"
+msgstr ""
+"an t-am reatha\n"
+"an t-am a shonraíonn tú\n"
+"am coibhneasta leis an am reatha"
+
+#: ../filter/filter.ui.h:13
+#, fuzzy
+msgid "ago"
+msgstr "Clib"
+
+#: ../filter/filter.ui.h:16
+#, fuzzy
+msgid "in the future"
+msgstr ""
+"ó shin\n"
+"sa todhchaí"
+
+#: ../filter/filter.ui.h:18
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+#, fuzzy
+msgid "months"
+msgstr "Mí"
+
+#: ../filter/filter.ui.h:19
+msgid "seconds"
+msgstr "soicind"
+
+#: ../filter/filter.ui.h:20
+#, fuzzy
+msgid "the current time"
+msgstr "Sábháil an comhad reatha"
+
+#: ../filter/filter.ui.h:21
+msgid "the time you specify"
+msgstr ""
+
+#: ../filter/filter.ui.h:23
+msgid "years"
+msgstr ""
+
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:863 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "Neamhní"
+
+#: ../mail/em-account-editor.c:946
+msgid "Never"
+msgstr "Riamh"
+
+#: ../mail/em-account-editor.c:947
+msgid "Always"
+msgstr "I gCónaí"
+
+#: ../mail/em-account-editor.c:948
+msgid "Ask for each message"
+msgstr "Fiafraigh díom do gach teachtaireacht"
+
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1833 ../widgets/misc/e-account-tree-view.c:265
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "Neamhní"
+
+#: ../mail/em-account-editor.c:2237
+msgid "Fil_e:"
+msgstr ""
+
+#: ../mail/em-account-editor.c:2237 ../mail/mail-config.ui.h:157
+msgid "_Path:"
+msgstr "_Cosán:"
+
+#: ../mail/em-account-editor.c:2286
+msgid "Mail Configuration"
+msgstr "Socrú Post"
+
+#: ../mail/em-account-editor.c:2287
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
 msgstr ""
 
+#: ../mail/em-account-editor.c:2290
+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 ""
+"Iontráil d'ainm agus do sheoladh ríomhphoist thíos, le do thoil. Ní gá na "
+"réimsí \"roghnach\" thíos a chomhlánú, murar mhaith leat an t-eolas seo a "
+"chur i ríomhphoist a sheolann tú."
+
+#: ../mail/em-account-editor.c:2292 ../mail/em-account-editor.c:2484
+msgid "Receiving Email"
+msgstr "Fáil Ríomhphoist"
+
+#: ../mail/em-account-editor.c:2293
+msgid "Please configure the following account settings."
+msgstr "Cumraigh na socruithe cuntais a leanas, le do thoil."
+
+#: ../mail/em-account-editor.c:2295 ../mail/em-account-editor.c:3081
+msgid "Sending Email"
+msgstr "Seoladh Ríomhphoist"
+
+#: ../mail/em-account-editor.c:2296
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+>>>>>>> master
+msgstr ""
+"Iontráil eolas faoin slí ina sheolfaidh tú post, le do thoil. Mura bhfuil tú "
+"cinnte, fiafraigh do do riarthóir córais nó do do Sholáthraí Seirbhísí "
+"Idirlín."
+
+<<<<<<< HEAD
 #: ../mail/e-mail-attachment-bar.c:86 ../mail/e-mail-attachment-bar.c:91
 #: ../mail/em-format-html-display.c:1156 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:124
@@ -8418,10 +16570,320 @@ msgstr[2] "Teachtaireacht"
 msgstr[3] "Teachtaireacht"
 msgstr[4] "Teachtaireacht"
 
+=======
+#: ../mail/em-account-editor.c:2298 ../mail/mail-config.ui.h:1
+#, fuzzy
+msgid "Account Information"
+msgstr "Gan Eolas"
+
+#: ../mail/em-account-editor.c:2299
+#, fuzzy
+msgid ""
+"Please enter a descriptive name for this account below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"Iontráil ainm tuairisciúil don chuntas seo sa spás thíos, le do thoil. "
+"Úsáidfear an t-ainm seo le haghaidh taispeána amháin."
+
+#: ../mail/em-account-editor.c:2303
+msgid "Done"
+msgstr "Críochnaithe"
+
+#: ../mail/em-account-editor.c:2304
+#, fuzzy
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"Comhghairdeas, tá do chumraíocht phoist críochnaithe.\n"
+"\n"
+"Anois tá tú réidh le ríomhphost a sheoladh agus a fháil \n"
+"le Evolution.\n"
+"\n"
+"Cliceáil \"Cuir i bhFeidhm\" chun do chuid socruithe a shábháil."
+
+#: ../mail/em-account-editor.c:2843
+msgid "Check for _new messages every"
+msgstr "Lorg teachtaireachtaí _nua gach"
+
+#: ../mail/em-account-editor.c:2851
+msgid "minu_tes"
+msgstr "nói_méad"
+
+#: ../mail/em-account-editor.c:3520 ../mail/mail-config.ui.h:101
+msgid "Security"
+msgstr "Slándáil"
+
+#. 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
+msgid "Receiving Options"
+msgstr "Roghanna Fála"
+
+#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
+msgid "Checking for New Messages"
+msgstr "Lorg Teachtaireachtaí Nua"
+
+#: ../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
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Iatán"
+msgstr[1] "Iatáin"
+msgstr[2] "Iatáin"
+msgstr[3] "Iatáin"
+msgstr[4] "Iatáin"
+
+#: ../mail/e-mail-attachment-bar.c:608
+#: ../widgets/misc/e-attachment-paned.c:623
+msgid "Icon View"
+msgstr "Amharc Deilbhín"
+
+#: ../mail/e-mail-attachment-bar.c:610
+#: ../widgets/misc/e-attachment-paned.c:625
+msgid "List View"
+msgstr "Amharc Liosta"
+
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1441
+msgid "Close this window"
+msgstr "Dún an fhuinneog seo"
+
+#: ../mail/e-mail-browser.c:293
+#, fuzzy
+msgid "(No Subject)"
+msgstr "�bhar"
+
+#: ../mail/e-mail-display.c:66
+#, fuzzy
+msgid "_Add to Address Book..."
+msgstr "_Cuir leis an Leabhar Seoltaí"
+
+#: ../mail/e-mail-display.c:73
+#, fuzzy
+msgid "_To This Address"
+msgstr "Chuig an S_eoladh Seo"
+
+#: ../mail/e-mail-display.c:80
+#, fuzzy
+msgid "_From This Address"
+msgstr "Ón _Seoladh Seo"
+
+#: ../mail/e-mail-display.c:87
+#, fuzzy
+msgid "Send _Reply To..."
+msgstr "_Seol Chuig..."
+
+#: ../mail/e-mail-display.c:89
+#, fuzzy
+msgid "Send a reply message to this address"
+msgstr "Post an sceál seo"
+
+#: ../mail/e-mail-display.c:96
+#, fuzzy
+msgid "Create Search _Folder"
+msgstr "Ní féidir an fillteán %1 a chruthú."
+
+#: ../mail/e-mail-folder-utils.c:111
+#, fuzzy, c-format
+msgid "Saving message to folder '%s'"
+msgstr "Teachtaireacht á sábháil go fillteán"
+
+#: ../mail/e-mail-folder-utils.c:274
+msgid "Forwarded messages"
+msgstr "Teachtaireachtaí curtha ar aghaidh"
+
+#: ../mail/e-mail-folder-utils.c:391
+#, fuzzy
+msgid "Scanning messages for duplicates"
+msgstr "Teachtaireacht á sábháil go fillteán"
+
+#: ../mail/e-mail-folder-utils.c:584
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "%d teachtaireacht á bhfáil"
+msgstr[1] "%d theachtaireacht á bhfáil"
+msgstr[2] "%d theachtaireacht á bhfáil"
+msgstr[3] "%d dteachtaireacht á bhfáil"
+msgstr[4] "%d teachtaireacht á bhfáil"
+
+#: ../mail/e-mail-folder-utils.c:834
+#, fuzzy, c-format
+msgid "Removing folder '%s'"
+msgstr "Fillteán %s á bhaint"
+
+#: ../mail/e-mail-folder-utils.c:968
+#, fuzzy, c-format
+msgid "File \"%s\" has been removed."
+msgstr "Baineadh gach cuntas."
+
+#: ../mail/e-mail-folder-utils.c:972
+#, fuzzy
+msgid "File has been removed."
+msgstr "Baineadh gach cuntas."
+
+#: ../mail/e-mail-folder-utils.c:1031
+#, fuzzy
+msgid "Removing attachments"
+msgstr "Iatán á shábháil"
+
+#: ../mail/e-mail-folder-utils.c:1195
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messages"
+msgstr[0] "%d teachtaireacht á sábháil"
+msgstr[1] "%d theachtaireacht á sábháil"
+msgstr[2] "%d theachtaireacht á sábháil"
+msgstr[3] "%d dteachtaireacht á sábháil"
+msgstr[4] "%d teachtaireacht á sábháil"
+
+#: ../mail/e-mail-folder-utils.c:1539 ../mail/em-folder-utils.c:628
+#, fuzzy, c-format
+msgid "Invalid folder URI '%s'"
+msgstr "Fillteán neamhbhailí: `%s'"
+
+#. Label + combo box has a 12px left margin so it's
+#. * aligned with the junk mail options above it.
+#: ../mail/e-mail-junk-options.c:252
+msgid "Junk filtering software:"
+msgstr ""
+
+#: ../mail/e-mail-label-dialog.c:223
+#, fuzzy
+msgid "_Label name:"
+msgstr "_Ainm Lipéid:"
+
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "_Tábhachtach"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:42
+msgid "_Work"
+msgstr "_Obair"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:43
+msgid "_Personal"
+msgstr "_Pearsanta"
+
+#. green
+#: ../mail/e-mail-label-list-store.c:44
+msgid "_To Do"
+msgstr "Le _Déanamh"
+
+#. blue
+#: ../mail/e-mail-label-list-store.c:45
+msgid "_Later"
+msgstr "Ar _Ball"
+
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:684
+msgid "Add Label"
+msgstr "Cuir Lipéad Leis"
+
+#: ../mail/e-mail-label-manager.c:216
+msgid "Edit Label"
+msgstr "Cuir Lipéad in Eagar"
+
+#: ../mail/e-mail-label-manager.c:350
+msgid ""
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
+msgstr ""
+
+#: ../mail/e-mail-label-tree-view.c:88
+msgid "Color"
+msgstr "Dath"
+
+#: ../mail/e-mail-label-tree-view.c:98
+#: ../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 "Ainm"
+
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:312
+#: ../mail/em-folder-tree-model.c:919
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
+msgid "Inbox"
+msgstr "Bosca Isteach"
+
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:912
+#: ../modules/mail/e-mail-shell-view-private.c:1064
+msgid "Drafts"
+msgstr "Dréachtaí"
+
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:923
+#: ../modules/mail/e-mail-shell-view-private.c:1068
+msgid "Outbox"
+msgstr "Bosca Amach"
+
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:927
+#: ../modules/mail/e-mail-shell-view-private.c:1070
+msgid "Sent"
+msgstr "Seolta"
+
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:915
+#: ../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
+#: ../plugins/templates/templates.c:1322
+msgid "Templates"
+msgstr "Teimpléid"
+
+#: ../mail/e-mail-migrate.c:134
+msgid "Migrating..."
+msgstr ""
+
+#: ../mail/e-mail-migrate.c:169
+#, fuzzy
+msgid "Migration"
+msgstr "Cumraíocht"
+
+#: ../mail/e-mail-migrate.c:210
+#, c-format
+msgid "Migrating '%s':"
+msgstr ""
+
+#: ../mail/e-mail-migrate.c:728
+#, fuzzy
+msgid "Migrating Folders"
+msgstr "Ag cruthú na comhadlainne %1"
+
+#: ../mail/e-mail-migrate.c:729
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../mail/e-mail-migrate.c:1527
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "Ní féidir fillteáin poist logánta a chruthú ag `%s': %s"
+
+#: ../mail/e-mail-notebook-view.c:621
+#, fuzzy
+msgid "Please select a folder"
+msgstr "Roghnaigh úsáideoir le do thoil."
+
+>>>>>>> master
 #: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Cóipeáil go Fillteán"
 
+<<<<<<< HEAD
 #: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:463
 msgid "C_opy"
 msgstr "_Cóipeáil"
@@ -8436,10 +16898,27 @@ msgstr "_Bog"
 
 #: ../mail/e-mail-reader.c:1165 ../mail/e-mail-reader.c:1353
 #: ../mail/e-mail-reader.c:1393
+=======
+#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:487
+msgid "C_opy"
+msgstr "_Cóipeáil"
+
+#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
+msgid "Move to Folder"
+msgstr "Bog go Fillteán"
+
+#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:487
+msgid "_Move"
+msgstr "_Bog"
+
+#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1403
+>>>>>>> master
 #, fuzzy
 msgid "_Do not ask me again."
 msgstr "Ná fiafraigh díom arís."
 
+<<<<<<< HEAD
 #: ../mail/e-mail-reader.c:1399
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr ""
@@ -8449,37 +16928,73 @@ msgid "A_dd Sender to Address Book"
 msgstr "Cuir Seoltóir _Leis an Leabhar Seoltaí"
 
 #: ../mail/e-mail-reader.c:1759
+=======
+#: ../mail/e-mail-reader.c:1409
+msgid "_Always ignore Reply-To: for mailing lists."
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1775
+msgid "A_dd Sender to Address Book"
+msgstr "Cuir Seoltóir _Leis an Leabhar Seoltaí"
+
+#: ../mail/e-mail-reader.c:1777
+>>>>>>> master
 #, fuzzy
 msgid "Add sender to address book"
 msgstr "Cuir Seoltóir Leis an Leabhar Seoltaí"
 
+<<<<<<< HEAD
 #: ../mail/e-mail-reader.c:1764
 msgid "Check for _Junk"
 msgstr "Lorg _Dramhphost"
 
 #: ../mail/e-mail-reader.c:1766
+=======
+#: ../mail/e-mail-reader.c:1782
+msgid "Check for _Junk"
+msgstr "Lorg _Dramhphost"
+
+#: ../mail/e-mail-reader.c:1784
+>>>>>>> master
 #, fuzzy
 msgid "Filter the selected messages for junk status"
 msgstr "Post sceál do tadhall"
 
+<<<<<<< HEAD
 #: ../mail/e-mail-reader.c:1771
 msgid "_Copy to Folder..."
 msgstr "_Cóipeáil go Fillteán..."
 
 #: ../mail/e-mail-reader.c:1773
+=======
+#: ../mail/e-mail-reader.c:1789
+msgid "_Copy to Folder..."
+msgstr "_Cóipeáil go Fillteán..."
+
+#: ../mail/e-mail-reader.c:1791
+>>>>>>> master
 #, fuzzy
 msgid "Copy selected messages to another folder"
 msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
 
+<<<<<<< HEAD
 #: ../mail/e-mail-reader.c:1778
 msgid "_Delete Message"
 msgstr "_Scrios Teachtaireacht"
 
 #: ../mail/e-mail-reader.c:1780
+=======
+#: ../mail/e-mail-reader.c:1796
+msgid "_Delete Message"
+msgstr "_Scrios Teachtaireacht"
+
+#: ../mail/e-mail-reader.c:1798
+>>>>>>> master
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "Marcáil na teachtaireachtaí roghnaithe mar dhramhphost"
 
+<<<<<<< HEAD
 #: ../mail/e-mail-reader.c:1785
 msgid "Filter on Mailing _List..."
 msgstr "Scag ar L_iosta Postála..."
@@ -8533,28 +17048,100 @@ msgid "_Clear Flag"
 msgstr "_Glan Bratach"
 
 #: ../mail/e-mail-reader.c:1829
+=======
+#: ../mail/e-mail-reader.c:1803
+msgid "Filter on Mailing _List..."
+msgstr "Scag ar L_iosta Postála..."
+
+#: ../mail/e-mail-reader.c:1805
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1810
+msgid "Filter on _Recipients..."
+msgstr "Scag ar Fh_aighteoirí..."
+
+#: ../mail/e-mail-reader.c:1812
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1817
+msgid "Filter on Se_nder..."
+msgstr "Scag ar Sh_eoltóir..."
+
+#: ../mail/e-mail-reader.c:1819
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1824
+msgid "Filter on _Subject..."
+msgstr "Scag ar �b_har..."
+
+#: ../mail/e-mail-reader.c:1826
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1831
+msgid "A_pply Filters"
+msgstr "Cuir Scagairí i b_hFeidhm"
+
+#: ../mail/e-mail-reader.c:1833
+msgid "Apply filter rules to the selected messages"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1838
+msgid "_Find in Message..."
+msgstr "_Aimsigh i dTeachtaireacht..."
+
+#: ../mail/e-mail-reader.c:1840
+msgid "Search for text in the body of the displayed message"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1845
+msgid "_Clear Flag"
+msgstr "_Glan Bratach"
+
+#: ../mail/e-mail-reader.c:1847
+>>>>>>> master
 #, fuzzy
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Cruthaigh tasc nua ón dteachtaireacht roghnaithe"
 
+<<<<<<< HEAD
 #: ../mail/e-mail-reader.c:1834
 msgid "_Flag Completed"
 msgstr "Cuir _Bratach \"Críochnaithe\" Leis"
 
 #: ../mail/e-mail-reader.c:1836
+=======
+#: ../mail/e-mail-reader.c:1852
+msgid "_Flag Completed"
+msgstr "Cuir _Bratach \"Críochnaithe\" Leis"
+
+#: ../mail/e-mail-reader.c:1854
+>>>>>>> master
 #, fuzzy
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Cruthaigh cruinniú nua ón dteachtaireacht roghnaithe"
 
+<<<<<<< HEAD
 #: ../mail/e-mail-reader.c:1841
 msgid "Follow _Up..."
 msgstr "_Leantach..."
 
 #: ../mail/e-mail-reader.c:1843
+=======
+#: ../mail/e-mail-reader.c:1859
+msgid "Follow _Up..."
+msgstr "_Leantach..."
+
+#: ../mail/e-mail-reader.c:1861
+>>>>>>> master
 #, fuzzy
 msgid "Flag the selected messages for follow-up"
 msgstr "Post sceál do tadhall"
 
+<<<<<<< HEAD
 #: ../mail/e-mail-reader.c:1848
 msgid "_Attached"
 msgstr "_Ceangailte"
@@ -9330,11 +17917,613 @@ msgstr "Lorg Teachtaireachtaí Nua"
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
 #: ../mail/em-composer-utils.c:1146
+=======
+#: ../mail/e-mail-reader.c:1866
+msgid "_Attached"
+msgstr "_Ceangailte"
+
+#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
+msgid "Forward the selected message to someone as an attachment"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1873
+msgid "Forward As _Attached"
+msgstr "Cuir ar Aghaidh mar _Iatán"
+
+#: ../mail/e-mail-reader.c:1880
+msgid "_Inline"
+msgstr "_Inlíne"
+
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
+msgid "Forward the selected message in the body of a new message"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1887
+msgid "Forward As _Inline"
+msgstr "Cuir ar Aghaidh mar I_nlíne"
+
+#: ../mail/e-mail-reader.c:1894
+msgid "_Quoted"
+msgstr "_Athfhriotail"
+
+#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
+msgid "Forward the selected message quoted like a reply"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1901
+msgid "Forward As _Quoted"
+msgstr "Cuir ar Aghaidh mar _Luachan"
+
+#: ../mail/e-mail-reader.c:1908
+msgid "_Load Images"
+msgstr "_Luchtaigh �omhánna"
+
+#: ../mail/e-mail-reader.c:1910
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1915
+msgid "_Important"
+msgstr "_Tábhachtach"
+
+#: ../mail/e-mail-reader.c:1917
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Marcáil na teachtaireachtaí roghnaithe mar dhramhphost"
+
+#: ../mail/e-mail-reader.c:1922
+msgid "_Junk"
+msgstr "_Dramhphost"
+
+#: ../mail/e-mail-reader.c:1924
+#, fuzzy
+msgid "Mark the selected messages as junk"
+msgstr "Marcáil na teachtaireachtaí roghnaithe mar dhramhphost"
+
+#: ../mail/e-mail-reader.c:1929
+msgid "_Not Junk"
+msgstr "_Post Ceart"
+
+#: ../mail/e-mail-reader.c:1931
+#, fuzzy
+msgid "Mark the selected messages as not being junk"
+msgstr "Post sceál do tadhall"
+
+#: ../mail/e-mail-reader.c:1936
+msgid "_Read"
+msgstr "_Léite"
+
+#: ../mail/e-mail-reader.c:1938
+#, fuzzy
+msgid "Mark the selected messages as having been read"
+msgstr "Post an sceál seo"
+
+#: ../mail/e-mail-reader.c:1943
+msgid "Uni_mportant"
+msgstr "Gan Tá_bhacht"
+
+#: ../mail/e-mail-reader.c:1945
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Marcáil na teachtaireachtaí roghnaithe mar dhramhphost"
+
+#: ../mail/e-mail-reader.c:1950
+msgid "_Unread"
+msgstr "Gan _Léamh"
+
+#: ../mail/e-mail-reader.c:1952
+#, fuzzy
+msgid "Mark the selected messages as not having been read"
+msgstr "Post an sceál seo"
+
+#: ../mail/e-mail-reader.c:1957
+msgid "_Edit as New Message..."
+msgstr "Cuir in _Eagar mar Theachtaireacht Nua..."
+
+#: ../mail/e-mail-reader.c:1959
+#, fuzzy
+msgid "Open the selected messages in the composer for editing"
+msgstr "Post an sceál seo"
+
+#: ../mail/e-mail-reader.c:1964
+msgid "Compose _New Message"
+msgstr "Cum Teachtaireacht _Nua"
+
+#: ../mail/e-mail-reader.c:1966
+msgid "Open a window for composing a mail message"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1971
+msgid "_Open in New Window"
+msgstr "_Oscail i bhFuinneog Nua"
+
+#: ../mail/e-mail-reader.c:1973
+#, fuzzy
+msgid "Open the selected messages in a new window"
+msgstr "Oscail Gach Teachtaireacht i bhFuinneog Nua Chomhrá"
+
+#: ../mail/e-mail-reader.c:1978
+msgid "_Move to Folder..."
+msgstr "_Bog go Fillteán..."
+
+#: ../mail/e-mail-reader.c:1980
+#, fuzzy
+msgid "Move selected messages to another folder"
+msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
+
+#: ../mail/e-mail-reader.c:1985
+#, fuzzy
+msgid "_Switch to Folder"
+msgstr "Athraigh go %s"
+
+#: ../mail/e-mail-reader.c:1987
+#, fuzzy
+msgid "Display the parent folder"
+msgstr "Cuir comhfhillteáin leis"
+
+#: ../mail/e-mail-reader.c:1992
+#, fuzzy
+msgid "Switch to _next tab"
+msgstr "Athraigh go %s"
+
+#: ../mail/e-mail-reader.c:1994
+msgid "Switch to the next tab"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1999
+#, fuzzy
+msgid "Switch to _previous tab"
+msgstr "Athraigh go %s"
+
+#: ../mail/e-mail-reader.c:2001
+msgid "Switch to the previous tab"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2006
+#, fuzzy
+msgid "Cl_ose current tab"
+msgstr "Dún an comhad reatha"
+
+#: ../mail/e-mail-reader.c:2008
+#, fuzzy
+msgid "Close current tab"
+msgstr "Dún an comhad reatha"
+
+#: ../mail/e-mail-reader.c:2013
+msgid "_Next Message"
+msgstr "An Chéad Teachtaireacht _Eile"
+
+#: ../mail/e-mail-reader.c:2015
+#, fuzzy
+msgid "Display the next message"
+msgstr "An Chéad Teachtaireacht &Neamhléite Eile"
+
+#: ../mail/e-mail-reader.c:2020
+msgid "Next _Important Message"
+msgstr "An Chéad Teachtaireacht _Tábhachtach Eile"
+
+#: ../mail/e-mail-reader.c:2022
+#, fuzzy
+msgid "Display the next important message"
+msgstr "Liosta Teachtaireachtaí - Teachtaireachtaí Tábhachtacha"
+
+#: ../mail/e-mail-reader.c:2027
+msgid "Next _Thread"
+msgstr "An Chéad _Snáithe Eile"
+
+#: ../mail/e-mail-reader.c:2029
+#, fuzzy
+msgid "Display the next thread"
+msgstr "téigh go dtí an chéad snáithe eile"
+
+#: ../mail/e-mail-reader.c:2034
+msgid "Next _Unread Message"
+msgstr "An Chéad Teachtaireacht Gan _Léamh Eile"
+
+#: ../mail/e-mail-reader.c:2036
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "An Chéad Teachtaireacht Neamhléite Eile"
+
+#: ../mail/e-mail-reader.c:2041
+msgid "_Previous Message"
+msgstr "An Teachtaireacht _Roimhe Seo"
+
+#: ../mail/e-mail-reader.c:2043
+#, fuzzy
+msgid "Display the previous message"
+msgstr "Luaigh an teachtaireacht roimhe seo"
+
+#: ../mail/e-mail-reader.c:2048
+msgid "Pr_evious Important Message"
+msgstr "An Teachtaireacht Gan _Tábhacht Roimhe Seo"
+
+#: ../mail/e-mail-reader.c:2050
+#, fuzzy
+msgid "Display the previous important message"
+msgstr "Liosta Teachtaireachtaí - Teachtaireachtaí Tábhachtacha"
+
+#: ../mail/e-mail-reader.c:2055
+msgid "Previous T_hread"
+msgstr "An S_náithe Roimhe Seo"
+
+#: ../mail/e-mail-reader.c:2057
+#, fuzzy
+msgid "Display the previous thread"
+msgstr "Luaigh an teachtaireacht roimhe seo"
+
+#: ../mail/e-mail-reader.c:2062
+msgid "P_revious Unread Message"
+msgstr "An Teachtaireacht Gan _Léamh Roimhe Seo"
+
+#: ../mail/e-mail-reader.c:2064
+#, fuzzy
+msgid "Display the previous unread message"
+msgstr "Téigh go dtí an teachtaireacht gan léamh roimhe"
+
+#: ../mail/e-mail-reader.c:2071
+msgid "Print this message"
+msgstr "Priontáil an teachtaireacht seo"
+
+#: ../mail/e-mail-reader.c:2078
+#, fuzzy
+msgid "Preview the message to be printed"
+msgstr "Roghnaigh na míreanna atá le priontáil"
+
+#: ../mail/e-mail-reader.c:2083
+msgid "Re_direct"
+msgstr "A_treoraigh"
+
+#: ../mail/e-mail-reader.c:2085
+msgid "Redirect (bounce) the selected message to someone"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2090
+msgid "Remo_ve Attachments"
+msgstr "Bain _Iatáin"
+
+#: ../mail/e-mail-reader.c:2092
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Sábháil Iatáin"
+
+#: ../mail/e-mail-reader.c:2097
+msgid "Remove Du_plicate Messages"
+msgstr "Bain Teachtaireachtaí _Dúblacha"
+
+#: ../mail/e-mail-reader.c:2099
+#, fuzzy
+msgid "Checks selected messages for duplicates"
+msgstr "Marcáil na teachtaireachtaí roghnaithe mar dhramhphost"
+
+#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+#: ../modules/mail/e-mail-attachment-handler.c:177
+msgid "Reply to _All"
+msgstr "F_reagair Cách"
+
+#: ../mail/e-mail-reader.c:2106
+#, fuzzy
+msgid "Compose a reply to all the recipients of the selected message"
+msgstr "Cruthaigh teagmhas nua ón dteachtaireacht roghnaithe"
+
+#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
+msgid "Reply to _List"
+msgstr "Freagair do _Liosta"
+
+#: ../mail/e-mail-reader.c:2113
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2118
+#: ../modules/mail/e-mail-attachment-handler.c:184
+msgid "_Reply to Sender"
+msgstr "_Freagra don Seoltóir"
+
+#: ../mail/e-mail-reader.c:2120
+msgid "Compose a reply to the sender of the selected message"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2125
+msgid "_Save as mbox..."
+msgstr "Sábháil mar _mbox..."
+
+#: ../mail/e-mail-reader.c:2127
+msgid "Save selected messages as an mbox file"
+msgstr "Sábháil teachtaireachtaí roghnaithe mar chomhad mbox"
+
+#: ../mail/e-mail-reader.c:2132
+msgid "_Message Source"
+msgstr "Foinse _Theachtaireachta"
+
+#: ../mail/e-mail-reader.c:2134
+msgid "Show the raw email source of the message"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2146
+msgid "_Undelete Message"
+msgstr "_Díscrios Teachtaireacht"
+
+#: ../mail/e-mail-reader.c:2148
+msgid "Undelete the selected messages"
+msgstr "Díscrios na teachtaireachtaí roghnaithe"
+
+#: ../mail/e-mail-reader.c:2153
+msgid "_Normal Size"
+msgstr "G_náthmhéid"
+
+#: ../mail/e-mail-reader.c:2155
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2160
+msgid "_Zoom In"
+msgstr "_Súmáil Isteach"
+
+#: ../mail/e-mail-reader.c:2162
+msgid "Increase the text size"
+msgstr "Méadaigh an téacs"
+
+#: ../mail/e-mail-reader.c:2167
+msgid "Zoom _Out"
+msgstr "Súmáil _Amach"
+
+#: ../mail/e-mail-reader.c:2169
+msgid "Decrease the text size"
+msgstr "Laghdaigh méid an téacs"
+
+#: ../mail/e-mail-reader.c:2176
+msgid "Create R_ule"
+msgstr "Cruthaigh R_iail"
+
+#: ../mail/e-mail-reader.c:2183
+msgid "Ch_aracter Encoding"
+msgstr "Ionchódú C_arachtar"
+
+#: ../mail/e-mail-reader.c:2190
+msgid "F_orward As"
+msgstr "C_uir ar Aghaidh Mar..."
+
+#: ../mail/e-mail-reader.c:2197
+msgid "_Group Reply"
+msgstr "_Grúpfhreagairt"
+
+#: ../mail/e-mail-reader.c:2204
+msgid "_Go To"
+msgstr "_Téigh go dTí"
+
+#: ../mail/e-mail-reader.c:2211
+msgid "Mar_k As"
+msgstr "_Marcáil Mar"
+
+#: ../mail/e-mail-reader.c:2218
+msgid "_Message"
+msgstr "_Teachtaireacht"
+
+#: ../mail/e-mail-reader.c:2225
+msgid "_Zoom"
+msgstr "_Súmáil"
+
+#: ../mail/e-mail-reader.c:2235
+msgid "Search Folder from Mailing _List..."
+msgstr "Fillteán Cuardaigh ó _Liosta Postála..."
+
+#: ../mail/e-mail-reader.c:2237
+#, fuzzy
+msgid "Create a search folder for this mailing list"
+msgstr "Cruthaigh liosta tadhaill nua"
+
+#: ../mail/e-mail-reader.c:2242
+msgid "Search Folder from Recipien_ts..."
+msgstr "Fillteán Cuardaigh ó _Fhaighteoirí..."
+
+#: ../mail/e-mail-reader.c:2244
+#, fuzzy
+msgid "Create a search folder for these recipients"
+msgstr "Cruthaigh liosta tadhaill nua"
+
+#: ../mail/e-mail-reader.c:2249
+msgid "Search Folder from Sen_der..."
+msgstr "Fillteán Cuardaigh ó _Sheoltóir..."
+
+#: ../mail/e-mail-reader.c:2251
+#, fuzzy
+msgid "Create a search folder for this sender"
+msgstr ""
+"Cumraigh na critéir chuardaigh le húsáid don fhillteán cuardaigh shábháilte "
+"seo:"
+
+#: ../mail/e-mail-reader.c:2256
+msgid "Search Folder from S_ubject..."
+msgstr "Fillteán Cuardaigh ó �_bhar..."
+
+#: ../mail/e-mail-reader.c:2258
+#, fuzzy
+msgid "Create a search folder for this subject"
+msgstr ""
+"Cumraigh na critéir chuardaigh le húsáid don fhillteán cuardaigh shábháilte "
+"seo:"
+
+#: ../mail/e-mail-reader.c:2281
+msgid "Mark for Follo_w Up..."
+msgstr "Marcáil le hAghaidh _Leanúna..."
+
+#: ../mail/e-mail-reader.c:2289
+msgid "Mark as _Important"
+msgstr "Marcáil mar _Tábhachtach"
+
+#: ../mail/e-mail-reader.c:2293
+msgid "Mark as _Junk"
+msgstr "Marcáil mar _Dramhphost"
+
+#: ../mail/e-mail-reader.c:2297
+msgid "Mark as _Not Junk"
+msgstr "Marcáil mar _Phost Ceart"
+
+#: ../mail/e-mail-reader.c:2301
+msgid "Mar_k as Read"
+msgstr "Marcá_il mar Léite"
+
+#: ../mail/e-mail-reader.c:2305
+#, fuzzy
+msgid "Mark as Uni_mportant"
+msgstr "Marcáil mar Gan _Tábhacht"
+
+#: ../mail/e-mail-reader.c:2309
+msgid "Mark as _Unread"
+msgstr "Marcáil mar _Gan Léamh"
+
+#: ../mail/e-mail-reader.c:2353
+msgid "_Caret Mode"
+msgstr "Mód _Carait"
+
+#: ../mail/e-mail-reader.c:2355
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2361
+msgid "All Message _Headers"
+msgstr "Gach _Ceanntásc Teachtaireachta"
+
+#: ../mail/e-mail-reader.c:2363
+msgid "Show messages with all email headers"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2659
+#, fuzzy, c-format
+msgid "Retrieving message '%s'"
+msgstr "Teachtaireacht %s á fáil"
+
+#. 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
+#: ../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 "Réamhshocrú"
+
+#: ../mail/e-mail-reader.c:3415
+#: ../modules/mail/e-mail-attachment-handler.c:170
+msgid "_Forward"
+msgstr "_Cuir ar Aghaidh"
+
+#: ../mail/e-mail-reader.c:3416
+msgid "Forward the selected message to someone"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:3435
+msgid "Group Reply"
+msgstr "Grúpfhreagairt"
+
+#: ../mail/e-mail-reader.c:3436
+msgid "Reply to the mailing list, or to all recipients"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:3489 ../mail/em-filter-i18n.h:14
+msgid "Delete"
+msgstr "Scrios"
+
+#: ../mail/e-mail-reader.c:3522
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../widgets/misc/e-calendar.c:202
+msgid "Next"
+msgstr "Ar Aghaidh"
+
+#: ../mail/e-mail-reader.c:3526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../widgets/misc/e-calendar.c:178
+msgid "Previous"
+msgstr "Siar"
+
+#: ../mail/e-mail-reader.c:3535 ../mail/mail-dialogs.ui.h:17
+msgid "Reply"
+msgstr "Freagair"
+
+#: ../mail/e-mail-reader.c:4205
+#, fuzzy, c-format
+msgid "Folder '%s'"
+msgstr "Fillteán"
+
+#: ../mail/e-mail-reader-utils.c:145
+#, fuzzy
+msgid "Do not warn me again"
+msgstr "Ná fiafraigh díom arís."
+
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:670
+#, 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?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: ../mail/e-mail-reader-utils.c:1047
+#, fuzzy
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "Sábháil Teachtaireacht..."
+msgstr[1] "Sábháil Teachtaireacht..."
+msgstr[2] "Sábháil Teachtaireacht..."
+msgstr[3] "Sábháil Teachtaireacht..."
+msgstr[4] "Sábháil Teachtaireacht..."
+
+#. Translators: This is part of a suggested file name
+#. * used when saving a message or multiple messages to
+#. * 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
+#, fuzzy
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "Teachtaireacht"
+msgstr[1] "Teachtaireacht"
+msgstr[2] "Teachtaireacht"
+msgstr[3] "Teachtaireacht"
+msgstr[4] "Teachtaireacht"
+
+#: ../mail/e-mail-session.c:871
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "Iontráil Frása Faire do %s"
+
+#: ../mail/e-mail-session.c:875
+msgid "Enter Passphrase"
+msgstr "Iontráil Frása Faire:"
+
+#: ../mail/e-mail-session.c:879
+#, c-format
+msgid "Enter Password for %s"
+msgstr "Iontráil Focal Faire do %s"
+
+#: ../mail/e-mail-session.c:883
+msgid "Enter Password"
+msgstr "Iontráil Focal Faire"
+
+#: ../mail/e-mail-session.c:934
+#, c-format
+msgid "User canceled operation."
+msgstr "Chealaigh an t-úsáideoir an oibríocht."
+
+#: ../mail/e-mail-session.c:1047
+#, c-format
+>>>>>>> master
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/em-composer-utils.c:1157
 msgid "-----Original Message-----"
 msgstr "-----Bunteachtaireacht-----"
@@ -9364,6 +18553,105 @@ msgid "Choose folders to post the message to."
 msgstr ""
 
 #: ../mail/em-filter-folder-element.c:319
+=======
+#: ../mail/e-mail-session.c:1056
+#, c-format
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
+
+#: ../mail/e-mail-session-utils.c:419
+#, fuzzy, c-format
+msgid "Cannot get transport for account '%s'"
+msgstr "Sábháil \"%title%\" %reason%?"
+
+#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:635
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr ""
+
+#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
+#: ../mail/mail-ops.c:654 ../mail/mail-ops.c:688
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+
+#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:708
+#, fuzzy, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "Comhad féilire le luchtú"
+
+#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:831
+#: ../mail/mail-ops.c:927
+msgid "Sending message"
+msgstr "Teachtaireacht á seoladh"
+
+#: ../mail/e-mail-session-utils.c:873
+#, fuzzy, c-format
+msgid "Unsubscribing from folder '%s'"
+msgstr "Ag díliostáil ón bhfillteán %S..."
+
+#: ../mail/e-mail-store-utils.c:168
+#, fuzzy, c-format
+msgid "Disconnecting from '%s'"
+msgstr "Ag dínasc ó %s"
+
+#: ../mail/e-mail-store-utils.c:259
+#, fuzzy, c-format
+msgid "Reconnecting to '%s'"
+msgstr "Ag athnasc le %s"
+
+#: ../mail/e-mail-store-utils.c:334
+#, fuzzy, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "Míreanna le húsáid as líne"
+
+#: ../mail/e-mail-tag-editor.c:291
+#, fuzzy
+msgid "Flag to Follow Up"
+msgstr "Clóigh leanúint anseo"
+
+#. Note to translators: this is the attribution string used
+#. * when quoting messages.  Each ${Variable} gets replaced
+#. * with a value.  To see a full list of available variables,
+#. * see mail/em-composer-utils.c:attribvars array.
+#: ../mail/em-composer-utils.c:1197
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: ../mail/em-composer-utils.c:1208
+msgid "-----Original Message-----"
+msgstr "-----Bunteachtaireacht-----"
+
+#. 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
+#, c-format
+msgid "Your message to %s about \"%s\" on %s has been read."
+msgstr ""
+
+#: ../mail/em-composer-utils.c:2052
+#, fuzzy, c-format
+msgid "Delivery Notification for: \"%s\""
+msgstr "&Fógairt an Chórais"
+
+#: ../mail/em-composer-utils.c:2592
+msgid "an unknown sender"
+msgstr "seoltóir anaithnid"
+
+#: ../mail/em-composer-utils.c:2998
+msgid "Posting destination"
+msgstr ""
+
+#: ../mail/em-composer-utils.c:2999
+msgid "Choose folders to post the message to."
+msgstr ""
+
+#: ../mail/em-filter-folder-element.c:241
+>>>>>>> master
 msgid "Select Folder"
 msgstr "Roghnaigh Fillteán"
 
@@ -9542,7 +18830,11 @@ msgid "Play Sound"
 msgstr "Seinn Fuaim"
 
 #. Past tense, as in "has been read".
+<<<<<<< HEAD
 #: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
+=======
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
+>>>>>>> master
 msgid "Read"
 msgstr "Léigh"
 
@@ -9625,6 +18917,7 @@ msgid "Unset Status"
 msgstr "Díshocraigh Stádas"
 
 #. and now for the action area
+<<<<<<< HEAD
 #: ../mail/em-filter-rule.c:536
 msgid "Then"
 msgstr "Ansin"
@@ -9634,6 +18927,17 @@ msgid "Add Ac_tion"
 msgstr "Cuir _Gníomh Leis"
 
 #: ../mail/em-folder-properties.c:142
+=======
+#: ../mail/em-filter-rule.c:561
+msgid "Then"
+msgstr "Ansin"
+
+#: ../mail/em-filter-rule.c:592
+msgid "Add Ac_tion"
+msgstr "Cuir _Gníomh Leis"
+
+#: ../mail/em-folder-properties.c:145
+>>>>>>> master
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Teachtaireachtaí gan léamh:"
@@ -9642,7 +18946,11 @@ msgstr[2] "Teachtaireachtaí gan léamh:"
 msgstr[3] "Teachtaireachtaí gan léamh:"
 msgstr[4] "Teachtaireachtaí gan léamh:"
 
+<<<<<<< HEAD
 #: ../mail/em-folder-properties.c:153
+=======
+#: ../mail/em-folder-properties.c:156
+>>>>>>> master
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Teachtaireachtaí iomlán:"
@@ -9651,16 +18959,25 @@ msgstr[2] "Teachtaireachtaí iomlán:"
 msgstr[3] "Teachtaireachtaí iomlán:"
 msgstr[4] "Teachtaireachtaí iomlán:"
 
+<<<<<<< HEAD
 #: ../mail/em-folder-properties.c:174
+=======
+#: ../mail/em-folder-properties.c:177
+>>>>>>> master
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Úsáid cuóta (%s):"
 
+<<<<<<< HEAD
 #: ../mail/em-folder-properties.c:176
+=======
+#: ../mail/em-folder-properties.c:179
+>>>>>>> master
 #, c-format
 msgid "Quota usage"
 msgstr "Úsáid cuóta"
 
+<<<<<<< HEAD
 #: ../mail/em-folder-properties.c:314
 msgid "Folder Properties"
 msgstr "Airíonna Fillteáin"
@@ -9704,40 +19021,88 @@ msgid "Folder names cannot contain '/'"
 msgstr ""
 
 #: ../mail/em-folder-tree.c:1255
+=======
+#: ../mail/em-folder-properties.c:317
+msgid "Folder Properties"
+msgstr "Airíonna Fillteáin"
+
+#: ../mail/em-folder-selection-button.c:79
+msgid "<click here to select a folder>"
+msgstr "<cliceáil anseo chun fillteán a roghnú>"
+
+#: ../mail/em-folder-selector.c:436
+msgid "C_reate"
+msgstr "C_ruthaigh"
+
+#: ../mail/em-folder-selector.c:442
+msgid "Folder _name:"
+msgstr "Ai_nm Fillteán:"
+
+#: ../mail/em-folder-tree.c:647
+msgid "Folder names cannot contain '/'"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:768
+>>>>>>> master
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
+<<<<<<< HEAD
 #: ../mail/em-folder-tree.c:1492
 msgid "Mail Folder Tree"
 msgstr "Crann Fillteáin Poist"
 
 #: ../mail/em-folder-tree.c:1953 ../mail/em-folder-utils.c:95
+=======
+#: ../mail/em-folder-tree.c:1590
+msgid "Mail Folder Tree"
+msgstr "Crann Fillteáin Poist"
+
+#: ../mail/em-folder-tree.c:2069 ../mail/em-folder-utils.c:115
+>>>>>>> master
 #, c-format
 msgid "Moving folder %s"
 msgstr "Fillteán %s á bhogadh"
 
+<<<<<<< HEAD
 #: ../mail/em-folder-tree.c:1957 ../mail/em-folder-utils.c:97
+=======
+#: ../mail/em-folder-tree.c:2072 ../mail/em-folder-utils.c:117
+>>>>>>> master
 #, c-format
 msgid "Copying folder %s"
 msgstr "Fillteán %s á chóipeáil"
 
+<<<<<<< HEAD
 #: ../mail/em-folder-tree.c:1966 ../mail/message-list.c:2230
+=======
+#: ../mail/em-folder-tree.c:2079 ../mail/message-list.c:2303
+>>>>>>> master
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Teachtaireachtaí á mbogadh isteach i bhfillteán %s"
 
+<<<<<<< HEAD
 #: ../mail/em-folder-tree.c:1970 ../mail/message-list.c:2232
+=======
+#: ../mail/em-folder-tree.c:2083 ../mail/message-list.c:2305
+>>>>>>> master
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Teachtaireachtaí á gcóipeáil isteach i bhfillteán %s"
 
+<<<<<<< HEAD
 #: ../mail/em-folder-tree.c:1989
+=======
+#: ../mail/em-folder-tree.c:2102
+>>>>>>> master
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ní féidir teachtaireacht(aí) a chur isteach i stóráil barrleibhéil"
 
+<<<<<<< HEAD
 #: ../mail/em-folder-utils.c:464
 #, fuzzy
 msgid "Move Folder To"
@@ -9921,30 +19286,146 @@ msgid "Malformed external-body part."
 msgstr ""
 
 #: ../mail/em-format-html.c:2097
+=======
+#: ../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:982
+#: ../widgets/misc/e-account-tree-view.c:1052
+#: ../widgets/misc/e-account-tree-view.c:1127
+#: ../widgets/misc/e-account-tree-view.c:1375
+msgid "Search Folders"
+msgstr "Fillteáin Cuardaigh"
+
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
+msgid "UNMATCHED"
+msgstr "GAN CHOMHOIRIÚNÚ"
+
+#: ../mail/em-folder-tree-model.c:989 ../mail/em-folder-tree-model.c:1281
+msgid "Loading..."
+msgstr "� Luchtú..."
+
+#: ../mail/em-folder-utils.c:488
+#, fuzzy
+msgid "Move Folder To"
+msgstr "_Bog Fillteán Go..."
+
+#: ../mail/em-folder-utils.c:488
+#, fuzzy
+msgid "Copy Folder To"
+msgstr "_Cóipeáil Fillteán Go..."
+
+#: ../mail/em-folder-utils.c:605
+#, fuzzy
+msgid "Create Folder"
+msgstr "Cruthaigh fillteán"
+
+#: ../mail/em-folder-utils.c:606
+msgid "Specify where to create the folder:"
+msgstr "Sonraigh an áit ina cruthófar an fillteán:"
+
+#: ../mail/em-format-html.c:167
+msgid "Formatting message"
+msgstr "Teachtaireacht á formáidiú"
+
+#: ../mail/em-format-html.c:379
+msgid "Formatting Message..."
+msgstr "Teachtaireacht á Formáidiú..."
+
+#: ../mail/em-format-html.c:1596 ../mail/em-format-html.c:1606
+#, fuzzy, c-format
+msgid "Retrieving '%s'"
+msgstr "`%s' á Fháil"
+
+#: ../mail/em-format-html.c:1757 ../mail/em-format-html-display.c:89
+msgid "Unsigned"
+msgstr "Gan síniú"
+
+#: ../mail/em-format-html.c:1758 ../mail/em-format-html-display.c:90
+msgid "Valid signature"
+msgstr "Síniú bailí"
+
+#: ../mail/em-format-html.c:1759 ../mail/em-format-html-display.c:91
+msgid "Invalid signature"
+msgstr "Síniú neamhbhailí"
+
+#: ../mail/em-format-html.c:1760 ../mail/em-format-html-display.c:92
+msgid "Valid signature, but cannot verify sender"
+msgstr ""
+
+#: ../mail/em-format-html.c:1761 ../mail/em-format-html-display.c:93
+msgid "Signature exists, but need public key"
+msgstr ""
+
+#: ../mail/em-format-html.c:1767 ../mail/em-format-html-display.c:100
+msgid "Unencrypted"
+msgstr "Gan chriptiú"
+
+#: ../mail/em-format-html.c:1768 ../mail/em-format-html-display.c:101
+msgid "Encrypted, weak"
+msgstr "Criptithe, lag"
+
+#: ../mail/em-format-html.c:1769 ../mail/em-format-html-display.c:102
+msgid "Encrypted"
+msgstr "Criptithe"
+
+#: ../mail/em-format-html.c:1770 ../mail/em-format-html-display.c:103
+msgid "Encrypted, strong"
+msgstr "Criptithe, láidir"
+
+#: ../mail/em-format-html.c:2170
+msgid "Unknown external-body part."
+msgstr ""
+
+#: ../mail/em-format-html.c:2180
+msgid "Malformed external-body part."
+msgstr ""
+
+#: ../mail/em-format-html.c:2211
+>>>>>>> master
 #, fuzzy, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Uasluchtaigh go suíomh saincheaptha FTP"
 
+<<<<<<< HEAD
 #: ../mail/em-format-html.c:2108
+=======
+#: ../mail/em-format-html.c:2222
+>>>>>>> master
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/em-format-html.c:2110
+=======
+#: ../mail/em-format-html.c:2224
+>>>>>>> master
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Easpórtáil: Easpórtáil imeachtaí go comhad logánta."
 
+<<<<<<< HEAD
 #: ../mail/em-format-html.c:2131
+=======
+#: ../mail/em-format-html.c:2245
+>>>>>>> master
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Ag iarraidh sonraí le seoladh"
 
+<<<<<<< HEAD
 #: ../mail/em-format-html.c:2142
+=======
+#: ../mail/em-format-html.c:2260
+>>>>>>> master
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/em-format-html.c:2800
 #, fuzzy
 msgid "(no subject)"
@@ -10101,6 +19582,275 @@ msgstr "Bainistiú na Síntiús Fillteán"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 #, fuzzy
+=======
+#. 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:402
+#, fuzzy, c-format
+msgid "From: %s"
+msgstr "Ó %s:"
+
+#: ../mail/em-format-html.c:2990
+#, fuzzy
+msgid "(no subject)"
+msgstr "�bhar"
+
+#: ../mail/em-format-html.c:3066
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:89
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:90
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:91
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:92
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:93
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:100
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:101
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:102
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:103
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
+msgid "_View Certificate"
+msgstr "_Amharc ar Theastas"
+
+#: ../mail/em-format-html-display.c:254
+msgid "This certificate is not viewable"
+msgstr "Níl an teastas inamharctha"
+
+#: ../mail/em-format-html-display.c:566
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:756
+#, fuzzy
+msgid "Save Image"
+msgstr "Sábháil Teachtaireacht..."
+
+#: ../mail/em-format-html-display.c:804
+#, fuzzy
+msgid "Save _Image..."
+msgstr "Sábháil mar..."
+
+#: ../mail/em-format-html-display.c:806
+#, fuzzy
+msgid "Save the image to a file"
+msgstr "Sábháil an comhad reatha"
+
+#: ../mail/em-format-html-display.c:1034
+msgid "Completed on"
+msgstr "Críochnaithe ar"
+
+#: ../mail/em-format-html-display.c:1046
+#, fuzzy
+msgid "Overdue:"
+msgstr "thar téarma"
+
+#: ../mail/em-format-html-display.c:1054
+msgid "by"
+msgstr "roimh"
+
+#: ../mail/em-format-html-display.c:1335 ../mail/em-format-html-display.c:1386
+msgid "View _Unformatted"
+msgstr "Amharc ar Cinn gan _Fhormáidiú"
+
+#: ../mail/em-format-html-display.c:1337
+msgid "Hide _Unformatted"
+msgstr "Folaigh Cinn gan _Fhormáidiú"
+
+#: ../mail/em-format-html-display.c:1408
+msgid "O_pen With"
+msgstr "_Oscail Le"
+
+#: ../mail/em-format-html-print.c:176
+#, c-format
+msgid "Page %d of %d"
+msgstr "Leathanach %d as %d"
+
+#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:122
+#, fuzzy, c-format
+msgid "No HTML stream available"
+msgstr "Gan achoimre le fáil."
+
+#: ../mail/em-subscription-editor.c:1162
+#, fuzzy
+msgid "Folder Subscriptions"
+msgstr "Bainistiú na Síntiús Fillteán"
+
+#: ../mail/em-subscription-editor.c:1201
+msgid "_Account:"
+msgstr "_Cuntas:"
+
+#: ../mail/em-subscription-editor.c:1216
+#, fuzzy
+msgid "Clear Search"
+msgstr "Cuardaigh i gcónaí"
+
+#: ../mail/em-subscription-editor.c:1234
+#, fuzzy
+msgid "Sho_w items that contain:"
+msgstr "nach ina bhfuil"
+
+#: ../mail/em-subscription-editor.c:1273
+#, fuzzy
+msgid "Subscribe to the selected folder"
+msgstr "Liostáil le Fillteán Úsáideora Eile"
+
+#: ../mail/em-subscription-editor.c:1274
+#, fuzzy
+msgid "Su_bscribe"
+msgstr "Liostáilte"
+
+#: ../mail/em-subscription-editor.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#, fuzzy
+msgid "Unsubscribe from the selected folder"
+msgstr "Athainmnigh an fillteán roghnaithe"
+
+#: ../mail/em-subscription-editor.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
+msgid "_Unsubscribe"
+msgstr "_Díliostáil"
+
+#: ../mail/em-subscription-editor.c:1297
+#, fuzzy
+msgid "Collapse all folders"
+msgstr "Gach fillteán logánta"
+
+#: ../mail/em-subscription-editor.c:1298
+#, fuzzy
+msgid "C_ollapse All"
+msgstr "Laghdaigh Gach _Snáithe"
+
+#: ../mail/em-subscription-editor.c:1308
+#, fuzzy
+msgid "Expand all folders"
+msgstr "Lea_thnaigh Gach Snáithe"
+
+#: ../mail/em-subscription-editor.c:1309
+#, fuzzy
+msgid "E_xpand All"
+msgstr "Lea_thnaigh Gach Snáithe"
+
+#: ../mail/em-subscription-editor.c:1319
+#, fuzzy
+msgid "Refresh the folder list"
+msgstr "Athnuaigh an fillteán"
+
+#: ../mail/em-subscription-editor.c:1331
+#, fuzzy
+msgid "Stop the current operation"
+msgstr "Cealaigh an oibríocht phoist reatha"
+
+#. Translators: This message is shown only for ten or more
+#. * 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:104
+#, fuzzy, 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] "An bhfuil tú cinnte gur main leat an chatagóir seo a bhaint?"
+msgstr[1] "An bhfuil tú cinnte gur main leat an chatagóir seo a bhaint?"
+msgstr[2] "An bhfuil tú cinnte gur main leat an chatagóir seo a bhaint?"
+msgstr[3] "An bhfuil tú cinnte gur main leat an chatagóir seo a bhaint?"
+msgstr[4] "An bhfuil tú cinnte gur main leat an chatagóir seo a bhaint?"
+
+#: ../mail/em-utils.c:160
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
+#, fuzzy
+msgid "_Do not show this message again"
+msgstr "_Ná taispeáin an teachtaireacht seo arís."
+
+#: ../mail/em-utils.c:335
+msgid "Message Filters"
+msgstr "Scagairí Teachtaireachta"
+
+#: ../mail/em-utils.c:920
+#, c-format
+msgid "Messages from %s"
+msgstr "Teachtaireachtaí ó %s"
+
+#: ../mail/em-vfolder-editor.c:108
+msgid "Search _Folders"
+msgstr "Cuardaigh _Fillteáin"
+
+#: ../mail/em-vfolder-rule.c:618
+msgid "Add Folder"
+msgstr "Cuir Fillteán Leis"
+
+#: ../mail/evolution-mail.schemas.in.h:1
+#, fuzzy
+msgid "\"Filter Editor\" window height"
+msgstr "Airde fhuinneog réamhshocraithe"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Filter Editor\" window maximize state"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:3
+#, fuzzy
+msgid "\"Filter Editor\" window width"
+msgstr "Leithead fuinneog réamhshocraithe"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+#, fuzzy
+msgid "\"Folder Subscriptions\" window height"
+msgstr "Bainistiú na Síntiús Fillteán"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+#, fuzzy
+>>>>>>> master
 msgid "\"Folder Subscriptions\" window maximize state"
 msgstr "Bainistiú na Síntiús Fillteán"
 
@@ -10144,7 +19894,11 @@ msgid "Always request read receipt"
 msgstr "Nuair a thagann admháil léite:"
 
 #: ../mail/evolution-mail.schemas.in.h:14
+<<<<<<< HEAD
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+=======
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
+>>>>>>> master
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
 
@@ -10175,9 +19929,14 @@ msgid "Check for new messages in all active accounts"
 msgstr "Lorg teachtaireachtaí _nua gach"
 
 #: ../mail/evolution-mail.schemas.in.h:20
+<<<<<<< HEAD
 #, fuzzy
 msgid "Check for new messages on start"
 msgstr "Lorg teachtaireachtaí _nua gach"
+=======
+msgid "Check for new messages on start"
+msgstr "Lorg teachtaireachtaí nua ag tosú"
+>>>>>>> master
 
 #: ../mail/evolution-mail.schemas.in.h:21
 msgid "Check incoming mail being junk"
@@ -10290,7 +20049,11 @@ msgstr "Leithead fuinneoige réamhshocraithe (i bpicteilíní)"
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
+<<<<<<< HEAD
 "Describes wheter message headers in paned view should be collapsed or "
+=======
+"Describes whether message headers in paned view should be collapsed or "
+>>>>>>> master
 "expanded by default. \"0\" = expanded \"1\" = collapsed"
 msgstr ""
 
@@ -10385,10 +20148,19 @@ msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:63
+<<<<<<< HEAD
+=======
+#, fuzzy
+msgid "Enable local folders"
+msgstr "Gach fillteán logánta"
+
+#: ../mail/evolution-mail.schemas.in.h:64
+>>>>>>> master
 #, fuzzy
 msgid "Enable or disable magic space bar"
 msgstr "Bainistigh Gléasanna agus Breiseáin"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr ""
@@ -10406,23 +20178,51 @@ msgid "Enable search folders on startup."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:68
+=======
+#: ../mail/evolution-mail.schemas.in.h:65
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid "Enable or disable type ahead search feature"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:67
+msgid "Enable search folders"
+msgstr "Cumasaigh fillteáin cuardaigh"
+
+#: ../mail/evolution-mail.schemas.in.h:68
+msgid "Enable search folders on startup."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:69
+>>>>>>> master
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:69
+=======
+#: ../mail/evolution-mail.schemas.in.h:70
+>>>>>>> master
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:70
+=======
+#: ../mail/evolution-mail.schemas.in.h:71
+>>>>>>> master
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
@@ -10440,6 +20240,25 @@ msgid "Encode file names in an Outlook/GMail way"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:75
+=======
+#: ../mail/evolution-mail.schemas.in.h:72
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:73
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid "Enable/disable caret mode"
+msgstr "Cumasaigh/díchumasaigh mód carait"
+
+#: ../mail/evolution-mail.schemas.in.h:75 ../mail/mail-config.ui.h:45
+msgid "Encode file names in an Outlook/GMail way"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:76
+>>>>>>> master
 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, "
@@ -10447,15 +20266,24 @@ msgid ""
 "standard."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:76
 msgid "Flush Outbox after filtering"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:77
+=======
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "Flush Outbox after filtering"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:78
+>>>>>>> master
 #, fuzzy
 msgid "Forward message."
 msgstr "Teachtaireacht Curtha Ar Aghaidh"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:78
 msgid "Group Reply replies to list"
 msgstr ""
@@ -10559,11 +20387,31 @@ msgid ""
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:95
+=======
+#: ../mail/evolution-mail.schemas.in.h:79
+msgid "Group Reply replies to list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid "Height of the message-list pane"
+msgstr "Airde pána an liosta teachtaireachtaí"
+
+#: ../mail/evolution-mail.schemas.in.h:81
+msgid "Height of the message-list pane."
+msgstr "Airde pána an liosta teachtaireachtaí."
+
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid "Hides the per-folder preview and removes the selection"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:83
+>>>>>>> master
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:96
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
@@ -10644,11 +20492,180 @@ msgid "List of accounts"
 msgstr "Liosta cuntas"
 
 #: ../mail/evolution-mail.schemas.in.h:111
+=======
+#: ../mail/evolution-mail.schemas.in.h:84
+msgid ""
+"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
+"any MIME types appearing in this list which map to a Bonobo component viewer "
+"in GNOME's MIME type database may be used for displaying content."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid "Ignore list Reply-To:"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:86
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid ""
+"Initial height of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:88
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:90
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:91
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:92
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:94
+msgid ""
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:95
+msgid ""
+"Initial width of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:96
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:97
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:98
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:99
+msgid ""
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:100
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:101
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:102
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:103
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:104
+msgid "Last time Empty Junk was run"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:105
+msgid "Last time Empty Trash was run"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:106
+msgid "Layout style"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:107
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
+msgid "Level beyond which the message should be logged."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:108
+msgid "List of Labels and their associated colors"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:109
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:110
+msgid "List of accepted licenses"
+msgstr "Liosta ceadúnais glactha leo"
+
+#: ../mail/evolution-mail.schemas.in.h:111
+msgid "List of accounts"
+msgstr "Liosta cuntas"
+
+#: ../mail/evolution-mail.schemas.in.h:112
+>>>>>>> master
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
@@ -10658,11 +20675,23 @@ msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:114
+=======
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "List of custom headers and whether they are enabled."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:115
+>>>>>>> master
 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 ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:115
 msgid "List of protocol names whose license has been accepted."
 msgstr ""
@@ -10672,6 +20701,17 @@ msgid "Load images for HTML messages over HTTP"
 msgstr "Luchtaigh íomhánna do theachtaireachtaí HTML trí HTTP"
 
 #: ../mail/evolution-mail.schemas.in.h:117
+=======
+#: ../mail/evolution-mail.schemas.in.h:116
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid "Load images for HTML messages over HTTP"
+msgstr "Luchtaigh íomhánna do theachtaireachtaí HTML trí HTTP"
+
+#: ../mail/evolution-mail.schemas.in.h:118
+>>>>>>> master
 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 "
@@ -10682,6 +20722,7 @@ msgstr ""
 "idirlíon riamh. \"1\" - Luchtaigh íomhánna i dteachtaireachtaí ó "
 "theagmhálacha. \"2\" - Luchtaigh íomhánna ón idirlíon i gcónaí."
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions"
 msgstr "Logáil gníomhartha scagaire"
@@ -10699,19 +20740,47 @@ msgid "Logfile to log filter actions."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:122
+=======
+#: ../mail/evolution-mail.schemas.in.h:119
+msgid "Log filter actions"
+msgstr "Logáil gníomhartha scagaire"
+
+#: ../mail/evolution-mail.schemas.in.h:120
+msgid "Log filter actions to the specified log file."
+msgstr "Logáil gníomhartha scagaire go dtí an comhad loga sonraithe."
+
+#: ../mail/evolution-mail.schemas.in.h:121
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:123
+>>>>>>> master
 #, fuzzy
 msgid "Mail browser height"
 msgstr "Airde an ró roghnaithe"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser maximized"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:124
+=======
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Mail browser maximized"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:125
+>>>>>>> master
 #, fuzzy
 msgid "Mail browser width"
 msgstr "Tosaíonn ríomhphost le"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout"
 msgstr ""
@@ -10757,43 +20826,119 @@ msgid "Number of addresses to display in TO/CC/BCC"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:136
+=======
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Message text limit for display"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:132
+msgid "Minimum days between emptying the junk on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:133
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:137
+>>>>>>> master
 #, fuzzy
 msgid "Original message."
 msgstr "-----Bunteachtaireacht-----"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:137
 msgid "Path where picture gallery should search for its content"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:138
+=======
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "Path where picture gallery should search for its content"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:139
+>>>>>>> master
 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 ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:140
+=======
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid "Prompt before sending to recipients not entered as mail addresses"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:141
+>>>>>>> master
 #, fuzzy
 msgid "Prompt on empty subject"
 msgstr "Folmhaigh an Bruscar ag an &Scor"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:141
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:142
+=======
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:143
+>>>>>>> master
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:143
+=======
+#: ../mail/evolution-mail.schemas.in.h:144
+>>>>>>> master
 #, fuzzy
 msgid "Prompt when deleting messages in search folder"
 msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when mailing list hijacks private replies"
 msgstr ""
@@ -10807,10 +20952,26 @@ msgid "Prompt when replying to many recipients"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:147
+=======
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid "Prompt when mailing list hijacks private replies"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:146
+msgid "Prompt when replying privately to list messages"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:147
+msgid "Prompt when replying to many recipients"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:148
+>>>>>>> master
 #, fuzzy
 msgid "Prompt when user expunges"
 msgstr "Tabhair &leid nuair a dhéanann feidhmchlár rochtain ar sparán oscailte"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user only fills Bcc"
 msgstr ""
@@ -10820,11 +20981,23 @@ msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:150
+=======
+#: ../mail/evolution-mail.schemas.in.h:149
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:150
+msgid "Prompt when user tries to open 10 or more messages at once"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:151
+>>>>>>> master
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
@@ -10878,16 +21051,76 @@ msgid "Sender email-address column in the message list"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:164
+=======
+#: ../mail/evolution-mail.schemas.in.h:152
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid "Prompt while marking multiple messages"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:155
+msgid "Put personalized signatures at the top of replies"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Put the cursor at the bottom of replies"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "Recognize emoticons in text and replace them with images."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid "Run junk test on incoming mail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid "Save directory"
+msgstr "Sábháil comhadlann"
+
+#: ../mail/evolution-mail.schemas.in.h:161
+msgid "Search for the sender photo in local address books"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:162
+msgid "Send HTML mail by default"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:163
+msgid "Send HTML mail by default."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:164
+msgid "Sender email-address column in the message list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:165
+>>>>>>> master
 #, fuzzy
 msgid "Server synchronization interval"
 msgstr "Roghanna Beochana"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:165
+=======
+#: ../mail/evolution-mail.schemas.in.h:166
+>>>>>>> master
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr ""
@@ -10913,15 +21146,47 @@ msgid "Show Animations"
 msgstr "Taispeán Beocháin"
 
 #: ../mail/evolution-mail.schemas.in.h:172
+=======
+#: ../mail/evolution-mail.schemas.in.h:167
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:168
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:169
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:170
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:171
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:172
+msgid "Show Animations"
+msgstr "Taispeán Beocháin"
+
+#: ../mail/evolution-mail.schemas.in.h:173
+>>>>>>> master
 #, fuzzy
 msgid "Show all message headers"
 msgstr "Laghdaigh gach snáithe teachtaireachtaí"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:173
+=======
+#: ../mail/evolution-mail.schemas.in.h:174
+>>>>>>> master
 #, fuzzy
 msgid "Show all the headers when viewing a messages."
 msgstr "Comment=Taispeáin Teachtaireacht Téacs i bPreabfhuinneog"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show animated images as animations."
 msgstr ""
@@ -10935,67 +21200,126 @@ msgid "Show deleted messages in the message-list"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:177
+=======
+#: ../mail/evolution-mail.schemas.in.h:175
+msgid "Show animated images as animations."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:177
+msgid "Show deleted messages in the message-list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:178
+>>>>>>> master
 #, fuzzy
 msgid "Show image animations"
 msgstr "Taispeáin cineál na híomhá"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show original \"Date\" header value."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:179
+=======
+#: ../mail/evolution-mail.schemas.in.h:179
+msgid "Show original \"Date\" header value."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:180
+>>>>>>> master
 #, fuzzy
 msgid "Show photo of the sender"
 msgstr "&Seoladh nua an tseoltóra:"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:180
+=======
+#: ../mail/evolution-mail.schemas.in.h:181
+>>>>>>> master
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:181
+=======
+#: ../mail/evolution-mail.schemas.in.h:182
+>>>>>>> master
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:182
+=======
+#: ../mail/evolution-mail.schemas.in.h:183
+>>>>>>> master
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:183
+=======
+#: ../mail/evolution-mail.schemas.in.h:184
+>>>>>>> master
 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 ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:184
+=======
+#: ../mail/evolution-mail.schemas.in.h:185
+>>>>>>> master
 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 ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:185
+=======
+#: ../mail/evolution-mail.schemas.in.h:186
+>>>>>>> master
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:186
+=======
+#: ../mail/evolution-mail.schemas.in.h:187
+>>>>>>> master
 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 ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:187
 msgid "Show the photo of the sender in the message reading pane."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:188
+=======
+#: ../mail/evolution-mail.schemas.in.h:188
+msgid "Show the photo of the sender in the message reading pane."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:189
+>>>>>>> master
 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. "
@@ -11006,16 +21330,29 @@ msgid ""
 "Post: header, if there is one."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:189
+=======
+#: ../mail/evolution-mail.schemas.in.h:190
+msgid "Sort accounts alphabetically in a folder tree"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:191
+>>>>>>> master
 #, fuzzy
 msgid "Spell check inline"
 msgstr "Seiceáil an litrithe go huathoibríoch"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:190
+=======
+#: ../mail/evolution-mail.schemas.in.h:192
+>>>>>>> master
 #, fuzzy
 msgid "Spell checking color"
 msgstr "Seiceáil Litrithe"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:191
 #, fuzzy
 msgid "Spell checking languages"
@@ -11034,16 +21371,52 @@ msgid "The default plugin for Junk hook"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:195
+=======
+#: ../mail/evolution-mail.schemas.in.h:193
+#, fuzzy
+msgid "Spell checking languages"
+msgstr "Seiceáil an litrithe go huathoibríoch"
+
+#: ../mail/evolution-mail.schemas.in.h:194
+msgid "State of message headers in paned view"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:195
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:196
+msgid "Terminal font"
+msgstr "Cló teirminéil"
+
+#: ../mail/evolution-mail.schemas.in.h:197
+msgid "The default plugin for Junk hook"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:198
+>>>>>>> master
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:196
+=======
+#: ../mail/evolution-mail.schemas.in.h:199
+>>>>>>> master
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:197
+=======
+#: ../mail/evolution-mail.schemas.in.h:200
+>>>>>>> master
 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 "
@@ -11051,61 +21424,101 @@ msgid ""
 "message list."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:198
+=======
+#: ../mail/evolution-mail.schemas.in.h:201
+>>>>>>> master
 #, fuzzy
 msgid "The terminal font for mail display."
 msgstr "Úsáid &dath uathoibríoch cló don taispeántas scáileáin"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:199
+=======
+#: ../mail/evolution-mail.schemas.in.h:202
+>>>>>>> master
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:200
+=======
+#: ../mail/evolution-mail.schemas.in.h:203
+>>>>>>> master
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:201
+=======
+#: ../mail/evolution-mail.schemas.in.h:204
+>>>>>>> master
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:202
+=======
+#: ../mail/evolution-mail.schemas.in.h:205
+>>>>>>> master
 #, fuzzy
 msgid "The variable width font for mail display."
 msgstr "Úsáid &dath uathoibríoch cló don taispeántas scáileáin"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:203
+=======
+#: ../mail/evolution-mail.schemas.in.h:206
+>>>>>>> master
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:204
+=======
+#: ../mail/evolution-mail.schemas.in.h:207
+>>>>>>> master
 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 ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:205
+=======
+#: ../mail/evolution-mail.schemas.in.h:208
+>>>>>>> master
 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 ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:206
+=======
+#: ../mail/evolution-mail.schemas.in.h:209
+>>>>>>> master
 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 ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:207
+=======
+#: ../mail/evolution-mail.schemas.in.h:210
+>>>>>>> master
 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;"
@@ -11113,43 +21526,68 @@ msgid ""
 "mail view."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:208
+=======
+#: ../mail/evolution-mail.schemas.in.h:211
+>>>>>>> master
 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 ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:209
 msgid "This option would help in improving the speed of fetching."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:210
+=======
+#: ../mail/evolution-mail.schemas.in.h:212
+msgid "This option would help in improving the speed of fetching."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:213
+>>>>>>> master
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:211
+=======
+#: ../mail/evolution-mail.schemas.in.h:214
+>>>>>>> master
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Requires a restart to apply."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:212
+=======
+#: ../mail/evolution-mail.schemas.in.h:215
+>>>>>>> master
 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 ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:213
+=======
+#: ../mail/evolution-mail.schemas.in.h:216
+>>>>>>> master
 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 ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:214
 msgid "Thread the message-list based on Subject"
 msgstr ""
@@ -11163,10 +21601,26 @@ msgid "Timeout for marking message as seen."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:217
+=======
+#: ../mail/evolution-mail.schemas.in.h:217
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:218
+msgid "Timeout for marking message as seen"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:219
+msgid "Timeout for marking message as seen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:220
+>>>>>>> master
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Úsáid an réamhshocrú ó shocruithe an chuntais"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:218
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
@@ -11184,10 +21638,22 @@ msgid "Use custom fonts"
 msgstr "Úsáid clónna saincheaptha"
 
 #: ../mail/evolution-mail.schemas.in.h:222
+=======
+#: ../mail/evolution-mail.schemas.in.h:221
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:222
+msgid "Use custom fonts"
+msgstr "Úsáid clónna saincheaptha"
+
+#: ../mail/evolution-mail.schemas.in.h:223
+>>>>>>> master
 #, fuzzy
 msgid "Use custom fonts for displaying mail."
 msgstr "Úsáid clónna saincheaptha"
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:223
 msgid "Use only local spam tests."
 msgstr ""
@@ -11197,19 +21663,27 @@ msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:225
+=======
+#: ../mail/evolution-mail.schemas.in.h:224
+>>>>>>> master
 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 ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:226
+=======
+#: ../mail/evolution-mail.schemas.in.h:225
+>>>>>>> master
 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 ""
 
+<<<<<<< HEAD
 #: ../mail/evolution-mail.schemas.in.h:227
 #, fuzzy
 msgid "Variable width font"
@@ -11217,10 +21691,27 @@ msgstr "Cló &il-leithid"
 
 #: ../mail/evolution-mail.schemas.in.h:228
 msgid "Whether a read receipt request gets added to every message by default."
+=======
+#: ../mail/evolution-mail.schemas.in.h:226
+#, fuzzy
+msgid "Variable width font"
+msgstr "Cló &il-leithid"
+
+#: ../mail/evolution-mail.schemas.in.h:227
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:228
+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."
+>>>>>>> master
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:229
 msgid ""
+<<<<<<< HEAD
 "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."
@@ -11251,12 +21742,42 @@ 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."
+=======
+"Whether check for new messages when Evolution is started. This includes also "
+"sending messages from Outbox."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:230
+msgid "Whether disable ellipsizing feature of folder names in side bar."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:231
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:232
+msgid "Whether sort threads based on latest message in that thread"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:233
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:234
+msgid "Whether to show local folders (On This Computer) in a folder tree."
+>>>>>>> master
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:235
 #, fuzzy
 msgid "Width of the message-list pane"
 msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
+<<<<<<< HEAD
 
 #: ../mail/evolution-mail.schemas.in.h:236
 #, fuzzy
@@ -11360,26 +21881,146 @@ msgid "Import mail from Pine."
 msgstr "Iompórtáil post ó Pine."
 
 #: ../mail/mail-autofilter.c:73
+=======
+
+#: ../mail/evolution-mail.schemas.in.h:236
+#, fuzzy
+msgid "Width of the message-list pane."
+msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
+
+#: ../mail/importers/elm-importer.c:181
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Earráid agus Sonraí á nIompórtáil"
+
+#: ../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:520
+msgid "Mail"
+msgstr "Post"
+
+#: ../mail/importers/elm-importer.c:396
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "&GNOME-PIM (Evolution)"
+
+#: ../mail/importers/elm-importer.c:397
+#, fuzzy
+msgid "Import mail from Elm."
+msgstr "Iompórtáil Ó Phost OS X"
+
+#: ../mail/importers/evolution-mbox-importer.c:138
+#: ../plugins/dbx-import/dbx-importer.c:250
+#, fuzzy
+msgid "_Destination folder:"
+msgstr "Sprioc-fhillteán:"
+
+#: ../mail/importers/evolution-mbox-importer.c:145
+#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../plugins/pst-import/pst-importer.c:460
+msgid "Select folder"
+msgstr "Roghnaigh fillteán"
+
+#: ../mail/importers/evolution-mbox-importer.c:146
+#: ../plugins/dbx-import/dbx-importer.c:261
+#: ../plugins/pst-import/pst-importer.c:461
+#, fuzzy
+msgid "Select folder to import into"
+msgstr "Ní féidir fillteán a chruthú le ríomhphost a iompórtáil isteach ann."
+
+#: ../mail/importers/evolution-mbox-importer.c:433
+#, fuzzy
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "�bhar"
+
+#: ../mail/importers/evolution-mbox-importer.c:438
+#, fuzzy
+msgctxt "mboxImp"
+msgid "From"
+msgstr "Ó"
+
+#: ../mail/importers/evolution-mbox-importer.c:482
+#: ../shell/e-shell-utils.c:221
+msgid "Berkeley Mailbox (mbox)"
+msgstr "Bosca Poist Berkeley (mbox)"
+
+#: ../mail/importers/evolution-mbox-importer.c:483
+msgid "Importer Berkeley Mailbox format folders"
+msgstr ""
+
+#: ../mail/importers/mail-importer.c:64
+msgid "Importing mailbox"
+msgstr "Bosca poist á iompórtáil"
+
+#. 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
+#, fuzzy, c-format
+msgid "Importing '%s'"
+msgstr "`%s' á iompórtáil"
+
+#: ../mail/importers/mail-importer.c:316
+#, c-format
+msgid "Scanning %s"
+msgstr "%s á scanadh"
+
+#: ../mail/importers/pine-importer.c:260
+msgid "Importing Pine data"
+msgstr "Sonraí Pine á n-iompórtáil"
+
+#: ../mail/importers/pine-importer.c:463
+#: ../modules/addressbook/addressbook-config.c:1081
+msgid "Address Book"
+msgstr "Leabhar Seoltaí"
+
+#: ../mail/importers/pine-importer.c:509
+msgid "Evolution Pine importer"
+msgstr "Iompórtálaí Pine Evolution"
+
+#: ../mail/importers/pine-importer.c:510
+msgid "Import mail from Pine."
+msgstr "Iompórtáil post ó Pine."
+
+#: ../mail/mail-autofilter.c:72
+>>>>>>> master
 #, c-format
 msgid "Mail to %s"
 msgstr "Post chuig %s"
 
+<<<<<<< HEAD
 #: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:281
+=======
+#: ../mail/mail-autofilter.c:228 ../mail/mail-autofilter.c:271
+>>>>>>> master
 #, c-format
 msgid "Mail from %s"
 msgstr "Post ó %s"
 
+<<<<<<< HEAD
 #: ../mail/mail-autofilter.c:265
+=======
+#: ../mail/mail-autofilter.c:254
+>>>>>>> master
 #, c-format
 msgid "Subject is %s"
 msgstr "Is %s an t-ábhar"
 
+<<<<<<< HEAD
 #: ../mail/mail-autofilter.c:304
+=======
+#: ../mail/mail-autofilter.c:295
+>>>>>>> master
 #, c-format
 msgid "%s mailing list"
 msgstr "liosta postála %s"
 
+<<<<<<< HEAD
 #: ../mail/mail-autofilter.c:413
+=======
+#: ../mail/mail-autofilter.c:404
+>>>>>>> master
 msgid "Add Filter Rule"
 msgstr "Cuir Riail Scagaire Leis"
 
@@ -11388,7 +22029,11 @@ msgstr "Cuir Riail Scagaire Leis"
 #. * 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.
+<<<<<<< HEAD
 #: ../mail/mail-autofilter.c:522
+=======
+#: ../mail/mail-autofilter.c:507
+>>>>>>> master
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -11428,11 +22073,11 @@ msgstr ""
 
 #: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr ""
+msgstr "Déan cóip charbóin (_cc) i gcónaí go:"
 
 #: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr ""
+msgstr "Déan cóip charbóin folaithe (_bcc) i gcónaí go:"
 
 #: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
@@ -11452,7 +22097,11 @@ msgid "Apply the same _view settings to all folders"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:15
+<<<<<<< HEAD
 #: ../modules/addressbook/addressbook-config.c:1018
+=======
+#: ../modules/addressbook/addressbook-config.c:1088
+>>>>>>> master
 msgid "Authentication"
 msgstr "Fíordheimhniú"
 
@@ -11474,6 +22123,7 @@ msgid "Check cu_stom headers for junk"
 msgstr "Post ríomhphost"
 
 #: ../mail/mail-config.ui.h:20
+<<<<<<< HEAD
 #, fuzzy
 msgid "Check for new _messages on start"
 msgstr "Lorg teachtaireachtaí _nua gach"
@@ -11485,13 +22135,28 @@ msgstr "Lorg teachtaireachtaí _nua gach"
 
 #: ../mail/mail-config.ui.h:22
 #, fuzzy
+=======
+msgid "Check for new _messages on start"
+msgstr "Lorg _teachtaireachtaí nua ag tosú"
+
+#: ../mail/mail-config.ui.h:21
+msgid "Check for new messa_ges in all active accounts"
+msgstr "Lorg teachtai_reachtaí nua do gach cuntas gníomhach"
+
+#: ../mail/mail-config.ui.h:22
+>>>>>>> master
 msgid "Check incoming _messages for junk"
-msgstr "Post ríomhphost"
+msgstr "Seiceáil an dramhphost iad _teachtaireachtaí isteach"
 
 #: ../mail/mail-config.ui.h:23
+<<<<<<< HEAD
 #, fuzzy
 msgid "Check spelling while I _type"
 msgstr "Seiceáil litriú le linn clóscríofa"
+=======
+msgid "Check spelling while I _type"
+msgstr "Seiceáil _litriú agus mé á chlóscríobh"
+>>>>>>> master
 
 #: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
@@ -11507,12 +22172,20 @@ msgid "Color for _misspelled words:"
 msgstr "Uath athchuir focail litrithe mícheart"
 
 #: ../mail/mail-config.ui.h:27
+<<<<<<< HEAD
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Cum Teachtaireacht"
 
 #: ../mail/mail-config.ui.h:28
 #: ../modules/plugin-manager/evolution-plugin-manager.c:157
+=======
+msgid "Composing Messages"
+msgstr "Cumadh Teachtaireachtaí"
+
+#: ../mail/mail-config.ui.h:28
+#: ../modules/plugin-manager/evolution-plugin-manager.c:160
+>>>>>>> master
 msgid "Configuration"
 msgstr "Cumraíocht"
 
@@ -11521,6 +22194,7 @@ msgid "Confirm _when expunging a folder"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:30
+<<<<<<< HEAD
 #, fuzzy
 msgid "Confirmations"
 msgstr "Cumraíocht"
@@ -11538,14 +22212,37 @@ msgstr "Tosaíocht Réamhshocrú:"
 
 #: ../mail/mail-config.ui.h:34
 #, fuzzy
+=======
+msgid "Confirmations"
+msgstr "Deimhnithe"
+
+#: ../mail/mail-config.ui.h:31
+#: ../modules/addressbook/autocompletion-config.c:188
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
+msgid "Date/Time Format"
+msgstr "Formáid Dáta/Ama"
+
+#: ../mail/mail-config.ui.h:33
+msgid "Default Behavior"
+msgstr "Oibriú Réamhshocraithe"
+
+#: ../mail/mail-config.ui.h:34
+>>>>>>> master
 msgid "Default character e_ncoding:"
-msgstr "Tacar carachtar réamhshocraithe:"
+msgstr "_Ionchódú carachtar réamhshocraithe:"
+
+#: ../mail/mail-config.ui.h:35
+msgid "Delete Mail"
+msgstr "Scriosadh Poist"
 
+<<<<<<< HEAD
 #: ../mail/mail-config.ui.h:35
 #, fuzzy
 msgid "Delete Mail"
 msgstr "Scrios"
 
+=======
+>>>>>>> master
 #: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr ""
@@ -11571,7 +22268,7 @@ msgstr "Ná scrios"
 
 #: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
-msgstr "_Fillteán Dréachtaí:"
+msgstr "Fillteán _Dréachtaí:"
 
 #: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
@@ -11596,7 +22293,10 @@ msgid "F_all back to threading messages by subject"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:49
+<<<<<<< HEAD
 #, fuzzy
+=======
+>>>>>>> master
 msgid "Fix_ed Width Font:"
 msgstr "Cló _Aonleithid:"
 
@@ -11664,9 +22364,14 @@ msgid "Languages Table"
 msgstr "Cuir Tábla Leis"
 
 #: ../mail/mail-config.ui.h:66
+<<<<<<< HEAD
 #, fuzzy
 msgid "Loading Images"
 msgstr "_Luchtaigh �omhánna"
+=======
+msgid "Loading Images"
+msgstr "Luchtú �omhánna"
+>>>>>>> master
 
 #: ../mail/mail-config.ui.h:67
 #, fuzzy
@@ -11678,6 +22383,7 @@ msgid "Mailbox location"
 msgstr "�it do Bosca Phoist"
 
 #: ../mail/mail-config.ui.h:69
+<<<<<<< HEAD
 #, fuzzy
 msgid "Message Display"
 msgstr "Teachtaireachtaí"
@@ -11690,6 +22396,22 @@ msgstr "Stádas Teactaireachta"
 #: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr ""
+=======
+msgid "Message Display"
+msgstr "Taispeáint Teachtaireachtaí"
+
+#: ../mail/mail-config.ui.h:70
+msgid "Message Receipts"
+msgstr "Admhálacha Teachtaireachta"
+
+#: ../mail/mail-config.ui.h:71
+msgid "No _Proxy for:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr "Gan chriptiú"
+>>>>>>> master
 
 #: ../mail/mail-config.ui.h:73
 msgid "Option is ignored if a match for custom junk headers is found."
@@ -11707,14 +22429,18 @@ msgstr "_Eagras:"
 
 #: ../mail/mail-config.ui.h:77
 msgid "PGP/GPG _Key ID:"
-msgstr "ID _Eochar PGP:"
+msgstr "CA _Eochracha PGP/GPG:"
 
 #: ../mail/mail-config.ui.h:78
 msgid "Pass_word:"
 msgstr "_Focal Faire:"
 
 #: ../mail/mail-config.ui.h:79
+<<<<<<< HEAD
 #: ../modules/calendar/e-calendar-preferences.ui.h:23
+=======
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
+>>>>>>> master
 msgid "Pick a color"
 msgstr "Roghnaigh dath"
 
@@ -11723,6 +22449,7 @@ msgid "Port:"
 msgstr "Port:"
 
 #: ../mail/mail-config.ui.h:81
+<<<<<<< HEAD
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
@@ -11737,6 +22464,20 @@ msgstr "Socruithe Dramhphoist"
 msgid "Quoted"
 msgstr "_Athfhriotail"
 
+=======
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "Pretty Good Privacy (PGP/GPG)"
+
+#: ../mail/mail-config.ui.h:83
+msgid "Proxy Settings"
+msgstr "Socruithe Seachfhreastalaí"
+
+#: ../mail/mail-config.ui.h:84
+#, fuzzy
+msgid "Quoted"
+msgstr "_Athfhriotail"
+
+>>>>>>> master
 #: ../mail/mail-config.ui.h:85
 msgid "Re_member password"
 msgstr "_Meabhraigh focal faire"
@@ -11775,6 +22516,13 @@ msgstr "SHA384"
 msgid "SHA512"
 msgstr "SHA512"
 
+<<<<<<< HEAD
+=======
+#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "Criptiú SSL"
+
+>>>>>>> master
 #: ../mail/mail-config.ui.h:95
 #, fuzzy
 msgid "SSL is not supported in this build of Evolution"
@@ -11789,15 +22537,26 @@ msgid "S_elect..."
 msgstr "_Roghnaigh..."
 
 #: ../mail/mail-config.ui.h:98
+<<<<<<< HEAD
 #, fuzzy
+=======
+>>>>>>> master
 msgid "S_end message receipts:"
-msgstr "[-- DEIREADH TEACHTAIREACHTA PGP --]\n"
+msgstr "_Seol admhálacha teachtaireachta:"
 
 #: ../mail/mail-config.ui.h:99
+<<<<<<< HEAD
 #, fuzzy
+=======
+>>>>>>> master
 msgid "S_tandard Font:"
-msgstr "Cló Comhrá"
+msgstr "Cló _Caighdeánach:"
+
+#: ../mail/mail-config.ui.h:100
+msgid "Secure MIME (S/MIME)"
+msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr ""
@@ -11812,10 +22571,14 @@ msgid "Select HTML variable width font"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:104
+=======
+#: ../mail/mail-config.ui.h:102
+>>>>>>> master
 #, fuzzy
 msgid "Sender Photograph"
 msgstr "<b>Grianghraf Seoltóra</b>"
 
+<<<<<<< HEAD
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:106
 msgid "Sending a _private reply to a mailing list message"
@@ -11838,6 +22601,38 @@ msgid "Sending a message with only _Bcc recipients defined"
 msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
+=======
+#: ../mail/mail-config.ui.h:103
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:104
+msgid "Sender Photograph"
+msgstr "Grianghraf Seoltóra"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:106
+msgid "Sending a _private reply to a mailing list message"
+msgstr ""
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:108
+msgid "Sending a message with _recipients not entered as mail addresses"
+msgstr ""
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:110
+#, fuzzy
+msgid "Sending a message with an _empty subject line"
+msgstr "Tá teachtaireachtaí gan léamh sa snáithe seo."
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:112
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr ""
+
+#. This is in the context of: Ask for confirmation before...
+>>>>>>> master
 #: ../mail/mail-config.ui.h:114
 msgid "Sending a reply to a large _number of recipients"
 msgstr ""
@@ -11865,6 +22660,7 @@ msgid "Set custom junk header"
 msgstr "Cuir Ceanntásc Dramhphoist Saincheaptha Leis"
 
 #: ../mail/mail-config.ui.h:120
+<<<<<<< HEAD
 #, fuzzy
 msgid "Si_gning algorithm:"
 msgstr "Teastas sí_nithe:"
@@ -11873,10 +22669,18 @@ msgstr "Teastas sí_nithe:"
 #, fuzzy
 msgid "Sig_natures"
 msgstr "Sínithe"
+=======
+msgid "Si_gning algorithm:"
+msgstr "Al_gartam sínithe:"
+
+#: ../mail/mail-config.ui.h:121
+msgid "Sig_natures"
+msgstr "Sí_nithe"
+>>>>>>> master
 
 #: ../mail/mail-config.ui.h:122
 msgid "Sig_ning certificate:"
-msgstr "Teastas sí_nithe:"
+msgstr "_Teastas sínithe:"
 
 #: ../mail/mail-config.ui.h:123
 msgid "Signat_ure:"
@@ -11887,6 +22691,7 @@ msgid "Signatures"
 msgstr "Sínithe"
 
 #: ../mail/mail-config.ui.h:125
+<<<<<<< HEAD
 #, fuzzy
 msgid "Signing _algorithm:"
 msgstr "Teastas sí_nithe:"
@@ -11895,6 +22700,14 @@ msgstr "Teastas sí_nithe:"
 #, fuzzy
 msgid "Special Folders"
 msgstr "Fillteáin Logánta"
+=======
+msgid "Signing _algorithm:"
+msgstr "_Algartam sínithe:"
+
+#: ../mail/mail-config.ui.h:126
+msgid "Special Folders"
+msgstr "Fillteáin Speisialta"
+>>>>>>> master
 
 #: ../mail/mail-config.ui.h:127
 msgid "Spell Checking"
@@ -11905,9 +22718,18 @@ msgid "Start _typing at the bottom on replying"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:129
+<<<<<<< HEAD
 #, fuzzy
 msgid "Start up"
 msgstr "Tosaigh:"
+=======
+msgid "Start up"
+msgstr "Tosú"
+
+#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "Criptiú TLS"
+>>>>>>> master
 
 #: ../mail/mail-config.ui.h:131
 msgid "T_ype:"
@@ -11952,9 +22774,14 @@ msgid "Use Authe_ntication"
 msgstr "Úsáid Fío_rdheimhniú"
 
 #: ../mail/mail-config.ui.h:141
+<<<<<<< HEAD
 #, fuzzy
 msgid "User _Name:"
 msgstr "Ai_nm úsáideora:"
+=======
+msgid "User _Name:"
+msgstr "Ai_nm Úsáideora:"
+>>>>>>> master
 
 #: ../mail/mail-config.ui.h:142
 msgid "_Add Signature"
@@ -11968,6 +22795,7 @@ msgstr "Cuirfidh %S cosc ar íomhánna ó %S i gcónaí."
 #: ../mail/mail-config.ui.h:144
 msgid "_Authentication Type"
 msgstr "Cineál _Fíordheimhnithe"
+<<<<<<< HEAD
 
 #: ../mail/mail-config.ui.h:145
 #, fuzzy
@@ -11979,19 +22807,36 @@ msgid "_Direct connection to the Internet"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:147
-msgid "_Do not sign meeting requests (for Outlook compatibility)"
+=======
+
+#: ../mail/mail-config.ui.h:145
+msgid "_Direct connection to the Internet"
 msgstr ""
 
+#: ../mail/mail-config.ui.h:146
+>>>>>>> master
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr "_Ná sínigh iarratais cruinnithe (le haghaidh comhoiriúnachta Outlook)"
+
+<<<<<<< HEAD
 #: ../mail/mail-config.ui.h:148
+=======
+#: ../mail/mail-config.ui.h:147
+>>>>>>> master
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Stíl na hImlíne"
 
+<<<<<<< HEAD
 #: ../mail/mail-config.ui.h:149
+=======
+#: ../mail/mail-config.ui.h:148
+>>>>>>> master
 #, fuzzy
 msgid "_Junk Folder:"
 msgstr "bhFillteán Reatha"
 
+<<<<<<< HEAD
 #: ../mail/mail-config.ui.h:150
 msgid "_Keep signature above the original message on replying"
 msgstr ""
@@ -12007,19 +22852,45 @@ msgid "_Load images only in messages from contacts"
 msgstr "Post sceál do tadhall"
 
 #: ../mail/mail-config.ui.h:153
+=======
+#: ../mail/mail-config.ui.h:149
+msgid "_Keep signature above the original message on replying"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:150
+#, fuzzy
+msgid "_Languages"
+msgstr "Teanga"
+
+#: ../mail/mail-config.ui.h:151
+#, fuzzy
+msgid "_Load images only in messages from contacts"
+msgstr "Post sceál do tadhall"
+
+#: ../mail/mail-config.ui.h:152
+>>>>>>> master
 #, fuzzy
 msgid "_Lookup in local address book only"
 msgstr "Ná taispeáin ach fillteáin atá oscailte"
 
+<<<<<<< HEAD
 #: ../mail/mail-config.ui.h:154
 msgid "_Make this my default account"
 msgstr "S_ocraigh é seo mar mo chuntas réamhshocraithe"
 
 #: ../mail/mail-config.ui.h:155
+=======
+#: ../mail/mail-config.ui.h:153
+msgid "_Make this my default account"
+msgstr "S_ocraigh é seo mar mo chuntas réamhshocraithe"
+
+#: ../mail/mail-config.ui.h:154
+>>>>>>> master
 #, fuzzy
 msgid "_Manual proxy configuration:"
 msgstr "Socrú Post"
 
+<<<<<<< HEAD
 #: ../mail/mail-config.ui.h:157
 msgid "_Never load images from the Internet"
 msgstr ""
@@ -12037,10 +22908,26 @@ msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:161
+=======
+#: ../mail/mail-config.ui.h:156
+msgid "_Never load images from the Internet"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../mail/mail-config.ui.h:159
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:160
+>>>>>>> master
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Stíl na hImlíne"
 
+<<<<<<< HEAD
 #: ../mail/mail-config.ui.h:162
 msgid "_Script:"
 msgstr "_Script:"
@@ -12050,25 +22937,49 @@ msgid "_Secure HTTP Proxy:"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
+=======
+#: ../mail/mail-config.ui.h:161
+msgid "_Script:"
+msgstr "_Script:"
+
+#: ../mail/mail-config.ui.h:162
+msgid "_Secure HTTP Proxy:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:164 ../modules/addressbook/ldap-config.ui.h:29
+>>>>>>> master
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Freastalaí:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
+<<<<<<< HEAD
 #: ../mail/mail-config.ui.h:167
+=======
+#: ../mail/mail-config.ui.h:166
+>>>>>>> master
 #, fuzzy
 msgid "_Show animated images"
 msgstr "_Taispeáin íomhánna beo"
 
+<<<<<<< HEAD
 #: ../mail/mail-config.ui.h:168
 msgid "_Show the photograph of sender in the message preview"
 msgstr ""
 
 #: ../mail/mail-config.ui.h:169
+=======
+#: ../mail/mail-config.ui.h:167
+msgid "_Show the photograph of sender in the message preview"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:168
+>>>>>>> master
 #, fuzzy
 msgid "_Trash Folder:"
 msgstr "_Fillteán Dréachtaí:"
 
+<<<<<<< HEAD
 #: ../mail/mail-config.ui.h:170
 msgid "_Use Secure Connection:"
 msgstr "Úsáid C_eangal Daingean:"
@@ -12082,15 +22993,35 @@ msgid "_Use the same fonts as other applications"
 msgstr "Ú_sáid na clónna céanna a úsáideann feidhmchláir eile"
 
 #: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:48
+=======
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
+msgstr "Úsáid nasc daingean:"
+
+#: ../mail/mail-config.ui.h:170
+msgid "_Use system defaults"
+msgstr "Ú_sáid réamhshocruithe an chórais"
+
+#: ../mail/mail-config.ui.h:171
+msgid "_Use the same fonts as other applications"
+msgstr "Ú_sáid na clónna céanna a úsáideann feidhmchláir eile"
+
+#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
+>>>>>>> master
 #, fuzzy
 msgid "a"
 msgstr "am"
 
+<<<<<<< HEAD
 #: ../mail/mail-config.ui.h:174 ../smime/gui/smime-ui.ui.h:49
+=======
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
+>>>>>>> master
 #, fuzzy
 msgid "b"
 msgstr "roimh"
 
+<<<<<<< HEAD
 #: ../mail/mail-config.ui.h:175
 msgid "color"
 msgstr "dath"
@@ -12103,6 +23034,16 @@ msgstr "cur síos"
 msgid "gtk-ok"
 msgstr ""
 
+=======
+#: ../mail/mail-config.ui.h:174
+msgid "color"
+msgstr "dath"
+
+#: ../mail/mail-config.ui.h:175
+msgid "description"
+msgstr "cur síos"
+
+>>>>>>> master
 #: ../mail/mail-dialogs.ui.h:1
 msgid "All active remote folders"
 msgstr "Gach fillteán cianda gníomhach"
@@ -12120,29 +23061,51 @@ msgstr "Gach fillteán logánta"
 msgid "Call"
 msgstr "Glao"
 
+<<<<<<< HEAD
 #: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "_Críochnaithe"
 
 #: ../mail/mail-dialogs.ui.h:6
+=======
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
+msgid "Co_mpleted"
+msgstr "_Críochnaithe"
+
+#: ../mail/mail-dialogs.ui.h:7
+>>>>>>> master
 #, fuzzy
 msgid "Digital Signature"
 msgstr "Cuir Síniú in Eagar"
 
+<<<<<<< HEAD
 #: ../mail/mail-dialogs.ui.h:7
 msgid "Do Not Forward"
 msgstr "Ná Cuir Ar Aghaidh"
 
 #: ../mail/mail-dialogs.ui.h:8
+=======
+#: ../mail/mail-dialogs.ui.h:8
+msgid "Do Not Forward"
+msgstr "Ná Cuir Ar Aghaidh"
+
+#: ../mail/mail-dialogs.ui.h:9
+>>>>>>> master
 #, fuzzy
 msgid "Encryption"
 msgstr "Criptigh"
 
+<<<<<<< HEAD
 #: ../mail/mail-dialogs.ui.h:9
+=======
+#: ../mail/mail-dialogs.ui.h:10
+>>>>>>> master
 #, fuzzy
 msgid "Follow-Up"
 msgstr "Teachtaireacht leantach go %s%s?"
 
+<<<<<<< HEAD
 #: ../mail/mail-dialogs.ui.h:10
 msgid "For Your Information"
 msgstr "Mar Eolas Duit"
@@ -12152,31 +23115,59 @@ msgid "Forward"
 msgstr "Cuir ar Aghaidh"
 
 #: ../mail/mail-dialogs.ui.h:12
+=======
+#: ../mail/mail-dialogs.ui.h:11
+msgid "For Your Information"
+msgstr "Mar Eolas Duit"
+
+#: ../mail/mail-dialogs.ui.h:12
+msgid "Forward"
+msgstr "Cuir ar Aghaidh"
+
+#: ../mail/mail-dialogs.ui.h:13
+>>>>>>> master
 #, fuzzy
 msgid "License Agreement"
 msgstr "Comhaontú um Cheadúnas"
 
+<<<<<<< HEAD
 #: ../mail/mail-dialogs.ui.h:13
+=======
+#: ../mail/mail-dialogs.ui.h:14
+>>>>>>> master
 #, fuzzy
 msgid "No Response Necessary"
 msgstr ""
 "Port:\n"
 "(más gá)"
 
+<<<<<<< HEAD
 #: ../mail/mail-dialogs.ui.h:17
 msgid "Reply to All"
 msgstr "Freagair Cách"
 
 #: ../mail/mail-dialogs.ui.h:18
+=======
+#: ../mail/mail-dialogs.ui.h:18
+msgid "Reply to All"
+msgstr "Freagair Cách"
+
+#: ../mail/mail-dialogs.ui.h:19
+>>>>>>> master
 #, fuzzy
 msgid "Review"
 msgstr "Athbhreithnigh"
 
+<<<<<<< HEAD
 #: ../mail/mail-dialogs.ui.h:19
+=======
+#: ../mail/mail-dialogs.ui.h:20
+>>>>>>> master
 #, fuzzy
 msgid "Search Folder Sources"
 msgstr "Fillteán foinseach: %1 - Spriocfhillteán: %2"
 
+<<<<<<< HEAD
 #: ../mail/mail-dialogs.ui.h:20
 msgid "Security Information"
 msgstr "Eolas Slándála"
@@ -12186,54 +23177,102 @@ msgid "Specific folders"
 msgstr "Fillteáin áirithe"
 
 #: ../mail/mail-dialogs.ui.h:22
+=======
+#: ../mail/mail-dialogs.ui.h:21
+msgid "Security Information"
+msgstr "Eolas Slándála"
+
+#: ../mail/mail-dialogs.ui.h:22
+msgid "Specific folders"
+msgstr "Fillteáin áirithe"
+
+#: ../mail/mail-dialogs.ui.h:23
+>>>>>>> master
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail-dialogs.ui.h:24
 msgid "_Accept License"
 msgstr "_Glac le Ceadúnas"
 
 #: ../mail/mail-dialogs.ui.h:25
+=======
+#: ../mail/mail-dialogs.ui.h:25
+msgid "_Accept License"
+msgstr "_Glac le Ceadúnas"
+
+#: ../mail/mail-dialogs.ui.h:26
+>>>>>>> master
 #, fuzzy
 msgid "_Due By:"
 msgstr "&Grúpáil De Réir"
 
+<<<<<<< HEAD
 #: ../mail/mail-dialogs.ui.h:26
 msgid "_Flag:"
 msgstr "_Bratach:"
 
 #: ../mail/mail-dialogs.ui.h:27
+=======
+#: ../mail/mail-dialogs.ui.h:27
+msgid "_Flag:"
+msgstr "_Bratach:"
+
+#: ../mail/mail-dialogs.ui.h:28
+>>>>>>> master
 #, fuzzy
 msgid "_Tick this to accept the license agreement"
 msgstr "Líosta do cuntasaí"
 
+<<<<<<< HEAD
 #: ../mail/mail-folder-cache.c:787
+=======
+#: ../mail/mail-folder-cache.c:779
+>>>>>>> master
 #, c-format
 msgid "Pinging %s"
 msgstr "%s á phingiú"
 
+<<<<<<< HEAD
 #: ../mail/mail-ops.c:84
+=======
+#: ../mail/mail-ops.c:86
+>>>>>>> master
 #, fuzzy
 msgid "Filtering Selected Messages"
 msgstr "&Scrios Teachtaireachtaí Roghnaithe"
 
+<<<<<<< HEAD
 #: ../mail/mail-ops.c:204
+=======
+#: ../mail/mail-ops.c:206
+>>>>>>> master
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "&Seol Ríomhphost Go..."
 
+<<<<<<< HEAD
 #: ../mail/mail-ops.c:786
+=======
+#: ../mail/mail-ops.c:842
+>>>>>>> master
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Teachtaireacht %d as %d á seoladh"
 
+<<<<<<< HEAD
 #: ../mail/mail-ops.c:834
+=======
+#: ../mail/mail-ops.c:890
+>>>>>>> master
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Theip ar sheoladh %d as %d teachtaireacht"
 
+<<<<<<< HEAD
 #: ../mail/mail-ops.c:838 ../mail/mail-send-recv.c:824
 msgid "Canceled."
 msgstr "Cealaithe."
@@ -12243,54 +23282,98 @@ msgid "Complete."
 msgstr "Críochnaithe."
 
 #: ../mail/mail-ops.c:950
+=======
+#: ../mail/mail-ops.c:894 ../mail/mail-send-recv.c:837
+msgid "Canceled."
+msgstr "Cealaithe."
+
+#: ../mail/mail-ops.c:896 ../mail/mail-send-recv.c:839
+msgid "Complete."
+msgstr "Críochnaithe."
+
+#: ../mail/mail-ops.c:1006
+>>>>>>> master
 #, fuzzy, c-format
 msgid "Moving messages to '%s'"
 msgstr "Teachtaireachtaí á mbogadh go %s"
 
+<<<<<<< HEAD
 #: ../mail/mail-ops.c:951
+=======
+#: ../mail/mail-ops.c:1007
+>>>>>>> master
 #, fuzzy, c-format
 msgid "Copying messages to '%s'"
 msgstr "Teachtaireachtaí á gcóipeáil go %s"
 
+<<<<<<< HEAD
 #: ../mail/mail-ops.c:1068
+=======
+#: ../mail/mail-ops.c:1125
+>>>>>>> master
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Fillteán '%s' á stóráil"
 
+<<<<<<< HEAD
 #: ../mail/mail-ops.c:1142
+=======
+#: ../mail/mail-ops.c:1200
+>>>>>>> master
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail-ops.c:1143
+=======
+#: ../mail/mail-ops.c:1201
+>>>>>>> master
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Cuntas '%s' á stóráil"
 
+<<<<<<< HEAD
 #: ../mail/mail-ops.c:1205
+=======
+#: ../mail/mail-ops.c:1263
+>>>>>>> master
 #, fuzzy, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Fillteán á athnuachan"
 
+<<<<<<< HEAD
 #: ../mail/mail-ops.c:1383
+=======
+#: ../mail/mail-ops.c:1453
+>>>>>>> master
 #, fuzzy, c-format
 msgid "Expunging folder '%s'"
 msgstr "Fillteán á ghlanadh"
 
+<<<<<<< HEAD
 #: ../mail/mail-ops.c:1456
+=======
+#: ../mail/mail-ops.c:1538
+>>>>>>> master
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Bruscar i '%s' á fholmhú"
 
+<<<<<<< HEAD
 #: ../mail/mail-ops.c:1457
 msgid "Local Folders"
 msgstr "Fillteáin Logánta"
 
 #: ../mail/mail-ops.c:1555
+=======
+#: ../mail/mail-ops.c:1640
+>>>>>>> master
 #, fuzzy, c-format
 msgid "Disconnecting %s"
 msgstr "Ag dínasc ó %s"
 
+<<<<<<< HEAD
 #: ../mail/mail-send-recv.c:197
 msgid "Canceling..."
 msgstr "� Chealú..."
@@ -12312,31 +23395,74 @@ msgid "Waiting..."
 msgstr "Ag Feitheamh..."
 
 #: ../mail/mail-send-recv.c:943
+=======
+#: ../mail/mail-send-recv.c:198
+msgid "Canceling..."
+msgstr "� Chealú..."
+
+#: ../mail/mail-send-recv.c:454
+msgid "Send & Receive Mail"
+msgstr "Seol & Faigh Post"
+
+#: ../mail/mail-send-recv.c:470
+msgid "Cancel _All"
+msgstr "Cealaigh _Gach Rud"
+
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:979
+msgid "Updating..."
+msgstr "� Nuashonrú..."
+
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:691
+msgid "Waiting..."
+msgstr "Ag Feitheamh..."
+
+#: ../mail/mail-send-recv.c:959
+>>>>>>> master
 #, c-format
 msgid "Checking for new mail"
 msgstr "Lorg poist nua"
 
+<<<<<<< HEAD
 #: ../mail/mail-tools.c:71
+=======
+#: ../mail/mail-tools.c:72
+>>>>>>> master
 #, fuzzy, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "Níl an chomhadlann (%1) ann. Cruthaigh?"
 
+<<<<<<< HEAD
 #: ../mail/mail-tools.c:105
+=======
+#: ../mail/mail-tools.c:106
+>>>>>>> master
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail-tools.c:214
+=======
+#: ../mail/mail-tools.c:215
+>>>>>>> master
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "Teachtaireacht Curtha Ar Aghaidh"
 
+<<<<<<< HEAD
 #: ../mail/mail-tools.c:216
+=======
+#: ../mail/mail-tools.c:217
+>>>>>>> master
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Teachtaireacht Curtha Ar Aghaidh"
 
+<<<<<<< HEAD
 #: ../mail/mail-vfolder.c:87
+=======
+#: ../mail/mail-vfolder.c:92
+>>>>>>> master
 #, fuzzy, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "cuardaigh sa bhfillteán sonraithe"
@@ -12351,7 +23477,11 @@ msgstr "_Brabhsáil le fillteáin eile"
 #. * 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.
+<<<<<<< HEAD
 #: ../mail/mail-vfolder.c:660
+=======
+#: ../mail/mail-vfolder.c:678
+>>>>>>> master
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12367,11 +23497,19 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
+<<<<<<< HEAD
 #: ../mail/mail-vfolder.c:1259
 msgid "Edit Search Folder"
 msgstr "Cuir Fillteán Cuardaigh in Eagar"
 
 #: ../mail/mail-vfolder.c:1373
+=======
+#: ../mail/mail-vfolder.c:1314
+msgid "Edit Search Folder"
+msgstr "Cuir Fillteán Cuardaigh in Eagar"
+
+#: ../mail/mail-vfolder.c:1423
+>>>>>>> master
 msgid "New Search Folder"
 msgstr "Fillteán Cuardaigh Nua"
 
@@ -12676,35 +23814,67 @@ msgstr "theip ar oscailt leabhar"
 
 #: ../mail/mail.error.xml.h:66
 #, fuzzy
+<<<<<<< HEAD
 msgid "Failed to remove attachments from messages."
 msgstr "Theip ar sheoladh %d as %d teachtaireacht"
 
 #: ../mail/mail.error.xml.h:67
+=======
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr ""
+"Freastalaí á chuardach le haghaidh liosta mheicníochtaí fíordheimhnithe "
+"tacaithe."
+
+#: ../mail/mail.error.xml.h:67
+#, fuzzy
+msgid "Failed to remove attachments from messages."
+msgstr "Theip ar sheoladh %d as %d teachtaireacht"
+
+#: ../mail/mail.error.xml.h:68
+>>>>>>> master
 #, fuzzy
 msgid "Failed to retrieve messages."
 msgstr "Ní féidir an teachtaireacht a rá"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:68
+=======
+#: ../mail/mail.error.xml.h:69
+>>>>>>> master
 #, fuzzy
 msgid "Failed to save messages to disk."
 msgstr "Theip ar sheoladh %d as %d teachtaireacht"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:69
+=======
+#: ../mail/mail.error.xml.h:70
+>>>>>>> master
 #, fuzzy
 msgid "Failed to unsubscribe from folder."
 msgstr "Díliostáil ó fhillteán \"%s\" i ndáiríre?"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:70
+=======
+#: ../mail/mail.error.xml.h:71
+>>>>>>> master
 #, fuzzy
 msgid "File exists but cannot overwrite it."
 msgstr "Tá comhad ainmnithe \"%1\" ann cheana. Forscríobh?"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:71
+=======
+#: ../mail/mail.error.xml.h:72
+>>>>>>> master
 #, fuzzy
 msgid "File exists but is not a regular file."
 msgstr "Tá %1 ann ach ní gnáthchomhad é."
 
 #. Translators: {0} is replaced with a folder name
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:73
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr ""
@@ -12714,55 +23884,106 @@ msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:75
+=======
+#: ../mail/mail.error.xml.h:74
+msgid "Folder '{0}' doesn't contain any duplicate message."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:75
+msgid "If you continue, you will not be able to recover these messages."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:76
+>>>>>>> master
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:76
+=======
+#: ../mail/mail.error.xml.h:77
+>>>>>>> master
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:77
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:78
+=======
+#: ../mail/mail.error.xml.h:78
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:79
+>>>>>>> master
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:80
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:81
+=======
+#: ../mail/mail.error.xml.h:81
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:82
+>>>>>>> master
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:82
 msgid "Ignore"
 msgstr "Tabhair Neamhaird Air"
 
 #: ../mail/mail.error.xml.h:83
+=======
+#: ../mail/mail.error.xml.h:83
+msgid "Ignore"
+msgstr "Tabhair Neamhaird Air"
+
+#: ../mail/mail.error.xml.h:84
+>>>>>>> master
 #, fuzzy
 msgid "Invalid authentication"
 msgstr "Name=Fíordheimhniú"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:84
 msgid "Mail Deletion Failed"
 msgstr "Theip ar Scriosadh Poist"
 
 #: ../mail/mail.error.xml.h:85
+=======
+#: ../mail/mail.error.xml.h:85
+msgid "Mail Deletion Failed"
+msgstr "Theip ar Scriosadh Poist"
+
+#: ../mail/mail.error.xml.h:86
+>>>>>>> master
 #, fuzzy
 msgid "Mail filters automatically updated."
 msgstr "Ionsáigh pictúir atá ann cheana ó comhad eile"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:86
+=======
+#: ../mail/mail.error.xml.h:87
+>>>>>>> master
 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 "
@@ -12770,27 +23991,44 @@ msgid ""
 "recipient."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:87
+=======
+#: ../mail/mail.error.xml.h:88
+>>>>>>> master
 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 ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:88
 msgid "Missing folder."
 msgstr "Fillteán ar iarraidh."
 
 #: ../mail/mail.error.xml.h:90
+=======
+#: ../mail/mail.error.xml.h:89
+msgid "Missing folder."
+msgstr "Fillteán ar iarraidh."
+
+#: ../mail/mail.error.xml.h:91
+>>>>>>> master
 #, fuzzy
 msgid "N_ever"
 msgstr "Riamh"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:91
+=======
+#: ../mail/mail.error.xml.h:92
+>>>>>>> master
 #, fuzzy
 msgid "No duplicate messages found."
 msgstr "Aimsíodh teachtaireachtaí gan chríochnú"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:92
 msgid "No sources selected."
 msgstr "Níor roghnaíodh aon fhoinse."
@@ -12808,18 +24046,42 @@ msgid "Please enable the account or send using another account."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:96
+=======
+#: ../mail/mail.error.xml.h:93
+msgid "No sources selected."
+msgstr "Níor roghnaíodh aon fhoinse."
+
+#: ../mail/mail.error.xml.h:94
+msgid "Opening too many messages at once may take a long time."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:95
+msgid "Please check your account settings and try again."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:96
+msgid "Please enable the account or send using another account."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:97
+>>>>>>> master
 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 ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:97
+=======
+#: ../mail/mail.error.xml.h:98
+>>>>>>> master
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
 "{0}"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:99
 msgid "Please provide an unique name to identify this signature."
 msgstr ""
@@ -12833,49 +24095,97 @@ msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:102
+=======
+#: ../mail/mail.error.xml.h:100
+msgid "Please provide an unique name to identify this signature."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:101
+msgid "Please wait."
+msgstr "Fan go fóill, le do thoil."
+
+#: ../mail/mail.error.xml.h:102
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:103
+>>>>>>> master
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Freastalaí á chuardach le haghaidh liosta mheicníochtaí fíordheimhnithe "
 "tacaithe."
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:103
+=======
+#: ../mail/mail.error.xml.h:104
+>>>>>>> master
 #, fuzzy
 msgid "Read receipt requested."
 msgstr "cruthaigh an fillteán iarrtha"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:104
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:105
+=======
+#: ../mail/mail.error.xml.h:105
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:106
+>>>>>>> master
 #, fuzzy
 msgid "Really delete folder \"{0}\"?"
 msgstr "Ní féidir leat fillteán caighdeánach a scriosadh."
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:106
+=======
+#: ../mail/mail.error.xml.h:107
+>>>>>>> master
 #, fuzzy
 msgid "Remove duplicate messages?"
 msgstr "Bain Gníomh"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:107
+=======
+#: ../mail/mail.error.xml.h:108
+>>>>>>> master
 #, fuzzy
 msgid "Reply _Privately"
 msgstr "_Príobháideach"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:110
+=======
+#: ../mail/mail.error.xml.h:111
+>>>>>>> master
 #, fuzzy
 msgid "Search Folders automatically updated."
 msgstr "Roghnaigh na fillteáin atá le cuardach:"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:111
 msgid "Send private reply?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:112
+=======
+#: ../mail/mail.error.xml.h:112
+msgid "Send private reply?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:113
+>>>>>>> master
 #, fuzzy
 msgid "Send reply to all recipients?"
 msgstr "Seoltóir nó Faighteoirí"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:113
 msgid "Signature Already Exists"
 msgstr "Tá an Síniú Ann Cheana"
@@ -12885,12 +24195,27 @@ msgid "Synchronize folders locally for offline usage?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:115
+=======
+#: ../mail/mail.error.xml.h:114
+msgid "Signature Already Exists"
+msgstr "Tá an Síniú Ann Cheana"
+
+#: ../mail/mail.error.xml.h:115
+msgid "Synchronize folders locally for offline usage?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:116
+>>>>>>> master
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:116
+=======
+#: ../mail/mail.error.xml.h:117
+>>>>>>> master
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -12900,84 +24225,145 @@ msgid ""
 "recipient. "
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:119
+=======
+#: ../mail/mail.error.xml.h:120
+>>>>>>> master
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:121
+=======
+#: ../mail/mail.error.xml.h:122
+>>>>>>> master
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:124
 msgid "The script file must exist and be executable."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:125
+=======
+#: ../mail/mail.error.xml.h:125
+msgid "The script file must exist and be executable."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:126
+>>>>>>> master
 #, fuzzy
 msgid "These messages are not copies."
 msgstr "Teachtaireacht mar Ghnáth-théacs"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:126
+=======
+#: ../mail/mail.error.xml.h:127
+>>>>>>> master
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:128
+=======
+#: ../mail/mail.error.xml.h:129
+>>>>>>> master
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:129
+=======
+#: ../mail/mail.error.xml.h:130
+>>>>>>> master
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:130
+=======
+#: ../mail/mail.error.xml.h:131
+>>>>>>> master
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:131
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:132
+=======
+#: ../mail/mail.error.xml.h:132
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:133
+>>>>>>> master
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:133
+=======
+#: ../mail/mail.error.xml.h:134
+>>>>>>> master
 #, fuzzy
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Níl aon teachtaireacht ann san fhillteán seo."
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:134
 msgid "Unable to connect to the GroupWise server."
 msgstr "Ní féidir nasc leis an bhfreastalaí GroupWise."
 
 #: ../mail/mail.error.xml.h:135
+=======
+#: ../mail/mail.error.xml.h:135
+msgid "Unable to connect to the GroupWise server."
+msgstr "Ní féidir nasc leis an bhfreastalaí GroupWise."
+
+#: ../mail/mail.error.xml.h:136
+>>>>>>> master
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:136
 msgid "Unable to read license file."
 msgstr "Ní féidir comhad ceadúnais a léamh."
 
 #: ../mail/mail.error.xml.h:137
+=======
+#: ../mail/mail.error.xml.h:137
+msgid "Unable to read license file."
+msgstr "Ní féidir comhad ceadúnais a léamh."
+
+#: ../mail/mail.error.xml.h:138
+>>>>>>> master
 #, fuzzy
 msgid "Unable to retrieve message."
 msgstr "Ní féidir an teachtaireacht a rá"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:138
 msgid "Use _Default"
 msgstr "Úsáid _Réamhshocrú"
@@ -12999,18 +24385,46 @@ msgid ""
 msgstr ""
 
 #: ../mail/mail.error.xml.h:142
+=======
+#: ../mail/mail.error.xml.h:139
+msgid "Use _Default"
+msgstr "Úsáid _Réamhshocrú"
+
+#: ../mail/mail.error.xml.h:140
+msgid "Use default drafts folder?"
+msgstr "Úsáid fillteán dréachtaí réamhshocraithe?"
+
+#: ../mail/mail.error.xml.h:141
+#, fuzzy
+msgid "Would you like to close the message window?"
+msgstr "Ar mhaith leat an chluiche seo a shábháil?"
+
+#: ../mail/mail.error.xml.h:142
+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 ""
+
+#: ../mail/mail.error.xml.h:143
+>>>>>>> master
 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 ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:143
+=======
+#: ../mail/mail.error.xml.h:144
+>>>>>>> master
 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 ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:144
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Níl ceadanna go leor agat an post seo a scriosadh."
@@ -13036,21 +24450,57 @@ msgid "You must specify a folder."
 msgstr "Ní mór duit fillteán a shonrú."
 
 #: ../mail/mail.error.xml.h:150
+=======
+#: ../mail/mail.error.xml.h:145
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "Níl ceadanna go leor agat an post seo a scriosadh."
+
+#: ../mail/mail.error.xml.h:146
+msgid "You have not filled in all of the required information."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:147
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:148
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:149
+msgid "You must name this Search Folder."
+msgstr "Ní mór duit an Fillteán Cuardaigh a ainmniú."
+
+#: ../mail/mail.error.xml.h:150
+msgid "You must specify a folder."
+msgstr "Ní mór duit fillteán a shonrú."
+
+#: ../mail/mail.error.xml.h:151
+>>>>>>> master
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:152
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:153
+=======
+#: ../mail/mail.error.xml.h:153
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:154
+>>>>>>> master
 #, fuzzy
 msgid "_Always"
 msgstr "I gCónaí"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:154
 msgid "_Append"
 msgstr "_Iarcheangail"
@@ -13070,38 +24520,84 @@ msgid "_Empty Trash"
 msgstr "_Folmhaigh Bruscar"
 
 #: ../mail/mail.error.xml.h:158
+=======
+#: ../mail/mail.error.xml.h:155
+msgid "_Append"
+msgstr "_Iarcheangail"
+
+#: ../mail/mail.error.xml.h:156
+#: ../plugins/publish-calendar/publish-calendar.c:619
+msgid "_Disable"
+msgstr "_Díchumasaigh"
+
+#: ../mail/mail.error.xml.h:157
+msgid "_Discard changes"
+msgstr "Cuir athruithe i _leataobh"
+
+#: ../mail/mail.error.xml.h:158
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
+msgid "_Empty Trash"
+msgstr "_Folmhaigh Bruscar"
+
+#: ../mail/mail.error.xml.h:159
+>>>>>>> master
 #, fuzzy
 msgid "_Exit Evolution"
 msgstr "Evolution"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:159
 msgid "_Expunge"
 msgstr "_Glan"
 
 #: ../mail/mail.error.xml.h:160
+=======
+#: ../mail/mail.error.xml.h:160
+msgid "_Expunge"
+msgstr "_Glan"
+
+#: ../mail/mail.error.xml.h:161
+>>>>>>> master
 #, fuzzy
 msgid "_Migrate Now"
 msgstr "Cumraíocht"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:161
+=======
+#: ../mail/mail.error.xml.h:162
+>>>>>>> master
 #, fuzzy
 msgid "_No"
 msgstr "Ná Déan"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:162
 msgid "_Open Messages"
 msgstr "_Oscail Teachtaireachtaí"
 
 #: ../mail/mail.error.xml.h:165
+=======
+#: ../mail/mail.error.xml.h:163
+msgid "_Open Messages"
+msgstr "_Oscail Teachtaireachtaí"
+
+#: ../mail/mail.error.xml.h:166
+>>>>>>> master
 #, fuzzy
 msgid "_Send Receipt"
 msgstr "&Ná seol admháil léite riamh"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:166
+=======
+#: ../mail/mail.error.xml.h:167
+>>>>>>> master
 #, fuzzy
 msgid "_Synchronize"
 msgstr "Sioncronaigh"
 
+<<<<<<< HEAD
 #: ../mail/mail.error.xml.h:167
 msgid "_Yes"
 msgstr ""
@@ -13151,10 +24647,62 @@ msgid "Highest"
 msgstr "Is Airde"
 
 #: ../mail/message-list.c:1836 ../widgets/table/e-cell-date.c:46
+=======
+#: ../mail/mail.error.xml.h:168
+msgid "_Yes"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:169
+msgid "{0}"
+msgstr "{0}"
+
+#: ../mail/message-list.c:1261
+msgid "Unseen"
+msgstr "Gan Fheiceáil"
+
+#: ../mail/message-list.c:1262
+msgid "Seen"
+msgstr "Feicthe"
+
+#: ../mail/message-list.c:1263
+msgid "Answered"
+msgstr "Freagartha"
+
+#: ../mail/message-list.c:1264
+msgid "Forwarded"
+msgstr "Curtha ar Aghaidh"
+
+#: ../mail/message-list.c:1265
+msgid "Multiple Unseen Messages"
+msgstr "Teachtaireachtaí gan Fheiceáil Iomadúla"
+
+#: ../mail/message-list.c:1266
+msgid "Multiple Messages"
+msgstr "Teachtaireachtaí Iomadúla"
+
+#: ../mail/message-list.c:1270
+msgid "Lowest"
+msgstr "Is �sle"
+
+#: ../mail/message-list.c:1271
+msgid "Lower"
+msgstr "Níos �sle"
+
+#: ../mail/message-list.c:1275
+msgid "Higher"
+msgstr "Níos Airde"
+
+#: ../mail/message-list.c:1276
+msgid "Highest"
+msgstr "Is Airde"
+
+#: ../mail/message-list.c:1909 ../widgets/table/e-cell-date.c:51
+>>>>>>> master
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
+<<<<<<< HEAD
 #. in 12-hour format, without seconds.
 #: ../mail/message-list.c:1843 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
@@ -13177,10 +24725,35 @@ msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
 #: ../mail/message-list.c:2656
+=======
+#. * in 12-hour format, without seconds.
+#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:205
+msgid "Today %l:%M %p"
+msgstr "Inniu %l:%M %p"
+
+#: ../mail/message-list.c:1925
+msgid "Yesterday %l:%M %p"
+msgstr "Inné %l:%M %p"
+
+#: ../mail/message-list.c:1937
+msgid "%a %l:%M %p"
+msgstr "%a %l:%M %p"
+
+#: ../mail/message-list.c:1945
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %l:%M %p"
+
+#: ../mail/message-list.c:1947
+msgid "%b %d %Y"
+msgstr "%d %b %Y"
+
+#: ../mail/message-list.c:2752
+>>>>>>> master
 #, fuzzy
 msgid "Select all visible messages"
 msgstr "Taispeáin gach rabhadh"
 
+<<<<<<< HEAD
 #: ../mail/message-list.c:2814 ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Teachtaireachtaí"
@@ -13191,12 +24764,34 @@ msgid "Generating message list"
 msgstr "Liosta teachtaireachtaí á ghiniúint"
 
 #: ../mail/message-list.c:4721
+=======
+#: ../mail/message-list.c:2912 ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Teachtaireachtaí"
+
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:4160
+#, fuzzy
+msgid "Follow-up"
+msgstr "Teachtaireacht leantach go %s%s?"
+
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:4675 ../mail/message-list.c:5098
+msgid "Generating message list"
+msgstr "Liosta teachtaireachtaí á ghiniúint"
+
+#: ../mail/message-list.c:4912
+>>>>>>> master
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../mail/message-list.c:4723
+=======
+#: ../mail/message-list.c:4914
+>>>>>>> master
 msgid "There are no messages in this folder."
 msgstr "Níl aon teachtaireacht ann san fhillteán seo."
 
@@ -13226,7 +24821,11 @@ msgid "Sent Messages"
 msgstr "Teachtaireachtaí Seolta"
 
 #: ../mail/message-list.etspec.h:16
+<<<<<<< HEAD
 #: ../widgets/misc/e-attachment-tree-view.c:568
+=======
+#: ../widgets/misc/e-attachment-tree-view.c:572
+>>>>>>> master
 msgid "Size"
 msgstr "Méid"
 
@@ -13236,6 +24835,7 @@ msgid "Subject - Trimmed"
 msgstr "Gan ábhar"
 
 #: ../mail/searchtypes.xml.h:1
+<<<<<<< HEAD
 #: ../modules/mail/e-mail-shell-view-actions.c:1555
 msgid "Body contains"
 msgstr "Corp ina bhfuil"
@@ -13259,11 +24859,309 @@ msgstr "Seoltóir ina bhfuil"
 #: ../modules/mail/e-mail-shell-view-actions.c:1583
 msgid "Subject contains"
 msgstr "�bhar ina bhfuil"
+=======
+#: ../modules/mail/e-mail-shell-view-actions.c:1562
+msgid "Body contains"
+msgstr "Corp ina bhfuil"
+
+#: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1569
+msgid "Message contains"
+msgstr "Teachtaireacht ina bhfuil"
+
+#: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1576
+msgid "Recipients contain"
+msgstr "Faighteoirí ina bhfuil"
+
+#: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
+msgid "Sender contains"
+msgstr "Seoltóir ina bhfuil"
+
+#: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1590
+msgid "Subject contains"
+msgstr "�bhar ina bhfuil"
 
 #: ../mail/searchtypes.xml.h:6
 msgid "Subject or Addresses contains"
 msgstr "�bhar nó Seoltaí ina bhfuil"
 
+#: ../modules/addressbook/addressbook-config.c:207
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+
+#: ../modules/addressbook/addressbook-config.c:209
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+
+#: ../modules/addressbook/addressbook-config.c:211
+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 ""
+
+#: ../modules/addressbook/addressbook-config.c:641
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "Úsáid san _fhéilire Breithlaethanta & Cothroim Lae"
+
+#: ../modules/addressbook/addressbook-config.c:683
+msgid "Copy _book content locally for offline operation"
+msgstr "Cóipeáil ábhar an _leabhair go logánta chun oibríochta as líne"
+
+#: ../modules/addressbook/addressbook-config.c:798
+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 ""
+
+#: ../modules/addressbook/addressbook-config.c:879
+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 ""
+
+#: ../modules/addressbook/addressbook-config.c:962
+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 ""
+
+#: ../modules/addressbook/addressbook-config.c:1086
+msgid "Server Information"
+msgstr "Eolas faoin bhFreastalaí"
+
+#: ../modules/addressbook/addressbook-config.c:1091
+#: ../smime/gui/smime-ui.ui.h:13
+msgid "Details"
+msgstr "Mionsonraí"
+
+#: ../modules/addressbook/addressbook-config.c:1092
+#: ../modules/mail/e-mail-shell-view.c:58
+msgid "Searching"
+msgstr "� chuardach"
+
+#: ../modules/addressbook/addressbook-config.c:1094
+msgid "Downloading"
+msgstr "� íosluchtú"
+
+#: ../modules/addressbook/addressbook-config.c:1309
+msgid "Address Book Properties"
+msgstr "Airíonna an Leabhar Seoltaí"
+
+#: ../modules/addressbook/addressbook-config.c:1311
+msgid "New Address Book"
+msgstr "Leabhar Seoltaí Nua"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
+#, fuzzy
+msgid "Contact layout style"
+msgstr "Liosta Teagmhálacha"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
+msgid "Contact preview pane position (horizontal)"
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
+msgid "Contact preview pane position (vertical)"
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "EFolderList XML for the list of completion URIs"
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid "EFolderList XML for the list of completion URIs."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+#, fuzzy
+msgid "Primary address book"
+msgstr "leabhar seoltaí evolution"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+msgid "Show autocompleted name with an address"
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+#, fuzzy
+msgid "Show maps"
+msgstr "Taispeán Beocháin"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid "Show preview pane"
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid ""
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+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 ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+msgid "URI for the folder last used in the select names dialog"
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
+msgid "URI for the folder last used in the select names dialog."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+#, fuzzy
+msgid "Whether to show maps in preview pane."
+msgstr "Taispeáin an pána \"Réamhamharc\""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
+msgid "Whether to show the preview pane."
+msgstr ""
+
+#. 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:194
+#: ../modules/mail/em-mailer-prefs.c:1049
+msgid "_Table column:"
+msgstr "Colún an _tábla:"
+
+#: ../modules/addressbook/autocompletion-config.c:197
+msgid "Autocompletion"
+msgstr "Comhlánú Uathoibríoch"
+
+#: ../modules/addressbook/autocompletion-config.c:200
+msgid "Always _show address of the autocompleted contact"
+msgstr "Taispeáin _seoladh na teagmhála a gcomhlánaíodh go huathoibríoch"
+
+#. Create the LDAP source group
+#: ../modules/addressbook/e-book-shell-backend.c:102
+#: ../modules/addressbook/e-book-shell-migrate.c:154
+msgid "On LDAP Servers"
+msgstr "Ar Fhreastalaithe LDAP"
+
+#: ../modules/addressbook/e-book-shell-backend.c:302
+msgctxt "New"
+msgid "_Contact"
+msgstr "Te_agmháil"
+
+#: ../modules/addressbook/e-book-shell-backend.c:304
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
+msgid "Create a new contact"
+msgstr "Cruthaigh teaghmháil nua"
+
+#: ../modules/addressbook/e-book-shell-backend.c:309
+msgctxt "New"
+msgid "Contact _List"
+msgstr "Liosta Tea_gmhálacha"
+
+#: ../modules/addressbook/e-book-shell-backend.c:311
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
+msgid "Create a new contact list"
+msgstr "Cruthaigh liosta tadhaill nua"
+
+#: ../modules/addressbook/e-book-shell-backend.c:319
+msgctxt "New"
+msgid "Address _Book"
+msgstr "_Leabhar Seoltaí"
+
+#: ../modules/addressbook/e-book-shell-backend.c:321
+#: ../modules/addressbook/e-book-shell-view-actions.c:835
+msgid "Create a new address book"
+msgstr "Cruthaigh leabhar seoltaí nua"
+
+#. Create the contacts group
+#: ../modules/addressbook/e-book-shell-backend.c:338
+#: ../modules/addressbook/e-book-shell-view.c:405
+#: ../modules/calendar/e-cal-shell-backend.c:115
+#: ../modules/calendar/e-cal-shell-migrate.c:63
+#: ../modules/online-accounts/e-online-accounts-google.c:366
+msgid "Contacts"
+msgstr "Teagmhálacha"
+
+#: ../modules/addressbook/e-book-shell-backend.c:348
+msgid "Certificates"
+msgstr "Teastais"
+
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:387
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
+msgid "Save as vCard"
+msgstr "Sábháil mar vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
+msgid "Co_py All Contacts To..."
+msgstr "Cói_peáil Gach Teagmháil Go..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#, fuzzy
+msgid "Copy the contacts of the selected address book to another"
+msgstr "Post an sceál seo"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
+msgid "D_elete Address Book"
+msgstr "Scrios _Leabhar Seoltaí"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
+msgid "Delete the selected address book"
+msgstr "Scrios an leabhar seoltaí roghnaithe"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
+msgid "Mo_ve All Contacts To..."
+msgstr "Bog Gach _Teagmháil Go..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
+#, fuzzy
+msgid "Move the contacts of the selected address book to another"
+msgstr "Post an sceál seo"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:833
+msgid "_New Address Book"
+msgstr "Leabhar Seoltaí _Nua"
+>>>>>>> master
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
+msgid "Address _Book Properties"
+msgstr "Airíonna an _Leabhair Seoltaí"
+
+<<<<<<< HEAD
 #: ../modules/addressbook/addressbook-config.c:205
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
@@ -15278,34 +27176,1870 @@ msgid "%d selected"
 msgstr ", %d roghnaithe"
 
 #: ../modules/calendar/e-memo-shell-view.c:223
+=======
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
+#, fuzzy
+msgid "Show properties of the selected address book"
+msgstr "Airíonna an mhodúil/phoirt roghnaithe:"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
+#, fuzzy
+msgid "Address Book _Map"
+msgstr "Leabhar Seoltaí"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#, fuzzy
+msgid "Show map with all contacts from selected address book"
+msgstr "Post an sceál seo"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:854
+#: ../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
+msgid "_Rename..."
+msgstr "Atha_inmnigh..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
+#, fuzzy
+msgid "Rename the selected address book"
+msgstr "Athainmnigh an fillteán roghnaithe"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#, fuzzy
+msgid "Stop loading"
+msgstr "Stad Luchtú"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
+msgid "_Copy Contact To..."
+msgstr "Cóip_eáil Teagmháil Go..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#, fuzzy
+msgid "Copy selected contacts to another address book"
+msgstr "Cóipeáil Teagmhálacha Roghnaithe go Fillteán Eile..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
+msgid "_Delete Contact"
+msgstr "Scr_ios Teagmháil"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:882
+msgid "_Find in Contact..."
+msgstr "_Aimsigh i dTeagmháil..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
+msgid "Search for text in the displayed contact"
+msgstr ""
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:889
+msgid "_Forward Contact..."
+msgstr "Cuir Teagmháil ar _Aghaidh..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
+msgid "Send selected contacts to another person"
+msgstr "Seol teagmhálacha roghnaithe chuig duine eile"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
+msgid "_Move Contact To..."
+msgstr "_Bog Teagmháil Go..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
+msgid "Move selected contacts to another address book"
+msgstr "Bog teagmhálacha roghnaithe go leabhar seoltaí eile"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
+msgid "_New Contact..."
+msgstr "Teagmháil _Nua..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:910
+msgid "New Contact _List..."
+msgstr "_Liosta Teagmhálacha Nua..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:917
+msgid "_Open Contact"
+msgstr "Oscail _Teagmháil"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
+msgid "View the current contact"
+msgstr "Amharc ar an teagmháil reatha"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:924
+msgid "_Send Message to Contact..."
+msgstr "_Seol Teachtaireacht Chuig Teagmháil..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
+#, fuzzy
+msgid "Send a message to the selected contacts"
+msgstr "Brúigh anseo chun an teachtaireacht a sheoladh"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:933
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-task-shell-view-actions.c:822
+msgid "_Actions"
+msgstr "_Gníomhartha"
+
+#: ../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
+msgid "_Preview"
+msgstr "_Réamhamharc"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../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 "Scr_ios"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
+msgid "_Properties"
+msgstr "_Airíonna"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#, fuzzy
+msgid "Address Book Map"
+msgstr "Leabhar Seoltaí"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
+msgid "Contact _Preview"
+msgstr "_Réamhamharc Teagmhála"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:991
+#, fuzzy
+msgid "Show contact preview window"
+msgstr "Oscail an fhuinneog réamhamhairc priontála"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#, fuzzy
+msgid "Show _Maps"
+msgstr "Taispeáin mar liosta"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:999
+#, fuzzy
+msgid "Show maps in contact preview window"
+msgstr "Oscail an fhuinneog réamhamhairc priontála"
+
+#: ../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
+msgid "_Classic View"
+msgstr "Amharc _Clasaiceach"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1020
+#, fuzzy
+msgid "Show contact preview below the contact list"
+msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
+
+#: ../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
+msgid "_Vertical View"
+msgstr "Amharc _Ingearach"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1027
+#, fuzzy
+msgid "Show contact preview alongside the contact list"
+msgstr "Oscail an fhuinneog réamhamhairc priontála"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../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 "Catagóir ar Bith"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:970
+msgid "Unmatched"
+msgstr "Gan Chomhoiriúnú"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../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:665
+msgid "Advanced Search"
+msgstr "Cuardach Casta"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1085
+#, fuzzy
+msgid "Print all shown contacts"
+msgstr "Priontáil teagmhálacha roghnaithe"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1092
+#, fuzzy
+msgid "Preview the contacts to be printed"
+msgstr "Réamhamharcann sé seo na teagmhálacha le priontáil"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1099
+msgid "Print selected contacts"
+msgstr "Priontáil teagmhálacha roghnaithe"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1114
+msgid "S_ave Address Book as vCard"
+msgstr "Sá_bháil Leabhar Seoltaí mar vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "Sábháil teagmhálacha an leabhar seoltaí roghnaithe mar vCard"
+
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:1122
+#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+msgid "_Save as vCard..."
+msgstr "Sábháil mar _vCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1124
+msgid "Save selected contacts as a vCard"
+msgstr "Sábháil teagmhálacha roghnaithe mar vCard"
+
+#: ../modules/addressbook/e-book-shell-view.c:349
+msgid "_Forward Contacts"
+msgstr "_Cuir Teagmhálacha ar Aghaidh"
+
+#: ../modules/addressbook/e-book-shell-view.c:351
+msgid "_Forward Contact"
+msgstr "_Cuir Teagmháil ar Aghaidh"
+
+#: ../modules/addressbook/e-book-shell-view.c:382
+msgid "_Send Message to Contacts"
+msgstr "_Seol Teachtaireacht Chuig Teagmhálacha"
+
+#: ../modules/addressbook/e-book-shell-view.c:384
+msgid "_Send Message to List"
+msgstr "_Seol Teachtaireacht Chuig Liosta"
+
+#: ../modules/addressbook/e-book-shell-view.c:386
+msgid "_Send Message to Contact"
+msgstr "_Seol Teachtaireacht Chuig Teagmháil"
+
+#: ../modules/addressbook/eab-composer-util.c:149
+msgid "Multiple vCards"
+msgstr "vCardanna Iomadúla"
+
+#: ../modules/addressbook/eab-composer-util.c:157
+#, c-format
+msgid "vCard for %s"
+msgstr "vCard do %s"
+
+#: ../modules/addressbook/eab-composer-util.c:169
+#: ../modules/addressbook/eab-composer-util.c:196
+#, c-format
+msgid "Contact information"
+msgstr "Eolas teagmhála"
+
+#: ../modules/addressbook/eab-composer-util.c:198
+#, c-format
+msgid "Contact information for %s"
+msgstr "Eolas teagmhála le %s"
+
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
+msgid "1"
+msgstr "1"
+
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:4
+msgid "5"
+msgstr "5"
+
+#: ../modules/addressbook/ldap-config.ui.h:5
+msgid "Anonymously"
+msgstr ""
+
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../modules/addressbook/ldap-config.ui.h:7
+msgid "B_rowse this book until limit reached"
+msgstr ""
+
+#: ../modules/addressbook/ldap-config.ui.h:8
+msgid "Lo_gin:"
+msgstr "_Logáil Isteach:"
+
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:11
+#, fuzzy
+msgid "One"
+msgstr "Ar Líne"
+
+#: ../modules/addressbook/ldap-config.ui.h:13
+msgid "Search Filter"
+msgstr ""
+
+#: ../modules/addressbook/ldap-config.ui.h:14
+msgid "Search _base:"
+msgstr ""
+
+#: ../modules/addressbook/ldap-config.ui.h:15
+msgid "Search _filter:"
+msgstr ""
+
+#: ../modules/addressbook/ldap-config.ui.h:16
+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 ""
+
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:18
+#, fuzzy
+msgid "Sub"
+msgstr "Do"
+
+#: ../modules/addressbook/ldap-config.ui.h:19
+msgid "Supported Search Bases"
+msgstr ""
+
+#: ../modules/addressbook/ldap-config.ui.h:21
+msgid "Using distinguished name (DN)"
+msgstr ""
+
+#: ../modules/addressbook/ldap-config.ui.h:22
+#, fuzzy
+msgid "Using email address"
+msgstr "_Seoladh Ríomhphoist:"
+
+#: ../modules/addressbook/ldap-config.ui.h:23
+msgid "_Download limit:"
+msgstr ""
+
+#: ../modules/addressbook/ldap-config.ui.h:24
+msgid "_Find Possible Search Bases"
+msgstr ""
+
+#: ../modules/addressbook/ldap-config.ui.h:25
+msgid "_Login method:"
+msgstr ""
+
+#: ../modules/addressbook/ldap-config.ui.h:28
+msgid "_Search scope:"
+msgstr ""
+
+#: ../modules/addressbook/ldap-config.ui.h:30
+msgid "_Timeout:"
+msgstr ""
+
+#: ../modules/addressbook/ldap-config.ui.h:32
+msgid "cards"
+msgstr "cartaí"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:146
+#, fuzzy, c-format
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "theip ar oscailt leabhar"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:164
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr ""
+
+#: ../modules/bogofilter/evolution-bogofilter.c:213
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr ""
+
+#: ../modules/bogofilter/evolution-bogofilter.c:312
+msgid "Bogofilter Options"
+msgstr "Roghanna Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:321
+msgid "Convert message text to _Unicode"
+msgstr "Tiontaigh téacs na teachtaireachta go _Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:477
+#, fuzzy
+msgid "Bogofilter"
+msgstr "Roghanna Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "Tiontaigh teachtaireachtaí poist go Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
+msgid "(Shown in a Day View)"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
+msgid "05 minutes"
+msgstr "05 nóiméad"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
+msgid "10 minutes"
+msgstr "10 nóiméad"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
+msgid "15 minutes"
+msgstr "15 nóiméad"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
+msgid "30 minutes"
+msgstr "30 nóiméad"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
+msgid "60 minutes"
+msgstr "60 nóiméad"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
+msgid "Alerts"
+msgstr "Foláirimh"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
+msgid "Day _ends:"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
+msgid "Days"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Default Free/Busy Server"
+msgstr "Freastalaí Saor/Gnóthach Réamhshocraithe"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
+msgid "Display"
+msgstr "Taispeáin"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#, fuzzy
+msgid "Display reminders in _notification area only"
+msgstr "Taispeáin deilbhín sa limistéar fógartha"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#, fuzzy
+msgid "Hours"
+msgstr "uair"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
+#, fuzzy
+msgid "Minutes"
+msgstr "noimeaíd"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#, fuzzy
+msgid "Publishing Information"
+msgstr "Suíomh réamhshocraithe foilsithe"
+
+#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+msgid "S_un"
+msgstr "_Domh"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
+msgid "Sc_roll Month View by a week"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Se_cond zone:"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
+#, fuzzy
+msgid "Select the calendars for reminder notification"
+msgstr "Eolas féilire"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Sh_ow a reminder"
+msgstr ""
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
+msgid "Show a _reminder"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
+msgid "Show r_ecurring events in italic in bottom left calendar"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
+msgid "Show week _numbers"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "T_asks due today:"
+msgstr ""
+
+#. Thursday
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
+msgid "T_hu"
+msgstr "Déa_r"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
+msgid "Template:"
+msgstr "Teimpléad:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../widgets/misc/e-dateedit.c:592
+msgid "Time"
+msgstr "Am"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
+msgid "Time format:"
+msgstr "Formáid ama:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
+msgid "Use s_ystem time zone"
+msgstr "Úsáid crios ama an chó_rais"
+
+#. A weekday like "Monday" follows
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
+msgid "Wee_k starts on:"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+msgid "Work Week"
+msgstr "Seachtain Oibre"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
+msgid "Work days:"
+msgstr "Laethanta oibre:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "_12 hour (AM/PM)"
+msgstr "_12 uair (AM/PM)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_24 hour"
+msgstr "_24 uair"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
+msgid "_Compress weekends in month view"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
+msgid "_Day begins:"
+msgstr ""
+
+#. Friday
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
+msgid "_Fri"
+msgstr "_Aoine"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
+msgid "_Hide completed tasks after"
+msgstr ""
+
+#. Monday
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+msgid "_Mon"
+msgstr "_Luan"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
+msgid "_Overdue tasks:"
+msgstr ""
+
+#. Saturday
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
+msgid "_Sat"
+msgstr "_Sath"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
+msgid "_Show appointment end times in week and month view"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
+msgid "_Time divisions:"
+msgstr ""
+
+#. Tuesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
+msgid "_Tue"
+msgstr "_Máirt"
+
+#. Wednesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
+msgid "_Wed"
+msgstr "_Céad"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
+msgid "before every anniversary/birthday"
+msgstr ""
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
+msgid "before every appointment"
+msgstr "roimh gach coinne"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+msgid "Ask for confirmation when deleting items"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#, fuzzy
+msgid "Birthday and anniversary reminder"
+msgstr "Breithlaethanta & Cothroim Lae"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+#, fuzzy
+msgid "Birthday and anniversary reminder units"
+msgstr "Breithlaethanta & Cothroim Lae"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+#, fuzzy
+msgid "Birthday and anniversary reminder value"
+msgstr "Breithlaethanta & Cothroim Lae"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+msgid "Calendars to run reminders for"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+msgid "Compress weekends in month view"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+msgid "Confirm expunge"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+msgid "Default appointment reminder"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+msgid "Default reminder units"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+msgid "Default reminder value"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#, fuzzy
+msgid "Directory for saving reminder audio files"
+msgstr "Comhadlann a sábhálfar comhaid uathúla chúltaca inti"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
+msgid "Free/busy server URLs"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+msgid "Free/busy template URL"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+msgid "Hide completed tasks"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+msgid "Hide task units"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+msgid "Hide task value"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+msgid "Horizontal pane position"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#, fuzzy
+msgid "Last reminder time"
+msgstr "Am aláraim is déanaí"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+msgid "List of recently used second time zones in a Day View."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+msgid "List of server URLs for free/busy publishing."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+msgid "Marcus Bains Line"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+msgid "Marcus Bains Line Color - Day View"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+msgid "Marcus Bains Line Color - Time bar"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+msgid "Maximum number of recently used timezones to remember."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+#, fuzzy
+msgid "Memo layout style"
+msgstr "Stíl na hImlíne"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+msgid "Memo preview pane position (horizontal)"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+msgid "Memo preview pane position (vertical)"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+msgid "Minute the workday ends on, 0 to 59."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+msgid "Minute the workday starts on, 0 to 59."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+msgid "Month view horizontal pane position"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+msgid "Month view vertical pane position"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+msgid "Number of units for determining a birthday or anniversary reminder."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+msgid "Number of units for determining a default reminder."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+msgid "Number of units for determining when to hide tasks."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+msgid "Overdue tasks color"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+msgid "Position of the task preview pane when oriented vertically."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+msgid "Primary calendar"
+msgstr "Príomhfhéilire"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+msgid "Primary memo list"
+msgstr "Príomhliosta meamram"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+msgid "Primary task list"
+msgstr "Príomhliosta tascanna"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Programs that are allowed to be run by reminders."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+msgid "Recently used second time zones in a Day View"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+msgid "Recurrent Events in Italic"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#, fuzzy
+msgid "Reminder programs"
+msgstr "Rith roghchlár"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
+msgid "Save directory for reminder audio"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
+msgid "Scroll Month View by a week"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+msgid "Show Role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
+msgid "Show appointment end times in week and month views"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
+msgid "Show categories field in the event/meeting/task editor"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
+msgid "Show days with recurrent events in italic font in bottom left calendar."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
+#, fuzzy
+msgid "Show display reminders in notification tray"
+msgstr "Taispeáin deilbhín sa limistéar fógartha"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
+msgid "Show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
+#, fuzzy
+msgid "Show the memo preview pane"
+msgstr "Taispeáin an pána \"Réamhamharc\""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
+#, fuzzy
+msgid "Show the task preview pane"
+msgstr "Taispeáin an pána \"Réamhamharc\""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
+msgid "Show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
+msgid "Show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
+msgid "Task layout style"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
+msgid "Task preview pane position (horizontal)"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
+msgid "Task preview pane position (vertical)"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
+msgid "Tasks due today color"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
+msgid ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
+msgid ""
+"The UID of the selected (or \"primary\") memo list in the sidebar of the "
+"\"Memos\" view."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+msgid ""
+"The UID of the selected (or \"primary\") task list in the sidebar of the "
+"\"Tasks\" view."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"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 ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
+msgid "The second timezone for a Day View"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
+msgid "Time divisions"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
+msgid "Time the last reminder ran, in time_t."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+msgid "Timezone"
+msgstr "Crios Ama"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
+msgid "Twenty four hour time format"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\"."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
+msgid "Use system timezone"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
+msgid "Vertical pane position"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
+msgid "Week start"
+msgstr "Tosach seachtaine"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
+msgid "Whether or not to use the notification tray for display reminders."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
+msgid "Whether to display the end time of events in the week and month views."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
+msgid "Whether to set a default reminder for appointments."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
+msgid "Whether to set a reminder for birthdays and anniversaries."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
+msgid "Work days"
+msgstr "Laethanta oibre"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
+msgid "Workday end hour"
+msgstr "Uair deiridh an lae oibre"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+msgid "Workday end minute"
+msgstr "Nóiméad deiridh an lae oibre"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+msgid "Workday start hour"
+msgstr "Uair tosaigh an lae oibre"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
+msgid "Workday start minute"
+msgstr "Nóiméad tosaigh an lae oibre"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:312
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "I_mport"
+msgstr "Io_mpórtáil"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:393
+msgid "Select a Calendar"
+msgstr "Roghnaigh Féilire"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:420
+msgid "Select a Task List"
+msgstr "Roghnaigh Liosta Tascanna"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:430
+msgid "I_mport to Calendar"
+msgstr "Io_mpórtáil go Féilire"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:437
+msgid "I_mport to Tasks"
+msgstr "Io_mpórtáil go Tascanna"
+
+#: ../modules/calendar/e-calendar-preferences.c:461
+#, fuzzy
+msgid "Selected Calendars for Reminders"
+msgstr "Post an sceál seo"
+
+#: ../modules/calendar/e-calendar-preferences.c:863
+#, fuzzy
+msgid "Ti_me and date:"
+msgstr "Am agus dáta:"
+
+#: ../modules/calendar/e-calendar-preferences.c:864
+#, fuzzy
+msgid "_Date only:"
+msgstr "Dáta amháin:"
+
+#. Create the Webcal source group
+#: ../modules/calendar/e-cal-shell-backend.c:117
+#: ../modules/calendar/e-cal-shell-migrate.c:198
+#: ../modules/calendar/e-memo-shell-backend.c:104
+#: ../modules/calendar/e-memo-shell-migrate.c:152
+#: ../modules/calendar/e-task-shell-backend.c:104
+#: ../modules/calendar/e-task-shell-migrate.c:164
+msgid "On The Web"
+msgstr "Ar An nGréasán"
+
+#: ../modules/calendar/e-cal-shell-backend.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:127
+msgid "Weather"
+msgstr "Aimsir"
+
+#: ../modules/calendar/e-cal-shell-backend.c:206
+#: ../modules/calendar/e-cal-shell-migrate.c:66
+msgid "Birthdays & Anniversaries"
+msgstr "Breithlaethanta & Cothroim Lae"
+
+#: ../modules/calendar/e-cal-shell-backend.c:439
+msgctxt "New"
+msgid "_Appointment"
+msgstr "_Coinne"
+
+#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+msgid "Create a new appointment"
+msgstr "Cruthaigh coinne nua"
+
+#: ../modules/calendar/e-cal-shell-backend.c:446
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "C_oinne an Lae ar Fad"
+
+#: ../modules/calendar/e-cal-shell-backend.c:448
+msgid "Create a new all-day appointment"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-backend.c:453
+msgctxt "New"
+msgid "M_eeting"
+msgstr "Cr_uinniú"
+
+#: ../modules/calendar/e-cal-shell-backend.c:455
+msgid "Create a new meeting request"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-backend.c:463
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "Fé_ilire"
+
+#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+msgid "Create a new calendar"
+msgstr "Cruthaigh féilire nua"
+
+#: ../modules/calendar/e-cal-shell-backend.c:788
+msgid "Calendar and Tasks"
+msgstr "Féilire agus Tascanna"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:184
+#, fuzzy
+msgid "Loading calendars"
+msgstr "Féilire á Luchtú"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:755
+#, fuzzy
+msgid "_New Calendar..."
+msgstr "Féilire _Nua"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:772
+#, fuzzy
+msgid "Calendar Selector"
+msgstr "Earráid iCalendar"
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-cal-shell-sidebar.c:1123
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "Féilire á oscailt"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
+msgid "Print"
+msgstr "Priontáil"
+
+#: ../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."
+msgstr ""
+
+#. Translators: This is the first part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:337
+msgid "Purge events older than"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:564
+#, fuzzy
+msgid "Copying Items"
+msgstr "Míreanna á gcóipeáil"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:848
+#, fuzzy
+msgid "Moving Items"
+msgstr "Míreanna á mbogadh"
+
+#. Translators: Default filename part saving an event to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-actions.c:1175
+msgid "event"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1177
+#: ../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
+#, fuzzy
+msgid "Save as iCalendar"
+msgstr "Roghnaigh Féilire"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
+msgid "_Copy..."
+msgstr "_Cóipeáil..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#, fuzzy
+msgid "D_elete Calendar"
+msgstr "Roghnaigh Féilire"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#, fuzzy
+msgid "Delete the selected calendar"
+msgstr "Scrios an fillteán roghnaithe"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#, fuzzy
+msgid "Go Back"
+msgstr "Déan Cúltaca"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#, fuzzy
+msgid "Go Forward"
+msgstr "Téigh ar aghaidh"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+msgid "Select today"
+msgstr "Roghnaigh an lá inniu"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+msgid "Select _Date"
+msgstr "Roghnaigh _Dáta"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+msgid "Select a specific date"
+msgstr "Roghnaigh dáta áirithe"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+msgid "_New Calendar"
+msgstr "Féilire _Nua"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-task-shell-view-actions.c:813
+msgid "Purg_e"
+msgstr "Purg_aigh"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+msgid "Purge old appointments and meetings"
+msgstr "Purgaigh seanchoinní agus seanchruinnithe"
+
+#: ../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 "Athn_uaigh"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#, fuzzy
+msgid "Refresh the selected calendar"
+msgstr "Athainmnigh an fillteán roghnaithe"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#, fuzzy
+msgid "Rename the selected calendar"
+msgstr "Athainmnigh an fillteán roghnaithe"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#, fuzzy
+msgid "Show _Only This Calendar"
+msgstr "Taispeáin an Féilire Seo A_mháin"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+msgid "Cop_y to Calendar..."
+msgstr "Cóip_eáil go Féilire..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+msgid "_Delegate Meeting..."
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#, fuzzy
+msgid "_Delete Appointment"
+msgstr "Scrios an choinne seo"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#, fuzzy
+msgid "Delete selected appointments"
+msgstr "Scrios an choinne seo"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#, fuzzy
+msgid "Delete This _Occurrence"
+msgstr "Scrios an tarlú seo"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+msgid "Delete this occurrence"
+msgstr "Scrios an tarlú seo"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#, fuzzy
+msgid "Delete All Occ_urrences"
+msgstr "Scrios _Gach Tarlú"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+msgid "Delete all occurrences"
+msgstr "Scrios gach tarlú"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+#, fuzzy
+msgid "New All Day _Event..."
+msgstr "_Teagmhas an Lae ar Fad Nua"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#, fuzzy
+msgid "Create a new all day event"
+msgstr "Cruthaigh féilire nua"
+
+#: ../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 "_Cuir ar Aghaidh mar iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+#, fuzzy
+msgid "New _Meeting..."
+msgstr "_Cruinniú Nua"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#, fuzzy
+msgid "Create a new meeting"
+msgstr "Cruthaigh meamram nua"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+msgid "Mo_ve to Calendar..."
+msgstr "Bo_g go Féilire..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+msgid "New _Appointment..."
+msgstr "_Coinne Nua..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1489
+msgid "Make this Occurrence _Movable"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+msgid "_Open Appointment"
+msgstr "_Oscail Coinne"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+msgid "View the current appointment"
+msgstr "Amharc ar an gcoinne reatha"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+msgid "_Reply"
+msgstr "_Freagair"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+msgid "_Schedule Meeting..."
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+#, fuzzy
+msgid "Converts an appointment to a meeting"
+msgstr "Purgaigh seanchoinní agus seanchruinnithe"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#, fuzzy
+msgid "Conv_ert to Appointment..."
+msgstr "_Coinne Nua..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+#, fuzzy
+msgid "Converts a meeting to an appointment"
+msgstr "Cruthaigh coinne nua"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+#, fuzzy
+msgid "Quit"
+msgstr "_Scoir"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1651
+msgid "Day"
+msgstr "Lá"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+msgid "Show one day"
+msgstr "Taispeáin lá amháin"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
+msgid "List"
+msgstr "Liosta"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+msgid "Show as list"
+msgstr "Taispeáin mar liosta"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1665
+msgid "Month"
+msgstr "Mí"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+msgid "Show one month"
+msgstr "Taispeáin mí amháin"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1672
+msgid "Week"
+msgstr "Seachtain"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+msgid "Show one week"
+msgstr "Taispeáin seachtain amháin"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1681
+#, fuzzy
+msgid "Show one work week"
+msgstr "Taispeáin seachtain amháin"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+msgid "Active Appointments"
+msgstr "Coinní Gníomhacha"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+msgid "Next 7 Days' Appointments"
+msgstr "Coinní an Chéad 7 Lae Eile"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-memo-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:994
+msgid "Description contains"
+msgstr "Cur síos ina bhfuil"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-memo-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:1001
+msgid "Summary contains"
+msgstr "Achoimre ina bhfuil"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1753
+msgid "Print this calendar"
+msgstr "Priontáil an féilire seo"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+#, fuzzy
+msgid "Preview the calendar to be printed"
+msgstr "Réamhamharcann sé seo an féilire le priontáil"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1782
+#: ../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
+#, fuzzy
+msgid "_Save as iCalendar..."
+msgstr "_Cuir ar Aghaidh mar iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1859
+msgid "Go To"
+msgstr "Téigh Go"
+
+#. 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:217
+#: ../modules/calendar/e-memo-shell-view-actions.c:522
+#, fuzzy
+msgid "memo"
+msgstr "%d mheamram"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
+#, fuzzy
+msgid "New _Memo"
+msgstr "Meamram nua"
+
+#: ../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:656
+msgid "Create a new memo"
+msgstr "Cruthaigh meamram nua"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:661
+msgid "_Open Memo"
+msgstr "_Oscail Meamram"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:269
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
+msgid "View the selected memo"
+msgstr "Amharc ar an meamram roghnaithe"
+
+#: ../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 "Oscail Leathanach _Gréasáin"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:286
+#: ../modules/calendar/e-memo-shell-view-actions.c:828
+#, fuzzy
+msgid "Print the selected memo"
+msgstr "Amharc ar an meamram roghnaithe"
+
+#. Translators: Default filename part saving a task to a file when
+#. * 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:284
+#: ../modules/calendar/e-task-shell-view-actions.c:639
+#, fuzzy
+msgid "task"
+msgstr "%d tasc"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
+#: ../modules/calendar/e-task-shell-view-actions.c:701
+msgid "_Assign Task"
+msgstr "_Sann Tasc"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:778
+msgid "_Mark as Complete"
+msgstr "_Marcáil mar Críochnaithe"
+
+#: ../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 "Marcáil tascanna roghnaithe mar chríochnaithe"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+msgid "_Mark as Incomplete"
+msgstr "_Marcáil mar Gan Chríochnú"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:342
+#: ../modules/calendar/e-task-shell-view-actions.c:787
+#, fuzzy
+msgid "Mark selected tasks as incomplete"
+msgstr "Marcáil tascanna roghnaithe mar chríochnaithe"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:792
+msgid "New _Task"
+msgstr "_Tasc Nua"
+
+#: ../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:794
+msgid "Create a new task"
+msgstr "Cruthaigh tasc nua"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
+#: ../modules/calendar/e-task-shell-view-actions.c:799
+msgid "_Open Task"
+msgstr "_Oscail Tasc"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
+#: ../modules/calendar/e-task-shell-view-actions.c:801
+msgid "View the selected task"
+msgstr "Amharc ar an dtasc roghnaithe"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-task-shell-view-actions.c:1027
+#, fuzzy
+msgid "Print the selected task"
+msgstr "Amharc ar an dtasc roghnaithe"
+
+#: ../modules/calendar/e-memo-shell-backend.c:298
+msgctxt "New"
+msgid "Mem_o"
+msgstr "_Meamram"
+
+#: ../modules/calendar/e-memo-shell-backend.c:305
+msgctxt "New"
+msgid "_Shared Memo"
+msgstr "Comhmh_eamram"
+
+#: ../modules/calendar/e-memo-shell-backend.c:307
+#, fuzzy
+msgid "Create a new shared memo"
+msgstr "Cruthaigh meamram comhroinnte nua"
+
+#: ../modules/calendar/e-memo-shell-backend.c:315
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "Liosta Meam_ram"
+
+#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
+msgid "Create a new memo list"
+msgstr "Cruthaigh liosta meamram nua"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:179
+msgid "Loading memos"
+msgstr "Meamraim á luchtú"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:696
+#, fuzzy
+msgid "Memo List Selector"
+msgstr "Liosta Meamram"
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-memo-shell-sidebar.c:1009
+#, c-format
+msgid "Opening memos at %s"
+msgstr "Meamraim á n-oscailt ag %s"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
+msgid "Print Memos"
+msgstr "Priontáil Meamraim"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#, fuzzy
+msgid "_Delete Memo"
+msgstr "_Scrios Teachtaireacht"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#, fuzzy
+msgid "_Find in Memo..."
+msgstr "_Aimsigh i dTeachtaireacht..."
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
+msgid "Search for text in the displayed memo"
+msgstr ""
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#, fuzzy
+msgid "D_elete Memo List"
+msgstr "Liosta Meamram _Nua"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#, fuzzy
+msgid "Delete the selected memo list"
+msgstr "Scrios meamraim roghnaithe"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
+msgid "_New Memo List"
+msgstr "Liosta Meamram _Nua"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#, fuzzy
+msgid "Refresh the selected memo list"
+msgstr "Scrios meamraim roghnaithe"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#, fuzzy
+msgid "Rename the selected memo list"
+msgstr "Athainmnigh an fillteán roghnaithe"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#, fuzzy
+msgid "Show _Only This Memo List"
+msgstr "Taispeáin an Liosta Meamram Seo A_mháin"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
+msgid "Memo _Preview"
+msgstr "_Réamhamharc Meamraim"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
+#, fuzzy
+msgid "Show memo preview pane"
+msgstr "Taispeáin an pána \"Réamhamharc\""
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:749
+#, fuzzy
+msgid "Show memo preview below the memo list"
+msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:756
+#, fuzzy
+msgid "Show memo preview alongside the memo list"
+msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
+msgid "Print the list of memos"
+msgstr "Priontáil liosta meamram"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:821
+#, fuzzy
+msgid "Preview the list of memos to be printed"
+msgstr "Roghnaigh na míreanna atá le priontáil"
+
+#: ../modules/calendar/e-memo-shell-view.c:227
+>>>>>>> master
 #, fuzzy
 msgid "Delete Memos"
 msgstr "_Scrios Teachtaireacht"
 
+<<<<<<< HEAD
 #: ../modules/calendar/e-memo-shell-view.c:225
+=======
+#: ../modules/calendar/e-memo-shell-view.c:229
+>>>>>>> master
 #, fuzzy
 msgid "Delete Memo"
 msgstr "Súmáil go %1 %%"
 
+<<<<<<< HEAD
 #: ../modules/calendar/e-task-shell-backend.c:280
+=======
+#: ../modules/calendar/e-memo-shell-view-private.c:424
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d mheamram"
+msgstr[1] "%d mheamram"
+msgstr[2] "%d mheamram"
+msgstr[3] "%d meamram"
+msgstr[4] "%d meamram"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:428
+#: ../modules/calendar/e-task-shell-view-private.c:585
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr ", %d roghnaithe"
+
+#: ../modules/calendar/e-task-shell-backend.c:297
+>>>>>>> master
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tasc"
 
+<<<<<<< HEAD
 #: ../modules/calendar/e-task-shell-backend.c:287
+=======
+#: ../modules/calendar/e-task-shell-backend.c:304
+>>>>>>> master
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tasc _Sannta"
 
+<<<<<<< HEAD
 #: ../modules/calendar/e-task-shell-backend.c:289
 msgid "Create a new assigned task"
 msgstr ""
 
 #: ../modules/calendar/e-task-shell-backend.c:297
+=======
+#: ../modules/calendar/e-task-shell-backend.c:306
+msgid "Create a new assigned task"
+msgstr ""
+
+#: ../modules/calendar/e-task-shell-backend.c:314
+>>>>>>> master
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Liosta Tasca_nna"
 
+<<<<<<< HEAD
 #: ../modules/calendar/e-task-shell-backend.c:299
 #: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Create a new task list"
@@ -15316,11 +29050,24 @@ msgid "Loading tasks"
 msgstr "Tascanna á luchtú"
 
 #: ../modules/calendar/e-task-shell-sidebar.c:578
+=======
+#: ../modules/calendar/e-task-shell-backend.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:745
+msgid "Create a new task list"
+msgstr "Cruthaigh liosta tascanna nua"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:179
+msgid "Loading tasks"
+msgstr "Tascanna á luchtú"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:696
+>>>>>>> master
 #, fuzzy
 msgid "Task List Selector"
 msgstr "Liosta Tascanna"
 
 #. Translators: The string field is a URI.
+<<<<<<< HEAD
 #: ../modules/calendar/e-task-shell-sidebar.c:885
 #, c-format
 msgid "Opening tasks at %s"
@@ -15332,6 +29079,19 @@ msgid "Print Tasks"
 msgstr "Priontáil Tascanna"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:569
+=======
+#: ../modules/calendar/e-task-shell-sidebar.c:1010
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Tascanna á n-oscailt ag %s"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
+msgid "Print Tasks"
+msgstr "Priontáil Tascanna"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:583
+>>>>>>> master
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15339,6 +29099,7 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../modules/calendar/e-task-shell-view-actions.c:576
 #, fuzzy
 msgid "Do not ask me again"
@@ -15369,29 +29130,78 @@ msgid "D_elete Task List"
 msgstr "Roghnaigh Liosta Tascanna"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:724
+=======
+#: ../modules/calendar/e-task-shell-view-actions.c:590
+#, fuzzy
+msgid "Do not ask me again"
+msgstr "Ná fiafraigh díom arís."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:708
+#, fuzzy
+msgid "_Delete Task"
+msgstr "Scr_ios"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:715
+#, fuzzy
+msgid "_Find in Task..."
+msgstr "_Aimsigh i dTeachtaireacht..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:717
+msgid "Search for text in the displayed task"
+msgstr ""
+
+#: ../modules/calendar/e-task-shell-view-actions.c:729
+#, fuzzy
+msgid "Copy..."
+msgstr "_Cóipeáil..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:736
+#, fuzzy
+msgid "D_elete Task List"
+msgstr "Roghnaigh Liosta Tascanna"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:738
+>>>>>>> master
 #, fuzzy
 msgid "Delete the selected task list"
 msgstr "Scrios tascanna roghnaithe"
 
+<<<<<<< HEAD
 #: ../modules/calendar/e-task-shell-view-actions.c:729
 msgid "_New Task List"
 msgstr "Liosta Tascanna _Nua"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:745
+=======
+#: ../modules/calendar/e-task-shell-view-actions.c:743
+msgid "_New Task List"
+msgstr "Liosta Tascanna _Nua"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:759
+>>>>>>> master
 #, fuzzy
 msgid "Refresh the selected task list"
 msgstr "Scrios tascanna roghnaithe"
 
+<<<<<<< HEAD
 #: ../modules/calendar/e-task-shell-view-actions.c:752
+=======
+#: ../modules/calendar/e-task-shell-view-actions.c:766
+>>>>>>> master
 #, fuzzy
 msgid "Rename the selected task list"
 msgstr "Athainmnigh an fillteán roghnaithe"
 
+<<<<<<< HEAD
 #: ../modules/calendar/e-task-shell-view-actions.c:757
+=======
+#: ../modules/calendar/e-task-shell-view-actions.c:771
+>>>>>>> master
 #, fuzzy
 msgid "Show _Only This Task List"
 msgstr "Taispeáin an Liosta Tascanna Seo A_mháin"
 
+<<<<<<< HEAD
 #: ../modules/calendar/e-task-shell-view-actions.c:771
 #, fuzzy
 msgid "Mar_k as Incomplete"
@@ -15454,6 +29264,80 @@ msgid "Expunging"
 msgstr ""
 
 #: ../modules/calendar/e-task-shell-view-private.c:571
+=======
+#: ../modules/calendar/e-task-shell-view-actions.c:785
+#, fuzzy
+msgid "Mar_k as Incomplete"
+msgstr "_Marcáil mar Gan Chríochnú"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:815
+msgid "Delete completed tasks"
+msgstr "Scrios tascanna críochnaithe"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:890
+msgid "Task _Preview"
+msgstr "_Réamhamharc Taisc"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:892
+#, fuzzy
+msgid "Show task preview pane"
+msgstr "Taispeáin fuinneog réamhamhairc taisc"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:913
+#, fuzzy
+msgid "Show task preview below the task list"
+msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:920
+#, fuzzy
+msgid "Show task preview alongside the task list"
+msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:928
+msgid "Active Tasks"
+msgstr "Tascanna Gníomhacha"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:942
+msgid "Completed Tasks"
+msgstr "Tascanna Críochnaithe"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:949
+msgid "Next 7 Days' Tasks"
+msgstr "Tascanna na Chéad 7 Lá Eile"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:956
+msgid "Overdue Tasks"
+msgstr "Tascanna Déanacha"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:963
+msgid "Tasks with Attachments"
+msgstr "Tascanna le hIatáin"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
+msgid "Print the list of tasks"
+msgstr "Priontáil an liosta tascanna"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1020
+#, fuzzy
+msgid "Preview the list of tasks to be printed"
+msgstr "Réamhamharcann sé seo na teagmhálacha le priontáil"
+
+#: ../modules/calendar/e-task-shell-view.c:362
+#, fuzzy
+msgid "Delete Tasks"
+msgstr "Tascanna Críochnaithe"
+
+#: ../modules/calendar/e-task-shell-view.c:364
+#, fuzzy
+msgid "Delete Task"
+msgstr "Súmáil go %1 %%"
+
+#: ../modules/calendar/e-task-shell-view-private.c:472
+msgid "Expunging"
+msgstr ""
+
+#: ../modules/calendar/e-task-shell-view-private.c:581
+>>>>>>> master
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -15463,6 +29347,7 @@ msgstr[2] "%d thasc"
 msgstr[3] "%d dtasc"
 msgstr[4] "%d tasc"
 
+<<<<<<< HEAD
 #: ../modules/calendar/e-task-shell-view.c:358
 #, fuzzy
 msgid "Delete Tasks"
@@ -15617,8 +29502,176 @@ msgstr "Roghnaigh _Snáithe Teachtaireachta"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "Select all messages in the same thread as the selected message"
+=======
+#: ../modules/mail/em-account-prefs.c:261
+msgid "Evolution Account Assistant"
+msgstr "Cúntóir Cuntais Evolution"
+
+#: ../modules/mail/em-account-prefs.c:310
+msgid "Account Editor"
+msgstr "Eagarthóir Cuntas"
+
+#. Translators: This is only for multiple messages.
+#: ../modules/mail/e-mail-attachment-handler.c:384
+#, fuzzy, c-format
+msgid "%d attached messages"
+msgstr "Teachtaireacht Faoi Iamh"
+
+#: ../modules/mail/e-mail-shell-backend.c:195
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "Teachtaireacht _Phoist"
+
+#: ../modules/mail/e-mail-shell-backend.c:197
+msgid "Compose a new mail message"
+msgstr "Cum teachtaireacht phoist nua"
+
+#: ../modules/mail/e-mail-shell-backend.c:205
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "_Fillteán Poist"
+
+#: ../modules/mail/e-mail-shell-backend.c:207
+msgid "Create a new mail folder"
+msgstr "Cruthaigh fillteán poist nua"
+
+#: ../modules/mail/e-mail-shell-backend.c:412
+msgid "Mail Accounts"
+msgstr "Cuntais Poist"
+
+#: ../modules/mail/e-mail-shell-backend.c:420
+msgid "Mail Preferences"
+msgstr "Sainroghanna Poist"
+
+#: ../modules/mail/e-mail-shell-backend.c:428
+msgid "Composer Preferences"
+msgstr "Sainroghanna Cumadóra"
+
+#: ../modules/mail/e-mail-shell-backend.c:436
+msgid "Network Preferences"
+msgstr "Sainroghanna Líonra"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view.c:960
+#, fuzzy
+msgid "_Disable Account"
+msgstr "Díchumasaigh Cuntas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
+#, fuzzy
+msgid "Disable this account"
+msgstr "Díchumasaigh Cuntas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
+#, fuzzy
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr ""
+"An bhfuil tú cinnte go dteastaíonn uait an leabharmharc <b>%1</b> a "
+"scriosadh?"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
+msgid "_Download Messages for Offline Usage"
+msgstr "�osl_uchtaigh Teachtaireachtaí le hAghaidh Úsáide as Líne"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
+#, fuzzy
+msgid "Download messages of accounts and folders marked for offline usage"
+msgstr "�osl_uchtaigh Teachtaireachtaí le hAghaidh Úsáide as Líne"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
+#, fuzzy
+msgid "Fl_ush Outbox"
+msgstr "NASCLITIR BHEAG LAIDINE FL"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
+msgid "_Copy Folder To..."
+msgstr "_Cóipeáil Fillteán Go..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
+msgid "Copy the selected folder into another folder"
+msgstr "Cóipeáil an fillteán roghnaithe isteach i bhfillteán eile"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
+#, fuzzy
+msgid "Permanently remove this folder"
+msgstr "Is fillteán poiblí é seo."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
+msgid "E_xpunge"
+msgstr "G_lan"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
+msgid "Permanently remove all deleted messages from this folder"
 msgstr ""
 
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
+msgid "Mar_k All Messages as Read"
+msgstr "_Marcáil Gach Teachtaireacht mar Léite"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#, fuzzy
+msgid "Mark all messages in the folder as read"
+msgstr "Marcáil teachtaireachtaí mar &leite ó:"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
+msgid "_Move Folder To..."
+msgstr "_Bog Fillteán Go..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#, fuzzy
+msgid "Move the selected folder into another folder"
+msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
+msgid "_New..."
+msgstr "_Nua..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
+msgid "Create a new folder for storing mail"
+msgstr "Cruthaigh fillteán nua le haghaidh stóráil poist"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
+msgid "Change the properties of this folder"
+msgstr "Athraigh airíonna an fhillteáin seo"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
+msgid "Refresh the folder"
+msgstr "Athnuaigh an fillteán"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
+msgid "Change the name of this folder"
+msgstr "Athraigh ainm an fhillteáin seo"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
+msgid "Select Message _Thread"
+msgstr "Roghnaigh _Snáithe Teachtaireachta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
+msgid "Select Message S_ubthread"
+msgstr "Roghnaigh _Foshnáithe Teachtaireachta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#, fuzzy
+msgid "Select all replies to the currently selected message"
+msgstr "&Scrios Teachtaireachtaí Roghnaithe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
+msgid "Empty _Trash"
+msgstr "Folmhaigh _Bruscar"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#, fuzzy
+msgid "Permanently remove all the deleted messages from all accounts"
+>>>>>>> master
+msgstr ""
+"An bhfuil tú cinnte go dteastaíonn uait an leabharmharc <b>%1</b> a "
+"scriosadh?"
+
+<<<<<<< HEAD
 #: ../modules/mail/e-mail-shell-view-actions.c:1206
 msgid "Select Message S_ubthread"
 msgstr "Roghnaigh _Foshnáithe Teachtaireachta"
@@ -16008,6 +30061,351 @@ msgstr "Ceanntásc dáta:"
 msgid "Show _original header value"
 msgstr "Taispeáin _Bunmhéid"
 
+=======
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
+msgid "_New Label"
+msgstr "_Lipéad Nua"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
+msgid "N_one"
+msgstr "_Neamhní"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
+#, fuzzy
+msgid "_Manage Subscriptions"
+msgstr "_Síntiúis..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
+msgid "Send / _Receive"
+msgstr "Seol / Fa_igh"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
+msgid "Send queued items and retrieve new items"
+msgstr ""
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
+msgid "R_eceive All"
+msgstr "_Faigh Gach"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
+msgid "Receive new items from all accounts"
+msgstr ""
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
+msgid "_Send All"
+msgstr "_Seol Gach"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
+msgid "Send queued items in all accounts"
+msgstr ""
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../widgets/misc/e-activity-proxy.c:310
+msgid "Cancel"
+msgstr "Cealaigh"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
+msgid "Cancel the current mail operation"
+msgstr "Cealaigh an oibríocht phoist reatha"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
+msgid "Collapse All _Threads"
+msgstr "Laghdaigh Gach _Snáithe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
+msgid "Collapse all message threads"
+msgstr "Laghdaigh gach snáithe teachtaireachtaí"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
+msgid "E_xpand All Threads"
+msgstr "Lea_thnaigh Gach Snáithe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
+#, fuzzy
+msgid "Expand all message threads"
+msgstr "laghdaigh/leathnaigh gach snáithe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
+msgid "_Message Filters"
+msgstr "Scagairí _Teachtaireachta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
+msgid "Create or edit rules for filtering new mail"
+msgstr "Cruthaigh rialacha le haghaidh scagadh poist nua nó cuir iad in eagar"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
+msgid "_Subscriptions..."
+msgstr "_Síntiúis..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
+msgid "F_older"
+msgstr "_Fillteán"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
+msgid "_Label"
+msgstr "_Lipéad"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1367
+msgid "C_reate Search Folder From Search..."
+msgstr "C_ruthaigh Fillteán Cuardaigh ó Chuardach..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1374
+msgid "Search F_olders"
+msgstr "F_illteáin Cuardaigh"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#, fuzzy
+msgid "Create or edit search folder definitions"
+msgstr "Cruthaigh sainmhínithe Fhillteán Cuardaigh nó cuir iad in eagar"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1407
+msgid "_New Folder..."
+msgstr "Fillteán _Nua..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
+msgid "Show Message _Preview"
+msgstr "Taispeáin _Réamhamharc Teachtaireachta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1437
+#, fuzzy
+msgid "Show message preview pane"
+msgstr "Taispeáin &teachtaireacht i bpreabfhuinneog"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
+msgid "Show _Deleted Messages"
+msgstr "Taispeáin Teachtaireachtaí Scr_iosta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
+#, fuzzy
+msgid "Show deleted messages with a line through them"
+msgstr "Bog teachtaireachtaí víreasacha go dtí an fillteán roghnaithe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1451
+msgid "_Group By Threads"
+msgstr "_Grúpáil de Réir Snáithe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#, fuzzy
+msgid "Threaded message list"
+msgstr "Liosta &snáithithe teachtaireachtaí"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
+#, fuzzy
+msgid "Show message preview below the message list"
+msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1481
+#, fuzzy
+msgid "Show message preview alongside the message list"
+msgstr "Taispeáin an pána réamhamhairc &faoi liosta na dteachtaireachtaí"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1489
+msgid "All Messages"
+msgstr "Gach Teachtaireacht"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1496
+msgid "Important Messages"
+msgstr "Teachtaireachtaí Tábhachtacha"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1503
+msgid "Last 5 Days' Messages"
+msgstr "Teachtaireachtaí na 5 Lá is Déanaí"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1510
+msgid "Messages Not Junk"
+msgstr "Teachtaireachtaí Nach Dramhphost"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1517
+msgid "Messages with Attachments"
+msgstr "Teachtaireachtaí le hIatáin"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1524
+msgid "No Label"
+msgstr "Gan Lipéad"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1531
+msgid "Read Messages"
+msgstr "Teachtaireachtaí Léite"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1538
+msgid "Recent Messages"
+msgstr "Teachtaireachtaí le Déanaí"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
+msgid "Unread Messages"
+msgstr "Teachtaireachtaí Gan Léamh"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1597
+msgid "Subject or Addresses contain"
+msgstr "�bhar nó Seoltaí ina bhfuil"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
+msgid "All Accounts"
+msgstr "nGach Cuntas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
+msgid "Current Account"
+msgstr "gCuntas Reatha"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
+msgid "Current Folder"
+msgstr "bhFillteán Reatha"
+
+#: ../modules/mail/e-mail-shell-view.c:563
+msgid "All Account Search"
+msgstr "Cuardach Gach Cuntais"
+
+#: ../modules/mail/e-mail-shell-view.c:736
+msgid "Account Search"
+msgstr "Cuardach Cuntas"
+
+#: ../modules/mail/e-mail-shell-view.c:958
+#, fuzzy
+msgid "Proxy _Logout"
+msgstr "Name=Logáil Amach"
+
+#: ../modules/mail/e-mail-shell-view-private.c:997
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "%d roghnaithe, "
+msgstr[1] "%d roghnaithe, "
+msgstr[2] "%d roghnaithe, "
+msgstr[3] "%d roghnaithe, "
+msgstr[4] "%d roghnaithe, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:1008
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d scriosta"
+msgstr[1] "%d scriosta"
+msgstr[2] "%d scriosta"
+msgstr[3] "%d scriosta"
+msgstr[4] "%d scriosta"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d dramhphost"
+msgstr[1] "%d dhramhphost"
+msgstr[2] "%d dhramhphost"
+msgstr[3] "%d ndramhphost"
+msgstr[4] "%d dramhphost"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1027
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d dréacht"
+msgstr[1] "%d dhréacht"
+msgstr[2] "%d dhréacht"
+msgstr[3] "%d ndréacht"
+msgstr[4] "%d dréacht"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1033
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d gan seoladh"
+msgstr[1] "%d gan seoladh"
+msgstr[2] "%d gan seoladh"
+msgstr[3] "%d gan seoladh"
+msgstr[4] "%d gan seoladh"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1039
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d seolta"
+msgstr[1] "%d sheolta"
+msgstr[2] "%d sheolta"
+msgstr[3] "%d seolta"
+msgstr[4] "%d seolta"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1051
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d gan léamh, "
+msgstr[1] "%d gan léamh, "
+msgstr[2] "%d gan léamh, "
+msgstr[3] "%d gan léamh, "
+msgstr[4] "%d gan léamh, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:1054
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d iomlán"
+msgstr[1] "%d iomlán"
+msgstr[2] "%d iomlán"
+msgstr[3] "%d iomlán"
+msgstr[4] "%d iomlán"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1074
+msgid "Trash"
+msgstr "Bruscar"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1542
+msgid "Send / Receive"
+msgstr "Seol / Faigh"
+
+#: ../modules/mail/em-composer-prefs.c:495
+#: ../modules/plugin-manager/evolution-plugin-manager.c:360
+#: ../plugins/publish-calendar/publish-calendar.c:857
+#: ../widgets/misc/e-account-tree-view.c:385
+msgid "Enabled"
+msgstr "Cumasaithe"
+
+#: ../modules/mail/em-composer-prefs.c:499
+msgid "Language(s)"
+msgstr "Teang(ach)a"
+
+#: ../modules/mail/em-mailer-prefs.c:91
+msgid "Every time"
+msgstr "Gach uair"
+
+#: ../modules/mail/em-mailer-prefs.c:92
+msgid "Once per day"
+msgstr "Uair sa lá"
+
+#: ../modules/mail/em-mailer-prefs.c:93
+msgid "Once per week"
+msgstr "Uair sa seachtain"
+
+#: ../modules/mail/em-mailer-prefs.c:94
+msgid "Once per month"
+msgstr "Uair sa mhí"
+
+#: ../modules/mail/em-mailer-prefs.c:293
+msgid "Header"
+msgstr "Ceanntásc"
+
+#: ../modules/mail/em-mailer-prefs.c:297
+msgid "Contains Value"
+msgstr "Luach Ann"
+
+#. 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:1051
+#, fuzzy
+msgid "_Date header:"
+msgstr "Ceanntásc dáta:"
+
+#: ../modules/mail/em-mailer-prefs.c:1052
+#, fuzzy
+msgid "Show _original header value"
+msgstr "Taispeáin _Bunmhéid"
+
+>>>>>>> master
 #: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr ""
@@ -16017,8 +30415,12 @@ msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../modules/mailto-handler/evolution-mailto-handler.c:143
 #, fuzzy
+=======
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+>>>>>>> master
 msgid "Do you want to make Evolution your default email client?"
 msgstr ""
 "Ar mhaith leat Evolution a úsáid mar do chliant ríomhphoist réamhshocraithe?"
@@ -16028,6 +30430,7 @@ msgid "Click 'Work Online' to return to online mode."
 msgstr ""
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
+<<<<<<< HEAD
 #, fuzzy
 msgid "Evolution is currently offline due to a network outage."
 msgstr ""
@@ -16038,6 +30441,14 @@ msgstr ""
 #, fuzzy
 msgid "Evolution is currently offline."
 msgstr "Tá Evolution ag dul as líne."
+=======
+msgid "Evolution is currently offline due to a network outage."
+msgstr "Tá Evolution as líne faoi láthair mar gheall ar bhriseadh an líonra."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
+msgid "Evolution is currently offline."
+msgstr "Tá Evolution as líne faoi láthair."
+>>>>>>> master
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
 msgid ""
@@ -16045,6 +30456,7 @@ msgid ""
 "established."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Author(s)"
 msgstr "Úda(i)r"
@@ -16220,11 +30632,79 @@ 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."
+=======
+#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an authentication token."
+msgstr ""
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+msgid "OAuth"
+msgstr ""
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+msgid ""
+"This option will connect to the server by way of the GNOME Online Accounts "
+"service"
+msgstr ""
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+msgid "Author(s)"
+msgstr "Úda(i)r"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:255
+msgid "Plugin Manager"
+msgstr "Bainisteoir Breiseán"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:270
+msgid "Note: Some changes will not take effect until restart"
+msgstr ""
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:299
+msgid "Overview"
+msgstr "Foramharc"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:368
+#: ../modules/plugin-manager/evolution-plugin-manager.c:451
+msgid "Plugin"
+msgstr "Breiseán"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+msgid "_Plugins"
+msgstr "_Breiseáin"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:490
+msgid "Enable and disable plugins"
+msgstr "Cumasaigh agus díchumasaigh breiseáin"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr ""
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr ""
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
+#, fuzzy
+msgid "Hello Python"
+msgstr "Fón Baile"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:191
+#, c-format
+msgid "Failed to spawn SpamAssassin (%s): "
+>>>>>>> master
 msgstr ""
 "Is féidir leat Evolution a athchóiriú ó do chúltaca. Is féidir leis gach "
 "Post, Féilire, Tasc, Meamram agus Teagmháil a athchóiriú. Athchóiríonn sé do "
 "chuid socruithe pearsanta, scagairí poist, srl."
 
+<<<<<<< HEAD
 #: ../plugins/backup-restore/backup-restore.c:333
 msgid "_Restore Evolution from the backup file"
 msgstr "_Athchóirigh Evolution ón gcomhad cúltaca"
@@ -16258,6 +30738,10 @@ msgstr "A_thchóirigh na Sonraí Evolution..."
 #: ../plugins/backup-restore/backup-restore.c:398
 #, fuzzy
 msgid "Restore Evolution data and settings from an archive file"
+=======
+#: ../modules/spamassassin/evolution-spamassassin.c:214
+msgid "Failed to stream mail message content to SpamAssassin: "
+>>>>>>> master
 msgstr ""
 "Déan cúltaca ar shonraí agus ar shocruithe Evolution agus athchóirigh iad."
 
@@ -16280,6 +30764,7 @@ msgstr "Seiceáil an Cúltaca Evolution"
 msgid "Restart Evolution"
 msgstr "Atosaigh Evolution"
 
+<<<<<<< HEAD
 #: ../plugins/backup-restore/backup.c:86
 #, fuzzy
 msgid "With Graphical User Interface"
@@ -16471,8 +30956,196 @@ msgstr ""
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
+=======
+#: ../modules/spamassassin/evolution-spamassassin.c:233
+#, fuzzy, c-format
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "Theip ar sheoladh %d as %d teachtaireacht"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:261
+#, fuzzy
+msgid "Failed to read output from SpamAssassin: "
+msgstr "Theip ar sheoladh %d as %d teachtaireacht"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:316
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:835
+msgid "SpamAssassin Options"
+msgstr "Roghanna SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:850
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "GenericName=Teisteanna agus Scrúduithe"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:864
+#, fuzzy
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr "Níl aon teachtaireacht ann san fhillteán seo."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:1073
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use SpamAssassin daemon and client"
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
+msgid "Use only local spam tests."
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
+msgid "Use only the local spam tests (no DNS)."
+msgstr ""
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:280
+#: ../widgets/misc/e-import-assistant.c:396
+#, fuzzy
+msgid "Please select the information that you would like to import:"
+msgstr "Roghnaigh cineál an chomhaid a theastaíonn uait a iompórtáil:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:312
+#: ../widgets/misc/e-import-assistant.c:552
+#, c-format
+msgid "From %s:"
+msgstr "Ó %s:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:323
+#: ../modules/startup-wizard/evolution-startup-wizard.c:421
+#, fuzzy
+msgid "Importing Files"
+msgstr "Comhaid nua ríomhphoist á n-iompórtáil..."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:399
+msgid "Import cancelled. Click \"Forward\" to continue."
+msgstr ""
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:417
+msgid "Import complete. Click \"Forward\" to continue."
+msgstr ""
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:497
+msgid "Evolution Setup Assistant"
+msgstr "Cúntóir Socraithe Evolution"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:503
+msgid "Welcome"
+msgstr "Fáilte"
+
+#: ../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"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"Fáilte go Evolution. Ceadófar an chéad cúpla scáileáin eile d'Evolution nasc "
+"le do chuntais ríomhphoist, agus comhaid a iompórtáil ó fheidhmchláir "
+"eile. \n"
+"\n"
+"Cliceáil an cnaipe \"Ar Aghaidh\" chun leanúint ar aghaidh, le do thoil. "
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:613
+#, fuzzy
+msgid "Loading accounts..."
+msgstr "� Luchtú..."
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+#, fuzzy
+msgid "Add local address books to Evolution."
+msgstr "Ná taispeáin ach fillteáin atá oscailte"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Local Address Books"
+msgstr "Leabhair Seoltaí Logánta"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
 msgstr ""
 
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
+msgid "_Do not show this message again."
+msgstr "_Ná taispeáin an teachtaireacht seo arís."
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:464
+#: ../plugins/templates/templates.c:462
+msgid "Keywords"
+msgstr "Lorgfhocail"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr ""
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+msgid "Message has no attachments"
+msgstr "Níl aon iatán ag an teachtaireacht"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#, fuzzy
+msgid "_Add Attachment..."
+msgstr "Cuir _Iatán Leis..."
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Edit Message"
+msgstr "Cuir Teachtaireacht in _Eagar"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#, fuzzy
+msgid "Attachment Reminder"
+msgstr "&Scoránaigh Meabhrúchán"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr ""
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+#, fuzzy
+msgid "Inline Audio"
+msgstr "vCardanna Iomadúla"
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+msgid "Play audio attachments directly in mail messages."
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:192
+msgid "Select name of the Evolution backup file"
+msgstr "Roghnaigh ainm an chomhaid cúltaca Evolution"
+
+#: ../plugins/backup-restore/backup-restore.c:225
+msgid "_Restart Evolution after backup"
+msgstr "_Atosaigh Evolution tar éis cúltaca"
+
+#: ../plugins/backup-restore/backup-restore.c:251
+msgid "Select name of the Evolution backup file to restore"
+msgstr "Roghnaigh ainm an chomhaid cúltaca Evolution le hathchóiriú"
+
+#: ../plugins/backup-restore/backup-restore.c:264
+msgid "_Restart Evolution after restore"
+msgstr "_Atosaigh Evolution tar éis athchóirithe"
+
+#: ../plugins/backup-restore/backup-restore.c:337
+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."
+>>>>>>> master
+msgstr ""
+"Is féidir leat Evolution a athchóiriú ó do chúltaca. Is féidir leis gach "
+"Post, Féilire, Tasc, Meamram agus Teagmháil a athchóiriú. Athchóiríonn sé do "
+"chuid socruithe pearsanta, scagairí poist, srl."
+
+<<<<<<< HEAD
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid "BBDB"
 msgstr "BBDB"
@@ -16505,8 +31178,35 @@ msgstr ""
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:198
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
+=======
+#: ../plugins/backup-restore/backup-restore.c:344
+msgid "_Restore Evolution from the backup file"
+msgstr "_Athchóirigh Evolution ón gcomhad cúltaca"
+
+#: ../plugins/backup-restore/backup-restore.c:351
+msgid "Please select an Evolution Archive to restore:"
+msgstr "Roghnaigh Cartlann Evolution le hathchóiriú, le do thoil:"
+
+#: ../plugins/backup-restore/backup-restore.c:354
+msgid "Choose a file to restore"
+msgstr "Roghnaigh comhad le hathchóiriú"
+
+#: ../plugins/backup-restore/backup-restore.c:362
+msgid "Restore from backup"
+msgstr "Athchóirigh ó chúltaca"
+
+#: ../plugins/backup-restore/backup-restore.c:402
+msgid "_Back up Evolution Data..."
+msgstr "Déan _Cóip Chúltaca Sonraí Evolution..."
+
+#: ../plugins/backup-restore/backup-restore.c:404
+#, fuzzy
+msgid "Back up Evolution data and settings to an archive file"
+>>>>>>> master
 msgstr ""
+"Déan cúltaca ar shonraí agus ar shocruithe Evolution agus athchóirigh iad."
 
+<<<<<<< HEAD
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:221
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
@@ -17319,17 +32019,811 @@ msgstr ""
 #: ../plugins/itip-formatter/itip-formatter.c:1558
 #, fuzzy
 msgid "Task information sent"
+=======
+#: ../plugins/backup-restore/backup-restore.c:409
+msgid "R_estore Evolution Data..."
+msgstr "A_thchóirigh na Sonraí Evolution..."
+
+#: ../plugins/backup-restore/backup-restore.c:411
+#, fuzzy
+msgid "Restore Evolution data and settings from an archive file"
+msgstr ""
+"Déan cúltaca ar shonraí agus ar shocruithe Evolution agus athchóirigh iad."
+
+#: ../plugins/backup-restore/backup.c:77
+#, fuzzy
+msgid "Back up Evolution directory"
+msgstr "Comhadlann saincheaptha chúltaca:"
+
+#: ../plugins/backup-restore/backup.c:79
+#, fuzzy
+msgid "Restore Evolution directory"
+msgstr "ní féidir an chomhadlann reatha a athchóiriú"
+
+#: ../plugins/backup-restore/backup.c:81
+#, fuzzy
+msgid "Check Evolution Back up"
+msgstr "Seiceáil an Cúltaca Evolution"
+
+#: ../plugins/backup-restore/backup.c:83
+msgid "Restart Evolution"
+msgstr "Atosaigh Evolution"
+
+#: ../plugins/backup-restore/backup.c:85
+#, fuzzy
+msgid "With Graphical User Interface"
+msgstr "*.ui *.UI|Comhaid Chomhéadain"
+
+#. FIXME Will the versioned setting always work?
+#: ../plugins/backup-restore/backup.c:299
+#: ../plugins/backup-restore/backup.c:418
+msgid "Shutting down Evolution"
+msgstr "Evolution á mhúchadh"
+
+#: ../plugins/backup-restore/backup.c:308
+msgid "Backing Evolution accounts and settings"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:318
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:331
+#, fuzzy
+msgid "Back up complete"
+msgstr "Cúltaca críochnaithe"
+
+#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:527
+msgid "Restarting Evolution"
+msgstr "Evolution á atosú"
+
+#: ../plugins/backup-restore/backup.c:424
+#, fuzzy
+msgid "Back up current Evolution data"
+msgstr "Foinse Sonraí na Cáipéise Reatha"
+
+#: ../plugins/backup-restore/backup.c:432
+#, fuzzy
+msgid "Extracting files from back up"
+msgstr "Fainéis á léamh ó chúltaca"
+
+#: ../plugins/backup-restore/backup.c:491
+msgid "Loading Evolution settings"
+msgstr "Socruithe Evolution á luchtú"
+
+#: ../plugins/backup-restore/backup.c:508
+#, fuzzy
+msgid "Removing temporary back up files"
+msgstr "An iomarca comhad cúltaca?"
+
+#: ../plugins/backup-restore/backup.c:520
+msgid "Ensuring local sources"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:707
+#, fuzzy, c-format
+msgid "Backing up to the folder %s"
+msgstr "Theip ar léamh na comhadlainne."
+
+#: ../plugins/backup-restore/backup.c:712
+#, fuzzy, c-format
+msgid "Restoring from the folder %s"
+msgstr "Ag díliostáil ón bhfillteán %S..."
+
+#. Backup / Restore only can have GUI. We should restrict the rest
+#: ../plugins/backup-restore/backup.c:736
+#, fuzzy
+msgid "Evolution Back up"
+msgstr "Cúltaca Evolution"
+
+#: ../plugins/backup-restore/backup.c:736
+msgid "Evolution Restore"
+msgstr "Athchóiriú Evolution"
+
+#: ../plugins/backup-restore/backup.c:774
+#, fuzzy
+msgid "Backing up Evolution Data"
+msgstr "Foinse Sonraí na Cáipéise Reatha"
+
+#: ../plugins/backup-restore/backup.c:775
+msgid "Please wait while Evolution is backing up your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:777
+#, fuzzy
+msgid "Restoring Evolution Data"
+msgstr "Evolution á Atosú"
+
+#: ../plugins/backup-restore/backup.c:778
+msgid "Please wait while Evolution is restoring your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:796
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
+
+#. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#, fuzzy
+msgid "Back up and Restore"
+msgstr "Cúltaca agus Athchóiriú"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+#, fuzzy
+msgid "Back up and restore your Evolution data and settings."
+msgstr ""
+"Déan cúltaca ar do chuid sonraí agus ar do chuid socruithe Evolution agus "
+"athchóirigh iad."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Are you sure you want to close Evolution?"
+msgstr "An bhfuil tú cinnte gur mhaith leat Evolution a dhúnadh?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+#, fuzzy
+msgid ""
+"Are you sure you want to restore Evolution from the selected back up file?"
+msgstr "An bhfuil tú cinnte gur mhaith leat Evolution a dhúnadh?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+#, fuzzy
+msgid "Close and Back up Evolution"
+msgstr "Foinse Sonraí na Cáipéise Reatha"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#, fuzzy
+msgid "Close and Restore Evolution"
+msgstr "Ní féidir Evolution a thosú"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Insufficient Permissions"
+msgstr "Diúltaíodh Cead"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#, fuzzy
+msgid "Invalid Evolution back up file"
+msgstr "Comhad cúltaca Evolution neamhbhailí"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#, fuzzy
+msgid "Please select a valid back up file to restore."
+msgstr "Dealaigh na tadhallaí roghnaithe"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+#, fuzzy
+msgid "The selected folder is not writable."
+msgstr "Post an sceál seo"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid ""
+"To back up your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+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 ""
+
+#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+msgid "Automatic Contacts"
+msgstr "Teagmhálacha Uathoibríoch"
+
+#. Enable BBDB checkbox
+#: ../plugins/bbdb/bbdb.c:710
+msgid "Create _address book entries when sending mails"
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:716
+#, fuzzy
+msgid "Select Address book for Automatic Contacts"
+msgstr "Tadhallaí Phoiblí"
+
+#: ../plugins/bbdb/bbdb.c:731
+msgid "Instant Messaging Contacts"
+msgstr "Teagmhálacha Chur Teachtaireachtaí Meandaracha"
+
+#. Enable Gaim Checkbox
+#: ../plugins/bbdb/bbdb.c:746
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:752
+msgid "Select Address book for Pidgin buddy list"
+msgstr ""
+
+#. Synchronize now button.
+#: ../plugins/bbdb/bbdb.c:763
+msgid "Synchronize with _buddy list now"
+msgstr ""
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
+"lists."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:214
+msgid "Authentication failed. Server requires correct login."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:216
+msgid "Given URL cannot be found."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:220
+#, c-format
+msgid ""
+"Server returned unexpected data.\n"
+"%d - %s"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:360
+#: ../plugins/caldav/caldav-browse-server.c:694
+#, fuzzy
+msgid "Failed to parse server response."
+msgstr "Ag dul i dteagmháil le freastalaí na nuashonruithe..."
+
+#: ../plugins/caldav/caldav-browse-server.c:454
+msgid "Events"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:476
+#, fuzzy
+msgid "User's calendars"
+msgstr "Féilire nua"
+
+#: ../plugins/caldav/caldav-browse-server.c:588
+#: ../plugins/caldav/caldav-browse-server.c:763
+#, fuzzy
+msgid "Failed to get server URL."
+msgstr ""
+"Teip ag cruthaigh eolaire '%s':\n"
+"%s"
+
+#: ../plugins/caldav/caldav-browse-server.c:761
+#: ../plugins/caldav/caldav-browse-server.c:802
+#: ../plugins/caldav/caldav-browse-server.c:1493
+#, fuzzy
+msgid "Searching for user's calendars..."
+msgstr "Féilire á luchtú..."
+
+#: ../plugins/caldav/caldav-browse-server.c:800
+#, fuzzy
+msgid "Could not find any user calendar."
+msgstr "Ní féidir an soláthraí cuardaigh a aimsiú."
+
+#: ../plugins/caldav/caldav-browse-server.c:938
+#, c-format
+msgid "Previous attempt failed: %s"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:940
+#, c-format
+msgid "Previous attempt failed with code %d"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:945
+#, fuzzy, c-format
+msgid "Enter password for user %s on server %s"
+msgstr "Iontráil focal faire do %s (úsáideoir %s)"
+
+#: ../plugins/caldav/caldav-browse-server.c:1008
+#, fuzzy, c-format
+msgid "Cannot create soup message for URL '%s'"
+msgstr ""
+"Ní féidir comhad aschurtha a chruthú: %s:\n"
+"%s"
+
+#. fetch content
+#: ../plugins/caldav/caldav-browse-server.c:1266
+#, fuzzy
+msgid "Searching folder content..."
+msgstr "Fillteán Cuardaigh ó _Sheoltóir..."
+
+#: ../plugins/caldav/caldav-browse-server.c:1325
+#: ../plugins/caldav/caldav-source.c:261
+msgid "Server _handles meeting invitations"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:1332
+#, fuzzy
+msgid "List of available calendars:"
+msgstr "Féilirí Logánta"
+
+#: ../plugins/caldav/caldav-browse-server.c:1370
+#, fuzzy
+msgid "Supports"
+msgstr "Tacaíocht CalDAV"
+
+#: ../plugins/caldav/caldav-browse-server.c:1397
+#: ../plugins/caldav/caldav-source.c:259
+#, fuzzy
+msgid "User e_mail:"
+msgstr "Ríomhphost nua"
+
+#: ../plugins/caldav/caldav-browse-server.c:1469
+#, fuzzy, c-format
+msgid "Failed to create thread: %s"
+msgstr ""
+"Teip ag cruthaigh eolaire '%s':\n"
+"%s"
+
+#: ../plugins/caldav/caldav-browse-server.c:1585
+#, c-format
+msgid "Server URL '%s' is not a valid URL"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:1591
+msgid "Browse for a CalDAV calendar"
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:240
+#: ../plugins/calendar-http/calendar-http.c:107
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:145
+#: ../plugins/google-account-setup/google-contacts-source.c:359
+#, fuzzy
+msgid "Use _secure connection"
+msgstr "Úsáid nasc daingean:"
+
+#: ../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 "Ai_nm úsáideora:"
+
+#: ../plugins/caldav/caldav-source.c:264
+msgid "Brows_e server for a calendar"
+msgstr ""
+
+#: ../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 "A_thnuaigh:"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+msgid "Add CalDAV support to Evolution."
+msgstr "Cuir tacaíocht le CalDAV le Evolution."
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "CalDAV Support"
+msgstr "Tacaíocht CalDAV"
+
+#: ../plugins/calendar-file/calendar-file.c:134
+msgid "_Customize options"
+msgstr "_Saincheap roghanna"
+
+#: ../plugins/calendar-file/calendar-file.c:153
+msgid "File _name:"
+msgstr "_Ainm comhaid:"
+
+#: ../plugins/calendar-file/calendar-file.c:157
+msgid "Choose calendar file"
+msgstr "Roghnaigh comhad féilire"
+
+#: ../plugins/calendar-file/calendar-file.c:209
+msgid "On open"
+msgstr "Ag am oscailte"
+
+#: ../plugins/calendar-file/calendar-file.c:210
+msgid "On file change"
+msgstr "Ag am athraithe comhaid"
+
+#: ../plugins/calendar-file/calendar-file.c:211
+#, fuzzy
+msgid "Periodically"
+msgstr "Pearsanta"
+
+#: ../plugins/calendar-file/calendar-file.c:228
+msgid "Force read _only"
+msgstr ""
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
+msgid "Add local calendars to Evolution."
+msgstr ""
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+msgid "Local Calendars"
+msgstr "Féilirí Logánta"
+
+#: ../plugins/calendar-http/calendar-http.c:207
+msgid "Userna_me:"
+msgstr "_Ainm úsáideora:"
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
+msgid "Add web calendars to Evolution."
+msgstr ""
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+msgid "Web Calendars"
+msgstr "Féilirí Gréasáin"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Fog"
+msgstr "Aimsir: Ceo"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
+msgid "Weather: Cloudy"
+msgstr "Aimsir: Scamallach"
+
+#: ../plugins/calendar-weather/calendar-weather.c:67
+msgid "Weather: Cloudy Night"
+msgstr "Aimsir: Oíche Scamallach"
+
+#: ../plugins/calendar-weather/calendar-weather.c:68
+msgid "Weather: Overcast"
+msgstr "Aimsir: Modartha"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
+msgid "Weather: Showers"
+msgstr "Aimsir: Ceathanna"
+
+#: ../plugins/calendar-weather/calendar-weather.c:70
+msgid "Weather: Snow"
+msgstr "Aimsir: Sneachta"
+
+#: ../plugins/calendar-weather/calendar-weather.c:71
+msgid "Weather: Sunny"
+msgstr "Aimsir: Grianmhar"
+
+#: ../plugins/calendar-weather/calendar-weather.c:72
+msgid "Weather: Clear Night"
+msgstr "Aimsir: Oíche Ghlan"
+
+#: ../plugins/calendar-weather/calendar-weather.c:73
+msgid "Weather: Thunderstorms"
+msgstr "Aimsir: Stoirmeacha Toirní"
+
+#: ../plugins/calendar-weather/calendar-weather.c:239
+msgid "Select a location"
+msgstr "Roghnaigh suíomh"
+
+#. Translators: "None" location for a weather calendar
+#: ../plugins/calendar-weather/calendar-weather.c:350
+#: ../plugins/calendar-weather/calendar-weather.c:398
+msgctxt "weather-cal-location"
+msgid "None"
+msgstr "Neamhní"
+
+#: ../plugins/calendar-weather/calendar-weather.c:477
+msgid "_Units:"
+msgstr "_Aonaid:"
+
+#: ../plugins/calendar-weather/calendar-weather.c:486
+msgid "Metric (Celsius, cm, etc)"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:489
+msgid "Imperial (Fahrenheit, inches, etc)"
+msgstr ""
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
+msgid "Add weather calendars to Evolution."
+msgstr ""
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
+msgid "Weather Calendars"
+msgstr "Féilirí Aimsire"
+
+#: ../plugins/dbx-import/dbx-importer.c:284
+#, fuzzy
+msgid "Importing Outlook Express data"
+msgstr "Earráid agus Sonraí á nIompórtáil"
+
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+#, fuzzy
+msgid "Import Outlook Express messages from DBX file"
+msgstr "Iompórtáil Ó Phost OS X"
+
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+#, fuzzy
+msgid "Outlook DBX import"
+msgstr "Comhphairt Coimriú Evolution"
+
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+msgid "Outlook Express 5/6 personal folders (.dbx)"
+msgstr ""
+
+#: ../plugins/default-source/default-source.c:168
+msgid "Mark as _default address book"
+msgstr "Marcáil mar leabhar seoltaí _réamhshocraithe"
+
+#: ../plugins/default-source/default-source.c:182
+msgid "A_utocomplete with this address book"
+msgstr "Comhlánaigh go h_uathoibríoch leis an leabhar seoltaí seo"
+
+#: ../plugins/default-source/default-source.c:191
+msgid "Mark as _default calendar"
+msgstr "Marcáil mar féilire _réamhshocraithe"
+
+#: ../plugins/default-source/default-source.c:192
+msgid "Mark as _default task list"
+msgstr "Marcáil mar liosta tascanna _réamhshocraithe"
+
+#: ../plugins/default-source/default-source.c:193
+msgid "Mark as _default memo list"
+msgstr "Marcáil mar liosta meamram _réamhshocraithe"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+msgid "Default Sources"
+msgstr "Foinsí Réamhshocraithe"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid "Mark your preferred address book and calendar as default."
+msgstr ""
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "Liosta Cheanntásc Saincheaptha"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:322
+#, fuzzy
+msgctxt "email-custom-header-Security"
+msgid "Security:"
+msgstr "Slándáil:"
+
+#: ../plugins/email-custom-header/email-custom-header.c:326
+msgctxt "email-custom-header-Security"
+msgid "Personal"
+msgstr "Pearsanta"
+
+#: ../plugins/email-custom-header/email-custom-header.c:327
+#, fuzzy
+msgctxt "email-custom-header-Security"
+msgid "Unclassified"
+msgstr "Gan Siniú"
+
+#: ../plugins/email-custom-header/email-custom-header.c:328
+#, fuzzy
+msgctxt "email-custom-header-Security"
+msgid "Protected"
+msgstr "Cruthaithe"
+
+#: ../plugins/email-custom-header/email-custom-header.c:329
+msgctxt "email-custom-header-Security"
+msgid "Confidential"
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:330
+#, fuzzy
+msgctxt "email-custom-header-Security"
+msgid "Secret"
+msgstr "Scór"
+
+#: ../plugins/email-custom-header/email-custom-header.c:331
+#, fuzzy
+msgctxt "email-custom-header-Security"
+msgid "Top secret"
+msgstr "Scór"
+
+#: ../plugins/email-custom-header/email-custom-header.c:388
+#, fuzzy
+msgctxt "email-custom-header"
+msgid "None"
+msgstr "Neamhní"
+
+#: ../plugins/email-custom-header/email-custom-header.c:584
+msgid "_Custom Header"
+msgstr "Ceanntásc _Saincheaptha"
+
+#. 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:847
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:901
+msgid "Key"
+msgstr "Eochair"
+
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:468
+msgid "Values"
+msgstr "Luachanna"
+
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Add custom headers to outgoing mail messages."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "Ceanntásc Saincheaptha"
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
+msgid "Email Custom Header"
+msgstr "Ceanntásc Ríomhphoist Saincheaptha"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
+msgid "Default External Editor"
+msgstr "Eagarthóir Seachtrach Réamhshocraithe"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
+msgid "The default command that must be used as the editor."
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:121
+msgid "Command to be executed to launch the editor: "
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:122
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
+msgstr ""
+"Le haghaidh Emacs úsáid \"xemacs\"\n"
+"Le haghaidh VI úsáid \"gvim -f\""
+
+#: ../plugins/external-editor/external-editor.c:402
+#: ../plugins/external-editor/external-editor.c:404
+msgid "Compose in External Editor"
+msgstr "Cum in Eagarthóir Seachtrach"
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+msgid "External Editor"
+msgstr "Eagarthóir Seachtrach"
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr "Ní féidir Comhad Sealadach a chruthú"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
+msgid "Editor not launchable"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+#, fuzzy
+msgid "External editor still running"
+msgstr "Cumraigh an tEagarthóir"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
+msgid "Insert Face picture by default"
+msgstr ""
+
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
+msgid ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+msgstr ""
+
+#: ../plugins/face/face.c:292
+#, fuzzy
+msgid "Select a Face Picture"
+msgstr "Roghnaigh Comhad"
+
+#: ../plugins/face/face.c:302
+#, fuzzy
+msgid "Image files"
+msgstr "Comhaid nua ríomhphoist á n-iompórtáil..."
+
+#: ../plugins/face/face.c:359
+msgid "_Insert Face picture by default"
+msgstr ""
+
+#: ../plugins/face/face.c:370
+msgid "Load new _Face picture"
+msgstr ""
+
+#: ../plugins/face/face.c:429
+#, fuzzy
+msgid "Include _Face"
+msgstr "Sná&itheanna ar a dtugtar neamhaird"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid "Attach a small picture of your face to outgoing messages."
+msgstr ""
+
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+msgid "Failed Read"
+msgstr ""
+
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+#, fuzzy
+msgid "Invalid Image Size"
+msgstr "Luach Dáta Neamhbhailí"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:3
+#, fuzzy
+msgid "Not an image"
+msgstr "_Gan íomhá"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:4
+#, fuzzy
+msgid "Please select an image of size 48 * 48"
+msgstr "Roghnaigh úsáideoir le do thoil."
+
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+#, fuzzy
+msgid "The file cannot be read"
+msgstr "Níorbh fhéidir an mhír a sheoladh!\n"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid "The file you selected does not look like a valid .png image. Error: {0}"
+>>>>>>> master
 msgstr ""
 "Seoladh teachtaireacht chuig:\n"
 "%1%2"
 
+<<<<<<< HEAD
 #: ../plugins/itip-formatter/itip-formatter.c:1561
 #, fuzzy
 msgid "Memo information sent"
+=======
+#: ../plugins/google-account-setup/google-contacts-source.c:325
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#, fuzzy
+msgid "Server"
+msgstr "_Freastalaí:"
+
+#: ../plugins/google-account-setup/google-source.c:459
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+>>>>>>> master
 msgstr ""
 "Seoladh teachtaireacht chuig:\n"
 "%1%2"
 
+<<<<<<< HEAD
 #: ../plugins/itip-formatter/itip-formatter.c:1570
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
@@ -18802,10 +34296,1574 @@ msgid "UID"
 msgstr "UID"
 
 #: ../plugins/save-calendar/csv-format.c:364
+=======
+#: ../plugins/google-account-setup/google-source.c:576
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+
+#: ../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 "Earráid anaithnid."
+
+#: ../plugins/google-account-setup/google-source.c:679
+msgid "Cal_endar:"
+msgstr "_Féilire:"
+
+#: ../plugins/google-account-setup/google-source.c:714
+#, fuzzy
+msgid "Retrieve _List"
+msgstr "`%s' á Fháil"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+msgid "Add Google Calendars to Evolution."
+msgstr ""
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+#, fuzzy
+msgid "Google Calendars"
+msgstr "Féilire Gnome"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+#, fuzzy
+msgid "Inline Image"
+msgstr "vCardanna Iomadúla"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+msgid "View image attachments directly in mail messages."
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.c:337
+#: ../plugins/imap-features/imap-headers.ui.h:2
+msgid "Custom Headers"
+msgstr "Ceanntásca Saincheaptha"
+
+#: ../plugins/imap-features/imap-headers.c:349
+#: ../plugins/imap-features/imap-headers.ui.h:5
+msgid "IMAP Headers"
+msgstr "Ceanntásca IMAP"
+
+#: ../plugins/imap-features/imap-headers.ui.h:1
+msgid "Basic and _Mailing List Headers (Default)"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.ui.h:3
+msgid ""
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
+"You can ignore this if you choose \"All Headers\"."
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.ui.h:6
+msgid ""
+"Select your IMAP Header Preferences. \n"
+"The more headers you have the more time it will take to download."
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.ui.h:8
+msgid ""
+"_Basic Headers (Fastest) \n"
+"Use this if you do not have filters based on mailing lists"
+msgstr ""
+
+#: ../plugins/imap-features/imap-headers.ui.h:10
+#, fuzzy
+msgid "_Fetch All Headers"
+msgstr "Faigh _Gach Ceanntásc"
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
+msgid "Fine-tune your IMAP accounts."
+msgstr ""
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+#, fuzzy
+msgid "IMAP Features"
+msgstr "Ardtréithe"
+
+#. Translators: The first '%s' is replaced with a calendar name,
+#. * the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:499
+#, fuzzy, c-format
+msgid "Failed to load the calendar '%s' (%s)"
+msgstr "Comhad féilire le luchtú"
+
+#: ../plugins/itip-formatter/itip-formatter.c:659
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:683
+#, fuzzy, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "Taispeáin &Tascanna san Fhéilire"
+
+#: ../plugins/itip-formatter/itip-formatter.c:789
+#, fuzzy
+msgid "Unable to find any calendars"
+msgstr "Ní féidir an soláthraí cuardaigh a aimsiú."
+
+#: ../plugins/itip-formatter/itip-formatter.c:796
+msgid "Unable to find this meeting in any calendar"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:800
+msgid "Unable to find this task in any task list"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:804
+msgid "Unable to find this memo in any memo list"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1082
+#, fuzzy
+msgid "Opening the calendar. Please wait..."
+msgstr "Féilire á oscailt"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1085
+msgid "Searching for an existing version of this appointment"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1362
+#, fuzzy
+msgid "Unable to parse item"
+msgstr "Earráid: Ní féidir an comhad %1 a pharsáil.\n"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1451
+#, fuzzy, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr "Ní féidir sonraí an fhéilire a léamh: "
+
+#: ../plugins/itip-formatter/itip-formatter.c:1463
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1467
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1472
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1477
+#, c-format
+msgid "Sent to calendar '%s' as canceled"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1579
+#, fuzzy, c-format
+msgid "Organizer has removed the delegate %s "
+msgstr "Bainte"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+msgid "Sent a cancelation notice to the delegate"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1588
+#, fuzzy
+msgid "Could not send the cancelation notice to the delegate"
+msgstr "Teíp ag dealaigh fillteán: %s"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1700
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1729
+#, fuzzy, c-format
+msgid "Unable to update attendee. %s"
+msgstr "Ní féidir sonraí an leabhair seoltaí a nuashonrú: "
+
+#: ../plugins/itip-formatter/itip-formatter.c:1733
+#, fuzzy
+msgid "Attendee status updated"
+msgstr "Sealadach"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1737
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1759
+#, fuzzy
+msgid "Meeting information sent"
+msgstr ""
+"Seoladh teachtaireacht chuig:\n"
+"%1%2"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1762
+#, fuzzy
+msgid "Task information sent"
+msgstr ""
+"Seoladh teachtaireacht chuig:\n"
+"%1%2"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1765
+#, fuzzy
+msgid "Memo information sent"
+msgstr ""
+"Seoladh teachtaireacht chuig:\n"
+"%1%2"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1774
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1777
+msgid "Unable to send task information, the task does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1780
+msgid "Unable to send memo information, the memo does not exist"
+msgstr ""
+
+#. Translators: This is a default filename for a calendar.
+#: ../plugins/itip-formatter/itip-formatter.c:1846
+#, fuzzy
+msgid "calendar.ics"
+msgstr "Féilirí"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1851
+#, fuzzy
+msgid "Save Calendar"
+msgstr "Féilire Nua"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1914
+#: ../plugins/itip-formatter/itip-formatter.c:1925
+#, fuzzy
+msgid "The calendar attached is not valid"
+msgstr "Níl an t-am sonraithe bailí."
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:2008
+msgid "The calendar attached contains multiple items"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:2009
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:2672
+msgctxt "cal-itip"
+msgid "None"
+msgstr "Neamhní"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2688
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:2806
+#, fuzzy
+msgid "This meeting recurs"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2809
+#, fuzzy
+msgid "This task recurs"
+msgstr "Mionathraigh an Tasc seo..."
+
+#: ../plugins/itip-formatter/itip-formatter.c:2812
+#, fuzzy
+msgid "This memo recurs"
+msgstr "Name=Comhad Meamraim"
+
+#: ../plugins/itip-formatter/itip-formatter.c:3036
+#, fuzzy
+msgid "Meeting Invitations"
+msgstr ""
+"Seoladh teachtaireacht chuig:\n"
+"%1%2"
+
+#. Delete message after acting
+#. FIXME Need a schema for this
+#: ../plugins/itip-formatter/itip-formatter.c:3061
+#, fuzzy
+msgid "_Delete message after acting"
+msgstr "Scrios Dialóga Dúnta tar éis (Lá)"
+
+#: ../plugins/itip-formatter/itip-formatter.c:3071
+#: ../plugins/itip-formatter/itip-formatter.c:3104
+#, fuzzy
+msgid "Conflict Search"
+msgstr "Inneall Cuardaigh"
+
+#. Source selector
+#: ../plugins/itip-formatter/itip-formatter.c:3086
+msgid "Select the calendars to search for meeting conflicts"
+msgstr ""
+
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:196
+msgid "Today %H:%M"
+msgstr "Inniu %H:%M"
+
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:200
+msgid "Today %H:%M:%S"
+msgstr "Inniu %H:%M:%S"
+
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:209
+msgid "Today %l:%M:%S %p"
+msgstr "Inniu %l:%M:%S %p"
+
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:224
+msgid "Tomorrow %H:%M"
+msgstr "Amárach %H:%M"
+
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:228
+msgid "Tomorrow %H:%M:%S"
+msgstr "Amárach %H:%M:%S"
+
+#. strftime format of a time,
+#. * in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:233
+msgid "Tomorrow %l:%M %p"
+msgstr "Amárach %l:%M %p"
+
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:237
+msgid "Tomorrow %l:%M:%S %p"
+msgstr "Amárach %l:%M:%S %p"
+
+#. strftime format of a weekday.
+#: ../plugins/itip-formatter/itip-view.c:256
+#, c-format
+msgid "%A"
+msgstr "%A"
+
+#. strftime format of a weekday and a
+#. * time, in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:261
+msgid "%A %H:%M"
+msgstr "%A %H:%M"
+
+#. strftime format of a weekday and a
+#. * time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:265
+msgid "%A %H:%M:%S"
+msgstr "%A %H:%M:%S"
+
+#. strftime format of a weekday and a
+#. * time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:270
+msgid "%A %l:%M %p"
+msgstr "%A %l:%M %p"
+
+#. strftime format of a weekday and a
+#. * time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:274
+msgid "%A %l:%M:%S %p"
+msgstr "%A %I:%M:%S %p"
+
+#. strftime format of a weekday and a date
+#. * without a year.
+#: ../plugins/itip-formatter/itip-view.c:283
+msgid "%A, %B %e"
+msgstr "%A, %e %B"
+
+#. strftime format of a weekday, a date
+#. * without a year and a time,
+#. * in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:289
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %e %B %H:%M"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:293
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%A, %e %B %H:%M:%S"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:298
+msgid "%A, %B %e %l:%M %p"
+msgstr "%A, %e %B %l:%M %p"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:302
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %e %B %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: ../plugins/itip-formatter/itip-view.c:308
+msgid "%A, %B %e, %Y"
+msgstr "%A, %e %B, %Y"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:313
+msgid "%A, %B %e, %Y %H:%M"
+msgstr "%A, %e %B, %Y %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:317
+msgid "%A, %B %e, %Y %H:%M:%S"
+msgstr "%A, %e %B, %Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:322
+msgid "%A, %B %e, %Y %l:%M %p"
+msgstr "%A, %e %B, %Y %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:326
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%A, %e %B, %Y %l:%M:%S %p"
+
+#: ../plugins/itip-formatter/itip-view.c: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 "Duine anaithnid"
+
+#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
+#, fuzzy, c-format
+msgid "Please respond on behalf of %s"
+msgstr "Ar fanacht (logánta)"
+
+#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:546
+#, fuzzy, c-format
+msgid "Received on behalf of %s"
+msgstr "Ar fanacht (logánta)"
+
+#: ../plugins/itip-formatter/itip-view.c:376
+#, fuzzy, c-format
+msgid "%s through %s has published the following meeting information:"
+msgstr "Foilsíodh an tasc seo"
+
+#: ../plugins/itip-formatter/itip-view.c:378
+#, fuzzy, c-format
+msgid "%s has published the following meeting information:"
+msgstr "Tharla an earráid inmheánach a leanas: "
+
+#: ../plugins/itip-formatter/itip-view.c:383
+#, fuzzy, c-format
+msgid "%s has delegated the following meeting to you:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../plugins/itip-formatter/itip-view.c:386
+#, fuzzy, c-format
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../plugins/itip-formatter/itip-view.c:388
+#, fuzzy, c-format
+msgid "%s requests your presence at the following meeting:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../plugins/itip-formatter/itip-view.c:394
+#, fuzzy, c-format
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "Cuir meamram nua leis an mbunachar sonraí."
+
+#: ../plugins/itip-formatter/itip-view.c:396
+#, fuzzy, c-format
+msgid "%s wishes to add to an existing meeting:"
+msgstr "Cuir meamram nua leis an mbunachar sonraí."
+
+#: ../plugins/itip-formatter/itip-view.c:400
+#, fuzzy, c-format
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../plugins/itip-formatter/itip-view.c:402
+#, c-format
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:406
+#, fuzzy, c-format
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../plugins/itip-formatter/itip-view.c:408
+#, fuzzy, c-format
+msgid "%s has sent back the following meeting response:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../plugins/itip-formatter/itip-view.c:412
+#, fuzzy, c-format
+msgid "%s through %s has canceled the following meeting:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../plugins/itip-formatter/itip-view.c:414
+#, fuzzy, c-format
+msgid "%s has canceled the following meeting."
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../plugins/itip-formatter/itip-view.c:418
+#, fuzzy, c-format
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../plugins/itip-formatter/itip-view.c:420
+#, fuzzy, c-format
+msgid "%s has proposed the following meeting changes."
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../plugins/itip-formatter/itip-view.c:424
+#, fuzzy, c-format
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../plugins/itip-formatter/itip-view.c:426
+#, fuzzy, c-format
+msgid "%s has declined the following meeting changes."
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../plugins/itip-formatter/itip-view.c:464
+#, fuzzy, c-format
+msgid "%s through %s has published the following task:"
+msgstr "Foilsíodh an tasc seo"
+
+#: ../plugins/itip-formatter/itip-view.c:466
+#, fuzzy, c-format
+msgid "%s has published the following task:"
+msgstr "Foilsíodh an tasc seo"
+
+#: ../plugins/itip-formatter/itip-view.c:471
+#, c-format
+msgid "%s requests the assignment of %s to the following task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:474
+#, fuzzy, c-format
+msgid "%s through %s has assigned you a task:"
+msgstr "Tá $a díreach tar éis tú a bhípeáil!"
+
+#: ../plugins/itip-formatter/itip-view.c:476
+#, fuzzy, c-format
+msgid "%s has assigned you a task:"
+msgstr "Tá $a díreach tar éis tú a bhípeáil!"
+
+#: ../plugins/itip-formatter/itip-view.c:482
+#, fuzzy, c-format
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "Cuir an tasc seo leis an phainéal"
+
+#: ../plugins/itip-formatter/itip-view.c:484
+#, fuzzy, c-format
+msgid "%s wishes to add to an existing task:"
+msgstr "Cuir an tasc seo leis an phainéal"
+
+#: ../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 ""
+
+#: ../plugins/itip-formatter/itip-view.c:490
+#, c-format
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:494
+#, fuzzy, c-format
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr "Foilsíodh an tasc seo"
+
+#: ../plugins/itip-formatter/itip-view.c:496
+#, c-format
+msgid "%s has sent back the following assigned task response:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:500
+#, fuzzy, c-format
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../plugins/itip-formatter/itip-view.c:502
+#, fuzzy, c-format
+msgid "%s has canceled the following assigned task:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../plugins/itip-formatter/itip-view.c:506
+#, fuzzy, c-format
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr "Foilsíodh an tasc seo"
+
+#: ../plugins/itip-formatter/itip-view.c:508
+#, fuzzy, c-format
+msgid "%s has proposed the following task assignment changes:"
+msgstr "Foilsíodh an tasc seo"
+
+#: ../plugins/itip-formatter/itip-view.c:512
+#, fuzzy, c-format
+msgid "%s through %s has declined the following assigned task:"
+msgstr "Foilsíodh an tasc seo"
+
+#: ../plugins/itip-formatter/itip-view.c:514
+#, fuzzy, c-format
+msgid "%s has declined the following assigned task:"
+msgstr "Foilsíodh an tasc seo"
+
+#: ../plugins/itip-formatter/itip-view.c:551
+#, fuzzy, c-format
+msgid "%s through %s has published the following memo:"
+msgstr "Foilsíodh an tasc seo"
+
+#: ../plugins/itip-formatter/itip-view.c:553
+#, fuzzy, c-format
+msgid "%s has published the following memo:"
+msgstr "Tharla an earráid inmheánach a leanas: "
+
+#: ../plugins/itip-formatter/itip-view.c:558
+#, fuzzy, c-format
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "Cuir meamram nua leis an mbunachar sonraí."
+
+#: ../plugins/itip-formatter/itip-view.c:560
+#, fuzzy, c-format
+msgid "%s wishes to add to an existing memo:"
+msgstr "Cuir meamram nua leis an mbunachar sonraí."
+
+#: ../plugins/itip-formatter/itip-view.c:564
+#, fuzzy, c-format
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../plugins/itip-formatter/itip-view.c:566
+#, fuzzy, c-format
+msgid "%s has canceled the following shared memo:"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../plugins/itip-formatter/itip-view.c:690
+msgid "All day:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:700
+#, fuzzy
+msgid "Start day:"
+msgstr "Dáta to_saigh:"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:700
+#: ../plugins/itip-formatter/itip-view.c:1062
+msgid "Start time:"
+msgstr "Am tosaithe:"
+
+#: ../plugins/itip-formatter/itip-view.c:712
+#, fuzzy
+msgid "End day:"
+msgstr "%d lá"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:712
+#: ../plugins/itip-formatter/itip-view.c:1073
+msgid "End time:"
+msgstr "Am deiridh:"
+
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:848
+msgid "_Open Calendar"
+msgstr "_Oscail Féilire"
+
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../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 "_Diúltaigh"
+
+#: ../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
+#, fuzzy
+msgid "A_ccept"
+msgstr "Glac Leis"
+
+#: ../plugins/itip-formatter/itip-view.c:858
+#, fuzzy
+msgid "_Decline all"
+msgstr "Gach Comhad"
+
+#: ../plugins/itip-formatter/itip-view.c:859
+#, fuzzy
+msgid "_Tentative all"
+msgstr "Gach Comhad"
+
+#: ../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
+#, fuzzy
+msgid "_Tentative"
+msgstr "Sealadach"
+
+#: ../plugins/itip-formatter/itip-view.c:860
+#, fuzzy
+msgid "A_ccept all"
+msgstr "Glac Uile"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:871
+msgid "_Send Information"
+msgstr "_Seol Eolas"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:875
+#, fuzzy
+msgid "_Update Attendee Status"
+msgstr "Sealadach"
+
+#: ../plugins/itip-formatter/itip-view.c:878
+msgid "_Update"
+msgstr "_Nuashonraigh"
+
+#. Comment
+#: ../plugins/itip-formatter/itip-view.c:1093
+#: ../plugins/itip-formatter/itip-view.c:1147
+msgid "Comment:"
+msgstr "Nóta:"
+
+#: ../plugins/itip-formatter/itip-view.c:1132
+msgid "Send _reply to sender"
+msgstr "Seol _freagra don seoltóir"
+
+#: ../plugins/itip-formatter/itip-view.c:1162
+#, fuzzy
+msgid "Send _updates to attendees"
+msgstr "(Ath)sheol Údarú Go"
+
+#: ../plugins/itip-formatter/itip-view.c:1171
+#, fuzzy
+msgid "_Apply to all instances"
+msgstr "Cuir i bhfeidhm i ng&ach fheidhmchlár"
+
+#: ../plugins/itip-formatter/itip-view.c:1180
+#, fuzzy
+msgid "Show time as _free"
+msgstr "Taispeáin colúi&n mar uimhreacha"
+
+#: ../plugins/itip-formatter/itip-view.c:1183
+msgid "_Preserve my reminder"
+msgstr ""
+
+#. To Translators: This is a check box to inherit a reminder.
+#: ../plugins/itip-formatter/itip-view.c:1189
+#, fuzzy
+msgid "_Inherit reminder"
+msgstr "&Scoránaigh Meabhrúchán"
+
+#: ../plugins/itip-formatter/itip-view.c:1965
+msgid "_Tasks:"
+msgstr "_Tascanna:"
+
+#: ../plugins/itip-formatter/itip-view.c:1967
+msgid "_Memos:"
+msgstr "_Meamraim:"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
+#, fuzzy
+msgid "Itip Formatter"
+msgstr "GenericName=Uirlis Fhormáidithe Dioscaí Boga"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+#, fuzzy
+msgid "This meeting has been delegated"
+msgstr "Cealaíodh an cruinniú seo"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+#, fuzzy
+msgid "Beep or play sound file."
+msgstr "Roghnaigh Comhad Fuaime"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Enable icon in notification area."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+#, fuzzy
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr "Ar theacht teachtaireachtaí nua i"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+#, fuzzy
+msgid "Notify new messages for Inbox only."
+msgstr "Bog Teachtaireachtaí go Fillteán"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Ar theacht teachtaireachtaí nua i"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#, fuzzy
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr "Ar theacht teachtaireachtaí nua i"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+msgid "Sound file name to be played."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+msgid "Use sound theme"
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid "Whether play sound or beep when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:391
+#, fuzzy, c-format
+msgid ""
+"You have received %d new message\n"
+"in %s."
+msgid_plural ""
+"You have received %d new messages\n"
+"in %s."
+msgstr[0] "Oscail &Teachtaireacht i bhFuinneog Nua"
+msgstr[1] "Oscail &Teachtaireacht i bhFuinneog Nua"
+msgstr[2] "Oscail &Teachtaireacht i bhFuinneog Nua"
+msgstr[3] "Oscail &Teachtaireacht i bhFuinneog Nua"
+msgstr[4] "Oscail &Teachtaireacht i bhFuinneog Nua"
+
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:416
+#, c-format
+msgid "Subject: %s"
+msgstr "�bhar: %s"
+
+#: ../plugins/mail-notification/mail-notification.c:427
+#, fuzzy, c-format
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
+msgstr[0] "Oscail &Teachtaireacht i bhFuinneog Nua"
+msgstr[1] "Oscail &Teachtaireacht i bhFuinneog Nua"
+msgstr[2] "Oscail &Teachtaireacht i bhFuinneog Nua"
+msgstr[3] "Oscail &Teachtaireacht i bhFuinneog Nua"
+msgstr[4] "Oscail &Teachtaireacht i bhFuinneog Nua"
+
+#: ../plugins/mail-notification/mail-notification.c:436
+#: ../plugins/mail-notification/mail-notification.c:444
+#: ../plugins/mail-notification/mail-notification.c:447
+msgid "New email"
+msgstr "Ríomhphost nua"
+
+#. Translators: The '%s' is a mail
+#. * folder name.  (e.g. "Show Inbox")
+#: ../plugins/mail-notification/mail-notification.c:468
+#, fuzzy, c-format
+msgid "Show %s"
+msgstr "Taispeáin Réimsí"
+
+#: ../plugins/mail-notification/mail-notification.c:673
+#, fuzzy
+msgid "_Play sound when a new message arrives"
+msgstr "Ar theacht teachtaireachtaí nua i"
+
+#: ../plugins/mail-notification/mail-notification.c:703
+msgid "_Beep"
+msgstr "_Bíp"
+
+#: ../plugins/mail-notification/mail-notification.c:716
+msgid "Use sound _theme"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:735
+#, fuzzy
+msgid "Play _file:"
+msgstr "Seinn comhad _fuaime"
+
+#: ../plugins/mail-notification/mail-notification.c:744
+msgid "Select sound file"
+msgstr "Roghnaigh comhad fuaime"
+
+#: ../plugins/mail-notification/mail-notification.c:801
+msgid "Notify new messages for _Inbox only"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:811
+#, fuzzy
+msgid "Show _notification when a new message arrives"
+msgstr "Ar theacht teachtaireachtaí nua i"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+#, fuzzy
+msgid "Mail Notification"
+msgstr "&Fógairt an Chórais"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#, fuzzy
+msgid "Notifies you when new mail messages arrive."
+msgstr "Ar theacht teachtaireachtaí nua i"
+
+#. 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:239
+#, c-format
+msgid "Created from a mail by %s"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:658
+#, fuzzy
+msgid "Do you wish to continue converting remaining mails?"
+msgstr "Ar mhaith leat é a fhorscríobh?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:733
+msgid "[No Summary]"
+msgstr "[Gan Achoimre]"
+
+#: ../plugins/mail-to-task/mail-to-task.c:745
+msgid "Invalid object returned from a server"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:795
+#, fuzzy, c-format
+msgid "An error occurred during processing: %s"
+msgstr "Tharla earráid anaithnid le linn priontála."
+
+#: ../plugins/mail-to-task/mail-to-task.c:820
+#, fuzzy, c-format
+msgid "Cannot open calendar. %s"
+msgstr "Ní féidir an comhad %1 a oscailt"
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:1084
+#, fuzzy, c-format
+msgid "Cannot get source list. %s"
+msgstr ""
+"Teip ag cruthaigh comhad aschur: %s:\n"
+" %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1145
+#, fuzzy
+msgid "No writable calendar is available."
+msgstr "Gan chur síos le fáil."
+
+#: ../plugins/mail-to-task/mail-to-task.c:1237
+msgid "Create an _Event"
+msgstr "Cruthaigh T_eagmhas"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1239
+msgid "Create a new event from the selected message"
+msgstr "Cruthaigh teagmhas nua ón dteachtaireacht roghnaithe"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1244
+msgid "Create a Mem_o"
+msgstr "Cruthaigh Meamr_am"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1246
+msgid "Create a new memo from the selected message"
+msgstr "Cruthaigh meamram nua ón dteachtaireacht roghnaithe"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1251
+msgid "Create a _Task"
+msgstr "Cruthaigh _Tasc"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1253
+msgid "Create a new task from the selected message"
+msgstr "Cruthaigh tasc nua ón dteachtaireacht roghnaithe"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1261
+msgid "Create a _Meeting"
+msgstr "Cruthaigh _Cruinniú"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1263
+msgid "Create a new meeting from the selected message"
+msgstr "Cruthaigh cruinniú nua ón dteachtaireacht roghnaithe"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#, fuzzy
+msgid "Convert a mail message to a task."
+msgstr "Post an sceál seo"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:346
+msgid "Get List _Archive"
+msgstr "Faigh C_artlann an Liosta"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:348
+msgid "Get an archive of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:353
+msgid "Get List _Usage Information"
+msgstr "Faigh Eolas Ú_sáide an Liosta"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:355
+msgid "Get information about the usage of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:360
+msgid "Contact List _Owner"
+msgstr "Déan Teagmháil le hÚ_inéir Liosta"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:362
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
+msgid "_Post Message to List"
+msgstr "_Postáil Teachtaireacht go Liosta"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
+msgid "Post a message to the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
+msgid "_Subscribe to List"
+msgstr "_Liostáil le Liosta"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
+msgid "_Unsubscribe from List"
+msgstr "_Díliostáil ó Liosta"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
+msgid "Unsubscribe from the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
+msgid "Mailing _List"
+msgstr "Liosta _Postála"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#, fuzzy
+msgid "Mailing List Actions"
+msgstr "&Liosta ríomhphoist na teanga:"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+#, fuzzy
+msgid "Action not available"
+msgstr "Níl comhbhrúiteoir ar fáil"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
+msgid ""
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
+msgid "Malformed header"
+msgstr "Ceanntásc míchumtha"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+#, fuzzy
+msgid "No e-mail action"
+msgstr "Níl aon ghníomh socraithe"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
+#, fuzzy
+msgid "Posting not allowed"
+msgstr "Ní cheadaítear spásanna"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+#, fuzzy
+msgid "Send e-mail message to mailing list?"
+msgstr "Post sceál do tadhall"
+
+#: ../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"
+"\n"
+"Header: {0}"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
+msgid ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+msgid ""
+"This message does not contain the header information required for this "
+"action."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
+msgid "_Edit message"
+msgstr "Cuir teachtaireacht in _eagar"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
+msgid "_Send message"
+msgstr "_Seol teachtaireacht"
+
+#: ../plugins/mark-all-read/mark-all-read.c:42
+#, fuzzy
+msgid "Also mark messages in subfolders?"
+msgstr "Bog Teachtaireachtaí go Fillteán"
+
+#: ../plugins/mark-all-read/mark-all-read.c:44
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr ""
+
+#: ../plugins/mark-all-read/mark-all-read.c:215
+#, fuzzy
+msgid "In Current Folder and _Subfolders"
+msgstr "Cruthaigh fillteán"
+
+#: ../plugins/mark-all-read/mark-all-read.c:229
+#, fuzzy
+msgid "In Current _Folder Only"
+msgstr "Fillteán Reatha"
+
+#: ../plugins/mark-all-read/mark-all-read.c:575
+msgid "Mark Me_ssages as Read"
+msgstr "Marcáil _Teachtaireachtaí mar Léite"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+#, fuzzy
+msgid "Mark All Read"
+msgstr "Marcáil mar léite"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+#, fuzzy
+msgid "Mark all messages in a folder as read."
+msgstr "Marcáil teachtaireachtaí mar &leite ó:"
+
+#. but then we also need to create our own section frame
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
+msgid "Plain Text Mode"
+msgstr "Mód Gnáth-Théacs"
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Prefer Plain Text"
+msgstr "Úsáid Gnáth-Théacs de Rogha"
+
+#: ../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 ""
+"Amharc ar theachtaireachtaí poist mar ghnáth-théacs, fiú má tá ábhar HTML "
+"ann."
+
+#: ../plugins/prefer-plain/prefer-plain.c:251
+msgid "Show HTML if present"
+msgstr "Taispeáin HTML má tá sé ann"
+
+#: ../plugins/prefer-plain/prefer-plain.c:252
+msgid "Let Evolution choose the best part to show."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:255
+#, fuzzy
+msgid "Show plain text if present"
+msgstr "Taispeáin HTML má tá sé ann"
+
+#: ../plugins/prefer-plain/prefer-plain.c:256
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:260
+#, fuzzy
+msgid "Only ever show plain text"
+msgstr "Ná taispeáin ach PLAIN"
+
+#: ../plugins/prefer-plain/prefer-plain.c:261
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:313
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:333
+msgid "HTML _Mode"
+msgstr "_Mód HTML"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+#, fuzzy
+msgid "Import Outlook messages from PST file"
+msgstr "Iompórtáil Ó Phost OS X"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+#, fuzzy
+msgid "Outlook PST import"
+msgstr "Comhphairt Coimriú Evolution"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr ""
+
+#: ../plugins/pst-import/pst-importer.c:450
+msgid "_Mail"
+msgstr "_Post"
+
+#: ../plugins/pst-import/pst-importer.c:469
+msgid "Destination folder:"
+msgstr "Sprioc-fhillteán:"
+
+#: ../plugins/pst-import/pst-importer.c:475
+msgid "_Address Book"
+msgstr "Lea_bhar Seoltaí"
+
+#: ../plugins/pst-import/pst-importer.c:476
+msgid "A_ppointments"
+msgstr "_Coinní"
+
+#: ../plugins/pst-import/pst-importer.c:477 ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "T_ascanna"
+
+#: ../plugins/pst-import/pst-importer.c:478
+#, fuzzy
+msgid "_Journal entries"
+msgstr "Iris"
+
+#: ../plugins/pst-import/pst-importer.c:585
+#, fuzzy
+msgid "Importing Outlook data"
+msgstr "Earráid agus Sonraí á nIompórtáil"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../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 "Foilsiú Féilirí"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+msgid "Locations"
+msgstr "Suíomhanna"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#, fuzzy
+msgid "Publish calendars to the web."
+msgstr "Roghnaigh na míreanna atá le priontáil"
+
+#: ../plugins/publish-calendar/publish-calendar.c:216
+#: ../plugins/publish-calendar/publish-calendar.c:471
+#, c-format
+msgid "Could not open %s:"
+msgstr "Níorbh fhéidir %s a oscailt:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:218
+#, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "Níorbh fhéidir %s a oscailt: Earráid anaithnid"
+
+#: ../plugins/publish-calendar/publish-calendar.c:238
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:240
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:288
+#, c-format
+msgid "Mount of %s failed:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:619
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "E_nable"
+msgstr "_Cumasaigh"
+
+#: ../plugins/publish-calendar/publish-calendar.c:767
+#, fuzzy
+msgid "Are you sure you want to remove this location?"
+msgstr "An bhfuil tú cinnte gur main leat an chatagóir seo a bhaint?"
+
+#. 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
+#, fuzzy
+msgid "Could not create publish thread."
+msgstr "Níorbh Fhéidir an Teachtaireacht a Sheoladh"
+
+#: ../plugins/publish-calendar/publish-calendar.c:1107
+#, fuzzy
+msgid "_Publish Calendar Information"
+msgstr "Eolas faoin Fhillteán Líonra"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+#, fuzzy
+msgid "Custom Location"
+msgstr "&Fógairt an Chórais"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+msgid "Daily"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+msgid "FTP (with login)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+msgid "Manual (via Actions menu)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
+msgid "P_ort:"
+msgstr "_Port:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+#, fuzzy
+msgid "Public FTP"
+msgstr "Poiblí"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
+#, fuzzy
+msgid "Publishing Location"
+msgstr "Suíomh réamhshocraithe foilsithe"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
+#, fuzzy
+msgid "Publishing _Frequency:"
+msgstr "Minicíocht an Chloig"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Secure FTP (SSH)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "Secure WebDAV (HTTPS)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:17
+#, fuzzy
+msgid "Service _type:"
+msgstr "Cineál na Seirbhíse"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+#, fuzzy
+msgid "Sources"
+msgstr "Foinse"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:19
+#, fuzzy
+msgid "Time _duration:"
+msgstr "Am _Críos:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+#, fuzzy
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+#, fuzzy
+msgid "Weekly"
+msgstr "Seachtain"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+#, fuzzy
+msgid "Windows share"
+msgstr "_Fuinneog"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+msgid "_File:"
+msgstr "_Comhad:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
+msgid "_Password:"
+msgstr "_Focal faire:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+msgid "_Publish as:"
+msgstr "_Foilsigh mar:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+msgid "_Remember password"
+msgstr "_Meabhraigh focal faire"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
+msgid "_Username:"
+msgstr "_Ainm úsáideora:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+msgid "iCal"
+msgstr "iCal"
+
+#: ../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 ""
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:518
+msgid "New Location"
+msgstr "Suíomh Nua"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:520
+msgid "Edit Location"
+msgstr "Cuir Suíomh in Eagar"
+
+#. 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:168
+msgid "%F %T"
+msgstr "%F %T"
+
+#: ../plugins/save-calendar/csv-format.c:382
+msgid "UID"
+msgstr "UID"
+
+#: ../plugins/save-calendar/csv-format.c:384
+>>>>>>> master
 #, fuzzy
 msgid "Description List"
 msgstr "Liosta Cainéal"
 
+<<<<<<< HEAD
 #: ../plugins/save-calendar/csv-format.c:365
 msgid "Categories List"
 msgstr "Liosta Catagóirí"
@@ -18831,19 +35889,55 @@ msgid "Due"
 msgstr "Spriocdháta"
 
 #: ../plugins/save-calendar/csv-format.c:373
+=======
+#: ../plugins/save-calendar/csv-format.c:385
+msgid "Categories List"
+msgstr "Liosta Catagóirí"
+
+#: ../plugins/save-calendar/csv-format.c:386
+msgid "Comment List"
+msgstr "Liosta Nótaí"
+
+#: ../plugins/save-calendar/csv-format.c:389
+msgid "Contact List"
+msgstr "Liosta Teagmhálacha"
+
+#: ../plugins/save-calendar/csv-format.c:390
+msgid "Start"
+msgstr "Tús"
+
+#: ../plugins/save-calendar/csv-format.c:391
+msgid "End"
+msgstr "Deireadh"
+
+#: ../plugins/save-calendar/csv-format.c:392
+msgid "Due"
+msgstr "Spriocdháta"
+
+#: ../plugins/save-calendar/csv-format.c:393
+>>>>>>> master
 #, fuzzy
 msgid "percent Done"
 msgstr "� Shábháil... Críochnaithe"
 
+<<<<<<< HEAD
 #: ../plugins/save-calendar/csv-format.c:375
 msgid "URL"
 msgstr "URL"
 
 #: ../plugins/save-calendar/csv-format.c:376
+=======
+#: ../plugins/save-calendar/csv-format.c:395
+msgid "URL"
+msgstr "URL"
+
+#: ../plugins/save-calendar/csv-format.c:396
+>>>>>>> master
 #, fuzzy
 msgid "Attendees List"
 msgstr "Liosta Cainéal"
 
+<<<<<<< HEAD
 #: ../plugins/save-calendar/csv-format.c:378
 msgid "Modified"
 msgstr "Athraithe"
@@ -18853,25 +35947,49 @@ msgid "A_dvanced options for the CSV format"
 msgstr ""
 
 #: ../plugins/save-calendar/csv-format.c:538
+=======
+#: ../plugins/save-calendar/csv-format.c:398
+msgid "Modified"
+msgstr "Athraithe"
+
+#: ../plugins/save-calendar/csv-format.c:573
+msgid "A_dvanced options for the CSV format"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:581
+>>>>>>> master
 #, fuzzy
 msgid "Prepend a _header"
 msgstr "Priontáil an &ceanntásc"
 
+<<<<<<< HEAD
 #: ../plugins/save-calendar/csv-format.c:547
+=======
+#: ../plugins/save-calendar/csv-format.c:590
+>>>>>>> master
 #, fuzzy
 msgid "_Value delimiter:"
 msgstr "&Teormharcóir idir eochairfhocail:"
 
+<<<<<<< HEAD
 #: ../plugins/save-calendar/csv-format.c:554
+=======
+#: ../plugins/save-calendar/csv-format.c:601
+>>>>>>> master
 #, fuzzy
 msgid "_Record delimiter:"
 msgstr "&Teormharcóir idir eochairfhocail:"
 
+<<<<<<< HEAD
 #: ../plugins/save-calendar/csv-format.c:561
+=======
+#: ../plugins/save-calendar/csv-format.c:612
+>>>>>>> master
 #, fuzzy
 msgid "_Encapsulate values with:"
 msgstr "RockRidge le díth ainm"
 
+<<<<<<< HEAD
 #: ../plugins/save-calendar/csv-format.c:583
 #, fuzzy
 msgid "Comma separated value format (.csv)"
@@ -18880,6 +35998,16 @@ msgstr "Comhad 'luachanna deighilte le camóga' (*.csv)"
 #: ../plugins/save-calendar/ical-format.c:162
 msgid "iCalendar format (.ics)"
 msgstr "Formáid iCalendar (.ics)"
+=======
+#: ../plugins/save-calendar/csv-format.c:638
+#, fuzzy
+msgid "Comma separated values (.csv)"
+msgstr "Comhad 'luachanna deighilte le camóga' (*.csv)"
+
+#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:225
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
+>>>>>>> master
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
@@ -18895,6 +36023,7 @@ msgstr "Sábháil an tadhallaí seo mar VCard."
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
+<<<<<<< HEAD
 #: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
@@ -18912,16 +36041,43 @@ msgid "Select destination file"
 msgstr "Roghnaigh sprioc-chomhad"
 
 #: ../plugins/save-calendar/save-calendar.c:336
+=======
+#: ../plugins/save-calendar/rdf-format.c:156
+msgid "%FT%T"
+msgstr "%FT%T"
+
+#: ../plugins/save-calendar/rdf-format.c:389
+msgid "RDF (.rdf)"
+msgstr "RDF (.rdf)"
+
+#: ../plugins/save-calendar/save-calendar.c:127
+msgid "_Format:"
+msgstr "_Formáid:"
+
+#: ../plugins/save-calendar/save-calendar.c:189
+msgid "Select destination file"
+msgstr "Roghnaigh sprioc-chomhad"
+
+#: ../plugins/save-calendar/save-calendar.c:344
+>>>>>>> master
 #, fuzzy
 msgid "Save the selected calendar to disk"
 msgstr "Post an sceál seo"
 
+<<<<<<< HEAD
 #: ../plugins/save-calendar/save-calendar.c:367
+=======
+#: ../plugins/save-calendar/save-calendar.c:375
+>>>>>>> master
 #, fuzzy
 msgid "Save the selected memo list to disk"
 msgstr "Post an sceál seo"
 
+<<<<<<< HEAD
 #: ../plugins/save-calendar/save-calendar.c:398
+=======
+#: ../plugins/save-calendar/save-calendar.c:406
+>>>>>>> master
 #, fuzzy
 msgid "Save the selected task list to disk"
 msgstr "Sábháil an tadhallaí seo mar VCard."
@@ -18939,11 +36095,16 @@ msgid ""
 "an email you are replying to."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../plugins/templates/templates.c:1063
+=======
+#: ../plugins/templates/templates.c:1094
+>>>>>>> master
 #, fuzzy
 msgid "No Title"
 msgstr "Gan teideal"
 
+<<<<<<< HEAD
 #: ../plugins/templates/templates.c:1164
 #, fuzzy
 msgid "Save as _Template"
@@ -18953,6 +36114,15 @@ msgstr "&Seol mar atá"
 #, fuzzy
 msgid "Save as Template"
 msgstr "Sábháil mar dréacht"
+=======
+#: ../plugins/templates/templates.c:1195
+msgid "Save as _Template"
+msgstr "Sábháil mar T_heimpléad"
+
+#: ../plugins/templates/templates.c:1197
+msgid "Save as Template"
+msgstr "Sábháil mar Theimpléad"
+>>>>>>> master
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
@@ -18974,29 +36144,47 @@ msgstr "vCardanna Iomadúla"
 msgid "Show vCards directly in mail messages."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../plugins/vcard-inline/vcard-inline.c:198
 #: ../plugins/vcard-inline/vcard-inline.c:283
+=======
+#: ../plugins/vcard-inline/vcard-inline.c:207
+#: ../plugins/vcard-inline/vcard-inline.c:292
+>>>>>>> master
 #, fuzzy
 msgid "Show Full vCard"
 msgstr "Taispeáin/Folaigh vCárta"
 
+<<<<<<< HEAD
 #: ../plugins/vcard-inline/vcard-inline.c:201
+=======
+#: ../plugins/vcard-inline/vcard-inline.c:210
+>>>>>>> master
 #, fuzzy
 msgid "Show Compact vCard"
 msgstr "Taispeáin/Folaigh vCárta"
 
+<<<<<<< HEAD
 #: ../plugins/vcard-inline/vcard-inline.c:262
+=======
+#: ../plugins/vcard-inline/vcard-inline.c:271
+>>>>>>> master
 #, fuzzy
 msgid "There is one other contact."
 msgstr "E427: Tá aon chlib chomhoiriúnach amháin"
 
+<<<<<<< HEAD
 #: ../plugins/vcard-inline/vcard-inline.c:271
+=======
+#: ../plugins/vcard-inline/vcard-inline.c:280
+>>>>>>> master
 #, fuzzy, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "E427: Tá aon chlib chomhoiriúnach amháin"
 msgstr[1] "agus aon carta eile."
 
+<<<<<<< HEAD
 #: ../plugins/vcard-inline/vcard-inline.c:292
 msgid "Save in Address Book"
 msgstr "Sábháil sa Leabhar Seoltaí"
@@ -19045,6 +36233,56 @@ msgstr "Staid fhuinneog réamhshocraithe"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:6
 #, fuzzy
+=======
+#: ../plugins/vcard-inline/vcard-inline.c:301
+msgid "Save in Address Book"
+msgstr "Sábháil sa Leabhar Seoltaí"
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "Add WebDAV contacts to Evolution."
+msgstr ""
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "Teagmhálacha WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:283
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:1
+msgid "Authenticate proxy server connections"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:2
+#, fuzzy
+msgid "Automatic proxy configuration URL"
+msgstr "Aithint uathoibríoch cineálacha"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Configuration version"
+msgstr "Leagan cumraíochta"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:4
+msgid "Default sidebar width"
+msgstr "Leithead barra taoibh réamhshocraithe"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:5
+#, fuzzy
+msgid "Default window X coordinate"
+msgstr "Staid fhuinneog réamhshocraithe"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+#, fuzzy
+>>>>>>> master
 msgid "Default window Y coordinate"
 msgstr "Staid fhuinneog réamhshocraithe"
 
@@ -19112,6 +36350,7 @@ msgstr "&Oscail Iatán"
 #, fuzzy
 msgid "Initial file chooser folder"
 msgstr "Cuir comhfhillteáin leis"
+<<<<<<< HEAD
 
 #: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Initial folder for GtkFileChooser dialogs."
@@ -19366,38 +36605,311 @@ msgid "All Files (*)"
 msgstr "Gach Comhad (*)"
 
 #: ../shell/e-shell-view.c:291
+=======
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+#, fuzzy
+msgid "Last upgraded configuration version"
+msgstr "Tá an leagan mícheart i gcomhad na cumraíochta."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
+msgid "Non-proxy hosts"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+#, fuzzy
+msgid "Proxy configuration mode"
+msgstr "Cumraíocht"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:28
+msgid "SOCKS proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:29
+msgid "SOCKS proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+msgid "Secure HTTP proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:31
+msgid "Secure HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:32
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:33
+#, fuzzy
+msgid "Sidebar is visible"
+msgstr "Tá an barra taoibh suiteáilte."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:34
+#, fuzzy
+msgid "Skip development warning dialog"
+msgstr "Tabhair foláireamh dom agus mé ar tí:"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
+msgid "Start in offline mode"
+msgstr "Tosaigh i mód as líne"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "Statusbar is visible"
+msgstr "Tá an barra stádais infheicthe"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+#, fuzzy
+msgid "The default X coordinate for the main window."
+msgstr "Leithead fuinneoige réamhshocraithe (i bpicteilíní)"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+#, fuzzy
+msgid "The default Y coordinate for the main window."
+msgstr "Leithead fuinneoige réamhshocraithe (i bpicteilíní)"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
+msgid "The default height for the main window, in pixels."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid "The default width for the main window, in pixels."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
+msgid "The default width for the sidebar, in pixels."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "The machine name to proxy HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "The machine name to proxy secure HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
+msgid "The machine name to proxy socks through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:49
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:50
+msgid ""
+"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
+"by the GNOME toolbar setting."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:51
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:52
+#, fuzzy
+msgid "Toolbar is visible"
+msgstr "($Arg1) dofheicthe"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:53
+#, fuzzy
+msgid "URL that provides proxy configuration values."
+msgstr "Tá an leagan mícheart i gcomhad na cumraíochta."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:54
+msgid "Use HTTP proxy"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:55
+msgid "Username to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:56
+msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:57
+#, fuzzy
+msgid "Whether or not the window should be maximized."
+msgstr "Cé acu atá an phríomhfhuinneog uasmhéadaithe nó nach bhfuil."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:58
+msgid "Whether the sidebar should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:59
+msgid "Whether the status bar should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:60
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:61
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:62
+msgid "Whether the window buttons should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:63
+#, fuzzy
+msgid "Window button style"
+msgstr "Roghnaigh stíl chnaipe"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:64
+#, fuzzy
+msgid "Window buttons are visible"
+msgstr "Níl aon teachtaireacht chlibeáilte le feiceáil!"
+
+#: ../shell/e-shell-content.c:728 ../shell/e-shell-content.c:729
+msgid "Searches"
+msgstr "Cuardaigh"
+
+#: ../shell/e-shell-content.c:772
+msgid "Save Search"
+msgstr "Sábháil Cuardach"
+
+#. Translators: The "Show:" label precedes a combo box that
+#. * 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
+msgid "Sho_w:"
+msgstr "_Taispeáin:"
+
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:971
+msgid "Sear_ch:"
+msgstr "C_uardaigh:"
+
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:1034
+msgid "i_n"
+msgstr "_i"
+
+#: ../shell/e-shell-utils.c:223
+msgid "vCard (.vcf)"
+msgstr "vCard (.vcf)"
+
+#: ../shell/e-shell-utils.c:246
+msgid "All Files (*)"
+msgstr "Gach Comhad (*)"
+
+#: ../shell/e-shell-view.c:296
+>>>>>>> master
 msgid "Saving user interface state"
 msgstr ""
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
+<<<<<<< HEAD
 #: ../shell/e-shell-window-actions.c:644
+=======
+#: ../shell/e-shell-window-actions.c:645
+>>>>>>> master
 msgid "translator-credits"
 msgstr ""
 "Alastair McKinstry <mckinstry@computer.org>\n"
 "David O'Callaghan <david.ocallaghan@cs.tcd.ie>\n"
 "Seán de Búrca <leftmostcat@gmail.com>"
 
+<<<<<<< HEAD
 #: ../shell/e-shell-window-actions.c:655
 msgid "Evolution Website"
 msgstr "Suíomh Gréasáin Evolution"
 
 #: ../shell/e-shell-window-actions.c:917
+=======
+#: ../shell/e-shell-window-actions.c:656
+msgid "Evolution Website"
+msgstr "Suíomh Gréasáin Evolution"
+
+#: ../shell/e-shell-window-actions.c:902
+>>>>>>> master
 #, fuzzy
 msgid "Categories Editor"
 msgstr "Liosta Catagóirí"
 
+<<<<<<< HEAD
 #: ../shell/e-shell-window-actions.c:1252
+=======
+#: ../shell/e-shell-window-actions.c:1237
+>>>>>>> master
 #, fuzzy
 msgid "Bug Buddy is not installed."
 msgstr "Níl bug-buddy suiteáilte."
 
+<<<<<<< HEAD
 #: ../shell/e-shell-window-actions.c:1254
+=======
+#: ../shell/e-shell-window-actions.c:1239
+>>>>>>> master
 #, fuzzy
 msgid "Bug Buddy could not be run."
 msgstr "Níorbh fhéidir bug-buddy a rith."
 
+<<<<<<< HEAD
 #: ../shell/e-shell-window-actions.c:1435
 msgid "Show information about Evolution"
 msgstr "Taispeáin eolas faoi Evolution"
@@ -19429,10 +36941,36 @@ msgid "_Forget Passwords"
 msgstr "Déan D_earmad ar na Focail Faire"
 
 #: ../shell/e-shell-window-actions.c:1498
+=======
+#: ../shell/e-shell-window-actions.c:1420
+msgid "Show information about Evolution"
+msgstr "Taispeáin eolas faoi Evolution"
+
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1439
+msgid "_Close Window"
+msgstr "_Dún Fuinneog"
+
+#: ../shell/e-shell-window-actions.c:1446
+msgid "_Contents"
+msgstr "_Inneachar"
+
+#: ../shell/e-shell-window-actions.c:1448
+#, fuzzy
+msgid "Open the Evolution User Guide"
+msgstr "Oscail Fillteán Úsáideora Eile"
+
+#: ../shell/e-shell-window-actions.c:1474
+msgid "_Forget Passwords"
+msgstr "Déan D_earmad ar na Focail Faire"
+
+#: ../shell/e-shell-window-actions.c:1476
+>>>>>>> master
 #, fuzzy
 msgid "Forget all remembered passwords"
 msgstr "_Meabhraigh focal faire"
 
+<<<<<<< HEAD
 #: ../shell/e-shell-window-actions.c:1503
 msgid "I_mport..."
 msgstr "_Iompórtáil..."
@@ -19450,10 +36988,30 @@ msgid "Create a new window displaying this view"
 msgstr ""
 
 #: ../shell/e-shell-window-actions.c:1524
+=======
+#: ../shell/e-shell-window-actions.c:1481
+msgid "I_mport..."
+msgstr "_Iompórtáil..."
+
+#: ../shell/e-shell-window-actions.c:1483
+msgid "Import data from other programs"
+msgstr "Iompórtáil sonraí ó chláir eile"
+
+#: ../shell/e-shell-window-actions.c:1488
+msgid "New _Window"
+msgstr "_Fuinneog Nua"
+
+#: ../shell/e-shell-window-actions.c:1490
+msgid "Create a new window displaying this view"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1502
+>>>>>>> master
 #, fuzzy
 msgid "Available Cate_gories"
 msgstr "Réimsí ar Fáil"
 
+<<<<<<< HEAD
 #: ../shell/e-shell-window-actions.c:1526
 msgid "Manage available categories"
 msgstr ""
@@ -19463,10 +37021,22 @@ msgid "_Quick Reference"
 msgstr "Carta Tagartha _Tapa"
 
 #: ../shell/e-shell-window-actions.c:1540
+=======
+#: ../shell/e-shell-window-actions.c:1504
+msgid "Manage available categories"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1516
+msgid "_Quick Reference"
+msgstr "Carta Tagartha _Tapa"
+
+#: ../shell/e-shell-window-actions.c:1518
+>>>>>>> master
 #, fuzzy
 msgid "Show Evolution's shortcut keys"
 msgstr "Athraigh socruithe Evolution"
 
+<<<<<<< HEAD
 #: ../shell/e-shell-window-actions.c:1547
 msgid "Exit the program"
 msgstr "Scoir an ríomhchlár"
@@ -19480,42 +37050,86 @@ msgid "Construct a more advanced search"
 msgstr ""
 
 #: ../shell/e-shell-window-actions.c:1561
+=======
+#: ../shell/e-shell-window-actions.c:1525
+msgid "Exit the program"
+msgstr "Scoir an ríomhchlár"
+
+#: ../shell/e-shell-window-actions.c:1530
+msgid "_Advanced Search..."
+msgstr "Cuardach C_asta..."
+
+#: ../shell/e-shell-window-actions.c:1532
+msgid "Construct a more advanced search"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1539
+>>>>>>> master
 #, fuzzy
 msgid "Clear the current search parameters"
 msgstr "Cuardaigh i gcónaí"
 
+<<<<<<< HEAD
 #: ../shell/e-shell-window-actions.c:1566
 msgid "_Edit Saved Searches..."
 msgstr "Cuir Cuardaigh Sábháilte in _Eagar..."
 
 #: ../shell/e-shell-window-actions.c:1568
+=======
+#: ../shell/e-shell-window-actions.c:1544
+msgid "_Edit Saved Searches..."
+msgstr "Cuir Cuardaigh Sábháilte in _Eagar..."
+
+#: ../shell/e-shell-window-actions.c:1546
+>>>>>>> master
 #, fuzzy
 msgid "Manage your saved searches"
 msgstr "Bainstigh do chuid ríomhphoist, do chuid teagmhálacha agus do sceideal"
 
+<<<<<<< HEAD
 #: ../shell/e-shell-window-actions.c:1575
 msgid "Click here to change the search type"
 msgstr ""
 
 #: ../shell/e-shell-window-actions.c:1580
+=======
+#: ../shell/e-shell-window-actions.c:1553
+msgid "Click here to change the search type"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1558
+>>>>>>> master
 msgid "_Find Now"
 msgstr "_Aimsigh Anois"
 
 #. Block the default Ctrl+F.
+<<<<<<< HEAD
 #: ../shell/e-shell-window-actions.c:1582
+=======
+#: ../shell/e-shell-window-actions.c:1560
+>>>>>>> master
 #, fuzzy
 msgid "Execute the current search parameters"
 msgstr "Cealaigh an oibríocht phoist reatha"
 
+<<<<<<< HEAD
 #: ../shell/e-shell-window-actions.c:1587
 msgid "_Save Search..."
 msgstr "_Sábháil Cuardach..."
 
 #: ../shell/e-shell-window-actions.c:1589
+=======
+#: ../shell/e-shell-window-actions.c:1565
+msgid "_Save Search..."
+msgstr "_Sábháil Cuardach..."
+
+#: ../shell/e-shell-window-actions.c:1567
+>>>>>>> master
 #, fuzzy
 msgid "Save the current search parameters"
 msgstr "Sábháil an comhad reatha"
 
+<<<<<<< HEAD
 #: ../shell/e-shell-window-actions.c:1601
 msgid "Submit _Bug Report..."
 msgstr "Seol Tuairisc faoi _Fhabht..."
@@ -19529,19 +37143,43 @@ msgid "_Work Offline"
 msgstr "_Oibrigh as Líne"
 
 #: ../shell/e-shell-window-actions.c:1610
+=======
+#: ../shell/e-shell-window-actions.c:1579
+msgid "Submit _Bug Report..."
+msgstr "Seol Tuairisc faoi _Fhabht..."
+
+#: ../shell/e-shell-window-actions.c:1581
+msgid "Submit a bug report using Bug Buddy"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1586
+msgid "_Work Offline"
+msgstr "_Oibrigh as Líne"
+
+#: ../shell/e-shell-window-actions.c:1588
+>>>>>>> master
 #, fuzzy
 msgid "Put Evolution into offline mode"
 msgstr "Tosaigh i mód as líne"
 
+<<<<<<< HEAD
 #: ../shell/e-shell-window-actions.c:1615
 msgid "_Work Online"
 msgstr "_Oibrigh ar Líne"
 
 #: ../shell/e-shell-window-actions.c:1617
+=======
+#: ../shell/e-shell-window-actions.c:1593
+msgid "_Work Online"
+msgstr "_Oibrigh ar Líne"
+
+#: ../shell/e-shell-window-actions.c:1595
+>>>>>>> master
 #, fuzzy
 msgid "Put Evolution into online mode"
 msgstr "Tosaigh i mód ar líne"
 
+<<<<<<< HEAD
 #: ../shell/e-shell-window-actions.c:1645
 msgid "Lay_out"
 msgstr "Leagan _Amach"
@@ -19567,10 +37205,38 @@ msgid "Show Side _Bar"
 msgstr "Taispeáin _Barra Taoibh"
 
 #: ../shell/e-shell-window-actions.c:1711
+=======
+#: ../shell/e-shell-window-actions.c:1623
+msgid "Lay_out"
+msgstr "Leagan _Amach"
+
+#: ../shell/e-shell-window-actions.c:1630
+msgid "_New"
+msgstr "_Nua"
+
+#: ../shell/e-shell-window-actions.c:1637
+msgid "_Search"
+msgstr "Cuar_daigh"
+
+#: ../shell/e-shell-window-actions.c:1644
+msgid "_Switcher Appearance"
+msgstr "Cuma _Athraitheora"
+
+#: ../shell/e-shell-window-actions.c:1658
+msgid "_Window"
+msgstr "_Fuinneog"
+
+#: ../shell/e-shell-window-actions.c:1687
+msgid "Show Side _Bar"
+msgstr "Taispeáin _Barra Taoibh"
+
+#: ../shell/e-shell-window-actions.c:1689
+>>>>>>> master
 #, fuzzy
 msgid "Show the side bar"
 msgstr "Taispeáin _Barra Taoibh"
 
+<<<<<<< HEAD
 #: ../shell/e-shell-window-actions.c:1717
 msgid "Show _Buttons"
 msgstr "Taispeán _Cnaipí"
@@ -19742,6 +37408,179 @@ msgstr ""
 msgid "Do not tell me again"
 msgstr "Ná tabhair rabhadh dom arís"
 
+=======
+#: ../shell/e-shell-window-actions.c:1695
+msgid "Show _Buttons"
+msgstr "Taispeán _Cnaipí"
+
+#: ../shell/e-shell-window-actions.c:1697
+msgid "Show the switcher buttons"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1703
+msgid "Show _Status Bar"
+msgstr "Taispeáin Barra _Stádais"
+
+#: ../shell/e-shell-window-actions.c:1705
+msgid "Show the status bar"
+msgstr "Taispeáin an barra stádais"
+
+#: ../shell/e-shell-window-actions.c:1711
+msgid "Show _Tool Bar"
+msgstr "Taispeáin Barra _Uirlisí"
+
+#: ../shell/e-shell-window-actions.c:1713
+msgid "Show the tool bar"
+msgstr "Taispeáin an barra uirlisí"
+
+#: ../shell/e-shell-window-actions.c:1735
+msgid "_Icons Only"
+msgstr "_Deilbhíní Amháin"
+
+#: ../shell/e-shell-window-actions.c:1737
+msgid "Display window buttons with icons only"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1742
+msgid "_Text Only"
+msgstr "_Téacs Amháin"
+
+#: ../shell/e-shell-window-actions.c:1744
+msgid "Display window buttons with text only"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1749
+msgid "Icons _and Text"
+msgstr "Deilbhíní _agus Téacs"
+
+#: ../shell/e-shell-window-actions.c:1751
+msgid "Display window buttons with icons and text"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1756
+msgid "Tool_bar Style"
+msgstr "Stíl _Bharra Uirlisí"
+
+#: ../shell/e-shell-window-actions.c:1758
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1766
+msgid "Define Views..."
+msgstr "Sainmhínigh Amhairc..."
+
+#: ../shell/e-shell-window-actions.c:1768
+msgid "Create or edit views"
+msgstr "Cruthaigh amhairc nó cuir iad in eagar"
+
+#: ../shell/e-shell-window-actions.c:1773
+msgid "Save Custom View..."
+msgstr "Sábháil Amharc Saincheaptha..."
+
+#: ../shell/e-shell-window-actions.c:1775
+msgid "Save current custom view"
+msgstr "Sábháil amharc saincheaptha reatha"
+
+#: ../shell/e-shell-window-actions.c:1782
+msgid "C_urrent View"
+msgstr "Amharc _Reatha"
+
+#: ../shell/e-shell-window-actions.c:1792
+msgid "Custom View"
+msgstr "Amharc Saincheaptha"
+
+#: ../shell/e-shell-window-actions.c:1794
+msgid "Current view is a customized view"
+msgstr "Is amharc saincheaptha é an t-amharc reatha"
+
+#: ../shell/e-shell-window-actions.c:1804
+msgid "Change the page settings for your current printer"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:2194
+#, c-format
+msgid "Switch to %s"
+msgstr "Athraigh go %s"
+
+#: ../shell/e-shell-window-actions.c:2414
+msgid "Execute these search parameters"
+msgstr ""
+
+#. Translators: This is used for the main window title.
+#: ../shell/e-shell-window-private.c:584
+#, c-format
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
+
+#: ../shell/e-shell-window.c:442
+msgid "New"
+msgstr "Nua"
+
+#: ../shell/e-shell.c:361
+#, fuzzy
+msgid "Preparing to go offline..."
+msgstr "Míreanna le húsáid as líne"
+
+#: ../shell/e-shell.c:414
+#, fuzzy
+msgid "Preparing to go online..."
+msgstr "Míreanna le húsáid as líne"
+
+#: ../shell/e-shell.c:476
+msgid "Preparing to quit..."
+msgstr ""
+
+#. Preview/Alpha/Beta version warning message
+#: ../shell/main.c:195
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Evolution groupware suite.\n"
+"\n"
+"This version of Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+"Dia duit.  Go raibh maith agat as an am a ghlacadh an leagan\n"
+"réamhamhairc na sraithe feidhmchlár grúpa-earraí Evolution seo a\n"
+"íosluchtú.\n"
+"\n"
+"Níl an leagan Evolution seo críochnaithe fós. Tá ag fáil réidh,\n"
+"ach tá cuid de na gnéithe gan chríochnú nó ní oibríonn siad i\n"
+"gceart.\n"
+"\n"
+"Má tá leagan Evolution cobhsaí uait, spreagaimid thú leis an leagan\n"
+"seo a dhíshuiteáil, agus an leagan %s a shuiteáil ina ionad.\n"
+"\n"
+"Má faigheann tú amach fabhtanna, seol tuairisc fúthu chugainn ag\n"
+"bugzilla.gnome.org. Níl aon bharánta ag an táirge seo agus níl sé\n"
+"ceaptha do dhaoine tugtha do thaomanna feirge.\n"
+"\n"
+"Tá súil againn go mbaineann tú sult as torthaí ár n-obair dian, agus\n"
+"fanaimid go díocasach le do chuid rannchuidithe!\n"
+
+#: ../shell/main.c:219
+msgid ""
+"Thanks\n"
+"The Evolution Team\n"
+msgstr ""
+"Go raibh maith agat\n"
+"An Fhoireann Evolution\n"
+
+#: ../shell/main.c:226
+msgid "Do not tell me again"
+msgstr "Ná tabhair rabhadh dom arís"
+
+>>>>>>> master
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
 #: ../shell/main.c:308
@@ -19793,18 +37632,30 @@ msgstr ""
 msgid "Request a running Evolution process to quit"
 msgstr "Evolution á atosú"
 
+<<<<<<< HEAD
 #: ../shell/main.c:511 ../shell/main.c:519
 msgid "- The Evolution PIM and Email Client"
 msgstr "- An Cliaint PIM agus Poist Evolution"
 
 #: ../shell/main.c:582
+=======
+#: ../shell/main.c:512 ../shell/main.c:520
+msgid "- The Evolution PIM and Email Client"
+msgstr "- An Cliaint PIM agus Poist Evolution"
+
+#: ../shell/main.c:583
+>>>>>>> master
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../shell/main.c:588
+=======
+#: ../shell/main.c:589
+>>>>>>> master
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -19881,41 +37732,70 @@ msgstr "Acmhainn"
 msgid "Create a new test source"
 msgstr "Roghnaigh Cineál na Míre Nuaí"
 
+<<<<<<< HEAD
 #: ../smclient/eggdesktopfile.c:165
+=======
+#: ../smclient/eggdesktopfile.c:166
+>>>>>>> master
 #, c-format
 msgid "File is not a valid .desktop file"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../smclient/eggdesktopfile.c:188
+=======
+#: ../smclient/eggdesktopfile.c:189
+>>>>>>> master
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../smclient/eggdesktopfile.c:957
+=======
+#: ../smclient/eggdesktopfile.c:959
+>>>>>>> master
 #, fuzzy, c-format
 msgid "Starting %s"
 msgstr "%s á scanadh"
 
+<<<<<<< HEAD
 #: ../smclient/eggdesktopfile.c:1098
+=======
+#: ../smclient/eggdesktopfile.c:1102
+>>>>>>> master
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../smclient/eggdesktopfile.c:1166
+=======
+#: ../smclient/eggdesktopfile.c:1170
+>>>>>>> master
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../smclient/eggdesktopfile.c:1365
+=======
+#: ../smclient/eggdesktopfile.c:1370
+>>>>>>> master
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../smclient/eggdesktopfile.c:1386
+=======
+#: ../smclient/eggdesktopfile.c:1391
+>>>>>>> master
 #, c-format
 msgid "Not a launchable item"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../smclient/eggsmclient.c:224
 msgid "Disable connection to session manager"
 msgstr ""
@@ -20218,6 +38098,335 @@ msgid "SSL Client Certificate"
 msgstr "Teastas Cliaint SSL"
 
 #: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
+=======
+#: ../smclient/eggsmclient.c:226
+msgid "Disable connection to session manager"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:229
+#, fuzzy
+msgid "Specify file containing saved configuration"
+msgstr "Socrú cumraíocht Pilot"
+
+#: ../smclient/eggsmclient.c:229
+msgid "FILE"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:232
+msgid "Specify session management ID"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:232
+#, fuzzy
+msgid "ID"
+msgstr "UID"
+
+#: ../smclient/eggsmclient.c:253
+msgid "Session management options:"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:254
+#, fuzzy
+msgid "Show session management options"
+msgstr "Taispeáin cineál na híomhá"
+
+#: ../smime/gui/ca-trust-dialog.c:107
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: ../smime/gui/cert-trust-dialog.c:146
+#, fuzzy
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+"Mar nach bhfuil muinín agat as an údarás teastais a d'eisigh an teastas seo, "
+"níl muinín agat as fordheimhniú an teastais seo ach amháin má léiríonn tú "
+"anseo é."
+
+#: ../smime/gui/cert-trust-dialog.c:150
+#, fuzzy
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+"Mar nach bhfuil aithne agat ar an údarás teastais a d'eisigh an teastas seo, "
+"níl muinín agat as fordheimhniú an teastais seo ach amháin má léiríonn tú a "
+"mhalairt anseo."
+
+#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+msgid "Certificate Name"
+msgstr "Ainm Teastais"
+
+#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+#, fuzzy
+msgid "Issued To Organization"
+msgstr "_Eagras:"
+
+#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+#, fuzzy
+msgid "Issued To Organizational Unit"
+msgstr "Aonad an Eagrais (Organizational Unit, 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
+msgid "Serial Number"
+msgstr "Sraithuimhir"
+
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:115
+msgid "Purposes"
+msgstr "Aidhmeanna"
+
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+#, fuzzy
+msgid "Issued By"
+msgstr "Eisithe ar an"
+
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:117
+#, fuzzy
+msgid "Issued By Organization"
+msgstr "_Eagras:"
+
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118
+#, fuzzy
+msgid "Issued By Organizational Unit"
+msgstr "Aonad an Eagrais (Organizational Unit, OU)"
+
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
+#, fuzzy
+msgid "Issued"
+msgstr "Eisitheoir"
+
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120
+msgid "Expires"
+msgstr "As feidhm"
+
+#: ../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 "Méarlorg SHA1"
+
+#: ../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 "Méarlorg MD5"
+
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
+#, fuzzy
+msgid "Email Address"
+msgstr "_Seoladh Ríomhphoist:"
+
+#: ../smime/gui/certificate-manager.c:575
+#, fuzzy
+msgid "Select a certificate to import..."
+msgstr "Roghnaigh an Catalóg le hIompórtáil"
+
+#: ../smime/gui/certificate-manager.c:588
+msgid "All files"
+msgstr "Gach comhad"
+
+#: ../smime/gui/certificate-manager.c:623
+#, fuzzy
+msgid "Failed to import certificate"
+msgstr "Iompórtáladh Teastas"
+
+#: ../smime/gui/certificate-manager.c:991
+msgid "All PKCS12 files"
+msgstr "Gach comhad PKCS12"
+
+#: ../smime/gui/certificate-manager.c:1009
+#, fuzzy
+msgid "All email certificate files"
+msgstr ""
+"*.kat|Comhaid Katalog\n"
+"*|Gach Comhad"
+
+#: ../smime/gui/certificate-manager.c:1027
+#, fuzzy
+msgid "All CA certificate files"
+msgstr ""
+"*.kat|Comhaid Katalog\n"
+"*|Gach Comhad"
+
+#: ../smime/gui/certificate-viewer.c:345
+#, c-format
+msgid "Certificate Viewer: %s"
+msgstr "Amharcán Teastais: %s"
+
+#: ../smime/gui/component.c:50
+#, fuzzy, c-format
+msgid "Enter the password for '%s'"
+msgstr "Iontráil an focal faire le `%s'"
+
+#. we're setting the password initially
+#: ../smime/gui/component.c:76
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "Iontráil an focal faire nua do <b>%1</b>, le do thoil:"
+
+#: ../smime/gui/component.c:78
+msgid "Enter new password"
+msgstr "Iontráil focal faire nua"
+
+#. FIXME: add serial no, validity date, uses
+#: ../smime/gui/e-cert-selector.c:118
+#, fuzzy, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr "Cliceáil chun sórtáil de réir ábhair"
+
+#: ../smime/gui/e-cert-selector.c:119
+#, fuzzy, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr "CRL Eisithe ag:"
+
+#: ../smime/gui/e-cert-selector.c:172
+msgid "Select certificate"
+msgstr "Roghnaigh teastas"
+
+#: ../smime/gui/smime-ui.ui.h:1
+#, fuzzy
+msgid "<Not Part of Certificate>"
+msgstr "<Ní ina chuid den Teastas>"
+
+#: ../smime/gui/smime-ui.ui.h:2
+msgid "Authorities"
+msgstr "Údaráis"
+
+#: ../smime/gui/smime-ui.ui.h:3
+#, fuzzy
+msgid "Backup _All"
+msgstr "Gach Comhad"
+
+#: ../smime/gui/smime-ui.ui.h:4
+#, fuzzy
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+"Sula gcuireann tú muinín san údarás deimhniúcháin seo, ba cheart duit a "
+"theastas, a pholasaithe agus a mhodhanna oibre a scrúdú má tá fáil orthu."
+
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1097
+msgid "Certificate"
+msgstr "Teastas"
+
+#: ../smime/gui/smime-ui.ui.h:6
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Cuir eagar ar Mhuinín Teastais"
+
+#: ../smime/gui/smime-ui.ui.h:7
+#, fuzzy
+msgid "Certificate Fields"
+msgstr "&Réimsí Teastais"
+
+#: ../smime/gui/smime-ui.ui.h:8
+#, fuzzy
+msgid "Certificate Hierarchy"
+msgstr "O&rdlathas Teastais"
+
+#: ../smime/gui/smime-ui.ui.h:9
+msgid "Certificate details"
+msgstr "Sonraí teastais"
+
+#: ../smime/gui/smime-ui.ui.h:10
+#, fuzzy
+msgid "Certificates Table"
+msgstr "Cuir Tábla Leis"
+
+#: ../smime/gui/smime-ui.ui.h:11
+#, fuzzy
+msgid "Common Name (CN)"
+msgstr "Ainm Coiteann (Common Name, CN)"
+
+#: ../smime/gui/smime-ui.ui.h:12
+msgid "Contact Certificates"
+msgstr "Teastais Teagmhálacha"
+
+#: ../smime/gui/smime-ui.ui.h:14
+#, fuzzy
+msgid "Do not trust the authenticity of this certificate"
+msgstr "Níl muinín agat as fíordheimhniú an teastais seo."
+
+#: ../smime/gui/smime-ui.ui.h:15
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Cuir socruithe muiníne na dteastas ríomhphoist in eagar"
+
+#: ../smime/gui/smime-ui.ui.h:16
+#, fuzzy
+msgid "Email Recipient Certificate"
+msgstr "Teastas faighteora ríomhphoist"
+
+#: ../smime/gui/smime-ui.ui.h:17
+#, fuzzy
+msgid "Email Signer Certificate"
+msgstr "Teastas sínitheora ríomhphoist"
+
+#: ../smime/gui/smime-ui.ui.h:18
+#, fuzzy
+msgid "Expires On"
+msgstr "Le síothlú"
+
+#: ../smime/gui/smime-ui.ui.h:19
+#, fuzzy
+msgid "Field Value"
+msgstr "Ainm Réimse"
+
+#: ../smime/gui/smime-ui.ui.h:20
+#, fuzzy
+msgid "Fingerprints"
+msgstr "Méarlorg MD5"
+
+#: ../smime/gui/smime-ui.ui.h:24
+#, fuzzy
+msgid "Issued On"
+msgstr "Eisithe ar an"
+
+#: ../smime/gui/smime-ui.ui.h:25
+#, fuzzy
+msgid "Issued To"
+msgstr "Eisithe ar an"
+
+#: ../smime/gui/smime-ui.ui.h:27
+msgid "Organization (O)"
+msgstr "Eagras (O)"
+
+#: ../smime/gui/smime-ui.ui.h:28
+#, fuzzy
+msgid "Organizational Unit (OU)"
+msgstr "Aonad an Eagrais (Organizational Unit, OU)"
+
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:829
+msgid "SSL Client Certificate"
+msgstr "Teastas Cliaint SSL"
+
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:833
+>>>>>>> master
 msgid "SSL Server Certificate"
 msgstr "Teastas Freastalaí SSL"
 
@@ -20283,7 +38492,11 @@ msgstr "Déan Cúltaca"
 msgid "_Edit CA Trust"
 msgstr "Cuir socruithe muiníne do theastais na nÚdarás Deimhniúcháin in eagar"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert-db.c:906
+=======
+#: ../smime/lib/e-cert-db.c:912
+>>>>>>> master
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Tá an teastas ann cheana."
@@ -20293,6 +38506,7 @@ msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:414
 msgid "Sign"
 msgstr "Sínigh"
@@ -20330,74 +38544,166 @@ msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "Criptiú PKCS #1 SHA-1 le RSA"
 
 #: ../smime/lib/e-cert.c:639
+=======
+#: ../smime/lib/e-cert.c:417
+msgid "Sign"
+msgstr "Sínigh"
+
+#: ../smime/lib/e-cert.c:418
+msgid "Encrypt"
+msgstr "Criptigh"
+
+#: ../smime/lib/e-cert.c:530
+msgid "Version"
+msgstr "Leagan"
+
+#: ../smime/lib/e-cert.c:545
+msgid "Version 1"
+msgstr "Leagan 1"
+
+#: ../smime/lib/e-cert.c:548
+msgid "Version 2"
+msgstr "Leagan 2"
+
+#: ../smime/lib/e-cert.c:551
+msgid "Version 3"
+msgstr "Leagan 3"
+
+#: ../smime/lib/e-cert.c:634
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr "Criptiú PKCS #1 MD2 le RSA"
+
+#: ../smime/lib/e-cert.c:637
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr "Criptiú PKCS #1 MD5 le RSA"
+
+#: ../smime/lib/e-cert.c:640
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr "Criptiú PKCS #1 SHA-1 le RSA"
+
+#: ../smime/lib/e-cert.c:643
+>>>>>>> master
 #, fuzzy
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "Criptiú PKCS #1 SHA-1 le RSA"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:642
+=======
+#: ../smime/lib/e-cert.c:646
+>>>>>>> master
 #, fuzzy
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "Criptiú PKCS #1 SHA-1 le RSA"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:645
+=======
+#: ../smime/lib/e-cert.c:649
+>>>>>>> master
 #, fuzzy
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "Criptiú PKCS #1 SHA-1 le RSA"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
 msgstr "Criptiú PKCS #1 RSA"
 
 #: ../smime/lib/e-cert.c:675
+=======
+#: ../smime/lib/e-cert.c:676
+msgid "PKCS #1 RSA Encryption"
+msgstr "Criptiú PKCS #1 RSA"
+
+#: ../smime/lib/e-cert.c:679
+>>>>>>> master
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "Úsáid Eochrach an Teastais"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:678
+=======
+#: ../smime/lib/e-cert.c:682
+>>>>>>> master
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "Cineál teastais Netscape"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:681
+=======
+#: ../smime/lib/e-cert.c:685
+>>>>>>> master
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Aitheantóir Eochrach na nÚdarás Deimhniúcháin"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:693
+=======
+#: ../smime/lib/e-cert.c:697
+>>>>>>> master
 #, fuzzy, c-format
 msgid "Object Identifier (%s)"
 msgstr "Aitheantóir an Réada"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:744
+=======
+#: ../smime/lib/e-cert.c:749
+>>>>>>> master
 #, fuzzy
 msgid "Algorithm Identifier"
 msgstr "Aitheantóir an Algartaim"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:752
+=======
+#: ../smime/lib/e-cert.c:757
+>>>>>>> master
 #, fuzzy
 msgid "Algorithm Parameters"
 msgstr "Paraiméadair an Algartaim"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:774
+=======
+#: ../smime/lib/e-cert.c:779
+>>>>>>> master
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr "Faisnéis maidir le heochair phoiblí an aonáin ainmnithe"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:779
+=======
+#: ../smime/lib/e-cert.c:784
+>>>>>>> master
 #, fuzzy
 msgid "Subject Public Key Algorithm"
 msgstr "Algartam eochrach poiblí an aonáin ainmnithe"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:794
+=======
+#: ../smime/lib/e-cert.c:799
+>>>>>>> master
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Eochair phoiblí an aonáin ainmnithe"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
+=======
+#: ../smime/lib/e-cert.c:820 ../smime/lib/e-cert.c:870
+>>>>>>> master
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Earráid: ní féidir an eisínteacht a phróiseáil"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
 msgid "Object Signer"
 msgstr "Sínitheoir an Réada"
@@ -20415,25 +38721,57 @@ msgid "Signing"
 msgstr "� Shíniú"
 
 #: ../smime/lib/e-cert.c:876
+=======
+#: ../smime/lib/e-cert.c:841 ../smime/lib/e-cert.c:853
+msgid "Object Signer"
+msgstr "Sínitheoir an Réada"
+
+#: ../smime/lib/e-cert.c:845
+msgid "SSL Certificate Authority"
+msgstr "Údarás Deimhniúcháin SSL"
+
+#: ../smime/lib/e-cert.c:849
+msgid "Email Certificate Authority"
+msgstr "Údarás Deimhniúcháin Ríomhphoist"
+
+#: ../smime/lib/e-cert.c:878
+msgid "Signing"
+msgstr "� Shíniú"
+
+#: ../smime/lib/e-cert.c:882
+>>>>>>> master
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Neamhdhiúltú"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:880
+=======
+#: ../smime/lib/e-cert.c:886
+>>>>>>> master
 #, fuzzy
 msgid "Key Encipherment"
 msgstr "Criptiúchán na n-eochracha"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:884
+=======
+#: ../smime/lib/e-cert.c:890
+>>>>>>> master
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "Criptiúchán na sonraí"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:888
+=======
+#: ../smime/lib/e-cert.c:894
+>>>>>>> master
 #, fuzzy
 msgid "Key Agreement"
 msgstr "Comhaontas Eochrach"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:892
 msgid "Certificate Signer"
 msgstr "Sínitheoir an Teastais"
@@ -20451,6 +38789,25 @@ msgid "Not Critical"
 msgstr "Neamh-Chriticiúil"
 
 #: ../smime/lib/e-cert.c:970
+=======
+#: ../smime/lib/e-cert.c:898
+msgid "Certificate Signer"
+msgstr "Sínitheoir an Teastais"
+
+#: ../smime/lib/e-cert.c:902
+msgid "CRL Signer"
+msgstr "Sínitheoir CRL"
+
+#: ../smime/lib/e-cert.c:951
+msgid "Critical"
+msgstr "Criticiúil"
+
+#: ../smime/lib/e-cert.c:953 ../smime/lib/e-cert.c:956
+msgid "Not Critical"
+msgstr "Neamh-Chriticiúil"
+
+#: ../smime/lib/e-cert.c:977
+>>>>>>> master
 msgid "Extensions"
 msgstr "Eisínteachtaí"
 
@@ -20462,30 +38819,51 @@ msgstr "Eisínteachtaí"
 #. * change this string, unless changing the order of
 #. * name and value.  As a result example:
 #. * "OU = VeriSign Trust Network"
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:1047
+=======
+#: ../smime/lib/e-cert.c:1055
+>>>>>>> master
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:1102 ../smime/lib/e-cert.c:1225
+=======
+#: ../smime/lib/e-cert.c:1111 ../smime/lib/e-cert.c:1234
+>>>>>>> master
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Algartam Sínithe Teastais"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:1111
 msgid "Issuer"
 msgstr "Eisitheoir"
 
 #: ../smime/lib/e-cert.c:1166
+=======
+#: ../smime/lib/e-cert.c:1120
+msgid "Issuer"
+msgstr "Eisitheoir"
+
+#: ../smime/lib/e-cert.c:1175
+>>>>>>> master
 #, fuzzy
 msgid "Issuer Unique ID"
 msgstr "Aitheantas uathúil an eisitheora"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:1185
+=======
+#: ../smime/lib/e-cert.c:1194
+>>>>>>> master
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Aitheantas Uathúil an aonáin ainmnithe"
 
+<<<<<<< HEAD
 #: ../smime/lib/e-cert.c:1231
 msgid "Certificate Signature Value"
 msgstr "Luach Sínithe Teastais"
@@ -20499,6 +38877,21 @@ msgid "Enter password for PKCS12 file:"
 msgstr "Iontráil focal faire don chomhad PKCS12:"
 
 #: ../smime/lib/e-pkcs12.c:353
+=======
+#: ../smime/lib/e-cert.c:1240
+msgid "Certificate Signature Value"
+msgstr "Luach Sínithe Teastais"
+
+#: ../smime/lib/e-pkcs12.c:256
+msgid "PKCS12 File Password"
+msgstr "Focal Faire Comhaid PKCS12"
+
+#: ../smime/lib/e-pkcs12.c:257
+msgid "Enter password for PKCS12 file:"
+msgstr "Iontráil focal faire don chomhad PKCS12:"
+
+#: ../smime/lib/e-pkcs12.c:363
+>>>>>>> master
 msgid "Imported Certificate"
 msgstr "Iompórtáladh Teastas"
 
@@ -20579,7 +38972,11 @@ msgstr "Le _Stádas"
 #: ../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
+<<<<<<< HEAD
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:780
+=======
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:789
+>>>>>>> master
 msgid "UTC"
 msgstr "AUL"
 
@@ -20608,14 +39005,23 @@ msgstr ""
 msgid "_Selection"
 msgstr "Mód Roghnaithe"
 
+<<<<<<< HEAD
 #: ../widgets/menus/gal-define-views-dialog.c:346
+=======
+#: ../widgets/menus/gal-define-views-dialog.c:359
+>>>>>>> master
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Sainmhínigh Amhairc do \"%s\""
 
+<<<<<<< HEAD
 #: ../widgets/menus/gal-define-views-dialog.c:354
 #: ../widgets/menus/gal-define-views-dialog.c:356
+=======
+#: ../widgets/menus/gal-define-views-dialog.c:367
+#: ../widgets/menus/gal-define-views-dialog.c:369
+>>>>>>> master
 msgid "Define Views"
 msgstr "Sainmhínigh Amhairc"
 
@@ -20624,11 +39030,19 @@ msgstr "Sainmhínigh Amhairc"
 msgid "Define Views for \"%s\""
 msgstr "Sainmhínigh Amhairc do \"%s\""
 
+<<<<<<< HEAD
 #: ../widgets/menus/gal-view-factory-etable.c:109
 msgid "Table"
 msgstr "Tábla"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:273
+=======
+#: ../widgets/menus/gal-view-factory-etable.c:111
+msgid "Table"
+msgstr "Tábla"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+>>>>>>> master
 msgid "Save Current View"
 msgstr "Sábháil Amharc Reatha"
 
@@ -20640,7 +39054,11 @@ msgstr "_Cruthaigh amharc nua"
 msgid "_Replace existing view"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../widgets/menus/gal-view-new-dialog.c:106
+=======
+#: ../widgets/menus/gal-view-new-dialog.c:108
+>>>>>>> master
 msgid "Define New View"
 msgstr "Sainmhínigh Amharc Nua"
 
@@ -20656,6 +39074,7 @@ msgstr "Cineál Amhairc"
 msgid "Type of view:"
 msgstr "Cineál amhairc:"
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-account-manager.c:349
 msgid "De_fault"
 msgstr "_Réamhshocrú"
@@ -20695,6 +39114,50 @@ msgid "Set as _Background"
 msgstr "Socraigh mar _Chúlra"
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:90
+=======
+#: ../widgets/misc/e-account-manager.c:383
+msgid "Use default Evolution _sort order for accounts"
+msgstr ""
+
+#: ../widgets/misc/e-account-manager.c:438
+msgid "De_fault"
+msgstr "_Réamhshocrú"
+
+#: ../widgets/misc/e-account-tree-view.c:404
+msgid "Account Name"
+msgstr "Ainm Cuntais"
+
+#: ../widgets/misc/e-account-tree-view.c:435
+msgid "Protocol"
+msgstr "Prótacal"
+
+#: ../widgets/misc/e-attachment-dialog.c:308
+msgid "Attachment Properties"
+msgstr "Airíonna Iatáin"
+
+#: ../widgets/misc/e-attachment-dialog.c:330
+msgid "_Filename:"
+msgstr "A_inm Comhaid:"
+
+#: ../widgets/misc/e-attachment-dialog.c:365
+msgid "MIME Type:"
+msgstr "Cineál MIME:"
+
+#: ../widgets/misc/e-attachment-dialog.c:373
+#: ../widgets/misc/e-attachment-store.c:559
+msgid "_Suggest automatic display of attachment"
+msgstr ""
+
+#: ../widgets/misc/e-attachment-handler-image.c:95
+msgid "Could not set as background"
+msgstr ""
+
+#: ../widgets/misc/e-attachment-handler-image.c:145
+msgid "Set as _Background"
+msgstr "Socraigh mar _Chúlra"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:93
+>>>>>>> master
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] ""
@@ -20703,6 +39166,7 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-attachment-handler-sendto.c:132
 msgid "_Send To..."
 msgstr "_Seol Chuig..."
@@ -20741,6 +39205,44 @@ msgid "A_ttach"
 msgstr "_Ceangail"
 
 #: ../widgets/misc/e-attachment-store.c:610
+=======
+#: ../widgets/misc/e-attachment-handler-sendto.c:135
+msgid "_Send To..."
+msgstr "_Seol Chuig..."
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:137
+msgid "Send the selected attachments somewhere"
+msgstr ""
+
+#: ../widgets/misc/e-attachment-icon-view.c:162
+#: ../widgets/misc/e-attachment-tree-view.c:547
+msgid "Loading"
+msgstr "� Luchtú"
+
+#: ../widgets/misc/e-attachment-icon-view.c:174
+#: ../widgets/misc/e-attachment-tree-view.c:559
+msgid "Saving"
+msgstr "� Shábháil"
+
+#: ../widgets/misc/e-attachment-paned.c:97
+msgid "Hide Attachment _Bar"
+msgstr "Folaigh _Barra Iatán"
+
+#: ../widgets/misc/e-attachment-paned.c:99
+#: ../widgets/misc/e-attachment-paned.c:639
+msgid "Show Attachment _Bar"
+msgstr "Taispeáin _Barra Iatán"
+
+#: ../widgets/misc/e-attachment-store.c:547
+msgid "Add Attachment"
+msgstr "Cuir Iatán Leis"
+
+#: ../widgets/misc/e-attachment-store.c:550
+msgid "A_ttach"
+msgstr "_Ceangail"
+
+#: ../widgets/misc/e-attachment-store.c:613
+>>>>>>> master
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Sábháil Iatáin"
@@ -20750,6 +39252,7 @@ msgstr[3] "Sábháil Iatáin"
 msgstr[4] "Sábháil Iatáin"
 
 #. Translators: Default attachment filename.
+<<<<<<< HEAD
 #: ../widgets/misc/e-attachment-store.c:639
 #: ../widgets/misc/e-attachment.c:1806 ../widgets/misc/e-attachment.c:2348
 msgid "attachment.dat"
@@ -20809,46 +39312,140 @@ msgid "A save operation is already in progress"
 msgstr ""
 
 #: ../widgets/misc/e-attachment.c:1949
+=======
+#: ../widgets/misc/e-attachment-store.c:642
+#: ../widgets/misc/e-attachment.c:1810 ../widgets/misc/e-attachment.c:2352
+msgid "attachment.dat"
+msgstr "iatán.dat"
+
+#: ../widgets/misc/e-attachment-view.c:404
+msgid "Open With Other Application..."
+msgstr ""
+
+#: ../widgets/misc/e-attachment-view.c:411
+msgid "S_ave All"
+msgstr "Sábháil G_ach Rud"
+
+#: ../widgets/misc/e-attachment-view.c:437
+msgid "A_dd Attachment..."
+msgstr "Cuir _Iatán Leis..."
+
+#: ../widgets/misc/e-attachment-view.c:461
+msgid "_Hide"
+msgstr "_Folaigh"
+
+#: ../widgets/misc/e-attachment-view.c:468
+#, fuzzy
+msgid "Hid_e All"
+msgstr "Sábháil G_ach Rud"
+
+#: ../widgets/misc/e-attachment-view.c:475
+#, fuzzy
+msgid "_View Inline"
+msgstr "&Inlíne"
+
+#: ../widgets/misc/e-attachment-view.c:482
+#, fuzzy
+msgid "Vie_w All Inline"
+msgstr "&Inlíne"
+
+#: ../widgets/misc/e-attachment-view.c:803
+#, fuzzy, c-format
+msgid "Open With \"%s\""
+msgstr "Oscail le \"%s\""
+
+#: ../widgets/misc/e-attachment-view.c:806
+#, c-format
+msgid "Open this attachment in %s"
+msgstr "Oscail an t-iatán seo i %s"
+
+#. To Translators: This text is set as a description of an attached
+#. * 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:998
+msgid "Attached message"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:1853 ../widgets/misc/e-attachment.c:2654
+msgid "A load operation is already in progress"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:1861 ../widgets/misc/e-attachment.c:2662
+msgid "A save operation is already in progress"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:1953
+>>>>>>> master
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Níorbh fhéidir '%s' a luchtú"
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-attachment.c:1952
+=======
+#: ../widgets/misc/e-attachment.c:1956
+>>>>>>> master
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Níorbh fhéidir an t-iatán a luchtú"
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-attachment.c:2228
+=======
+#: ../widgets/misc/e-attachment.c:2232
+>>>>>>> master
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Níorbh fhéidir '%s' a oscailt"
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-attachment.c:2231
+=======
+#: ../widgets/misc/e-attachment.c:2235
+>>>>>>> master
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Níorbh fhéidir an t-iatán a oscailt"
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-attachment.c:2666
 msgid "Attachment contents not loaded"
 msgstr ""
 
 #: ../widgets/misc/e-attachment.c:2742
+=======
+#: ../widgets/misc/e-attachment.c:2670
+msgid "Attachment contents not loaded"
+msgstr ""
+
+#: ../widgets/misc/e-attachment.c:2746
+>>>>>>> master
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Níorbh fhéidir '%s' a shábháil"
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-attachment.c:2745
+=======
+#: ../widgets/misc/e-attachment.c:2749
+>>>>>>> master
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Níorbh fhéidir an t-iatán a shábháil"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
+<<<<<<< HEAD
 #: ../widgets/misc/e-buffer-tagger.c:359
+=======
+#: ../widgets/misc/e-buffer-tagger.c:387
+>>>>>>> master
 #, fuzzy
 msgid "Ctrl-click to open a link"
 msgstr "Cliceáil chun %s a oscailt"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
+<<<<<<< HEAD
 #: ../widgets/misc/e-calendar-item.c:1247
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -20869,6 +39466,33 @@ msgstr "Iontráil an tacar carachtar le húsáid"
 msgid "Other..."
 msgstr "Eile..."
 
+=======
+#: ../widgets/misc/e-calendar-item.c:1250
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../widgets/misc/e-calendar.c:226
+msgid "Month Calendar"
+msgstr "Féilire Míosa"
+
+#: ../widgets/misc/e-charset-combo-box.c:96
+msgid "Character Encoding"
+msgstr "Ionchódú Carachtar"
+
+#: ../widgets/misc/e-charset-combo-box.c:119
+msgid "Enter the character set to use"
+msgstr "Iontráil an tacar carachtar le húsáid"
+
+#: ../widgets/misc/e-charset-combo-box.c:339
+msgid "Other..."
+msgstr "Eile..."
+
+#: ../widgets/misc/e-contact-map-window.c:355
+#, fuzzy
+msgid "Contacts Map"
+msgstr "Teagmhálacha:"
+
+>>>>>>> master
 #: ../widgets/misc/e-dateedit.c:501
 msgid "Date and Time"
 msgstr "Dáta agus Am"
@@ -20894,19 +39518,28 @@ msgid "_Today"
 msgstr "_Inniu"
 
 #. Note that we don't show this here, since by default a 'None' date
+<<<<<<< HEAD
 #. is not permitted.
+=======
+#. * is not permitted.
+>>>>>>> master
 #: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_Neamhní"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
+<<<<<<< HEAD
 #: ../widgets/misc/e-dateedit.c:1686 ../widgets/misc/e-dateedit.c:1918
+=======
+#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1921
+>>>>>>> master
 #, fuzzy
 msgctxt "date"
 msgid "None"
 msgstr "Neamhní"
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-dateedit.c:1813
 msgid "Invalid Date Value"
 msgstr "Luach Dáta Neamhbhailí"
@@ -20916,11 +39549,23 @@ msgid "Invalid Time Value"
 msgstr "Luach Ama Neamhbhailí"
 
 #: ../widgets/misc/e-import-assistant.c:245
+=======
+#: ../widgets/misc/e-dateedit.c:1815
+msgid "Invalid Date Value"
+msgstr "Luach Dáta Neamhbhailí"
+
+#: ../widgets/misc/e-dateedit.c:1859
+msgid "Invalid Time Value"
+msgstr "Luach Ama Neamhbhailí"
+
+#: ../widgets/misc/e-import-assistant.c:249
+>>>>>>> master
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-import-assistant.c:262
 msgid "F_ilename:"
 msgstr "A_inm Comhaid:"
@@ -20936,15 +39581,37 @@ msgstr "_Cineál comhaid:"
 
 #: ../widgets/misc/e-import-assistant.c:329
 #: ../widgets/misc/e-import-assistant.c:905
+=======
+#: ../widgets/misc/e-import-assistant.c:266
+msgid "F_ilename:"
+msgstr "A_inm Comhaid:"
+
+#: ../widgets/misc/e-import-assistant.c:276
+msgid "Select a file"
+msgstr "Roghnaigh comhad"
+
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
+msgid "File _type:"
+msgstr "_Cineál comhaid:"
+
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:913
+>>>>>>> master
 #, fuzzy
 msgid "Choose the destination for this import"
 msgstr "Roghnaigh am críochnaithe don imeacht seo"
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-import-assistant.c:354
+=======
+#: ../widgets/misc/e-import-assistant.c:358
+>>>>>>> master
 #, fuzzy
 msgid "Choose the type of importer to run:"
 msgstr "Roghnaigh cineál an mhéarchlár le cumrú."
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-import-assistant.c:362
 msgid "Import data and settings from _older programs"
 msgstr "Iompórtáil sonraí agus socruithe ó fheidhmchláir níos _sine"
@@ -20954,6 +39621,17 @@ msgid "Import a _single file"
 msgstr "Iompórtáil comhad _aonair"
 
 #: ../widgets/misc/e-import-assistant.c:522
+=======
+#: ../widgets/misc/e-import-assistant.c:366
+msgid "Import data and settings from _older programs"
+msgstr "Iompórtáil sonraí agus socruithe ó fheidhmchláir níos _sine"
+
+#: ../widgets/misc/e-import-assistant.c:374
+msgid "Import a _single file"
+msgstr "Iompórtáil comhad _aonair"
+
+#: ../widgets/misc/e-import-assistant.c:526
+>>>>>>> master
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -20961,47 +39639,82 @@ msgid ""
 msgstr ""
 
 #. Install a custom "Cancel Import" button.
+<<<<<<< HEAD
 #: ../widgets/misc/e-import-assistant.c:762
+=======
+#: ../widgets/misc/e-import-assistant.c:768
+>>>>>>> master
 #, fuzzy
 msgid "_Cancel Import"
 msgstr "_Iompórtáil"
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-import-assistant.c:904
+=======
+#: ../widgets/misc/e-import-assistant.c:912
+>>>>>>> master
 #, fuzzy
 msgid "Preview data to be imported"
 msgstr "Roghnaigh na míreanna atá le priontáil"
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-import-assistant.c:910
 #: ../widgets/misc/e-import-assistant.c:923
 #: ../widgets/misc/e-import-assistant.c:1268
 #: ../widgets/misc/e-import-assistant.c:1344
 #: ../widgets/misc/e-import-assistant.c:1353
+=======
+#: ../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
+>>>>>>> master
 #, fuzzy
 msgid "Import Data"
 msgstr "Tábhachtach"
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-import-assistant.c:918
 msgid "Select what type of file you want to import from the list."
 msgstr ""
 
 #: ../widgets/misc/e-import-assistant.c:1258
 #: ../widgets/misc/e-import-assistant.c:1293
+=======
+#: ../widgets/misc/e-import-assistant.c:926
+msgid "Select what type of file you want to import from the list."
+msgstr ""
+
+#: ../widgets/misc/e-import-assistant.c:1266
+#: ../widgets/misc/e-import-assistant.c:1301
+>>>>>>> master
 #, fuzzy
 msgid "Evolution Import Assistant"
 msgstr "Iompórtáil Comhaid mbox (UNIX, Evolution)"
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-import-assistant.c:1275
 #: ../widgets/misc/e-import-assistant.c:1331
 msgid "Import Location"
 msgstr "Iompórtáil Suíomh"
 
 #: ../widgets/misc/e-import-assistant.c:1286
+=======
+#: ../widgets/misc/e-import-assistant.c:1283
+#: ../widgets/misc/e-import-assistant.c:1339
+msgid "Import Location"
+msgstr "Iompórtáil Suíomh"
+
+#: ../widgets/misc/e-import-assistant.c:1294
+>>>>>>> master
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
 "external files into Evolution."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-import-assistant.c:1303
 msgid "Importer Type"
 msgstr "Cineál Iompórtálaí"
@@ -21023,11 +39736,35 @@ msgid "World Map"
 msgstr "Léarscáil an Domhain"
 
 #: ../widgets/misc/e-map.c:869
+=======
+#: ../widgets/misc/e-import-assistant.c:1311
+msgid "Importer Type"
+msgstr "Cineál Iompórtálaí"
+
+#: ../widgets/misc/e-import-assistant.c:1321
+msgid "Select Information to Import"
+msgstr "Roghnaigh Eolas le hIompórtáil"
+
+#: ../widgets/misc/e-import-assistant.c:1330
+msgid "Select a File"
+msgstr "Roghnaigh Comhad"
+
+#: ../widgets/misc/e-import-assistant.c:1347
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr ""
+
+#: ../widgets/misc/e-map.c:883
+msgid "World Map"
+msgstr "Léarscáil an Domhain"
+
+#: ../widgets/misc/e-map.c:886
+>>>>>>> master
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
 msgstr ""
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-online-button.c:23
 #, fuzzy
 msgid "Evolution is currently online.  Click this button to work offline."
@@ -21054,24 +39791,60 @@ msgid "Evolution Preferences"
 msgstr "Sainroghanna Evolution"
 
 #: ../widgets/misc/e-search-bar.c:75
+=======
+#: ../widgets/misc/e-online-button.c:27
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr ""
+"Tá Evolution ar líne faoi láthair.  Cliceáil ar an gcnaipe seo chun oibriú "
+"as líne."
+
+#: ../widgets/misc/e-online-button.c:30
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr ""
+"Tá Evolution as líne faoi láthair.  Cliceáil ar an gcnaipe seo chun oibriú "
+"ar líne."
+
+#: ../widgets/misc/e-online-button.c:33
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr "Tá Evolution as líne faoi láthair mar níl an líonra ar fáil."
+
+#: ../widgets/misc/e-preferences-window.c:279
+msgid "Evolution Preferences"
+msgstr "Sainroghanna Evolution"
+
+#: ../widgets/misc/e-search-bar.c:81
+>>>>>>> master
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-search-bar.c:557
+=======
+#: ../widgets/misc/e-search-bar.c:563
+>>>>>>> master
 #, fuzzy
 msgid "Close the find bar"
 msgstr "Dún an fhuinneog seo"
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-search-bar.c:565
 msgid "Fin_d:"
 msgstr "Ai_msigh:"
 
 #: ../widgets/misc/e-search-bar.c:577
+=======
+#: ../widgets/misc/e-search-bar.c:571
+msgid "Fin_d:"
+msgstr "Ai_msigh:"
+
+#: ../widgets/misc/e-search-bar.c:583
+>>>>>>> master
 #, fuzzy
 msgid "Clear the search"
 msgstr "Cuardaigh i gcónaí"
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-search-bar.c:601
 msgid "_Previous"
 msgstr "_Roimhe Seo"
@@ -21101,6 +39874,37 @@ msgid "Reached top of page, continued from bottom"
 msgstr ""
 
 #: ../widgets/misc/e-send-options.c:543
+=======
+#: ../widgets/misc/e-search-bar.c:607
+msgid "_Previous"
+msgstr "_Roimhe Seo"
+
+#: ../widgets/misc/e-search-bar.c:613
+msgid "Find the previous occurrence of the phrase"
+msgstr ""
+
+#: ../widgets/misc/e-search-bar.c:626
+msgid "_Next"
+msgstr "_Ar Aghaidh"
+
+#: ../widgets/misc/e-search-bar.c:632
+msgid "Find the next occurrence of the phrase"
+msgstr ""
+
+#: ../widgets/misc/e-search-bar.c:645
+msgid "Mat_ch case"
+msgstr "_Comhoiriúnaigh an cás"
+
+#: ../widgets/misc/e-search-bar.c:673
+msgid "Reached bottom of page, continued from top"
+msgstr ""
+
+#: ../widgets/misc/e-search-bar.c:695
+msgid "Reached top of page, continued from bottom"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.c:552
+>>>>>>> master
 msgid "When de_leted:"
 msgstr ""
 
@@ -21134,7 +39938,10 @@ msgid "_After"
 msgstr "_Tar Éis:"
 
 #: ../widgets/misc/e-send-options.ui.h:8
+<<<<<<< HEAD
 #, fuzzy
+=======
+>>>>>>> master
 msgctxt "ESendOptionsAfter"
 msgid "days"
 msgstr "lá"
@@ -21145,7 +39952,10 @@ msgid "Wi_thin"
 msgstr ""
 
 #: ../widgets/misc/e-send-options.ui.h:10
+<<<<<<< HEAD
 #, fuzzy
+=======
+>>>>>>> master
 msgctxt "ESendOptionsWithin"
 msgid "days"
 msgstr "lá"
@@ -21190,6 +40000,7 @@ msgstr ""
 #, fuzzy
 msgid "Standard"
 msgstr "Cló Comhrá"
+<<<<<<< HEAD
 
 #: ../widgets/misc/e-send-options.ui.h:25
 #, fuzzy
@@ -21201,6 +40012,19 @@ msgstr "Sonraí _Stádais"
 msgid "Top Secret"
 msgstr "Scór"
 
+=======
+
+#: ../widgets/misc/e-send-options.ui.h:25
+#, fuzzy
+msgid "Status Tracking"
+msgstr "Sonraí _Stádais"
+
+#: ../widgets/misc/e-send-options.ui.h:26
+#, fuzzy
+msgid "Top Secret"
+msgstr "Scór"
+
+>>>>>>> master
 #: ../widgets/misc/e-send-options.ui.h:28
 msgid "When acce_pted:"
 msgstr ""
@@ -21248,6 +40072,7 @@ msgctxt "send-options"
 msgid "None"
 msgstr "Neamhní"
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-signature-editor.c:134
 #: ../widgets/misc/e-signature-editor.c:560
 #: ../widgets/misc/e-signature-manager.c:368
@@ -21268,20 +40093,54 @@ msgid "_Signature Name:"
 msgstr "Ainm _Sínithe:"
 
 #: ../widgets/misc/e-signature-manager.c:313
+=======
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:564
+#: ../widgets/misc/e-signature-manager.c:372
+#: ../widgets/misc/e-signature-script-dialog.c:219
+msgid "Unnamed"
+msgstr "Gan Ainm"
+
+#: ../widgets/misc/e-signature-editor.c:214
+msgid "_Save and Close"
+msgstr "_Sábháil agus Dún"
+
+#: ../widgets/misc/e-signature-editor.c:431
+msgid "Edit Signature"
+msgstr "Cuir Síniú in Eagar"
+
+#: ../widgets/misc/e-signature-editor.c:446
+msgid "_Signature Name:"
+msgstr "Ainm _Sínithe:"
+
+#: ../widgets/misc/e-signature-manager.c:317
+>>>>>>> master
 #, fuzzy
 msgid "Add Signature Script"
 msgstr "Cuir script sínithe leis"
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-signature-manager.c:378
+=======
+#: ../widgets/misc/e-signature-manager.c:382
+>>>>>>> master
 #, fuzzy
 msgid "Edit Signature Script"
 msgstr "Cuir Síniú in Eagar"
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-signature-manager.c:598
 msgid "Add _Script"
 msgstr "Cuir _Script Leis"
 
 #: ../widgets/misc/e-signature-script-dialog.c:264
+=======
+#: ../widgets/misc/e-signature-manager.c:602
+msgid "Add _Script"
+msgstr "Cuir _Script Leis"
+
+#: ../widgets/misc/e-signature-script-dialog.c:268
+>>>>>>> master
 #, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
@@ -21291,12 +40150,20 @@ msgstr ""
 "Iontráil ainm tuairisciúil don chuntas seo sa spás thíos, le do thoil. "
 "Úsáidfear an t-ainm seo le haghaidh taispeána amháin."
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-signature-script-dialog.c:309
+=======
+#: ../widgets/misc/e-signature-script-dialog.c:313
+>>>>>>> master
 #, fuzzy
 msgid "S_cript:"
 msgstr "_Script:"
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-signature-script-dialog.c:340
+=======
+#: ../widgets/misc/e-signature-script-dialog.c:344
+>>>>>>> master
 msgid "Script file must be executable."
 msgstr ""
 
@@ -21304,15 +40171,24 @@ msgstr ""
 msgid "Click here to go to URL"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-web-view.c:405
 msgid "_Copy Link Location"
 msgstr "_Cóipeáil Suíomh an Naisc"
 
 #: ../widgets/misc/e-web-view.c:407
+=======
+#: ../widgets/misc/e-web-view.c:410
+msgid "_Copy Link Location"
+msgstr "_Cóipeáil Suíomh an Naisc"
+
+#: ../widgets/misc/e-web-view.c:412
+>>>>>>> master
 #, fuzzy
 msgid "Copy the link to the clipboard"
 msgstr "Cóipeáil rudaí go dtí an gearrthaisce."
 
+<<<<<<< HEAD
 #: ../widgets/misc/e-web-view.c:415
 msgid "_Open Link in Browser"
 msgstr "_Oscail Nasc i mBrabhsálaí"
@@ -21364,10 +40240,64 @@ msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #: ../widgets/misc/ea-calendar-item.c:311
+=======
+#: ../widgets/misc/e-web-view.c:420
+msgid "_Open Link in Browser"
+msgstr "_Oscail Nasc i mBrabhsálaí"
+
+#: ../widgets/misc/e-web-view.c:422
+#, fuzzy
+msgid "Open the link in a web browser"
+msgstr "_Oscail Nasc i mBrabhsálaí"
+
+#: ../widgets/misc/e-web-view.c:430
+#, fuzzy
+msgid "_Copy Email Address"
+msgstr "Cóipeáil _Seoladh Ríomhphoist"
+
+#: ../widgets/misc/e-web-view.c:447
+#, fuzzy
+msgid "_Copy Image"
+msgstr "_Gan íomhá"
+
+#: ../widgets/misc/e-web-view.c:449
+#, fuzzy
+msgid "Copy the image to the clipboard"
+msgstr "Cóipeáil rudaí go dtí an gearrthaisce."
+
+#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
+#, fuzzy
+msgid "Select all text and images"
+msgstr "Comment=Taispeáin Teachtaireacht Téacs i bPreabfhuinneog"
+
+#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
+#: ../widgets/misc/e-web-view.c:986
+#, fuzzy, c-format
+msgid "Click to call %s"
+msgstr "Theip ar ghlao '%s': %s\n"
+
+#: ../widgets/misc/e-web-view.c:988
+#, fuzzy
+msgid "Click to hide/unhide addresses"
+msgstr "Cliceáil chun féilire an mhíosa a fholú"
+
+#: ../widgets/misc/e-web-view.c:990
+#, c-format
+msgid "Click to open %s"
+msgstr "Cliceáil chun %s a oscailt"
+
+#: ../widgets/misc/ea-calendar-item.c:306
+#: ../widgets/misc/ea-calendar-item.c:315
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../widgets/misc/ea-calendar-item.c:318
+>>>>>>> master
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Féilire: ó %s go %s"
 
+<<<<<<< HEAD
 #: ../widgets/misc/ea-calendar-item.c:347
 msgid "evolution calendar item"
 msgstr ""
@@ -21377,25 +40307,49 @@ msgid "popup list"
 msgstr "preabliosta"
 
 #: ../widgets/table/e-cell-date-edit.c:300
+=======
+#: ../widgets/misc/ea-calendar-item.c:354
+msgid "evolution calendar item"
+msgstr ""
+
+#: ../widgets/table/e-cell-combo.c:187
+msgid "popup list"
+msgstr "preabliosta"
+
+#: ../widgets/table/e-cell-date-edit.c:299
+>>>>>>> master
 msgid "Now"
 msgstr "Anois"
 
 #. Translators: "None" as a label of a button to unset date in a date table cell
+<<<<<<< HEAD
 #: ../widgets/table/e-cell-date-edit.c:317
 #, fuzzy
+=======
+#: ../widgets/table/e-cell-date-edit.c:316
+>>>>>>> master
 msgctxt "table-date"
 msgid "None"
 msgstr "Neamhní"
 
+<<<<<<< HEAD
 #: ../widgets/table/e-cell-date-edit.c:325
 msgid "OK"
 msgstr "Ceart go Leor"
 
 #: ../widgets/table/e-cell-date-edit.c:869
+=======
+#: ../widgets/table/e-cell-date-edit.c:324
+msgid "OK"
+msgstr "Ceart go Leor"
+
+#: ../widgets/table/e-cell-date-edit.c:868
+>>>>>>> master
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
 
+<<<<<<< HEAD
 #: ../widgets/table/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
@@ -21403,31 +40357,48 @@ msgstr ""
 #: ../widgets/table/e-table-click-to-add.c:592
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:60
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:139
+=======
+#: ../widgets/table/e-cell-percent.c:80
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
+
+#: ../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:143
+>>>>>>> master
 msgid "click to add"
 msgstr "cliceáil chun cur leis"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
 msgid "(Ascending)"
 msgstr "(Ag dul suas)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
 msgid "(Descending)"
 msgstr "(Ag dul síos)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:400
 msgid "Not sorted"
 msgstr "Gan sórtáil"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:441
 msgid "No grouping"
 msgstr "Gan grúpáil"
 
+<<<<<<< HEAD
 #: ../widgets/table/e-table-config.c:657
+=======
+#: ../widgets/table/e-table-config.c:666
+>>>>>>> master
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Taispeáin Réimsí"
 
+<<<<<<< HEAD
 #: ../widgets/table/e-table-config.c:677
+=======
+#: ../widgets/table/e-table-config.c:686
+>>>>>>> master
 msgid "Available Fields"
 msgstr "Réimsí ar Fáil"
 
@@ -21436,7 +40407,11 @@ msgid "A_vailable Fields:"
 msgstr "Réimsí ar _Fáil:"
 
 #: ../widgets/table/e-table-config.ui.h:2
+<<<<<<< HEAD
 #: ../widgets/table/e-table-header-item.c:1678
+=======
+#: ../widgets/table/e-table-header-item.c:1717
+>>>>>>> master
 msgid "Ascending"
 msgstr "Ag dul suas"
 
@@ -21449,7 +40424,11 @@ msgid "Clear _All"
 msgstr "Glan _Gach Rud"
 
 #: ../widgets/table/e-table-config.ui.h:5
+<<<<<<< HEAD
 #: ../widgets/table/e-table-header-item.c:1678
+=======
+#: ../widgets/table/e-table-header-item.c:1717
+>>>>>>> master
 msgid "Descending"
 msgstr "Ag dul síos"
 
@@ -21513,18 +40492,27 @@ msgstr ""
 msgid "_Sort..."
 msgstr "_Sórtáil..."
 
+<<<<<<< HEAD
 #: ../widgets/table/e-table-field-chooser-dialog.c:117
 #, fuzzy
 msgid "Add a Column"
 msgstr "Cuir C_olún Leis..."
 
 #: ../widgets/table/e-table-field-chooser.c:151
+=======
+#: ../widgets/table/e-table-field-chooser-dialog.c:119
+msgid "Add a Column"
+msgstr "Cuir Colún Leis"
+
+#: ../widgets/table/e-table-field-chooser.c:153
+>>>>>>> master
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
 msgstr ""
 
 #. Translators: This text is used as a special row when an ETable
+<<<<<<< HEAD
 #. 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.
@@ -21548,6 +40536,31 @@ msgstr[4] "%s : %s (%d mír)"
 #. Example: "Smith (13 items)"
 #.
 #: ../widgets/table/e-table-group-container.c:363
+=======
+#. * 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:361
+#, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+msgstr[0] "%s: %s (%d mhír)"
+msgstr[1] "%s: %s (%d mhír)"
+msgstr[2] "%s: %s (%d mhír)"
+msgstr[3] "%s: %s (%d mír)"
+msgstr[4] "%s: %s (%d mír)"
+
+#. 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)"
+#.
+#: ../widgets/table/e-table-group-container.c:373
+>>>>>>> master
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -21557,35 +40570,60 @@ msgstr[2] "%s (%d mhír)"
 msgstr[3] "%s (%d mír)"
 msgstr[4] "%s (%d mír)"
 
+<<<<<<< HEAD
 #: ../widgets/table/e-table-header-item.c:1522
+=======
+#: ../widgets/table/e-table-header-item.c:1557
+>>>>>>> master
 #, fuzzy
 msgid "Customize Current View"
 msgstr "Féach ar an gcomhad reatha"
 
+<<<<<<< HEAD
 #: ../widgets/table/e-table-header-item.c:1543
+=======
+#: ../widgets/table/e-table-header-item.c:1579
+>>>>>>> master
 #, fuzzy
 msgid "Sort _Ascending"
 msgstr "Sórtáil in ord Ardaitheach"
 
+<<<<<<< HEAD
 #: ../widgets/table/e-table-header-item.c:1546
+=======
+#: ../widgets/table/e-table-header-item.c:1582
+>>>>>>> master
 #, fuzzy
 msgid "Sort _Descending"
 msgstr "Sórtáil in ord �slitheach"
 
+<<<<<<< HEAD
 #: ../widgets/table/e-table-header-item.c:1549
 msgid "_Unsort"
 msgstr "_Díshórtáil"
 
 #: ../widgets/table/e-table-header-item.c:1552
+=======
+#: ../widgets/table/e-table-header-item.c:1585
+msgid "_Unsort"
+msgstr "_Díshórtáil"
+
+#: ../widgets/table/e-table-header-item.c:1588
+>>>>>>> master
 #, fuzzy
 msgid "Group By This _Field"
 msgstr "&Seiceáil litriú an réimse seo"
 
+<<<<<<< HEAD
 #: ../widgets/table/e-table-header-item.c:1555
+=======
+#: ../widgets/table/e-table-header-item.c:1591
+>>>>>>> master
 #, fuzzy
 msgid "Group By _Box"
 msgstr "Grúpáil de réir &Suímh"
 
+<<<<<<< HEAD
 #: ../widgets/table/e-table-header-item.c:1559
 msgid "Remove This _Column"
 msgstr "Bain an Co_lún Seo"
@@ -21595,49 +40633,93 @@ msgid "Add a C_olumn..."
 msgstr "Cuir C_olún Leis..."
 
 #: ../widgets/table/e-table-header-item.c:1566
+=======
+#: ../widgets/table/e-table-header-item.c:1595
+msgid "Remove This _Column"
+msgstr "Bain an Co_lún Seo"
+
+#: ../widgets/table/e-table-header-item.c:1598
+msgid "Add a C_olumn..."
+msgstr "Cuir C_olún Leis..."
+
+#: ../widgets/table/e-table-header-item.c:1602
+>>>>>>> master
 #, fuzzy
 msgid "A_lignment"
 msgstr "Ai&líniú..."
 
+<<<<<<< HEAD
 #: ../widgets/table/e-table-header-item.c:1569
+=======
+#: ../widgets/table/e-table-header-item.c:1605
+>>>>>>> master
 #, fuzzy
 msgid "B_est Fit"
 msgstr "Laghdaigh go leithead leathanaigh"
 
+<<<<<<< HEAD
 #: ../widgets/table/e-table-header-item.c:1572
 msgid "Format Column_s..."
 msgstr "Formáidigh Colúi_n..."
 
 #: ../widgets/table/e-table-header-item.c:1576
+=======
+#: ../widgets/table/e-table-header-item.c:1608
+msgid "Format Column_s..."
+msgstr "Formáidigh Colúi_n..."
+
+#: ../widgets/table/e-table-header-item.c:1612
+>>>>>>> master
 #, fuzzy
 msgid "Custo_mize Current View..."
 msgstr "Dún an t-amharc reatha cáipéise"
 
+<<<<<<< HEAD
 #: ../widgets/table/e-table-header-item.c:1635
+=======
+#: ../widgets/table/e-table-header-item.c:1674
+>>>>>>> master
 msgid "_Sort By"
 msgstr "_Sórtáil De Réir"
 
 #. Custom
+<<<<<<< HEAD
 #: ../widgets/table/e-table-header-item.c:1653
+=======
+#: ../widgets/table/e-table-header-item.c:1692
+>>>>>>> master
 msgid "_Custom"
 msgstr "_Saincheaptha"
 
 #. Translators: description of a "popup" action
+<<<<<<< HEAD
 #: ../widgets/table/gal-a11y-e-cell-popup.c:123
+=======
+#: ../widgets/table/gal-a11y-e-cell-popup.c:125
+>>>>>>> master
 msgid "popup a child"
 msgstr ""
 
 #. Translators: description of a "toggle" action
+<<<<<<< HEAD
 #: ../widgets/table/gal-a11y-e-cell-toggle.c:174
+=======
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:178
+>>>>>>> master
 msgid "toggle the cell"
 msgstr ""
 
 #. Translators: description of an "expand" action
+<<<<<<< HEAD
 #: ../widgets/table/gal-a11y-e-cell-tree.c:212
+=======
+#: ../widgets/table/gal-a11y-e-cell-tree.c:214
+>>>>>>> master
 msgid "expands the row in the ETree containing this cell"
 msgstr ""
 
 #. Translators: description of a "collapse" action
+<<<<<<< HEAD
 #: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr ""
@@ -21659,5 +40741,28 @@ msgid "Select All"
 msgstr "Roghnaigh Gach Rud"
 
 #: ../widgets/text/e-text.c:2294
+=======
+#: ../widgets/table/gal-a11y-e-cell-tree.c:221
+msgid "collapses the row in the ETree containing this cell"
+msgstr ""
+
+#: ../widgets/table/gal-a11y-e-cell.c:123
+msgid "Table Cell"
+msgstr ""
+
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
+msgid "click"
+msgstr "cliceáil"
+
+#: ../widgets/table/gal-a11y-e-table-column-header.c:158
+msgid "sort"
+msgstr "sórtáil"
+
+#: ../widgets/text/e-text.c:2327
+msgid "Select All"
+msgstr "Roghnaigh Gach Rud"
+
+#: ../widgets/text/e-text.c:2339
+>>>>>>> master
 msgid "Input Methods"
 msgstr "Modhanna Ionchurtha"
diff --git a/po/te.po b/po/te.po
index a086f2cdc8..059856e79d 100644
--- a/po/te.po
+++ b/po/te.po
@@ -3,18 +3,19 @@
 # Copyright (C) 2005 Free Software Foundation, Andhra Pradesh.
 # This file is distributed under the same license as the evolution package.
 #
+#: ../shell/main.c:570
 # Prajasakti Localisation Team <localisation@prajasakti.com>, 2005.
 # భరత� క�మార� <bharatfsf@gmail.com>, 2007.
 # Krishna Babu K <kkrothap@redhat.com>, 2008, 2009, 2010.
-#: ../shell/main.c:534
+# Krishnababu Krothapalli <kkrothap@redhat.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: te\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=evolution\n"
-"POT-Creation-Date: 2010-07-28 04:11+0000\n"
-"PO-Revision-Date: 2010-07-21 18:35+0530\n"
-"Last-Translator: Krishna Babu K <kkrothap@redhat.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
+"cgi?product=evolution&keywords=I18N+L10N\n"
+"POT-Creation-Date: 2011-09-21 15:52+0000\n"
+"PO-Revision-Date: 2011-09-26 13:35+0530\n"
+"Last-Translator: Krishnababu Krothapalli <kkrothap@redhat.com>\n"
 "Language-Team: Telugu <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +29,8 @@ msgstr ""
 "\n"
 "\n"
 "\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.2\n"
+"Language: te\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
@@ -36,211 +38,263 @@ msgid ""
 "'{0}' is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
 msgstr ""
-"'{0}' చద�వ�ట-మాత�రమే చిర�నామా ప�స�తకం మరియ� సవరించలేమ�. ప�రక�కపట�టీలోని పరిచయాల దర�శనంన�ండి వేరొక "
+"'{0}' చద�వ�ట-మాత�రమే చిర�నామా ప�స�తకం మరియ� సవరించలేమ�. ప�రక�కపట�టీలోని "
+"పరిచయాల దర�శనంన�ండి వేరొక "
 "చిర�నామాప�స�తకంన� యెంచ�కోండి."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
-msgstr "ఒక పైచయం ఈ చిర�నామాతో మ�ందే ఉన�నది. మీర� ఈ చిర�నామాతోనే కొత�త పలకానికి జతచేయాలన�క�ంట�న�నారా?"
+msgstr ""
+"ఒక పైచయం ఈ చిర�నామాతో మ�ందే ఉన�నది. మీర� ఈ చిర�నామాతోనే కొత�త పలకానికి "
+"జతచేయాలన�క�ంట�న�నారా?"
 
 #: ../addressbook/addressbook.error.xml.h:4
-msgid "Address '{0}' already exists."
-msgstr "చిర�నామా '{0}మ�ందే ఉన�నది"
+#| msgid ""
+#| "The name or email of this contact already exists in this folder.  Would "
+#| "you like to add it anyway?"
+msgid ""
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
+msgstr ""
+"ఒక పరిచయ జాబితా '{0}' పేర�తో వ�న�నది యిప�పటికే ఈ పరిచయ జాబితానంద� వ�ంది. "
+"అయినా మీర�దీనిని జతచేద�దామని అన�క�ంట�న�నారా?"
 
 #: ../addressbook/addressbook.error.xml.h:5
+msgid "Add with duplicates"
+msgstr "నకిలీలతో జతచేయి"
+
+#: ../addressbook/addressbook.error.xml.h:6
+msgid "Address '{0}' already exists."
+msgstr "చిర�నామా '{0}' మ�ందే ఉన�నది"
+
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Cannot add new contact"
 msgstr "కొత�త పరిచయాన�ని జతచేయలేమ�"
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Cannot move contact."
 msgstr "పరిచయాన�ని జరపలేమ�"
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Category editor not available."
 msgstr "విభాగ సరిచేయ�కర�త అంద�బాట�లో లేద�"
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:10
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
 "your caps lock might be on."
 msgstr ""
-"మీ సంకేతపదం సరిగా స�పెల� చేయబడినదోలేదో మరియ� మీర� మద�దతీయబడ� లాగిన� విధానాన�ని ఉపయోగిస�త�న�నారో లేదో ఒక సారి "
-"సరిచూడండి. చాలా సంకేతపదాల� చిన�నపెద�దఅక�షర తేడాన� కలిగిఉన�నవని గ�ర�తించండి; మీ కాప�స�‌లాక� ఉపయోగంలో "
+"మీ సంకేతపదం సరిగా స�పెల� చేయబడినదోలేదో మరియ� మీర� మద�దతీయబడ� లాగిన� "
+"విధానాన�ని ఉపయోగిస�త�న�నారో లేదో ఒక సారి "
+"సరిచూడండి. చాలా సంకేతపదాల� చిన�నపెద�దఅక�షర తేడాన� కలిగిఉన�నవని గ�ర�తించండి; "
+"మీ కాప�స�‌లాక� ఉపయోగంలో "
 "ఉండిఉండవచ�చ�."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Could not get schema information for LDAP server."
 msgstr "LDAP సేవిక  క�  మ�ఖ�యాంశ సూచిక  సమాచారం రాలేద�"
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Could not remove address book."
 msgstr "చిర�నామా ప�స�తకాన�ని తొలగించలేమ�"
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:13
 msgid ""
 "Currently you can only access the GroupWise System Address Book from "
 "Evolution. Please use some other GroupWise mail client once to get your "
 "GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
-"ప�రస�త�తం మీర� ఎవాల�యూషన� న�ండి సమూహతరహా చిర�నామా ప�స�తకం న� మాత�రమే వాడ�కోగలర�. మీ తరచూ "
-"సమూహతరహా పరిచయాలన� మరియ� సమూహతరహా వ�యక�తిగత పరిచయాల సంచయాలన� పొంద�టక�, దయచేసి వేరొక సమూహతరహా "
+"ప�రస�త�తం మీర� ఎవాల�యూషన� న�ండి సమూహతరహా చిర�నామా ప�స�తకం న� మాత�రమే "
+"వాడ�కోగలర�. మీ తరచూ "
+"సమూహతరహా పరిచయాలన� మరియ� సమూహతరహా వ�యక�తిగత పరిచయాల సంచయాలన� పొంద�టక�, దయచేసి "
+"వేరొక సమూహతరహా "
 "మెయిల� కక�షిదారిని ఒకసారి వ�పయోగించండి."
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Delete address book '{0}'?"
 msgstr "చిర�నామా ప�స�తకాన�ని తొలగించండి '{0}'?"
 
-#: ../addressbook/addressbook.error.xml.h:13
+#: ../addressbook/addressbook.error.xml.h:15
 #: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
-#, fuzzy
 msgid "Do _Not Delete"
-msgstr "తొలగించవద�ద�"
+msgstr "తొలగించవద�ద� (_N)"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "Error saving {0} to {1}: {2}"
 msgstr "{0} న� {1} క� దాయ�టలో దోషం: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Failed to authenticate with LDAP server."
 msgstr "LDAP సేవిక తో ప�రామాణీకరించడంలో విఫలమయినది."
 
-#. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1273
+#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Failed to delete contact"
 msgstr "పరిచయాన�ని తొలగించడంలో విఫలమయినది"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "GroupWise Address book creation:"
 msgstr "గ�రూప�ల వారీగా  చిర�నామా ప�స�తక సృష�టి:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP సేవిక    మ�ఖ�యాంశ సూచిక  సమాచారం తో స�పపందించలేద� "
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:21
+#| msgid "{0} is already in the list"
+msgid "List '{0}' is already in this contact list."
+msgstr "ఈ పరిచయ జాబితానంద� జాబితా '{0}' ఇప�పటికే వ�ంది."
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "Skip duplicates"
+msgstr "నకిలీలన� వదలివేయి"
+
+#: ../addressbook/addressbook.error.xml.h:23
+msgid "Some addresses already exist in this contact list."
+msgstr "ఈ పరిచయ జాబితానంద� కొన�ని చిర�నామాల� యిప�పటికే వ�న�నాయి."
+
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Some features may not work properly with your current server"
 msgstr "మీ ప�రస�త�త  సేవికతో కొన�ని లక�షణాల� సరిగ�గా పనిచేయవ�"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "ఎవల�యూష�న� చిర�నామా ప�స�తకం ఊహించని విధంగా త�యజించబడినది."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
-msgstr "మీర� ఎంచ�క�న�న ప�రతిరూపం చాలా పెద�దది. మీర� దాన�ని మార�చి దాయాలన�క�ంట�న�నారా?"
+msgstr ""
+"మీర� ఎంచ�క�న�న ప�రతిరూపం చాలా పెద�దది. మీర� దాన�ని మార�చి దాయాలన�క�ంట�న�నారా?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 msgstr ""
-"ఈ LDAP సేవిక పాత LDAP వర�షన� న� ఉపయోగిస�త�ండవచ�చ�, �దైతే ఈ ఫంక�షనాలిటినికి మద�దత� నీయదో లేదా ఇది "
-"తప�ప�గాఆకృతీకరించి ఉండవచ�చ�. మద�దత�నిచ�చ� శోధన ఆధారాల కొరక� మీ నిర�వహణాధికారిని సంప�రదించండి."
+"ఈ LDAP సేవిక పాత LDAP వర�షన� న� ఉపయోగిస�త�ండవచ�చ�, �దైతే ఈ ఫంక�షనాలిటినికి "
+"మద�దత� నీయదో లేదా ఇది "
+"తప�ప�గాఆకృతీకరించి ఉండవచ�చ�. మద�దత�నిచ�చ� అన�వేషణ ఆధారాల కొరక� మీ "
+"నిర�వహణాధికారిని సంప�రదించండి."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This address book could not be opened."
 msgstr "ఈ చిర�నామా ప�స�తకాన�ని తెర�వలేకపోయింది."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "This address book server does not have any suggested search bases."
 msgstr "ఈ చిర�నామా ప�స�తక సేవికక�  తగ�గ వెత�క� మూలాల� లేవ�"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:30
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
-"ఈ చిర�నామా ప�స�తక సేవిక అంద�బాట�లో లేద� లేక సేవిక నామమ�ఉచ�ఛారణలో లోపం జరిగింది  లేక మీ అల�లిక బంధం "
+"ఈ చిర�నామా ప�స�తక సేవిక అంద�బాట�లో లేద� లేక సేవిక పేర�ఉచ�ఛారణలో లోపం జరిగింది "
+" లేక మీ అల�లిక బంధం "
 "డౌన� అయినది."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "This address book will be removed permanently."
 msgstr "ఈ చిర�నామా ప�స�తకం శాశ�వతంగా తొలగించబడ�త�ంది."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "This server does not support LDAPv3 schema information."
 msgstr "ఈ సేవికక� LDAPv3 మ�ఖ�యాంశ సూచిక  సమాచార సహకారం లేద�"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "Unable to open address book"
 msgstr "చిర�నామ ప�స�తకాన�ని తెరవలేకపోయింది"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Unable to perform search."
 msgstr "వెతకలేకపోయింది"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Unable to save {0}."
 msgstr "{0} న� దాయలేమ�."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "Would you like to save your changes?"
 msgstr "మీ మార�ప�లన� దాయాలన�క�ంట�న�నారా?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
-"మీర� పరిచయాన�ని ఒక చిర�నామాప�స�తకం న�ండి వేరొక దానికి కద�ల�చ�టక� ప�రయత�నిస�త�న�నార� అయితే ఇది మూలం "
+"మీర� పరిచయాన�ని ఒక చిర�నామాప�స�తకం న�ండి వేరొక దానికి కద�ల�చ�టక� "
+"ప�రయత�నిస�త�న�నార� అయితే ఇది మూలం "
 "న�ండి తొలగించబడద�. మీర� బద�ల�గా ఒక నకల� దాయాలన�క�ంట�న�నారా?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../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"
 msgstr ""
-"మీర� మద�దతీయని సమూహతరహా సేవికక� అన�సంధానించబడ�త�న�నార� మరియ� ఎవాల�యూషన� న� ఉపయోగించ�టలో "
-"సమస�యలన� ఎద�ర�కోవచ�చ�. మంచి ఫలితాలకొరక� సేవిక మద�దతీయబడ� వర�షన� క� నవీకరింబడవలెన�"
+"మీర� మద�దతీయని సమూహతరహా సేవికక� అన�సంధానించబడ�త�న�నార� మరియ� ఎవాల�యూషన� న� "
+"ఉపయోగించ�టలో "
+"సమస�యలన� ఎద�ర�కోవచ�చ�. మంచి ఫలితాలకొరక� సేవిక మద�దతీయబడ� వర�షన� క� "
+"నవీకరింబడవలెన�"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:39
+#| msgid ""
+#| "The name or email address of this contact already exists\n"
+#| "in this folder.  Would you like to add it anyway?"
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr ""
+"ఈ జాబితానంద� యిప�పటికే భాగమైన చిర�నామాలన� మీర� జతచేయ�టక� ప�రయత�నిస�త�న�నార�. "
+"మీర� వాటిని యేమైనా సరే సంస�థాపించాలని అన�కొన�చ�న�నారా?"
+
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "ఈచిర�నామా ప�స�తకంన�ండి పరిచయాలన� తొలగించ�టక� మీర� అన�మతినికలిగిలేర�."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:41
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
-msgstr "ఈ పరిచయానికి మీర� సవరింప�ల� చేసార�. మీర� ఈ మార�ప�లన� దాయాలన�క�ంట�న�నారా?"
+msgstr ""
+"ఈ పరిచయానికి మీర� సవరింప�ల� చేసార�. మీర� ఈ మార�ప�లన� దాయాలన�క�ంట�న�నారా?"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#. Translators: {0} is replaced with an address book name which will not be available
+#: ../addressbook/addressbook.error.xml.h:43
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
-msgstr "ఎవాల�యూషన� ప�నఃప�రారంభించ�నంతవరక� {0} కొరక� మీ పరిచయాల� అంద�బాట�లోకి రావ�."
+msgstr ""
+"ఎవాల�యూషన� ప�నఃప�రారంభించ�నంతవరక� {0} కొరక� మీ పరిచయాల� అంద�బాట�లోకి రావ�."
 
-#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
-#: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:618
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "జతచేయ�(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "_Discard"
 msgstr "తీసివేయ�(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "_Do not save"
 msgstr "దాయవద�ద�(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:47
 msgid "_Resize"
 msgstr "ప�న: పరిమాణమ�(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:48
 msgid "_Use as it is"
 msgstr "ఎలా ఉందో అలా ఉపయోగించ�మ�(_U)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2022
+#: ../addressbook/gui/widgets/eab-contact-display.c:715
+#: ../calendar/gui/e-calendar-view.c:2104
 msgid "Anniversary"
 msgstr "వార�షీకోత�సవం"
 
@@ -250,83 +304,80 @@ msgstr "వార�షీకోత�సవం"
 #. * 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:582
-#: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:123
+#: ../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
 msgid "Birthday"
 msgstr "ప�ట�టిన రోజ�"
 
 #. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
-#, fuzzy
 msgid "Blog:"
-msgstr "బ�లాగ�"
+msgstr "బ�లాగ�:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "విభాగాల�(_t)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#, fuzzy
 msgid "Calendar:"
-msgstr "క�యాలెండర�(_C):"
+msgstr "క�యాలెండర�:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:934
+#: ../addressbook/importers/evolution-vcard-importer.c:991
 msgid "Contact"
 msgstr "చిర�నామా"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2584
+#: ../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
 msgid "Contact Editor"
 msgstr "చిర�నామా సరిచేయ�నది"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:295
+#: ../addressbook/gui/merging/eab-contact-merging.c:386
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
-#: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../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:837
 msgid "Email"
 msgstr "ఈ-తపాలా"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
-#, fuzzy
 msgid "Free/Busy:"
-msgstr "ఖాళీ/తీరిక లేని(_F):"
+msgstr "ఖాళీ/తీరిక లేని:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "పూర�తి పేర�(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:70
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:1323
+#: ../widgets/misc/e-contact-map.c:295
 msgid "Home"
 msgstr "నివాసం"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-#, fuzzy
 msgid "Home Page:"
-msgstr "నివాస ప�ట(_H):"
+msgstr "నివాస  పేజీ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "ప�రతిరూపం"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-#, fuzzy
 msgid "Instant Messaging"
-msgstr "<b>తక�షణ సందేశం</b>"
+msgstr "తక�షణ సందేశీకరణ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
-msgstr ""
+msgstr "జాబ�"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
@@ -334,27 +385,22 @@ msgstr "మెయిల� చేసే చిర�నామా"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
-#, fuzzy
 msgid "Miscellaneous"
-msgstr "వివిధమైన"
+msgstr "నానావిధమైన"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "నిక� నేమ� (_k):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:423
-#: ../plugins/groupwise-features/camel-gw-listener.c:448
-#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "గమనికల�"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:71
-#: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1725
+#: ../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
 msgid "Other"
 msgstr "ఇతరమ�ల�"
 
@@ -367,24 +413,23 @@ msgid "Telephone"
 msgstr "దూర సంవాదక యంత�రమ�"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-#, fuzzy
 msgid "Video Chat:"
-msgstr "దృశ�య మాటామంతి(_V):"
+msgstr "దృశ�య మాటామంతి:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-#, fuzzy
 msgid "Web Addresses"
-msgstr "<b>మహాతలంలో చిర�నామాల�</b>"
+msgstr "వెబ� చిర�నామాల�"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
-#, fuzzy
 msgid "Web addresses"
-msgstr "చిర�నామాల�"
+msgstr "వెబ� చిర�నామాల�"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:69
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
+#: ../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 "పని"
 
@@ -405,14 +450,13 @@ msgid "_Birthday:"
 msgstr "ప�ట�టిన రోజ�(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
-#, fuzzy
 msgid "_Blog:"
-msgstr "బ�లాగ�"
+msgstr "బ�లాగ� (_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/itip-formatter/itip-view.c:1921
+#: ../calendar/gui/dialogs/event-page.c:710
+#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../plugins/itip-formatter/itip-view.c:1963
 msgid "_Calendar:"
 msgstr "క�యాలెండర�(_C):"
 
@@ -434,7 +478,7 @@ msgstr "శాఖ(_D):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_File under:"
-msgstr "దస�త�రం కింద(_F):"
+msgstr "ఫైల� కింద(_F):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Free/Busy:"
@@ -490,74 +534,74 @@ msgstr "ఎక�కడ(_W):"
 msgid "_Zip/Postal Code:"
 msgstr "జిప� కోడ�(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
-#: ../addressbook/gui/widgets/eab-contact-display.c:539
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Jabber"
 msgstr "జాబర�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:544
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
 msgid "Yahoo"
 msgstr "యాహూ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:661
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:543
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
 msgid "GroupWise"
 msgstr "గ�రూప�ల వారీగా"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:546
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:662
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
+#: ../addressbook/gui/widgets/eab-gui-util.c:469
 msgid "Error adding contact"
 msgstr "చిర�నామాన� జతపర�చ�టలో దోషం"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
 msgid "Error modifying contact"
 msgstr "చిర�నామా మార�చ�టలో దోషం"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Error removing contact"
 msgstr "చిర�నామా తీసివేయ�టలో దోషం"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:670
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2919
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "పరిచయాన�ని సరిచేయ�నది-%s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2987
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3398
 msgid "Please select an image for this contact"
 msgstr "ఈ పరిచయమ�నక�   దయచేసి ఒక ప�రతిరూపమ�న� ఎంపిక చేయండి"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2988
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3399
 msgid "_No image"
 msgstr "ప�రతిరూపం లేద�(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3730
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -565,53 +609,53 @@ msgstr ""
 "పరిచయాల దత�తాంశం నిస�సారమైనది:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' యొక�క రూపలావణ�యం నిస�సారమైనది"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3743
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' యొక�క రూపలావణ�యం నిస�సారమైనది"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3287
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3756
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3770
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ఖాళీ గా ఉంది"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3785
 msgid "Invalid contact."
 msgstr "నిస�సారమైన పరిచయం"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:437
 msgid "Contact Quick-Add"
 msgstr "పరిచయాన�ని త�వరితంగా-జతచేయ�నది"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:440
 msgid "_Edit Full"
 msgstr "పూర�తిగా సరిచేయ�(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:488
 msgid "_Full name"
 msgstr "పూర�తి నామం(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:499
 msgid "E_mail"
 msgstr "ఈ-తపాలా(_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:510
 msgid "_Select Address Book"
 msgstr "కొత చిర�నామా ప�స�తకాన�ని ఎంచ�కొన�మ�(_S)"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
-msgstr ""
+msgstr "à°¡à°¾."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:2
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
@@ -620,24 +664,23 @@ msgstr "పూర�తి  పేర�"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:4
 msgid "I"
-msgstr ""
+msgstr "I"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:5
 msgid "II"
-msgstr ""
+msgstr "II"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:6
 msgid "III"
-msgstr ""
+msgstr "III"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:7
 msgid "Jr."
-msgstr ""
+msgstr "జూ."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:8
-#, fuzzy
 msgid "Miss"
-msgstr "ఇక"
+msgstr "క�మారి"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:9
 msgid "Mr."
@@ -672,14 +715,13 @@ msgid "_Suffix:"
 msgstr "అంత�యసర�గ(_S):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:742
 msgid "Contact List Editor"
 msgstr "జాబీతా సరిచేయ�వాన�ని సంప�రదించ�మ�"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
-#, fuzzy
 msgid "Members"
-msgstr "సభ�య�ల�(_M)"
+msgstr "సభ�య�ల�"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 msgid "_Hide addresses when sending mail to this list"
@@ -690,54 +732,60 @@ msgid "_List name:"
 msgstr "జాబితా పేర�(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:173
+#: ../mail/mail-config.ui.h:163
 msgid "_Select..."
 msgstr "ఎంపికచేయి (_S)..."
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "ఈమెయిల� చిర�నామాన� రాయ�మ� లేదా దాన�ని పరిచయాన�ని క�రింది జాబితాలో కి జరపండి(_T)"
+msgstr ""
+"ఈమెయిల� చిర�నామాన� రాయ�మ� లేదా దాన�ని పరిచయాన�ని క�రింది జాబితాలో కి "
+"జరపండి(_T)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:865
 msgid "Contact List Members"
 msgstr "పరిచయస�త�ల జాబితా సభ�య�ల�"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:911
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1328
-msgid "_Members"
-msgstr "సభ�య�ల�(_M)"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1440
 msgid "Error adding list"
 msgstr "జాబితాన� జతపర�చ�టలో దోషం"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1180
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1455
 msgid "Error modifying list"
 msgstr "జాబితాన� మార�చ�టలో దోషం"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1194
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1470
 msgid "Error removing list"
 msgstr "జాబితాన� తీసివేయ�టలో దోషం"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1601
+msgid "_Members"
+msgstr "సభ�య�ల�(_M)"
+
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "మార�చిన చిర�నామా:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
+#. Translators: Heading of the contact which has same name or email address in this folder already.
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
 msgid "Conflicting Contact:"
 msgstr "ఘర�షణపడ�త�న�న చిర�నామా:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "పరిచయం యొక�క నకల�న� కనిపెట�టింది"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
+#| msgid ""
+#| "The name or email of this contact already exists in this folder.  Would "
+#| "you like to add it anyway?"
 msgid ""
-"The name or email of this contact already exists in this folder.  Would you "
-"like to add it anyway?"
+"The name or email of this contact already exists in this folder. Would you "
+"like to save the changes anyway?"
 msgstr ""
-"ఈపరిచయంయొక�క నామమ� లేదా ఈమెయిల� యిప�పటికే ఈఫోల�డర�‌నంద� వ�ంది.  అయినా మీర�దీనిని జతచేద�దామని అన�క�ంట�న�నారా?"
+"ఈపరిచయంయొక�క పేర� లేదా ఈమెయిల� యిప�పటికే ఈఫోల�డర�‌నంద� వ�ంది.  అయినా మీర� "
+"మార�ప�లన� దాచాలని అన�క�ంట�న�నారా?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
@@ -752,154 +800,134 @@ msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
-"ఈ పరిచయం యొక�క నామమ� లేదా ఈమెయిల� చిర�నామా ఈ సంచయం\n"
+"ఈ పరిచయం యొక�క పేర� లేదా ఈమెయిల� చిర�నామా ఈ సంచయం\n"
 "నంద� ఇప�పటికే ఉంది.  మీర� దీనిని �విధంగానైనా జతచేయాలని అన�క�ంట�న�నారా?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:241
+#: ../addressbook/gui/merging/eab-contact-merging.c:332
 msgid "_Merge"
 msgstr "విలీనం (_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:166
-#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
-#, c-format
-msgid "Cancelled"
-msgstr "రద�ద�చేయబడినది"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:224
+#: ../addressbook/gui/merging/eab-contact-merging.c:315
 msgid "Merge Contact"
 msgstr "పరిచయాన�ని విలీనంచేయి"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../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:904
-#: ../modules/calendar/e-cal-shell-view-actions.c:1687
-#: ../modules/calendar/e-memo-shell-view-actions.c:768
-#: ../modules/calendar/e-task-shell-view-actions.c:967
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Any field contains"
 msgstr "� క�షేత�రమైన కలిగిఉన�నది "
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:911
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Email begins with"
 msgstr "దీనితో ఈ-తపాలా మొదలౌత�ంది"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:918
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
 msgid "Name contains"
-msgstr "దీనిని కలిగివ�న�ననామమ�"
+msgstr "దీనిని కలిగివ�న�నపేర�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:143
+#: ../addressbook/gui/widgets/e-addressbook-model.c:157
 msgid "No contacts"
 msgstr "చిర�నామాల� లేవ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:147
+#: ../addressbook/gui/widgets/e-addressbook-model.c:161
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d చిర�నామా"
 msgstr[1] "%d చిర�నామాల�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-model.c:357
 msgid "Error getting book view"
 msgstr "ప�స�తక దర�శనం తీస�క�వచ�చ�టలో దోషమ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:716
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-model.c:771
 msgid "Search Interrupted"
-msgstr "శోధన వడపోత"
+msgstr "అన�వేషణ ఆటంకపరచబడెన�"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:158
 msgid "Error modifying card"
 msgstr "పలకం మార�చ�ట లో దోషం"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Cut selected contacts to the clipboard"
-msgstr "ఎంపికచేసిన పాఠ�యమ�న� క�లిప�‌బోర�డ�క� కత�తిరించ�మ�"
+msgstr "ఎంపికచేసిన పరిచయాలన� క�లిప�‌బోర�డ�క� కత�తిరించ�మ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Copy selected contacts to the clipboard"
-msgstr "ఎంపికైన పాఠ�యాన�ని క�లిప� పలకాన�ని నకల� తీయ�మ�"
+msgstr "ఎంపికైన పరిచయాలన� క�లిప� పలకాన�ని నకల� తీయ�మ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
 msgid "Paste contacts from the clipboard"
-msgstr "క�లిప� పలకం న�ండి కర�తవ�యాలన� అతికించ�మ�"
+msgstr "క�లిప� పలకం న�ండి పరిచయాలన� అతికించ�మ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
-#: ../modules/addressbook/e-book-shell-view-actions.c:729
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "Delete selected contacts"
 msgstr "ఎంచ�క�న�న పరిచయాలన� తొలగించ�మ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:646
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:648
 msgid "Select all visible contacts"
-msgstr "అన�ని పరిచయాలన� ఎంచ�కొన�మ�"
+msgstr "అన�ని కనిపించ� పరిచయాలన� ఎంచ�కొన�మ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
 msgid "Are you sure you want to delete these contact lists?"
-msgstr ""
-"మీర� ఖచ�చితంగా ఈ పరిచయ\n"
-"జాబితాలన� తొలగిద�దామన�క�ంట�న�నారా?"
+msgstr "మీర� ఖచ�చితంగా ఈ పరిచయ జాబితాలన� తొలగిద�దామన�క�ంట�న�నారా?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
 msgid "Are you sure you want to delete this contact list?"
-msgstr ""
-"మీర� ఖచ�చితంగా ఈ పరిచయ\n"
-"జాబితాలన� తొలగిద�దామన�క�ంట�న�నారా?"
+msgstr "మీర� ఖచ�చితంగా ఈ పరిచయ జాబితాలన� తొలగిద�దామన�క�ంట�న�నారా?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
+#, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
-msgstr ""
-"మీర� ఖచ�చితంగా పరిచయ\n"
-"జాబితాన� తొలగిద�దామన�క�ంట�న�నారా (%s)? "
+msgstr "మీర� ఖచ�చితంగా పరిచయ జాబితాన� తొలగిద�దామన�క�ంట�న�నారా (%s)? "
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1340
 msgid "Are you sure you want to delete these contacts?"
-msgstr ""
-"మీక� ఖచ�చితంగా పరిచయాలన�\n"
-"తొలగిద�దామన�క�ంట�న�నారా?"
+msgstr "మీక� ఖచ�చితంగా పరిచయాలన� తొలగిద�దామన�క�ంట�న�నారా?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1344
 msgid "Are you sure you want to delete this contact?"
-msgstr ""
-"మీక� ఖచ�చితంగా పరిచయాలన�\n"
-"తొలగిద�దామన�క�ంట�న�నారా?"
+msgstr "మీక� ఖచ�చితంగా పరిచయాలన� తొలగిద�దామన�క�ంట�న�నారా?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1348
+#, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
-msgstr ""
-"మీర� ఖచ�చితంగా పరిచయాన�ని\n"
-"తొలగిద�దామ�న�క�ంట�న�నారా (%s)?"
+msgstr "మీర� ఖచ�చితంగా పరిచయాన�నితొలగిద�దామ�న�క�ంట�న�నారా (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
-#, fuzzy, c-format
+#. Translators: This is shown for > 5 contacts.
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1504
+#, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
-msgstr ""
-"%dచిర�నామాన� తెరచినప�ప�డ�  %dకొత�త గవాక�షం కూడా  తెరచ�క�ంట�ంది.\n"
+msgid_plural ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr[0] ""
+"%dచిర�నామాలన� తెరచినప�ప�డ�  %dకొత�త విండో కూడా  తెరచ�క�ంట�ంది.\n"
 "మీర� నిజంగా  ఈ చిర�నామాన� ప�రదర�శించాలన�క�ంట�న�నారా?"
+msgstr[1] ""
+"%dచిర�నామాన� తెరచినప�ప�డ�  %dకొత�త విండోల� కూడా  తెరచ�క�ంటాయి.\n"
+"మీర� నిజంగా  ఈ చిర�నామాలన�నీ ప�రదర�శించాలన�క�ంట�న�నారా?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1473
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1512
 msgid "_Don't Display"
 msgstr "ప�రదర�శించ వద�ద�(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
 msgid "Display _All Contacts"
 msgstr "అన�ని పరిచయాలన� ప�రదర�శించ�మ�(_A)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
 msgid "Assistant"
 msgstr "సహాయక�డ�"
 
@@ -928,7 +956,7 @@ msgid "Car Phone"
 msgstr "కార� ఫోన�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -936,7 +964,7 @@ msgid "Categories"
 msgstr "విభాగాల�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
 msgid "Company"
 msgstr "కంపెనీ"
 
@@ -958,11 +986,11 @@ msgstr "ఇంటి పేర�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
-msgstr "దస�త�రం లాగ"
+msgstr "ఫైల� లాగ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Given Name"
-msgstr "ఇచ�చిన నామమ�"
+msgstr "ఇచ�చిన పేర�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
@@ -985,22 +1013,22 @@ msgid "Journal"
 msgstr "పత�రిక"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
 msgid "Manager"
 msgstr "అభికర�త"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
+#: ../addressbook/gui/widgets/eab-contact-display.c:712
 msgid "Mobile Phone"
 msgstr "మొబైల� ఫోన�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Nickname"
 msgstr "మ�ద�ద� పేర�"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../addressbook/gui/widgets/eab-contact-display.c:739
 msgid "Note"
 msgstr "చీటి"
 
@@ -1029,13 +1057,13 @@ msgid "Radio"
 msgstr "రేడియో"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:569
+#: ../calendar/gui/e-meeting-list-view.c:610
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "పాత�ర"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:584
+#: ../addressbook/gui/widgets/eab-contact-display.c:716
 msgid "Spouse"
 msgstr "జీవిత భాగస�వామి"
 
@@ -1065,7 +1093,7 @@ msgstr "భాగమ�"
 msgid "Web Site"
 msgstr "మయాతల ప�రదేశం"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1075,7 +1103,7 @@ msgstr ""
 "\n"
 "పరిచయాలకొరక� శోధిస�త�న�నది..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1089,7 +1117,7 @@ msgstr ""
 "\n"
 "కొత�త చిర�నామా సృష�టించ�టక� ఇక�కడ రెండ�సార�ల�-నొక�క�మ�"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1103,7 +1131,7 @@ msgstr ""
 "\n"
 "కొత�త చిర�నామా సృష�టించ�టక� ఇక�కడ రెండ�సార�ల� నొక�క�మ�"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
 msgid ""
 "\n"
 "\n"
@@ -1113,7 +1141,7 @@ msgstr ""
 "\n"
 "చిర�నామా కొరక� వెత�క�మ�."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:204
 msgid ""
 "\n"
 "\n"
@@ -1123,148 +1151,139 @@ msgstr ""
 "\n"
 "ఈ దర�శనిలో చూప�టక� అంశాల� లేవ�"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "పని ఈమెయిల�"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "నివాసం ఈమెయిల�"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:807
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:819
 msgid "Other Email"
 msgstr "ఇతర ఈమెయిల�"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:184
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+#: ../addressbook/gui/widgets/ea-minicard-view.c:187
 msgid "evolution address book"
 msgstr "ఎవల�యూషన� చిర�నామా ప�స�తకం"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
 msgid "New Contact"
 msgstr "కొత�త  పరిచయం"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+#: ../addressbook/gui/widgets/ea-minicard-view.c:37
 msgid "New Contact List"
 msgstr "కొత�త  పరిచయ జాబితా"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:167
+#: ../addressbook/gui/widgets/ea-minicard-view.c:170
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "ప�రస�త�త చిర�నామా ప�స�తకం సంచయం %s కలిగిఉంది %d కార�డ�న�"
 msgstr[1] "ప�రస�త�త చిర�నామా ప�స�తకం సంచయం %s కలిగిఉంది %d కార�డ�లన�"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:31
+#: ../addressbook/gui/widgets/ea-minicard.c:34
 msgid "Open"
 msgstr "తెర�వ�మ�"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:153
+#: ../addressbook/gui/widgets/ea-minicard.c:156
 msgid "Contact List: "
 msgstr "పరిచయ జాబితా:"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:154
+#: ../addressbook/gui/widgets/ea-minicard.c:157
 msgid "Contact: "
 msgstr "పరిచయం: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:180
+#: ../addressbook/gui/widgets/ea-minicard.c:183
 msgid "evolution minicard"
 msgstr "ఎవల�యూషన�  యొక�క చిన�నపలకం"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:182
 msgid "Copy _Email Address"
 msgstr "ఈమెయిల� చిర�నామాన�ని నకల� తీయ�మ�(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:391
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-contact-display.c:184
+#: ../widgets/misc/e-web-view.c:432
 msgid "Copy the email address to the clipboard"
-msgstr "క�లిప�‌బోర�డ�నక� విషయమ�లన� నకల�తీయి."
+msgstr "క�లిప�‌బోర�డ�నక� ఈమెయిల� చిర�నామాల� నకల�తీయి."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:396
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../widgets/misc/e-web-view.c:437
 msgid "_Send New Message To..."
 msgstr "కొత�త సందేశాన�ని ఇక�కడకి పంపించ�మ�(_S)..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:398
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../widgets/misc/e-web-view.c:439
 msgid "Send a mail message to this address"
-msgstr "మెయిల� సందేశాన�ని కర�తవ�యానికి మార�చ�మ�."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:258
-#: ../addressbook/gui/widgets/eab-contact-display.c:260
-msgid "(map)"
-msgstr "(పటం)"
+msgstr "చిర�నామాక� మెయిల� సందేశాన�ని పంప�."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:278
-#: ../addressbook/gui/widgets/eab-contact-display.c:289
-msgid "map"
-msgstr "పటం"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:415
-#: ../addressbook/gui/widgets/eab-contact-display.c:778
-msgid "List Members"
-msgstr "సభ�య�ల జాబితా"
+#: ../addressbook/gui/widgets/eab-contact-display.c:215
+#| msgid "Open"
+msgid "Open map"
+msgstr "మాప� తెర�వ�"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
 #: ../addressbook/gui/widgets/eab-contact-display.c:556
+#| msgid "List Members"
+msgid "List Members:"
+msgstr "జాబితా సభ�య�ల�:"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
 msgid "Department"
 msgstr "శాఖ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
 msgid "Profession"
 msgstr "వృత�త"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
 msgid "Position"
 msgstr "'స�థానం"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
 msgid "Video Chat"
 msgstr "దృశ�య మాటామంతి"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:488
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../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:513
+#: ../modules/online-accounts/e-online-accounts-google.c:294
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:498
+#: ../widgets/misc/e-send-options.c:528
 msgid "Calendar"
 msgstr "క�యాలెండర�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:563
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:128
-#: ../calendar/gui/dialogs/event-editor.c:355
+#: ../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 "ఖాళీ/తీరిక లేని"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:689
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
 msgid "Phone"
 msgstr "ఫోన�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:565
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
 msgid "Fax"
 msgstr "ఫ�యాక�స�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:691
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
 msgid "Address"
 msgstr "చిర�నామా"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:708
 msgid "Home Page"
 msgstr "నివాస ప�ట"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
 msgid "Web Log"
 msgstr "మహాతలంలో నమోద�"
 
@@ -1272,90 +1291,99 @@ msgstr "మహాతలంలో నమోద�"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:350
-#: ../modules/addressbook/e-book-shell-backend.c:115
-#: ../modules/addressbook/e-book-shell-migrate.c:138
-#: ../modules/calendar/e-cal-shell-backend.c:127
-#: ../modules/calendar/e-cal-shell-migrate.c:151
-#: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:112
-#: ../modules/calendar/e-task-shell-migrate.c:121
-#: ../plugins/email-custom-header/email-custom-header.c:320
+#: ../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
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-memo-shell-backend.c:122
+#: ../modules/calendar/e-memo-shell-migrate.c:120
+#: ../modules/calendar/e-task-shell-backend.c:122
+#: ../modules/calendar/e-task-shell-migrate.c:132
 msgid "Personal"
 msgstr "వ�యక�తిగత"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:796
+#: ../addressbook/gui/widgets/eab-contact-display.c:986
+msgid "List Members"
+msgstr "సభ�య�ల జాబితా"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1004
 msgid "Job Title"
 msgstr "కార�య శీర�షిక"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:833
+#: ../addressbook/gui/widgets/eab-contact-display.c:1041
 msgid "Home page"
 msgstr "నివాసప�ట"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:842
+#: ../addressbook/gui/widgets/eab-contact-display.c:1050
 msgid "Blog"
 msgstr "బ�లాగ�"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1011
-#: ../widgets/misc/e-web-view.c:848
+#: ../addressbook/gui/widgets/eab-contact-display.c:1248
+#: ../widgets/misc/e-web-view.c:980
 #, c-format
 msgid "Click to mail %s"
 msgstr "%s క� మెయిల� చేయ�టక� నొక�క�మ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../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 ""
-"మేమ� ఈ చిర�నామా ప�స�తకాన�ని తెర�వలేమ�. దీనర�దం దానిని ఆఫ�‌లైన� లో ఉంపయోగించ�టక� ఉంచలేద� లేదా ఆఫ�‌లైన� లో "
-"ఉపయోగించ�టక� ఇంకా దిగ�మతికాలేద�. దాని సారమ�లన� నకల�తీయ�టక� దయచేసి చిర�నామా ప�స�తకాన�ని ఒకసారి ఆన�‌లైన� "
+"మేమ� ఈ చిర�నామా ప�స�తకాన�ని తెర�వలేమ�. దీనర�దం దానిని ఆఫ�‌లైన� లో "
+"ఉంపయోగించ�టక� ఉంచలేద� లేదా ఆఫ�‌లైన� లో "
+"ఉపయోగించ�టక� ఇంకా దిగ�మతికాలేద�. దాని సారమ�లన� నకల�తీయ�టక� దయచేసి చిర�నామా "
+"ప�స�తకాన�ని ఒకసారి ఆన�‌లైన� "
 "రీతిలో తెర�వ�మ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:81
+#: ../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 ""
-"ఈ చిర�నామాప�స�తకాన�ని తెర�వలేమ�.  దయచేసి పాత� %s ఉందేమో మరియ� మీక� వాడ�కొన�టక� అన�మతి ఉందేమో "
+"ఈ చిర�నామాప�స�తకాన�ని తెర�వలేమ�.  దయచేసి పాత� %s ఉందేమో మరియ� మీక� "
+"వాడ�కొన�టక� అన�మతి ఉందేమో "
 "పరిశీలించ�మ�."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:93
+#: ../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 ""
-"ఈ వర�షన� ఎవాల�యూషన� LDAP సేవిక కంపైలేషన� న� కలిగిలేద�. మీర� ఎవాల�యూషన� న� LDAP నంద� ఉపయోగించాలి "
+"ఈ వర�షన� ఎవాల�యూషన� LDAP సేవిక కంపైలేషన� న� కలిగిలేద�. మీర� ఎవాల�యూషన� న� "
+"LDAP నంద� ఉపయోగించాలి "
 "అన�క�ంటే, మీర� LDAP-చేతనపరిచిన ఎవాల�యూషన� న� సంస�థాపించాలి."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:102
+#: ../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 ""
-"మేమ� ఈ చిర�నామా ప�స�తకాన�ని తెర�వలేమ�. దీనర�ధం మీర� సరికాని URI ని ప�రవేశపెట�టి ఉండాలి, లేదా సేవిక "
+"మేమ� ఈ చిర�నామా ప�స�తకాన�ని తెర�వలేమ�. దీనర�ధం మీర� సరికాని URI ని "
+"ప�రవేశపెట�టి ఉండాలి, లేదా సేవిక "
 "అంద�బాట� లో లేకపోయిఉండాలి."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
 msgid "Detailed error message:"
 msgstr "దోషమ�యొక�క విశదీకృత సందేశమ�:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:134
+#: ../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"
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this address book."
 msgstr ""
-"ఈ క�వరీకి చాలా కార�డ�ల� జతక�దిరినవి సేవిక తిరిగిపంపించ�టక� ఆకృతీకరించి ఉండాలి\n"
-"లేదా ఎవాల�యూషన� ప�రదర�శన క� ఆకృతీకరించబడిఉండాలి. దయచేసి మీ శోధనన� ఎక�క�వ\n"
+"ఈ క�వరీకి చాలా కార�డ�ల� జతక�దిరినవి సేవిక తిరిగిపంపించ�టక� ఆకృతీకరించి "
+"ఉండాలి\n"
+"లేదా ఎవాల�యూషన� ప�రదర�శన క� ఆకృతీకరించబడిఉండాలి. దయచేసి మీ అన�వేషణన� ఎక�క�వ\n"
 "ప�రత�యేకం చేయాలి లేదా ఫలితాల పరిమితిని సంచయం సేవిక అభీష�టాలంద�\n"
 "ఈ చిర�నామాప�స�తకం కొరక� ఉచ�చమ� చేయండి."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:141
+#: ../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"
@@ -1364,215 +1392,212 @@ msgid ""
 msgstr ""
 "ఈ క�వరీ ని నిర�వర�తించ�టక� సేవిక పరిమిత సమయంన� మించిపోయింది లేదా\n"
 "ఈ చిర�నామా ప�స�తకంక� మీర� ఆకృతీకరించిన పరిమితి మించిపోయింది. దయచేసి\n"
-"మీ శోధనన� ఎక�క�వ ప�రత�యేకం చేయ�మ� లేదా ఈ చిర�నామా ప�స�తకం కొరక� సంచయం సేవిక\n"
+"మీ అన�వేషణన� ఎక�క�వ ప�రత�యేకం చేయ�మ� లేదా ఈ చిర�నామా ప�స�తకం కొరక� సంచయం "
+"సేవిక\n"
 "అభీష�టాల సమయ పరిమితిని ఉచ�చమ� చేయండి."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:149
-#, fuzzy, c-format
+#: ../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 "చిర�నామా ప�స�తకం కొరక� పూర�వరంగం ఈ ప�రశ�నన� నిర�వహించలేకపోయింది."
+msgstr "చిర�నామా ప�స�తకం కొరక� పూర�వరంగం ఈ ప�రశ�నన� నిర�వహించలేకపోయింది. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#, c-format
 msgid "The backend for this address book refused to perform this query. %s"
-msgstr "చిర�నామా ప�స�తకం కొరక� పూర�వరంగం ఈ ప�రశ�నన� నిర�వహించలేకపోయింది."
+msgstr "చిర�నామా ప�స�తకం కొరక� పూర�వరంగం ఈ ప�రశ�నన� నిర�వహించలేకపోయింది. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:159
-#, fuzzy, c-format
+#: ../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 "ఈ ప�రశ�న విజయవంతంగా పూర�తికాలేకపోయింది."
+msgstr "ఈ ప�రశ�న విజయవంతంగా పూర�తికాలేకపోయింది. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:263
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
 msgid "Select Address Book"
 msgstr "చిర�నామా ప�స�తకాన�ని ఎంచ�కొన�మ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:287
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
 msgid "list"
 msgstr "జాబితా"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:414
+#: ../addressbook/gui/widgets/eab-gui-util.c:552
 msgid "Move contact to"
 msgstr "చిర�నామాన� ఇక�కడికి జర�ప�మ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:416
+#: ../addressbook/gui/widgets/eab-gui-util.c:554
 msgid "Copy contact to"
 msgstr "చిర�నామాన� ఇక�కడికి నకల�తీయ�మ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:419
+#: ../addressbook/gui/widgets/eab-gui-util.c:557
 msgid "Move contacts to"
 msgstr "చిర�నామాలన� ఇక�కడికి జర�ప�మ�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:421
+#: ../addressbook/gui/widgets/eab-gui-util.c:559
 msgid "Copy contacts to"
 msgstr "చిర�నామాలన� ఇక�కడికి నకల� తీయ�మ�"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
 msgid "Card View"
 msgstr " పలక దర�శనం"
 
-#: ../addressbook/importers/evolution-csv-importer.c:720
-#: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:264
-#: ../calendar/importers/icalendar-importer.c:325
-#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
+#: ../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:902
+#: ../calendar/importers/icalendar-importer.c:941 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "ఎగ�మతిచేస�త�న�నది..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1008
+#: ../addressbook/importers/evolution-csv-importer.c:1072
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "అవ�ట�‌ల�క� CSV లేదా టాబ� (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1009
+#: ../addressbook/importers/evolution-csv-importer.c:1073
 msgid "Outlook CSV and Tab Importer"
 msgstr "అవ�ట�‌ల�క� CSV మరియ� టాబ� దిగ�మతికారి"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1017
+#: ../addressbook/importers/evolution-csv-importer.c:1081
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "మొజిల�లా CSV లేదా టాబ� (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1018
+#: ../addressbook/importers/evolution-csv-importer.c:1082
 msgid "Mozilla CSV and Tab Importer"
 msgstr "మొజిల�లా CSV మరియ� టాబ� దిగ�మతికారి"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1026
+#: ../addressbook/importers/evolution-csv-importer.c:1090
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "ఎవాల�యూషన� CSV లేదా టాబ� (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1027
+#: ../addressbook/importers/evolution-csv-importer.c:1091
 msgid "Evolution CSV and Tab Importer"
 msgstr "ఎవాల�యూషన� CSV మరియ� టాబ� దిగ�మతికారి"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:742
+#: ../addressbook/importers/evolution-ldif-importer.c:796
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP దత�తాంశ పరస�పరమార�పిడి రూపలావణ�యం (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:743
+#: ../addressbook/importers/evolution-ldif-importer.c:797
 msgid "Evolution LDIF importer"
 msgstr "ఎవల�యూషన� LDIF దిగ�మతిచేయ�నది"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:623
+#: ../addressbook/importers/evolution-vcard-importer.c:658
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vకార�డ�� (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:624
+#: ../addressbook/importers/evolution-vcard-importer.c:659
 msgid "Evolution vCard Importer"
 msgstr "ఎవల�యూషన� Vకార�డ�� దిగ�మతిచేయ�నది"
 
 #. 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:746
+#: ../addressbook/printing/e-contact-print.c:719
 #, c-format
 msgid "Page %d"
 msgstr "పేజీ %d"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
+#: ../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 "దస�త�రమ�న� తెరవలేమ�"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
-msgid "Couldn't get list of address books"
-msgstr "చిర�నామా ప�స�తకాల జాబితా రాలేద�"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#, c-format
+#| msgid "Couldn't get list of address books"
+msgid "Couldn't get list of address books: %s"
+msgstr "చిర�నామా ప�స�తకాల జాబితా పొందలేకపోయింది: %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
+#: ../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
+msgid "Unknown error"
+msgstr "అపరిచిత దోషం"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
-msgid "failed to open book"
-msgstr "ప�స�తకం తెర�చ�టలో విఫలం"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#, c-format
+msgid "Failed to open client '%s': %s"
+msgstr "క�లైంట� '%s'న�  లోడ�చేయలేకపోయింది: %s"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:45
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Specify the output file instead of standard output"
 msgstr "నిర�ధిష�టదిగ�బడి బద�ల� దిగ�బడి దస�త�రమ�న� పేర�కొన�మ�"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:46
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "OUTPUTFILE"
 msgstr "దిగ�బడి దస�త�రమ�"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "List local address book folders"
 msgstr "స�థానిక చిర�నామా ప�స�తక సంచయాల జాబితాపర�చ�మ�"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "Show cards as vcard or csv file"
 msgstr "కార�డ�లన� vకార�డ� లేక csvదస�త�రమ� గా చూప� "
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:68
 msgid "[vcard|csv]"
 msgstr "[vకార�డ�|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:71
 msgid "Export in asynchronous mode"
 msgstr "అకాలనియమిత విధంగా ఎగ�మతి చేయ�"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:74
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr "అకాలనియమిత విధంలో కార�డ�ల సంఖ�య, అప�రమేయ పరిమాణం 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:76
 msgid "NUMBER"
 msgstr "సంఖ�య"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:139
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
-msgstr "ఆదేశవాక�య క�రమాన�గత సంకేతాల దోషం, దయచేసి వాడకాన�ని చూడటానికి --సహాయ ఇచ�చాపూర�వకాన�ని వాడండి"
+msgstr ""
+"ఆదేశవాక�య క�రమాన�గత సంకేతాల దోషం, దయచేసి వాడకాన�ని చూడటానికి --సహాయ "
+"ఇచ�చాపూర�వకాన�ని వాడండి"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:153
 msgid "Only support csv or vcard format."
 msgstr "కేవలం csv లేక vకార�డ� రూపలావణ�యాన�ని సహకారించ�న�."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:162
 msgid "In async mode, output must be file."
 msgstr "అకాలనియమిత విధం లో, దిగ�బడి చేసేది దస�త�రమై ఉండాలి."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:170
 msgid "In normal mode, there is no need for the size option."
 msgstr "సాధారణ సంవిధానంలో, పరిమాణ ఇచ�చాపూర�వకాల ఆవశ�యం లేద�"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:201
 msgid "Unhandled error"
 msgstr "సంభాలించని దోషం"
 
-#: ../addressbook/util/addressbook.c:103
-msgid "Accessing LDAP Server anonymously"
-msgstr "LDAP సేవికన� అనామకంగా సాంగత�యం చేస�త�న�నది"
-
-#: ../addressbook/util/addressbook.c:215
-#: ../plugins/groupwise-features/camel-gw-listener.c:526
-msgid "Failed to authenticate.\n"
-msgstr "ప�రమాణీకరించడంలో విఫలం.\n"
-
-#: ../addressbook/util/addressbook.c:222
-#: ../plugins/groupwise-features/camel-gw-listener.c:506
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "%s (వినియోగదారి %s) కొరక� సంకేతపదాన�ని ప�రవేశపెట�టండి"
-
-#: ../addressbook/util/addressbook.c:230
-#: ../calendar/common/authentication.c:55
-#: ../plugins/caldav/caldav-browse-server.c:813
-#: ../plugins/google-account-setup/google-source.c:438
-#: ../plugins/publish-calendar/publish-calendar.c:328
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "రహస�య పదమ�న� ప�రవేశపెట�టండి"
-
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar from the side bar in the Calendar view."
 msgstr ""
-"'{0}' చద�వ�ట-మాత�రమే క�యాలెండర� మరియ� సవరించలేమ�. ప�రక�కపట�టీలోని క�యాలెండర� దర�శనంన�ండి వేరొక "
+"'{0}' చద�వ�ట-మాత�రమే క�యాలెండర� మరియ� సవరించలేమ�. ప�రక�కపట�టీలోని క�యాలెండర� "
+"దర�శనంన�ండి వేరొక "
 "క�యాలెండర�‌న� యెంచ�కోండి."
 
 #. For Translators: {0} is the name of the calendar source
@@ -1581,25 +1606,25 @@ msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
 msgstr ""
-"'{0}' చద�వ�ట-మాత�రమే క�యాలెండర� మరియ� సవరించలేమ�. అపాయింట�‌మెంట�స��‌న� ఆమోదించే వేరొక క�యాలెండర�‌న� "
+"'{0}' చద�వ�ట-మాత�రమే క�యాలెండర� మరియ� సవరించలేమ�. అపాయింట�‌మెంట�స��‌న� "
+"ఆమోదించే వేరొక క�యాలెండర�‌న� "
 "యెంచ�కొన�మ�."
 
 #: ../calendar/calendar.error.xml.h:5
-#, fuzzy
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
 msgstr ""
-"మీ నియామకంఅర�జీ నంద� అర�దవంతమైన సంక�షిప�తాన�ని జతచేసి నట�లైతే అది మీ అర�జీని స�వీకరించ� వారికి మీ నియామకం "
+"మీ నియామకంఅర�జీ నంద� అర�దవంతమైన సంక�షిప�తాన�ని జతచేసి నట�లైతే అది మీ నియామకం "
 "ఎంద�కొరకో ఒక అభిప�రాయాన�ని ఇస�త�ంది."
 
 #: ../calendar/calendar.error.xml.h:6
-#, fuzzy
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
 msgstr ""
-"మీ కర�తవ�యంక� అర�ధవంతమైన సంక�షిప�తాన�ని జతపరిచినట�లైతే అది మీ స�వీకరణదార�లక� మీ కర�తవ�యం గ�రించి ఒక "
+"మీ కర�తవ�యంక� అర�ధవంతమైన సంక�షిప�తాన�ని జతపరిచినట�లైతే అది మీ కర�తవ�యం "
+"గ�రించి ఒక "
 "అభిప�రాయం ఇస�త�ంది."
 
 #: ../calendar/calendar.error.xml.h:7
@@ -1647,7 +1672,6 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "మీర� నియామకం శీర�షిక '{0}' న� తొలగించ�దామని అన�క�ంట�న�నారా?"
 
 #: ../calendar/calendar.error.xml.h:17
-#, fuzzy
 msgid "Are you sure you want to delete the meeting titled '{0}'?"
 msgstr "మీర� నియామకం శీర�షిక '{0}' న� తొలగించ�దామని అన�క�ంట�న�నారా?"
 
@@ -1690,18 +1714,16 @@ msgid "Are you sure you want to delete this task?"
 msgstr "మీర� నిజంగా ఈ కర�తవ�యాన�ని రద�ద� చేయాలన�క�ంట�న�నారా?"
 
 #: ../calendar/calendar.error.xml.h:26
-#, fuzzy
 msgid "Are you sure you want to save the appointment without a summary?"
-msgstr "మీర� ఖచ�చితంగా సంక�షిప�తం లేక�ండా నియామకాన�ని పంపాలని అన�క�ంట�న�నారా?"
+msgstr "మీర� ఖచ�చితంగా సంక�షిప�తం లేక�ండా నియామకాన�ని దాయాలని అన�క�ంట�న�నారా?"
 
 #: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "మీర� ఖచ�చితంగా మెమోన� సంక�షిప�తం లేక�ండా దాయాలన�క�ంట�న�నారా?"
 
 #: ../calendar/calendar.error.xml.h:28
-#, fuzzy
 msgid "Are you sure you want to save the task without a summary?"
-msgstr "మీర� నిజంగా ఈ కర�తవ�యాన�ని సంక�షిప�తమ� లేక�ండా పంపించాలన�క�ంట�న�నారా?"
+msgstr "మీర� నిజంగా ఈ కర�తవ�యాన�ని సంక�షిప�తమ� లేక�ండా దాయాలన�క�ంట�న�నారా?"
 
 #: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
@@ -1743,12 +1765,16 @@ msgstr "సరికూరà±�పరి లోడà±�కాలేకపోయిà°
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
-msgstr "ఈమెయిల� ఆహ�వానమ�ల� పల�గోనేవారందరికి పంప�మ� మరియ� వాటిని ఆమోదించ�టక� వారిని ఆమోదింప�మ�."
+msgstr ""
+"ఈమెయిల� ఆహ�వానమ�ల� పల�గోనేవారందరికి పంప�మ� మరియ� వాటిని ఆమోదించ�టక� వారిని "
+"ఆమోదింప�మ�."
 
 #: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
-msgstr "పాల�గొన�నవారందరికి ఈ మెయిల� ద�వారా ఆహ�వానాల� పంపబడతాయి మరియ� వార�  స�పందించ�టక�  అన�మతి ఉంది."
+msgstr ""
+"పాల�గొన�నవారందరికి ఈ మెయిల� ద�వారా ఆహ�వానాల� పంపబడతాయి మరియ� వార�  "
+"స�పందించ�టక�  అన�మతి ఉంది."
 
 #: ../calendar/calendar.error.xml.h:41
 msgid "Error loading calendar"
@@ -1762,216 +1788,244 @@ msgstr "మెమో జాబితాన� నింప�టలో దోష
 msgid "Error loading task list"
 msgstr "కర�తవ�య జాబితాన� నింప�టలో దోషం"
 
-#: ../calendar/calendar.error.xml.h:44
+#. 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
+#| msgid "Error on '{0}'"
+msgid "Error on {0}: {1}"
+msgstr "{0} పై దోషం: {1}"
+
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
-msgstr "మీర� రద�ద� నోటీస� న� పంపకపోతే, మీతో పాల�గొన� మిగతావారికి సమావేశం రద�దయిన సంగతి తెలియద�."
+msgstr ""
+"మీర� రద�ద� నోటీస� న� పంపకపోతే, మీతో పాల�గొన� మిగతావారికి సమావేశం రద�దయిన "
+"సంగతి తెలియద�."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
-msgstr "మీర� రద�ద� నోటీస� పంపకపోతే, పాల�గోంట�న�న మిగతావారికి మెమో రద�దయిన సంగతి తెలియకపోవచ�చ�."
+msgstr ""
+"మీర� రద�ద� నోటీస� పంపకపోతే, పాల�గోంట�న�న మిగతావారికి మెమో రద�దయిన సంగతి "
+"తెలియకపోవచ�చ�."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
-msgstr "మీర� రద�ద� నోటీస� పంపకపోతే, పాల�గొంట�న�న మిగతా వారికి కర�తవ�యం రద�దైన సంగతి తెలియద�."
+msgstr ""
+"మీర� రద�ద� నోటీస� పంపకపోతే, పాల�గొంట�న�న మిగతా వారికి కర�తవ�యం రద�దైన సంగతి "
+"తెలియద�."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr ""
-"తాజా సమాచారాన�ని పంప�ట ద�వారా పాల�దొంట�న�న మిగతా వార� వారి క�యాలెండర�లన� ఎప�పటికప�ప�డ� నవీకరించ�తార�."
+"తాజా సమాచారాన�ని పంప�ట ద�వారా పాల�దొంట�న�న మిగతా వార� వారి క�యాలెండర�లన� "
+"ఎప�పటికప�ప�డ� నవీకరించ�తార�."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr ""
-"తాజా సమాచారాన�ని పంప�ట ద�వారా పాల�దొంట�న�న మిగతా వార� వారి కర�తవ�య జాబితాలన� ఎప�పటికప�ప�డ� నవీకరించ�తార�."
+"తాజా సమాచారాన�ని పంప�ట ద�వారా పాల�దొంట�న�న మిగతా వార� వారి కర�తవ�య జాబితాలన� "
+"ఎప�పటికప�ప�డ� నవీకరించ�తార�."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
-msgstr "కొన�ని అన�భందాల� దిగ�మతైనవి. నియామకాల న� దాచ�ట ఈ అన�భందాల నష�టంలో ప�రతిఫలిస�త�ంది."
+msgstr ""
+"కొన�ని అన�భందాల� దిగ�మతైనవి. నియామకాల న� దాచ�ట ఈ అన�భందాల నష�టంలో "
+"ప�రతిఫలిస�త�ంది."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
-msgstr "కొన�ని అన�భందాల� దిగ�మతైనవి. కర�తవ�యాన�ని దాచ�ట ఈ అన�భందాల నష�టంలో ప�రతిఫలిస�త�ంది."
+msgstr ""
+"కొన�ని అన�భందాల� దిగ�మతైనవి. కర�తవ�యాన�ని దాచ�ట ఈ అన�భందాల నష�టంలో "
+"ప�రతిఫలిస�త�ంది."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:54
 msgid "Some features may not work properly with your current server."
 msgstr "మీ ప�రస�త�త సేవికతో కొన�ని లక�షణాల� సరిగ�గా పనిచేయవ�"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "ఎవల�యూషన� క�యాలండర� ఊహించని విధంగా త�యజించబడినది."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "ఎవల�యూషన� క�యాలండర� ఊహించని విధంగా నిష�క�రమించెన�."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "ఎవాల�యూషన� మెమో ఊహించని విధంగా త�యజించబడింది."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "ఎవల�యూషన� కర�తవ�యాల� ఊహించని విధంగా త�యజించబడ�డాయి."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "The calendar is not marked for offline usage."
 msgstr "లైన� వెల�పలి ఉపయోగానికి క�యాలెండర� గ�ర�తించబడలేద�"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "The memo list is not marked for offline usage."
 msgstr "మెమో జాబితా ఆఫ�‌లైన� వ�పయోగానికి గ�ర�త�ంచబడిలేద�."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "The task list is not marked for offline usage."
 msgstr "లైన� వెల�పలి ఉపయోగానికి కర�తవ�యాల జాబితా గ�ర�తించబడలేద�"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "This calendar will be removed permanently."
 msgstr "ఈ క�యాలెండర� శాశ�వతంగా తొలగించబడ�త�ంది."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "This memo list will be removed permanently."
 msgstr "మెమో జాబితా శాశ�వతంగా తొలగించబడ�తోంది."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "This task list will be removed permanently."
 msgstr "ఈ కర�తవ�య జాబితా శాశ�వతంగా తొలగించబడ�త�ంది."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this appointment?"
 msgstr "ఈ నియామకానికి మీ మార�ప�లన� దాయాలన� క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:63
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to save your changes to this meeting?"
-msgstr "ఈ మెమోక� మీర� చేసిన మార�ప�లన� దాయాలన�క�ంట�న�నారా?"
+msgstr "మీర� చేసిన మార�ప�లన� యీ సమావేశంక� దాయాలన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to save your changes to this memo?"
 msgstr "ఈ మెమోక� మీర� చేసిన మార�ప�లన� దాయాలన�క�ంట�న�నారా?"
 
 #
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to save your changes to this task?"
 msgstr "మీర� ఈ కర�తవ�యానికి మార�ప�లన� దాయదల�చ�క�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "మీర� రద�ద� నోటీస�న� ఈమెమో కొరక� పంప�దామని అన�క�ంట�న�నరా?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "మీర� పాల�గొన�వారందరికి రద�ద� నోటీస�న� పంప�దామని అన�క�ంట�న�నారా?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "పాల�గొన�నవారికి సమావేశానికి ఆహ�వానాలన� పంప�తారా?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send this task to participants?"
 msgstr "పాల�గొన�నవారికి మీర� ఈ  కర�తవ�యాన�ని పంప�తారా? "
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "పాల�గొన�నవారికి తాజా సమావేశ సమాచారాన�ని పంప�తారా?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send updated task information to participants?"
 msgstr "పాల�గొన�నవారికి తాజా కర�తవ�య సమాచారాన�ని పంప�తారా?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:75
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
 "a supported version."
 msgstr ""
-"మీర� మద�దతీయని సమూహతరహా సేవికక� అన�సంధానించబడ�త�న�నార� మరియ� ఎవాల�యూషన� ఉపయోగించ�టలో సమస�యన� "
-"ఎద�ర�క�ంటార�. మంచి ఫలితాల కొరక�, సేవిక తప�పక మద�దతివ�వబడ� వర�షన� క� నవీకరించబడలి."
+"మీర� మద�దతీయని సమూహతరహా సేవికక� అన�సంధానించబడ�త�న�నార� మరియ� ఎవాల�యూషన� "
+"ఉపయోగించ�టలో సమస�యన� "
+"ఎద�ర�క�ంటార�. మంచి ఫలితాల కొరక�, సేవిక తప�పక మద�దతివ�వబడ� వర�షన� క� "
+"నవీకరించబడలి."
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:76
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "మీర� ఈ నియామకాన�ని మార�చినార�, కాని ఇంతవరక� దాయలేద�."
 
-#: ../calendar/calendar.error.xml.h:74
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:77
 msgid "You have changed this meeting, but not yet saved it."
-msgstr "మీర� ఈ  కర�తవ�యాన�ని మార�చార� కాని ఇంకా దాయలేద�."
+msgstr "మీర� ఈ  సమావేశాన�ని మార�చార�, కాని ఇంకా దాయలేద�."
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:78
 msgid "You have changed this task, but not yet saved it."
 msgstr "మీర� ఈ  కర�తవ�యాన�ని మార�చార� కాని ఇంకా దాయలేద�."
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "మీర� ఈ మెమోక� మార�ప�ల� చేసినార�, అయితే ఇంతవరక� దాయలేద�."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "ఎవల�యూషన� ప�న:ప�రారంభమయ�యేవరక� మీ క�యాలెండర�స� అంద�బాట�లో ఉండవ�."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:81
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "ఎవాల�యూషన� ప�నఃప�రారంభమయ�యేవరక� మీ మెమోల� అంద�బాట�లోకి రావ�."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "ఎవల�యూషన� ప�న:ప�రారంభమయ�యేవరక� మీ కర�తవ�యాల� అంద�బాట�లో ఉండవ�."
 
-#: ../calendar/calendar.error.xml.h:80
-#: ../composer/mail-composer.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "మార�ప�లన� తీసివేయ�మ�(_D)"
 
-#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:268
+#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:317
 msgid "_Save"
 msgstr "దాయ�(_S)"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:85
 msgid "_Save Changes"
 msgstr "మార�ప�లన� దాయ�మ�(_S)"
 
-#: ../calendar/calendar.error.xml.h:83
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
+#: ../calendar/calendar.error.xml.h:86
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "పంప�మ�(_S)"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Send Notice"
 msgstr "తాఖీద� ని పంప�మ� (_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:107
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "నిమిషం"
 msgstr[1] "నిమిషాల�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "à°—à°‚à°Ÿ"
 msgstr[1] "గంటల�"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
+#. 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:133
+#: ../calendar/gui/dialogs/recurrence-page.c:1190
+#| msgid "day"
+msgid "day"
+msgid_plural "days"
+msgstr[0] "రోజ�"
+msgstr[1] "రోజ�"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:313
 msgid "Start time"
 msgstr "ప�రారంభ సమయం"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "నియామకాల�"
 
@@ -1981,10 +2035,9 @@ msgstr "అన�నిటిని తృణీకరించ�మ� (_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
-#: ../calendar/gui/e-itip-control.c:1175
-#: ../plugins/itip-formatter/itip-view.c:1043
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1739
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1749
+#: ../plugins/itip-formatter/itip-view.c:1052
 msgid "Location:"
 msgstr "స�థానం:"
 
@@ -1992,32 +2045,32 @@ msgstr "స�థానం:"
 msgid "Snooze _time:"
 msgstr "వెళ�ళబ�చ�చ� సమయం(_t):"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:919
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "తృణీకరించ�మ� (_D)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1060
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1607
-#: ../widgets/menus/gal-define-views.ui.h:5
-msgid "_Edit"
-msgstr "సరిచేయ�(_E)"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "వెళ�ళబ�చ�చ�(_S)"
 
+#. Translators: This is the last part of the sentence:
+#. * "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:454
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
+#: ../plugins/google-account-setup/google-contacts-source.c:387
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+msgid "days"
+msgstr "రోజ�ల�"
+
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:24 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:453
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:335
-#, fuzzy
+#: ../plugins/google-account-setup/google-contacts-source.c:386
 msgid "hours"
-msgstr "à°—à°‚à°Ÿ"
+msgstr "గంటల�"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
@@ -2026,38 +2079,40 @@ msgstr "నియామకం యొక�క స�థానమ�"
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:25 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../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:334
+#: ../plugins/google-account-setup/google-contacts-source.c:385
 msgid "minutes"
 msgstr "నిమిషాల�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
 msgid "No summary available."
 msgstr "సంక�షిప�తమ� అంద�బాట�లో లేద�."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
 msgid "No description available."
 msgstr "వివరణ అంద�బాట�లో లేద�"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1607
 msgid "No location information available."
 msgstr "స�థానమ� యొక�క సమాచారం అంద�బాట� లో లేద�."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1519
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
 #, c-format
-msgid "You have %d alarms"
-msgstr "మీక� %d హెచ�చరికల�న�నాయి"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#| msgid "You have %d alarms"
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] "మీక� %d అలారంవ�ంది"
+msgstr[1] "మీక� %d అలారాల� వ�న�నాయి"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1853
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
 msgid "Warning"
 msgstr "హెచ�చరిక"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1857
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2069,7 +2124,7 @@ msgstr ""
 "పంప�టక� ఆకృతీకరించబడింది.  ఎవాల�యూషన� బద�ల�గా ఒక సాదారణ గర�తించ�దాని\n"
 "డైలాగ� పెట�టె న� ప�రదర�శిస�త�ంది."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1894
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2079,24 +2134,25 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"ఎవాల�యూషన� క�యాలెండర� గ�ర�తింప�కారి ట�రిగ�గర� గ�రించి. ఈ గ�ర�తింప�కారి ఈ క�రింది ప�రోగ�రామ� న� నడ�ప�టక� "
+"ఎవాల�యూషన� క�యాలెండర� గ�ర�తింప�కారి ట�రిగ�గర� గ�రించి. ఈ గ�ర�తింప�కారి ఈ "
+"క�రింది ప�రోగ�రామ� న� నడ�ప�టక� "
 "ఆకృతీకరించబడింది:\n"
 "\n"
 "        %s\n"
 "\n"
 "మీర� ఖచ�చితంగా ఈ ప�రోగ�రామ� న� నడ�పవలెనని అన�క�ంట�న�నారా?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1746
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1909
 msgid "Do not ask me about this program again."
 msgstr "ఈ కార�యక�రమం గ�రించి నన�న� మళ�ళీ అడగద�ద�"
 
-#: ../calendar/gui/alarm-notify/util.c:44
+#: ../calendar/gui/alarm-notify/util.c:45
 msgid "invalid time"
 msgstr "నిస�సార కాలం"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
-#: ../calendar/gui/misc.c:116
+#: ../calendar/gui/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/misc.c:118
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -2104,8 +2160,8 @@ msgstr[0] "%d à°—à°‚à°Ÿ"
 msgstr[1] "%d గంటల�"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
-#: ../calendar/gui/misc.c:122
+#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:411
+#: ../calendar/gui/misc.c:124
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2115,593 +2171,27 @@ msgstr[1] "%d నిమిషాల�"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
-#: ../calendar/gui/misc.c:126
+#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:417
+#: ../calendar/gui/misc.c:128
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d క�షణం"
 msgstr[1] "%d క�షణాల�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "అలారం ప�రోగ�రామ�‌ల�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:11
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "దోషంన� స�థితిపట�టీపై చూపించవలిసిన సమయం సెకన�లలో."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
-msgid "Ask for confirmation when deleting items"
-msgstr "అంశమ�లన� తొలగించ�త�న�నప�ప�డ� నిర�ధారణకొరక� అడ�గ�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "ఈ రోజ�క� మిగిలి ఉన�న బ�యాక�‌గ�రౌండ� వర�ణప� కర�తవ�యం, \"#rrggbb\" రూపంలో."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "ఇంకా సమయంఉన�న బ�యాక�‌గ�రౌండ� వర�ణప� కర�తవ�యమ�ల�, \"#rrggbb\" రూపంలో."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
-msgid "Calendars to run alarms for"
-msgstr "హెచ�చరికల� ఇచ�చ�టక� క�యాలెండర�ల�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr "సమయ పట�టీ పై మార�కస� బైన�స� వర�సన� గీయ�టక� వర�ణమ� (అప�రమేయంగా ఖాళీ)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
-msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "తేదీ దర�శని లో మార�కస� బైన�స� వర�సన� గీయ�టక� వర�ణమ�."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
-msgid "Compress weekends in month view"
-msgstr "వారాంతం లన� నెల దర�శనం లో క�చింప�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
-msgid "Confirm expunge"
-msgstr "కొట�టివేతన� నిర�ధరించ�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
-msgid "Count of default recurrence for a new event. -1 means forever."
-msgstr "కొత�త ఘటన కొరక� అప�రమేయ ప�నరావృతమ� యొక�క లెక�క. -1 అంటే ఎప�పటికీ."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
-msgid "Days on which the start and end of work hours should be indicated."
-msgstr "ప�రారంభ మరియ� మ�గింప� పని గంటలన� సూచించవలిసిన రోజ�ల�."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
-msgid "Default appointment reminder"
-msgstr "అప�రమేయ నియామకాన�ని గ�ర�తించ�నది"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
-msgid "Default recurrence count"
-msgstr "అప�రమేయ ప�నరావృత లెక�క"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
-msgid "Default reminder units"
-msgstr "అప�రమేయంగా గ�ర�త�చేయ� భాగమ�ల�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
-msgid "Default reminder value"
-msgstr "అప�రమేయంగా గ�ర�త�చేయ�దాని విల�వ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
-msgid "Directory for saving alarm audio files"
-msgstr "హెచ�చరిక శ�రవణ దస�త�రాలన� వివరంలో దాయ�మ� "
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
-msgid "Event Gradient"
-msgstr "ఘటన క�రమాన�గతమార�ప�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
-msgid "Event Transparency"
-msgstr "ఘటన పారదర�శకత"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
-msgid "Free/busy server URLs"
-msgstr "ఖాళీ/తీరికలేని సేవిక URLs"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
-msgid "Free/busy template URL"
-msgstr "ఖాళీ/తీరికలేని మాదిరి URL"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
-msgid "Gradient of the events in calendar views."
-msgstr "క�యాలెండర� దర�శనాలలో ఘటనల యొక�క క�రమాన�గతమార�ప�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
-msgid "Hide completed tasks"
-msgstr "పూర�తయిన కర�తవ�యాలన� దాయ�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
-msgid "Hide task units"
-msgstr "కర�తవ�యం యూనిట�లన� మర�గ�పర�చ�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
-msgid "Hide task value"
-msgstr "కర�తవ�య విల�వన� దాయ�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
-msgid "Horizontal pane position"
-msgstr "సమతలంగా ఉన�న పలక స�థానమ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr "పనిరోజ� పూర�తగ� గంట, ఇరవై నాల�గ� గంటల రూపంలో, 0 న�ండి 23"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
-msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr "పనిరోజ� ప�రారంభమగ� గంట, ఇరవై నాల�గ� గంటల రూపంలో, 0 న�ండి 23"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
-msgid "If \"true\", show the memo preview pane in the main window."
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
-msgid "If \"true\", show the task preview pane in the main window."
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
-msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr "రోజ� లో చూపబడ� విరామాల� మరియ� పనివారాల దర�శనంల�, నిమషాలలో."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
-msgid "Last alarm time"
-msgstr "చివరి హెచ�చరిక సమయం"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:95
-msgid "Level beyond which the message should be logged."
-msgstr "� స�థాయి కి క�రింద సందేశం లాగిన� అవ�వాలో."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
-msgid "List of recently used second time zones in a Day View."
-msgstr "రోజ� దర�శనంలో యిటీవల వ�పయోగించిన సమయక�షేత�రాల యొక�క జాబితా."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
-msgid "List of server URLs for free/busy publishing."
-msgstr "ఖాళీ/తీరికలేని పబ�లిషింగ� కొరక� సేవిక URLs యొక�క జాబితా."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
-msgid "Marcus Bains Line"
-msgstr "మార�కస� బైన�స�  వర�స"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
-msgid "Marcus Bains Line Color - Day View"
-msgstr "మార�కస� బైన�స� వర�స వర�ణమ� - రోజ� దర�శనం"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
-msgid "Marcus Bains Line Color - Time bar"
-msgstr "మార�కస� బైన�స� వర�స వర�ణం - సమయ పట�టీ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
-msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
-msgstr ""
-"'day_second_zones' జాబితానంద� గ�ర�త�ంచ�కొన�టక� యిటీవల వ�పయోగించిన సమయక�షేత�రమ�లయొక�క గరిష�ట "
-"సంఖ�య."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
-msgid "Maximum number of recently used timezones to remember."
-msgstr "గ�ర�త�ంచ�కొనవలసిన యిటీవలవ�పయోగించిన సమయక�షేత�రమ�ల గరిష�ట సంఖ�య."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
-#, fuzzy
-msgid "Memo layout style"
-msgstr "ప�రత�య�త�తరమ� శైలి(_R):"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
-msgid "Memo preview pane position (horizontal)"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
-#, fuzzy
-msgid "Memo preview pane position (vertical)"
-msgstr "నిల�వ పలక స�థానమ�లో నెల దర�శనాన�ని చూప�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
-msgid "Minute the workday ends on, 0 to 59."
-msgstr "పనిరోజ� మ�గియ� నిమషం, 0 న�ండి 59."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
-msgid "Minute the workday starts on, 0 to 59."
-msgstr "పనిరోజ� ప�రారంభం మగ� నిమ�షం, 0 న�ండి 59."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
-msgid "Month view horizontal pane position"
-msgstr "క�యాలెండర� లో నెల దర�శనాన�ని సమాతల పలక స�థానమ�లో చూప�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
-msgid "Month view vertical pane position"
-msgstr "నిల�వ పలక స�థానమ�లో నెల దర�శనాన�ని చూప�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
-msgid "Number of units for determining a default reminder."
-msgstr "అప�రమేయంగా గర�త�చేయ�దానిని నిర�దారించ�ట కొరక� యూనిట�ల సంఖ�య."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
-msgid "Number of units for determining when to hide tasks."
-msgstr "కర�తవ�యాలన� ఎప�ప�డ� మర�గ�పరచాలో గ�ర�త�చేయ�దాని కొరక� యూనిట�ల సంఖ�య."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
-msgid "Overdue tasks color"
-msgstr "అతక�రమించ� కర�తవ�యం వర�ణమ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
-msgstr ""
-"సమాంతర తలం యొక�క స�థానమ�, నెల దర�శనిలో లేనప�ప�డ� తేదీ మార�చ� క�యాలెండర� మరియ� కర�తవ�య జాబితా ల మధ�య, "
-"పిక�సెల�స� లో."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"సమాంతర తలం యొక�క స�థానమ�, నెల దర�శిని లో దర�శనం మరియ� తేదీ నేవిగేటర� క�యాలెండర� మరియ� కర�తవ�యజాబితా మధ�య, "
-"పిక�సెల�స� లో."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-msgid "Position of the memo preview pane when oriented vertically."
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-msgid "Position of the task preview pane when oriented horizontally."
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
-msgid "Position of the task preview pane when oriented vertically."
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr "నిల�వ� తలం యొక�క స�థానమ�, క�యాలెండర� జాబితా మరియ� తేదీ మార�చ� క�యాలెండర� మధ�య."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"నిల�వ� తలం యొక�క స�థానమ�, నెల దర�శనం లో దర�శనం మరియ� తేది మార�చ� క�యాలెండర� మరియ� కర�తవ�యం జాబితా ల "
-"మధ�య, పిక�సెల�స� లో."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
-msgstr ""
-"నిల�వ� తలం యొక�క స�థానమ�, నెల దర�శనం లో లేనప�ప�డ� దర�శనం మరియ� తేది మార�చ� క�యాలెండర� మరియ� "
-"కర�తవ�యం జాబితా ల మధ�య, పిక�సెల�స� లో."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-msgid "Primary calendar"
-msgstr "ప�రాధమిక క�యాలెండర�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-msgid "Primary memo list"
-msgstr "ప�రాధమిక మెమో జాబితా"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
-msgid "Primary task list"
-msgstr "ప�రాధమిక కర�తవ�య జాబితా"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
-msgid "Programs that are allowed to be run by alarms."
-msgstr "హెచ�చరికలచే నడ�చ�టక� కార�యక�రమాల� అన�మతింబడ�డాయి."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
-msgid "Recently used second time zones in a Day View"
-msgstr "రోజ� దర�శనమ�నంద� యిటీవలవ�పయోగించిన రెండవ సమయ క�షేత�రమ�ల�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
-msgstr "హెచ�చరిక శ�రవణ క� వివరమ�న� దాయ�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-msgid "Scroll Month View by a week"
-msgstr "నెల దర�శనమ�న� వారమ� ద�వారా స�క�రాల� చేయ�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "RSVP క�షేత�రమ�న� ఘటన/కర�తవ�యం/సమావేశం కూర�పరి లో చూప�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
-msgid "Show Role field in the event/task/meeting editor"
-msgstr "పాత�ర క�షేత�రమ�న� ఘటన/కర�తవ�యం/సమావేశం కూర�పరి నంద� చూప�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
-msgid "Show appointment end times in week and month views"
-msgstr "వారమ� మరియ� నెల దర�శనంలలో నియామకాల మ�గియ� సమయాన�ని చూప�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid "Show categories field in the event/meeting/task editor"
-msgstr "వర�గమ�ల క�షేత�రమ�న� ఘటన/కర�తవ�యం/సమావేశం కూర�పరి నంద� చూప�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
-msgid "Show display alarms in notification tray"
-msgstr "ప�రకటన ట�రే లో ప�రదర�శన అలారంలన� చూప�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
-msgid "Show status field in the event/task/meeting editor"
-msgstr "స�థితి క�షేత�రమ�న� ఘటన/కర�తవ�యం/సమావేశం కూర�పరిని చూప�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
-#, fuzzy
-msgid "Show the memo preview pane"
-msgstr "\"ఉపదర�శన\" పలకాన�ని చూప�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
-#, fuzzy
-msgid "Show the task preview pane"
-msgstr "\"ఉపదర�శన\" పలకాన�ని చూప�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
-msgid "Show timezone field in the event/meeting editor"
-msgstr "సమయక�షేత�ర క�షేత�రమ�న� ఘటన/సమావేశం కూర�పరి నంద� చూప�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-msgid "Show type field in the event/task/meeting editor"
-msgstr "టైప� క�షేత�రమ�న� ఘటన/కర�తవ�యం/సమావేశం కూర�పరినంద� చూప�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
-#, fuzzy
-msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
-msgstr "వారప� సంఖ�యన� తేదీ మరియ� పని వారప� దర�శనమ�లో చూప�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
-msgstr ""
-"అమర�చివ�న�నట�లైతే, రోజ�లో రెండవ సమయ క�షేత�రమ�న� చూపమ�. విల�వ 'సమయక�షేత�రమ�' కీనంద� వ�పయోగించిన "
-"దానికి సరిపోల�త�ంది."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid "Task layout style"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
-#, fuzzy
-msgid "Task preview pane position (horizontal)"
-msgstr "నిల�వ� పలక స�థానం యొక�క కర�తవ�యాల�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
-#, fuzzy
-msgid "Task preview pane position (vertical)"
-msgstr "నిల�వ� పలక స�థానం యొక�క కర�తవ�యాల�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
-msgid "Tasks due today color"
-msgstr "ఈ రోజ�తో అయిపోవ� కర�తవ�యమ�ల వర�ణమ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
-#, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"ఖాళీ/తిరకలేని డాటా ఫాల�‌బ�యాక� గా ఉపయోగించ�టక� URL మాదిరి, %s మెయిల� చిర�నామా యొక�క వినియోగదారి బాగమ� చేత "
-"ప�నఃస�థాపించబడింది మరియ� %d డెమోన� చేత ప�నఃస�థాపించబడింది."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
-msgstr ""
-"క�యాలెండర� నందలి తేదీల� మరియ� సమయాలక� ఉపయోగించ�టక� అప�రమేయ సమయక�షేత�రం, \"America/New York\" "
-"లాంటి అన�వాదించలేని ఓల�సన� సమయక�షేత�ర డాటాబేస� స�థానమ�."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"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 ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
-msgid "The second timezone for a Day View"
-msgstr "రోజ� దర�శనంక� రెండవ సమయక�షేత�రమ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
-msgstr ""
-"ఇది మూడ� విల�వ�లన� కలిగివ�ండవచ�చ�. దోషమ�ల కొరక� 0. హెచ�చరికల కొరక� 1. డీబగ� సందేశాల కొరక� 2."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
-msgid "Time divisions"
-msgstr "సమయ విభాగమ�ల�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
-msgid "Time the last alarm ran, in time_t."
-msgstr "చివరి అలారం నడ�వవలిసిన సమయం, time_t లో."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
-msgid "Timezone"
-msgstr "సమయక�షేత�రం"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
-msgid ""
-"Transparency of the events in calendar views, a value between 0 "
-"(transparent) and 1 (opaque)."
-msgstr "క�యాలెండర� దర�శనంలలో ఘటనల యొక�క పారదర�శకత, 0(పారదర�శకం) మరియ� 1 (ఒపాక�యూ) ఒక విల�వ."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
-msgid "Twenty four hour time format"
-msgstr "ఇరవైనాల�గ� గంటల సమయ రూపలావణ�యమ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
-msgid "URI of the highlighted (\"primary\") calendar"
-msgstr "ఉద�దీపనం చేసిన (\"ప�రాధమిక\") క�యాలెండర� యొక�క URI"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
-msgid "URI of the highlighted (\"primary\") memo list"
-msgstr "ఉద�దీపనంచేసిన (\"ప�రాధమిక\") మెమో జాబితా యొక�క URI"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
-msgid "URI of the highlighted (\"primary\") task list"
-msgstr "ఉద�దీపనంచేసిన (\"ప�రాధమిక\") కర�తవ�య జాబితా యొక�క URI"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "అప�రమేయంగా గ�ర�తించ�దాని యొక�క ప�రమాణంల�, \"నిమ�షాల�\", \"గంటల�\" లేదా \"రోజ�ల�\"."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"కర�తవ�యాలన� ఎప�ప�డ� మర�గ�పరచాలో నిర�ధారించ�టక� ప�రమాణమ�ల�, \"నిమ�షాల�\", \"గంటల�\" లేదా "
-"\"రోజ�ల�\"."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
-msgid "Use system timezone"
-msgstr "సిస�టమ� సమయక�షేత�రమ�న� వ�పయోగించ�మ�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr "ఎవాల�యూషన� నంద� యెంపికచేసిన సమయక�షేత�రమ�నక� బద�ల�గా సిస�టమ� సమయక�షేత�రమ�న� వ�పయోగించ�మ�."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
-msgid "Vertical pane position"
-msgstr "నిల�వ�గావ�న�న పలక స�థానం"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
-msgid "Week start"
-msgstr "ప�రారంభ వారం"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "వారమ� ప�రారంభంలో వారమ�రోజ�, ఆదివారం (0) న�ండి శనివారం (6) వరక�."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
-msgid "Whether or not to use the notification tray for display alarms."
-msgstr "ప�రదర�శన అలారమ�లక� ప�రకటన ట�రే న� ఉపయోగించాలా వద�దా."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "ఒక నియామకాన�ని లేదా కర�తవ�యాన�ని తొలగిస�త�న�నప�పడ� నిర�దారణ కొరక� అడగవలెనా."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
-msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "కర�తవ�యాలన� మరియ� నియామకాలన� కొట�టివేయ�చ�న�నప�పడ� నిర�దారణ కొరక� అడగవలెనా."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
-msgstr ""
-"నెల దర�శని లో వారాంతమ�లన� క�చించ వలెనా, �దైతే శనివారమ� మరియ� ఆదివారమ�లన� ఒక వారమ�రోజ� స�థలమ�లో "
-"ఉంచ�త�ందో."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
-msgid "Whether to display the end time of events in the week and month views."
-msgstr "వారమ� మరియ� నెల దర�శనమ�లలో ఘటనల యొక�క మ�గియ�కాలాన�ని ప�రదర�శించవలెనా."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr "క�యాలండర� నంద� మార�కస� బైన�స� వర�సన (ప�రస�త�త సమయం వద�ద వర�స) న� గీయవలెనా."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
-msgid "Whether to hide completed tasks in the tasks view."
-msgstr "పూర�తైన కర�తవ�యమ�లన� కర�తవ�య దర�శని లో మర�గ�పరచాలా."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
-msgid "Whether to scroll a Month View by a week, not by a month."
-msgstr "నెల దర�శనమ�న� నెలన� అన�సరించి కాక, వారమ� ద�వారా స�క�రాల� చేయాలా."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
-msgid "Whether to set a default reminder for appointments."
-msgstr "నియామకాలక� అప�రమేయంగా గ�ర�తించ�దానిని అమర�చాలా."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
-msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "RSVP క�షేత�రాన�ని ఘటన/కర�తవ�యం/సమావేశం కూర�పరి నంద� చూపాలా"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr "వర�గమ�ల క�షేత�రాన�ని ఘటన/సమావేశం కూర�పరి నంద� చూపాలా"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
-msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "పాత�ర క�షేత�రాన�ని ఘటన/కర�తవ�యం/సమావేశం కూర�పరి నంద� చూపాలా"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "స�థితి క�షేత�రాన�ని ఘటన/కర�తవ�యం/సమావేశం కూర�పరి నంద� చూపాలా"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
-msgstr "సమయాన�ని am/pm విధానం బద�ల�గా ఇరవై నాల�గ� గంటల రూపంలో చూపించాలా."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "సమయక�షేత�ర క�షేత�రమ�న� ఘటన/సమావేశం కూర�పరి నంద� చూపాలా"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
-msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "టైప� క�షేత�రాన�ని ఘటన/కర�తవ�యం/సమావేశం కూర�పరి నంద� చూపాలా"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
-#, fuzzy
-msgid "Whether to show week numbers in various places in the Calendar."
-msgstr "వారప� సంఖ�యలన� తేదీ మార�చ�దానిలో చూపాలా."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
-msgid "Work days"
-msgstr "పనిరోజ�ల�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Workday end hour"
-msgstr "పనిరోజ�లో చివరి గంట"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
-msgid "Workday end minute"
-msgstr "పనిరోజ� చివరి నిమిషం"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
-msgid "Workday start hour"
-msgstr "పనిరోజ� ప�రారంభ గంట"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
-msgid "Workday start minute"
-msgstr "పనిరోజ� ప�రారంభ నిమిషం"
-
-#: ../calendar/gui/cal-editor-utils.c:105
-msgid "Invalid object"
-msgstr "చెల�లని ఆబ�జక�ట�"
-
-#: ../calendar/gui/calendar-view-factory.c:117
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Day View"
 msgstr "రోజ� దర�శనం"
 
-#: ../calendar/gui/calendar-view-factory.c:120
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Work Week View"
 msgstr "పని వారం దర�శనం"
 
-#: ../calendar/gui/calendar-view-factory.c:123
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Week View"
 msgstr "వారం దర�శనం"
 
-#: ../calendar/gui/calendar-view-factory.c:126
+#: ../calendar/gui/calendar-view-factory.c:125
 msgid "Month View"
 msgstr "నెల దర�శనం"
 
@@ -2730,18 +2220,16 @@ msgstr "వర�గమ�"
 msgid "Classification"
 msgstr "వర�గీకరణ"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
-#: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:323
-#: ../widgets/misc/e-send-options.ui.h:2
+#: ../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/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "గోప�యమైన"
 
 #: ../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
-#: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:514
+#: ../modules/plugin-manager/evolution-plugin-manager.c:71
+#: ../widgets/misc/e-attachment-tree-view.c:526
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "విశదీకరణ"
@@ -2763,9 +2251,9 @@ msgstr "ఉంది"
 
 #: ../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:831
+#: ../plugins/publish-calendar/publish-calendar.c:863
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:397
 msgid "Location"
 msgstr "స�థానమ�"
 
@@ -2774,21 +2262,21 @@ msgstr "స�థానమ�"
 msgid "Organizer"
 msgstr "నిర�వాహక�డ�"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
+#: ../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/memotypes.xml.h:12
 msgid "Private"
 msgstr "స�వంత"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
-#: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
+#: ../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/e-task-table.c:502 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "ప�రజా"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:322
-#: ../calendar/gui/dialogs/event-editor.c:343
+#: ../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 "ప�నరావృతి"
@@ -2798,7 +2286,7 @@ msgstr "ప�నరావృతి"
 #: ../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:363
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Summary"
 msgstr "తాత�పర�యం"
 
@@ -2827,65 +2315,66 @@ msgstr "ఇక"
 msgid "is not"
 msgstr "ఇది కాద�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:626
-msgid "Edit Alarm"
-msgstr "అలారమ�న� సరిచేయ�మ�"
+#: ../calendar/gui/dialogs/alarm-dialog.c:636
+#| msgid "Reminder!"
+msgid "Edit Reminder"
+msgstr "గ�ర�త�చేయ�దాన�ని సరికూర�చ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:817
-#: ../calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/dialogs/alarm-dialog.c:827
+#: ../calendar/gui/e-alarm-list.c:447
 msgid "Pop up an alert"
 msgstr "అప�రమత�తాన�ని ప�రత�యక�షపర�చ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:818
-#: ../calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/dialogs/alarm-dialog.c:828
+#: ../calendar/gui/e-alarm-list.c:443
 msgid "Play a sound"
 msgstr "ధ�వనిని ఆడించ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:819
-#: ../calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/dialogs/alarm-dialog.c:829
+#: ../calendar/gui/e-alarm-list.c:455
 msgid "Run a program"
 msgstr "కార�యక�రమాన�ని నడిపించ�"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:820
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/dialogs/alarm-dialog.c:830
+#: ../calendar/gui/e-alarm-list.c:451
 msgid "Send an email"
 msgstr "ఒక ఈతపాలా పంప�"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Alarm"
-msgstr "హెచ�చరిక న� జతపర�చ�"
+#| msgid "Reminder!"
+msgid "Add Reminder"
+msgstr "గ�ర�త�చేయ�నది జతచేయి"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
-#, fuzzy
-msgid "Alarm"
-msgstr "హెచ�చరికల�"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "మలచిన సందేశం(_m)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Custom alarm sound"
-msgstr "మలచిన హెచ�చరిక ధ�వని"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+#| msgid "Custom alarm sound"
+msgid "Custom reminder sound"
+msgstr "మలచిన అలారం ధ�వని"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Mes_sage:"
 msgstr "సందేశం(_s):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
-#, fuzzy
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
 msgid "Options"
-msgstr "ఇచ�ఛాపూర�వకాల�(_O)"
+msgstr "�చ�చికాల�"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+#| msgid "Reminder!"
+msgid "Reminder"
+msgstr "గ�ర�త�చేయ�నది"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-#, fuzzy
 msgid "Repeat"
-msgstr "<b>మళ�ళీచేయ�</b>"
+msgstr "తిరిగిచేయి"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 msgid "Select A File"
-msgstr "దస�త�రం న� ఎంచ�కొన�మ�"
+msgstr "ఫైల� న� ఎంచ�కొన�మ�"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Send To:"
@@ -2900,67 +2389,48 @@ msgid "_Program:"
 msgstr "కార�యక�రంమం(_P):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the alarm"
-msgstr "హెచ�చరిక మళ�ళీ చేయ�(_R)"
+#| msgid "_Repeat the alarm"
+msgid "_Repeat the reminder"
+msgstr "అలారం తిరిగిచేయ�(_R)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
 msgstr "ధ�వని(_S):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
-#, fuzzy
 msgid "after"
 msgstr "తర�వాత"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
-#, fuzzy
 msgid "before"
 msgstr "ఇంతక�మ�ంద�"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
-#, fuzzy
 msgid "day(s)"
-msgstr "రోజ�ల�"
-
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:336
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:43
-msgid "days"
-msgstr "రోజ�ల�"
+msgstr "రోజ�(ల�)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
-#, fuzzy
 msgid "end of appointment"
-msgstr "కొత�త నియామకం"
+msgstr "నియామకం మ�గింప�"
 
-#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "అధిక సమయాల� ప�రతి"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#, fuzzy
 msgid "hour(s)"
-msgstr "à°—à°‚à°Ÿ"
+msgstr "గంట(ల�)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#, fuzzy
 msgid "minute(s)"
-msgstr "నిమిషాల�"
+msgstr "నిమిషా(ల�)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
-#, fuzzy
 msgid "start of appointment"
-msgstr "నియామకం యొక�క స�థానమ�"
+msgstr "నియామకం యొక�క ప�రారంభం"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:245
 msgid "Action/Trigger"
 msgstr "క�రియ/క�రియారంభంచేయ�"
 
@@ -2969,760 +2439,472 @@ msgid "A_dd"
 msgstr "జతపర�చ�(_d)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:7
-msgid "Alarms"
-msgstr "హెచ�చరికల�"
-
-#. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
-#: ../calendar/gui/e-day-view-time-item.c:797
-#, fuzzy
-msgctxt "cal-second-zone"
-msgid "None"
-msgstr "�దికాద�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
-#: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:319
-msgid "Select..."
-msgstr "ఎంపికచేయ�..."
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
-msgid "Selected Calendars for Alarms"
-msgstr "హెచ�చరికలక� ఎంచ�క�న�న క�యాలెండర�ల�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
-#, fuzzy
-msgid "Ti_me and date:"
-msgstr "సమయం మరియ� తేది:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
-#, fuzzy
-msgid "_Date only:"
-msgstr "తేది మాత�రమే:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
-#, fuzzy, no-c-format
-msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr ""
-"<i>%u మరియ� %d ఈ మెయిల� చిర�నామా న�ండి వినియోగదార�డ� మరియ� అధికారక�షేత�రమ� చేత ప�నఃస�థాపించబడతాయి.</"
-"i>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
-msgid "(Shown in a Day View)"
-msgstr "(రోజ� దర�శనంలో చూప�మ�)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
-#, fuzzy
-msgid "05 minutes"
-msgstr "నిమిషాల�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
-#, fuzzy
-msgid "10 minutes"
-msgstr "నిమిషాల�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
-#, fuzzy
-msgid "15 minutes"
-msgstr "నిమిషాల�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
-#, fuzzy
-msgid "30 minutes"
-msgstr "నిమిషాల�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
-#, fuzzy
-msgid "60 minutes"
-msgstr "నిమిషాల�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
-#, fuzzy
-msgid "Alerts"
-msgstr "హెచ�చరికల�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:30
-#: ../modules/addressbook/autocompletion-config.c:153
-msgid "Date/Time Format"
-msgstr "తారీఖ�/సమయం ఫార�మాట�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
-msgid "Day _ends:"
-msgstr "రోజ� పూర�తయినది(_e):"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
-#, fuzzy
-msgid "Days"
-msgstr "రోజ�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
-#, fuzzy
-msgid "Default Free/Busy Server"
-msgstr "<span weight=\"bold\">అప�రమేయ ఖాళి/తీరకలేని సేవిక</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
-msgid "Display"
-msgstr "ప�రదర�శించ�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
-msgid "Display alarms in _notification area only"
-msgstr "ప�రకటన ప�రాంతమ�లో మాత�రమే ఆలారమ�లన� ప�రదర�శించ�మ� (_n)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:738
-msgid "Friday"
-msgstr "శ�క�రవారం"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
-#: ../modules/addressbook/addressbook-config.c:1005
-#: ../plugins/itip-formatter/itip-formatter.c:2676
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:21
-msgid "General"
-msgstr "సాధారణ"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
-#, fuzzy
-msgid "Hours"
-msgstr "à°—à°‚à°Ÿ"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
-#, fuzzy
-msgid "Minutes"
-msgstr "నిమిషాల�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:734
-msgid "Monday"
-msgstr "సోమవారం"
-
-#. Translators: "None" for not including threads;
-#. * part of "Include threads: None"
-#. Translators: Used in send options dialog
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
-msgid "None"
-msgstr "�దికాద�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:85
-msgid "Pick a color"
-msgstr "వర�ణన� న� తీస�కొన�మ�"
-
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-msgid "S_un"
-msgstr "ఆది(_u)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:739
-msgid "Saturday"
-msgstr "శనివారం"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
-msgid "Sc_roll Month View by a week"
-msgstr "నెల దర�శనమ�న� వారమ� ద�వారా స�క�రాల� చేయ�మ� (_r)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
-msgid "Se_cond zone:"
-msgstr "రెండవ క�షేత�రమ� (_c):"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
-msgid "Select the calendars for alarm notification"
-msgstr "హెచ�చరిక తాఖీద� ఇచ�చ�టక� క�యాలెండర�లన� ఎంచ�కొన�మ�"
-
-#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
-msgid "Sh_ow a reminder"
-msgstr "గ�ర�తిచ�దానిని చూప�మ�(_o)"
-
-#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-msgid "Show a _reminder"
-msgstr "గ�ర�త�చేయ�దానిని చూపమ� (_r)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
-#, fuzzy
-msgid "Show week _numbers"
-msgstr "వారమ� సంఖ�యలన� తేది మార�చ�దానిలో చూప�మ�(_n)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:733
-msgid "Sunday"
-msgstr "ఆదివారం"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-msgid "T_asks due today:"
-msgstr "ఈ రోజ�క� మిగిలిన కర�తవ�యాల�(_a):"
-
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-msgid "T_hu"
-msgstr "గ�ర�(_h)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:381
-msgid "Task List"
-msgstr "కర�తవ�యం జాబితా"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-msgid "Template:"
-msgstr "మాదిది:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:737
-msgid "Thursday"
-msgstr "గ�ర�వారం"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:592
-msgid "Time"
-msgstr "సమయం"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-msgid "Time _zone:"
-msgstr "కాల క�షేత�రం(_z):"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-msgid "Time format:"
-msgstr "కాల రూపకం:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:735
-msgid "Tuesday"
-msgstr "మంగళవారం"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-msgid "Use s_ystem time zone"
-msgstr "సిస�టమ� సమయ క�షేత�రమ�న� వ�పయోగించ�మ�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:736
-msgid "Wednesday"
-msgstr "బ�ధవారం"
-
-#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
-msgid "Wee_k starts on:"
-msgstr "వారమ� ప�రారంభించబడ�త�ంది(_k):"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1639
-msgid "Work Week"
-msgstr "పని వారం"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
-msgid "Work days:"
-msgstr "పని రోజ�ల�:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
-msgid "_12 hour (AM/PM)"
-msgstr "_12 గంటల�(AM/PM)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
-msgid "_24 hour"
-msgstr "_24గంటల�"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
-msgid "_Ask for confirmation when deleting items"
-msgstr "అంశాలన� తొలగించేమ�ంద� దృవీకరించ�కొన�మ�(_A)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
-msgid "_Compress weekends in month view"
-msgstr "నెల దర�శనం లో వారాంతమ�లన� క�చింపచేయ�మ�(_C)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
-msgid "_Day begins:"
-msgstr "రోజ� ప�రారంభమయింది(_D):"
-
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
-msgid "_Fri"
-msgstr "శ�క�ర(_F)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
-msgid "_Hide completed tasks after"
-msgstr "పూర�తయిన కర�తవ�యాలన� తర�వాత అదృశ�యపర�చ�మ�(_H)"
-
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
-msgid "_Mon"
-msgstr "సోమ(_M)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
-msgid "_Overdue tasks:"
-msgstr "సమయంమించిన కర�తవ�యమ�ల�(_O):"
-
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
-msgid "_Sat"
-msgstr "శని(_S)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
-msgid "_Show appointment end times in week and month view"
-msgstr "వారమ� మరియ� నెల దర�శనమ�లో నియామకం మ�గియ� సమయాన�ని చూప�మ�(_S)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
-msgid "_Time divisions:"
-msgstr "సమయ భాగమ�ల�(_T):"
-
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:69
-msgid "_Tue"
-msgstr "మంగళ(_T)"
-
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:71
-msgid "_Wed"
-msgstr "బ�ధ(_W)"
-
-#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:73
-msgid "before every anniversary/birthday"
-msgstr "ప�రతి వార�షికమ�/ప�ట�టినరోజ�క� మ�ంద�"
-
-#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
-msgid "before every appointment"
-msgstr "ప�రతి నియామకం మ�ంద�"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#| msgid "Reminder!"
+msgid "Reminders"
+msgstr "గ�ర�త�చేయ�నవి"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:153
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "Type:"
 msgstr "రకమ�:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:510
+#: ../calendar/gui/dialogs/calendar-setup.c:185
+#: ../modules/addressbook/addressbook-config.c:530
 msgid "_Type:"
 msgstr "à°°à°•à°‚(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
+#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:155
 #: ../modules/addressbook/ldap-config.ui.h:26
-#: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:282
+#: ../widgets/misc/e-signature-script-dialog.c:284
 msgid "_Name:"
 msgstr "పేర�(_N):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:300
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "ఆఫ�‌లైన� ఆపరేషన� కొరక� క�యాలెండర� సారమ�లన� నకల� తీయ�మ�(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:302
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "ఆఫ�‌లైన� ఆపరేషన� కొరక� కర�తవ�య జాబితా సారమ�లన� నకల�తీయ�మ�(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:304
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "ఆఫ�‌లైన� ఆపరేషన� కొరక� మెమో జాబితా సారమ�లన� స�థానికంగా నకల�తీయ�మ�(_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
+#: ../calendar/gui/dialogs/calendar-setup.c:350
+#| msgid "Shared Folder Notification"
+msgid "Sh_ow reminder notifications"
+msgstr "గ�ర�త�చేయ�దాన�ని ప�రకటనల� చూప�మ� (_o)"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:425
 msgid "Colo_r:"
 msgstr "వర�ణమ� (_r):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:448
+#: ../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/calendar/e-calendar-preferences.ui.h:17
+#: ../plugins/itip-formatter/itip-formatter.c:3045
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "General"
+msgstr "సాధారణ"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:461
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
+msgid "Task List"
+msgstr "కర�తవ�యం జాబితా"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:472
 msgid "Memo List"
 msgstr "మెమో జాబితా"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:564
 msgid "Calendar Properties"
 msgstr "క�యాలెండర� లక�షణాల�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:564
 msgid "New Calendar"
 msgstr "కొత�త క�యాలెండర�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "Task List Properties"
 msgstr "కార�య జాబితా లక�షణాల�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "New Task List"
 msgstr "కొత�త కర�తవ�యంజాబితా"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:684
 msgid "Memo List Properties"
 msgstr "మెమో జాబితా లక�షణాల�"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:684
 msgid "New Memo List"
 msgstr "కొత�త మెమో జాబితా"
 
-#: ../calendar/gui/dialogs/changed-comp.c:59
+#: ../calendar/gui/dialogs/changed-comp.c:62
 msgid "This event has been deleted."
 msgstr "ఈ ఘటన తొలగించబడినది"
 
-#: ../calendar/gui/dialogs/changed-comp.c:63
+#: ../calendar/gui/dialogs/changed-comp.c:66
 msgid "This task has been deleted."
 msgstr "ఈ కర�తవ�యం తొలగించబడినది."
 
-#: ../calendar/gui/dialogs/changed-comp.c:67
+#: ../calendar/gui/dialogs/changed-comp.c:70
 msgid "This memo has been deleted."
 msgstr "ఈ మెమో తొలగించబడినది"
 
-#: ../calendar/gui/dialogs/changed-comp.c:76
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  మీర� మార�ప�ల� చేసినార�. ఆ మార�ప�లన� మర�చి సరిచేయ�దానిని మూసివేయ�?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:78
+#: ../calendar/gui/dialogs/changed-comp.c:81
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  మీర� మార�ప�ల� చేయలేద�, సరిచేయ�దానిని మూసివేయ�?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:83
+#: ../calendar/gui/dialogs/changed-comp.c:86
 msgid "This event has been changed."
 msgstr "ఈ ఘటన మార�చబడినది."
 
-#: ../calendar/gui/dialogs/changed-comp.c:87
+#: ../calendar/gui/dialogs/changed-comp.c:90
 msgid "This task has been changed."
 msgstr "ఈ కర�తవ�యం మార�చబడినది"
 
-#: ../calendar/gui/dialogs/changed-comp.c:91
+#: ../calendar/gui/dialogs/changed-comp.c:94
 msgid "This memo has been changed."
 msgstr "ఈ మెమో మార�చబడినది."
 
-#: ../calendar/gui/dialogs/changed-comp.c:100
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  మీర� మార�ప�ల� చేసినార�. ఆ మార�ప�లన� మర�చి సరిచేయ�దానిని తాజా పర�చవలెన?"
+msgstr ""
+"%s  మీర� మార�ప�ల� చేసినార�. ఆ మార�ప�లన� మర�చి సరిచేయ�దానిని తాజా పర�చవలెన?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:102
+#: ../calendar/gui/dialogs/changed-comp.c:105
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  మీర� మార�ప�ల� చేసార�, సరిచేయ�దానిని తాజా పర�చవలెన?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:448
+#: ../calendar/gui/dialogs/comp-editor-page.c:461
 #, c-format
 msgid "Validation error: %s"
 msgstr "వర�తింప�చేయ�ట లో దోషం: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:246
+#: ../calendar/gui/dialogs/comp-editor.c:273
 msgid "Could not save attachments"
 msgstr "అన�భందమ�లన� దాయలేక పోయింది"
 
-#: ../calendar/gui/dialogs/comp-editor.c:522
+#: ../calendar/gui/dialogs/comp-editor.c:613
 msgid "Could not update object"
 msgstr "తాత�పర�యాన�ని తాజాపర�చలేకపోయింది"
 
-#: ../calendar/gui/dialogs/comp-editor.c:637
+#: ../calendar/gui/dialogs/comp-editor.c:741
 msgid "Edit Appointment"
 msgstr "నియామకాన�ని సరిచేయ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:644
+#: ../calendar/gui/dialogs/comp-editor.c:748
 #, c-format
 msgid "Meeting - %s"
 msgstr "సమావేశం - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:646
+#: ../calendar/gui/dialogs/comp-editor.c:750
 #, c-format
 msgid "Appointment - %s"
 msgstr "నియామకం- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:652
+#: ../calendar/gui/dialogs/comp-editor.c:756
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "అప�పగించబడిన కర�తవ�యం - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:654
+#: ../calendar/gui/dialogs/comp-editor.c:758
 #, c-format
 msgid "Task - %s"
 msgstr "కార�యం - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:763
 #, c-format
 msgid "Memo - %s"
 msgstr "మెమో - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:675
+#: ../calendar/gui/dialogs/comp-editor.c:779
 msgid "No Summary"
 msgstr "సంక�షిప�తం లేద�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:786
+#: ../calendar/gui/dialogs/comp-editor.c:900
 msgid "Keep original item?"
 msgstr "వాస�తవ అంశమ�న� కలిగివ�ండాలా?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983
-msgid "Click here to close the current window"
-msgstr "ప�రస�త�త గవాక�షాన�ని మూయ�టక� ఇక�కడ నొక�కండి"
+#: ../calendar/gui/dialogs/comp-editor.c:1101
+#| msgid "Close the current file"
+msgid "Close the current window"
+msgstr "ప�రస�త�త విండోన� మూయి"
 
-#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1453
-#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1061
+#: ../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
 msgid "Copy the selection"
 msgstr "ఎంపికన� నకల� తీయ�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1460
-#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:1055
+#: ../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
 msgid "Cut the selection"
 msgstr "ఎంపికచేసినదాన�ని కత�తిరించ�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1004
-#: ../shell/e-shell-window-actions.c:1467
-#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
-#, fuzzy
+#: ../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
 msgid "Delete the selection"
-msgstr "ఎంపికచేసినదాన�ని కత�తిరించ�మ�"
+msgstr "ఎంపికచేసినదాన�ని తొలగించ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1011
-msgid "Click here to view help available"
-msgstr "సహాయం అంద�బాట�లో ఉందోలేదో చూడటానికి ఇక�కడ నొక�కండి"
+#: ../calendar/gui/dialogs/comp-editor.c:1129
+#| msgid "View"
+msgid "View help"
+msgstr "సహాయం దర�శించ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1502
-#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:1067
+#: ../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
 msgid "Paste the clipboard"
 msgstr "క�లిప� పలకాన�ని అతికించ�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1039
-msgid "Click here to save the current window"
-msgstr "ప�రస�త�త గవాక�షాన�ని దాయ�టక� ఇక�కడ నొక�కండి"
+#: ../calendar/gui/dialogs/comp-editor.c:1157
+#| msgid "Save Current View"
+msgid "Save current changes"
+msgstr "ప�రస�త�త  మార�ప�లన� దాయి"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1572
-#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
+#: ../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
 msgid "Select all text"
 msgstr "పాఠ�యమొత�తాన�ని ఎంచ�కొన�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1053
+#: ../calendar/gui/dialogs/comp-editor.c:1171
 msgid "_Classification"
 msgstr "వర�గీకరణ(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1614
-#: ../widgets/misc/e-signature-editor.c:217
+#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../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
+#: ../shell/e-shell-window-actions.c:1602
+#: ../widgets/menus/gal-define-views.ui.h:5
+msgid "_Edit"
+msgstr "సరిచేయ�(_E)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1185 ../mail/e-mail-browser.c:169
+#: ../shell/e-shell-window-actions.c:1609
+#: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
-msgstr "దస�త�రం(_F)"
+msgstr "ఫైల� (_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1074
-#: ../shell/e-shell-window-actions.c:1621
+#: ../calendar/gui/dialogs/comp-editor.c:1192
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Help"
 msgstr "సహాయం(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1199
 msgid "_Insert"
 msgstr "చేర�చ�మ� (_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../composer/e-composer-actions.c:312
+#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../composer/e-composer-actions.c:340
 msgid "_Options"
 msgstr "ఇచ�ఛాపూర�వకాల�(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1656 ../smime/gui/smime-ui.ui.h:45
+#: ../calendar/gui/dialogs/comp-editor.c:1213 ../mail/e-mail-browser.c:183
+#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "దర�శనం(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
-#: ../composer/e-composer-actions.c:240
+#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../composer/e-composer-actions.c:289
 msgid "_Attachment..."
 msgstr "జతపర�చ�మ�(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1107
-msgid "Click here to attach a file"
-msgstr "దస�త�రాన�ని జతపర�చ�టక� ఇక�కడ నొక�కండి"
+#: ../calendar/gui/dialogs/comp-editor.c:1225
+#: ../composer/e-composer-actions.c:291
+#: ../widgets/misc/e-attachment-view.c:439
+msgid "Attach a file"
+msgstr "ఒక ఫైల�న� జతపర�చ�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1233
 msgid "_Categories"
 msgstr "విభాగాల�(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:1235
 msgid "Toggles whether to display categories"
 msgstr "వర�గీకరణల� ప�రదర�శితమైతే మార�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1241
 msgid "Time _Zone"
 msgstr "కాలక�షేత�రమ�(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1243
 msgid "Toggles whether the time zone is displayed"
 msgstr "సమయ క�షేత�రం ప�రదర�శితమైతే మార�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/dialogs/comp-editor.c:1252
 msgid "Pu_blic"
 msgstr "పబ�లిక�(_b)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1254
 msgid "Classify as public"
 msgstr "ప�రజామైనది గా వర�గీకరించ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1259
 msgid "_Private"
 msgstr "స�వంత(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1261
 msgid "Classify as private"
 msgstr "వ�యక�తిగతమైనదిగా వర�గీకరించ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1148
+#: ../calendar/gui/dialogs/comp-editor.c:1266
 msgid "_Confidential"
 msgstr "గోప�యమైన(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1268
 msgid "Classify as confidential"
 msgstr "గోప�యమైనదిగా వర�గీకరించ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "R_ole Field"
 msgstr "పాత�ర క�షేత�రం(_o)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1278
 msgid "Toggles whether the Role field is displayed"
 msgstr "పాత�ర క�షేత�రం ప�రదర�శితమైతే మార�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1166
+#: ../calendar/gui/dialogs/comp-editor.c:1284
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1168
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "RSVP క�షేత�రం ప�రదర�శితమైతే మార�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1174
+#: ../calendar/gui/dialogs/comp-editor.c:1292
 msgid "_Status Field"
 msgstr "స�స�థితి క�షేత�రం(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../calendar/gui/dialogs/comp-editor.c:1294
 msgid "Toggles whether the Status field is displayed"
 msgstr "స�థితి క�షేత�రం ప�రదర�శితమైతే మార�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1300
 msgid "_Type Field"
 msgstr "క�షేత�ర రకం(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1184
+#: ../calendar/gui/dialogs/comp-editor.c:1302
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "హాజరైనవాని రకం ప�రదర�శితమైతే మార�మ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1208
-#: ../composer/e-composer-private.c:70
+#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "ఇటీవలి పత�రమ�ల� (_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1743
-#: ../composer/e-composer-actions.c:428
+#: ../calendar/gui/dialogs/comp-editor.c:2059
+#: ../composer/e-composer-actions.c:508
 msgid "Attach"
 msgstr "జతపర�చ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2072
-#: ../calendar/gui/dialogs/comp-editor.c:2121
-#: ../calendar/gui/dialogs/comp-editor.c:3086
+#: ../calendar/gui/dialogs/comp-editor.c:2397
+#: ../calendar/gui/dialogs/comp-editor.c:2560
+#: ../calendar/gui/dialogs/comp-editor.c:3549
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "ఈ అంశాన�ని తాజాపరిస�తే మార�ప�ల� రద�ద� అవ�తాయి"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3050
-#: ../plugins/prefer-plain/prefer-plain.c:64
+#: ../calendar/gui/dialogs/comp-editor.c:3513
+#: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "అన�బంధం"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3118
+#: ../calendar/gui/dialogs/comp-editor.c:3581
 msgid "Unable to use current version!"
 msgstr "వర�తమాన వివరణన� వాడలేకపోత�ంది!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:92
-msgid "Could not open source"
-msgstr "వనర�న� తెరవలేకపోయింది"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:100
+#: ../calendar/gui/dialogs/copy-source-dialog.c:114
 msgid "Could not open destination"
 msgstr "గమ�యాన�ని తెరవలేకపోయింది"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:109
+#: ../calendar/gui/dialogs/copy-source-dialog.c:130
 msgid "Destination is read only"
 msgstr "గమ�యం కేవలం చదవదగినది"
 
+#: ../calendar/gui/dialogs/copy-source-dialog.c:164
+#| msgid "Cannot create a new event"
+msgid "Cannot create object"
+msgstr "కొత�త ఆబ�జక�ట�న� సృష�టించలేమ�"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:193
+msgid "Could not open source"
+msgstr "వనర�న� తెరవలేకపోయింది"
+
 #: ../calendar/gui/dialogs/delete-comp.c:214
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "ఇతర స�వీకరణదార�ల మెయిల�‌పెట�టెలన�నింటి న�ండి ఈ అంశమ�న� తొలగించాలా(_D)?"
 
 #: ../calendar/gui/dialogs/delete-comp.c:217
-#, fuzzy
 msgid "_Retract comment"
-msgstr "శాతం పూర�తి(_e):"
+msgstr "రిట�రాక�ట� వ�యాఖ�యానం (_R)"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:56
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/delete-error.c:57
+#, c-format
 msgid "The event could not be deleted due to a dbus error: %s"
-msgstr "ఒక దోషం మూలంగా ఘటనన� రద�ద�చేయలేకపోయింది"
+msgstr "dbus దోషం కారణంగా ఘటన తొలగించబడలేద�: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:60
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/delete-error.c:61
+#, c-format
 msgid "The task could not be deleted due to a dbus error: %s"
-msgstr "ఒక దోషం మూలంగా కార�యాన�ని రద�ద�చేయలేకపోయింది"
+msgstr "dbus దోషం కారణంగా కర�తవ�యం తొలగించబడలేద�: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:64
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/delete-error.c:65
+#, c-format
 msgid "The memo could not be deleted due to a dbus error: %s"
-msgstr "ఒక దోషం మూలంగా అంశాన�ని తొలగించలేకపోయింది"
+msgstr "dbus దోషం మూలంగా మెమోన� తొలగించలేకపోయింది: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:68
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/delete-error.c:69
+#, c-format
 msgid "The item could not be deleted due to a dbus error: %s"
-msgstr "ఒక దోషం మూలంగా అంశాన�ని రద�ద�చేయలేకపోయింది"
+msgstr "dbusదోషం మూలంగా అంశాన�ని తొలగించలేకపోయింది: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
+#: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The event could not be deleted because permission was denied"
 msgstr "అన�మతి తిరస�కరించబడినంద�న ఘటనన� రద�ద�చేయలేకపోయింది"
 
-#: ../calendar/gui/dialogs/delete-error.c:78
+#: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The task could not be deleted because permission was denied"
 msgstr "అన�మతి తిరస�కరించబడినంద�న కార�యాన�ని రద�ద�చేయలేకపోయింది"
 
-#: ../calendar/gui/dialogs/delete-error.c:81
+#: ../calendar/gui/dialogs/delete-error.c:82
 msgid "The memo could not be deleted because permission was denied"
 msgstr "అన�మతి తిరస�కరించబడినంద�న అంశాన�ని తొలగించలేకపోయింది"
 
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:85
 msgid "The item could not be deleted because permission was denied"
 msgstr "అన�మతి తిరస�కరించబడినంద�న అంశాన�ని రద�ద�చేయలేకపోయింది"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:92
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/delete-error.c:93
+#, c-format
 msgid "The event could not be deleted due to an error: %s"
-msgstr "ఒక దోషం మూలంగా ఘటనన� రద�ద�చేయలేకపోయింది"
+msgstr "ఒక దోషం మూలంగా ఘటనన� తొలగించలేకపోయింది: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:96
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/delete-error.c:97
+#, c-format
 msgid "The task could not be deleted due to an error: %s"
-msgstr "ఒక దోషం మూలంగా కార�యాన�ని రద�ద�చేయలేకపోయింది"
+msgstr "ఒక దోషం మూలంగా కర�తవ�యాన�ని తొలగించలేకపోయింది: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:100
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/delete-error.c:101
+#, c-format
 msgid "The memo could not be deleted due to an error: %s"
-msgstr "ఒక దోషం మూలంగా అంశాన�ని తొలగించలేకపోయింది"
+msgstr "ఒక దోషం మూలంగా  మెమోన� తొలగించలేకపోయింది: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:104
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/delete-error.c:105
+#, c-format
 msgid "The item could not be deleted due to an error: %s"
-msgstr "ఒక దోషం మూలంగా అంశాన�ని రద�ద�చేయలేకపోయింది"
+msgstr "ఒక దోషం మూలంగా అంశాన�ని తొలగించలేకపోయింది: %s"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
@@ -3736,303 +2918,355 @@ msgstr "క� ప�రతినిధి:"
 msgid "Enter Delegate"
 msgstr "ప�రతినిధిని ప�రవేశపెట�ట�మ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
-msgid "_Alarms"
-msgstr "అలారమ�ల�(_A)"
+#: ../calendar/gui/dialogs/event-editor.c:212
+#| msgid "Reminder!"
+msgid "_Reminders"
+msgstr "గ�ర�త�చేయ�నవి (_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:219
-msgid "Click here to set or unset alarms for this event"
-msgstr "ఈ ఘటనక� హెచ�చరికల� అమర�చ�టక� లేదా తీసివేయ�టక� ఇక�కడ నొక�కండి"
+#: ../calendar/gui/dialogs/event-editor.c:214
+#| msgid "Click here to set or unset alarms for this event"
+msgid "Set or unset reminders for this event"
+msgstr "ఈ ఘటనక� అలారాల� అమర�చ� లేదా తీసివేయి"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
 msgstr "సమయంన� తీరికలేనిదిగా చూప�మ� (_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:224
 msgid "Toggles whether to show time as busy"
 msgstr "చూపించ� సమంయ తీరికలేక�ంటే మార�మ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:233
 msgid "_Recurrence"
 msgstr "ప�నరావృతి(_R)"
 
 #
-#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/event-editor.c:235
 msgid "Make this a recurring event"
 msgstr "ప�నఃసంభవమిస�త�న�న ఘటనగా దీన�ని చేయ�మ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:210
-#: ../widgets/misc/e-send-options.ui.h:19
+#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "పంపించ� �చ�చికాల�"
 
-#: ../calendar/gui/dialogs/event-editor.c:247
-#: ../calendar/gui/dialogs/task-editor.c:129
+#: ../calendar/gui/dialogs/event-editor.c:242
+#: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "ఉన�నతస�థితిగల పంపించే ఇచ�చాపూర�వకాలన� అమర�చ�మ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:255
+#: ../calendar/gui/dialogs/event-editor.c:250
 msgid "All _Day Event"
 msgstr "పూర�తిరోజ� ఘటన(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:257
+#: ../calendar/gui/dialogs/event-editor.c:252
 msgid "Toggles whether to have All Day Event"
 msgstr "రోజ�మెత�తం ఘటన ఉంటే మార�మ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:266
+#: ../calendar/gui/dialogs/event-editor.c:261
 msgid "_Free/Busy"
 msgstr "ఖాళీ/తీరిక లేని(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:268
+#: ../calendar/gui/dialogs/event-editor.c:263
 msgid "Query free / busy information for the attendees"
 msgstr "హాజరైనవారి కొరక� ఖాళీ/తీరికలేని సమాచారం న� ప�రశ�నించ�మ�"
 
-#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2588
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3310
 msgid "Appointment"
 msgstr "నియామకం"
 
-#: ../calendar/gui/dialogs/event-editor.c:385
-#: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../calendar/gui/e-meeting-list-view.c:148
+#: ../calendar/gui/dialogs/event-editor.c:384
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/e-meeting-list-view.c:161
 msgid "Attendees"
 msgstr "హాజరైనవార�"
 
-#: ../calendar/gui/dialogs/event-editor.c:578
-#, fuzzy
+#: ../calendar/gui/dialogs/event-editor.c:582
 msgid "Print this event"
-msgstr "ఈ సందేశాన�ని మ�ద�రించ�మ�"
+msgstr "ఈ ఘటనన� మ�ద�రించ�"
 
-#: ../calendar/gui/dialogs/event-page.c:766
+#: ../calendar/gui/dialogs/event-page.c:558
 msgid "Event's start time is in the past"
-msgstr ""
+msgstr "ఘటన యొక�క ప�రారంభ సమయం భూతకాలంలో వ�ంది"
 
-#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:635
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "ఘటన సరికూర�చబడలేద�, యెంచేతంటే యెంపికైన క�యాలెండర� చద�వ�టక� మాత�రమే"
 
-#: ../calendar/gui/dialogs/event-page.c:811
+#: ../calendar/gui/dialogs/event-page.c:639
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "ఘటన పూర�తిగా సరికూర�చబడలేద�, యెంచేతంటే మీర� నిర�వాహక�ల� కాద�"
 
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.c:2775
-msgid "This event has alarms"
-msgstr "ఈ ఘటన అలారమ�లన� కలిగిఉంది"
+#: ../calendar/gui/dialogs/event-page.c:651
+#: ../calendar/gui/dialogs/event-page.c:3080
+#| msgid "This event has alarms"
+msgid "This event has reminders"
+msgstr "ఈ ఘటన గర�త�చేయ�వాటిని కలిగిఉంది"
 
-#: ../calendar/gui/dialogs/event-page.c:890
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "నిర�వాహక�డ�(_g):"
 
-#: ../calendar/gui/dialogs/event-page.c:937
-msgid "_Delegatees"
-msgstr "ప�రాతినిధ�యంవహించే(_D)"
-
-#: ../calendar/gui/dialogs/event-page.c:939
-msgid "Atte_ndees"
-msgstr "హాజరైనవార�(_n)"
-
-#: ../calendar/gui/dialogs/event-page.c:1154
+#: ../calendar/gui/dialogs/event-page.c:1263
 msgid "Event with no start date"
 msgstr "ప�రారంభ తారీఖ� లేని ఘటన"
 
-#: ../calendar/gui/dialogs/event-page.c:1157
+#: ../calendar/gui/dialogs/event-page.c:1266
 msgid "Event with no end date"
 msgstr "అంతం తారీఖ� లేని ఘటన"
 
-#: ../calendar/gui/dialogs/event-page.c:1328
-#: ../calendar/gui/dialogs/memo-page.c:686
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/event-page.c:1439
+#: ../calendar/gui/dialogs/memo-page.c:708
+#: ../calendar/gui/dialogs/task-page.c:819
 msgid "Start date is wrong"
 msgstr "ప�రారంభ తారీఖ� తప�ప�"
 
-#: ../calendar/gui/dialogs/event-page.c:1338
+#: ../calendar/gui/dialogs/event-page.c:1449
 msgid "End date is wrong"
 msgstr "అంతం తారీఖ� తప�ప�"
 
-#: ../calendar/gui/dialogs/event-page.c:1361
+#: ../calendar/gui/dialogs/event-page.c:1472
 msgid "Start time is wrong"
 msgstr "ప�రారంభ తారీఖ� తప�ప�"
 
-#: ../calendar/gui/dialogs/event-page.c:1368
+#: ../calendar/gui/dialogs/event-page.c:1479
 msgid "End time is wrong"
 msgstr "అంతం తారీఖ� తప�ప�"
 
-#: ../calendar/gui/dialogs/event-page.c:1530
-#: ../calendar/gui/dialogs/memo-page.c:727
-#: ../calendar/gui/dialogs/task-page.c:967
-msgid "The organizer selected no longer has an account."
-msgstr "ఎంపికచేసిన వ�యస�థీకరింపచేసెదానికి ఖాతా లేద� "
-
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/memo-page.c:733
-#: ../calendar/gui/dialogs/task-page.c:973
+#: ../calendar/gui/dialogs/event-page.c:1644
+#: ../calendar/gui/dialogs/memo-page.c:749
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "An organizer is required."
 msgstr "వ�యస�థీకరింపచేసెది అవసరం"
 
-#: ../calendar/gui/dialogs/event-page.c:1561
-#: ../calendar/gui/dialogs/task-page.c:997
+#: ../calendar/gui/dialogs/event-page.c:1678
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "At least one attendee is required."
 msgstr "కనీసం ఒక హాజరయ�యెవార� అవసరం."
 
-#: ../calendar/gui/dialogs/event-page.c:2649
+#: ../calendar/gui/dialogs/event-page.c:1885
+msgid "_Delegatees"
+msgstr "ప�రాతినిధ�యంవహించే(_D)"
+
+#: ../calendar/gui/dialogs/event-page.c:1887
+msgid "Atte_ndees"
+msgstr "హాజరైనవార�(_n)"
+
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
-msgid "Unable to open the calendar '%s'."
-msgstr "క�యాలెండర� '%s'న� తెరవలేకపోయింది."
+#| msgid "Unable to open the calendar '%s'."
+msgid "Unable to open the calendar '%s': %s"
+msgstr "క�యాలెండర� '%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:2693
-#: ../calendar/gui/dialogs/memo-page.c:946
-#: ../calendar/gui/dialogs/task-page.c:1787
+#. * on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2998
+#: ../calendar/gui/dialogs/memo-page.c:1012
+#: ../calendar/gui/dialogs/task-page.c:1838
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "మీర� %s తర�ప�న మీర� చేస�త�న�నార�"
 
-#: ../calendar/gui/dialogs/event-page.c:2994
+#: ../calendar/gui/dialogs/event-page.c:3325
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d రోజ� మ�ందరి నియామకం"
 msgstr[1] "%d రోజ�ల మ�ందరి నియామకం"
 
-#: ../calendar/gui/dialogs/event-page.c:3000
+#: ../calendar/gui/dialogs/event-page.c:3331
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d ఘంట మ�ందరి నియామకం"
 msgstr[1] "%d ఘంటల మ�ందరి నియామకం"
 
-#: ../calendar/gui/dialogs/event-page.c:3006
+#: ../calendar/gui/dialogs/event-page.c:3337
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d నిమిషం మ�ందరి నియామకం"
 msgstr[1] "%dనిమిషాల మ�ందరి నియామకం"
 
-#: ../calendar/gui/dialogs/event-page.c:3019
+#: ../calendar/gui/dialogs/event-page.c:3356
 msgid "Customize"
 msgstr "మల�చ�కొన�"
 
-#. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3021
-#, fuzzy
-msgctxt "cal-alarms"
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/dialogs/event-page.c:3362
+#| msgid "None"
+msgctxt "cal-reminders"
 msgid "None"
 msgstr "�దికాద�"
 
-#. TRANSLATORS: Predefined alarm's description
-#: ../calendar/gui/dialogs/event-page.ui.h:2
-#, fuzzy
-msgid "1 day before appointment"
-msgstr "%d రోజ� మ�ందరి నియామకం"
-
-#. TRANSLATORS: Predefined alarm's description
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-#, fuzzy
-msgid "1 hour before appointment"
-msgstr "%d ఘంట మ�ందరి నియామకం"
-
-#. TRANSLATORS: Predefined alarm's description
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-#, fuzzy
-msgid "15 minutes before appointment"
-msgstr "%d నిమిషం మ�ందరి నియామకం"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:578
+#: ../calendar/gui/e-meeting-time-sel.c:564
 msgid "Atte_ndees..."
 msgstr "హాజరైనవార�(_n)..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-msgid "Custom Alarm:"
-msgstr "మల�చ�కొన� అలారమ�:"
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+#| msgid "Custom Header"
+msgid "Custom Reminder:"
+msgstr "మల�చిన అలారం:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Event Description"
 msgstr "ఘటన విశదీకరణ"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
-msgid "_Alarm"
-msgstr "అలారమ�(_A)"
+#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
+msgid "Time _zone:"
+msgstr "కాల క�షేత�రం(_z):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:345
+#: ../widgets/misc/e-attachment-dialog.c:347
 msgid "_Description:"
 msgstr "వివరణ(_D):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../plugins/calendar-weather/calendar-weather.c:358
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../plugins/calendar-weather/calendar-weather.c:381
 msgid "_Location:"
 msgstr "స�థానమ�(_L):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:20
-#, fuzzy
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#| msgid "Reminder!"
+msgid "_Reminder"
+msgstr "గ�ర�త�చేయ�నది (_R)"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
-msgstr "తాత�పర�యం:"
+msgstr "సంక�షిప�తసమాచారం (_S):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:21
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "_Time:"
 msgstr "సమయం(_T):"
 
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "1 రోజ� మ�ందరి నియామకం"
+
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "1 గంట మ�ందరి నియామకం"
+
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:21
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "15 నిమిషాల మ�ందరి నియామకం"
+
 #. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
-#, fuzzy
+msgctxt "eventpage"
 msgid "for"
-msgstr "నాల�గోది"
+msgstr "కొరక�"
 
 #. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.ui.h:27
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-#, fuzzy
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+msgctxt "eventpage"
 msgid "until"
-msgstr ""
-"కొరక�\n"
-"వరక�"
+msgstr "వరక�"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
+msgid "April"
+msgstr "�ప�రిల�"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
+msgid "August"
+msgstr "ఆగస�ట�"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
+msgid "December"
+msgstr "డిసెంబర�"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
+msgid "February"
+msgstr "ఫిబ�రవరి"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
+msgid "January"
+msgstr "జనవరి"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
+msgid "July"
+msgstr "జ�లై"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
+msgid "June"
+msgstr "జూన�"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
+msgid "March"
+msgstr "మార�చ�"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
+msgid "May"
+msgstr "మే"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
+msgid "November"
+msgstr "నంబర�"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
+msgid "October"
+msgstr "అక�టోబర�"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "Select Date"
+msgstr "తారీఖ� ఎంపికచేయి"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+msgid "Select _Today"
+msgstr "ఈ రోజ�న� ఎంచ�కొన�మ�(_T)"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
+msgid "September"
+msgstr "సెప�టెంబర�"
+
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3314
 msgid "Memo"
 msgstr "మెమో"
 
 #: ../calendar/gui/dialogs/memo-editor.c:156
-#, fuzzy
 msgid "Print this memo"
-msgstr "మెమోల జాబితాన� మ�ద�రిస�త�ంది"
+msgstr "ఈ మెమో మ�ద�రించ�"
 
-#: ../calendar/gui/dialogs/memo-page.c:338
+#: ../calendar/gui/dialogs/memo-page.c:405
 msgid "Memo's start date is in the past"
-msgstr ""
+msgstr "మెమో యొక�క ప�రారంభ తేది భూతకాలంలోవ�ంది"
 
-#: ../calendar/gui/dialogs/memo-page.c:376
+#: ../calendar/gui/dialogs/memo-page.c:442
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "మెమో సరికూర�చ బడలేద�, యెంచేతంటే యెంపికైన మెమో జాబితా చద�వ�టక� మాత�రమే"
 
-#: ../calendar/gui/dialogs/memo-page.c:380
+#: ../calendar/gui/dialogs/memo-page.c:446
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "మెమో పూర�తిగా సరికూర�చబడలేద�, యెంచేతంటే మీర� నిర�వాహక�ల� కాద�"
 
-#: ../calendar/gui/dialogs/memo-page.c:907
+#: ../calendar/gui/dialogs/memo-page.c:936
 #, c-format
-msgid "Unable to open memos in '%s'."
-msgstr "'%s'లో మెమోలన� తెరవలేకపోయింది."
-
-#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:215
-#: ../em-format/em-format.c:942 ../mail/em-format-html.c:2289
-#: ../mail/em-format-html.c:2348 ../mail/em-format-html.c:2372
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:80
+#| msgid "Unable to open memos in '%s'."
+msgid "Unable to open memos in '%s': %s"
+msgstr "'%s' నంద� మెమోలన� తెర�వలేక పోయింది: %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
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "క�"
 
@@ -4051,62 +3285,66 @@ msgid "T_o:"
 msgstr "క�(_o):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:426
+#: ../calendar/gui/dialogs/task-page.c:333
 #: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_Group:"
-msgstr "సమూహం(_G):"
+#| msgid "_Last:"
+msgid "_List:"
+msgstr "జాబితా (_L):"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "మీర� ప�నరావృతిచెందిన ఘటనన� మార�చ�త�న�నార�, మీర� మార�చాలని అన�క�ంట�న�నారా?"
+msgstr ""
+"మీర� ప�నరావృతిచెందిన ఘటనన� మార�చ�త�న�నార�, మీర� మార�చాలని అన�క�ంట�న�నారా?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:57
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr "మీర� ప�నరావృతిచెందిన ఘటనక� ప�రాతినిధ�యంవహిస�త�న�నార�, మీర� ప�రాతినిధ�యంవహిస�తారా?"
+msgstr ""
+"మీర� ప�నరావృతిచెందిన ఘటనక� ప�రాతినిధ�యంవహిస�త�న�నార�, మీర� "
+"ప�రాతినిధ�యంవహిస�తారా?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:61
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "మీర� ప�నరావృతిచెందిన కార�యాన�ని మార�చ�త�న�నార�, మార�చాలంన�క�ంట�న�నారా?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:64
+#: ../calendar/gui/dialogs/recur-comp.c:65
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "మీర� ప�నరావృతిచెందిన మెమో మార�చ�త�న�నార�, మార�చాలన�క�ంట�న�నారా?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This Instance Only"
 msgstr "ఈ ప�రత�యేకస�థితి మాత�రమే"
 
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Prior Instances"
 msgstr "ఇది మరియ� పూర�వప� ప�రత�యేకస�థితిల�"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:101
 msgid "This and Future Instances"
 msgstr "ఇది మరియ� భవిష�యత�త� ప�రత�యేకస�థితిల�"
 
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:106
 msgid "All Instances"
 msgstr "అన�ని ప�రత�యేకస�థితిల�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:575
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "ఎవల�య�షన� సర�చేయలేని ప�నరావృత�త�ల� ఈ నియామకం కలద�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:964
 msgid "Recurrence date is invalid"
 msgstr "ప�నరావృతి తారీఖ� నిస�సారం"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:1004
 msgid "End time of the recurrence was before event's start"
 msgstr "ప�నరావృతమ� యొక�క మ�గింప� సమయం ఘటన ప�రారంభమ�నక� మ�ంద�"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:961
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "on"
 msgstr "పైన"
 
@@ -4114,7 +3352,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:1018
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
 msgid "first"
 msgstr "మొదటి"
 
@@ -4123,7 +3361,7 @@ msgstr "మొదటి"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1103
 msgid "second"
 msgstr "రెండోది"
 
@@ -4131,7 +3369,7 @@ msgstr "రెండోది"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
 msgid "third"
 msgstr "మూడవది"
 
@@ -4139,7 +3377,7 @@ msgstr "మూడవది"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 msgid "fourth"
 msgstr "నాల�గోది"
 
@@ -4147,7 +3385,7 @@ msgstr "నాల�గోది"
 #. * (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:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 msgid "fifth"
 msgstr "�దవ"
 
@@ -4155,13 +3393,13 @@ msgstr "�దవ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
 msgid "last"
 msgstr "చివరిది"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1068
+#: ../calendar/gui/dialogs/recurrence-page.c:1147
 msgid "Other Date"
 msgstr "ఇతర తారీఖ�"
 
@@ -4169,7 +3407,7 @@ msgstr "ఇతర తారీఖ�"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1153
 msgid "1st to 10th"
 msgstr "1 న�ండి 10 వరక�"
 
@@ -4177,7 +3415,7 @@ msgstr "1 న�ండి 10 వరక�"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1159
 msgid "11th to 20th"
 msgstr "11 న�ండి 20 వరక�"
 
@@ -4185,45 +3423,73 @@ msgstr "11 న�ండి 20 వరక�"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
 msgid "21st to 31st"
 msgstr "21 న�ండి 31 వరక�"
 
-#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
-#. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1111
-msgid "day"
-msgstr "రోజ�"
+#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
+msgid "Monday"
+msgstr "సోమవారం"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "Tuesday"
+msgstr "మంగళవారం"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
+msgid "Wednesday"
+msgstr "బ�ధవారం"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+msgid "Thursday"
+msgstr "గ�ర�వారం"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+msgid "Friday"
+msgstr "శ�క�రవారం"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1196
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
+msgid "Saturday"
+msgstr "శనివారం"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1197
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
+msgid "Sunday"
+msgstr "ఆదివారం"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1240
+#: ../calendar/gui/dialogs/recurrence-page.c:1321
 msgid "on the"
 msgstr "పైన"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1412
+#: ../calendar/gui/dialogs/recurrence-page.c:1496
 msgid "occurrences"
 msgstr "సంభవించనవి"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2119
+#: ../calendar/gui/dialogs/recurrence-page.c:2214
 msgid "Add exception"
 msgstr "అక�షేపణన� కల�ప�మ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2160
+#: ../calendar/gui/dialogs/recurrence-page.c:2255
 msgid "Could not get a selection to modify."
 msgstr "సవరించ�టక� ఎంపికన� పొందలేకపోయింది."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2166
+#: ../calendar/gui/dialogs/recurrence-page.c:2261
 msgid "Modify exception"
 msgstr "ఆక�షేపణన� సవరించ�మ�"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2305
 msgid "Could not get a selection to delete."
 msgstr "తొలగించ�టక� ఎంపికన� పొందలేకపోయింది."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2337
+#: ../calendar/gui/dialogs/recurrence-page.c:2439
 msgid "Date/Time"
 msgstr "తారీఖ�/సమయం"
 
@@ -4232,127 +3498,144 @@ msgid "Every"
 msgstr "ప�రతి"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:2
-#, fuzzy
 msgid "Exceptions"
-msgstr "<b>ఆక�షేపణల�</b>"
+msgstr "ఆక�షేపణల�"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
-#, fuzzy
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
 msgid "Preview"
-msgstr "ఉపదర�శనం(_P)"
+msgstr "ఉపదర�శనం"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:5
 msgid "This appointment rec_urs"
 msgstr "ఈ నియామకం ప�నరావృతి(_u)"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "రోజ�(ల�)"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgctxt "recurrpage"
+msgid "for"
+msgstr "కొరక�"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
-#, fuzzy
+msgctxt "recurrpage"
 msgid "forever"
-msgstr "ఎప�పటికివద�ద�"
+msgstr "ఎప�పటికీ"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
-#, fuzzy
+msgctxt "recurrpage"
 msgid "month(s)"
-msgstr "నెల"
+msgstr "నెల(ల�)"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+msgctxt "recurrpage"
+msgid "until"
+msgstr "వరక�"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:18
-#, fuzzy
+msgctxt "recurrpage"
 msgid "week(s)"
-msgstr "వారమ�ల�"
+msgstr "వారమ�(ల�)"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+msgctxt "recurrpage"
 msgid "year(s)"
-msgstr ""
+msgstr "సంవత�సరా(ల�)"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
-msgid "Send my alarms with this event"
-msgstr "ఈ ఘటనతో నా అలారమ�లన� పంప�మ�"
+#: ../calendar/gui/dialogs/send-comp.c:198
+#| msgid "Send my alarms with this event"
+msgid "Send my reminders with this event"
+msgstr "ఈ ఘటనతో నా  అలారాలన� పంప�"
 
-#: ../calendar/gui/dialogs/send-comp.c:164
+#: ../calendar/gui/dialogs/send-comp.c:200
 msgid "Notify new attendees _only"
 msgstr "కొత�తగా హాజరైనవారిని మాత�రమే ప�రకటించ�మ� (_o)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:350
-#: ../calendar/gui/dialogs/task-details-page.c:372
+#: ../calendar/gui/dialogs/task-details-page.c:351
+#: ../calendar/gui/dialogs/task-details-page.c:373
 msgid "Completed date is wrong"
 msgstr "పూర�తి చేసిన తారీఖ� తప�ప�"
 
-#: ../calendar/gui/dialogs/task-details-page.c:483
+#: ../calendar/gui/dialogs/task-details-page.c:488
 msgid "Web Page"
 msgstr "మహాతల ప�ట"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:443
-#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
-#: ../calendar/gui/print.c:2675 ../mail/em-sync-stream.c:151
-#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#: ../calendar/gui/e-cal-component-preview.c:300
+#: ../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
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
 msgstr "రద�ద�చేయబడినది"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:441
-#: ../calendar/gui/e-cal-model-tasks.c:715
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
-#: ../calendar/gui/print.c:2672 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-cal-component-preview.c:297
+#: ../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:217 ../calendar/gui/e-task-table.c:232
+#: ../calendar/gui/e-task-table.c:605 ../calendar/gui/print.c:3397
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:387
 msgid "Completed"
 msgstr "పూర�తిచేయబడిన"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1183 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1274 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "ఎక�క�వ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:439
-#: ../calendar/gui/e-cal-model-tasks.c:713
-#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
-#: ../calendar/gui/print.c:2669
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../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:3394
 msgid "In Progress"
 msgstr "ప�రోగమనంలొ ఉన�న"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1181 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-task-table.c:528 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1272 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "తక�క�వ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1182
-#: ../widgets/misc/e-send-options.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/tasktypes.xml.h:17 ../mail/message-list.c:1273
+#: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "మామూల�"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:437
-#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
-#: ../calendar/gui/print.c:2666 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:304
+#: ../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
 msgid "Not Started"
 msgstr "ప�రారంభం కాలేద�"
 
@@ -4365,11 +3648,11 @@ msgid "Stat_us:"
 msgstr "స�స�థితి(_u):"
 
 #. 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-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1773
-#: ../calendar/gui/e-meeting-list-view.c:594
+#: ../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
 #: ../mail/message-list.etspec.h:17
@@ -4378,8 +3661,8 @@ msgstr "స�స�థితి"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:24
+#: ../calendar/gui/e-task-table.c:529 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "నిర�వచించబడలేద�"
 
@@ -4388,7 +3671,7 @@ msgid "_Date completed:"
 msgstr "తారీఖ� పూర�తి అయినది(_D):"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:36
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Priority:"
 msgstr "ప�రాధాన�యత(_P):"
 
@@ -4396,62 +3679,62 @@ msgstr "ప�రాధాన�యత(_P):"
 msgid "_Web Page:"
 msgstr "మహాతలం ప�ట(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:117
+#: ../calendar/gui/dialogs/task-editor.c:116
 msgid "_Status Details"
 msgstr "స�స�థితి వివరాల�(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:119
+#: ../calendar/gui/dialogs/task-editor.c:118
 msgid "Click to change or view the status details of the task"
 msgstr "కర�తవ�యమ� యొక�క స�స�థితి వివరాల� దర�శించ�టక� లేదా మార�చ�టక� నొక�క�మ�"
 
-#: ../calendar/gui/dialogs/task-editor.c:127
-#: ../plugins/groupwise-features/mail-send-options.c:200
+#: ../calendar/gui/dialogs/task-editor.c:126
 msgid "_Send Options"
 msgstr "పంప�టక� ఇచ�ఛాపూర�వకాలన�(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2590
-#: ../widgets/misc/e-send-options.c:502
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3312
+#: ../widgets/misc/e-send-options.c:535
 msgid "Task"
 msgstr "కార�యం"
 
-#: ../calendar/gui/dialogs/task-editor.c:331
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "కర�తవ�యం వివరణల�"
 
-#: ../calendar/gui/dialogs/task-editor.c:373
-#, fuzzy
+#: ../calendar/gui/dialogs/task-editor.c:366
 msgid "Print this task"
-msgstr "కర�తవ�యాల జాబితాన� మ�ద�రించ�మ�"
+msgstr "ఈ కర�తవ�యాన�ని మ�ద�రించ�"
 
-#: ../calendar/gui/dialogs/task-page.c:343
+#: ../calendar/gui/dialogs/task-page.c:251
 msgid "Task's start date is in the past"
-msgstr ""
+msgstr "కర�తవ�యం ప�రారంభ తేది భూతకాలంలో వ�ంది"
 
-#: ../calendar/gui/dialogs/task-page.c:344
+#: ../calendar/gui/dialogs/task-page.c:252
 msgid "Task's due date is in the past"
-msgstr ""
+msgstr "కర�తవ�యం గడ�వ�తేది భూతకాలంలో వ�ంది"
 
-#: ../calendar/gui/dialogs/task-page.c:379
+#: ../calendar/gui/dialogs/task-page.c:286
 msgid "Task cannot be edited, because the selected task list is read only"
-msgstr "కర�తవ�యం సరికూర�చబడలేద�, యెంచేతంటే యెంపికైన కర�తవ�యప� జాబితా చద�వ�టక� మాత�రమే"
+msgstr ""
+"కర�తవ�యం సరికూర�చబడలేద�, యెంచేతంటే యెంపికైన కర�తవ�యప� జాబితా చద�వ�టక� మాత�రమే"
 
-#: ../calendar/gui/dialogs/task-page.c:383
+#: ../calendar/gui/dialogs/task-page.c:290
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "కర�తవ�యమ� పూర�తిగా సరికూర�చబడలేద�, యెంచేతంటే మీర� నిర�వాహక�ల� కాద�"
 
-#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.c:341
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "నిర�వాహక�డ�(_z):"
 
-#: ../calendar/gui/dialogs/task-page.c:880
+#: ../calendar/gui/dialogs/task-page.c:801
 msgid "Due date is wrong"
 msgstr "పూర�వనిర�ణిత రోజ� తప�పూ"
 
-#: ../calendar/gui/dialogs/task-page.c:1744
+#: ../calendar/gui/dialogs/task-page.c:1757
 #, c-format
-msgid "Unable to open tasks in '%s'."
-msgstr "'%s'లో కార�యాలన� తెరవలేకపోయింది."
+#| msgid "Unable to open tasks in '%s'."
+msgid "Unable to open tasks in '%s': %s"
+msgstr "'%s' నంద� కర�తవ�యాలన� తెర�వలేక పోయింది: %s"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
@@ -4466,7 +3749,7 @@ msgid "Time zone:"
 msgstr "సమయ క�షేత�రమ�:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:394
+#: ../calendar/gui/e-alarm-list.c:393
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -4474,121 +3757,116 @@ msgstr[0] "%d రోజ�"
 msgstr[1] "%d రోజ�ల�"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:400
+#: ../calendar/gui/e-alarm-list.c:399
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d వారం"
 msgstr[1] "%d వారాల�"
 
-#: ../calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:461
 msgid "Unknown action to be performed"
 msgstr "అపరిచిత కార�యాన�ని చెయ�యాలి"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:476
+#: ../calendar/gui/e-alarm-list.c:475
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s నియామకాన�ని ప�రారింబించేమ�ంద�"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:481
+#: ../calendar/gui/e-alarm-list.c:480
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s నియామకం ప�రారింబించిన తర�వాత"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:488
+#: ../calendar/gui/e-alarm-list.c:487
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s  నియామకం ప�రారింబించినప�ప�డ�"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:499
+#: ../calendar/gui/e-alarm-list.c:498
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s  నియామకం పూర�తి అవ�వడానికిమ�ంద�"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:504
+#: ../calendar/gui/e-alarm-list.c:503
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s  నియామకం పూర�తయినతర�వాత"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:511
+#: ../calendar/gui/e-alarm-list.c:510
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s నియామకం పూర�తయినప�ప�డ�"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:535
+#: ../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:543
+#: ../calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s అపరిచిత క�రియారంభ రకం కొరక�"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:671
 msgid "Untitled"
 msgstr "శిర�షిక లేద�"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
-#, fuzzy
+#: ../calendar/gui/e-cal-component-preview.c:200
 msgid "Categories:"
-msgstr "విభాగాల�"
+msgstr "వర�గాల�:"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Summary:"
 msgstr "తాత�పర�యం:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:263
 msgid "Start Date:"
 msgstr "ప�రారంభ తారీఖ�:"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:277
 msgid "Due Date:"
 msgstr "ప�ర�వనిర�ణిత తారీఖ�:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1189
-#: ../plugins/itip-formatter/itip-view.c:1074
+#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../plugins/itip-formatter/itip-view.c:1083
 msgid "Status:"
 msgstr "స�స�థితి:"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-component-preview.c:317
 msgid "Priority:"
 msgstr "ప�రాధాన�యం:"
 
-#: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "విశదీకరణ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
+#: ../calendar/gui/e-cal-component-preview.c:373
 msgid "Web Page:"
 msgstr "మహాతల ప�ట:"
 
 #: ../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:368
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "Created"
 msgstr "సృష�టించబడింది"
 
@@ -4607,17 +3885,17 @@ msgstr "చివరిగా సవరించిన"
 msgid "Start Date"
 msgstr " తారీఖ� మొదల�"
 
-#: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:563
+#: ../calendar/gui/e-cal-model-calendar.c:188
+#: ../calendar/gui/e-task-table.c:580
 msgid "Free"
 msgstr "స�వతంత�ర"
 
-#: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
+#: ../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 "తీరికలేద�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:659
+#: ../calendar/gui/e-cal-model-tasks.c:665
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4628,48 +3906,44 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:709
-#, fuzzy
+#: ../calendar/gui/e-cal-model-tasks.c:717
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "�దికాద�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
-#: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
+#: ../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 "అవ�న�"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
-#: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:181
+#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "కాద�"
 
-#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
-#: ../calendar/gui/e-itip-control.c:1349
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
-#: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2343
-#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../calendar/gui/e-cal-model.c:776 ../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
+#: ../plugins/itip-formatter/itip-formatter.c:469
+#: ../plugins/itip-formatter/itip-formatter.c:2697
 msgid "Unknown"
 msgstr "అపరిచిత"
 
-#: ../calendar/gui/e-cal-model.c:1271
+#: ../calendar/gui/e-cal-model.c:1580
 msgid "Recurring"
 msgstr "ప�నరావృతికరణ"
 
-#: ../calendar/gui/e-cal-model.c:1273
+#: ../calendar/gui/e-cal-model.c:1582
 msgid "Assigned"
 msgstr "స�థానం ఇవ�వబడినది"
 
-#: ../calendar/gui/e-cal-model.c:2175
+#: ../calendar/gui/e-cal-model.c:2937
 #, c-format
 msgid "Opening %s"
 msgstr "%sతెర�స�త�ంది"
@@ -4697,7 +3971,7 @@ msgstr "పూర�వ నిర�ణీత తేది"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:394
 msgid "Priority"
 msgstr "ప�రాధాన�యత"
 
@@ -4706,116 +3980,112 @@ msgid "Start date"
 msgstr "ప�రారంభ తేది"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:557
+#: ../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:572
+#: ../widgets/misc/e-attachment-tree-view.c:584
 msgid "Type"
 msgstr "à°°à°•à°‚"
 
-#: ../calendar/gui/e-calendar-view.c:407
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:420
 msgid "Cut selected events to the clipboard"
-msgstr "ఎంపికచేసిన పాఠ�యమ�న� క�లిప�‌బోర�డ�క� కత�తిరించ�మ�"
+msgstr "ఎంపికచేసిన ఘటనలన� క�లిప�‌బోర�డ�క� కత�తిరించ�మ�"
 
-#: ../calendar/gui/e-calendar-view.c:413
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:426
 msgid "Copy selected events to the clipboard"
-msgstr "ఎంపికైన పాఠ�యాన�ని క�లిప� పలకాన�ని నకల� తీయ�మ�"
+msgstr "ఎంపికైన ఘటనలన� క�లిప� పలకాన�ని నకల� తీయ�మ�"
 
-#: ../calendar/gui/e-calendar-view.c:419
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:432
 msgid "Paste events from the clipboard"
-msgstr "క�లిప� పలకం న�ండి పాఠ�యాన�ని అతికించ�మ�"
+msgstr "క�లిప� పలకం న�ండి ఘటనలన� అతికించ�మ�"
 
-#: ../calendar/gui/e-calendar-view.c:425
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:438
 msgid "Delete selected events"
-msgstr "ఎంపికచేసిన మెమోన� తొలగించ�మ�"
+msgstr "ఎంపికచేసిన ఘటనలన� తొలగించ�మ�"
 
-#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
-#: ../calendar/gui/e-task-table.c:266
+#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-task-table.c:269
 msgid "Deleting selected objects"
 msgstr "ఎంపికచేసిన అంశాలన� తొలగించ�త�న�నది"
 
-#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:845
-#: ../calendar/gui/e-task-table.c:1068
+#: ../calendar/gui/e-calendar-view.c:650 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-task-table.c:1104
 msgid "Updating objects"
 msgstr "అంశాలన� తాజా పర�చ�త�న�నది"
 
-#: ../calendar/gui/e-calendar-view.c:1720
-#: ../calendar/gui/e-itip-control.c:1195
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../plugins/itip-formatter/itip-formatter.c:2331
+#: ../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 "ఆమొదించబడినది"
 
-#: ../calendar/gui/e-calendar-view.c:1721
-#: ../calendar/gui/e-itip-control.c:1205
-#: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
-#: ../plugins/itip-formatter/itip-formatter.c:2337
+#: ../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 "తగించబడినది"
 
-#: ../calendar/gui/e-calendar-view.c:1722
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../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 "తాత�కాలిక"
 
-#: ../calendar/gui/e-calendar-view.c:1723
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../plugins/itip-formatter/itip-formatter.c:2340
+#: ../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 "ప�రాతినిధ�యంవహించే"
 
-#: ../calendar/gui/e-calendar-view.c:1724
+#: ../calendar/gui/e-calendar-view.c:1805
 msgid "Needs action"
 msgstr "చర�య అవసరం"
 
 #. 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:1869 ../calendar/gui/e-memo-table.c:528
-#: ../calendar/gui/e-task-table.c:743
+#. 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
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "నిర�వాహకి: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1873 ../calendar/gui/e-memo-table.c:533
-#: ../calendar/gui/e-task-table.c:746
+#. 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
 #, c-format
 msgid "Organizer: %s"
 msgstr "నిర�వాహకి: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2624
+#: ../calendar/gui/e-calendar-view.c:1969 ../calendar/gui/print.c:3346
 #, c-format
 msgid "Location: %s"
 msgstr "స�థానం: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1920
+#: ../calendar/gui/e-calendar-view.c:2000
 #, c-format
 msgid "Time: %s %s"
 msgstr "సమయం: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:160
+#: ../calendar/gui/e-cell-date-edit-text.c:156
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a·%m/%d/%Y·%H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:163
+#: ../calendar/gui/e-cell-date-edit-text.c:159
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a·%m/%d/%Y·%I:%M:%S·%p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:171
+#: ../calendar/gui/e-cell-date-edit-text.c:167
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4828,494 +4098,86 @@ 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:759
+#: ../calendar/gui/e-day-view-time-item.c:809
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i నిమిష భాగాల�"
 
-#: ../calendar/gui/e-day-view-time-item.c:780
+#: ../calendar/gui/e-day-view-time-item.c:830
 msgid "Show the second time zone"
 msgstr "రెండవ సమయ క�షేత�రాన�ని చూప�మ�"
 
+#. Translators: "None" indicates no second time zone set for a day view
+#: ../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:231
+msgctxt "cal-second-zone"
+msgid "None"
+msgstr "�దికాద�"
+
+#: ../calendar/gui/e-day-view-time-item.c:879
+#: ../calendar/gui/e-timezone-entry.c:319
+#: ../modules/calendar/e-calendar-preferences.c:258
+msgid "Select..."
+msgstr "ఎంపికచేయ�..."
+
 #. 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.
-#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
+#. * 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
 msgid "%A %d %B"
 msgstr "%A·%d·%B"
 
 #. 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.
-#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1895
-#: ../calendar/gui/e-week-view-main-item.c:227
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../modules/calendar/e-cal-shell-view-private.c:1014
+#. * %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-week-view-main-item.c:224
+#: ../calendar/gui/ea-gnome-calendar.c:204
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. 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.
-#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1911
-#: ../calendar/gui/e-week-view-main-item.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../modules/calendar/e-cal-shell-view-private.c:1050
+#. * 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-week-view-main-item.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:234
+#: ../modules/calendar/e-cal-shell-view-private.c:1090
 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:1077 ../calendar/gui/e-week-view.c:749
-#: ../calendar/gui/print.c:819
+#: ../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
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
-#: ../calendar/gui/print.c:821
+#: ../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
 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:2645
+#: ../calendar/gui/e-day-view.c:2636
 #, c-format
 msgid "Week %d"
 msgstr "వారం %d"
 
-#: ../calendar/gui/e-itip-control.c:761
-#, fuzzy
-msgid "Recurring:"
-msgstr "ప�నరావృతికరణ"
-
-#: ../calendar/gui/e-itip-control.c:765
-msgid "Yes. (Complex Recurrence)"
-msgstr "అవ�న�. (క�లిష�టమైన ప�నరావృతి)"
-
-#: ../calendar/gui/e-itip-control.c:782
-#, c-format
-msgid "Every day"
-msgid_plural "Every %d days"
-msgstr[0] "ప�రతి రోజ�"
-msgstr[1] "ప�రతి%d రోజ�ల�"
-
-#: ../calendar/gui/e-itip-control.c:795
-#, c-format
-msgid "Every week"
-msgid_plural "Every %d weeks"
-msgstr[0] "ప�రతి వారం"
-msgstr[1] "ప�రతి %d వారాల�"
-
-#: ../calendar/gui/e-itip-control.c:802
-#, c-format
-msgid "Every week on "
-msgid_plural "Every %d weeks on "
-msgstr[0] "ప�రతి వారం మొదల�"
-msgstr[1] "ప�రతి %d వారాల మొదల� "
-
-#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
-msgid " and "
-msgstr " మరియ�"
-
-#: ../calendar/gui/e-itip-control.c:822
-#, c-format
-msgid "The %s day of "
-msgstr "%s రోజైన"
-
-#: ../calendar/gui/e-itip-control.c:838
-#, c-format
-msgid "The %s %s of "
-msgstr " %s %s అయిన "
-
-#: ../calendar/gui/e-itip-control.c:849
-#, c-format
-msgid "every month"
-msgid_plural "every %d months"
-msgstr[0] "ప�రతి %d నెల"
-msgstr[1] "ప�రతి %d నెలల�"
-
-#: ../calendar/gui/e-itip-control.c:861
-#, c-format
-msgid "Every year"
-msgid_plural "Every %d years"
-msgstr[0] "ప�రతి %d సంవత�సరం"
-msgstr[1] "ప�రతి %d సంవత�సరాల�"
-
-#: ../calendar/gui/e-itip-control.c:874
-#, c-format
-msgid "a total of %d time"
-msgid_plural "a total of %d times"
-msgstr[0] " %d సమయంయొక�క మొత�తమ�"
-msgstr[1] "%d సమయాలయొక�క మొత�తమ�"
-
-#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
-msgid ", ending on "
-msgstr ", పైన అంతం "
-
-#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:906
-msgid "Starts"
-msgstr "మొదలౌత�ంది"
-
-#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:916
-msgid "Ends"
-msgstr "అంతమౌత�ంది"
-
-#: ../calendar/gui/e-itip-control.c:943
-#: ../plugins/save-calendar/csv-format.c:372
-msgid "Due"
-msgstr "పూర�వనిర�ణిత"
-
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
-msgid "iCalendar Information"
-msgstr "iక�యాలెండర� సమాచారం"
-
-#. Title
-#: ../calendar/gui/e-itip-control.c:1008
-msgid "iCalendar Error"
-msgstr "iక�యాలెండర� దోషం"
-
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
-#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
-#: ../plugins/itip-formatter/itip-view.c: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
-msgid "An unknown person"
-msgstr "అపరిచిత వ�యక�తి"
-
-#: ../calendar/gui/e-itip-control.c:1145
-#, fuzzy
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr "<br> ఈ సమాచారమ�న� సమీక�షించి, కింది జాబితాన�ంచి క�రియన� ఎంపికచేస�కోండి"
-
-#. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1160
-#: ../plugins/itip-formatter/itip-formatter.c:2318
-#, fuzzy
-msgctxt "cal-itip"
-msgid "None"
-msgstr "�దికాద�"
-
-#: ../calendar/gui/e-itip-control.c:1200
-#: ../plugins/itip-formatter/itip-formatter.c:2334
-msgid "Tentatively Accepted"
-msgstr "ప�రయోగాత�మకంగా ఆమొదించబడినది"
-
-#: ../calendar/gui/e-itip-control.c:1290
-msgid ""
-"The meeting has been canceled, however it could not be found in your "
-"calendars"
-msgstr "సమావేశం రద�ద� చేయబడినది, కాని అది మీ క�యాలెండర� లో కనిపించలేద� "
-
-#: ../calendar/gui/e-itip-control.c:1292
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
-msgstr " కార�యం రద�ద� చేయబడినది, కాని అది మీ కార�యజాబితా లో కనిపించలేద�"
-
-#: ../calendar/gui/e-itip-control.c:1369
-#, fuzzy, c-format
-msgid "%s has published meeting information."
-msgstr "<b>%s</b> సమావేశ సమాచారాన�ని మ�ద�రించినది"
-
-#: ../calendar/gui/e-itip-control.c:1370
-msgid "Meeting Information"
-msgstr "సమావేశ సమాచారం"
-
-#: ../calendar/gui/e-itip-control.c:1376
-#, fuzzy, c-format
-msgid "%s requests the presence of %s at a meeting."
-msgstr "%s యొక�క హాజర� ఒక సమావేశం వద�ద <b>%s</b> అభ�యర�ధించింది"
-
-#: ../calendar/gui/e-itip-control.c:1378
-#, fuzzy, c-format
-msgid "%s requests your presence at a meeting."
-msgstr "<b>%s</b> సమావేశం వద�ద మీ హాజర�న� అభ�యర�ధించింది."
-
-#: ../calendar/gui/e-itip-control.c:1379
-msgid "Meeting Proposal"
-msgstr "సమావేశ ప�రతిపాదన"
-
-#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1385
-#, fuzzy, c-format
-msgid "%s wishes to be added to an existing meeting."
-msgstr "<b>%s</b> అభినందనల� ఉన�న సమావేశానికి కల�పబడతాయి."
-
-#: ../calendar/gui/e-itip-control.c:1386
-msgid "Meeting Update"
-msgstr "సమావేశ తాజా వివరం"
-
-#: ../calendar/gui/e-itip-control.c:1390
-#, fuzzy, c-format
-msgid "%s wishes to receive the latest meeting information."
-msgstr "<b>%s</b> సమావేశ తాజా సమాచారాన�ని కొర�త�ంది"
-
-#: ../calendar/gui/e-itip-control.c:1391
-msgid "Meeting Update Request"
-msgstr "సమావేశ తాజా వివరాల అభ�యర�ధన"
-
-#: ../calendar/gui/e-itip-control.c:1398
-#, fuzzy, c-format
-msgid "%s has replied to a meeting request."
-msgstr "<b>%s</b> సమావేశ అభ�యర�ధన క� జవాబ� చెపింది"
-
-#: ../calendar/gui/e-itip-control.c:1399
-msgid "Meeting Reply"
-msgstr "సమావేశం యొక�క జవాబ�"
-
-#: ../calendar/gui/e-itip-control.c:1406
-#, fuzzy, c-format
-msgid "%s has canceled a meeting."
-msgstr "<b>%s</b> సమావేశాన�ని రద�ద� చేసింది."
-
-#: ../calendar/gui/e-itip-control.c:1407
-msgid "Meeting Cancelation"
-msgstr "సమావేశ రద�ద�"
-
-#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
-#: ../calendar/gui/e-itip-control.c:1534
-#, fuzzy, c-format
-msgid "%s has sent an unintelligible message."
-msgstr "<b>%s</b> అవివేక సందేశాన�ని పంపినది"
-
-#: ../calendar/gui/e-itip-control.c:1418
-msgid "Bad Meeting Message"
-msgstr "చెడ�డ సమావేశ సందేశం"
-
-#: ../calendar/gui/e-itip-control.c:1445
-#, fuzzy, c-format
-msgid "%s has published task information."
-msgstr "<b>%s</b> కార�య సమాచారాన�ని ప�రచ�రించినది"
-
-#: ../calendar/gui/e-itip-control.c:1446
-msgid "Task Information"
-msgstr "కార�య సమాచారం"
-
-#: ../calendar/gui/e-itip-control.c:1453
-#, fuzzy, c-format
-msgid "%s requests %s to perform a task."
-msgstr "%s ఒక కార�యాన�ని నిర�వతించాడినికి<b>%s</b> అభ�యర�ధించినది"
-
-#: ../calendar/gui/e-itip-control.c:1455
-#, fuzzy, c-format
-msgid "%s requests you perform a task."
-msgstr "<b>%s</b> ఒక కార�యాన�ని నిర�వతించాడినికి అభ�యర�ధించినది"
-
-#: ../calendar/gui/e-itip-control.c:1456
-msgid "Task Proposal"
-msgstr "కార�య ప�రతిపాదన"
-
-#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1462
-#, fuzzy, c-format
-msgid "%s wishes to be added to an existing task."
-msgstr "<b>%s</b> అభినందనల� ఉన�న కార�యానికి చెంద�తాయి."
-
-#: ../calendar/gui/e-itip-control.c:1463
-msgid "Task Update"
-msgstr "కార�య తాజా వివరం"
-
-#: ../calendar/gui/e-itip-control.c:1467
-#, fuzzy, c-format
-msgid "%s wishes to receive the latest task information."
-msgstr "<b>%s</b> తాజా కార�య సమాచారాన�ని పొంద దల�చినది"
-
-#: ../calendar/gui/e-itip-control.c:1468
-msgid "Task Update Request"
-msgstr "కార�యాన�ని తాజాపర�చ�టక� అభ�యర�ధన"
-
-#: ../calendar/gui/e-itip-control.c:1475
-#, fuzzy, c-format
-msgid "%s has replied to a task assignment."
-msgstr "<b>%s</b> కార�య కేటాయింప� జవాబ� ఇచ�చింది"
-
-#: ../calendar/gui/e-itip-control.c:1476
-msgid "Task Reply"
-msgstr "కార�య జవాబ�"
-
-#: ../calendar/gui/e-itip-control.c:1483
-#, fuzzy, c-format
-msgid "%s has canceled a task."
-msgstr "<b>%s</b>ఒక కార�తవ�యాన�ని రద�ద� చేసింది."
-
-#: ../calendar/gui/e-itip-control.c:1484
-msgid "Task Cancelation"
-msgstr "కర�తవ�యం రద�ద�"
-
-#: ../calendar/gui/e-itip-control.c:1495
-msgid "Bad Task Message"
-msgstr "చెడ�డ కార�య సందేశం"
-
-#: ../calendar/gui/e-itip-control.c:1519
-#, fuzzy, c-format
-msgid "%s has published free/busy information."
-msgstr "<b>%s</b> తీరక/తీరకలేద� సమాచారాన�ని ప�రచ�రించ�"
-
-#: ../calendar/gui/e-itip-control.c:1520
-msgid "Free/Busy Information"
-msgstr "తీరక/తీరకలేద� సమాచారం"
-
-#: ../calendar/gui/e-itip-control.c:1524
-#, fuzzy, c-format
-msgid "%s requests your free/busy information."
-msgstr "<b>%s</b> తీరక/తీరకలేద� సమాచారాన�ని కోర�త�ంది"
-
-#: ../calendar/gui/e-itip-control.c:1525
-msgid "Free/Busy Request"
-msgstr "తీరక/తీరకలేద� కోరండి"
-
-#: ../calendar/gui/e-itip-control.c:1529
-#, fuzzy, c-format
-msgid "%s has replied to a free/busy request."
-msgstr "<b>%s</b> తీరక/తీరకలేద� కోరికక� జవాబ� ఇచ�చింది"
-
-#: ../calendar/gui/e-itip-control.c:1530
-msgid "Free/Busy Reply"
-msgstr "తీరక/తీరకలేద� జవాబ�"
-
-#: ../calendar/gui/e-itip-control.c:1535
-msgid "Bad Free/Busy Message"
-msgstr "తీరక/తీరకలేద� చెడ�డ సందేశం"
-
-#: ../calendar/gui/e-itip-control.c:1611
-msgid "The message does not appear to be properly formed"
-msgstr "సందేశం సరిగ�గ �ర�పర�చినట�ట�లేద�"
-
-#: ../calendar/gui/e-itip-control.c:1670
-msgid "The message contains only unsupported requests."
-msgstr "సహకారం లేని కోరికల� మాత�రమే సందేశం లో ఉన�నాయి"
-
-#: ../calendar/gui/e-itip-control.c:1703
-msgid "The attachment does not contain a valid calendar message"
-msgstr "అన�బంధం లో వర�తించ� క�యాలెండర� సందేశాల� లేవ�"
-
-#: ../calendar/gui/e-itip-control.c:1741
-msgid "The attachment has no viewable calendar items"
-msgstr "అన�బంధం లో చూడదగ�గ క�యాలెండర� అంశాల� లేవ�"
-
-#: ../calendar/gui/e-itip-control.c:1983
-msgid "Update complete\n"
-msgstr "తాజాపర�చ�ట పూర�తియింది\n"
-
-#: ../calendar/gui/e-itip-control.c:2017
-msgid "Object is invalid and cannot be updated\n"
-msgstr "అంశం వర�తించద� కన�క తాజాపర�చ�ట సాధ�యపడద�\n"
-
-#: ../calendar/gui/e-itip-control.c:2035
-msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "ఈ సమాధానం వర�తమాన జవాబ�దార�నిన�ండి రాలేద�. జవాబ�దార�నిగా జోడించండి?"
-
-#: ../calendar/gui/e-itip-control.c:2053
-msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "వర�తించని స�థితి కారణంగా జవాబ�దార�ని స�థితి తాజాపరచబడలేద�!\n"
-
-#: ../calendar/gui/e-itip-control.c:2077
-msgid "Attendee status updated\n"
-msgstr "జవాబ�దార�ని స�థితి తాజాపరచబడినది\n"
-
-#: ../calendar/gui/e-itip-control.c:2084
-#: ../plugins/itip-formatter/itip-formatter.c:1421
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "అంశం లేనంద�న జవాబ�దార�ని స�థితి తాజాపరచబడలేద�"
-
-#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
-msgid "Item sent!\n"
-msgstr "అంశం పంపబడినది!\n"
-
-#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
-msgid "The item could not be sent!\n"
-msgstr "అంశాన�ని పంపిచలేకపోయింది!\n"
-
-#: ../calendar/gui/e-itip-control.c:2273
-msgid "Choose an action:"
-msgstr "క�రియన� ఎంచ�కోండ:"
-
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2302
-#: ../calendar/gui/e-meeting-list-view.c:582
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: ../calendar/gui/e-itip-control.c:2342
-msgid "Update"
-msgstr "తాజా పర�చ�"
-
-#: ../calendar/gui/e-itip-control.c:2366
-#: ../plugins/groupwise-features/gw-ui.c:331
-msgid "Accept"
-msgstr "ఆమోదించ�"
-
-#: ../calendar/gui/e-itip-control.c:2367
-msgid "Tentatively accept"
-msgstr "తాత�కాలికంగా ఆమొదించ�"
-
-#: ../calendar/gui/e-itip-control.c:2368
-#: ../plugins/groupwise-features/gw-ui.c:345
-msgid "Decline"
-msgstr "తిరస�కరించ�"
-
-#: ../calendar/gui/e-itip-control.c:2393
-msgid "Send Free/Busy Information"
-msgstr "తీరిక/తీరికలేద� సమాచారాన�ని పంప�"
-
-#: ../calendar/gui/e-itip-control.c:2417
-msgid "Update respondent status"
-msgstr "సమాధనం ఇచ�చెవారి స�ధితిని తాజాపర�చ�"
-
-#: ../calendar/gui/e-itip-control.c:2441
-msgid "Send Latest Information"
-msgstr "తాజా సమాచారాన�ని పంప�"
-
-#: ../calendar/gui/e-itip-control.c:2465
-#: ../modules/mail/e-mail-shell-view-actions.c:976
-#: ../widgets/misc/e-activity-proxy.c:298
-msgid "Cancel"
-msgstr "రద�ద�"
-
-#: ../calendar/gui/e-itip-control.ui.h:1
-msgid "--to--"
-msgstr "--క�--"
-
-#: ../calendar/gui/e-itip-control.ui.h:2
-msgid "Calendar Message"
-msgstr "క�యాలెండర� సందేశం"
-
-#: ../calendar/gui/e-itip-control.ui.h:3
-msgid "Date:"
-msgstr "తారీఖ�:"
-
-#: ../calendar/gui/e-itip-control.ui.h:5
-msgid "Loading Calendar"
-msgstr "క�యాలెండర� న� నింప�త�ంది"
-
-#: ../calendar/gui/e-itip-control.ui.h:6
-msgid "Loading calendar..."
-msgstr "క�యాలెండర� న� నింప�త�ంది..."
-
-#: ../calendar/gui/e-itip-control.ui.h:7
-msgid "Organizer:"
-msgstr "నిర�వాహక�డ�:"
-
-#: ../calendar/gui/e-itip-control.ui.h:8
-msgid "Server Message:"
-msgstr "సేవిక సందేశం:"
-
 #: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "అధ�యక�షవర�య�ల�"
@@ -5332,148 +4194,174 @@ msgstr "ఇచ�ఛాపూర�వక పాల�గొన�వార�"
 msgid "Resources"
 msgstr "వనర�ల�"
 
-#: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../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
 msgid "Individual"
 msgstr "స�వతంత�రంగా"
 
-#: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
+#: ../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
 msgid "Group"
 msgstr "గ�రూప�"
 
-#: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/print.c:970
+#: ../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
 msgid "Resource"
 msgstr "వనర�"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/print.c:971
+#: ../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
 msgid "Room"
 msgstr "గది"
 
-#: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/print.c:985
+#: ../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
 msgid "Chair"
 msgstr "అధ�యక�ష�ల�"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../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
 msgid "Required Participant"
 msgstr "పాల�గొన�వార� కావాలి"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
-#: ../calendar/gui/print.c:987
+#: ../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
 msgid "Optional Participant"
 msgstr "ఇచ�ఛాపూర�వకంగా పాల�గొన�వార�"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/print.c:988
+#: ../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
 msgid "Non-Participant"
 msgstr "పాల�గొన�వార�-కాద�"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../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:1060
 msgid "Needs Action"
 msgstr "క�రియ అవసరం"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:537
+#: ../calendar/gui/e-meeting-list-view.c:578
 msgid "Attendee                          "
 msgstr "హాజరైనవ�యక�తి                          "
 
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:623
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
 msgid "In Process"
 msgstr "క�రమంలొఉన�న"
 
+#: ../calendar/gui/e-meeting-store.c:1876
+#, c-format
+msgid "Enter password to access free/busy information on server %s as user %s"
+msgstr ""
+"సేవిక %s పైన వాడ�కరి %s వలె ఖాళీగా/వత�తిడిగా వ�న�న సమాచారం యాక�సెస� చేయ�టక� "
+"సంకేతపదం ప�రవేశపెట�ట�"
+
+#: ../calendar/gui/e-meeting-store.c:1886
+#, c-format
+msgid "Failure reason: %s"
+msgstr "వైఫల�య కారణం: %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
+msgid "Enter password"
+msgstr "రహస�య పదమ�న� ప�రవేశపెట�టండి"
+
 #. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2376
+#. * %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,·%B·%d,·%Y"
 
 #. 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:462
-#: ../calendar/gui/e-meeting-time-sel.c:2407
+#. * %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·%m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:466
+#. * %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:453
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:548
 msgid "Out of Office"
 msgstr "కార�యాలయం న�ండి బయటక�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "No Information"
 msgstr "సమాచారం లేద�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:585
 msgid "O_ptions"
 msgstr "ఇచ�ఛాపూర�వకాల�(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:617
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _only working hours"
 msgstr "పనికాలాన�ని మాత�రమే చూపించ�(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:628
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "Show _zoomed out"
 msgstr "జూమ� తగ�గించ�ట చూప�(_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:644
+#: ../calendar/gui/e-meeting-time-sel.c:630
 msgid "_Update free/busy"
 msgstr "తీరిక/తీరికలేద� తాజాపర�చ�(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:659
+#: ../calendar/gui/e-meeting-time-sel.c:645
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:677
+#: ../calendar/gui/e-meeting-time-sel.c:663
 msgid "_Autopick"
 msgstr "స�వయంఎంపిక(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:692
+#: ../calendar/gui/e-meeting-time-sel.c:678
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:710
+#: ../calendar/gui/e-meeting-time-sel.c:696
 msgid "_All people and resources"
 msgstr "అన�ని వనర�ల� మరియ� ప�రజల�(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:720
+#: ../calendar/gui/e-meeting-time-sel.c:706
 msgid "All _people and one resource"
 msgstr "ప�రజలందర� మరియ� ఒక�క వనర�(_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:730
+#: ../calendar/gui/e-meeting-time-sel.c:716
 msgid "_Required people"
 msgstr "ప�రజల� కావాలి(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:739
+#: ../calendar/gui/e-meeting-time-sel.c:725
 msgid "Required people and _one resource"
 msgstr "ప�రజల� మరియ� ఒక�క వనర� కావాలి(_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:785
+#: ../calendar/gui/e-meeting-time-sel.c:774
 msgid "_Start time:"
 msgstr "ప�రారంభ సమయం(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:822
+#: ../calendar/gui/e-meeting-time-sel.c:814
 msgid "_End time:"
 msgstr "సమయాంతం(_E):"
 
@@ -5501,171 +4389,163 @@ msgstr "భాష"
 msgid "Member"
 msgstr "సభ�య�డ�"
 
-#: ../calendar/gui/e-memo-table.c:412
+#: ../calendar/gui/e-memo-table.c:420
 #: ../modules/calendar/e-cal-shell-content.c:473
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:431
+#: ../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:458
 msgid "Memos"
 msgstr "మెమోస�"
 
-#: ../calendar/gui/e-memo-table.c:490 ../calendar/gui/e-task-table.c:707
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:733
 msgid "* No Summary *"
 msgstr "* సంక�షిప�తం లేద� *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:575 ../calendar/gui/e-task-table.c:787
+#: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:817
 msgid "Start: "
 msgstr "ప�రారంభించ�: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:594 ../calendar/gui/e-task-table.c:805
+#: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:835
 msgid "Due: "
 msgstr "మిగిలివ�న�న: "
 
-#: ../calendar/gui/e-memo-table.c:710
-#, fuzzy
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Cut selected memos to the clipboard"
-msgstr "ఎంపికచేసిన సందేశాలన� క�లిప�‌బోర�డ�క� కత�తిరించ�మ�"
+msgstr "ఎంపికచేసిన మెమోలన� క�లిప�‌బోర�డ�క� కత�తిరించ�మ�"
 
-#: ../calendar/gui/e-memo-table.c:716
-#, fuzzy
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Copy selected memos to the clipboard"
-msgstr "క�లిప� పలకానికి ఎంచ�క�న�న సందేశాలన� నకల� తీయ�మ�"
+msgstr "క�లిప� పలకానికి ఎంచ�క�న�న మెమోలన� నకల� తీయ�మ�"
 
-#: ../calendar/gui/e-memo-table.c:722
-#, fuzzy
+#: ../calendar/gui/e-memo-table.c:738
 msgid "Paste memos from the clipboard"
-msgstr "క�లిప�‌బోర�డ�న�ండి మెమోన� అతికించ�మ�"
+msgstr "క�లిప�‌బోర�డ�న�ండి మెమోలన� అతికించ�మ�"
 
-#: ../calendar/gui/e-memo-table.c:728
-#: ../modules/calendar/e-memo-shell-view-actions.c:566
+#: ../calendar/gui/e-memo-table.c:744
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "Delete selected memos"
 msgstr "ఎంపికచేసిన మెమోన� తొలగించ�మ�"
 
-#: ../calendar/gui/e-memo-table.c:734
-#, fuzzy
+#: ../calendar/gui/e-memo-table.c:750
 msgid "Select all visible memos"
-msgstr "కనపడే సందేశాలన�నిటిని ఎంచ�కొన�మ�"
+msgstr "కనపడే మెమోలన�నిటనీ ఎంచ�కొన�మ�"
 
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "మెమోన� జతచేయ�టక� నొక�క�మ�"
 
 #. 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:539
-#, fuzzy, c-format
+#: ../calendar/gui/e-task-table.c:555
+#, c-format
 msgid "%d%%"
-msgstr "%d %b %Y"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2052
-#: ../calendar/importers/icalendar-importer.c:81
-#: ../calendar/importers/icalendar-importer.c:828
+#: ../calendar/gui/e-task-table.c:652 ../calendar/gui/print.c:2273
+#: ../calendar/importers/icalendar-importer.c:85
+#: ../calendar/importers/icalendar-importer.c:1043
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
 #: ../modules/calendar/e-cal-shell-content.c:434
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:429
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+#: ../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:456
 msgid "Tasks"
 msgstr "కర�తవ�యాల�"
 
-#: ../calendar/gui/e-task-table.c:933
-#, fuzzy
+#: ../calendar/gui/e-task-table.c:968
 msgid "Cut selected tasks to the clipboard"
-msgstr "ఎంపికచేసిన పాఠ�యమ�న� క�లిప�‌బోర�డ�క� కత�తిరించ�మ�"
+msgstr "ఎంపికచేసిన కర�తవ�యాలన� క�లిప�‌బోర�డ�నక� కత�తిరించ�మ�"
 
-#: ../calendar/gui/e-task-table.c:939
-#, fuzzy
+#: ../calendar/gui/e-task-table.c:974
 msgid "Copy selected tasks to the clipboard"
-msgstr "ఎంపికైన పాఠ�యాన�ని క�లిప� పలకాన�ని నకల� తీయ�మ�"
+msgstr "ఎంపికైన కర�తవ�యాలన� క�లిప� పలకాన�ని నకల� తీయ�మ�"
 
-#: ../calendar/gui/e-task-table.c:945
+#: ../calendar/gui/e-task-table.c:980
 msgid "Paste tasks from the clipboard"
 msgstr "క�లిప� పలకం న�ండి కర�తవ�యాలన� అతికించ�మ�"
 
-#: ../calendar/gui/e-task-table.c:951
-#: ../modules/calendar/e-task-shell-view-actions.c:690
+#: ../calendar/gui/e-task-table.c:986
+#: ../modules/calendar/e-task-shell-view-actions.c:710
 msgid "Delete selected tasks"
 msgstr "ఎంచ�క�న�న కర�తవ�యాలన� తొలగించ�మ�"
 
-#: ../calendar/gui/e-task-table.c:957
-#, fuzzy
+#: ../calendar/gui/e-task-table.c:992
 msgid "Select all visible tasks"
-msgstr "కనపడే సందేశాలన�నిటిని ఎంచ�కొన�మ�"
+msgstr "కనపడే కర�తవ�యాలన�నిటినీ ఎంచ�కొన�మ�"
 
 #: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "సమయక�షేత�రం న� ఎంపికచేయ�మ�"
 
 #. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
+#. * 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
 msgid "%d %B"
 msgstr "%d·%B"
 
-#: ../calendar/gui/ea-cal-view-event.c:286
-msgid "It has alarms."
-msgstr "హెచ�చరిక జారిచెయ� సౌలభ�యం కలద�"
+#: ../calendar/gui/ea-cal-view-event.c:290
+#| msgid "It has recurrences."
+msgid "It has reminders."
+msgstr "ఇది అలారమ�లన� కలిగివ�ంది."
 
-#: ../calendar/gui/ea-cal-view-event.c:289
+#: ../calendar/gui/ea-cal-view-event.c:293
 msgid "It has recurrences."
 msgstr "ప�నరావృతి కావటం ఉన�నది"
 
-#: ../calendar/gui/ea-cal-view-event.c:292
+#: ../calendar/gui/ea-cal-view-event.c:296
 msgid "It is a meeting."
 msgstr "అది ఒక సమావేశం."
 
-#: ../calendar/gui/ea-cal-view-event.c:298
+#: ../calendar/gui/ea-cal-view-event.c:303
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "క�యాలెండర� ఘటన:%s సంక�షిప�తమైనది"
 
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:306
 msgid "Calendar Event: It has no summary."
 msgstr "క�యాలెండర� ఘటన : దీనికి సంక�షిప�తమ�లేద�"
 
-#: ../calendar/gui/ea-cal-view-event.c:322
+#: ../calendar/gui/ea-cal-view-event.c:328
 msgid "calendar view event"
 msgstr "క�యాలెండర� దర�శన ఘటన"
 
-#: ../calendar/gui/ea-cal-view-event.c:551
+#: ../calendar/gui/ea-cal-view-event.c:557
 msgid "Grab Focus"
 msgstr "దృష�టిని లాగ�మ�"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:315
 msgid "New Appointment"
 msgstr "కొత�త నియామకం"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:316
 msgid "New All Day Event"
 msgstr "కొత�త  పూర�తి రోజ� ఘటన"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:317
 msgid "New Meeting"
 msgstr "కొత�త సమావేశం"
 
-#: ../calendar/gui/ea-cal-view.c:307
+#: ../calendar/gui/ea-cal-view.c:318
 msgid "Go to Today"
 msgstr "ఈ రోజ� క� వెళ�ళ�"
 
-#: ../calendar/gui/ea-cal-view.c:308
+#: ../calendar/gui/ea-cal-view.c:319
 msgid "Go to Date"
 msgstr "తారీఖ� క� వెళ�ళ�"
 
-#: ../calendar/gui/ea-day-view-main-item.c:308
-#: ../calendar/gui/ea-week-view-main-item.c:340
+#: ../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 "ప�రస�త�త సమయ విస�తృతిని దర�శించి ఎంచ�కొనే పట�టిక"
 
-#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5674,14 +4554,14 @@ msgstr[1] "%d ఘటనలన� కలిగి ఉంది"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:155 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:154
 msgid "It has no events."
 msgstr "దీనికి � ఘటనల� లేవ�"
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:162
+#: ../calendar/gui/ea-day-view.c:163
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "పనివారమ� దర�శనం: %s. %s"
@@ -5689,170 +4569,106 @@ msgstr "పనివారమ� దర�శనం: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:168
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "రోజ� దర�శనం: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:202
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for a work week"
 msgstr "ఒక వారానికి క�యాలెండర� దర�శనం"
 
-#: ../calendar/gui/ea-day-view.c:204
+#: ../calendar/gui/ea-day-view.c:205
 msgid "calendar view for one or more days"
 msgstr "ఒకటి లేదా కొన�ని రోజ�లకి క�యాలెండర� దర�శనం"
 
-#: ../calendar/gui/ea-gnome-calendar.c:48
-#: ../calendar/gui/ea-gnome-calendar.c:56
-#: ../calendar/importers/icalendar-importer.c:860
+#: ../calendar/gui/ea-gnome-calendar.c:50
+#: ../calendar/gui/ea-gnome-calendar.c:58
+#: ../calendar/importers/icalendar-importer.c:1077
 msgid "Gnome Calendar"
 msgstr "గ�నోమ� క�యాలెండర�"
 
-#: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1010
+#: ../calendar/gui/ea-gnome-calendar.c:201
+#: ../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:204
-#: ../calendar/gui/ea-gnome-calendar.c:209
+#: ../calendar/gui/ea-gnome-calendar.c:206
 #: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../modules/calendar/e-cal-shell-view-private.c:1017
-#: ../modules/calendar/e-cal-shell-view-private.c:1023
-#: ../modules/calendar/e-cal-shell-view-private.c:1026
+#: ../calendar/gui/ea-gnome-calendar.c:213
+#: ../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 %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:228
-#: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../calendar/gui/ea-gnome-calendar.c:240
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../calendar/gui/ea-gnome-calendar.c:236
 #: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../modules/calendar/e-cal-shell-view-private.c:1043
-#: ../modules/calendar/e-cal-shell-view-private.c:1054
-#: ../modules/calendar/e-cal-shell-view-private.c:1061
-#: ../modules/calendar/e-cal-shell-view-private.c:1064
+#: ../calendar/gui/ea-gnome-calendar.c:244
+#: ../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 "%d %b %Y"
 
-#: ../calendar/gui/ea-jump-button.c:147
+#: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "దూక� బటన�"
 
-#: ../calendar/gui/ea-jump-button.c:156
+#: ../calendar/gui/ea-jump-button.c:159
 msgid "Click here, you can find more events."
 msgstr "ఇక�కడ  నొక�కండి, మీక� మరిన�ని ఘటనల� కనబడతాయి"
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:159
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "నెల దర�శనం: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:163
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "వారప� దర�శనం: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:195
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for a month"
 msgstr "ఒక నెలక� క�యాలెండర� దర�శనం"
 
-#: ../calendar/gui/ea-week-view.c:197
+#: ../calendar/gui/ea-week-view.c:199
 msgid "calendar view for one or more weeks"
 msgstr "ఒకటి లేదా మరిన�ని వారాలకి క�యాలెండర� దర�శనం"
 
-#: ../calendar/gui/gnome-cal.c:2287
+#: ../calendar/gui/gnome-cal.c:2250
 msgid "Purging"
 msgstr "శాశ�వతంగా తొలగించ�త�ంది"
 
-#: ../calendar/gui/goto-dialog.ui.h:1
-msgid "April"
-msgstr ""
-
-#: ../calendar/gui/goto-dialog.ui.h:2
-msgid "August"
-msgstr ""
-
-#: ../calendar/gui/goto-dialog.ui.h:3
-#, fuzzy
-msgid "December"
-msgstr "సభ�య�డ�"
-
-#: ../calendar/gui/goto-dialog.ui.h:4
-msgid "February"
-msgstr ""
-
-#: ../calendar/gui/goto-dialog.ui.h:5
-msgid "January"
-msgstr ""
-
-#: ../calendar/gui/goto-dialog.ui.h:6
-msgid "July"
-msgstr ""
-
-#: ../calendar/gui/goto-dialog.ui.h:7
-#, fuzzy
-msgid "June"
-msgstr "నిరర�దకమైన"
-
-#: ../calendar/gui/goto-dialog.ui.h:8
-#, fuzzy
-msgid "March"
-msgstr "శోధించ�"
-
-#: ../calendar/gui/goto-dialog.ui.h:9
-#, fuzzy
-msgid "May"
-msgstr "సోమవారం"
-
-#: ../calendar/gui/goto-dialog.ui.h:10
-#, fuzzy
-msgid "November"
-msgstr "సభ�య�డ�"
-
-#: ../calendar/gui/goto-dialog.ui.h:11
-#, fuzzy
-msgid "October"
-msgstr "ఇతరమ�ల�"
-
-#: ../calendar/gui/goto-dialog.ui.h:12
-msgid "Select Date"
-msgstr "తారీఖ� గ�ర�తించ�"
-
-#: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1312
-msgid "Select _Today"
-msgstr "ఈ రోజ�న� ఎంచ�కొన�మ�(_T)"
-
-#: ../calendar/gui/goto-dialog.ui.h:14
-#, fuzzy
-msgid "September"
-msgstr "సభ�య�డ�"
-
-#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
-#: ../calendar/gui/itip-utils.c:551
+#: ../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 "వ�యవస�ధీకరణ చేసేదానిని అమరచాలి"
 
-#: ../calendar/gui/itip-utils.c:451
+#: ../calendar/gui/itip-utils.c:558
 msgid "At least one attendee is necessary"
 msgstr "కనీసం ఒక జవాబ�దార�డ� అవసరం"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:755 ../calendar/gui/itip-utils.c:916
 msgid "Event information"
 msgstr "ఘటన సమాచారం"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
+#: ../calendar/gui/itip-utils.c:758 ../calendar/gui/itip-utils.c:919
 msgid "Task information"
 msgstr "కార�తవ�య సమాచారం"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:761 ../calendar/gui/itip-utils.c:922
 msgid "Memo information"
 msgstr "మెమో సమాచారం"
 
-#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
+#: ../calendar/gui/itip-utils.c:764 ../calendar/gui/itip-utils.c:940
 msgid "Free/Busy information"
 msgstr "తీరిక/తీరికలేద� సమాచారం"
 
-#: ../calendar/gui/itip-utils.c:644
+#: ../calendar/gui/itip-utils.c:767
 msgid "Calendar information"
 msgstr "క�యాలెండర� సమాచారం"
 
@@ -5860,7 +4676,7 @@ msgstr "క�యాలెండర� సమాచారం"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:678
+#: ../calendar/gui/itip-utils.c:804
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "ఆమొదించబడినది"
@@ -5869,7 +4685,7 @@ msgstr "ఆమొదించబడినది"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:685
+#: ../calendar/gui/itip-utils.c:811
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "ప�రయోగాత�మకంగా ఆమొదించబడినది"
@@ -5881,7 +4697,7 @@ msgstr "à°ªà±�రయోగాతà±�మకంగా ఆమొదించబడà°
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
+#: ../calendar/gui/itip-utils.c:818 ../calendar/gui/itip-utils.c:866
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "తిరస�కరించబడినది"
@@ -5890,7 +4706,7 @@ msgstr "తిరస�కరించబడినది"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:699
+#: ../calendar/gui/itip-utils.c:825
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ప�రాతినిధ�యంవహించే"
@@ -5898,7 +4714,7 @@ msgstr "ప�రాతినిధ�యంవహించే"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:712
+#: ../calendar/gui/itip-utils.c:838
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "నవీకరించబడిన"
@@ -5906,7 +4722,7 @@ msgstr "నవీకరించబడిన"
 #. 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:719
+#: ../calendar/gui/itip-utils.c:845
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "రద�ద�చేయి"
@@ -5914,7 +4730,7 @@ msgstr "రద�ద�చేయి"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:726
+#: ../calendar/gui/itip-utils.c:852
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ప�నర�వికాసం"
@@ -5922,251 +4738,252 @@ msgstr "ప�నర�వికాసం"
 #. 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:733
+#: ../calendar/gui/itip-utils.c:859
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "ప�రతీకూల-ప�రదిపాదన"
 
-#: ../calendar/gui/itip-utils.c:803
+#: ../calendar/gui/itip-utils.c:937
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "తీరిక/తీరికలేద� సమాచారం(%s to %s)"
 
-#: ../calendar/gui/itip-utils.c:811
+#: ../calendar/gui/itip-utils.c:945
 msgid "iCalendar information"
 msgstr "iక�యాలెండర� సమాచారం"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:970
 msgid "Unable to book a resource, the new event collides with some other."
-msgstr ""
+msgstr "వనర�న� బ�క� చేయలేక పోయింది, కొత�త ఘటన వేరే దానితో విభేదిస�తోంది."
 
-#: ../calendar/gui/itip-utils.c:833
+#: ../calendar/gui/itip-utils.c:974
 msgid "Unable to book a resource, error: "
-msgstr ""
+msgstr "వనర�న� బ�క� చేయలేక పోయింది, దోషం:"
 
-#: ../calendar/gui/itip-utils.c:986
+#: ../calendar/gui/itip-utils.c:1137
 msgid "You must be an attendee of the event."
 msgstr "మీర� ఘటన హాజరవ�వాలి"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:581
 msgid "1st"
 msgstr "1à°µ"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:581
 msgid "2nd"
 msgstr "2à°µ"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:581
 msgid "3rd"
 msgstr "౩వ"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:581
 msgid "4th"
 msgstr "4à°µ"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:581
 msgid "5th"
 msgstr "5à°µ"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:582
 msgid "6th"
 msgstr "6à°µ"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:582
 msgid "7th"
 msgstr "7à°µ"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:582
 msgid "8th"
 msgstr "8à°µ"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:582
 msgid "9th"
 msgstr "9à°µ"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:582
 msgid "10th"
 msgstr "10à°µ"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:583
 msgid "11th"
 msgstr "11à°µ"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:583
 msgid "12th"
 msgstr "12à°µ"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:583
 msgid "13th"
 msgstr "13à°µ"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:583
 msgid "14th"
 msgstr "14à°µ"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:583
 msgid "15th"
 msgstr "15à°µ"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:584
 msgid "16th"
 msgstr "16à°µ"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:584
 msgid "17th"
 msgstr "17à°µ"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:584
 msgid "18th"
 msgstr "18à°µ"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:584
 msgid "19th"
 msgstr "19à°µ"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:584
 msgid "20th"
 msgstr "20à°µ"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:585
 msgid "21st"
 msgstr "21à°µ"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:585
 msgid "22nd"
 msgstr "22à°µ"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:585
 msgid "23rd"
 msgstr "23à°µ"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:585
 msgid "24th"
 msgstr "24à°µ"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:585
 msgid "25th"
 msgstr "25à°µ"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:586
 msgid "26th"
 msgstr "26à°µ"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:586
 msgid "27th"
 msgstr "27à°µ"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:586
 msgid "28th"
 msgstr "28à°µ"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:586
 msgid "29th"
 msgstr "29à°µ"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:586
 msgid "30th"
 msgstr "30à°µ"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:587
 msgid "31st"
 msgstr "31à°µ"
 
-#: ../calendar/gui/print.c:593
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:644
 msgid "Su"
 msgstr "ఆది"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:644
 msgid "Mo"
 msgstr "సోమ"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:644
 msgid "Tu"
 msgstr "మం"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:644
 msgid "We"
 msgstr "బ�ధ"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:645
 msgid "Th"
 msgstr "గ�ర�"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:645
 msgid "Fr"
 msgstr "శ�క�ర"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:645
 msgid "Sa"
 msgstr "శని"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:2429
+#: ../calendar/gui/print.c:3139
 msgid " to "
 msgstr " దానికి "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:3149
 msgid " (Completed "
 msgstr " (పూర�తి చేయబడ�డ "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:2441
+#: ../calendar/gui/print.c:3155
 msgid "Completed "
 msgstr "పూర�తి చేయబడ�డ "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:2449
+#: ../calendar/gui/print.c:3165
 msgid " (Due "
 msgstr " (అర�హమైంది"
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:2454
+#: ../calendar/gui/print.c:3172
 msgid "Due "
 msgstr "అర�హమైంది"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:3337
 #, c-format
 msgid "Summary: %s"
 msgstr "తాత�పర�యం: %s"
 
-#: ../calendar/gui/print.c:2639
+#: ../calendar/gui/print.c:3364
 msgid "Attendees: "
 msgstr "హాజరైనవార�: "
 
-#: ../calendar/gui/print.c:2682
+#: ../calendar/gui/print.c:3407
 #, c-format
 msgid "Status: %s"
 msgstr "స�స�థితి: %s"
 
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:3422
 #, c-format
 msgid "Priority: %s"
 msgstr "ప�రాధాన�యం: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:3440
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "%i: శాతం పూర�తియింది"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:3451
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2739
+#: ../calendar/gui/print.c:3464
 #, c-format
 msgid "Categories: %s"
 msgstr "%s: వర�గమ�ల�"
 
-#: ../calendar/gui/print.c:2750
+#: ../calendar/gui/print.c:3475
 msgid "Contacts: "
 msgstr "చిర�నామాల�: "
 
@@ -6175,6 +4992,10 @@ msgstr "చిర�నామాల�: "
 msgid "% Completed"
 msgstr "u% పూర�తైంది"
 
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Cancelled"
+msgstr "రద�ద�చేయబడినది"
+
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "ప�రోగమనంలొ వ�న�న"
@@ -6187,120 +5008,115 @@ msgstr "దీని కన�నా పెద�దది"
 msgid "is less than"
 msgstr "దీని కన�నా చిన�నది"
 
-#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:84
 msgid "Appointments and Meetings"
 msgstr "నియామకాల� మరియ� సమావేశాల�"
 
-#: ../calendar/importers/icalendar-importer.c:350
-#: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../calendar/importers/icalendar-importer.c:435
+#: ../calendar/importers/icalendar-importer.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:2170
 msgid "Opening calendar"
 msgstr "క�యాలెండర�‌న� తెర�చ�చ�న�నది"
 
-#: ../calendar/importers/icalendar-importer.c:493
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "iCalendar files (.ics)"
-msgstr "�క�యాలెండర� దస�త�రంల� (.ics)"
+msgstr "�క�యాలెండర� ఫైల�ల� (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:494
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution iCalendar importer"
 msgstr "ఎవాల�యూషన� iక�యాలెండర� దిగ�మతిదారి"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:674
 msgid "Reminder!"
 msgstr "గ�ర�త�చేయ�నది!"
 
-#: ../calendar/importers/icalendar-importer.c:662
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:758
 msgid "vCalendar files (.vcs)"
-msgstr "విక�యాలెండర� దస�త�రంల�(.vcf)"
+msgstr "vCalendar ఫైళ�ళ� (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:663
+#: ../calendar/importers/icalendar-importer.c:759
 msgid "Evolution vCalendar importer"
 msgstr "ఎవాల�యాషన� vక�యాలెండర� దిగ�మతిదారి"
 
-#: ../calendar/importers/icalendar-importer.c:823
+#: ../calendar/importers/icalendar-importer.c:1038
 msgid "Calendar Events"
 msgstr "క�యాలెండర� ఘటనల�"
 
-#: ../calendar/importers/icalendar-importer.c:861
+#: ../calendar/importers/icalendar-importer.c:1078
 msgid "Evolution Calendar intelligent importer"
 msgstr "ఎవాల�యూషన� క�యాలెండర� ఇంటినిజంట� దిగ�మతిదారి"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1146
+#: ../calendar/importers/icalendar-importer.c:1464
 msgctxt "iCalImp"
 msgid "Meeting"
-msgstr "సమావేశం (_e)"
+msgstr "సమావేశం"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1146
+#: ../calendar/importers/icalendar-importer.c:1464
 msgctxt "iCalImp"
 msgid "Event"
-msgstr "పంపిన"
+msgstr "ఘటన"
 
-#: ../calendar/importers/icalendar-importer.c:929
-#: ../calendar/importers/icalendar-importer.c:1244
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1149
+#: ../calendar/importers/icalendar-importer.c:1465
 msgctxt "iCalImp"
 msgid "Task"
-msgstr "కార�యం"
+msgstr "కర�తవ�యం"
 
-#: ../calendar/importers/icalendar-importer.c:932
-#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1152
+#: ../calendar/importers/icalendar-importer.c:1466
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "మెమో"
 
-#: ../calendar/importers/icalendar-importer.c:941
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1161
 msgctxt "iCalImp"
 msgid "has recurrences"
-msgstr "ప�నరావృతి కావటం ఉన�నది"
+msgstr "ప�నరావృతి  వ�న�నది"
 
-#: ../calendar/importers/icalendar-importer.c:946
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1166
 msgctxt "iCalImp"
 msgid "is an instance"
-msgstr "ఇది మరియ� పూర�వప� ప�రత�యేకస�థితిల�"
+msgstr "ఒక యిన�‌స�టాన�స�"
 
-#: ../calendar/importers/icalendar-importer.c:951
+#: ../calendar/importers/icalendar-importer.c:1171
 #, fuzzy
+#| msgid "Sh_ow a reminder"
 msgctxt "iCalImp"
-msgid "has alarms"
-msgstr "హెచ�చరిక జారిచెయ� సౌలభ�యం కలద�"
+msgid "has reminders"
+msgstr "గ�ర�తిచ�దానిని చూప�మ�(_o)"
 
-#: ../calendar/importers/icalendar-importer.c:956
+#: ../calendar/importers/icalendar-importer.c:1176
 #, fuzzy
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "%s అన�భందమ�"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:969
+#: ../calendar/importers/icalendar-importer.c:1189
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "ప�రజా"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:972
+#: ../calendar/importers/icalendar-importer.c:1192
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "స�వంత"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:975
+#: ../calendar/importers/icalendar-importer.c:1195
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "గోప�యమైన"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:979
+#: ../calendar/importers/icalendar-importer.c:1199
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Classification"
@@ -6308,15 +5124,15 @@ msgstr "వర�గీకరణ"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:984
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../calendar/importers/icalendar-importer.c:1204
+#: ../calendar/importers/icalendar-importer.c:1505
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "తాత�పర�యం"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:990
+#: ../calendar/importers/icalendar-importer.c:1210
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Location"
@@ -6324,72 +5140,72 @@ msgstr "స�థానమ�"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:998
-#: ../calendar/importers/icalendar-importer.c:1280
+#: ../calendar/importers/icalendar-importer.c:1218
+#: ../calendar/importers/icalendar-importer.c:1501
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "ప�రారంభమౌత�ంది"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1009
+#: ../calendar/importers/icalendar-importer.c:1229
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "పూర�వనిర�ణిత"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1021
+#: ../calendar/importers/icalendar-importer.c:1241
 #, fuzzy
 msgctxt "iCalImp"
 msgid "End"
 msgstr "మ�గ�స�త�ంది"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1031
+#: ../calendar/importers/icalendar-importer.c:1251
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "విభాగాల�"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1055
+#: ../calendar/importers/icalendar-importer.c:1275
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "పూర�తిచేయబడిన"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1063
+#: ../calendar/importers/icalendar-importer.c:1283
 #, fuzzy
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1074
-#: ../calendar/importers/icalendar-importer.c:1077
+#: ../calendar/importers/icalendar-importer.c:1294
+#: ../calendar/importers/icalendar-importer.c:1297
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "నిర�వాహక�డ�"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1097
-#: ../calendar/importers/icalendar-importer.c:1100
+#: ../calendar/importers/icalendar-importer.c:1317
+#: ../calendar/importers/icalendar-importer.c:1320
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "హాజరైనవార�"
 
-#: ../calendar/importers/icalendar-importer.c:1114
+#: ../calendar/importers/icalendar-importer.c:1334
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "విశదీకరణ"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1276
+#: ../calendar/importers/icalendar-importer.c:1497
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Type"
@@ -7944,214 +6760,223 @@ msgstr "ఫసిఫిక�/వాల�లిస�"
 msgid "Pacific/Yap"
 msgstr "ఫసిఫిక�/యప�"
 
-#: ../composer/e-composer-actions.c:163
+#: ../composer/e-composer-actions.c:208
 msgid "Save as..."
 msgstr "ఇలా దాయ�..."
 
-#: ../composer/e-composer-actions.c:242
-#: ../widgets/misc/e-attachment-view.c:329
-msgid "Attach a file"
-msgstr "ఒక దస�త�రాన�ని జతపర�చ�మ�"
-
-#: ../composer/e-composer-actions.c:247
-#: ../widgets/misc/e-signature-editor.c:203
+#: ../composer/e-composer-actions.c:296
+#: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "మూయ�మ�(_C)"
 
-#: ../composer/e-composer-actions.c:249
+#: ../composer/e-composer-actions.c:298
 msgid "Close the current file"
-msgstr "ప�రస�త�త దస�త�రాన�ని మూయ�మ�"
+msgstr "ప�రస�త�త ఫైల�న� మూయ�మ�"
 
-#: ../composer/e-composer-actions.c:254
-msgid "_Print..."
-msgstr "మ�ద�రించ�(_P)..."
+#: ../composer/e-composer-actions.c:303
+msgid "New _Message"
+msgstr "కొత�త సందేశం (_M)"
 
-#: ../composer/e-composer-actions.c:261
-msgid "Print Pre_view"
-msgstr "మ�ద�రణ ఉపదర�శనం(_v)"
+#: ../composer/e-composer-actions.c:305
+msgid "Open New Message window"
+msgstr "కొత�త సందేశం విండోన� తెర�వ�మ�"
+
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
+#, fuzzy
+msgid "Configure Evolution"
+msgstr "ఆకృతీకరణ"
 
-#: ../composer/e-composer-actions.c:270
+#: ../composer/e-composer-actions.c:319
 msgid "Save the current file"
-msgstr "ప�రస�త�త దస�త�రాన�ని దాయ�మ�"
+msgstr "ప�రస�త�త ఫైల�న� దాయ�మ�"
 
-#: ../composer/e-composer-actions.c:275
+#: ../composer/e-composer-actions.c:324
 msgid "Save _As..."
 msgstr "ఇలా దాయ�మ�(_A)..."
 
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:326
 msgid "Save the current file with a different name"
-msgstr "ప�రస�త�త దస�త�రాన�ని వేరే పేర�తో దాయ�మ�"
+msgstr "ప�రస�త�త ఫైల�న� వేరే పేర�తో దాయ�మ�"
+
+#: ../composer/e-composer-actions.c:333
+msgid "Character _Encoding"
+msgstr "అక�షర సంకేతరచన (_E)"
+
+#: ../composer/e-composer-actions.c:350
+msgid "_Print..."
+msgstr "మ�ద�రించ�(_P)..."
+
+#: ../composer/e-composer-actions.c:357
+msgid "Print Pre_view"
+msgstr "మ�ద�రణ ఉపదర�శనం(_v)"
 
-#: ../composer/e-composer-actions.c:282
+#: ../composer/e-composer-actions.c:364
 msgid "Save as _Draft"
 msgstr "డ�రాఫ�ట� గా దాయ�మ� (_D)"
 
-#: ../composer/e-composer-actions.c:284
+#: ../composer/e-composer-actions.c:366
 msgid "Save as draft"
 msgstr "డ�రాఫ�ట� గా దాయ�మ�"
 
-#: ../composer/e-composer-actions.c:289 ../composer/e-composer-private.c:293
+#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
 msgid "S_end"
 msgstr "పంపించ�(_e)"
 
-#: ../composer/e-composer-actions.c:291
+#: ../composer/e-composer-actions.c:373
 msgid "Send this message"
 msgstr "ఈ సందేశాన�ని పంప�మ�"
 
-#: ../composer/e-composer-actions.c:296
-msgid "New _Message"
-msgstr "కొత�త సందేశం (_M)"
-
-#: ../composer/e-composer-actions.c:298
-msgid "Open New Message window"
-msgstr "కొత�త సందేశం విండోన� తెర�వ�మ�"
-
-#: ../composer/e-composer-actions.c:305
-msgid "Character _Encoding"
-msgstr "అక�షర సంకేతరచన (_E)"
-
-#: ../composer/e-composer-actions.c:322
+#: ../composer/e-composer-actions.c:381
 msgid "PGP _Encrypt"
 msgstr "PGP ని రహస�యపర�చ�(_E)"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:383
 msgid "Encrypt this message with PGP"
 msgstr "PGP తో ఈ సందెశాన�ని రహస�యపర�చ�"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:389
 msgid "PGP _Sign"
 msgstr "PGP సంతకం(_S)"
 
-#: ../composer/e-composer-actions.c:332
+#: ../composer/e-composer-actions.c:391
 msgid "Sign this message with your PGP key"
 msgstr "మీ PGP మీటతో ఈ సందేశాన�ని సంతకంచేయ�మ�"
 
-#: ../composer/e-composer-actions.c:338
+#: ../composer/e-composer-actions.c:397
+msgid "_Picture Gallery"
+msgstr "చిత�రశాల (_P)"
+
+#: ../composer/e-composer-actions.c:399
+msgid "Show a collection of pictures that you can drag to your message"
+msgstr "మీ సందేశంనక� లాగగల చిత�రాల సమూహం చూప�మ�"
+
+#: ../composer/e-composer-actions.c:405
 msgid "_Prioritize Message"
 msgstr "సందేశాన�ని ప�రాధాన�యపర�చ�(_P)"
 
-#: ../composer/e-composer-actions.c:340
+#: ../composer/e-composer-actions.c:407
 msgid "Set the message priority to high"
 msgstr "సందేశ ప�రాధాన�యతన� ఎక�క�వగా అమర�చ�మ�"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:413
 msgid "Re_quest Read Receipt"
 msgstr "చదివినదాని రశీద�న� అభ�యర�దించ� (_q)"
 
-#: ../composer/e-composer-actions.c:348
+#: ../composer/e-composer-actions.c:415
 msgid "Get delivery notification when your message is read"
 msgstr "మీ సందేశం చదవబడిన తర�వాత  చేరినట�ట� తాఖీద� పొంద�మ�"
 
-#: ../composer/e-composer-actions.c:354
+#: ../composer/e-composer-actions.c:421
 msgid "S/MIME En_crypt"
 msgstr "S/MIME ని రహస�యపర�చ�(_c)"
 
-#: ../composer/e-composer-actions.c:356
+#: ../composer/e-composer-actions.c:423
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "మీ S/MIME ఎన�క�రిప�షన� దృవీకరణపత�రం తో ఈ సందేశంన� ఎన�క�రిప�ట�చేయ�మ�"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:429
 msgid "S/MIME Sig_n"
 msgstr "S/MIME సంతకం(_n)"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:431
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "మీ S/MIME సంతకం దృవీకరణపత�రం తో ఈ సందేశంన� సంతకంచేయ�మ�"
 
-#: ../composer/e-composer-actions.c:370
+#: ../composer/e-composer-actions.c:437
 msgid "_Bcc Field"
 msgstr "_Bcc క�షేత�రమ�"
 
-#: ../composer/e-composer-actions.c:372
+#: ../composer/e-composer-actions.c:439
 msgid "Toggles whether the BCC field is displayed"
 msgstr "BCC క�షేత�రం ప�రదర�శించబడితే మార�స�త�ంది"
 
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:445
 msgid "_Cc Field"
 msgstr "_Cc క�షేత�రమ�"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:447
 msgid "Toggles whether the CC field is displayed"
 msgstr "CC క�షేత�రం ప�రదర�శించబడితే మార�స�త�ంది"
 
-#: ../composer/e-composer-actions.c:386
+#: ../composer/e-composer-actions.c:453
 msgid "_Reply-To Field"
 msgstr "క�షేత�రానికి సమాధానం(_R)"
 
-#: ../composer/e-composer-actions.c:388
+#: ../composer/e-composer-actions.c:455
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "వీరికి-ప�రత�య�త�తరమ� క�షేత�రం ప�రదర�శితమైతే మార�మ�"
 
-#: ../composer/e-composer-actions.c:431
+#: ../composer/e-composer-actions.c:514
 msgid "Save Draft"
 msgstr "డ�రాఫ�ట� న� దాయ�మ�"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the recipients of the message"
 msgstr "సందేశం యొక�క స�వీకరణదార�లన� ప�రవేశపెట�టండి"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "సందేశం యొక�క నకల�న� పొంద� వారి చిర�నామాలన� ప�రవేశపెట�టండి"
 
-#: ../composer/e-composer-header-table.c:46
+#: ../composer/e-composer-header-table.c:45
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr ""
-"సందేశం యొక�క నకల�న� స�వీకరణదార�ల జాబితానంద� కనబడక�ండా తీస�క�నే వారి చిర�నామాలన� ప�రవేశపెట�టండి"
+"సందేశం యొక�క నకల�న� స�వీకరణదార�ల జాబితానంద� కనబడక�ండా తీస�క�నే వారి "
+"చిర�నామాలన� ప�రవేశపెట�టండి"
 
-#: ../composer/e-composer-header-table.c:1005
+#: ../composer/e-composer-header-table.c:1021
 msgid "Fr_om:"
 msgstr "న�ండి(_o):"
 
-#: ../composer/e-composer-header-table.c:1014
+#: ../composer/e-composer-header-table.c:1030
 msgid "_Reply-To:"
 msgstr "క�-ప�రత�య�త�తరమ�(_R):"
 
-#: ../composer/e-composer-header-table.c:1018
+#: ../composer/e-composer-header-table.c:1034
 msgid "_To:"
 msgstr "క�(_T):"
 
-#: ../composer/e-composer-header-table.c:1023
+#: ../composer/e-composer-header-table.c:1039
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:1028
+#: ../composer/e-composer-header-table.c:1044
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:1033
+#: ../composer/e-composer-header-table.c:1049
 msgid "_Post To:"
 msgstr "క� పోస�ట� చేయ�మ�(_P):"
 
-#: ../composer/e-composer-header-table.c:1037
+#: ../composer/e-composer-header-table.c:1053
 msgid "S_ubject:"
 msgstr "సంగతి(_u):"
 
-#: ../composer/e-composer-header-table.c:1046
+#: ../composer/e-composer-header-table.c:1062
 msgid "Si_gnature:"
 msgstr "సంతకం(_g):"
 
-#: ../composer/e-composer-name-header.c:137
+#: ../composer/e-composer-name-header.c:141
 msgid "Click here for the address book"
 msgstr "చిర�నామా ప�స�తకం కొరక� ఇక�కడ నొక�క�మ�"
 
-#: ../composer/e-composer-post-header.c:126
+#: ../composer/e-composer-post-header.c:131
 msgid "Click here to select folders to post to"
 msgstr "పోస�ట�చేయ�టక� సంచయాలన� ఎంచ�కొన�టక� ఇక�కడ నొక�కండి"
 
-#: ../composer/e-composer-private.c:211
+#: ../composer/e-composer-private.c:249
 #, fuzzy
 msgid "Undo the last action"
 msgstr "ఎంపికన� నకల� తీయ�మ�"
 
-#: ../composer/e-composer-private.c:215
+#: ../composer/e-composer-private.c:253
 #, fuzzy
 msgid "Redo the last undone action"
 msgstr "తాజా సమాచారాన�ని పంప�"
 
-#: ../composer/e-composer-private.c:219
+#: ../composer/e-composer-private.c:257
 #, fuzzy
 msgid "Search for text"
 msgstr ""
@@ -8159,51 +6984,43 @@ msgstr ""
 "\n"
 "చిర�నామా కొరక� వెత�క�మ�."
 
-#: ../composer/e-composer-private.c:223
+#: ../composer/e-composer-private.c:261
 #, fuzzy
 msgid "Search for and replace text"
-msgstr "iPod కొరక� శోధన విఫలమైంది"
+msgstr "iPod కొరక� అన�వేషణ విఫలమైంది"
 
-#: ../composer/e-composer-private.c:313
+#: ../composer/e-composer-private.c:372
 msgid "Save draft"
 msgstr "డ�రాఫ�ట� న� దాయ�మ�"
 
-#. Check buttons
-#: ../composer/e-msg-composer.c:199
-#: ../plugins/attachment-reminder/attachment-reminder.c:117
-msgid "_Do not show this message again."
-msgstr "ఈ సందేశంన� మళ�ళీ చూపవద�ద� (_D)."
-
-#: ../composer/e-msg-composer.c:1029
+#: ../composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
-"బయటక� వెళ�ళ� సందేశానికి సంతకాన�ని పెట�టలేద�: ఈ ఖాతా క� ఎట�వంటి సంతక దృవీకరణపత�రం అమర�చలేద�"
+"బయటక� వెళ�ళ� సందేశానికి సంతకాన�ని పెట�టలేద�: ఈ ఖాతా క� ఎట�వంటి సంతక "
+"దృవీకరణపత�రం అమర�చలేద�"
 
-#: ../composer/e-msg-composer.c:1041
+#: ../composer/e-msg-composer.c:821
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
-"బయటక� వెళ�ళ� సందేశాన�ని ఎన�క�రిప�ట� చేయలేద�: ఈ ఖాతా క� ఎట�వంటి ఎన�క�రిప�షన� దృవీకరణపత�రం అమర�చలేద�"
-
-#: ../composer/e-msg-composer.c:1465
-#, fuzzy
-msgid "Unable to reconstruct message from autosave file"
-msgstr "సరికూర�పరిన�ండి సందేశాన�ని వెలికితీయలేద�"
+"బయటక� వెళ�ళ� సందేశాన�ని ఎన�క�రిప�ట� చేయలేద�: ఈ ఖాతా క� ఎట�వంటి ఎన�క�రిప�షన� "
+"దృవీకరణపత�రం అమర�చలేద�"
 
-#: ../composer/e-msg-composer.c:1533 ../composer/e-msg-composer.c:1817
+#: ../composer/e-msg-composer.c:1699 ../composer/e-msg-composer.c:2083
 msgid "Compose Message"
 msgstr "సందేశాన�ని కూర�చ�మ�"
 
-#: ../composer/e-msg-composer.c:3538
+#: ../composer/e-msg-composer.c:4228
 #, fuzzy
 msgid "The composer contains a non-text message body, which cannot be edited."
-msgstr "<b>(కూర�పరి పాఠ�యమ�-కాని సందేశం బాడీని కలిగిఉంది, �దైతే సరికూర�చబడలేదో.)</b>"
+msgstr ""
+"<b>(కూర�పరి పాఠ�యమ�-కాని సందేశం బాడీని కలిగిఉంది, �దైతే సరికూర�చబడలేదో.)</b>"
 
-#: ../composer/e-msg-composer.c:4144
+#: ../composer/e-msg-composer.c:4933
 msgid "Untitled Message"
 msgstr "శీర�షికలేని సందేశం"
 
@@ -8212,7 +7029,8 @@ msgid ""
 " There are few attachments getting downloaded. Sending the mail will cause "
 "the mail to be sent without those pending attachments "
 msgstr ""
-"అక�కడ కొన�ని అన�భందాల� దిగ�మతికాబోత�న�నాయి. మెయిల� పంప�టవలన దిగ�మతికావలిసిన అన�భందాల� లేక�ండానే మెయిల� "
+"అక�కడ కొన�ని అన�భందాల� దిగ�మతికాబోత�న�నాయి. మెయిల� పంప�టవలన దిగ�మతికావలిసిన "
+"అన�భందాల� లేక�ండానే మెయిల� "
 "పంపబడ�త�ంది "
 
 #: ../composer/mail-composer.error.xml.h:2
@@ -8220,441 +7038,482 @@ msgid "All accounts have been removed."
 msgstr "అన�ని ఖాతాల� తొలగించబడినవి."
 
 #: ../composer/mail-composer.error.xml.h:3
+#, fuzzy
+#| msgid "Error occurred while spawning %s: %s."
+msgid "An error occurred while saving to your Drafts folder."
+msgstr "%s స�పానింగ�‌లో వొకదోషమ� సంభవించింది: %s"
+
+#: ../composer/mail-composer.error.xml.h:4
+#, fuzzy
+#| msgid "An error occurred while printing"
+msgid "An error occurred while saving to your Outbox folder."
+msgstr "మ�ద�రించ�చ�న�నప�ప�డ� ఒక దోషం ఎద�రైంది"
+
+#: ../composer/mail-composer.error.xml.h:5
+#, fuzzy
+#| msgid "An error occurred while printing"
+msgid "An error occurred while sending. How do you want to proceed?"
+msgstr "మ�ద�రించ�చ�న�నప�ప�డ� ఒక దోషం ఎద�రైంది"
+
+#: ../composer/mail-composer.error.xml.h:6
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr "మీర� ఖచ�చితంగా సందేశాన�ని తీసివేద�దామన�క�ంట�న�నారా, శీర�షిక '{0}', మీర� కూర�చ�త�న�నార�?"
+msgstr ""
+"మీర� ఖచ�చితంగా సందేశాన�ని తీసివేద�దామన�క�ంట�న�నారా, శీర�షిక '{0}', మీర� "
+"కూర�చ�త�న�నార�?"
 
-#: ../composer/mail-composer.error.xml.h:4
+#: ../composer/mail-composer.error.xml.h:7
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr "ఎంచేతంటే &quot;{0}&quot;, మీర� వేరే మెయిల� �చ�చికాలన� ఎంచ�కోవలిసి రావచ�చ�."
+msgstr ""
+"ఎంచేతంటే &quot;{0}&quot;, మీర� వేరే మెయిల� �చ�చికాలన� ఎంచ�కోవలిసి రావచ�చ�."
 
-#: ../composer/mail-composer.error.xml.h:5
+#: ../composer/mail-composer.error.xml.h:8
 msgid "Because &quot;{1}&quot;."
 msgstr "ఎంచేతంటే &quot;{1}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:6
+#: ../composer/mail-composer.error.xml.h:9
+msgid ""
+"Because you are working offline, the message will be saved to your local "
+"Outbox folder. When you are back online you can send the message by clicking "
+"the Send/Receive button in Evolution's toolbar."
+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 "
 "continue the message at a later date."
 msgstr ""
-"ఈ కూర�పరి విండో న� ఎంచ�కొన�ట ఈ సందేశాన�ని శాశ�వతంగా నెట�టివేస�త�ంది, మీర� సందేశాన�ని మీ డ�రాఫ�ట�స�  సంచయం "
-"నంద� దాచ�కొనకపోతే. ఇది మిమ�మ�ల�ని తర�వాతి సమయంలో సందేశాన�ని కొనసాగించ�టక� అన�మతినిస�త�ంది."
+"ఈ కూర�పరి విండో న� ఎంచ�కొన�ట ఈ సందేశాన�ని శాశ�వతంగా నెట�టివేస�త�ంది, మీర� "
+"సందేశాన�ని మీ డ�రాఫ�ట�స�  సంచయం "
+"నంద� దాచ�కొనకపోతే. ఇది మిమ�మ�ల�ని తర�వాతి సమయంలో సందేశాన�ని కొనసాగించ�టక� "
+"అన�మతినిస�త�ంది."
 
-#: ../composer/mail-composer.error.xml.h:7
-msgid "Could not create composer window."
-msgstr "కూర�పరి విండోన� సృష�టించలేకపోయింది."
-
-#: ../composer/mail-composer.error.xml.h:8
+#: ../composer/mail-composer.error.xml.h:11
 msgid "Could not create message."
 msgstr "సందేశాన�ని సృష�టించలేకపోయింది."
 
-#: ../composer/mail-composer.error.xml.h:9
+#: ../composer/mail-composer.error.xml.h:12
 msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "సంతకం దస�త�రం &quot;{0}&quot; న� చద�వలేకపోయింది."
+msgstr "సంతకం ఫైల� &quot;{0}&quot; న� చద�వలేకపోయింది."
 
-#: ../composer/mail-composer.error.xml.h:10
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "{0} న�ండి అన�భందంక� సందేశాలన� వెలికితీయలేకపోయింది."
 
-#: ../composer/mail-composer.error.xml.h:11
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr "స�వయచాలకంగా దాయ� దస�త�రం &quot;{0}&quot; క� దాయలేకపోయింది."
+msgstr "స�వయచాలకంగా దాయ� ఫైల� &quot;{0}&quot; క� దాయలేకపోయింది."
 
-#: ../composer/mail-composer.error.xml.h:12
+#: ../composer/mail-composer.error.xml.h:15
 msgid "Do you want to recover unfinished messages?"
 msgstr "పూర�తికానట�వంచి సందేశాన�ని మీర� తిరిగిపొందాలన�క�ట�న�నారా?"
 
-#: ../composer/mail-composer.error.xml.h:13
+#: ../composer/mail-composer.error.xml.h:16
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "దిగ�మతి జర�గ�త�న�నది. మీర� మెయిల� న� పంపాలన�క�ంట�న�నారా?"
 
-#: ../composer/mail-composer.error.xml.h:14
+#: ../composer/mail-composer.error.xml.h:17
 msgid "Error saving to autosave because &quot;{1}&quot;."
-msgstr "స�వయంచాలకంగా దాయ� దస�త�రంక� దాయ�టలో దోషం ఎంచేతంటే &quot;{1}&quot;."
+msgstr "స�వయంచాలకంగా దాయ� ఫైల�క� దాయ�టలో దోషం ఎంచేతంటే &quot;{1}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:18
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
-"మీర� సందేశాన�ని కూర�చ�త�న�నప�ప�డ� ఎవాల�యూషన� అన�కోక�ండా నిష�క�రమించింది. సందేశాన�ని తిరిగిపొంద�ట ద�వారా "
+"మీర� సందేశాన�ని కూర�చ�త�న�నప�ప�డ� ఎవాల�యూషన� అన�కోక�ండా నిష�క�రమించింది. "
+"సందేశాన�ని తిరిగిపొంద�ట ద�వారా "
 "మీర� ఎక�కడ వదిలారో అక�కడిన�ండి కొనసాగించవచ�చ�."
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:19
+#, fuzzy
+msgid "Saving message to Outbox."
+msgstr "సందేశాన�ని సంచయంక� దాయ�చ�న�నది"
+
+#: ../composer/mail-composer.error.xml.h:20
 #, fuzzy
 msgid "The file '{0}' is not a regular file and cannot be sent in a message."
-msgstr "దస�త�రం `{0} సాదారణ దస�త�రం కాద� మరియ� సందేశంలో పంపబడలేద�."
+msgstr "ఫైల� `{0} సాదారణ ఫైల� కాద� మరియ� సందేశంలో పంపబడలేద�."
 
-#: ../composer/mail-composer.error.xml.h:17
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
+#, fuzzy
+#| msgid "Bad regular expression &quot;{0}&quot;."
+msgid "The reported error was &quot;{0}&quot;."
+msgstr "సరికాని రెగ�య�లర� ఎక�సప�రెషన� &quot;{0}&quot;."
+
+#: ../composer/mail-composer.error.xml.h:22
 msgid ""
-"Unable to activate the HTML editor control.\n"
-"\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
 msgstr ""
-"HTML కూర�పరి నియంత�రికన� చేతనం చేయలేద�.\n"
-"\n"
-"దయచేసి మీర� ఖచ�చితమైన gtkhtml మరియ� libgtkhtml న� కిలిగిఉన�నారేమో సరిచూస�కొనండి."
 
-#: ../composer/mail-composer.error.xml.h:20
-msgid "Unable to activate the address selector control."
-msgstr "చిర�నామా ఎంపికదారి నియంత�రిక చేతనం చేయలేద�."
+#: ../composer/mail-composer.error.xml.h:23
+msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
+msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:24
 #, fuzzy
-msgid "You cannot attach the file n{0}' to this message."
-msgstr "మీర� దస�త�రం `{0}' న� ఈ సందేశంక� అన�భందించలేర�."
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "మీర� ఫైల� `{0}' న� ఈ సందేశంక� అన�భందించలేర�."
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:25
 msgid "You need to configure an account before you can compose mail."
 msgstr " తపాలా న� రచించ�టక� మ�ంద� మీర� ఒక ఖాతా న� సరిచేయవలెన�."
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:26
+#, fuzzy
+#| msgid "An error occurred during processing: %s"
+msgid "Your message was sent, but an error occurred during post-processing."
+msgstr "ప�రోసెసింగ�‌నంద� వొక దోషమ� యెద�రైంది: %s"
+
+#. Response codes were chosen somewhat arbitrarily.
+#: ../composer/mail-composer.error.xml.h:28
 msgid "_Continue Editing"
 msgstr "సరికూర�చ�ట కొనసాగించ�(_C)"
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Do not Recover"
 msgstr "తిరిగిపొందవద�ద�(_D)"
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Recover"
 msgstr "తిరిగిపొంద�మ�(_R)"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Save Draft"
 msgstr "డ�రాప�ట��‌న� దాయ�మ� (_S)"
 
-#: ../capplet/anjal-settings-main.c:199
-msgid "Run Anjal in a window"
-msgstr ""
-
-#: ../capplet/anjal-settings-main.c:200
+#: ../composer/mail-composer.error.xml.h:33
 #, fuzzy
-msgid "Make Anjal the default email client"
-msgstr "అప�రమేయ మెమో జాబితాగా గ�ర�త�ంచ�మ� (_d)"
+msgid "_Save to Outbox"
+msgstr "ఇలా దాయ�..."
+
+#: ../composer/mail-composer.error.xml.h:35
+msgid "_Try Again"
+msgstr ""
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:207
+#: ../capplet/anjal-settings-main.c:154
 msgid "ID of the socket to embed in"
 msgstr ""
 
-#: ../capplet/anjal-settings-main.c:208
+#: ../capplet/anjal-settings-main.c:155
 #, fuzzy
 msgid "socket"
 msgstr " చక�కదిద�ద�"
 
-#: ../capplet/anjal-settings-main.c:221
-#, fuzzy
-msgid "Anjal email client"
-msgstr "అప�రమేయ మెయిల� కక�షిదార�"
-
-#: ../capplet/settings/mail-account-view.c:74
+#: ../capplet/settings/mail-account-view.c:77
 #, fuzzy
 msgid "Please enter your full name."
 msgstr "దయచేసి వేరే నామాన�ని ఎంచ�కొన�మ�."
 
-#: ../capplet/settings/mail-account-view.c:75
+#: ../capplet/settings/mail-account-view.c:78
 msgid "Please enter your email address."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:76
+#: ../capplet/settings/mail-account-view.c:79
 msgid "The email address you have entered is invalid."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:77
+#: ../capplet/settings/mail-account-view.c:80
 #, fuzzy
 msgid "Please enter your password."
 msgstr "సంకేతపదంన� ప�రవేశపెట�టండి."
 
-#: ../capplet/settings/mail-account-view.c:256
-#: ../plugins/caldav/caldav-source.c:66
+#: ../capplet/settings/mail-account-view.c:259
+#: ../plugins/caldav/caldav-source.c:67
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../capplet/settings/mail-account-view.c:360
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:81
+#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:413
+#: ../modules/online-accounts/e-online-accounts-google.c:287
+#: ../modules/online-accounts/e-online-accounts-google.c:359
+#: ../plugins/google-account-setup/google-contacts-source.c:55
+#: ../plugins/google-account-setup/google-source.c:87
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:464
+#: ../capplet/settings/mail-account-view.c:480
 #, fuzzy
 msgid "Personal details:"
 msgstr "వ�యక�తిగత"
 
-#: ../capplet/settings/mail-account-view.c:471
+#: ../capplet/settings/mail-account-view.c:487
 #, fuzzy
 msgid "Name:"
 msgstr "పేర�(_N):"
 
-#: ../capplet/settings/mail-account-view.c:480
+#: ../capplet/settings/mail-account-view.c:496
 #, fuzzy
 msgid "Email address:"
 msgstr "ఈ మెయిల� చిర�నామ(_A):"
 
-#: ../capplet/settings/mail-account-view.c:490
+#: ../capplet/settings/mail-account-view.c:506
 #, fuzzy
-msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
-msgstr "<span weight=\"bold\">మెయిల� తొలగించ�</span>"
+#| msgid "Details"
+msgid "Details:"
+msgstr "వివరాల�"
 
-#: ../capplet/settings/mail-account-view.c:496
+#: ../capplet/settings/mail-account-view.c:514
 #, fuzzy
-msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
-msgstr "<span weight=\"bold\">రక�షణ</span>"
+msgid "Receiving"
+msgstr "మెయిల� న� తీస�క�ంటోంది"
 
-#: ../capplet/settings/mail-account-view.c:501
+#: ../capplet/settings/mail-account-view.c:521
 #, fuzzy
 msgid "Server type:"
 msgstr "సేవిక రకం (_T):"
 
-#: ../capplet/settings/mail-account-view.c:510
+#: ../capplet/settings/mail-account-view.c:530
 #, fuzzy
 msgid "Server address:"
 msgstr "సేవిక సందేశం:"
 
-#: ../capplet/settings/mail-account-view.c:519
+#: ../capplet/settings/mail-account-view.c:539
 #, fuzzy
 msgid "Username:"
-msgstr "(_e) వినియోగదారి నామమ�:"
+msgstr "(_e) వినియోగదారి పేర�:"
 
-#: ../capplet/settings/mail-account-view.c:528
+#: ../capplet/settings/mail-account-view.c:548
 #, fuzzy
 msgid "Use encryption:"
 msgstr "ఎన�క�రిప�షన� లేద�"
 
-#: ../capplet/settings/mail-account-view.c:533
-#: ../capplet/settings/mail-account-view.c:566
+#: ../capplet/settings/mail-account-view.c:553
+#: ../capplet/settings/mail-account-view.c:588
 #, fuzzy
 msgid "never"
 msgstr "ఎప�పటికివద�ద�"
 
-#: ../capplet/settings/mail-account-view.c:545
+#: ../capplet/settings/mail-account-view.c:565
 #, fuzzy
-msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
-msgstr "<span weight=\"bold\">రక�షణ</span>"
+#| msgid "Ascending"
+msgid "Sending"
+msgstr "ఆరోహణాక�రమం"
 
-#: ../capplet/settings/mail-account-view.c:585
+#: ../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."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:587
+#: ../capplet/settings/mail-account-view.c:609
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
 "entered but you may need to change them."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:589
+#: ../capplet/settings/mail-account-view.c:611
 #, fuzzy
 msgid "You can specify more options to configure the account."
 msgstr "మీర� ఒక ఎక�సేంజ� ఖాతా మాత�రమే ఆకృతీకరించ గలర�."
 
-#: ../capplet/settings/mail-account-view.c:591
+#: ../capplet/settings/mail-account-view.c:613
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:592
+#: ../capplet/settings/mail-account-view.c:614
 msgid "You can specify your default settings for your account."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:593
+#: ../capplet/settings/mail-account-view.c:615
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:608
-#: ../mail/em-account-editor.c:2098 ../mail/em-account-editor.c:2219
-#: ../mail/mail-config.ui.h:62
+#: ../capplet/settings/mail-account-view.c:630
+#: ../mail/em-account-editor.c:2289 ../mail/em-account-editor.c:2425
 msgid "Identity"
 msgstr "గ�ర�తింప�"
 
-#: ../capplet/settings/mail-account-view.c:608
+#: ../capplet/settings/mail-account-view.c:630
 #, fuzzy
 msgid "Next - Receiving mail"
 msgstr "మెయిల� న� తీస�క�ంటోంది"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:631
 #, fuzzy
 msgid "Receiving mail"
 msgstr "మెయిల� న� తీస�క�ంటోంది"
 
-#: ../capplet/settings/mail-account-view.c:609
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:632
 #, fuzzy
 msgid "Next - Sending mail"
 msgstr "ఈమెయిల� పంపిస�త�న�నది"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:631
 #, fuzzy
 msgid "Back - Identity"
 msgstr "గ�ర�తింప�"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:631
 #, fuzzy
 msgid "Next - Receiving options"
 msgstr "�చ�చికాలన� తిరిగిపొంద�త�ంది"
 
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:632
 #, fuzzy
 msgid "Receiving options"
 msgstr "�చ�చికాలన� తిరిగిపొంద�త�ంది"
 
-#: ../capplet/settings/mail-account-view.c:610
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:634
 #, fuzzy
 msgid "Back - Receiving mail"
 msgstr "మెయిల� న� తీస�క�ంటోంది"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:634
 #, fuzzy
 msgid "Sending mail"
 msgstr "ఈమెయిల� పంపిస�త�న�నది"
 
-#: ../capplet/settings/mail-account-view.c:612
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
 #, fuzzy
 msgid "Next - Review account"
 msgstr "ఖాతా తొలగించాలా?"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:634
 #, fuzzy
 msgid "Next - Defaults"
 msgstr "అప�రమేయాల�"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:634
 #, fuzzy
 msgid "Back - Receiving options"
 msgstr "�చ�చికాలన� తిరిగిపొంద�త�ంది"
 
-#: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2985 ../mail/mail-config.ui.h:34
+#: ../capplet/settings/mail-account-view.c:635
+#: ../mail/em-account-editor.c:3377
 msgid "Defaults"
 msgstr "అప�రమేయాల�"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:635
 #, fuzzy
 msgid "Back - Sending mail"
 msgstr "ఈమెయిల� పంపిస�త�న�నది"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:637
 #, fuzzy
 msgid "Review account"
 msgstr "ఖాతా తొలగించాలా?"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Finish"
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:637
 #, fuzzy
 msgid "Back - Sending"
 msgstr "ఆరోహణాక�రమం"
 
-#: ../capplet/settings/mail-account-view.c:719
+#: ../capplet/settings/mail-account-view.c:760
 #, fuzzy
 msgid "Setup Google contacts with Evolution"
 msgstr "WebDAV పరిచయాలన� ఎవాల�యూషన�‌క� జతచేయ�మ�."
 
-#: ../capplet/settings/mail-account-view.c:720
+#: ../capplet/settings/mail-account-view.c:761
 #, fuzzy
 msgid "Setup Google calendar with Evolution"
 msgstr "ఎవాల�యూషన�‌క� గూగ�ల� కాలెండర�లన� జతచేయ�మ�."
 
-#: ../capplet/settings/mail-account-view.c:725
+#: ../capplet/settings/mail-account-view.c:766
 msgid "You may need to enable IMAP access."
 msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:733
+#: ../capplet/settings/mail-account-view.c:774
 #, fuzzy
-msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
-msgstr "<span weight=\"bold\">ప�రోక�సీ అమరికల�</span>"
+#| msgid "Backing Evolution accounts and settings"
+msgid "Google account settings:"
+msgstr "ఎవాల�యూషన� ఖాతాలన� మరియ� అమరికలన� వెన�కక�తెస�తోంది"
 
-#: ../capplet/settings/mail-account-view.c:757
+#: ../capplet/settings/mail-account-view.c:800
 #, fuzzy
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "ఎవాల�యూషన�‌క� వాతావరణ కాలెండర�లన� జతచేయి."
 
-#: ../capplet/settings/mail-account-view.c:761
+#: ../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 ""
 
-#: ../capplet/settings/mail-account-view.c:768
+#: ../capplet/settings/mail-account-view.c:813
 #, fuzzy
-msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
-msgstr "<span weight=\"bold\">ప�రోక�సీ అమరికల�</span>"
+#| msgid "Backing Evolution accounts and settings"
+msgid "Yahoo account settings:"
+msgstr "ఎవాల�యూషన� ఖాతాలన� మరియ� అమరికలన� వెన�కక�తెస�తోంది"
 
-#: ../capplet/settings/mail-account-view.c:780
+#: ../capplet/settings/mail-account-view.c:827
 #, fuzzy
 msgid "Yahoo Calendar name:"
 msgstr "కాలెండర� దస�త�రమ�న� యెంచ�కొన�మ�"
 
-#: ../capplet/settings/mail-account-view.c:1023
+#: ../capplet/settings/mail-account-view.c:1098
 #, fuzzy
 msgid "Password:"
 msgstr "సంకేతపదం (_w):"
 
-#: ../capplet/settings/mail-account-view.c:1091
-#: ../capplet/settings/mail-settings-view.c:267
+#: ../capplet/settings/mail-account-view.c:1150
+#: ../capplet/settings/mail-settings-view.c:254
 #, fuzzy
 msgid "Close Tab"
 msgstr "మూయ�మ�"
 
-#: ../capplet/settings/mail-account-view.c:1101
+#: ../capplet/settings/mail-account-view.c:1160
 #, fuzzy
 msgid "Account Wizard"
 msgstr "ఖాతా కూర�పరి"
 
-#: ../capplet/settings/mail-capplet-shell.c:208
+#: ../capplet/settings/mail-capplet-shell.c:215
 #, fuzzy
 msgid "Evolution account assistant"
 msgstr "ఎవాల�యూషన� ఖాతా సహాయక�డ�"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
-#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
-#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
-#: ../mail/message-list.c:1666
-#: ../modules/addressbook/e-book-shell-backend.c:95
-#: ../modules/addressbook/e-book-shell-migrate.c:130
-#: ../modules/calendar/e-cal-shell-backend.c:102
-#: ../modules/calendar/e-cal-shell-migrate.c:141
-#: ../modules/calendar/e-memo-shell-backend.c:92
-#: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:92
-#: ../modules/calendar/e-task-shell-migrate.c:111
+#: ../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
+#: ../modules/addressbook/e-book-shell-backend.c:100
+#: ../modules/addressbook/e-book-shell-migrate.c:136
+#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-migrate.c:154
+#: ../modules/calendar/e-memo-shell-backend.c:102
+#: ../modules/calendar/e-memo-shell-migrate.c:109
+#: ../modules/calendar/e-task-shell-backend.c:102
+#: ../modules/calendar/e-task-shell-migrate.c:121
 msgid "On This Computer"
 msgstr "ఈ కంప�యూటర� పైన"
 
-#: ../capplet/settings/mail-settings-view.c:146
-#: ../plugins/groupwise-features/share-folder.c:737
-msgid "Modify"
+#: ../capplet/settings/mail-settings-view.c:150
+#, fuzzy, c-format
+#| msgid "Modify"
+msgid "Modify %s..."
 msgstr "సవరించ�"
 
-#: ../capplet/settings/mail-settings-view.c:148
+#: ../capplet/settings/mail-settings-view.c:152
 #, fuzzy
 msgid "Add a new account"
 msgstr "నిల�వ� పట�టీని జతచేయ�..."
 
-#: ../capplet/settings/mail-settings-view.c:184
+#: ../capplet/settings/mail-settings-view.c:188
 #, fuzzy
 msgid "Account management"
 msgstr "ఖాతా నిర�వహణ"
 
-#: ../capplet/settings/mail-settings-view.c:277
+#: ../capplet/settings/mail-settings-view.c:264
 #, fuzzy
 msgid "Settings"
 msgstr "నిరర�ధకంక� అమరికల�"
@@ -8669,8 +7528,9 @@ msgstr "క�యాలెండర� సమాచారం"
 msgid "Evolution Alarm Notify"
 msgstr "ఎవాల�యూషన� Elm దిగ�మతిదారి"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:845
-#: ../shell/e-shell-window-private.c:253
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:999
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../shell/e-shell-window-private.c:257
 msgid "Evolution"
 msgstr "ఎవాల�యూషన�"
 
@@ -8697,41 +7557,39 @@ msgid "Email Settings"
 msgstr "నిరర�దక మెయిల� అమరికల�"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:224
+#: ../e-util/e-activity.c:227
 #, fuzzy, c-format
 msgid "%s (cancelled)"
 msgstr "రద�ద�చేయబడినది"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:227
+#: ../e-util/e-activity.c:230
 #, fuzzy, c-format
 msgid "%s (completed)"
 msgstr "%s (%d%% పూర�తి అయినది)"
 
-#. Translators: This is an activity whose percent
-#. * complete is unknown.
-#: ../e-util/e-activity.c:231
-#, fuzzy, c-format
-msgid "%s..."
-msgstr "%s (...)"
-
-#: ../e-util/e-activity.c:236
+#. Translators: This is an activity waiting to run.
+#: ../e-util/e-activity.c:233
 #, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% పూర�తి అయినది)"
+msgid "%s (waiting)"
+msgstr ""
 
-#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
-msgid "Evolution Error"
-msgstr "ఎవాల�యూషన� దోషం"
+#. Translators: This is a running activity which
+#. *              the user has requested to cancel.
+#: ../e-util/e-activity.c:237
+#, fuzzy, c-format
+msgid "%s (cancelling)"
+msgstr "రద�ద�చేయబడినది"
 
-#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
-msgid "Evolution Warning"
-msgstr "ఎవాల�యూషన� హెచ�చరిక"
+#: ../e-util/e-activity.c:239
+#, c-format
+msgid "%s"
+msgstr ""
 
-#: ../e-util/e-alert.c:649
+#: ../e-util/e-activity.c:244
 #, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "అంతర�గత దోషం, తెలియని దోషం '%s' అభ�యర�దించబడింది"
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% పూర�తి అయినది)"
 
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
@@ -8811,121 +7669,118 @@ msgid "Visual"
 msgstr "దార�శనీక"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../e-util/e-datetime-format.c:206
+#: ../modules/calendar/e-cal-shell-view-actions.c:1856
 #: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:311
+#: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
 msgstr "ఈరోజ�"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "మర�నాడ�"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:219
 msgid "Yesterday"
 msgstr "నిన�న"
 
-#. Translators: %d is replaced with a number of days. It's always greater than 1
-#: ../e-util/e-datetime-format.c:211
-#, fuzzy, c-format
-msgid "%d day from now"
-msgid_plural "%d days from now"
-msgstr[0] "ఇప�పడి న�ండి %d రోజ�ల�"
-msgstr[1] "ఇప�పడి న�ండి %d రోజ�ల�"
+#. 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:227
+#| msgid "Next"
+msgctxt "DateFmt"
+msgid "Next Mon"
+msgstr "తర�వాతి సోమ"
+
+#. 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:233
+#| msgid "Next _Thread"
+msgctxt "DateFmt"
+msgid "Next Tue"
+msgstr "తర�వాతి  మంగళ"
+
+#. 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:239
+#| msgid "Next _Thread"
+msgctxt "DateFmt"
+msgid "Next Wed"
+msgstr "తర�వాతి బ�ధ"
+
+#. 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:245
+#, fuzzy
+#| msgid "Next _Thread"
+msgctxt "DateFmt"
+msgid "Next Thu"
+msgstr "తర�వాతి తంతి(_T)"
 
-#. Translators: %d is replaced with a number of days. It's always greater than 1
-#: ../e-util/e-datetime-format.c:214
-#, fuzzy, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d రోజ�ల క�రితం"
-msgstr[1] "%d రోజ�ల క�రితం"
+#. 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:251
+#, fuzzy
+#| msgid "Next"
+msgctxt "DateFmt"
+msgid "Next Fri"
+msgstr "తర�వాతి"
+
+#. 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:257
+#, fuzzy
+#| msgid "Next"
+msgctxt "DateFmt"
+msgid "Next Sat"
+msgstr "తర�వాతి"
+
+#. 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:263
+#, fuzzy
+#| msgid "Next"
+msgctxt "DateFmt"
+msgid "Next Sun"
+msgstr "తర�వాతి"
 
-#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
-#: ../e-util/e-datetime-format.c:308
+#: ../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 "అప�రమేయ లోకేల�‌న� వ�పయోగించ�మ�"
 
-#: ../e-util/e-datetime-format.c:502
+#: ../e-util/e-datetime-format.c:574
 msgid "Format:"
 msgstr "ఫార�మాట�:"
 
-#: ../e-util/e-file-utils.c:136
+#: ../e-util/e-file-utils.c:151
 #, fuzzy
 msgid "(Unknown Filename)"
 msgstr "అపరిచిత రకమ�"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:140
+#: ../e-util/e-file-utils.c:155
 #, fuzzy, c-format
 msgid "Writing \"%s\""
 msgstr "పింగింగ� %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:145
+#: ../e-util/e-file-utils.c:160
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr ""
 
-#: ../e-util/e-non-intrusive-error-dialog.c:194
-msgid "Debug Logs"
-msgstr "డీబగ� లాగ�‌ల�"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:208
-msgid "Show _errors in the status bar for"
-msgstr "దీని కొరక� స�థితపట�టీ నంద� దోషాలన� చూప�మ�(_e)"
-
-#. Translators: This is the second part of the sentence
-#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:226
-msgid "second(s)."
-msgstr "సెకన�(ల�)."
-
-#: ../e-util/e-non-intrusive-error-dialog.c:232
-msgid "Log Messages:"
-msgstr "లాగ� సందేశాల�:"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:279
-msgid "Log Level"
-msgstr "లాగ� స�థాయి"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2757
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "సందేశాల�"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1425
-#: ../shell/e-shell-window-actions.c:1432
-#: ../shell/e-shell-window-actions.c:1439
-msgid "Close this window"
-msgstr "ఈ గవాక�షాన�ని మూయ�మ�"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:38
-msgid "Error"
-msgstr "దోషం"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:38
-msgid "Errors"
-msgstr "దోషాల�"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:39
-msgid "Warnings and Errors"
-msgstr "హెచ�చరికల� మరియ� దోషాల�"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:40
-msgid "Debug"
-msgstr "డీబగ�"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:40
-msgid "Error, Warnings and Debug messages"
-msgstr "దోషం, హెచ�చరికల� మరియ� డీబగ� సందేశాల�"
-
-#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:388
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "వారమ�ల�"
@@ -8943,7 +7798,7 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "మ�ద�రణా వ�యవస�థ దోషం గ�రించి � అదనప� వివరాలన� నివేదించలేద�."
 
-#: ../e-util/e-signature.c:732
+#: ../e-util/e-signature.c:708
 msgid "Autogenerated"
 msgstr "స�వయంచాలకంగాఉద�భవించిన"
 
@@ -8967,310 +7822,314 @@ msgstr "మీర� దీనిని మరల వ�రాయదల�చ�
 msgid "File exists \"{0}\"."
 msgstr "దస�త�రమ� వ�ంది \"{0}\"."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:140
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
 msgid "_Overwrite"
 msgstr "మరలావ�రాయండి(_O)"
 
-#: ../e-util/e-util.c:146
+#: ../e-util/e-util.c:117
 msgid "Could not open the link."
 msgstr "లింక�న� తెర�వలేక పోయినది."
 
-#: ../e-util/e-util.c:193
+#: ../e-util/e-util.c:164
 msgid "Could not display help for Evolution."
 msgstr "ఎవాల�యూషన� కొరక� సహాయంన� ప�రదర�శించ లేకపోయింది."
 
-#: ../e-util/gconf-bridge.c:1281
+#: ../e-util/gconf-bridge.c:1332
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf దోషమ�: %s"
 
-#: ../e-util/gconf-bridge.c:1292
+#: ../e-util/gconf-bridge.c:1343
 msgid "All further errors shown only on terminal."
 msgstr "తద�పరి అన�ని దోషమ�ల� టెర�మినల�‌పై మాత�రమే చూపబడ�న�."
 
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
-#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format-quote.c:319 ../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
 msgid "From"
 msgstr "న�ండి"
 
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
-#: ../modules/mail/em-mailer-prefs.c:79
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1061
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "క�-ప�రత�య�త�తరమ�"
 
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:943
-#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
-#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:81
+#: ../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
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:944
-#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
-#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:82
+#: ../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
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:945
-#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:83
-#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
+#: ../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
 msgid "Subject"
 msgstr "సంగతి"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2472
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../em-format/em-format-quote.c:475 ../mail/em-format-html.c:2786
+#: ../modules/mail/em-mailer-prefs.c:1028
 msgid "Mailer"
 msgstr "మెయిలర�"
 
-#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1190
+#: ../em-format/em-format-quote.c:565 ../mail/em-composer-utils.c:1203
 msgid "-------- Forwarded Message --------"
 msgstr "-------- మ�ంద�క� పంపబడినసందేశం --------"
 
-#: ../em-format/em-format.c:946 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:84 ../widgets/misc/e-dateedit.c:524
-#: ../widgets/misc/e-dateedit.c:546
+#: ../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
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
 msgstr "తారీఖ�"
 
-#: ../em-format/em-format.c:947 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:1067 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "వార�తాసమూహాల�"
 
-#: ../em-format/em-format.c:948 ../modules/mail/em-mailer-prefs.c:86
+#: ../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 "మ�ఖమ�"
 
-#: ../em-format/em-format.c:1310
+#: ../em-format/em-format.c:1472
 #, c-format
 msgid "%s attachment"
 msgstr "%s అన�భందమ�"
 
-#: ../em-format/em-format.c:1370
+#: ../em-format/em-format.c:1583
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME సందేశంన� పార�శ�  చేయలేకపోయింది: తెలియని దోషం"
 
-#: ../em-format/em-format.c:1525 ../em-format/em-format.c:1699
+#: ../em-format/em-format.c:1777 ../em-format/em-format.c:2005
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME సందేశంన� పార�శ� చేయలేకపోయింది. మూలంలాగా ప�రదర�శిస�తోంది."
 
-#: ../em-format/em-format.c:1533
+#: ../em-format/em-format.c:1788
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "మల�టీపార�ట�/ఎన�క�రిప�టెడ� కొరక� మద�దతీయని ఎన�క�రిప�షన� రకం"
 
-#: ../em-format/em-format.c:1546
+#: ../em-format/em-format.c:1808
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/MIME సందేశాన�ని పార�శ� చేయలేకపోయింది"
 
-#: ../em-format/em-format.c:1547
+#: ../em-format/em-format.c:1809
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME సందేశాన�ని పార�శ�  చేయలేకపోయింది: తెలియని దోషం"
 
-#: ../em-format/em-format.c:1723
+#: ../em-format/em-format.c:2030
 msgid "Unsupported signature format"
 msgstr "మద�దతీయని సంతకం రూపం"
 
-#: ../em-format/em-format.c:1733 ../em-format/em-format.c:1889
+#: ../em-format/em-format.c:2043 ../em-format/em-format.c:2225
 msgid "Error verifying signature"
 msgstr "సంతకాన�ని నిర�దారించ�టలో దోషం"
 
-#: ../em-format/em-format.c:1734 ../em-format/em-format.c:1877
-#: ../em-format/em-format.c:1890
+#: ../em-format/em-format.c:2044 ../em-format/em-format.c:2210
+#: ../em-format/em-format.c:2226
 msgid "Unknown error verifying signature"
 msgstr "సంతకాన�ని నిర�దారించ�టలో తెలియని దోషం"
 
-#: ../em-format/em-format.c:1970
+#: ../em-format/em-format.c:2318
 #, fuzzy
 msgid "Could not parse PGP message: "
 msgstr "PGP సందేశాన�ని పార�శ� చేయలేకపోయింది"
 
-#: ../em-format/em-format.c:1976 ../plugins/caldav/caldav-browse-server.c:203
-#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
-#: ../smime/gui/certificate-manager.c:100
-msgid "Unknown error"
-msgstr "అపరిచిత దోషం"
-
-#: ../filter/e-filter-datespec.c:74
+#. Don't delete this code, since it is needed so that xgettext can extract the translations.
+#. * Please, keep these strings in sync with the strings in the timespans array
+#: ../filter/e-filter-datespec.c:66
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 సెకన�క� మ�ందల"
 msgstr[1] "%d సెకన�లక� మ�ందల"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:67
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "ఇంకా 1 సెకన�క�"
 msgstr[1] "ఇంకా %d సెకన�లక�"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:68
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 నిమ�షం క� మ�ంద�"
 msgstr[1] "%d నిమిషాలక� మ�ంద�"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "ఇంకా 1 నిమ�షంక�"
 msgstr[1] "ఇంకా %d నిమిషాలక�"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 గంట మ�ంద�"
 msgstr[1] "%d గంటల మ�ంద�"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "ఇంకా 1 గంటక�"
 msgstr[1] "ఇంకా %d గంటలక�"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 రోజ� మ�ంద�"
 msgstr[1] "%d రోజ�ల మ�ంద�"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "ఇంకా 1 రోజ�క�"
 msgstr[1] "ఇంకా %d రోజ�లక�"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 వారం మ�ంద�"
 msgstr[1] "%d వారమ�ల మ�ంద�"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "ఇంకా 1 వారంక�"
 msgstr[1] "ఇంకా %d వారమ�లక�"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 నెలక� మ�ంద�"
 msgstr[1] "%d నెలలక� మ�ంద�"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "ఇంకా 1 నెలక�"
 msgstr[1] "ఇంకా %d నెలలక�"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 సంవత�సరం మ�ంద�"
 msgstr[1] "%d సంవత�సరమ�ల మ�ంద�"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "ఇంకా 1 సంవత�సరంక�"
 msgstr[1] "ఇంకా %d సంవత�సరమ�లక�"
 
-#: ../filter/e-filter-datespec.c:119
+#: ../filter/e-filter-datespec.c:129
 msgid "<click here to select a date>"
 msgstr "<ఒక తేదిన� ఎంచ�కొన�టక� ఇక�కడ నొక�కండి>"
 
-#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
-#: ../filter/e-filter-datespec.c:144
+#: ../filter/e-filter-datespec.c:132 ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:154
 msgid "now"
 msgstr "ఇప�ప�డ�"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:129
+#: ../filter/e-filter-datespec.c:139
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:272
+#: ../filter/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "సరిపోల�చ�టక� ఒక సమయాన�ని ఎంచ�కొన�మ�"
 
-#: ../filter/e-filter-file.c:184
+#: ../filter/e-filter-file.c:190
 #, fuzzy
 msgid "Choose a File"
-msgstr "దస�త�రాన�ని ఎంచ�కొన�మ�"
+msgstr "ఫైల�న� ఎంచ�కొన�మ�"
 
-#: ../filter/e-filter-rule.c:659
+#: ../filter/e-filter-rule.c:666
 msgid "R_ule name:"
-msgstr "నియమం నామమ�(_u):"
+msgstr "నియమం పేర�(_u):"
 
-#: ../filter/e-filter-rule.c:689
+#: ../filter/e-filter-rule.c:696
 msgid "Find items that meet the following conditions"
 msgstr "క�రింది నియమాలన� పోలిఉండ� అంశమ�లన� కన�గొన�మ�"
 
-#: ../filter/e-filter-rule.c:723
-msgid "A_dd Condition"
-msgstr "నియమాన�ని జతచేయ�మ� (_d)"
-
-#: ../filter/e-filter-rule.c:732
+#: ../filter/e-filter-rule.c:721
 msgid "If all conditions are met"
 msgstr "ఒకవేళ అన�ని నియమాల� సరితూగితే"
 
-#: ../filter/e-filter-rule.c:733
+#: ../filter/e-filter-rule.c:722
 msgid "If any conditions are met"
 msgstr "� నియమాల� అయినా సరితూగితే"
 
-#: ../filter/e-filter-rule.c:736
+#: ../filter/e-filter-rule.c:725
 msgid "_Find items:"
 msgstr "అంశాలన� కన�గొన�మ�(_F):"
 
-#: ../filter/e-filter-rule.c:760
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#: ../filter/e-filter-rule.c:754
+msgid "None"
+msgstr "�దికాద�"
+
+#: ../filter/e-filter-rule.c:755
 msgid "All related"
 msgstr "సంభందితమ�ల� అన�నీన�"
 
-#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
+#: ../filter/e-filter-rule.c:756 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "ప�రత�య�త�తరమ�ల�"
 
-#: ../filter/e-filter-rule.c:762
+#: ../filter/e-filter-rule.c:757
 msgid "Replies and parents"
 msgstr "మాత�ర�కల� మరియ� ప�రత�య�త�తరమ�ల�"
 
-#: ../filter/e-filter-rule.c:763
+#: ../filter/e-filter-rule.c:758
 msgid "No reply or parent"
 msgstr "� ప�రత�య�తరమ� లేదా మాత�ర�క లేద�"
 
-#: ../filter/e-filter-rule.c:766
-msgid "I_nclude threads"
+#: ../filter/e-filter-rule.c:761
+#, fuzzy
+#| msgid "I_nclude threads"
+msgid "I_nclude threads:"
 msgstr "తంత�లన� చేర�చ�మ�(_n)"
 
-#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:304
+#: ../filter/e-filter-rule.c:786
+msgid "A_dd Condition"
+msgstr "నియమాన�ని జతచేయ�మ� (_d)"
+
+#: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:321
 msgid "Incoming"
 msgstr "లోపలికివచ�చ�"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
+#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:322
 msgid "Outgoing"
 msgstr "బయటక� వెళ�ళ�"
 
-#: ../filter/e-rule-editor.c:265
+#: ../filter/e-rule-editor.c:270
 msgid "Add Rule"
 msgstr "నియమాన�ని జతచేయ�మ�"
 
-#: ../filter/e-rule-editor.c:352
+#: ../filter/e-rule-editor.c:359
 msgid "Edit Rule"
 msgstr "నియమాన�ని సరిచేయ�మ�"
 
@@ -9284,7 +8143,7 @@ msgstr "రెగ�యలర� ఎక�సప�రెషన� న� కం
 
 #: ../filter/filter.error.xml.h:3
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "దస�త�రం &quot;{0}&quot; వాడ�కలో లేద� లేదా అది రోజ� వాడ�కలో లేని దస�త�రం."
+msgstr "ఫైల� &quot;{0}&quot; వాడ�కలో లేద� లేదా అది రోజ� వాడ�కలో లేని ఫైల�."
 
 #: ../filter/filter.error.xml.h:4
 msgid "Missing date."
@@ -9292,15 +8151,15 @@ msgstr "తప�పిపోయిన తేది."
 
 #: ../filter/filter.error.xml.h:5
 msgid "Missing file name."
-msgstr "తప�పిపోయిన దస�త�రం నామమ�."
+msgstr "తప�పిపోయిన ఫైల� పేర�."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
 msgid "Missing name."
-msgstr "తప�పిపోయిన నామమ�."
+msgstr "తప�పిపోయిన పేర�."
 
 #: ../filter/filter.error.xml.h:7
 msgid "Name &quot;{0}&quot; already used."
-msgstr "నామమ� &quot;{0}&quot; ఇప�పటికే ఉపయోగంలోఉంది."
+msgstr "పేర� &quot;{0}&quot; ఇప�పటికే ఉపయోగంలోఉంది."
 
 #: ../filter/filter.error.xml.h:8
 msgid "Please choose another name."
@@ -9312,11 +8171,11 @@ msgstr "మీరà±� తపà±�పకà±�à°‚à°¡à°¾ à°’à°• తేదీని à°Žà°
 
 #: ../filter/filter.error.xml.h:10
 msgid "You must name this filter."
-msgstr "మీర� ఈ వడపోతక� నామమ� ఉంచవలెన�."
+msgstr "మీర� ఈ వడపోతక� పేర� ఉంచవలెన�."
 
 #: ../filter/filter.error.xml.h:11
 msgid "You must specify a file name."
-msgstr "మీర� ఒక దస�త�రనామమ�న� తెల�పవలెన�."
+msgstr "మీర� ఒక దస�త�రపేర�న� తెల�పవలెన�."
 
 #: ../filter/filter.ui.h:1
 msgid "Compare against"
@@ -9350,7 +8209,7 @@ msgstr ""
 "సందేశం యొక�క తేది వడపోత ఎప�ప�డ� అవసరమౌత�ందో\n"
 "ఆప�పటి సమయం తో పోల�చబడ�త�ంది."
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:194
 msgid "_Filter Rules"
 msgstr "వడపోత నియమాల�(_F)"
 
@@ -9380,14 +8239,14 @@ msgstr ""
 msgid "months"
 msgstr "నెల"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
+#: ../filter/filter.ui.h:19
 msgid "seconds"
 msgstr "సెకన�ల�"
 
 #: ../filter/filter.ui.h:20
 #, fuzzy
 msgid "the current time"
-msgstr "ప�రస�త�త దస�త�రాన�ని దాయ�మ�"
+msgstr "ప�రస�త�త ఫైల�న� దాయ�మ�"
 
 #: ../filter/filter.ui.h:21
 msgid "the time you specify"
@@ -9398,26 +8257,176 @@ msgstr ""
 msgid "years"
 msgstr "పీఠికల�"
 
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:863 ../widgets/misc/e-signature-combo-box.c:75
+#, fuzzy
+msgctxt "mail-signature"
+msgid "None"
+msgstr "�దికాద�"
+
+#: ../mail/em-account-editor.c:946
+msgid "Never"
+msgstr "ఎప�పటికివద�ద�"
+
+#: ../mail/em-account-editor.c:947
+msgid "Always"
+msgstr "యెల�లప�ప�డ�"
+
+#: ../mail/em-account-editor.c:948
+msgid "Ask for each message"
+msgstr "ప�రతి సందేశం కొరక� అడ�గ�మ�"
+
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1833 ../widgets/misc/e-account-tree-view.c:131
+#, fuzzy
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "�దికాద�"
+
+#: ../mail/em-account-editor.c:2237
+#, fuzzy
+#| msgid "_File:"
+msgid "Fil_e:"
+msgstr "ఫైల�(_F):"
+
+#: ../mail/em-account-editor.c:2237 ../mail/mail-config.ui.h:157
+msgid "_Path:"
+msgstr "పాత�(_P):"
+
+#: ../mail/em-account-editor.c:2286
+msgid "Mail Configuration"
+msgstr "మెయిల� ఆకృతీకరణ"
+
+#: ../mail/em-account-editor.c:2287
+#, fuzzy
+#| msgid ""
+#| "Welcome to the Evolution Mail Configuration Assistant.\n"
+#| "\n"
+#| "Click \"Forward\" to begin."
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"ఎవాల�యూషన� మెయిల� ఆకృతీకరణ సహాయకిక� స�వాగతం.\n"
+"\n"
+"ప�రారంభించ�టక� \"మ�ంద�క�పంప�\"న� నొక�క�మ�. "
+
+#: ../mail/em-account-editor.c:2290
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"దయచేసి క�రింద మీ పేర� మరియ� ఈమెయిల� చిర�నామాన� ప�రవేశపెట�ట�మ�. క�రిందన ఉన�న "
+"\"�చ�చిక\" క�షేత�రాల� "
+"నింపవలిసిన అవసరంలేద�, మీర� ఈ సమాచారంన� కూడా మీర� పంపే ఈమెయిల� నంద� చేర�చాలి "
+"అన�క�ంటే తప�ప."
+
+#: ../mail/em-account-editor.c:2292 ../mail/em-account-editor.c:2484
+msgid "Receiving Email"
+msgstr "మెయిల� న� తీస�క�ంటోంది"
+
+#: ../mail/em-account-editor.c:2293
+msgid "Please configure the following account settings."
+msgstr "దయచేసి క�రింది ఖాతా అమరికలన� ఆకృతీకరించ�మ�."
+
+#: ../mail/em-account-editor.c:2295 ../mail/em-account-editor.c:3081
+msgid "Sending Email"
+msgstr "ఈమెయిల� పంపిస�త�న�నది"
+
+#: ../mail/em-account-editor.c:2296
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"మీర� మెయిల� పంపించ� విధానం గ�రించి దయచేసి సమాచారంన� ప�రవేశపెట�టండి. మీక� "
+"ఖచ�చితంగా తెలియకపోతే, మీ సిస�టమ� "
+"నిర�వాహక�ని గాని లేక ఇంటర�నెట� సేవా దార�నిగాని అడగండి."
+
+#: ../mail/em-account-editor.c:2298 ../mail/mail-config.ui.h:1
+#, fuzzy
+msgid "Account Information"
+msgstr "సమాచారం లేద�"
+
+#: ../mail/em-account-editor.c:2299
+#, fuzzy
+msgid ""
+"Please enter a descriptive name for this account below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"క�రింది ఖాళినంద� ఈ ఖాతా కొరక� దయచేసి విశదీకృత పేర�న� ప�రవేశపెట�ట�మ�. ఈ పేర� "
+"ప�రదర�శించ�టక� మాత�రమే "
+"వ�పయోగించబడ�త�ంది."
+
+#: ../mail/em-account-editor.c:2303
+msgid "Done"
+msgstr "అయినది"
+
+#: ../mail/em-account-editor.c:2304
+#, fuzzy
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"ధన�యవాదమ�ల�, మీ మెయిల� ఆకృతీకరణ పూర�తైనది.\n"
+"\n"
+"మీర� ఎవాల�యూషన� ఉపయోగించి మెయిల�స� న� పంప�టక� మరియ�\n"
+"స�వీకరించ�టక� ఇప�ప�డ� సిద�దంగా ఉన�నార�.\n"
+"\n"
+"మీ అమరికలన� దాయ�టక� \"ఆపాదించ�\" న� నొక�కండి."
+
+#: ../mail/em-account-editor.c:2843
+msgid "Check for _new messages every"
+msgstr "కొత�త సందేశాల కొరక� వెత�క�మ� (_n)"
+
+#: ../mail/em-account-editor.c:2851
+msgid "minu_tes"
+msgstr "నిమిషాల�(_t)"
+
+#: ../mail/em-account-editor.c:3520 ../mail/mail-config.ui.h:101
+msgid "Security"
+msgstr "రక�షణ"
+
+#. Most sections for this is auto-generated from the camel config
+#. Most sections for this is auto-generated fromt the camel config
+#: ../mail/em-account-editor.c:3575 ../mail/em-account-editor.c:3658
+msgid "Receiving Options"
+msgstr "�చ�చికాలన� తిరిగిపొంద�త�ంది"
+
+#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
+msgid "Checking for New Messages"
+msgstr "కొత�త సందేశాల కొరక� పరిశీలిస�త�న�నది"
+
 #: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1027 ../mail/mail-config.ui.h:15
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
-#: ../widgets/misc/e-attachment-paned.c:123
+#: ../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
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "అన�భందమ�"
 msgstr[1] "అన�భందమ�"
 
-#: ../mail/e-mail-attachment-bar.c:586
-#: ../widgets/misc/e-attachment-paned.c:581
+#: ../mail/e-mail-attachment-bar.c:608
+#: ../widgets/misc/e-attachment-paned.c:623
 msgid "Icon View"
 msgstr "ప�రతిమ దర�శనమ�"
 
-#: ../mail/e-mail-attachment-bar.c:587
-#: ../widgets/misc/e-attachment-paned.c:582
+#: ../mail/e-mail-attachment-bar.c:610
+#: ../widgets/misc/e-attachment-paned.c:625
 msgid "List View"
 msgstr "జాబితా దర�శనం"
 
-#: ../mail/e-mail-browser.c:265
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1441
+msgid "Close this window"
+msgstr "ఈ గవాక�షాన�ని మూయ�మ�"
+
+#: ../mail/e-mail-browser.c:293
 #, fuzzy
 msgid "(No Subject)"
 msgstr "సంగతి"
@@ -9437,15 +8446,88 @@ msgstr "ఈ చిర�నామాక�(_T)"
 msgid "_From This Address"
 msgstr "ఈ చిర�నామా న�ండి(_F)"
 
+#: ../mail/e-mail-display.c:87
+#, fuzzy
+#| msgid "_Send To..."
+msgid "Send _Reply To..."
+msgstr "దీనికి పంపించ�... (_S)"
+
 #: ../mail/e-mail-display.c:89
 #, fuzzy
+msgid "Send a reply message to this address"
+msgstr "మెయిల� సందేశాన�ని కర�తవ�యానికి మార�చ�మ�."
+
+#: ../mail/e-mail-display.c:96
+#, fuzzy
 msgid "Create Search _Folder"
-msgstr "శోధన సంచయాన�ని సృష�టించ�మ�(_S)"
+msgstr "అన�వేషణ సంచయాన�ని సృష�టించ�మ�(_S)"
+
+#: ../mail/e-mail-folder-utils.c:111
+#, fuzzy, c-format
+msgid "Saving message to folder '%s'"
+msgstr "సందేశాన�ని సంచయంక� దాయ�చ�న�నది"
+
+#: ../mail/e-mail-folder-utils.c:274
+msgid "Forwarded messages"
+msgstr "మ�ంద�క�పంపిన సందేశాల�"
+
+#: ../mail/e-mail-folder-utils.c:391
+#, fuzzy
+msgid "Scanning messages for duplicates"
+msgstr "సందేశాన�ని సంచయంక� దాయ�చ�న�నది"
+
+#: ../mail/e-mail-folder-utils.c:584
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "%d సందేశాన�ని వెలికితీస�త�ంది"
+msgstr[1] "%d సందేశాలన� వెలికితీస�త�ంది"
+
+#: ../mail/e-mail-folder-utils.c:834
+#, fuzzy, c-format
+msgid "Removing folder '%s'"
+msgstr "%s సంచయాన�ని తొలగిస�త�న�నది"
+
+#: ../mail/e-mail-folder-utils.c:968
+#, fuzzy, c-format
+#| msgid "All accounts have been removed."
+msgid "File \"%s\" has been removed."
+msgstr "అన�ని ఖాతాల� తొలగించబడినవి."
+
+#: ../mail/e-mail-folder-utils.c:972
+#, fuzzy
+#| msgid "All accounts have been removed."
+msgid "File has been removed."
+msgstr "అన�ని ఖాతాల� తొలగించబడినవి."
+
+#: ../mail/e-mail-folder-utils.c:1031
+#, fuzzy
+#| msgid "Saving attachment"
+msgid "Removing attachments"
+msgstr "అన�బంధాన�ని దాస�త�న�నది"
 
-#: ../mail/e-mail-label-dialog.c:220
+#: ../mail/e-mail-folder-utils.c:1195
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messages"
+msgstr[0] "%d సందేశాన�ని దాస�త�ంది"
+msgstr[1] "%d సందేశాన�ని దాస�త�ంది"
+
+#: ../mail/e-mail-folder-utils.c:1539 ../mail/em-folder-utils.c:613
+#, fuzzy, c-format
+msgid "Invalid folder URI '%s'"
+msgstr "చెల�లని సంచయం: `%s'"
+
+#. Label + combo box has a 12px left margin so it's
+#. * aligned with the junk mail options above it.
+#: ../mail/e-mail-junk-options.c:252
+msgid "Junk filtering software:"
+msgstr ""
+
+#: ../mail/e-mail-label-dialog.c:223
 #, fuzzy
 msgid "_Label name:"
-msgstr "లేబ�ల� నామమ�(_N):"
+msgstr "లేబ�ల� పేర�(_N):"
 
 #: ../mail/e-mail-label-list-store.c:41
 msgid "I_mportant"
@@ -9472,928 +8554,942 @@ msgid "_Later"
 msgstr "తర�వాత(_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:478
+#: ../modules/mail/e-mail-shell-view-actions.c:684
 msgid "Add Label"
 msgstr "లేబ�ల� న� జతచేయ�మ�"
 
 #: ../mail/e-mail-label-manager.c:216
 msgid "Edit Label"
-msgstr "లేబ�ల� నామమ�"
+msgstr "లేబ�ల� పేర�"
 
-#: ../mail/e-mail-label-manager.c:349
+#: ../mail/e-mail-label-manager.c:350
 #, fuzzy
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
 msgstr ""
-"గమనిక: లేబ�ల� నామమ�నంద� ఉన�న క�రిందిగీత మెనూ నంద� సంభందిత గ�ర�తింప�దారి గా ఉపయోగపడ�త�ంది."
+"గమనిక: లేబ�ల� పేర�నంద� ఉన�న క�రిందిగీత మెనూ నంద� సంభందిత గ�ర�తింప�దారి గా "
+"ఉపయోగపడ�త�ంది."
 
-#: ../mail/e-mail-label-tree-view.c:86
+#: ../mail/e-mail-label-tree-view.c:88
 msgid "Color"
 msgstr "వర�ణమ�"
 
-#: ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1163
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:334
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../mail/e-mail-label-tree-view.c:98
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../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 "నామమ�"
+msgstr "పేర�"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
-#: ../mail/em-folder-tree-model.c:700 ../mail/em-folder-tree.c:2759
-#: ../modules/mail/e-mail-shell-view-private.c:1008
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:312
+#: ../mail/em-folder-tree-model.c:720
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "ఇన�‌బాక�స�"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:693
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:713
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "డ�రాఫ�ట�"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:703
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:724
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "అవ�ట�‌బాక�స�"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:705
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:728
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "పంపిన"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:696
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:716
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:573
+#: ../plugins/templates/templates.c:1034 ../plugins/templates/templates.c:1312
+#: ../plugins/templates/templates.c:1322
 msgid "Templates"
 msgstr "మాదిరిల�"
 
-#: ../mail/e-mail-migrate.c:131
+#: ../mail/e-mail-migrate.c:134
 msgid "Migrating..."
 msgstr "వలసపోతూ వ�న�న..."
 
-#: ../mail/e-mail-migrate.c:164
+#: ../mail/e-mail-migrate.c:169
 msgid "Migration"
 msgstr "వలసపంప�ట"
 
-#: ../mail/e-mail-migrate.c:204
+#: ../mail/e-mail-migrate.c:210
 #, c-format
 msgid "Migrating '%s':"
 msgstr "వలసపోతూవ�న�న '%s':"
 
-#: ../mail/e-mail-migrate.c:649
+#: ../mail/e-mail-migrate.c:728
 msgid "Migrating Folders"
 msgstr "సంచయాలన� వలసపంప�చ�న�నది"
 
-#: ../mail/e-mail-migrate.c:650
+#: ../mail/e-mail-migrate.c:729
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"ఎనాల�యూషన� 2.24 న�ండి ఎవాల�యూషన� మెయిల�‌పెట�టె సంచయాల యొక�క సంక�షిప�త రూపంన� sqliteక� మార�చబడింది.\n"
+"ఎనాల�యూషన� 2.24 న�ండి ఎవాల�యూషన� మెయిల�‌పెట�టె సంచయాల యొక�క సంక�షిప�త రూపంన� "
+"sqliteక� మార�చబడింది.\n"
 "\n"
 "ఎవాల�యూషన� మీ సంచయాలన� వలసపంప�త�న�నప�ప�డ� దయచేసి వోర�ప�తో వ�ండండి..."
 
-#: ../mail/e-mail-migrate.c:739
+#: ../mail/e-mail-migrate.c:1527
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "స�థానిక మెయిల� సంచయాలన� `%s' వద�ద సృష�టించలేక పోయింది: %s"
 
-#. XXX e-error should provide a widget layout and API suitable
-#. *     for packing additional widgets to the right of the alert
-#. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:109
-#: ../modules/calendar/e-task-shell-view-actions.c:570
+#: ../mail/e-mail-notebook-view.c:621
 #, fuzzy
-msgid "Do not ask me again"
-msgstr "నన�న� మళ�ళీ అడగొద�ద�."
+#| msgid "Please select a user."
+msgid "Please select a folder"
+msgstr "దయచేసి వినియోగదారిని ఎంపికచేస�కొన�మ�."
 
-#: ../mail/e-mail-reader.c:270 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "సంచయాన�ని నకల�తీయ�మ�"
 
-#: ../mail/e-mail-reader.c:270 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "నకల�తీయ�మ�(_o)"
 
-#: ../mail/e-mail-reader.c:644 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "సంచయంక� కద�ప�మ�"
 
-#: ../mail/e-mail-reader.c:644 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "జర�ప�(_M)"
 
-#. Check buttons
-#: ../mail/e-mail-reader.c:872 ../mail/e-mail-reader.c:982
-#: ../mail/e-mail-reader.c:1016
+#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1403
 #, fuzzy
 msgid "_Do not ask me again."
 msgstr "నన�న� మళ�ళీ అడగొద�ద�."
 
-#: ../mail/e-mail-reader.c:1020
+#: ../mail/e-mail-reader.c:1409
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1105
-#, fuzzy
-msgid "Save Message"
-msgid_plural "Save Messages"
-msgstr[0] "సందేశంన� దాయ�మ�..."
-msgstr[1] "సందేశంన� దాయ�మ�..."
-
-#. Translators: This is a part of a suggested file name
-#. * used when saving a message or multiple messages to an
-#. * mbox format, when the first message doesn't have a
-#. * Subject. The extension ".mbox" is appended to this
-#. * string, thus it will be something like "Message.mbox"
-#. * at the end.
-#: ../mail/e-mail-reader.c:1126
-#: ../plugins/groupwise-features/properties.ui.h:4
-#, fuzzy
-msgid "Message"
-msgid_plural "Messages"
-msgstr[0] "సందేశం"
-msgstr[1] "సందేశం"
-
-#: ../mail/e-mail-reader.c:1384
+#: ../mail/e-mail-reader.c:1775
 msgid "A_dd Sender to Address Book"
 msgstr "చిర�నామా ప�స�తకానికి మెయిల� పంపించ�వాన�ని జతపర�చ�(_d)"
 
-#: ../mail/e-mail-reader.c:1386
+#: ../mail/e-mail-reader.c:1777
 #, fuzzy
 msgid "Add sender to address book"
 msgstr "చిర�నామా ప�స�తకానికి మెయిల� పంపించ�వాన�ని జతపర�చ�"
 
-#: ../mail/e-mail-reader.c:1391
+#: ../mail/e-mail-reader.c:1782
 msgid "Check for _Junk"
 msgstr "నిరర�ధకం కొరక� పరిశీలించ�మ�(_J)"
 
-#: ../mail/e-mail-reader.c:1393
+#: ../mail/e-mail-reader.c:1784
 msgid "Filter the selected messages for junk status"
 msgstr "నిరర�ధకమైన వాటి స�థితి కొర� ఎంపికచేసిన సందేశాలన� వడపోయ�మ�"
 
-#: ../mail/e-mail-reader.c:1398
+#: ../mail/e-mail-reader.c:1789
 msgid "_Copy to Folder..."
 msgstr "సంచయంక� నకల�తీయ�మ�(_C)..."
 
-#: ../mail/e-mail-reader.c:1400
+#: ../mail/e-mail-reader.c:1791
 msgid "Copy selected messages to another folder"
 msgstr "ఎంచ�క�న�న సందేశాలన� వేరే సంచయానికి నకల� తీయ�మ�"
 
-#: ../mail/e-mail-reader.c:1405
+#: ../mail/e-mail-reader.c:1796
 msgid "_Delete Message"
 msgstr "సందేశాన�ని తొలగించ�మ�(_D)"
 
-#: ../mail/e-mail-reader.c:1407
+#: ../mail/e-mail-reader.c:1798
 msgid "Mark the selected messages for deletion"
 msgstr "ఎంచ�క�న�న సందేశాలన� తొలగించ�టక� గ�ర�త�పెట�ట�మ�"
 
-#: ../mail/e-mail-reader.c:1412
+#: ../mail/e-mail-reader.c:1803
 msgid "Filter on Mailing _List..."
 msgstr "మెయిలింగ� జాబితా పై వడపోత(_L)..."
 
-#: ../mail/e-mail-reader.c:1414
+#: ../mail/e-mail-reader.c:1805
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "ఈ మెయిలింగ� జాబితాక� సందేశాలన� వడపోయ�టక� నియమాన�ని సృష�టించ�మ�"
 
-#: ../mail/e-mail-reader.c:1419
+#: ../mail/e-mail-reader.c:1810
 msgid "Filter on _Recipients..."
 msgstr "స�వీకరించ�వారి పై వడపోత(_R)..."
 
-#: ../mail/e-mail-reader.c:1421
+#: ../mail/e-mail-reader.c:1812
 msgid "Create a rule to filter messages to these recipients"
 msgstr "ఈ స�వీకరణదార�ల క� సందేశాలన� వడపోయ�టక� నియమం సృష�టించ�మ�"
 
-#: ../mail/e-mail-reader.c:1426
+#: ../mail/e-mail-reader.c:1817
 msgid "Filter on Se_nder..."
 msgstr "పంపైవాని పై వడపోత(_n)..."
 
-#: ../mail/e-mail-reader.c:1428
+#: ../mail/e-mail-reader.c:1819
 msgid "Create a rule to filter messages from this sender"
 msgstr "ఈ పంపకందారి న�ండి వచ�చ� సందేశాలన� వడపోయ�టక� నియమాన�ని సృష�టించ�మ�"
 
-#: ../mail/e-mail-reader.c:1433
+#: ../mail/e-mail-reader.c:1824
 msgid "Filter on _Subject..."
 msgstr "సంగతి పై వడపోత(_S)..."
 
-#: ../mail/e-mail-reader.c:1435
+#: ../mail/e-mail-reader.c:1826
 msgid "Create a rule to filter messages with this subject"
 msgstr "ఈ సంగతితో సందేశాలన� వడపోయ�టక� నియమాన�ని సృష�టించ�మ�"
 
-#: ../mail/e-mail-reader.c:1440
+#: ../mail/e-mail-reader.c:1831
 msgid "A_pply Filters"
 msgstr "వడపోతలన� ఆపాదించ�మ�(_p)"
 
-#: ../mail/e-mail-reader.c:1442
+#: ../mail/e-mail-reader.c:1833
 msgid "Apply filter rules to the selected messages"
 msgstr "ఎంపికచేసిన సందేశాలక� వడపోత నియమాలన� ఆపాదించ�మ�"
 
-#: ../mail/e-mail-reader.c:1447
+#: ../mail/e-mail-reader.c:1838
 msgid "_Find in Message..."
 msgstr "సందేశంలో కన�గొన�మ�(_F)..."
 
-#: ../mail/e-mail-reader.c:1449
+#: ../mail/e-mail-reader.c:1840
 msgid "Search for text in the body of the displayed message"
 msgstr "ప�రదర�శించబడిన సందేశం మ�ఖ�యభాగమ�లో పాఠ�యమ�న� వెత�క�మ�"
 
-#: ../mail/e-mail-reader.c:1454
+#: ../mail/e-mail-reader.c:1845
 msgid "_Clear Flag"
 msgstr "ప�లాగ� శ�బ�రంచేయ�మ�(_C)"
 
-#: ../mail/e-mail-reader.c:1456
+#: ../mail/e-mail-reader.c:1847
 #, fuzzy
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "ఎంపికచేసన సందేశం న�ండి కొత�త కర�తవ�యాన�ని సృష�టించండి"
 
-#: ../mail/e-mail-reader.c:1461
+#: ../mail/e-mail-reader.c:1852
 msgid "_Flag Completed"
 msgstr "ఫ�లాగ� పూర�తయినది(_F)"
 
-#: ../mail/e-mail-reader.c:1463
+#: ../mail/e-mail-reader.c:1854
 #, fuzzy
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "ఎంపికచేసిన సందేశం లాగా అదే తంతిలోని అన�ని సందేశాలన� ఎంపికచేయ�మ�"
 
-#: ../mail/e-mail-reader.c:1468
+#: ../mail/e-mail-reader.c:1859
 msgid "Follow _Up..."
 msgstr "అన�సరించ�(_U)..."
 
-#: ../mail/e-mail-reader.c:1470
+#: ../mail/e-mail-reader.c:1861
 #, fuzzy
 msgid "Flag the selected messages for follow-up"
 msgstr "అన�సరించ�టక� ఎంపికచేసిన సందేశాలన� ప�లాగ� చేయ�మ�"
 
-#: ../mail/e-mail-reader.c:1475
+#: ../mail/e-mail-reader.c:1866
 msgid "_Attached"
 msgstr "జతపర�చిన(_A)"
 
-#: ../mail/e-mail-reader.c:1477 ../mail/e-mail-reader.c:1484
+#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ఎంచ�క�న�న సందేశాన�ని అన�బంధమ�గా ఒకరికి మ�ంద�క� పంప�మ�"
 
-#: ../mail/e-mail-reader.c:1482
+#: ../mail/e-mail-reader.c:1873
 #, fuzzy
 msgid "Forward As _Attached"
 msgstr "iక�యాలెండర� గా మ�ంద�క� పంపించ�(_F)"
 
-#: ../mail/e-mail-reader.c:1489
+#: ../mail/e-mail-reader.c:1880
 msgid "_Inline"
 msgstr "ఇన�‌లైన�(_I)"
 
-#: ../mail/e-mail-reader.c:1491 ../mail/e-mail-reader.c:1498
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
 msgid "Forward the selected message in the body of a new message"
 msgstr "ఎంచ�క�న�న సందేశాన�ని కొత�త సందేశమ�లో మ�ఖ�యభాగమ�లో మ�ంద�క� పంప�మ�"
 
-#: ../mail/e-mail-reader.c:1496
+#: ../mail/e-mail-reader.c:1887
 #, fuzzy
 msgid "Forward As _Inline"
 msgstr "మ�ంద�క�పంప� శైలి(_F):"
 
-#: ../mail/e-mail-reader.c:1503
+#: ../mail/e-mail-reader.c:1894
 msgid "_Quoted"
 msgstr "కోటెడ�(_Q)"
 
-#: ../mail/e-mail-reader.c:1505 ../mail/e-mail-reader.c:1512
+#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
 msgid "Forward the selected message quoted like a reply"
 msgstr "ప�రత�య�త�రరంగా కోట� చేసి ఎంపికచేసిన సందేశాన�ని మ�ంద�క�పంప�"
 
-#: ../mail/e-mail-reader.c:1510
+#: ../mail/e-mail-reader.c:1901
 #, fuzzy
 msgid "Forward As _Quoted"
 msgstr "మ�ంద�క�పంప� శైలి(_F):"
 
-#: ../mail/e-mail-reader.c:1517
+#: ../mail/e-mail-reader.c:1908
 msgid "_Load Images"
 msgstr "చిత�రమ�లన� నింప�మ�(_L)"
 
-#: ../mail/e-mail-reader.c:1519
+#: ../mail/e-mail-reader.c:1910
 msgid "Force images in HTML mail to be loaded"
 msgstr "HTML మెయిల� నంద� నింప�టక� చిత�రమ�లన� బలవంతపెట�ట�మ�"
 
-#: ../mail/e-mail-reader.c:1524
+#: ../mail/e-mail-reader.c:1915
 msgid "_Important"
 msgstr "మ�ఖ�యమైన(_I)"
 
-#: ../mail/e-mail-reader.c:1526
+#: ../mail/e-mail-reader.c:1917
 msgid "Mark the selected messages as important"
 msgstr "ఎంచ�క�న�న సందేశాలన� మ�ఖ�యమైనవిగా గ�ర�త�పెట�ట�మ�"
 
-#: ../mail/e-mail-reader.c:1531
+#: ../mail/e-mail-reader.c:1922
 msgid "_Junk"
 msgstr "నిరర�ధకం(_J)"
 
-#: ../mail/e-mail-reader.c:1533
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages as junk"
 msgstr "ఎంచిన సందేశాలన� నిరర�దకమైన వాటిగా గ�ర�త�ంచ�మ�"
 
-#: ../mail/e-mail-reader.c:1538
+#: ../mail/e-mail-reader.c:1929
 msgid "_Not Junk"
 msgstr "నిరర�ధకంకాద�(_N)"
 
-#: ../mail/e-mail-reader.c:1540
+#: ../mail/e-mail-reader.c:1931
 msgid "Mark the selected messages as not being junk"
 msgstr "ఎంచిన సందేశాలన� నిరర�ధకంకాని వాటివలె గ�ర�త�ంచ�మ�"
 
-#: ../mail/e-mail-reader.c:1545
+#: ../mail/e-mail-reader.c:1936
 msgid "_Read"
 msgstr "చద�వ�మ�(_R)"
 
-#: ../mail/e-mail-reader.c:1547
+#: ../mail/e-mail-reader.c:1938
 msgid "Mark the selected messages as having been read"
 msgstr "ఎంచ�క�న�న సందేశాలన� చదవబదినవిగా గ�ర�త�పెట�ట�మ�"
 
-#: ../mail/e-mail-reader.c:1552
+#: ../mail/e-mail-reader.c:1943
 msgid "Uni_mportant"
 msgstr "సాధారణమైన(_m)"
 
-#: ../mail/e-mail-reader.c:1554
+#: ../mail/e-mail-reader.c:1945
 msgid "Mark the selected messages as unimportant"
 msgstr "ఎంచ�క�న�న సందేశాల� మ�ఖ�యమ� కానివిగా గ�ర�త�పెట�ట�"
 
-#: ../mail/e-mail-reader.c:1559
+#: ../mail/e-mail-reader.c:1950
 msgid "_Unread"
 msgstr "చదవక�ండా ఉన�నవి(_U)"
 
-#: ../mail/e-mail-reader.c:1561
+#: ../mail/e-mail-reader.c:1952
 msgid "Mark the selected messages as not having been read"
 msgstr "ఎంచ�క�న�న సందేశాల� చదవబడనివిగా గ�ర�త�పెట�ట�"
 
-#: ../mail/e-mail-reader.c:1566
+#: ../mail/e-mail-reader.c:1957
 msgid "_Edit as New Message..."
 msgstr "కొత�త సందేశం లాగా సరిచేయ�మ�(_E)..."
 
-#: ../mail/e-mail-reader.c:1568
+#: ../mail/e-mail-reader.c:1959
 msgid "Open the selected messages in the composer for editing"
 msgstr "ఎంపికచేసిన సందేశాలన� కూర�పరినంద� సరిచేయ�ట కొరక� తెర�వ�మ�"
 
-#: ../mail/e-mail-reader.c:1573
+#: ../mail/e-mail-reader.c:1964
 msgid "Compose _New Message"
 msgstr "కొత�త సందేశం న� కూర�చ�మ�(_N)"
 
-#: ../mail/e-mail-reader.c:1575
+#: ../mail/e-mail-reader.c:1966
 msgid "Open a window for composing a mail message"
 msgstr "మెయిల� సందేశాన�ని కూర�చ�టక� విండోన� తెర�వ�మ�"
 
-#: ../mail/e-mail-reader.c:1580
+#: ../mail/e-mail-reader.c:1971
 msgid "_Open in New Window"
 msgstr " కొత�త గవాక�షమ� లో తెర�వ�మ�(_O)"
 
-#: ../mail/e-mail-reader.c:1582
+#: ../mail/e-mail-reader.c:1973
 msgid "Open the selected messages in a new window"
 msgstr "ఎంచ�క�న�న సందేశాలన� కొత�త గవాక�షమ�లో తెర�వ�మ�"
 
-#: ../mail/e-mail-reader.c:1587
+#: ../mail/e-mail-reader.c:1978
 msgid "_Move to Folder..."
 msgstr "సంచయంక� కద�ప�మ�(_M)..."
 
-#: ../mail/e-mail-reader.c:1589
+#: ../mail/e-mail-reader.c:1980
 msgid "Move selected messages to another folder"
 msgstr "ఎంచ�క�న�న సందేశాలన� వేరొక సంచయానికి జర�ప�మ�"
 
-#: ../mail/e-mail-reader.c:1594
+#: ../mail/e-mail-reader.c:1985
+#, fuzzy
+#| msgid "Switch to %s"
+msgid "_Switch to Folder"
+msgstr "%s క� మార�మ�"
+
+#: ../mail/e-mail-reader.c:1987
+#, fuzzy
+#| msgid "Install the shared folder"
+msgid "Display the parent folder"
+msgstr "భాగస�వామ�య సంచయంన� సంస�థాపించ�మ�"
+
+#: ../mail/e-mail-reader.c:1992
+#, fuzzy
+#| msgid "Switch to %s"
+msgid "Switch to _next tab"
+msgstr "%s క� మార�మ�"
+
+#: ../mail/e-mail-reader.c:1994
+msgid "Switch to the next tab"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1999
+#, fuzzy
+#| msgid "Switch to %s"
+msgid "Switch to _previous tab"
+msgstr "%s క� మార�మ�"
+
+#: ../mail/e-mail-reader.c:2001
+msgid "Switch to the previous tab"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2006
+#, fuzzy
+#| msgid "Close the current file"
+msgid "Cl_ose current tab"
+msgstr "ప�రస�త�త ఫైల�న� మూయ�మ�"
+
+#: ../mail/e-mail-reader.c:2008
+#, fuzzy
+#| msgid "Close the current file"
+msgid "Close current tab"
+msgstr "ప�రస�త�త ఫైల�న� మూయ�మ�"
+
+#: ../mail/e-mail-reader.c:2013
 msgid "_Next Message"
 msgstr "తర�వాతి సందేశం(_N)"
 
-#: ../mail/e-mail-reader.c:1596
+#: ../mail/e-mail-reader.c:2015
 msgid "Display the next message"
 msgstr "తర�వాతి సందేశాన�ని ప�రదర�శించ�మ�"
 
-#: ../mail/e-mail-reader.c:1601
+#: ../mail/e-mail-reader.c:2020
 msgid "Next _Important Message"
 msgstr "తర�వాతి మ�ఖ�య సందేశం(_I)"
 
-#: ../mail/e-mail-reader.c:1603
+#: ../mail/e-mail-reader.c:2022
 msgid "Display the next important message"
 msgstr "తర�వాతి మ�ఖ�య సందేశాన�ని ప�రదర�శించ�మ�"
 
-#: ../mail/e-mail-reader.c:1608
+#: ../mail/e-mail-reader.c:2027
 msgid "Next _Thread"
 msgstr "తర�వాతి తంతి(_T)"
 
-#: ../mail/e-mail-reader.c:1610
+#: ../mail/e-mail-reader.c:2029
 msgid "Display the next thread"
 msgstr "తర�వాతి తంతికి ప�రదర�శించ�మ�"
 
-#: ../mail/e-mail-reader.c:1615
+#: ../mail/e-mail-reader.c:2034
 msgid "Next _Unread Message"
 msgstr "తర�వాతి చదవబడని సందేశం(_U)"
 
-#: ../mail/e-mail-reader.c:1617
+#: ../mail/e-mail-reader.c:2036
 msgid "Display the next unread message"
 msgstr "తర�వాతి చదవబడని సందేశాన�ని ప�రదర�శించ�మ�"
 
-#: ../mail/e-mail-reader.c:1622
+#: ../mail/e-mail-reader.c:2041
 msgid "_Previous Message"
 msgstr "పూర�వప� సందేశం(_P)"
 
-#: ../mail/e-mail-reader.c:1624
+#: ../mail/e-mail-reader.c:2043
 msgid "Display the previous message"
 msgstr "పూర�వప� సందేశాన�ని ప�రదర�శించ�మ�"
 
-#: ../mail/e-mail-reader.c:1629
+#: ../mail/e-mail-reader.c:2048
 msgid "Pr_evious Important Message"
 msgstr "పూర�వప� మ�ఖ�య సందేశం(_e)"
 
-#: ../mail/e-mail-reader.c:1631
+#: ../mail/e-mail-reader.c:2050
 msgid "Display the previous important message"
 msgstr "పూర�వప� మ�ఖ�య సందేశాన�ని ప�రదర�శించ�మ�"
 
-#: ../mail/e-mail-reader.c:1636
+#: ../mail/e-mail-reader.c:2055
+#, fuzzy
+#| msgid "_Previous Message"
+msgid "Previous T_hread"
+msgstr "పూర�వప� సందేశం(_P)"
+
+#: ../mail/e-mail-reader.c:2057
+#, fuzzy
+#| msgid "Display the previous message"
+msgid "Display the previous thread"
+msgstr "పూర�వప� సందేశాన�ని ప�రదర�శించ�మ�"
+
+#: ../mail/e-mail-reader.c:2062
 msgid "P_revious Unread Message"
 msgstr "పూర�వప� చదవబడిన సందేశం(_r)"
 
-#: ../mail/e-mail-reader.c:1638
+#: ../mail/e-mail-reader.c:2064
 msgid "Display the previous unread message"
 msgstr "పూర�వప� చదవబడని సందేశాన�ని ప�రదర�శించ�మ�"
 
-#: ../mail/e-mail-reader.c:1645
+#: ../mail/e-mail-reader.c:2071
 msgid "Print this message"
 msgstr "ఈ సందేశాన�ని మ�ద�రించ�మ�"
 
-#: ../mail/e-mail-reader.c:1652
+#: ../mail/e-mail-reader.c:2078
 msgid "Preview the message to be printed"
 msgstr "మ�ద�రించాల�సిన సందేశాన�ని ప�న:దర�శనం చేయ�మ�"
 
-#: ../mail/e-mail-reader.c:1657
+#: ../mail/e-mail-reader.c:2083
 msgid "Re_direct"
 msgstr "తిరిగినిర�దేశించ�మ�(_d)"
 
-#: ../mail/e-mail-reader.c:1659
+#: ../mail/e-mail-reader.c:2085
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "ఎంపికచేసిన సందేశంన� ఎవరోఒకిరికి తిరిగినిర�దేశించ�మ�(bounce)"
 
-#: ../mail/e-mail-reader.c:1664 ../mail/mail.error.xml.h:91
-#: ../modules/calendar/e-cal-shell-view-actions.c:1459
-#: ../modules/mail/e-mail-attachment-handler.c:139
+#: ../mail/e-mail-reader.c:2090
+#, fuzzy
+#| msgid "Save Attachment"
+#| msgid_plural "Save Attachments"
+msgid "Remo_ve Attachments"
+msgstr "అన�భందమ�న� దాయి"
+
+#: ../mail/e-mail-reader.c:2092
+#, fuzzy
+#| msgid "Save Attachment"
+#| msgid_plural "Save Attachments"
+msgid "Remove attachments"
+msgstr "అన�భందమ�న� దాయి"
+
+#: ../mail/e-mail-reader.c:2097
+#, fuzzy
+#| msgid "Hide S_elected Messages"
+msgid "Remove Du_plicate Messages"
+msgstr "ఎంచ�క�న�న సందేశాలన� అదృశ�యపర�చ�మ�(_e)"
+
+#: ../mail/e-mail-reader.c:2099
+#, fuzzy
+#| msgid "Mark the selected messages for deletion"
+msgid "Checks selected messages for duplicates"
+msgstr "ఎంచ�క�న�న సందేశాలన� తొలగించ�టక� గ�ర�త�పెట�ట�మ�"
+
+#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+#: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "అందరికి ప�రత�య�త�తరమ�ఇవ�వ�(_A)"
 
-#: ../mail/e-mail-reader.c:1666
+#: ../mail/e-mail-reader.c:2106
 #, fuzzy
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "ఎంపికచేసిన సందేశం యొక�క స�వీకరణదార�ల క� ఒక ప�రత�య�త�తరమ� కూర�చ�మ�"
 
-#: ../mail/e-mail-reader.c:1671 ../mail/mail.error.xml.h:92
+#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
 msgid "Reply to _List"
 msgstr "జాబితాకి ప�రత�య�త�తరం(_L)"
 
-#: ../mail/e-mail-reader.c:1673
+#: ../mail/e-mail-reader.c:2113
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "ఎంపికచేసిన సందేశం యొక�క మెయిలింగ� జాబితా క� ప�రత�య�త�తరమ� కూర�చ�మ�"
 
-#: ../mail/e-mail-reader.c:1678
-#: ../modules/mail/e-mail-attachment-handler.c:146
+#: ../mail/e-mail-reader.c:2118
+#: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "పంపకందార�క� ప�రత�య�త�తరం(_R)"
 
-#: ../mail/e-mail-reader.c:1680
+#: ../mail/e-mail-reader.c:2120
 msgid "Compose a reply to the sender of the selected message"
 msgstr "ఎంపికచేసన సందేశం పంపినవానికి ప�రత�య�త�తరం కూర�చ�మ�"
 
-#: ../mail/e-mail-reader.c:1685
+#: ../mail/e-mail-reader.c:2125
 #, fuzzy
 msgid "_Save as mbox..."
 msgstr "ఇలా దాయ�..."
 
-#: ../mail/e-mail-reader.c:1687
+#: ../mail/e-mail-reader.c:2127
 #, fuzzy
 msgid "Save selected messages as an mbox file"
 msgstr "ఎంచ�క�న�న సందేశాలన� పాఠ�య దస�త�రమ�గా దాయ�మ�"
 
-#: ../mail/e-mail-reader.c:1692
-msgid "Search Folder from Mailing _List..."
-msgstr "మెయిలింగ� జాబితా న�ండి సంచయాన�ని వెత�క�మ�..."
-
-#: ../mail/e-mail-reader.c:1694
-#, fuzzy
-msgid "Create a search folder for this mailing list"
-msgstr "మెయిల� జాబితాలో వెత�క� సంచయాన�ని సృష�టించ�మ�"
-
-#: ../mail/e-mail-reader.c:1699
-msgid "Search Folder from Recipien_ts..."
-msgstr "తీస�క�న�నవాటి న�ండి సంచయాన�ని వెత�క�మ�(_t).."
-
-#: ../mail/e-mail-reader.c:1701
-#, fuzzy
-msgid "Create a search folder for these recipients"
-msgstr "మెయిల� స�వీకరించ�వారికి వెత�క� సంచయాన�ని సృష�టించ�మ�"
-
-#: ../mail/e-mail-reader.c:1706
-msgid "Search Folder from Sen_der..."
-msgstr "పంపినదాన�ని న�ండి సంచయాన�ని వెత�క�మ�..."
-
-#: ../mail/e-mail-reader.c:1708
-#, fuzzy
-msgid "Create a search folder for this sender"
-msgstr "మెయిల� పంపించ�దానికి వెత�క� సంచయాన�ని సృష�టించ�మ�"
-
-#: ../mail/e-mail-reader.c:1713
-msgid "Search Folder from S_ubject..."
-msgstr "సంగతి న�ండి సంచయాన�ని వెత�క�మ�(_u)..."
-
-#: ../mail/e-mail-reader.c:1715
-#, fuzzy
-msgid "Create a search folder for this subject"
-msgstr "ఈ విషయానికి వెత�క� సంచయాన�ని సృష�టించ�మ�"
-
-#: ../mail/e-mail-reader.c:1720
+#: ../mail/e-mail-reader.c:2132
 msgid "_Message Source"
 msgstr "సందేశం మూలం(_M)"
 
-#: ../mail/e-mail-reader.c:1722
+#: ../mail/e-mail-reader.c:2134
 msgid "Show the raw email source of the message"
 msgstr "సందేశం మ�డివనర�ని ఈ మెయిల� ద�వారా చూప�మ�"
 
-#: ../mail/e-mail-reader.c:1734
+#: ../mail/e-mail-reader.c:2146
 msgid "_Undelete Message"
 msgstr "సందేశాన�ని తొలగించవద�ద�(_U)"
 
-#: ../mail/e-mail-reader.c:1736
+#: ../mail/e-mail-reader.c:2148
 msgid "Undelete the selected messages"
 msgstr "ఎంపిక చేస�క�న�న సందేశాలని తొలగించవద�ద�"
 
-#: ../mail/e-mail-reader.c:1741
+#: ../mail/e-mail-reader.c:2153
 msgid "_Normal Size"
 msgstr "సాధారణ పరిమాణం(_N)"
 
-#: ../mail/e-mail-reader.c:1743
+#: ../mail/e-mail-reader.c:2155
 msgid "Reset the text to its original size"
 msgstr "పాఠ�యమ�న� అసలైన పరిమాణానికి ప�న:అమర�చ�మ�"
 
-#: ../mail/e-mail-reader.c:1748
+#: ../mail/e-mail-reader.c:2160
 msgid "_Zoom In"
 msgstr "జూమ� లోపలికి(_Z)"
 
-#: ../mail/e-mail-reader.c:1750
+#: ../mail/e-mail-reader.c:2162
 msgid "Increase the text size"
 msgstr "పాఠ�య పరిమాణాన�ని పెంచ�మ�"
 
-#: ../mail/e-mail-reader.c:1755
+#: ../mail/e-mail-reader.c:2167
 msgid "Zoom _Out"
 msgstr "జూమ� వెల�పలకి(_O)"
 
-#: ../mail/e-mail-reader.c:1757
+#: ../mail/e-mail-reader.c:2169
 msgid "Decrease the text size"
 msgstr "పాఠ�య పరిమాణాన�ని తగ�గించ�మ�"
 
-#: ../mail/e-mail-reader.c:1764
+#: ../mail/e-mail-reader.c:2176
 msgid "Create R_ule"
 msgstr "సూత�రమ�న� సృష�టించ�మ�(_u)"
 
-#: ../mail/e-mail-reader.c:1771
+#: ../mail/e-mail-reader.c:2183
 msgid "Ch_aracter Encoding"
 msgstr "అక�షర సంకేతరచన(_a)"
 
-#: ../mail/e-mail-reader.c:1778
+#: ../mail/e-mail-reader.c:2190
 #, fuzzy
 msgid "F_orward As"
 msgstr "ఇలా పంప�మ�(_o)..."
 
-#: ../mail/e-mail-reader.c:1785
+#: ../mail/e-mail-reader.c:2197
 #, fuzzy
 msgid "_Group Reply"
 msgstr "ప�రత�య�త�తరమ�(_R):"
 
-#: ../mail/e-mail-reader.c:1792
+#: ../mail/e-mail-reader.c:2204
 msgid "_Go To"
 msgstr "వెళ�ళ�(_G)"
 
-#: ../mail/e-mail-reader.c:1799
+#: ../mail/e-mail-reader.c:2211
 #, fuzzy
 msgid "Mar_k As"
 msgstr "ఇలా గ�ర�త�పెట�ట�(_k)"
 
-#: ../mail/e-mail-reader.c:1806
+#: ../mail/e-mail-reader.c:2218
 msgid "_Message"
 msgstr "సందేశం(_M)"
 
-#: ../mail/e-mail-reader.c:1813
+#: ../mail/e-mail-reader.c:2225
 msgid "_Zoom"
 msgstr "జూమ�(_Z)"
 
-#: ../mail/e-mail-reader.c:1838
+#: ../mail/e-mail-reader.c:2235
+msgid "Search Folder from Mailing _List..."
+msgstr "మెయిలింగ� జాబితా న�ండి సంచయాన�ని వెత�క�మ�..."
+
+#: ../mail/e-mail-reader.c:2237
+#, fuzzy
+msgid "Create a search folder for this mailing list"
+msgstr "మెయిల� జాబితాలో వెత�క� సంచయాన�ని సృష�టించ�మ�"
+
+#: ../mail/e-mail-reader.c:2242
+msgid "Search Folder from Recipien_ts..."
+msgstr "తీస�క�న�నవాటి న�ండి సంచయాన�ని వెత�క�మ�(_t).."
+
+#: ../mail/e-mail-reader.c:2244
+#, fuzzy
+msgid "Create a search folder for these recipients"
+msgstr "మెయిల� స�వీకరించ�వారికి వెత�క� సంచయాన�ని సృష�టించ�మ�"
+
+#: ../mail/e-mail-reader.c:2249
+msgid "Search Folder from Sen_der..."
+msgstr "పంపినదాన�ని న�ండి సంచయాన�ని వెత�క�మ�..."
+
+#: ../mail/e-mail-reader.c:2251
+#, fuzzy
+msgid "Create a search folder for this sender"
+msgstr "మెయిల� పంపించ�దానికి వెత�క� సంచయాన�ని సృష�టించ�మ�"
+
+#: ../mail/e-mail-reader.c:2256
+msgid "Search Folder from S_ubject..."
+msgstr "సంగతి న�ండి సంచయాన�ని వెత�క�మ�(_u)..."
+
+#: ../mail/e-mail-reader.c:2258
+#, fuzzy
+msgid "Create a search folder for this subject"
+msgstr "ఈ విషయానికి వెత�క� సంచయాన�ని సృష�టించ�మ�"
+
+#: ../mail/e-mail-reader.c:2281
 msgid "Mark for Follo_w Up..."
 msgstr "అన�సరించ�ట కొరక� గ�ర�త�ంచ�మ�(_w)..."
 
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:2289
 msgid "Mark as _Important"
 msgstr "మ�ఖ�యమైన దానివలె గ�ర�తించ�మ�(_I)"
 
-#: ../mail/e-mail-reader.c:1850
+#: ../mail/e-mail-reader.c:2293
 msgid "Mark as _Junk"
 msgstr "నిరర�ధకమైన దానివలె గ�ర�తించ�మ�(_J)"
 
-#: ../mail/e-mail-reader.c:1854
+#: ../mail/e-mail-reader.c:2297
 msgid "Mark as _Not Junk"
 msgstr "నిరర�ధకం కానిదానివలె గ�ర�తించ�మ�(_N)"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:2301
 msgid "Mar_k as Read"
 msgstr "చదివినదానివలె గ�ర�తించ�మ�(_k)"
 
-#: ../mail/e-mail-reader.c:1862
+#: ../mail/e-mail-reader.c:2305
 #, fuzzy
 msgid "Mark as Uni_mportant"
 msgstr "అమ�ఖ�యమైన దానివలె గ�ర�తించ�మ�(_i)"
 
-#: ../mail/e-mail-reader.c:1866
+#: ../mail/e-mail-reader.c:2309
 msgid "Mark as _Unread"
 msgstr "చదవనిదానివలె గర�తించ�మ�(_U)"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:2353
 msgid "_Caret Mode"
 msgstr "అక�షరరీతి(_C)"
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:2355
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "ప�రదర�శించబడిన సందేశాల మ�ఖ�యభాగమ�లో మిణ�గ�ర� మ�ల�క�న� చూపించ�మ�"
 
-#: ../mail/e-mail-reader.c:1910
+#: ../mail/e-mail-reader.c:2361
 msgid "All Message _Headers"
 msgstr "అన�ని సందేశ పీఠికల�(_H)"
 
-#: ../mail/e-mail-reader.c:1912
+#: ../mail/e-mail-reader.c:2363
 msgid "Show messages with all email headers"
 msgstr "ఈ మెయిల� పీఠికలతో సందేశాలన� చూప�మ�"
 
-#: ../mail/e-mail-reader.c:2133
-msgid "Unable to retrieve message"
-msgstr "సందేశాన�ని వెలికితీయలేద�."
-
-#: ../mail/e-mail-reader.c:2193 ../mail/mail-ops.c:1891
+#: ../mail/e-mail-reader.c:2659
 #, fuzzy, c-format
 msgid "Retrieving message '%s'"
 msgstr "%s సందేశాన�ని వెలికితీస�త�ంది"
 
 #. we changed user, thus reset the chosen calendar combo too, because
-#. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2724 ../mail/mail-config.ui.h:31
-#: ../plugins/google-account-setup/google-source.c:303
-#: ../plugins/google-account-setup/google-source.c:537
-#: ../plugins/google-account-setup/google-source.c:659
-#: ../widgets/misc/e-account-tree-view.c:234
+#. * other user means other calendars subscribed
+#: ../mail/e-mail-reader.c:3246 ../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
 msgid "Default"
 msgstr "అప�రమేయం"
 
-#: ../mail/e-mail-reader.c:2856
-#: ../modules/mail/e-mail-attachment-handler.c:132
+#: ../mail/e-mail-reader.c:3415
+#: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "మ�ంద�క�పంప�(_F)"
 
-#: ../mail/e-mail-reader.c:2857
+#: ../mail/e-mail-reader.c:3416
 msgid "Forward the selected message to someone"
 msgstr "ఎంచ�క�న�న సందేశాన�ని ఒకరికి మ�ంద�క� పంప�మ�"
 
-#. Likewise the "mail-reply-group" action
-#. For Translators: "Group Reply" will reply either to a mailing list
-#. (if possible and if that configuration option is enabled), or else
-#. it will reply to all. The word "Group" was chosen because it covers
-#. either of those, without too strongly implying one or the other.
-#: ../mail/e-mail-reader.c:2875
+#: ../mail/e-mail-reader.c:3435
 #, fuzzy
 msgid "Group Reply"
 msgstr "అంశాలన� దీని ద�వారా సమూహంచేయ�మ�"
 
-#: ../mail/e-mail-reader.c:2876
+#: ../mail/e-mail-reader.c:3436
 #, fuzzy
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "ఎంపికచేసిన సందేశం యొక�క మెయిలింగ� జాబితా క� ప�రత�య�త�తరమ� కూర�చ�మ�"
 
-#: ../mail/e-mail-reader.c:2921 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:743
+#: ../mail/e-mail-reader.c:3489 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "తొలగించ�"
 
-#: ../mail/e-mail-reader.c:2933
-#: ../modules/calendar/e-cal-shell-view-actions.c:1305
-#: ../widgets/misc/e-calendar.c:193
+#: ../mail/e-mail-reader.c:3522
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "తర�వాతి"
 
-#: ../mail/e-mail-reader.c:2937
-#: ../modules/calendar/e-cal-shell-view-actions.c:1298
-#: ../widgets/misc/e-calendar.c:169
+#: ../mail/e-mail-reader.c:3526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "పూర�వప�"
 
-#: ../mail/e-mail-reader.c:2947 ../mail/mail-dialogs.ui.h:19
+#: ../mail/e-mail-reader.c:3535 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "సమాధానం"
 
-#: ../mail/e-mail-tag-editor.c:292
-msgid "Flag to Follow Up"
-msgstr "అన�సరించ�టక� ప�లాగ�"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:77
-#: ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-msgstr "ఎన�క�రిప�షన� లేద�"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:136
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "TLS encryption"
-msgstr "TLS ఎన�క�రిప�షన�"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../mail/em-account-editor.c:516 ../mail/mail-config.ui.h:105
-#: ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "SSL ఎన�క�రిప�షన�"
+#: ../mail/e-mail-reader.c:4205
+#, fuzzy, c-format
+#| msgid "Folder"
+msgid "Folder '%s'"
+msgstr "సంచయం"
 
-#: ../mail/em-account-editor.c:603
-#, c-format
-msgid "%s License Agreement"
-msgstr "%s లైసెన�స� ఒప�పందం"
+#: ../mail/e-mail-reader-utils.c:145
+#, fuzzy
+msgid "Do not warn me again"
+msgstr "నన�న� మళ�ళీ అడగొద�ద�."
 
-#: ../mail/em-account-editor.c:610
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:670
 #, c-format
 msgid ""
-"\n"
-"Please read carefully the license agreement\n"
-"for %s displayed below\n"
-"and tick the check box for accepting it\n"
-msgstr ""
-"\n"
-"%s కొరక� క�రింద ప�రదర�శించబడిన లైసెన�స� ఒప�పందంన�\n"
-"జాగ�రత�తగా చదవండి మరియ� దానిని ఆమోదించ�టక� చెక�‌బాక�స�న� గ�ర�త�పెట�టండి\n"
+"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?"
+msgstr[0] ""
+msgstr[1] ""
 
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:897 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/e-mail-reader-utils.c:1047
 #, fuzzy
-msgctxt "mail-signature"
-msgid "None"
-msgstr "�దికాద�"
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "సందేశంన� దాయ�మ�..."
+msgstr[1] "సందేశంన� దాయ�మ�..."
 
-#: ../mail/em-account-editor.c:981
-msgid "Never"
-msgstr "ఎప�పటికివద�ద�"
+#. Translators: This is part of a suggested file name
+#. * used when saving a message or multiple messages to
+#. * 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
+#, fuzzy
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "సందేశం"
+msgstr[1] "సందేశం"
 
-#: ../mail/em-account-editor.c:982
-msgid "Always"
-msgstr "యెల�లప�ప�డ�"
+#: ../mail/e-mail-session.c:870
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "%s కొరక� రహస�యపదాన�ని ప�రవేశపెట�టండి"
 
-#: ../mail/em-account-editor.c:983
-msgid "Ask for each message"
-msgstr "ప�రతి సందేశం కొరక� అడ�గ�మ�"
+#: ../mail/e-mail-session.c:874
+msgid "Enter Passphrase"
+msgstr "రహస�యపదమ�న� ప�రవేశపెట�టండి"
 
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1720 ../widgets/misc/e-account-tree-view.c:124
-#, fuzzy
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "�దికాద�"
+#: ../mail/e-mail-session.c:878
+#, c-format
+msgid "Enter Password for %s"
+msgstr "%s క� రహస�యపద ప�రవేశ"
 
-#: ../mail/em-account-editor.c:2095
-msgid "Mail Configuration"
-msgstr "మెయిల� ఆకృతీకరణ"
+#: ../mail/e-mail-session.c:882
+msgid "Enter Password"
+msgstr "రహస�యపదాన�ని ప�రవేశించ�"
 
-#: ../mail/em-account-editor.c:2096
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"ఎవాల�యూషన� మెయిల� ఆకృతీకరణ సహాయకిక� స�వాగతం.\n"
-"\n"
-"ప�రారంభించ�టక� \"మ�ంద�క�పంప�\"న� నొక�క�మ�. "
+#: ../mail/e-mail-session.c:933
+#, c-format
+msgid "User canceled operation."
+msgstr "వినియోగదార�డ� రద�ద�చేసిన కార�యం"
 
-#: ../mail/em-account-editor.c:2099
+#: ../mail/e-mail-session.c:1046
+#, c-format
 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 ""
-"దయచేసి క�రింద మీ నామమ� మరియ� ఈమెయిల� చిర�నామాన� ప�రవేశపెట�ట�మ�. క�రిందన ఉన�న \"�చ�చిక\" క�షేత�రాల� "
-"నింపవలిసిన అవసరంలేద�, మీర� ఈ సమాచారంన� కూడా మీర� పంపే ఈమెయిల� నంద� చేర�చాలి అన�క�ంటే తప�ప."
+"No destination address provided, forward of the message has been cancelled."
+msgstr "� గమ�యస�థానప� చిర�నామా అందివ�వలేద�, సందేశమ�యొక�క కొనసాగింప� రద�దైనది."
 
-#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2258
-#: ../mail/mail-config.ui.h:98
-msgid "Receiving Email"
-msgstr "మెయిల� న� తీస�క�ంటోంది"
+#: ../mail/e-mail-session.c:1055
+#, c-format
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "ఉపయోగించ�టక� � ఖాతా కనబడలేద�, సందేశమ�యొక�క కొనసాగింప� రద�దైనది."
 
-#: ../mail/em-account-editor.c:2102
-msgid "Please configure the following account settings."
-msgstr "దయచేసి క�రింది ఖాతా అమరికలన� ఆకృతీకరించ�మ�."
+#: ../mail/e-mail-session-utils.c:419
+#, fuzzy, c-format
+#| msgid "Expunging and storing account '%s'"
+msgid "Cannot get transport for account '%s'"
+msgstr "ఖాతా '%s' న� కొట�టివేయ�చ�న�నది మరియ� నిల�వచేయ�చ�న�నది"
 
-#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2740
-msgid "Sending Email"
-msgstr "ఈమెయిల� పంపిస�త�న�నది"
+#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:634
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "బయటక�వెళ�ళ� వడపోతలన� ఆపాదించ�టలో వైఫల�యం: %s"
 
-#: ../mail/em-account-editor.c:2105
+#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
+#: ../mail/mail-ops.c:653 ../mail/mail-ops.c:687
+#, fuzzy, c-format
 msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
 msgstr ""
-"మీర� మెయిల� పంపించ� విధానం గ�రించి దయచేసి సమాచారంన� ప�రవేశపెట�టండి. మీక� ఖచ�చితంగా తెలియకపోతే, మీ సిస�టమ� "
-"నిర�వాహక�ని గాని లేక ఇంటర�నెట� సేవా దార�నిగాని అడగండి."
-
-#: ../mail/em-account-editor.c:2107
-msgid "Account Management"
-msgstr "ఖాతా నిర�వహణ"
+"%s క� కల�ప�టలో విఫలమైంది: %s\n"
+"బద�ల�గా స�థానిక `పంపినవాటి' సంచయం క� కల�ప�మ�."
 
-#: ../mail/em-account-editor.c:2108
-#, fuzzy
-msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"క�రింది ఖాళినంద� ఈ ఖాతా కొరక� దయచేసి విశదీకృత నామమ�న� ప�రవేశపెట�ట�మ�. ఈ నామమ� ప�రదర�శించ�టక� మాత�రమే "
-"వ�పయోగించబడ�త�ంది."
+#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:707
+#, fuzzy, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "స�థానిక `పంపినవాటి' సంచయంక� కల�ప�టలో వైఫల�యం: %s"
 
-#: ../mail/em-account-editor.c:2112
-msgid "Done"
-msgstr "అయినది"
+#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:810
+#: ../mail/mail-ops.c:906
+msgid "Sending message"
+msgstr "సందేశాన�ని పంప�త�న�నది"
 
-#: ../mail/em-account-editor.c:2113
-#, fuzzy
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"ధన�యవాదమ�ల�, మీ మెయిల� ఆకృతీకరణ పూర�తైనది.\n"
-"\n"
-"మీర� ఎవాల�యూషన� ఉపయోగించి మెయిల�స� న� పంప�టక� మరియ�\n"
-"స�వీకరించ�టక� ఇప�ప�డ� సిద�దంగా ఉన�నార�.\n"
-"\n"
-"మీ అమరికలన� దాయ�టక� \"ఆపాదించ�\" న� నొక�కండి."
+#: ../mail/e-mail-session-utils.c:873
+#, fuzzy, c-format
+#| msgid "Unsubscribing from folder \"%s\""
+msgid "Unsubscribing from folder '%s'"
+msgstr "సంచయం \"%s\" న�ండి చందాదార�గా విరమించ�కొన�మ�"
 
-#: ../mail/em-account-editor.c:2554
-msgid "Check for _new messages every"
-msgstr "కొత�త సందేశాల కొరక� వెత�క�మ� (_n)"
+#: ../mail/e-mail-store-utils.c:168
+#, fuzzy, c-format
+msgid "Disconnecting from '%s'"
+msgstr "%s న�ండి అనన�సంధానిస�తోంది"
 
-#: ../mail/em-account-editor.c:2562
-msgid "minu_tes"
-msgstr "నిమిషాల�(_t)"
+#: ../mail/e-mail-store-utils.c:259
+#, fuzzy, c-format
+msgid "Reconnecting to '%s'"
+msgstr "%s క� తిరిగిఅన�సంధానించబడ�తోంది"
 
-#: ../mail/em-account-editor.c:2838
-#, fuzzy
-msgid "Please select a folder from the current account."
-msgstr "ఈ పరిచయమ�నక�   దయచేసి ఒక ప�రతిరూపమ�న� ఎంపిక చేయండి"
+#: ../mail/e-mail-store-utils.c:334
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "లైన�వెల�పలకి '%s' ఖాతాన�ని తయార�చేస�త�ంది"
 
-#: ../mail/em-account-editor.c:3108 ../mail/mail-config.ui.h:112
-msgid "Security"
-msgstr "రక�షణ"
+#: ../mail/e-mail-tag-editor.c:291
+msgid "Flag to Follow Up"
+msgstr "అన�సరించ�టక� ప�లాగ�"
 
-#. Most sections for this is auto-generated from the camel config
-#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3153 ../mail/em-account-editor.c:3221
-msgid "Receiving Options"
-msgstr "�చ�చికాలన� తిరిగిపొంద�త�ంది"
+#. Note to translators: this is the attribution string used
+#. * when quoting messages.  Each ${Variable} gets replaced
+#. * with a value.  To see a full list of available variables,
+#. * see mail/em-composer-utils.c:attribvars array.
+#: ../mail/em-composer-utils.c:1197
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone} నాడ�, ${Sender} వ�రాశార�:"
 
-#: ../mail/em-account-editor.c:3154 ../mail/em-account-editor.c:3222
-msgid "Checking for New Messages"
-msgstr "కొత�త సందేశాల కొరక� పరిశీలిస�త�న�నది"
+#: ../mail/em-composer-utils.c:1208
+msgid "-----Original Message-----"
+msgstr "-----వాస�తన సందేశం-----"
 
-#. 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:1539
+#. 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
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr ""
 
-#. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1587
+#: ../mail/em-composer-utils.c:2052
 #, fuzzy, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "మెయిల� ప�రకటన లక�షణాల�"
 
-#: ../mail/em-composer-utils.c:1991
+#: ../mail/em-composer-utils.c:2592
 msgid "an unknown sender"
 msgstr "తెలియని పంపకదార�"
 
-#. Note to translators: this is the attribution string used when quoting messages.
-#. * each ${Variable} gets replaced with a value. To see a full list of available
-#. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2038
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone} నాడ�, ${Sender} వ�రాశార�:"
-
-#: ../mail/em-composer-utils.c:2182
-msgid "-----Original Message-----"
-msgstr "-----వాస�తన సందేశం-----"
-
-#: ../mail/em-composer-utils.c:2372
+#: ../mail/em-composer-utils.c:2998
 msgid "Posting destination"
 msgstr "గమ�యాన�ని పోస�ట�చేస�త�న�నది"
 
-#: ../mail/em-composer-utils.c:2373
+#: ../mail/em-composer-utils.c:2999
 msgid "Choose folders to post the message to."
 msgstr "సందేశాన�ని పోస�ట�చేయ�టక� సంచయాలన� ఎంచ�కొన�మ�."
 
-#: ../mail/em-filter-folder-element.c:260
+#: ../mail/em-filter-folder-element.c:241
 msgid "Select Folder"
 msgstr "సంచయాన�ని ఎంపికచేస�కొన�మ�"
 
@@ -10510,7 +9606,7 @@ msgstr "అమర�చ లేద�"
 msgid "is set"
 msgstr "అమర�చ బడింది"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
 msgid "Junk"
 msgstr "నిరర�దకమైన"
 
@@ -10559,7 +9655,7 @@ msgid "Play Sound"
 msgstr "సౌండ� న� నడ�ప�మ�"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "చద�వ�మ�"
 
@@ -10640,421 +9736,469 @@ msgid "Unset Status"
 msgstr "అమర�చని స�థితి"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:533
+#: ../mail/em-filter-rule.c:561
 msgid "Then"
 msgstr "అప�ప�డ�"
 
-#: ../mail/em-filter-rule.c:564
+#: ../mail/em-filter-rule.c:592
 msgid "Add Ac_tion"
 msgstr "చర�యన� జతచేయ�మ�(_t)"
 
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:126
+#: ../mail/em-folder-properties.c:145
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "చద�వని సందేశం:"
 msgstr[1] "చద�వని సందేశాల�:"
 
-#. TODO: can this be done in a loop?
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:130
+#: ../mail/em-folder-properties.c:156
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "మొత�తం సందేశాల�:"
 msgstr[1] "మొత�తం సందేశాల�:"
 
-#: ../mail/em-folder-properties.c:148
+#: ../mail/em-folder-properties.c:177
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "కేటాయింప� వినియోగమ� (%s):"
 
-#: ../mail/em-folder-properties.c:150
+#: ../mail/em-folder-properties.c:179
 #, c-format
 msgid "Quota usage"
 msgstr "కోటా వ�పయోగం:"
 
-#: ../mail/em-folder-properties.c:288
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../mail/em-folder-properties.c:317
 msgid "Folder Properties"
 msgstr "సంచయం లక�షణాల�"
 
-#: ../mail/em-folder-selection-button.c:75
+#: ../mail/em-folder-selection-button.c:79
 msgid "<click here to select a folder>"
 msgstr "<సంచయం న� ఎంపికచేస�కొన�టక� ఇక�కడ నొక�కండి>"
 
-#: ../mail/em-folder-selector.c:264
+#: ../mail/em-folder-selector.c:436
 msgid "C_reate"
 msgstr "సృష�టించ�మ� (_r)"
 
-#: ../mail/em-folder-selector.c:268
+#: ../mail/em-folder-selector.c:442
 msgid "Folder _name:"
-msgstr "సంచయం నామమ�(_n):"
-
-#. load store to mail component
-#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
-#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
-#: ../mail/mail-vfolder.c:1061 ../mail/mail-vfolder.c:1126
-msgid "Search Folders"
-msgstr "సంచయాలన� శోధించ�మ�"
-
-#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
-msgid "UNMATCHED"
-msgstr "జతకాని"
+msgstr "సంచయం పేర�(_n):"
 
-#: ../mail/em-folder-tree-model.c:768 ../mail/em-folder-tree-model.c:1111
-msgid "Loading..."
-msgstr "నింపబడ�త�న�న..."
-
-#: ../mail/em-folder-tree.c:184
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "\"%s\" నందలి సంచయాల స�కానింగ�"
-
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:647
 msgid "Folder names cannot contain '/'"
-msgstr "సంచయనామమ�ల� '/' న� కలిగిఉండలేవ�"
-
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. The first "%s" will be
-#. * replaced by the folder's name and "%u" will be replaced
-#. * with the number of unread messages in the folder. The
-#. * second %s will be replaced with a "+" letter for collapsed
-#. * folders with unread messages in some subfolder too,
-#. * or with an empty string for other cases.
-#. *
-#. * Most languages should translate this as "%s (%u%s)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:1084
+msgstr "సంచయపేర�ల� '/' న� కలిగిఉండలేవ�"
+
+#: ../mail/em-folder-tree.c:768
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1318
+#: ../mail/em-folder-tree.c:1590
 msgid "Mail Folder Tree"
 msgstr "మెయిల� సంచయం వృక�షం"
 
-#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:2069 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "కద�ల�త�న�న సంచయం %s"
 
-#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
+#: ../mail/em-folder-tree.c:2072 ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "నకల�తీయ�త�న�న సంచయం %s"
 
-#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2164
+#: ../mail/em-folder-tree.c:2079 ../mail/message-list.c:2303
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "సందేశాలన� సంచయం %s లోకి కద�ప�త�న�నది"
 
-#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2166
+#: ../mail/em-folder-tree.c:2083 ../mail/message-list.c:2305
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "సందేశాలన� సంచయం %s లోకి కద�ప�త�న�నది"
 
-#: ../mail/em-folder-tree.c:1650
+#: ../mail/em-folder-tree.c:2102
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "సందేశమ�(ల)న� పైస�థాయి నిల�వక� వద�లలేమ�"
 
-#: ../mail/em-folder-utils.c:403
+#: ../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
+msgid "Search Folders"
+msgstr "సంచయాలన� శోధించ�మ�"
+
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:179 ../mail/em-folder-tree-model.c:181
+msgid "UNMATCHED"
+msgstr "జతకాని"
+
+#: ../mail/em-folder-tree-model.c:790 ../mail/em-folder-tree-model.c:1075
+msgid "Loading..."
+msgstr "నింపబడ�త�న�న..."
+
+#: ../mail/em-folder-utils.c:488
 #, fuzzy
 msgid "Move Folder To"
 msgstr "సంచయం న� ఇక�కడికి జర�ప�మ�(_M)..."
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:488
 #, fuzzy
 msgid "Copy Folder To"
 msgstr "సంచయాన�ని ఇక�కడికి నకల� తీయ�మ�(_C)"
 
-#: ../mail/em-folder-utils.c:533
-#: ../plugins/groupwise-features/share-folder-common.c:136
-#, fuzzy, c-format
-msgid "Creating folder '%s'"
-msgstr "సంచయం `%s' న� సృష�టించ�ట"
-
-#: ../mail/em-folder-utils.c:693
+#: ../mail/em-folder-utils.c:590
 #, fuzzy
 msgid "Create Folder"
 msgstr "సంచయంన� సృష�టించ�ట"
 
-#: ../mail/em-folder-utils.c:694
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
+#: ../mail/em-folder-utils.c:591
 msgid "Specify where to create the folder:"
 msgstr "సంచయంన� ఎక�కడ సృష�టించాలో తెలియజేయ�మ�:"
 
-#: ../mail/em-folder-utils.c:714
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "సంచయం \"%s\" న�ండి చందాదార�గా విరమించ�కొన�మ�"
+#: ../mail/em-format-html.c:166
+msgid "Formatting message"
+msgstr "రూపీకరిస�త�న�న సందేశం"
+
+#: ../mail/em-format-html.c:378
+msgid "Formatting Message..."
+msgstr "రూపీకరిస�త�న�న సందేశం..."
 
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
+#: ../mail/em-format-html.c:1562 ../mail/em-format-html.c:1572
+#, fuzzy, c-format
+msgid "Retrieving '%s'"
+msgstr "`%s' వెలికితీస�తోంది"
+
+#: ../mail/em-format-html.c:1723 ../mail/em-format-html-display.c:89
 msgid "Unsigned"
 msgstr "సంతకంచేయని"
 
-#: ../mail/em-format-html-display.c:90
+#: ../mail/em-format-html.c:1724 ../mail/em-format-html-display.c:90
+msgid "Valid signature"
+msgstr "విల�వైన సంతకం"
+
+#: ../mail/em-format-html.c:1725 ../mail/em-format-html-display.c:91
+msgid "Invalid signature"
+msgstr "చెల�లని సంతకం"
+
+#: ../mail/em-format-html.c:1726 ../mail/em-format-html-display.c:92
+msgid "Valid signature, but cannot verify sender"
+msgstr "విల�వైన సంతకం, అయితే పంపకందారిని నిర�దారించలేమ�"
+
+#: ../mail/em-format-html.c:1727 ../mail/em-format-html-display.c:93
+msgid "Signature exists, but need public key"
+msgstr "సంతకం ఉంది, అయితే పబ�లిక� కీ అవసరం"
+
+#: ../mail/em-format-html.c:1733 ../mail/em-format-html-display.c:100
+msgid "Unencrypted"
+msgstr "అన�‌ఎన�క�రిప�టెడ�"
+
+#: ../mail/em-format-html.c:1734 ../mail/em-format-html-display.c:101
+msgid "Encrypted, weak"
+msgstr "ఎన�క�రిప�టెడ�, బలహీనంగా"
+
+#: ../mail/em-format-html.c:1735 ../mail/em-format-html-display.c:102
+msgid "Encrypted"
+msgstr "ఎన�క�రిప�టెడ�"
+
+#: ../mail/em-format-html.c:1736 ../mail/em-format-html-display.c:103
+msgid "Encrypted, strong"
+msgstr "ఎన�క�రిప�టెడ�, బలంగా"
+
+#: ../mail/em-format-html.c:2136
+msgid "Unknown external-body part."
+msgstr "అపరిచిత బాహ�య-మ�ఖ�యమైన భాగమ�."
+
+#: ../mail/em-format-html.c:2146
+msgid "Malformed external-body part."
+msgstr "తప�ప�గాఉన�న బాహ�య-మ�ఖ�యమైన భాగమ�."
+
+#: ../mail/em-format-html.c:2177
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "FTP సైట� (%s) క� సూచిక"
+
+#: ../mail/em-format-html.c:2188
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "స�థానిక ఫైల�(%s)క� సూచిక సైట� \"%s\" వద�ద నిర�ధారించబడింది"
+
+#: ../mail/em-format-html.c:2190
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "స�థానిక ఫైల� (%s) క� సూచిక"
+
+#: ../mail/em-format-html.c:2211
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "దూరస�థ డాటా (%s)క� సూచిక"
+
+#: ../mail/em-format-html.c:2226
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "తెలియని బహిర�గత డాటా క� సూచిక (\"%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
+#, fuzzy, c-format
+msgid "From: %s"
+msgstr "%s న�ండి:"
+
+#: ../mail/em-format-html.c:2956
+#, fuzzy
+msgid "(no subject)"
+msgstr "సంగతి"
+
+#: ../mail/em-format-html.c:3032
+#, fuzzy, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "సందేశం <b>%2$s</b> తర�ప�న <b>%1$s</b> ద�వారా పంపబడింది "
+
+#: ../mail/em-format-html-display.c:89
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "ఈ సందేశం సంతకంచేసినది కాద�. ఈ సందేశం దృవీకరించినదని � హామీ లోద�."
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
-msgid "Valid signature"
-msgstr "విల�వైన సంతకం"
-
-#: ../mail/em-format-html-display.c:91
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
-msgstr "ఈ సందేశం సంతకం చేసినది మరియ� అర�ధవంతమైనది దానర�ధం సందేశం దృవీకరించబడినది."
-
-#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1578
-msgid "Invalid signature"
-msgstr "చెల�లని సంతకం"
+msgstr ""
+"ఈ సందేశం సంతకం చేసినది మరియ� అర�ధవంతమైనది దానర�ధం సందేశం దృవీకరించబడినది."
 
-#: ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
-msgstr "ఈ సందేశం యొక�క సంతకం నిర�ధారించబడిలేద�, బదిలీకరణలో మర�ప�చేందబడి ఉండవచ�చ�."
-
-#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
-msgid "Valid signature, but cannot verify sender"
-msgstr "విల�వైన సంతకం, అయితే పంపకందారిని నిర�దారించలేమ�"
+msgstr ""
+"ఈ సందేశం యొక�క సంతకం నిర�ధారించబడిలేద�, బదిలీకరణలో మర�ప�చేందబడి ఉండవచ�చ�."
 
-#: ../mail/em-format-html-display.c:93
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
-"ఈ సందేశం విల�వైన సంతంకం తో సంతకంచేయ బడిఉంది, అయితే సందేశం యొక�క పంపకందార� నిర�దారించబడలేద�."
-
-#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1580
-msgid "Signature exists, but need public key"
-msgstr "సంతకం ఉంది, అయితే పబ�లిక� కీ అవసరం"
+"ఈ సందేశం విల�వైన సంతంకం తో సంతకంచేయ బడిఉంది, అయితే సందేశం యొక�క పంపకందార� "
+"నిర�దారించబడలేద�."
 
-#: ../mail/em-format-html-display.c:94
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "ఈ సందేశం సంతకంత పెట�టబడిఉంది, అయితే సభందిత పబ�లిక� కీ లేద�."
 
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1586
-msgid "Unencrypted"
-msgstr "అన�‌ఎన�క�రిప�టెడ�"
-
-#: ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html-display.c:100
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
-msgstr "ఈ సందేశం ఎన�క�రిప�టెడ� కాద�. ఇంటర�నెట� నంద� దీని సారం సందర�శించబడి ఉండవచ�చ�."
-
-#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1587
-msgid "Encrypted, weak"
-msgstr "ఎన�క�రిప�టెడ�, బలహీనంగా"
+msgstr ""
+"ఈ సందేశం ఎన�క�రిప�టెడ� కాద�. ఇంటర�నెట� నంద� దీని సారం సందర�శించబడి ఉండవచ�చ�."
 
-#: ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
-"ఈ సందేశం ఎన�క�రిప�టెడ�, అయితే బలహీన ఎన�క�రిప�షన� అల�గార�ధెమ� తో. అది కష�టం కావచ�చ�, అయితే బయటివ�యక�తికి ఈ "
+"ఈ సందేశం ఎన�క�రిప�టెడ�, అయితే బలహీన ఎన�క�రిప�షన� అల�గార�ధెమ� తో. అది కష�టం "
+"కావచ�చ�, అయితే బయటివ�యక�తికి ఈ "
 "సందేశం సారాలన� అన�భవసిద�ద సమయంలో దర�శించ�ట అసాధ�యం కాకపోవచ�చ�."
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1588
-msgid "Encrypted"
-msgstr "ఎన�క�రిప�టెడ�"
-
-#: ../mail/em-format-html-display.c:103
+#: ../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."
 msgstr ""
-"ఈ సందేశం ఎన�క�రిప�ట� చేయబడింది.  బయటి వారికి ఈ సందేశం నందలి సారమ�న� చూడ�ట�క కష�టంగాఉంట�ంది."
-
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1589
-msgid "Encrypted, strong"
-msgstr "ఎన�క�రిప�టెడ�, బలంగా"
+"ఈ సందేశం ఎన�క�రిప�ట� చేయబడింది.  బయటి వారికి ఈ సందేశం నందలి సారమ�న� చూడ�ట�క "
+"కష�టంగాఉంట�ంది."
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
-"ఈ సందేశం ఎన�క�రిప�ట� చేయబడింది, గట�టి ఎన�క�రిప�షన� అల�గార�ధెమ� తో, బయటవారికి ఈ సందేశంన� అవ�భవసిద�ద "
+"ఈ సందేశం ఎన�క�రిప�ట� చేయబడింది, గట�టి ఎన�క�రిప�షన� అల�గార�ధెమ� తో, బయటవారికి "
+"ఈ సందేశంన� అవ�భవసిద�ద "
 "సమయంలో దర�శించ�ట చాలా కష�టంగా ఉంట�ంది."
 
-#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
+#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "దృవీకరణపత�రం న� దర�శించ�(_V)"
 
-#: ../mail/em-format-html-display.c:248
+#: ../mail/em-format-html-display.c:254
 msgid "This certificate is not viewable"
 msgstr "ఈ దృవీకరణపత�రం దర�శించ�నట�ల� లేద�"
 
-#: ../mail/em-format-html-display.c:497
+#: ../mail/em-format-html-display.c:566
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
-"సంభాలించ�టక� మరీ పెద�దదిగా ఉండ�టవలన ఈ ఇమెయిల�‌న� ఎవాల�యూషన� చూపించలేక పోయింది. మీర� దీనిని "
+"సంభాలించ�టక� మరీ పెద�దదిగా ఉండ�టవలన ఈ ఇమెయిల�‌న� ఎవాల�యూషన� చూపించలేక పోయింది."
+" మీర� దీనిని "
 "రూపీకరించనివిధంగా లేదా బాహ�య పాఠ�యకూర�పరి ద�వారా దర�శించవచ�చ�."
 
-#: ../mail/em-format-html-display.c:725
+#: ../mail/em-format-html-display.c:756
+#, fuzzy
+msgid "Save Image"
+msgstr "సందేశంన� దాయ�మ�..."
+
+#: ../mail/em-format-html-display.c:804
+#, fuzzy
+#| msgid "Save as..."
+msgid "Save _Image..."
+msgstr "ఇలా దాయ�..."
+
+#: ../mail/em-format-html-display.c:806
+#, fuzzy
+#| msgid "Save the current file"
+msgid "Save the image to a file"
+msgstr "ప�రస�త�త ఫైల�న� దాయ�మ�"
+
+#: ../mail/em-format-html-display.c:1034
 msgid "Completed on"
 msgstr "ఇంతక� పూర�తైనది"
 
-#: ../mail/em-format-html-display.c:733
+#: ../mail/em-format-html-display.c:1046
 msgid "Overdue:"
 msgstr "కాలమ�దాటిన:"
 
-#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:737
+#: ../mail/em-format-html-display.c:1054
 msgid "by"
 msgstr "ద�వారా"
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html-display.c:999
+#: ../mail/em-format-html-display.c:1335 ../mail/em-format-html-display.c:1386
 msgid "View _Unformatted"
 msgstr "రూపీకరించని దర�శనం(_U)"
 
-#: ../mail/em-format-html-display.c:954
+#: ../mail/em-format-html-display.c:1337
 msgid "Hide _Unformatted"
 msgstr "రూపీకరించనిదానిని మర�గ�పర�చ�మ�(_U)"
 
-#: ../mail/em-format-html-display.c:1019
+#: ../mail/em-format-html-display.c:1408
 msgid "O_pen With"
 msgstr "దీనితో తెర�వ�మ�(_p)"
 
-#: ../mail/em-format-html-print.c:162
+#: ../mail/em-format-html-print.c:176
 #, c-format
 msgid "Page %d of %d"
 msgstr "%2$d యొక�క ప�ట %1$d"
 
-#: ../mail/em-format-html.c:153
-msgid "Formatting message"
-msgstr "రూపీకరిస�త�న�న సందేశం"
-
-#: ../mail/em-format-html.c:352
-msgid "Formatting Message..."
-msgstr "రూపీకరిస�త�న�న సందేశం..."
-
-#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
+#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:122
 #, fuzzy, c-format
-msgid "Retrieving '%s'"
-msgstr "`%s' వెలికితీస�తోంది"
+msgid "No HTML stream available"
+msgstr "సంక�షిప�తమ� అంద�బాట�లో లేద�."
 
-#: ../mail/em-format-html.c:1901
-msgid "Unknown external-body part."
-msgstr "అపరిచిత బాహ�య-మ�ఖ�యమైన భాగమ�."
+#: ../mail/em-subscription-editor.c:1162
+msgid "Folder Subscriptions"
+msgstr "సచయం చందాల�"
 
-#: ../mail/em-format-html.c:1909
-msgid "Malformed external-body part."
-msgstr "తప�ప�గాఉన�న బాహ�య-మ�ఖ�యమైన భాగమ�."
+#: ../mail/em-subscription-editor.c:1201
+msgid "_Account:"
+msgstr "ఖాతా(_A):"
 
-#: ../mail/em-format-html.c:1939
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "FTP సైట� (%s) క� సూచిక"
+#: ../mail/em-subscription-editor.c:1216
+#, fuzzy
+#| msgid "Clear the search"
+msgid "Clear Search"
+msgstr "అన�వేషణన� శ�భ�రపరచ�మ�"
 
-#: ../mail/em-format-html.c:1950
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "స�థానిక దస�త�రం(%s)క� సూచిక సైట� \"%s\" వద�ద నిర�ధారించబడింది"
+#: ../mail/em-subscription-editor.c:1234
+#, fuzzy
+#| msgid "does not contain"
+msgid "Sho_w items that contain:"
+msgstr "కలిగిలేద�"
 
-#: ../mail/em-format-html.c:1952
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "స�థానిక దస�త�రం (%s) క� సూచిక"
+#: ../mail/em-subscription-editor.c:1273
+#, fuzzy
+msgid "Subscribe to the selected folder"
+msgstr "ఎంచ�క�న�న సంచయాన�ని ప�న:నామకరణం చేయ�"
 
-#: ../mail/em-format-html.c:1973
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "దూరస�థ డాటా (%s)క� సూచిక"
+#: ../mail/em-subscription-editor.c:1274
+#, fuzzy
+#| msgid "Subscribed"
+msgid "Su_bscribe"
+msgstr "చందాకాబడిన"
 
-#: ../mail/em-format-html.c:1984
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "తెలియని బహిర�గత డాటా క� సూచిక (\"%s\" రకం)"
+#: ../mail/em-subscription-editor.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#, fuzzy
+msgid "Unsubscribe from the selected folder"
+msgstr "ఎంచ�క�న�న సంచయాన�ని ప�న:నామకరణం చేయ�"
 
-#. To translators: This message suggests to the receipients that the sender of the mail is
-#. different from the one listed in From field.
-#: ../mail/em-format-html.c:2647
-#, fuzzy, c-format
-msgid "This message was sent by %s on behalf of %s"
-msgstr "సందేశం <b>%2$s</b> తర�ప�న <b>%1$s</b> ద�వారా పంపబడింది "
+#: ../mail/em-subscription-editor.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
+msgid "_Unsubscribe"
+msgstr "చందావిరమించ�మ�(_U)"
 
-#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
-#: ../mail/em-html-stream.c:122
-#, fuzzy, c-format
-msgid "No HTML stream available"
-msgstr "సంక�షిప�తమ� అంద�బాట�లో లేద�."
+#: ../mail/em-subscription-editor.c:1297
+#, fuzzy
+msgid "Collapse all folders"
+msgstr "క�ప�పకూల�చ�మ�"
 
-#: ../mail/em-subscribe-editor.c:677
-msgid "This store does not support subscriptions, or they are not enabled."
-msgstr "ఈ నిల�వ చందాలక� మద�దత�నీయద�, లేదా అవి చేతనంకాబడిలేవ�."
+#: ../mail/em-subscription-editor.c:1298
+#, fuzzy
+msgid "C_ollapse All"
+msgstr "క�ప�పకూల�చ�మ�"
 
-#: ../mail/em-subscribe-editor.c:728
-msgid "Subscribed"
-msgstr "చందాకాబడిన"
+#: ../mail/em-subscription-editor.c:1308
+#, fuzzy
+msgid "Expand all folders"
+msgstr "అన�ని తంత�లన� విస�తరించ�మ�(_x)"
 
-#: ../mail/em-subscribe-editor.c:732
-msgid "Folder"
-msgstr "సంచయం"
+#: ../mail/em-subscription-editor.c:1309
+#, fuzzy
+msgid "E_xpand All"
+msgstr "అన�ని తంత�లన� విస�తరించ�మ�(_x)"
 
-#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:1120
-msgid "Please select a server."
-msgstr "దయచేసి ఒక సేవికన� ఎంపికచేయ�మ�."
+#: ../mail/em-subscription-editor.c:1319
+#, fuzzy
+#| msgid "Refresh the folder"
+msgid "Refresh the folder list"
+msgstr "సంచయాన�ని ప�నర�వికాసపర�చ�"
 
-#: ../mail/em-subscribe-editor.c:1166
-msgid "No server has been selected"
-msgstr "�సేవిక ఎంపికకాబడలేద�"
+#: ../mail/em-subscription-editor.c:1331
+#, fuzzy
+#| msgid "Cancel the current mail operation"
+msgid "Stop the current operation"
+msgstr "ప�రస�త�త మెయిల�  కార�యమ�న� రద�ద�చేయ�మ�"
 
-#. Translators: This message is shown only for ten or more 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:106
+#. Translators: This message is shown only for ten or more
+#. * 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
 #, fuzzy, c-format
-msgid "Are you sure you want to open %d messages at once?"
+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] "మీర� ఖచ�చితంగా {0} సందేశాలన� ఒక�కసారిగా తెరవాలన�క�ంట�న�నారా?"
 msgstr[1] "మీర� ఖచ�చితంగా {0} సందేశాలన� ఒక�కసారిగా తెరవాలన�క�ంట�న�నారా?"
 
-#: ../mail/em-utils.c:152
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#: ../mail/em-utils.c:158
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
 #, fuzzy
 msgid "_Do not show this message again"
 msgstr "ఈ సందేశంన� మళ�ళీ చూపవద�ద� (_D)."
 
-#: ../mail/em-utils.c:314
+#: ../mail/em-utils.c:333
 msgid "Message Filters"
 msgstr "సందేశం వడపోతల�"
 
-#: ../mail/em-utils.c:848
+#: ../mail/em-utils.c:918
 #, c-format
 msgid "Messages from %s"
 msgstr "%s న�ండి సందేశాల�"
 
-#: ../mail/em-vfolder-editor.c:126
+#: ../mail/em-vfolder-editor.c:108
 msgid "Search _Folders"
 msgstr "సంచయాలన� శోధించ�మ�(_F)"
 
-#: ../mail/em-vfolder-rule.c:525
+#: ../mail/em-vfolder-rule.c:618
 #, fuzzy
 msgid "Add Folder"
 msgstr "సంచయం"
@@ -11076,391 +10220,474 @@ msgstr "అప�రమేయ విండో వెడల�ప�"
 
 #: ../mail/evolution-mail.schemas.in.h:4
 #, fuzzy
-msgid "\"Search Folder Editor\" window height"
+msgid "\"Folder Subscriptions\" window height"
 msgstr "అప�రమేయ విండో ఎత�త�"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 #, fuzzy
-msgid "\"Search Folder Editor\" window maximize state"
+msgid "\"Folder Subscriptions\" window maximize state"
 msgstr "\"మెయిల� పంపించ� మరియ� స�వీకరించ�\" విండో గరిష�ఠ స�థితి"
 
 #: ../mail/evolution-mail.schemas.in.h:6
 #, fuzzy
+msgid "\"Folder Subscriptions\" window width"
+msgstr "అప�రమేయ విండో వెడల�ప�"
+
+#: ../mail/evolution-mail.schemas.in.h:7
+#, fuzzy
+msgid "\"Search Folder Editor\" window height"
+msgstr "అప�రమేయ విండో ఎత�త�"
+
+#: ../mail/evolution-mail.schemas.in.h:8
+#, fuzzy
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "\"మెయిల� పంపించ� మరియ� స�వీకరించ�\" విండో గరిష�ఠ స�థితి"
+
+#: ../mail/evolution-mail.schemas.in.h:9
+#, fuzzy
 msgid "\"Search Folder Editor\" window width"
 msgstr "మెయిలింగ� జాబితా న�ండి సంచయాన�ని వెత�క�మ�(_L)"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "\"Send and Receive Mail\" window height"
 msgstr "\"మెయిల�‌న� పంపించ� మరియ� స�వీకరించ�\" విండో ఎత�త�"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "\"మెయిల� పంపించ� మరియ� స�వీకరించ�\" విండో గరిష�ఠ స�థితి"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "\"Send and Receive Mail\" window width"
 msgstr "\"మెయిల� పంపించే మరియ� పొందే\" విండో వెడల�ప�"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Always request read receipt"
 msgstr "చదివిన రిసిప�ట�న� ఎల�లప�ప�డ� అభ�యర�దించ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
+msgid "Amount of time in seconds the error should be shown on the status bar."
+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"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:16
+#, fuzzy
+#| msgid "Attached message"
+msgid "Attribute message."
+msgstr "అన�భందించిన సందేశమ�"
+
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Automatic emoticon recognition"
 msgstr "emoticon న� స�వయంచాలకంగా గ�ర�తించ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Automatic link recognition"
 msgstr "స�వయంచాలక జోడి గ�ర�తింప�"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:19
+#, fuzzy
+#| msgid "Check for _new messages every"
+msgid "Check for new messages in all active accounts"
+msgstr "కొత�త సందేశాల కొరక� వెత�క�మ� (_n)"
+
+#: ../mail/evolution-mail.schemas.in.h:20
+#, fuzzy
+#| msgid "Check for _new messages every"
+msgid "Check for new messages on start"
+msgstr "కొత�త సందేశాల కొరక� వెత�క�మ� (_n)"
+
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Check incoming mail being junk"
 msgstr "లోనికవస�త�న�న మెయిల� నిరర�ధకం అగ�టన� పరిశీలించ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Citation highlight color"
 msgstr "సిటేషన� ఉద�దీపన వర�ణమ�"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Citation highlight color."
 msgstr "సిటేషన� ఉద�దీపన వర�ణమ�."
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Composer Window default height"
 msgstr "కూర�పరి విండో అప�రమేయ ఎత�త�"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Composer Window default width"
 msgstr "కూర�పరి విండో అప�రమేయ ‌వెడల�ప�"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Composer load/attach directory"
 msgstr "కూర�పరి నింప�/అన�భందం సంచయం"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "TO/CC/BCC నంద� చిర�నామాల ప�రదర�శనన� క�చింప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
-msgstr "TO/CC/BCC నంద� చిర�నామాల ప�రదర�శనన� address_count నంద� తెలిపినవిధంగా క�చింప�మ�."
+msgstr ""
+"TO/CC/BCC నంద� చిర�నామాల ప�రదర�శనన� address_count నంద� తెలిపినవిధంగా "
+"క�చింప�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
 msgstr ""
-"రిమోట� మెయిల� సేవికతో స�థానిక మార�ప�ల� ఎంతతరచ�గా సింక�రనైజ� చేయబడతాయో నియత�రిస�త�ంది. విరామం తప�పక 30 "
+"రిమోట� మెయిల� సేవికతో స�థానిక మార�ప�ల� ఎంతతరచ�గా సింక�రనైజ� చేయబడతాయో "
+"నియత�రిస�త�ంది. విరామం తప�పక 30 "
 "సెకన�ల� వ�ండాలి."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Custom headers to use while checking for junk."
 msgstr "నిరర�ధకం కొరక� పరిశీలిస�త�న�నప�ప�డ� వ�పయోగించ�టక� కస�టమ� హెడర�స��."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr ""
-"నిరర�ధకం కొరక� పరిశీలిస�త�న�నప�ప�డ� వ�పయోగించ�టక� మల�చ�క�న�న పీఠికల�. \"headername=value\" "
+"నిరర�ధకం కొరక� పరిశీలిస�త�న�నప�ప�డ� వ�పయోగించ�టక� మల�చ�క�న�న పీఠికల�. "
+"\"headername=value\" "
 "రూపకంలో జాబితా మూలకంల� స�ట�రింగ�."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default charset in which to compose messages"
 msgstr "సందేశాలన� దేనితో కూర�చాలో ఆ అప�రమేయ అక�షరసమితి"
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default charset in which to compose messages."
 msgstr "సందేశాలన� దేనితో కూర�చలో ఆ అప�రమేయ అక�షరసమితి."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default charset in which to display messages"
 msgstr "సందేశాలన� దేనితో ప�రదర�శించాలో ఆ అప�రమేయ అక�షరసమితి"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default charset in which to display messages."
 msgstr "సందేశాలన� దేనితో ప�రదర�శించాలో ఆ అప�రమేయ అక�షరసమితి."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default forward style"
 msgstr "మ�ంద�క�పంప�టక� అప�రమేయ శైలి"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default height of the Composer Window."
 msgstr "కూర�పరి విండో యొక�క అప�రమేయ ఎత�త�."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:38
 #, fuzzy
 msgid "Default height of the mail browser window."
 msgstr "కూర�పరి విండో యొక�క అప�రమేయ ఎత�త�."
 
-#: ../mail/evolution-mail.schemas.in.h:32
-msgid "Default height of the subscribe dialog."
-msgstr "సబ�‌స�క�రైబ� డైలాగ� యొక�క అప�రమేయ ఎత�త�."
-
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:39
 #, fuzzy
 msgid "Default maximized state of the mail browser window."
 msgstr "కూర�పరి విండో యొక�క అప�రమేయ వెడల�ప�."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Default reply style"
 msgstr "అప�రమేయ ప�రత�య�త�తరమ� శైలి"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Default value for thread expand state"
 msgstr "తంతి విస�తరింప� స�థితి కొరక� అప�రమేయ విల�వ"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Default width of the Composer Window."
 msgstr "కూర�పరి విండో యొక�క అప�రమేయ వెడల�ప�."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:43
 #, fuzzy
 msgid "Default width of the mail browser window."
 msgstr "కూర�పరి విండో యొక�క అప�రమేయ వెడల�ప�."
 
-#: ../mail/evolution-mail.schemas.in.h:38
-msgid "Default width of the subscribe dialog."
-msgstr "సబ�‌స�క�రైబ� డైలాగ� యొక�క అప�పమేయ వెడల�ప�."
+#: ../mail/evolution-mail.schemas.in.h:44
+msgid ""
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded \"1\" = collapsed"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
-msgstr "నిరర�ధకం వడపోతప�రక�రియలో స�థానిక చిర�నామా ప�స�తకంలో మాత�రమే చిర�నామాలన� చూడాలేమో నిర�ణయిస�త�ంది"
+msgstr ""
+"నిరర�ధకం వడపోతప�రక�రియలో స�థానిక చిర�నామా ప�స�తకంలో మాత�రమే చిర�నామాలన� "
+"చూడాలేమో నిర�ణయిస�త�ంది"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "పంపకందార� ఇమెయిల� కొరక� చిర�నామా ప�స�తంకంనంద� చూడాలేమో నిర�ధారిస�త�ంది"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
 "can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
-"చిర�నామా ప�స�తకంలో పంపకందార� ఈమెయిల� న� చూడాలేమో నిర�ణయిస�త�ంది. కనబడితే, ఇది స�పామ� కాద�. ఇది "
-"స�వయంచాలకమ�గింప�క� గ�ర�త�ంచిన ప�స�తకంలంద� కనిపిస�త�ంది. ఇది నెమ�మది అవ�వచ�చ�, ఒకవేళ దూరస�థ "
+"చిర�నామా ప�స�తకంలో పంపకందార� ఈమెయిల� న� చూడాలేమో నిర�ణయిస�త�ంది. కనబడితే, ఇది "
+"స�పామ� కాద�. ఇది "
+"స�వయంచాలకమ�గింప�క� గ�ర�త�ంచిన ప�స�తకంలంద� కనిపిస�త�ంది. ఇది నెమ�మది అవ�వచ�చ�, "
+"ఒకవేళ దూరస�థ "
 "చిర�నామాప�స�తకాల� (ldap వంటివి) స�వయంచాలకమ�గింప� క� గ�ర�త�ంచబడితే."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Determines whether to use custom headers to check for junk"
-msgstr "నిరర�ధకం కొరక� పరిశీలించ�టక� మల�చ�క�న�న పీఠికలన� ఉపయోగించాలేమో నిర�ధారిస�త�ంది"
+msgstr ""
+"నిరర�ధకం కొరక� పరిశీలించ�టక� మల�చ�క�న�న పీఠికలన� ఉపయోగించాలేమో నిర�ధారిస�త�ంది"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
 "checking speed."
 msgstr ""
-"నిరర�ధకం న� పరిశీలించ�ట కొరక� మల�చ�క�న�న పీఠికలన� ఉపయోగించాలేమో నిర�ధారిస�త�ంది. ఈ �చ�చికం చేతనం "
+"నిరర�ధకం న� పరిశీలించ�ట కొరక� మల�చ�క�న�న పీఠికలన� ఉపయోగించాలేమో "
+"నిర�ధారిస�త�ంది. ఈ �చ�చికం చేతనం "
 "అయ�యి పీఠికలన� తెల�పబడితే, ఇది నిరర�ధకం న� పరిశీలించే వేగంన� మెర�గ�పర�స�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
-"వర�టికల� దర�శనంలో \"సందేశాల�\" నిల�వ�వర�సనందలి \"న�ండి\" మరియ� \"సంగతి\" రెండ�వర�సలక� వొకే "
+"వర�టికల� దర�శనంలో \"సందేశాల�\" నిల�వ�వర�సనందలి \"న�ండి\" మరియ� \"సంగతి\" "
+"రెండ�వర�సలక� వొకే "
 "ఫాంట�లన� వాడవలెనేమో నిర�ణయిస�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Directory for loading/attaching files to composer."
 msgstr "కూర�పరికి దస�త�రాలన� నింప�టక�/అన�భందించ�టక� సంచయం."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Directory for saving mail component files."
 msgstr "మెయిల� మూలకం దస�త�రాలన� దాయ�టక� సంచయం."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Disable or enable ellipsizing of folder names in side bar"
-msgstr "ఫోల�డర� ట�రీనంద� ఫోల�డర� నామాలయొక�క ఎలిప�సైజింగ� చేతనం లేదా అచేతనం చేయ�మ�"
+msgstr ""
+"ఫోల�డర� ట�రీనంద� ఫోల�డర� నామాలయొక�క ఎలిప�సైజింగ� చేతనం లేదా అచేతనం చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Display only message texts not exceeding certain size"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:55
 #, fuzzy
 msgid "Do not add signature delimiter"
-msgstr "సంతకం దస�త�రాన�ని దాయలేకపోయింది."
+msgstr "సంతకం ఫైల�న� దాయలేకపోయింది."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Draw spelling error indicators on words as you type."
 msgstr "మీర� టైప�చేసిన విధంగా పదమ�లపై స�పెల�లింగ� దోషప� సూచికలన� గీయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty Junk folders on exit"
 msgstr "బయటక� వచ�చ�నప�ప�డ� నిరర�ధక సంచయాలన� ఖాళీచేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty Trash folders on exit"
 msgstr "బయటక� వచ�చ�నప�ప�డ� చెత�తక�ండీ సంచయాలన� ఖాళీ చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "ఎవాల�య�షన� బయటక� వచ�చ�నప�ప�డ� అన�ని నిరర�ధక సంచయాలన� ఖాళీ చేయ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "ఎవాల�యూషన� బయటక� వచ�చ�నప�ప�డ� అన�ని చెత�తక�ండి సంచయాలన� ఖాళీచేయ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 msgstr ""
-"�నిమేటెడ� ప�రతిబింబమ�లన� HTML మెయిల�‌నంద� చేతనమ�చేయి. చాలామందికి యానిమేటెడ� ప�రతిబింబమ�ల� విస�గ�కలిగస�తాయి "
+"�నిమేటెడ� ప�రతిబింబమ�లన� HTML మెయిల�‌నంద� చేతనమ�చేయి. చాలామందికి యానిమేటెడ� "
+"ప�రతిబింబమ�ల� విస�గ�కలిగస�తాయి "
 "మరియ� వార� స�థిర ప�రతిబింబమ�లన� చూడాలన�కొంటార�."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr "అక�షరరీతిని చేతనపర�చ�మ�, అలా మీర� మెయిల� చద�వ�త�న�నప�ప�డ� కర�సర� న� చూడగలర�."
+msgstr ""
+"అక�షరరీతిని చేతనపర�చ�మ�, అలా మీర� మెయిల� చద�వ�త�న�నప�ప�డ� కర�సర� న� చూడగలర�."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "మాయా స�పేస� పట�టీని చేతనం లేదా అచేతనం చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "బహ�ళ సందేశమ�లన� గ�ర�త�ంచ�నప�ప�డ� అడ�గ�టన� చేతనమ� లేదా అచేతనమ� చేయ�న�."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable or disable type ahead search feature"
-msgstr "టైప�చేయ�దానికి మ�ంది శోధన సౌలబ�యాన�ని చేతనం లేదా అచేతనం చేయ�మ�"
+msgstr "టైప�చేయ�దానికి మ�ంది అన�వేషణ సౌలబ�యాన�ని చేతనం లేదా అచేతనం చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders"
-msgstr "శోధన సంచయాలన� చేతనం చేయ�మ�"
+msgstr "అన�వేషణ సంచయాలన� చేతనం చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable search folders on startup."
-msgstr "శోధన సంచయాలన� ప�రారంభంనంద� చేతనంచేయ�మ�."
+msgstr "అన�వేషణ సంచయాలన� ప�రారంభంనంద� చేతనంచేయ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr ""
-"ఫోల�డర� నామమ�ల కొరక� యింటరాక�టివ� శోధనన� అన�మతించ�టక� ప�రక�క పట�టీ శోధన సౌలభ�యమ�న� చేతనమ�చేయి."
+"ఫోల�డర� పేర�ల కొరక� యింటరాక�టివ� అన�వేషణన� అన�మతించ�టక� ప�రక�క పట�టీ అన�వేషణ "
+"సౌలభ�యమ�న� చేతనమ�చేయి."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr ""
-"సందేశం ఉపదర�శనం నంద� స�పేస� బార� కీని స�క�రాల� చేయ�టక� ఉపయోగించ�టక� దీనిని చేతనంచేయ�మ�, సందేశం జాబితా "
+"సందేశం ఉపదర�శనం నంద� స�పేస� బార� కీని స�క�రాల� చేయ�టక� ఉపయోగించ�టక� దీనిని "
+"చేతనంచేయ�మ�, సందేశం జాబితా "
 "మరియ� సంచయాల�."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:72
 #, fuzzy
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
-"సందేశం ఉపదర�శనం నంద� స�పేస� బార� కీని స�క�రాల� చేయ�టక� ఉపయోగించ�టక� దీనిని చేతనంచేయ�మ�, సందేశం జాబితా "
+"సందేశం ఉపదర�శనం నంద� స�పేస� బార� కీని స�క�రాల� చేయ�టక� ఉపయోగించ�టక� దీనిని "
+"చేతనంచేయ�మ�, సందేశం జాబితా "
 "మరియ� సంచయాల�."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Enable/disable caret mode"
 msgstr "అక�షరరీతిని చేతనం/అచేతనం చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
+#: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
-msgstr "Outlook/GMail తరహాలో దస�త�ర నామమ�లన� ఎన�కోడ� చేయ�మ�"
+msgstr "Outlook/GMail తరహాలో దస�త�ర పేర�లన� ఎన�కోడ� చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:75
 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 ""
-"ఎవాల�యూషన� ద�వారా పంపిన UTF-8 అక�షరమ�ల దస�త�రనామమ�లన� వార� సరిగా ప�రదర�శించ�టక�,Outlook లేదా "
-"GMail చేయ�నట�ల� మెయిల� పీఠికలనంద� దస�త�ర నామమ�లన� ఎన�కోడ� చేయ�మ�, యెంద�చేతనంటే అవి RFC 2231 "
+"ఎవాల�యూషన� ద�వారా పంపిన UTF-8 అక�షరమ�ల దస�త�రపేర�లన� వార� సరిగా "
+"ప�రదర�శించ�టక�,Outlook లేదా "
+"GMail చేయ�నట�ల� మెయిల� పీఠికలనంద� దస�త�ర పేర�లన� ఎన�కోడ� చేయ�మ�, యెంద�చేతనంటే "
+"అవి RFC 2231 "
 "అన�సరించవ�, అయితే సరికాని RFC 2047 ప�రమాణంన� వ�పయోగిస�తాయి."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Flush Outbox after filtering"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:77
+#, fuzzy
+#| msgid "Forwarded message"
+msgid "Forward message."
+msgstr "మ�ంద�క�పంప�త�న�న సందేశం"
+
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Group Reply replies to list"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane"
 msgstr "సందేశ-జాబితా తలం యొక�క ఎత�త�"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Height of the message-list pane."
 msgstr "సందేశ-జాబితా తలం యొక�క ఎత�త�."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "ఒక�కో-సంచయంక� ఉపదర�శనంన� మర�గ�పర�చ�మ� మరియ� ఎంపికన� తీసివేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr ""
-"వినియోగదారి 10 లేదా ఎక�క�వ సందేశాలన� ఒక సమయంనంద� తెర�వ�టక� ప�రయత�నిస�తే, వినియోగదారిని నిజంగా "
+"వినియోగదారి 10 లేదా ఎక�క�వ సందేశాలన� ఒక సమయంనంద� తెర�వ�టక� ప�రయత�నిస�తే, "
+"వినియోగదారిని నిజంగా "
 "చేయాలన�క�ంట�న�నారేమో అడ�గ�."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
 "in GNOME's MIME type database may be used for displaying content."
 msgstr ""
-"ఎవాల�యూషన� నంద� ప�రత�యేకంగా ఒక mime-రకంనక� నిర�మిత దర�శని లేకపోతే, ఈ జాబితానంద� ఉన�న � mime-"
-"రకాల� GNOME యొక�క mime-రంకం డాటాబేస� బొనోబొ-మూలకం దర�శని కి సూచించబడినవో దానిని ప�రదర�శనకొరక� "
+"ఎవాల�యూషన� నంద� ప�రత�యేకంగా ఒక mime-రకంనక� నిర�మిత దర�శని లేకపోతే, ఈ "
+"జాబితానంద� ఉన�న � mime-"
+"రకాల� GNOME యొక�క mime-రంకం డాటాబేస� బొనోబొ-మూలకం దర�శని కి సూచించబడినవో "
+"దానిని ప�రదర�శనకొరక� "
 "ఉపయోగించ�కొనవచ�చ�."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Ignore list Reply-To:"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:85
 #, fuzzy
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
 msgstr ""
-"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ ఎత�త�. వినియోగదారి దానిఎత�త�న� మార�చినట�ల�గా ఈవిల�వ "
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ ఎత�త�. వినియోగదారి దానిఎత�త�న� "
+"మార�చినట�ల�గా ఈవిల�వ "
 "నవీకరించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:86
+#, fuzzy
+msgid ""
+"Initial height of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ ఎత�త�. వినియోగదారి దానిఎత�త�న� "
+"మార�చినట�ల�గా ఈవిల�వ "
+"నవీకరించబడ�త�ంది."
+
+#: ../mail/evolution-mail.schemas.in.h:87
 #, fuzzy
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ ఎత�త�. వినియోగదారి దానిఎత�త�న� మార�చినట�ల�గా ఈవిల�వ "
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ ఎత�త�. వినియోగదారి దానిఎత�త�న� "
+"మార�చినట�ల�గా ఈవిల�వ "
 "నవీకరించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ ఎత�త�. వినియోగదారి దానిఎత�త�న� మార�చినట�ల�గా ఈవిల�వ "
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ ఎత�త�. వినియోగదారి దానిఎత�త�న� "
+"మార�చినట�ల�గా ఈవిల�వ "
 "నవీకరించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:89
 #, fuzzy
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
@@ -11468,11 +10695,29 @@ msgid ""
 "value is not used by Evolution since the \"Filter Editor\" window cannot be "
 "maximized. This key exists only as an implementation detail."
 msgstr ""
-"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభం గరిష�ఠ స�థితి. వినియోగదారి విండోన� పెద�దది లేదా చిన�నది "
-"చేసినప�ప�డ� ఈవిల�వ నవీకరించబడ�త�ంది. \"మెయిల� పంప� మరియ� పొంద�\" విండో పెద�దది చేయ�నంతవరక� "
-"ఈవిల�వ ఎవాల�యూషన�‌చేత వ�పయోగించబడదని గమనించండి. ఈ కీ అభివృద�ద వివరంగా మాత�రమేవ�ంది."
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభం గరిష�ఠ స�థితి. వినియోగదారి "
+"విండోన� పెద�దది లేదా చిన�నది "
+"చేసినప�ప�డ� ఈవిల�వ నవీకరించబడ�త�ంది. \"మెయిల� పంప� మరియ� పొంద�\" విండో "
+"పెద�దది చేయ�నంతవరక� "
+"ఈవిల�వ ఎవాల�యూషన�‌చేత వ�పయోగించబడదని గమనించండి. ఈ కీ అభివృద�ద వివరంగా "
+"మాత�రమేవ�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:90
+#, fuzzy
+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 ""
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభం గరిష�ఠ స�థితి. వినియోగదారి "
+"విండోన� పెద�దది లేదా చిన�నది "
+"చేసినప�ప�డ� ఈవిల�వ నవీకరించబడ�త�ంది. \"మెయిల� పంప� మరియ� పొంద�\" విండో "
+"పెద�దది చేయ�నంతవరక� "
+"ఈవిల�వ ఎవాల�యూషన�‌చేత వ�పయోగించబడదని గమనించండి. ఈ కీ అభివృద�ద వివరంగా "
+"మాత�రమేవ�ంది."
+
+#: ../mail/evolution-mail.schemas.in.h:91
 #, fuzzy
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
@@ -11480,11 +10725,14 @@ msgid ""
 "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 ""
-"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభం గరిష�ఠ స�థితి. వినియోగదారి విండోన� పెద�దది లేదా చిన�నది "
-"చేసినప�ప�డ� ఈవిల�వ నవీకరించబడ�త�ంది. \"మెయిల� పంప� మరియ� పొంద�\" విండో పెద�దది చేయ�నంతవరక� "
-"ఈవిల�వ ఎవాల�యూషన�‌చేత వ�పయోగించబడదని గమనించండి. ఈ కీ అభివృద�ద వివరంగా మాత�రమేవ�ంది."
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభం గరిష�ఠ స�థితి. వినియోగదారి "
+"విండోన� పెద�దది లేదా చిన�నది "
+"చేసినప�ప�డ� ఈవిల�వ నవీకరించబడ�త�ంది. \"మెయిల� పంప� మరియ� పొంద�\" విండో "
+"పెద�దది చేయ�నంతవరక� "
+"ఈవిల�వ ఎవాల�యూషన�‌చేత వ�పయోగించబడదని గమనించండి. ఈ కీ అభివృద�ద వివరంగా "
+"మాత�రమేవ�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11492,37 +10740,53 @@ msgid ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
-"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభం గరిష�ఠ స�థితి. వినియోగదారి విండోన� పెద�దది లేదా చిన�నది "
-"చేసినప�ప�డ� ఈవిల�వ నవీకరించబడ�త�ంది. \"మెయిల� పంప� మరియ� పొంద�\" విండో పెద�దది చేయ�నంతవరక� "
-"ఈవిల�వ ఎవాల�యూషన�‌చేత వ�పయోగించబడదని గమనించండి. ఈ కీ అభివృద�ద వివరంగా మాత�రమేవ�ంది."
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభం గరిష�ఠ స�థితి. వినియోగదారి "
+"విండోన� పెద�దది లేదా చిన�నది "
+"చేసినప�ప�డ� ఈవిల�వ నవీకరించబడ�త�ంది. \"మెయిల� పంప� మరియ� పొంద�\" విండో "
+"పెద�దది చేయ�నంతవరక� "
+"ఈవిల�వ ఎవాల�యూషన�‌చేత వ�పయోగించబడదని గమనించండి. ఈ కీ అభివృద�ద వివరంగా "
+"మాత�రమేవ�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:93
 #, fuzzy
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
 msgstr ""
-"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ వెడల�ప�. వినియోగదారి విండోన� అడ�డంగా ప�నఃపరిమాణం "
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ వెడల�ప�. వినియోగదారి విండోన� "
+"అడ�డంగా ప�నఃపరిమాణం "
 "చేసినట�ల�గా ఈవిల�వ నవీకరించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:94
+#, fuzzy
+msgid ""
+"Initial width of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ వెడల�ప�. వినియోగదారి విండోన� "
+"అడ�డంగా ప�నఃపరిమాణం "
+"చేసినట�ల�గా ఈవిల�వ నవీకరించబడ�త�ంది."
+
+#: ../mail/evolution-mail.schemas.in.h:95
 #, fuzzy
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ వెడల�ప�. వినియోగదారి విండోన� అడ�డంగా ప�నఃపరిమాణం "
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ వెడల�ప�. వినియోగదారి విండోన� "
+"అడ�డంగా ప�నఃపరిమాణం "
 "చేసినట�ల�గా ఈవిల�వ నవీకరించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ వెడల�ప�. వినియోగదారి విండోన� అడ�డంగా ప�నఃపరిమాణం "
+"\"మెయిల� పంప� మరియ� పొంద�\" విండోయొక�క ప�రారంభ వెడల�ప�. వినియోగదారి విండోన� "
+"అడ�డంగా ప�నఃపరిమాణం "
 "చేసినట�ల�గా ఈవిల�వ నవీకరించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:97
 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 "
@@ -11530,419 +10794,483 @@ msgid ""
 "replying."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 msgstr ""
-"శోధన సంచయంన�ండి సందేశాలన� శాశ�వతంగా తోలగించ�నప�ప�డ� పర�యాయ హెచ�చరికలన� ఇది చేతనం/అచేతనం "
-"చేస�త�ంది, శోధన ఫలితాలన�ండి సాదారణంగా తొలగిస�త�న�నప�పడ�కాద�."
+"అన�వేషణ సంచయంన�ండి సందేశాలన� శాశ�వతంగా తోలగించ�నప�ప�డ� పర�యాయ హెచ�చరికలన� ఇది "
+"చేతనం/అచేతనం "
+"చేస�త�ంది, అన�వేషణ ఫలితాలన�ండి సాదారణంగా తొలగిస�త�న�నప�పడ�కాద�."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:99
 #, fuzzy
 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 ""
-"శోధన సంచయంన�ండి సందేశాలన� శాశ�వతంగా తోలగించ�నప�ప�డ� పర�యాయ హెచ�చరికలన� ఇది చేతనం/అచేతనం "
-"చేస�త�ంది, శోధన ఫలితాలన�ండి సాదారణంగా తొలగిస�త�న�నప�పడ�కాద�."
+"అన�వేషణ సంచయంన�ండి సందేశాలన� శాశ�వతంగా తోలగించ�నప�ప�డ� పర�యాయ హెచ�చరికలన� ఇది "
+"చేతనం/అచేతనం "
+"చేస�త�ంది, అన�వేషణ ఫలితాలన�ండి సాదారణంగా తొలగిస�త�న�నప�పడ�కాద�."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:100
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr ""
-"ఆఫ�‌లైన� రీతికి వెళ�ళ�టక� మ�న�ప� ఆఫ�‌లైన� సింక� అవసరమేమో అడ�గ�టక� ప�నరావృత ప�రాంప�ట�లన� చేతనం/"
+"ఆఫ�‌లైన� రీతికి వెళ�ళ�టక� మ�న�ప� ఆఫ�‌లైన� సింక� అవసరమేమో అడ�గ�టక� ప�నరావృత "
+"ప�రాంప�ట�లన� చేతనం/"
 "అచేతనం చేస�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:101
 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 ""
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:102
+#, fuzzy
+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 ""
+"అన�వేషణ సంచయంన�ండి సందేశాలన� శాశ�వతంగా తోలగించ�నప�ప�డ� పర�యాయ హెచ�చరికలన� ఇది "
+"చేతనం/అచేతనం "
+"చేస�త�ంది, అన�వేషణ ఫలితాలన�ండి సాదారణంగా తొలగిస�త�న�నప�పడ�కాద�."
+
+#: ../mail/evolution-mail.schemas.in.h:103
 #, fuzzy
 msgid "Last time Empty Junk was run"
 msgstr "గతసారి ఖాళీ నిరర�ధకం నడ�పబడింది"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:104
 #, fuzzy
 msgid "Last time Empty Trash was run"
 msgstr "చివరిసారి ఖాళీ చెత�తక�ండి నడ�పబడింది"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:105
 #, fuzzy
 msgid "Layout style"
 msgstr "కూర�ప�(_o)"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:106
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
+msgid "Level beyond which the message should be logged."
+msgstr "� స�థాయి కి క�రింద సందేశం లాగిన� అవ�వాలో."
+
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of Labels and their associated colors"
 msgstr "లేబ�ళ�ళ యొక�క జాబితా మరియ� సంభందిత వర�ణమ�ల�"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "బొనాబో మూలకం దర�శక�ల కొరక� పరిశీలించ�టక� mime రకాల జాబితా"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accepted licenses"
 msgstr "ఆమోదించిన లైసెన�సెస� యొక�క జాబితా"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "List of accounts"
 msgstr "ఖాతాల యొక�క జాబితా"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
-"ఎవాల�య�షన� యొక�క మెయిల� మూలకంక� తెలిసిన ఖాతాల జాబితా. ఆ జాబితా /apps/evolution/mail/accounts క� "
+"ఎవాల�య�షన� యొక�క మెయిల� మూలకంక� తెలిసిన ఖాతాల జాబితా. ఆ జాబితా "
+"/apps/evolution/mail/accounts క� "
 "సారూప�యంగాఉన�న ఉపసంచయాల నామాలన� కలిగిఉంది."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of custom headers and whether they are enabled."
 msgstr "మల�చ�క�న�న పీఠికల జాబితా మరియ� అవి చేతనంగా ఉన�నాయా."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "List of dictionary language codes used for spell checking."
 msgstr "స�పెల� పరిశీలనకొరక� పదకోశప� భాషా కొడ�‌ల జాబితా వ�పయోగించబడింది."
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
-"ఎవాల�యూషన� యొక�క మెయిల� మూలకంక� తెలిసిన లేబ�ల�స� యొక�క జాబితా. ఆ జాబితా ఈ నామాలన� కలిగిఉన�న స�ట�రింగ�స�న� "
+"ఎవాల�యూషన� యొక�క మెయిల� మూలకంక� తెలిసిన లేబ�ల�స� యొక�క జాబితా. ఆ జాబితా ఈ "
+"నామాలన� కలిగిఉన�న స�ట�రింగ�స�న� "
 "కలిగిఉంట�ంది: వర�ణమ� ల� HTML hex ఎన�కోడింగ� న� వాడతాయో ఆవర�ణాల."
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "List of protocol names whose license has been accepted."
 msgstr "ఎవరి లైసెన�స� ఆమోదించబడిందో వారి నియమం నామాల జాబితా."
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Load images for HTML messages over HTTP"
 msgstr "HTTP పై HTML సందేశాలకొరక� చిత�రాలన� నింప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
 "contacts. \"2\" - Always load images off the net."
 msgstr ""
-"HTTP(s) నంద� HTML సందేశాల కొరక� చిత�రాలన� నింప�మ�. సాధ�యమగ� విల�వల�: \"0\" - ఎప�పడూ నెట� "
-"న�ండి చిత�రాలన� నింపద�. \"1\" - పరిచయాలన�ండి చిత�రాలన� సందేశాల నంద� నింప�త�ంది. \"2\" - "
+"HTTP(s) నంద� HTML సందేశాల కొరక� చిత�రాలన� నింప�మ�. సాధ�యమగ� విల�వల�: \"0\" - "
+"ఎప�పడూ నెట� "
+"న�ండి చిత�రాలన� నింపద�. \"1\" - పరిచయాలన�ండి చిత�రాలన� సందేశాల నంద� "
+"నింప�త�ంది. \"2\" - "
 "ఎప�ప�డ� చిత�రాలన� నెట� న�ండి నింప�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions"
 msgstr "వడపోత చర�యలన� లాగిన�‌చేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Log filter actions to the specified log file."
 msgstr "తెల�పబడినట�వంటి లాగ� దస�త�రమ�లక� వడపోత చర�యలన� లాగ� చేయ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Logfile to log filter actions"
-msgstr "లాగ� వడపోత చర�యలక� లాగ�‌దస�త�రం"
+msgstr "లాగ� వడపోత చర�యలక� లాగ�‌ఫైల�"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Logfile to log filter actions."
-msgstr "లాగ� వడపోత చర�యలక� లాగ�‌దస�త�రం."
+msgstr "లాగ� వడపోత చర�యలక� లాగ�‌ఫైల�."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:122
 #, fuzzy
 msgid "Mail browser height"
 msgstr "పొందికగల అడ�డపట�టీ ఎత�త�"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser maximized"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:124
 #, fuzzy
 msgid "Mail browser width"
 msgstr "దీనితో ఈ-తపాలా మొదలౌత�ంది"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout"
 msgstr "తెల�పబడిన సమయనియమితి తర�వాత చూచినట�ల� గ�ర�త�ంచ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark as Seen after specified timeout."
 msgstr "తెల�పబడిన సమయనియమితి తర�వాత చూచినట�ల� గ�ర�త�ంచ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\""
 msgstr "సందేశం \"ఉపదర�శనం\" లో సిటేషన�లన� గర�త�ంచ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Mark citations in the message \"Preview\"."
 msgstr "సందేశం \"ఉపదర�శనం\" లో సిటేషన�లన� గర�త�ంచ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message text limit for display"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "సందేశ-ప�రదర�శన శైలి (సాదారణ: \"normal\", పూర�తి పీఠికల�: \"full headers\", మూలం: \"source\")"
+msgstr ""
+"సందేశ-ప�రదర�శన శైలి (సాదారణ: \"normal\", పూర�తి పీఠికల�: \"full headers\", "
+"మూలం: "
+"\"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the junk on exit"
 msgstr "బయటక�వచ�చిన తర�వాత నిరర�ధకంన� ఖాళీచేయ�టక� మధ�యలో కనీస రోజ�ల�"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum days between emptying the trash on exit"
 msgstr "బయటక�వచ�చిన తర�వాత చెత�తక�ండీన� ఖాళీచేయ�టక� మధ�యలో కనీస రోజ�ల�"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "బయటక�వచ�చిన తర�వాత నిరర�ధకంన� ఖాళీచేయ�టక� మధ�యలో కనీస సమయం, రోజ�లలో."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "బయటక�వచ�చిన తర�వాత చెత�తక�ండీన� ఖాళీచేయ�టక� మధ�యలో కనీస సమయం, రోజ�లలో."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "TO/CC/BCC లో ప�రదర�శితమగ�టక� చిర�నామాల సంఖ�య"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:136
+#, fuzzy
+#| msgid "-----Original Message-----"
+msgid "Original message."
+msgstr "-----వాస�తన సందేశం-----"
+
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid "Path where picture gallery should search for its content"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:138
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:139
+#, fuzzy
+msgid "Prompt before sending to recipients not entered as mail addresses"
+msgstr "బహ�ళ సందేశాలన� గర�తిస�త�న�నప�ప�డ� అడ�గ�మ�"
+
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt on empty subject"
 msgstr "ఖాళీ సంగతి పై అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr "వినియోగదారిని అడ�గ�మ� ఎప�ప�డైతే అతడ� లేక ఆమె సంచయంన� కొట�టివేయ�టక� ప�రయత�నిస�తారో."
+msgstr ""
+"వినియోగదారిని అడ�గ�మ� ఎప�ప�డైతే అతడ� లేక ఆమె సంచయంన� కొట�టివేయ�టక� "
+"ప�రయత�నిస�తారో."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
-msgstr "వినియోగదారిని అడ�గ�మ� ఎప�ప�డైతే అతడ� లేక ఆమె సందేశాన�ని సంగతి లేక�ండా పంప�టక� ప�రయత�నిస�తాడో."
+msgstr ""
+"వినియోగదారిని అడ�గ�మ� ఎప�ప�డైతే అతడ� లేక ఆమె సందేశాన�ని సంగతి లేక�ండా పంప�టక� "
+"ప�రయత�నిస�తాడో."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when deleting messages in search folder"
-msgstr "శోధన సంచయంలో సందేశాలన� తొలగించ�త�న�నప�ప�డ� అడ�గ�మ�"
+msgstr "అన�వేషణ సంచయంలో సందేశాలన� తొలగించ�త�న�నప�ప�డ� అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:144
 #, fuzzy
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "బహ�ళ సందేశాలన� గర�తిస�త�న�నప�ప�డ� అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:145
 #, fuzzy
 msgid "Prompt when replying privately to list messages"
 msgstr "బహ�ళ సందేశాలన� గర�తిస�త�న�నప�ప�డ� అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:146
 #, fuzzy
 msgid "Prompt when replying to many recipients"
 msgstr "సందేశాలన� Bcc స�వీకరణదార�లన� ఉద�దేశించి పంప�త�న�నప�పడ� అడ�గ�మ�(_o)"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user expunges"
 msgstr "వినియోగదారి కొట�టివేయబడ�త�న�నప�ప�డ� అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user only fills Bcc"
 msgstr "వినియోగదారి మాత�రమే Bcc ని నింప�త�న�నప�ప�డ� అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
-"వినియోగదారి 10 లేక అంతకన�నా ఎక�క�వ సందేశాలన� ఒకేసారి తెర�చ�టక� ప�రయత�నిస�త�న�నప�ప�డ� అడ�గ�మ�"
+"వినియోగదారి 10 లేక అంతకన�నా ఎక�క�వ సందేశాలన� ఒకేసారి తెర�చ�టక� "
+"ప�రయత�నిస�త�న�నప�ప�డ� అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
-"HTML మెయిల� న� స�వీకరించనబోనట�వంటి స�వీకరణదార�లక� వినియోగదారి HTML మెయిల� న� పంప�టక� ప�రయత�నిస�త�ంటే "
+"HTML మెయిల� న� స�వీకరించనబోనట�వంటి స�వీకరణదార�లక� వినియోగదారి HTML మెయిల� న� "
+"పంప�టక� ప�రయత�నిస�త�ంటే "
 "అడ�గ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
-"వినియోగదారి To లేదా Cc స�వీకరణదార�లన� లేక�ండా సందేశంన� పంప�టక� వినియోగదారి ప�రయత�నిస�త�ంటే అడ�గ�మ�."
+"వినియోగదారి To లేదా Cc స�వీకరణదార�లన� లేక�ండా సందేశంన� పంప�టక� వినియోగదారి "
+"ప�రయత�నిస�త�ంటే అడ�గ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "వినియోగదారి కొరనట�వంటి HTML న� పంప�టక� ప�రయత�నిస�త�ంటే అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Prompt while marking multiple messages"
 msgstr "బహ�ళ సందేశాలన� గర�తిస�త�న�నప�ప�డ� అడ�గ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put personalized signatures at the top of replies"
 msgstr "ప�రత�య�త�తరమ�ల పైన వక�తిగత సంతకాలన� వ�ంచ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Put the cursor at the bottom of replies"
 msgstr "కర�సర�‌న� ప�రత�య�త�తరమ�ల క�రిందన వ�ంచ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize emoticons in text and replace them with images."
-msgstr "పాఠ�యమ�లోని emoticons న� గ�ర�తించి మరియ� వాటిని చిత�రమ�లతో ప�నఃస�థాపించ�మ�."
+msgstr ""
+"పాఠ�యమ�లోని emoticons న� గ�ర�తించి మరియ� వాటిని చిత�రమ�లతో ప�నఃస�థాపించ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Recognize links in text and replace them."
 msgstr "పాఠ�యమ�లోని లింక�లన� గ�ర�తించి మరియ� వాటిని ప�నఃస�థాపించ�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Run junk test on incoming mail."
 msgstr "లోనికివస�త�న�న మెయిల� నిరర�ధకమైనదేమో పరిశీలనజర�ప�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Save directory"
 msgstr "సంచయంన� దాయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Search for the sender photo in local address books"
 msgstr "స�థానిక చిర�నామాప�స�తకంలంద� పంపకందార� ఛాయాచిత�రం కొరక� శోధించ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default"
 msgstr "అప�రమేయంగా HTML మెయిల� న� పంప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Send HTML mail by default."
 msgstr "అప�రమేయంగా HTML మెయిల� న� పంప�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Sender email-address column in the message list"
 msgstr "సందేశ జాబితాలో పంపినవాని ఈమెయిల�-చిర�నామా కాలమ�"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Server synchronization interval"
 msgstr "సేవిక సింక�రనైజేషన� విరామం"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"Bcc\" క�షేత�రమ�న� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"Cc\" క�షేత�రమ�న� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "న�యూస�‌గ�రూప�‌నక� పోస�ట� చేయ�నప�ప�డ� \"న�ండి\" క�షేత�రమ�న� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when posting to a newsgroup"
-msgstr "న�యూస�‌గ�రూప�‌నక� పోస�ట�చేయ�నప�ప�డ� \"దీనికి ప�రత�య�త�తరమ�\" క�షేత�రమ�న� చూప�మ�"
+msgstr ""
+"న�యూస�‌గ�రూప�‌నక� పోస�ట�చేయ�నప�ప�డ� \"దీనికి ప�రత�య�త�తరమ�\" క�షేత�రమ�న� "
+"చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show \"Reply To\" field when sending a mail message"
-msgstr "మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"దీనికి ప�రత�య�త�తరమ�\" క�షేత�రమ�న� చూప�మ�"
+msgstr ""
+"మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"దీనికి ప�రత�య�త�తరమ�\" క�షేత�రమ�న� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show Animations"
 msgstr "యానిమేషన�లన� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 #, fuzzy
 msgid "Show all message headers"
 msgstr "అన�ని సందేశ తంత�లన� కూల�చ�త�ంది"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 #, fuzzy
 msgid "Show all the headers when viewing a messages."
-msgstr "మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"దీనికి ప�రత�య�త�తరమ�\" క�షేత�రమ�న� చూప�మ�"
+msgstr ""
+"మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"దీనికి ప�రత�య�త�తరమ�\" క�షేత�రమ�న� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show animated images as animations."
 msgstr "యానిమేషన�లలాగా యానిమేటెడ� చిత�రాలన� చూప�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "సందేశ-జాబితా నంద� తొలగించిన సందేశాలన� (కొట�టివేత తో) చూప�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show deleted messages in the message-list"
 msgstr "తొలిగించిన సందేశాలన� సందేశ-జాబితా నంద� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show image animations"
 msgstr "ప�రతిబింబప� యానిమేషన�లన� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show original \"Date\" header value."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Show photo of the sender"
 msgstr "పంపకందార� యొక�క ఛాయాచిత�రమ�న� చూప�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
-"మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"Bcc\" క�షేత�రమ�న� చూప�మ�. మెయిల� ఖాతా యెంచ�కొనబడినప�ప�డ� దర�శన "
+"మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"Bcc\" క�షేత�రమ�న� చూప�మ�. మెయిల� ఖాతా "
+"యెంచ�కొనబడినప�ప�డ� దర�శన "
 "మెనూన�ండి యిది నియంత�రించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
-"మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"Cc\" క�షేత�రమ�న� చూప�మ�. మెయిల� ఖాతా యెంచ�కొనబడినప�ప�డ� దర�శన "
+"మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"Cc\" క�షేత�రమ�న� చూప�మ�. మెయిల� ఖాతా "
+"యెంచ�కొనబడినప�ప�డ� దర�శన "
 "మెనూన�ండి యిది నియంత�రించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
 msgstr ""
-"మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"From\" క�షేత�రమ�న� చూప�మ�. వార�తల ఖాతా యెంచ�కొనబడినప�ప�డ� "
+"మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"From\" క�షేత�రమ�న� చూప�మ�. వార�తల ఖాతా "
+"యెంచ�కొనబడినప�ప�డ� "
 "దర�శన మెనూన�ండి యిది నియంత�రించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
 msgstr ""
-"మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"దీనికి ప�రత�య�త�తరమ�\" క�షేత�రమ�న� చూప�మ�. వార�తల ఖాతా "
+"మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"దీనికి ప�రత�య�త�తరమ�\" క�షేత�రమ�న� చూప�మ�. "
+"వార�తల ఖాతా "
 "యెంచ�కొనబడినప�ప�డ� దర�శన మెనూన�ండి యిది నియంత�రించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
 msgstr ""
-"మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"దీనికి ప�రత�య�త�తరమ�\" క�షేత�రమ�న� చూప�మ�. మెయిల� ఖాతా "
+"మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"దీనికి ప�రత�య�త�తరమ�\" క�షేత�రమ�న� చూప�మ�. "
+"మెయిల� ఖాతా "
 "యెంచ�కొనబడినప�ప�డ� దర�శన మెనూన�ండి యిది నియంత�రించబడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
-msgstr "సందేశ జాబితాలో ప�రత�యేక కాలమ�‌నంద� పంపినవానియొక�క ఈమెయిల�-చిర�నామాన� చూప�మ�."
+msgstr ""
+"సందేశ జాబితాలో ప�రత�యేక కాలమ�‌నంద� పంపినవానియొక�క ఈమెయిల�-చిర�నామాన� చూప�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:186
 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 ""
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "సందేశాన�ని చద�వ� తలంలో పంపకందార� యొక�క ఛాయాచిత�రాన�ని చూప�మ�."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:188
 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. "
@@ -11953,47 +11281,43 @@ msgid ""
 "Post: header, if there is one."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell check inline"
 msgstr "ఇన�‌లైన� లో స�పెల�‌ పరిశీలన"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Spell checking color"
 msgstr "స�పెల� పరిశీలన వర�ణమ�"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Spell checking languages"
 msgstr "స�పెల� పరిశీలన భాషల�"
 
-#: ../mail/evolution-mail.schemas.in.h:177
-msgid "Subscribe dialog default height"
-msgstr "చందా డైలాగ� అప�రమేయ ఎత�త�"
-
-#: ../mail/evolution-mail.schemas.in.h:178
-msgid "Subscribe dialog default width"
-msgstr "చందా డైలాగ� అప�రమేయ వెడల�ప�"
+#: ../mail/evolution-mail.schemas.in.h:192
+msgid "State of message headers in paned view"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Terminal font"
 msgstr "టెర�మినల� ఫాంట�"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "The default plugin for Junk hook"
 msgstr "నిరర�ధక హ�క� కొరక� అప�రమేయ ప�లగ�ఇన�"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:195
 #, fuzzy
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "గతసారి ఖాళీ నిరర�ధకం నడ�స�త�న�నది, రోజ�లలో epoch న�ండి."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:196
 #, fuzzy
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "గతసారి ఖాళీ చెత�తక�ండి నడ�స�త�న�నది, రోజ�లలో epoch న�ండి."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:197
 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 "
@@ -12001,61 +11325,86 @@ msgid ""
 "message list."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "The terminal font for mail display."
 msgstr "మెయిల� ప�రదర�శన కొరక� టెర�మినల� ఫాంట�."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:199
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:200
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:201
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "The variable width font for mail display."
 msgstr "మెయిల� ప�రదర�శన కొరక� వేరియబ�ల� వెడల�ప� ఫాంట�."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
-"ఇది మూడ� విల�వ�లన� కలిగివ�ండవచ�చ�. దోషమ�ల కొరక� \"0\". హెచ�చరికల కొరక� \"1\". డీబగ� సందేశాల "
+"ఇది మూడ� విల�వ�లన� కలిగివ�ండవచ�చ�. దోషమ�ల కొరక� \"0\". హెచ�చరికల కొరక� \"1\". "
+"డీబగ� సందేశాల "
 "కొరక� \"2\"."
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:204
 #, fuzzy
 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 ""
-"ఎవాల�యూషన� క�రింది రూపీకరించబడే పాఠ�యమ� యొక�క గరిష�ట పరిమాణంన� ఇది నిర�ధారిస�త�ంది. అప�రమేయ 4MB / 4096 "
+"ఎవాల�యూషన� క�రింది రూపీకరించబడే పాఠ�యమ� యొక�క గరిష�ట పరిమాణంన� ఇది "
+"నిర�ధారిస�త�ంది. అప�రమేయ 4MB / 4096 "
 "KB మరియ� KB ల రూపంలో తెల�పబడింది."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 msgstr ""
-"ఇది అప�రమేయ నిరర�ధకం ప�లగ�ఇన�, అక�కడ బహ�ళ ప�లగ�ఇన�‌ల� చేతనంచేయబడి వ�న�నాకూడా. అప�రమేయంగా జాబితా చేసిన "
-"ప�లగ�ఇన� అచేతనం చేయబడివ�ంటే, అప�ప�డ� ఇది ఇతర అంద�బాట�లోవ�న�న ప�లగ�ఇన�‌ల కొరక� వెన�కక� వెళ�ళద�."
+"ఇది అప�రమేయ నిరర�ధకం ప�లగ�ఇన�, అక�కడ బహ�ళ ప�లగ�ఇన�‌ల� చేతనంచేయబడి వ�న�నాకూడా. "
+"అప�రమేయంగా జాబితా చేసిన "
+"ప�లగ�ఇన� అచేతనం చేయబడివ�ంటే, అప�ప�డ� ఇది ఇతర అంద�బాట�లోవ�న�న ప�లగ�ఇన�‌ల కొరక� "
+"వెన�కక� వెళ�ళద�."
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
 msgstr ""
-"ఈ కీ ఒకసారికి మాత�రమే చద�వ�టక� మరియ� చదివినతర�వాత \"అసత�యం\"క� అమర�చబడ�త�ంది. ఇది జాబితానందలి "
+"ఈ కీ ఒకసారికి మాత�రమే చద�వ�టక� మరియ� చదివినతర�వాత \"అసత�యం\"క� అమర�చబడ�త�ంది. "
+"ఇది జాబితానందలి "
 "మెయిల� ఎంపికన� తీసివేయ�చ�న�నది మరియ� ఆసంచయంక� వ�పదర�శనంన� తొలగించ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 msgstr ""
-"ఈ కీ మల�చ�క�న�న పీఠికలన� తెల�ప� XML ఆకృత�ల యొక�క జాబితా కలిగిఉండాలి, మరియ� అవి ప�రదర�శించబడాలి. "
-"XML ఆకృతి యొక�క రూపం &lt;పీఠిత చేతనమైంది&gt; - పీఠిక మెయిల� దర�శనం లో ప�రదర�శించాలంటే చేతనం "
+"ఈ కీ మల�చ�క�న�న పీఠికలన� తెల�ప� XML ఆకృత�ల యొక�క జాబితా కలిగిఉండాలి, మరియ� "
+"అవి ప�రదర�శించబడాలి. "
+"XML ఆకృతి యొక�క రూపం &lt;పీఠిత చేతనమైంది&gt; - పీఠిక మెయిల� దర�శనం లో "
+"ప�రదర�శించాలంటే చేతనం "
 "అమర�చండి."
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:208
 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 "
@@ -12065,192 +11414,209 @@ msgstr ""
 "determine whether to look up addresses in local addressbook only to exclude "
 "mail sent by known contacts from junk filtering."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "This option would help in improving the speed of fetching."
 msgstr "ఈ �చ�చికం సంగ�రహం యొక�క వేగంన� మెర�గ�పరచ�టక� దోహదపడ�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr ""
-"అప�రమేయ సందేశ జాబితా దర�శనంలో చూపవలిసిన చిర�నామాల సంఖ�యన� ఇది అమర�చ�త�ంది, వెన�క �దైతే '...' "
+"అప�రమేయ సందేశ జాబితా దర�శనంలో చూపవలిసిన చిర�నామాల సంఖ�యన� ఇది అమర�చ�త�ంది, "
+"వెన�క �దైతే '...' "
 "చూపబడ�త�ందో."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:211
+#, fuzzy
+#| msgid ""
+#| "This setting specifies whether the threads should be in expanded or "
+#| "collapsed state by default. Evolution requires a restart."
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
+"collapsed state by default. Requires a restart to apply."
 msgstr ""
-"తంత�ల� అప�రమేయంగా విస�తరింప�లో వ�ండాలో లేదా కూల�చిన స�థితినంద� వ�ండాలో ఈ అమరిక తెల�ప�త�ంది. "
+"తంత�ల� అప�రమేయంగా విస�తరింప�లో వ�ండాలో లేదా కూల�చిన స�థితినంద� వ�ండాలో ఈ "
+"అమరిక తెల�ప�త�ంది. "
 "ఎవాల�యూషన�‌క� ప�నఃప�రారంభం అవసరం."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 msgstr ""
-"ప�రతి తంతినంద� సందేశమ�ల తేదీలపై ఆధారపడ�ట కన�నా సరికొత�త సందేశం లపై ఆధారపడి తంత�ల� క�రమపరచాలేమో, ఈ "
+"ప�రతి తంతినంద� సందేశమ�ల తేదీలపై ఆధారపడ�ట కన�నా సరికొత�త సందేశం లపై ఆధారపడి "
+"తంత�ల� క�రమపరచాలేమో, ఈ "
 "అమర�ప� తెలియజేస�త�ంది. ఎవాల�య�షన� క� ప�నఃప�రారంభం అవసరం."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:213
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Thread the message-list based on Subject"
 msgstr "సంగతి పై ఆదారపడి సందేశ-జాబితాన� తంతిచేయ�మ�"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Timeout for marking message as seen"
 msgstr "సందేశాన�ని చూసినదానిలా గ�ర�త�ంచ�టక� సమయంమించినది"
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Timeout for marking message as seen."
 msgstr "చూచినట�ల�గా సందేశాన�ని గ�ర�త�ంచ�టక� సమయం మించిపోయింది."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "UID string of the default account."
 msgstr "అప�రమేయ ఖాతా యొక�క UID స�ట�రింగ�."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "Underline color for misspelled words when using inline spelling."
-msgstr "ఇన�‌లైన� స�పెల�లింగ�‌న� వ�పయోగిస�త�న�నప�ప�డ� తప�ప�గాస�పెల� చేయబడిన పదమ�ల క�రిందిగీత వర�ణమ�."
-
-#: ../mail/evolution-mail.schemas.in.h:201
-msgid "Use SpamAssassin daemon and client"
-msgstr "స�పామ�ఎస�సైన� డెమోన� మరియ� కక�షిదార�న� ఉపయోగించ�మ�"
-
-#: ../mail/evolution-mail.schemas.in.h:202
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "స�పామ�ఎస�సైన� డెమోన� మరియ� కక�షిదార� (spamc/spamd)న� వ�పయోగించ�మ�."
+msgstr ""
+"ఇన�‌లైన� స�పెల�లింగ�‌న� వ�పయోగిస�త�న�నప�ప�డ� తప�ప�గాస�పెల� చేయబడిన పదమ�ల "
+"క�రిందిగీత వర�ణమ�."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid "Use custom fonts"
 msgstr "మల�చ�క�న�న ఫాంట�లన� ఉపయోగించ�"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Use custom fonts for displaying mail."
 msgstr "మెయిల�‌న� ప�రదర�శించ�టక� మల�చ�క�న�న ఫాంట�లన� వ�పయోగించ�."
 
-#: ../mail/evolution-mail.schemas.in.h:205
-msgid "Use only local spam tests."
-msgstr "స�థానిక స�పామ� పరిశీలనలన� మాత�రమే ఉపయోగించ�మ�."
-
-#: ../mail/evolution-mail.schemas.in.h:206
-msgid "Use only the local spam tests (no DNS)."
-msgstr "స�థానిక స�పామ� పరిశీలనలన� మాత�రమే పరిశీలించ�మ� (DNS కాద�)."
-
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:221
 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 ""
-"సందేశమ�నక� ప�రత�య�త�తరమ� యిచ�చ�నప�ప�డ� కర�సర� యెక�కడికి వెళ�ళాలి అన�దానికి వినియోగదార�ల� అన�ని పై "
-"ఆర�మ�స�న� పొంద�తార�. కర�సర� సందేశమ�పైన వ�ంచాలా లేక క�రిందవ�ంచాలా అన�నది యిది నిర�ణయిస�త�ంది."
+"సందేశమ�నక� ప�రత�య�త�తరమ� యిచ�చ�నప�ప�డ� కర�సర� యెక�కడికి వెళ�ళాలి అన�దానికి "
+"వినియోగదార�ల� అన�ని పై "
+"ఆర�మ�స�న� పొంద�తార�. కర�సర� సందేశమ�పైన వ�ంచాలా లేక క�రిందవ�ంచాలా అన�నది యిది "
+"నిర�ణయిస�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:222
 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 ""
-"సందేశమ�నక� ప�రత�య�త�తరమ� యిచ�చ�నప�ప�డ� వారి సంతకం యెక�కడికి వెళ�ళాలి అన�దానికి వినియోగదార�ల� అన�ని పై "
-"ఆర�మ�స�న� పొంద�తార�. సంతకం సందేశమ�పైన వ�ంచాలా లేక క�రిందవ�ంచాలా అన�నది యిది నిర�ణయిస�త�ంది."
+"సందేశమ�నక� ప�రత�య�త�తరమ� యిచ�చ�నప�ప�డ� వారి సంతకం యెక�కడికి వెళ�ళాలి "
+"అన�దానికి వినియోగదార�ల� అన�ని పై "
+"ఆర�మ�స�న� పొంద�తార�. సంతకం సందేశమ�పైన వ�ంచాలా లేక క�రిందవ�ంచాలా అన�నది యిది "
+"నిర�ణయిస�త�ంది."
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:223
 msgid "Variable width font"
 msgstr "వేరియబ�ల� వెడల�ప� ఫాంట�"
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "ప�రతి సందేశాని కి అప�రమేయంగా రశీద� న� చద�వ� అభ�యర�దన జతచేయవలెనా."
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:225
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:226
+msgid ""
+"Whether check for new messages when Evolution is started. This includes also "
+"sending messages from Outbox."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid "Whether disable ellipsizing feature of folder names in side bar."
-msgstr "పక�కపట�టీ నంద� ఫోల�డర� నామాలయొక�క ఎలిప�సైజింగ� సౌలభ�యాన�ని అచేతనం చేయాలా."
+msgstr ""
+"పక�కపట�టీ నంద� ఫోల�డర� నామాలయొక�క ఎలిప�సైజింగ� సౌలభ�యాన�ని అచేతనం చేయాలా."
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
-"సందేశం దీనికి-ప�రత�య�త�తరంగా లేదా సంప�రదించ�చూ పీఠికలన� కలిగిలేనప�ప�డ� సంగత�ల ద�వారా తంతీకరణ పై "
+"సందేశం దీనికి-ప�రత�య�త�తరంగా లేదా సంప�రదించ�చూ పీఠికలన� కలిగిలేనప�ప�డ� సంగత�ల "
+"ద�వారా తంతీకరణ పై "
 "వెన�కక� వేళ�ళాలా వద�దా."
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "తంతిలోని సరికొత�త సందేశం పై ఆధరపడి తంత�లన� క�రమపరచవలెనా"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:230
 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 ""
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Width of the message-list pane"
 msgstr "సందేశ-జాబితా తలం యొక�క వెడల�ప�"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid "Width of the message-list pane."
 msgstr "సందేశ-జాబితా తలం యొక�క వెడల�ప�."
 
-#: ../mail/importers/elm-importer.c:176
+#: ../mail/importers/elm-importer.c:181
 msgid "Importing Elm data"
 msgstr "Elm డాటాన� దిగ�మతిచేస�తోంది"
 
-#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
-#: ../modules/mail/e-mail-shell-view.c:951
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
-#: ../widgets/misc/e-send-options.c:499
+#: ../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:520
 msgid "Mail"
 msgstr "మెయిల�"
 
-#: ../mail/importers/elm-importer.c:366
+#: ../mail/importers/elm-importer.c:396
 msgid "Evolution Elm importer"
 msgstr "ఎవాల�యూషన� Elm దిగ�మతిదారి"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:397
 msgid "Import mail from Elm."
 msgstr "Elm న�ండి మెయిల� న� దిగ�మతి చేయ�మ�."
 
-#: ../mail/importers/evolution-mbox-importer.c:116
-#: ../plugins/dbx-import/dbx-importer.c:226
+#: ../mail/importers/evolution-mbox-importer.c:138
+#: ../plugins/dbx-import/dbx-importer.c:250
 #, fuzzy
 msgid "_Destination folder:"
 msgstr "గమ�యస�థాన సంచయం:"
 
-#: ../mail/importers/evolution-mbox-importer.c:122
-#: ../plugins/dbx-import/dbx-importer.c:232
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../mail/importers/evolution-mbox-importer.c:145
+#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../plugins/pst-import/pst-importer.c:460
 msgid "Select folder"
 msgstr "సంచయంన� ఎంపికచేస�కొన�మ�"
 
-#: ../mail/importers/evolution-mbox-importer.c:122
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../mail/importers/evolution-mbox-importer.c:146
+#: ../plugins/dbx-import/dbx-importer.c:261
+#: ../plugins/pst-import/pst-importer.c:461
 msgid "Select folder to import into"
 msgstr "దీనిలోకి దిగ�మతిచేయ�టక� సంచయంన� ఎంపికచేయ�మ�"
 
-#. Translators: Column header for a message subject
-#: ../mail/importers/evolution-mbox-importer.c:372
+#: ../mail/importers/evolution-mbox-importer.c:433
 #, fuzzy
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "సంగతి"
 
-#. Translators: Column header for a message From address
-#: ../mail/importers/evolution-mbox-importer.c:376
+#: ../mail/importers/evolution-mbox-importer.c:438
 #, fuzzy
 msgctxt "mboxImp"
 msgid "From"
 msgstr "న�ండి"
 
-#: ../mail/importers/evolution-mbox-importer.c:412
-#: ../shell/e-shell-utils.c:251
+#: ../mail/importers/evolution-mbox-importer.c:482
+#: ../shell/e-shell-utils.c:221
 msgid "Berkeley Mailbox (mbox)"
 msgstr "బెర�కెలి మెయిల�‌బాక�స� (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:413
+#: ../mail/importers/evolution-mbox-importer.c:483
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "దిగ�మతిదారి బెర�కెలి మెయిల�‌పెట�టె రూపం సంచయాల�"
 
@@ -12259,160 +11625,167 @@ msgid "Importing mailbox"
 msgstr "మెయిల�‌పెట�టెన� దిగ�మతిచేస�తోంది"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:150
-#: ../plugins/dbx-import/dbx-importer.c:554
-#: ../plugins/pst-import/pst-importer.c:452
-#: ../plugins/pst-import/pst-importer.c:558
+#: ../mail/importers/mail-importer.c:153
+#: ../plugins/dbx-import/dbx-importer.c:610
+#: ../plugins/pst-import/pst-importer.c:648
 #, fuzzy, c-format
 msgid "Importing '%s'"
 msgstr "`%s' న� దిగ�మతిచేస�తోంది"
 
-#: ../mail/importers/mail-importer.c:295
+#: ../mail/importers/mail-importer.c:316
 #, c-format
 msgid "Scanning %s"
 msgstr "%s న� స�కానింగ� చేస�తోంది"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:260
 msgid "Importing Pine data"
 msgstr "పైన� డాటాన� దిగ�మతిచేస�తోంది"
 
-#: ../mail/importers/pine-importer.c:405
-#: ../modules/addressbook/addressbook-config.c:1006
+#: ../mail/importers/pine-importer.c:463
+#: ../modules/addressbook/addressbook-config.c:1081
 msgid "Address Book"
 msgstr "చిర�నామా ప�స�తకం"
 
-#: ../mail/importers/pine-importer.c:447
+#: ../mail/importers/pine-importer.c:509
 msgid "Evolution Pine importer"
 msgstr "ఎవాల�యూషన� పైన� దిగ�మతిదారి"
 
-#: ../mail/importers/pine-importer.c:448
+#: ../mail/importers/pine-importer.c:510
 msgid "Import mail from Pine."
 msgstr "పైన� న�ండి మెయిల� దిగ�మతిచేయ�మ�."
 
-#: ../mail/mail-autofilter.c:70
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "%s క� మెయిల� చేయ�మ�"
 
-#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
+#: ../mail/mail-autofilter.c:228 ../mail/mail-autofilter.c:271
 #, c-format
 msgid "Mail from %s"
 msgstr "%s న�ండి మెయిల�"
 
-#: ../mail/mail-autofilter.c:256
+#: ../mail/mail-autofilter.c:254
 #, c-format
 msgid "Subject is %s"
 msgstr "సంగతి %s"
 
-#: ../mail/mail-autofilter.c:291
+#: ../mail/mail-autofilter.c:295
 #, c-format
 msgid "%s mailing list"
 msgstr "%s మెయిలింగ� జాబితా"
 
-#: ../mail/mail-autofilter.c:363
+#: ../mail/mail-autofilter.c:404
 msgid "Add Filter Rule"
 msgstr "వడపోత నియమాన�ని జతచేయ�మ�"
 
-#. Translators: The first %s is name of the affected filter rule(s),
-#. the second %s is uri of the removed 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:450
+#. Translators: The first %s is name of the affected
+#. * filter rule(s), the second %s is URI of the removed
+#. * 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:507
 #, c-format
 msgid ""
-"The filter rule \"%s\" has been updated, because it used just removed "
-"folder\n"
+"The filter rule \"%s\" has been modified to account for the deleted folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following filter rules\n"
-"%s have been updated, because they used just removed folder\n"
+"%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 msgstr[0] ""
 msgstr[1] ""
 
-#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
 #: ../mail/mail-config.ui.h:2
-msgid "(Not Recommended)"
-msgstr ""
+msgid "Add Ne_w Signature..."
+msgstr "కొత�త సంతకాన�ని కల�ప�మ�(_w)..."
 
 #: ../mail/mail-config.ui.h:3
-msgid "(Note: Requires restart of the application)"
-msgstr "(గమనిక: అన�వర�తనం ప�నఃప�రారంభం అవసరం)"
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "ఈ ఖాతాన� ఉపయోగించ�నప�ప�డ� ఎప�ప�డూ బయటక�వెళ�ళ� సందేశాలన� సంతకంచేయి(_w)"
 
 #: ../mail/mail-config.ui.h:4
-#, fuzzy
-msgid "Account Information"
-msgstr "సమాచారం లేద�"
-
-#: ../mail/mail-config.ui.h:5
-msgid "Add Ne_w Signature..."
-msgstr "కొత�త సంతకాన�ని కల�ప�మ�(_w)..."
+msgid ""
+"All new emails with header that matches given content will be automatically "
+"filtered as junk"
+msgstr ""
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:6
-msgid "Al_ways sign outgoing messages when using this account"
-msgstr "ఈ ఖాతాన� ఉపయోగించ�నప�ప�డ� ఎప�ప�డూ బయటక�వెళ�ళ� సందేశాలన� సంతకంచేయి(_w)"
+#, fuzzy
+msgid "Allowing a _mailing list to redirect a private reply to the list"
+msgstr "బహ�ళ సందేశాలన� గర�తిస�త�న�నప�ప�డ� అడ�గ�మ�"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
-msgstr "ఎన�క�రిప�టెడ� సందేశాలన� పంప�త�న�నప�ప�డ� స�వతంక� ఎన�క�రిప�ట� అవ�వ�మ� (_f)"
+msgstr ""
+"ఎన�క�రిప�టెడ� సందేశాలన� పంప�త�న�నప�ప�డ� స�వతంక� ఎన�క�రిప�ట� అవ�వ�మ� (_f)"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "ఎప�ప�డ� వీరకి కార�బన�-నకలే (cc)(_s):"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "(_b) ఎప�ప�డూ బ�లైండ� కార�బన�-నకలే (bcc):"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "ఎన�క�రిప�టింగ� చేయ�చ�న�నప�పడ� ఎప�పడూ నా కీరింగ� లోని కీలన� నమ�మ�మ�(_t)"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr "ఎన�క�రిప�టెడ� సందేశాలన� పంప�త�న�నప�ప�డ� ఎప�ప�డూ నన�నూ ఎన�క�రిప�ట�చేయ�మ� (_m)"
+msgstr ""
+"ఎన�క�రిప�టెడ� సందేశాలన� పంప�త�న�నప�ప�డ� ఎప�ప�డూ నన�నూ ఎన�క�రిప�ట�చేయ�మ� (_m)"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "ఎప�ప�డూ చదివిన రశీద� న� అభ�యర�ధించ�మ�(_d)"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:13
 msgid "Apply the same _view settings to all folders"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:16
-#: ../modules/addressbook/addressbook-config.c:1013
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1088
 msgid "Authentication"
 msgstr "ప�రామాణీకరణ"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "స�వయంచాలకంగా emoticon చిత�రాలన� చేర�చ�మ� (_e)"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "అక�షర సమితి(_h):"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "మద�దతివ�వబడ� రకమ�ల కొరక� పరిశీలించ�మ�(_e)"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "నిరర�ధకం కొరక� మ�ల�చ�క�న�న పీఠికలన� పరిశీలించ�మ� (_s)"
 
+#: ../mail/mail-config.ui.h:20
+#, fuzzy
+#| msgid "Check for _new messages every"
+msgid "Check for new _messages on start"
+msgstr "కొత�త సందేశాల కొరక� వెత�క�మ� (_n)"
+
 #: ../mail/mail-config.ui.h:21
+#, fuzzy
+#| msgid "Check for _new messages every"
+msgid "Check for new messa_ges in all active accounts"
+msgstr "కొత�త సందేశాల కొరక� వెత�క�మ� (_n)"
+
+#: ../mail/mail-config.ui.h:22
 msgid "Check incoming _messages for junk"
 msgstr "లోనిక వస�త�న�న సందేశాలన� నిరర�ధకం కొరక� పరిశీలించ�మ�"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Check spelling while I _type"
 msgstr "నేన� టైప� చేస�త�న�నప�ప�డే స�పెల�లింగ� న� పరిశీలించ�మ�(_t)"
 
-#: ../mail/mail-config.ui.h:23
-msgid "Checks incoming mail messages to be Junk"
-msgstr "లోనకివస�త�న�న సందేశాలలో నిరర�ధకం కొరక� పరిశీలించ�"
-
 #: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "శ�బ�రంచేయ�(_a)"
@@ -12430,7 +11803,8 @@ msgstr "తపà±�à°ªà±�à°—à°¾ à°¸à±�పెలà±�‌చేసిన పదాలà
 msgid "Composing Messages"
 msgstr "సందేశాన�ని కూర�చ�మ�"
 
-#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:28
+#: ../modules/plugin-manager/evolution-plugin-manager.c:161
 msgid "Configuration"
 msgstr "ఆకృతీకరణ"
 
@@ -12438,12 +11812,24 @@ msgstr "ఆకృతీకరణ"
 msgid "Confirm _when expunging a folder"
 msgstr "ఒక సంచయాన�ని కొట�టివేయ�చ�న�నప�పడ� నిర�ధారించ�కొన�మ�(_w)"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:30
+#, fuzzy
+#| msgid "Configuration"
+msgid "Confirmations"
+msgstr "ఆకృతీకరణ"
+
+#: ../mail/mail-config.ui.h:31
+#: ../modules/addressbook/autocompletion-config.c:188
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
+msgid "Date/Time Format"
+msgstr "తారీఖ�/సమయం ఫార�మాట�"
+
+#: ../mail/mail-config.ui.h:33
 #, fuzzy
 msgid "Default Behavior"
 msgstr "ఆప�రమేయ ప�రాధాన�యం:"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Default character e_ncoding:"
 msgstr "అప�రమేయ అక�షర ఎన�కోడింగ�(_n):"
 
@@ -12466,386 +11852,385 @@ msgid "Displayed Message Headers"
 msgstr "అన�ని సందేశ పీఠికల�(_H)"
 
 #: ../mail/mail-config.ui.h:40
-#, fuzzy
-msgid "Do not display messages when text si_ze exceeds"
-msgstr "పాఠ�య పరిమాణం మించితే సందేశాలన� రూపీకరించవద�ద� (_z)"
-
-#: ../mail/mail-config.ui.h:41
 msgid "Do not mar_k messages as junk if sender is in my address book"
-msgstr "పంపకందార� నాచిర�నామా ప�స�తంకంలో వ�ంటే సందేశాలన� నిరర�ధకంగా గ�ర�తించవద�ద� (_k)"
+msgstr ""
+"పంపకందార� నాచిర�నామా ప�స�తంకంలో వ�ంటే సందేశాలన� నిరర�ధకంగా గ�ర�తించవద�ద� (_k)"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:41
 #, fuzzy
 msgid "Do not quote"
 msgstr "తొలగించవద�ద�"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
 msgstr "డ�రాఫ�ట�  సంచయం(_F):"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
 msgstr "ఈ మెయిల� చిర�నామ(_A):"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:44
 msgid "Empty trash folders on e_xit"
 msgstr "బయటక� వచ�చ�నప�ప�డ� చెత�తక�ండీ సంచయాలన� ఖాళీచేయ�మ�"
 
 #: ../mail/mail-config.ui.h:46
-msgid "Enable Magic S_pacebar"
-msgstr "మాయా స�పేస�‌బార� న� చేతనంచేయ�మ� (_p)"
-
-#: ../mail/mail-config.ui.h:47
-msgid "Enable Sea_rch Folders"
-msgstr "శోధన సంచయాలన� చేతనంచేయ�మ�(_r)"
-
-#: ../mail/mail-config.ui.h:49
 msgid "Encry_ption certificate:"
 msgstr "ఎన�క�రిప�షన� దృవీకరణపత�రం(_p):"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "బయటక�వెళ�ళ� సందేశాలన� ఎన�క�రిప�ట�చేయ�మ� (అప�రమేయంగా)"
 
-#: ../mail/mail-config.ui.h:51
-msgid "Fi_xed-width:"
-msgstr "నిర�దేశిత-వెడల�ప�(_x):"
+#: ../mail/mail-config.ui.h:48
+msgid "F_all back to threading messages by subject"
+msgstr "సంగతి ద�వారా తంతీకరణ సందేశాలక� తిరిగివెళ�ళ�మ� (_a)"
 
-#: ../mail/mail-config.ui.h:52
-msgid "Fix_ed width Font:"
+#: ../mail/mail-config.ui.h:49
+#, fuzzy
+#| msgid "Fix_ed width Font:"
+msgid "Fix_ed Width Font:"
 msgstr "నిర�దేశిత వెడల�ప� ఫాంట� (_e):"
 
-#: ../mail/mail-config.ui.h:53
-msgid "Font Properties"
-msgstr "ఫాంట� లక�షణాల�"
-
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:50
 msgid "Format messages in _HTML"
 msgstr "సందేశాలన� _HTML నంద� రూపీకరించ�మ�"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:51
 msgid "Full Nam_e:"
 msgstr "పూర�తి నామం(_e):"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:53
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "HTML సందేశాల�"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "H_TTP ప�రోక�సీ:"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:56
+#, fuzzy
+#| msgid "Sender contains"
+msgid "Header content"
+msgstr "పంపినవార� కలిగిఉంటే"
+
+#: ../mail/mail-config.ui.h:57
+#, fuzzy
+#| msgid "Header Name:"
+msgid "Header name"
+msgstr "పీఠిక పేర�:"
+
+#: ../mail/mail-config.ui.h:58
 msgid "Headers"
 msgstr "పీఠికల�"
 
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:59
 msgid "Highlight _quotations with"
 msgstr "కొటేషన�లన� వీటితో ఉద�దీపనంచేయ�మ�(_q)"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:60
 msgid "Ignore Reply-To: for mailing lists"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:61
 #, fuzzy
 msgid "Inline"
 msgstr "ఇన�‌లైన�(_I)"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:62
 msgid "Inline (Outlook style)"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:67
-msgid "KB"
-msgstr "KB"
-
-#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "లేబ�ళ�ళ�"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "భాషాల పట�టిక"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:66
 #, fuzzy
 msgid "Loading Images"
 msgstr "చిత�రమ�లన� నింప�మ�(_L)"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "మెయిల� పీఠికల పట�టిక"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "మెయిల�‌పెట�టె స�థానమ�"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:69
 #, fuzzy
 msgid "Message Display"
 msgstr "సందేశాల�"
 
-#: ../mail/mail-config.ui.h:74
-#, fuzzy
-msgid "Message Fonts"
-msgstr "సందేశం కలిగినది"
-
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:70
 #, fuzzy
 msgid "Message Receipts"
 msgstr "సందేశం తిప�ప�కొన�ట"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "(_P) దీనికొరక� ప�రోక�సీలేద�:"
 
-#: ../mail/mail-config.ui.h:78
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
-msgstr "గమనిక: మీర� మొదటిసారి అన�సంధానించ బడనంతవరక� మీర� సంకేతపదం కొరక� అడ�గబడర�"
+#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr "ఎన�క�రిప�షన� లేద�"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:73
 msgid "Option is ignored if a match for custom junk headers is found."
-msgstr "మల�చ�క�న�న నిరర�ధకం పీఠికలక� జోడి కనబడినట�లైతే ఈ �చ�చికం పట�టించ�కోబడద�."
+msgstr ""
+"మల�చ�క�న�న నిరర�ధకం పీఠికలక� జోడి కనబడినట�లైతే ఈ �చ�చికం పట�టించ�కోబడద�."
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:74
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 #, fuzzy
 msgid "Optional Information"
 msgstr "వ�యక�తిగత సమాచారం"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:76
 msgid "Or_ganization:"
 msgstr "నిర�వహణాసంస�థ(_g):"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:77
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG à°•à±€ ID(_K):"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:78
 msgid "Pass_word:"
 msgstr "సంకేతపదం (_w):"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:79
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
+msgid "Pick a color"
+msgstr "వర�ణన� న� తీస�కొన�మ�"
+
+#: ../mail/mail-config.ui.h:80
 msgid "Port:"
 msgstr "పోర�ట�:"
 
-#: ../mail/mail-config.ui.h:87
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "సందేశాలన� Bcc స�వీకరణదార�లన� ఉద�దేశించి పంప�త�న�నప�పడ� అడ�గ�మ�(_o)"
-
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:81
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "<span weight=\"bold\">చాలా మంచి వెస�ల�బాట� (PGP/GPG)</span>"
 
-#: ../mail/mail-config.ui.h:90
-#, fuzzy
-msgid "Printed Fonts"
-msgstr "మెమోలన� మ�ద�రించ�"
-
-#: ../mail/mail-config.ui.h:91
-msgid "Prompt when mailing list redirects private reply back to list"
-msgstr ""
-
-#: ../mail/mail-config.ui.h:92
-#, fuzzy
-msgid "Prompt when sending private replies to mailing _list messages"
-msgstr "బహ�ళ సందేశాలన� గర�తిస�త�న�నప�ప�డ� అడ�గ�మ�"
-
-#: ../mail/mail-config.ui.h:93
-#, fuzzy
-msgid "Prompt when sending replies to _many recipients"
-msgstr "సందేశాలన� Bcc స�వీకరణదార�లన� ఉద�దేశించి పంప�త�న�నప�పడ� అడ�గ�మ�(_o)"
-
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:83
 #, fuzzy
 msgid "Proxy Settings"
 msgstr "నిరర�ధకంక� అమరికల�"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:84
 #, fuzzy
 msgid "Quoted"
 msgstr "కోటెడ�(_Q)"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:85
 msgid "Re_member password"
 msgstr "సంకేతపదాన�ని గ�ర�త�ంచ�కొన�మ�(_m)"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:86
 msgid "Re_ply-To:"
 msgstr "వీరికి-ప�రత�య�త�తరమ�(_p):"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:87
 msgid "Remember _password"
 msgstr "సంకేతపదాన�ని గ�ర�త�ంచ�కొన�మ�(_p)"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:88
+#, fuzzy
+#| msgid "Replies and parents"
+msgid "Replies and Forwards"
+msgstr "మాత�ర�కల� మరియ� ప�రత�య�త�తరమ�ల�"
+
+#: ../mail/mail-config.ui.h:89
 #, fuzzy
 msgid "Required Information"
 msgstr "సేవిక సమాచారం"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:90
 msgid "SHA1"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:91
 msgid "SHA256"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:92
 msgid "SHA384"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:93
 msgid "SHA512"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "SSL ఎన�క�రిప�షన�"
+
+#: ../mail/mail-config.ui.h:95
 #, fuzzy
 msgid "SSL is not supported in this build of Evolution"
 msgstr "<b>SSL ఈ ఎవాల�యూషన� నిర�మాణంలో మద�దత�నీయద�</b>"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
-msgstr "స�థానిక చిర�నామా ప�స�తకమ�లంద� పంపకందార� ఛాయాచిత�రమ�ల కొరక� మాత�రమే శోధించ�మ� (_e)"
+msgstr ""
+"స�థానిక చిర�నామా ప�స�తకమ�లంద� పంపకందార� ఛాయాచిత�రమ�ల కొరక� మాత�రమే శోధించ�మ� "
+"(_e)"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "ఎంపికచేయ�మ�(_e)..."
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "సందేశ రశీద�లన� పంప�మ�(_e):"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "ప�రామాణిక ఫాంట�(_t):"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:113
-#, fuzzy
-msgid "Select Drafts Folder"
-msgstr "సంచయాన�ని ఎంపికచేస�కొన�మ�"
-
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "HTML నిర�ధారిత వెడల�ప� ఫాంట�న� ఎంపికచేయ�మ�"
 
-#: ../mail/mail-config.ui.h:115
-msgid "Select HTML fixed width font for printing"
-msgstr "మ�ద�రణ కొరక� HTML నిర�ధారిత వెడల�ప� ఫాంట�న� ఎంపికచేయ�మ�"
-
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML variable width font"
 msgstr "HTML వేరియబ�ల� వెడల�ప� ఫాంట�న� ఎంపికచేయ�మ�"
 
-#: ../mail/mail-config.ui.h:117
-msgid "Select HTML variable width font for printing"
-msgstr "మ�ద�రణ కొరక� HTML వేరియబ�ల� వెడల�ప� ఫాంట�న� ఎంపికచేయ�మ�"
-
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:104
 #, fuzzy
-msgid "Select Junk Folder"
-msgstr "సంచయాన�ని ఎంపికచేస�కొన�మ�"
+msgid "Sender Photograph"
+msgstr "<b>పంపకందార� ఛాయాచిత�రం</b>"
 
-#: ../mail/mail-config.ui.h:119
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:106
 #, fuzzy
-msgid "Select Sent Folder"
-msgstr "సంచయాన�ని ఎంపికచేస�కొన�మ�"
+msgid "Sending a _private reply to a mailing list message"
+msgstr "బహ�ళ సందేశాలన� గర�తిస�త�న�నప�ప�డ� అడ�గ�మ�"
 
-#: ../mail/mail-config.ui.h:120
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:108
+msgid "Sending a message with _recipients not entered as mail addresses"
+msgstr ""
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:110
 #, fuzzy
-msgid "Select Trash Folder"
-msgstr "సంచయాన�ని ఎంపికచేస�కొన�మ�"
+#| msgid "_Prompt when sending messages with an empty subject line"
+msgid "Sending a message with an _empty subject line"
+msgstr "సందేశాలన� ఖాళీ సంగతిపంక�తి తో పంప�త�న�నప�ప�డ� అడ�గ�మ�(_P)"
 
-#: ../mail/mail-config.ui.h:121
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:112
 #, fuzzy
-msgid "Sender Photograph"
-msgstr "<b>పంపకందార� ఛాయాచిత�రం</b>"
+#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "సందేశాలన� Bcc స�వీకరణదార�లన� ఉద�దేశించి పంప�త�న�నప�పడ� అడ�గ�మ�(_o)"
 
-#: ../mail/mail-config.ui.h:122
-msgid "Sending Mail"
-msgstr "మెయిల� న� పంప�త�న�నది"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:114
+#, fuzzy
+msgid "Sending a reply to a large _number of recipients"
+msgstr "పంపేవార� లేదా స�వీకరించేవార�"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:115
 msgid "Sent _Messages Folder:"
 msgstr "సందేశాల సంచయంన� పంపినది(_M):"
 
-#: ../mail/mail-config.ui.h:124
-#, fuzzy
-msgid "Sent and Draft Messages"
-msgstr "పంపిన సందేశాల�"
-
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:116
 msgid "Ser_ver requires authentication"
 msgstr "సేవికక� దృవీకరణ అవసరం(_v)"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:117
 #, fuzzy
 msgid "Server Configuration"
 msgstr "సేవిక సమాచారం"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:118
 msgid "Server _Type:"
 msgstr "సేవిక రకం (_T):"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:119
+#, fuzzy
+#| msgid "Add Custom Junk Header"
+msgid "Set custom junk header"
+msgstr "మ�ల�చ�క�న�న నిరర�దకప� పీఠికన� జతచేయ�మ�"
+
+#: ../mail/mail-config.ui.h:120
 #, fuzzy
 msgid "Si_gning algorithm:"
 msgstr "దృవీకరణపత�రం న� సతకంచేయ�చ�న�నది(_n):"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:121
 #, fuzzy
 msgid "Sig_natures"
 msgstr "సంతకాల�"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_ning certificate:"
 msgstr "దృవీకరణపత�రం న� సతకంచేయ�చ�న�నది(_n):"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:123
 msgid "Signat_ure:"
 msgstr "సతకం(_u):"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:124
 msgid "Signatures"
 msgstr "సంతకాల�"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:125
 #, fuzzy
 msgid "Signing _algorithm:"
 msgstr "దృవీకరణపత�రం న� సతకంచేయ�చ�న�నది(_n):"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:126
+#, fuzzy
+#| msgid "Local Folders"
+msgid "Special Folders"
+msgstr "స�థానిక సంచయాల�"
+
+#: ../mail/mail-config.ui.h:127
 msgid "Spell Checking"
 msgstr "స�పెల� పరిశీలన"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:128
 msgid "Start _typing at the bottom on replying"
 msgstr "జవాబ�యిచ�చ�నప�ప�డ� క�రిందన టైప�చేయ�ట ప�రారంభించ�మ� (_t)"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:129
+#, fuzzy
+#| msgid "Start: "
+msgid "Start up"
+msgstr "ప�రారంభించ�: "
+
+#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "TLS ఎన�క�రిప�షన�"
+
+#: ../mail/mail-config.ui.h:131
 msgid "T_ype:"
 msgstr "రకమ� (_T):"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:132
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
-"మీర� � భాషల కొరకైతే నిఘంట�వ�లన� సంస�థాపించారో ఆ భాషల� మాత�రమే ఈ భాషల జాబితానంద� ప�రతిబింబిస�తాయి."
+"మీర� � భాషల కొరకైతే నిఘంట�వ�లన� సంస�థాపించారో ఆ భాషల� మాత�రమే ఈ భాషల "
+"జాబితానంద� ప�రతిబింబిస�తాయి."
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:133
 #, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
@@ -12853,15 +12238,16 @@ msgid ""
 "for display purposes only. "
 msgstr ""
 "ఈ లిపి యొక�క అవ�ట�‌ప�ట� మీ సంతకంలాగా\n"
-"ఉపయోగించబడ�త�ంది. మీర� తెలిపిన నామమ� ప�రదర�శన వినియోగార�దం మాత�రమే ఉపయోగించబడ�త�ంది."
+"ఉపయోగించబడ�త�ంది. మీర� తెలిపిన పేర� ప�రదర�శన వినియోగార�దం మాత�రమే "
+"ఉపయోగించబడ�త�ంది."
 
-#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
-#: ../mail/mail-config.ui.h:143
-#, fuzzy
-msgid "Top Posting Option"
-msgstr "గమ�యాన�ని పోస�ట�చేస�త�న�నది"
+#: ../mail/mail-config.ui.h:136
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
+msgstr ""
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:137
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12869,171 +12255,150 @@ msgstr ""
 "దేనిద�వారా మీర� ఈ ఖాతా న� సంప�రదించాలి అన�క�ంట�న�నారో ఆ నామాన�ని టైప�చేయండి.\n"
 "ఉదాహరణక�: \"పని\" లేదా \"వ�యక�తిగత\""
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:139
 msgid "Us_ername:"
-msgstr "(_e) వినియోగదారి నామమ�:"
+msgstr "(_e) వినియోగదారి పేర�:"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:140
 msgid "Use Authe_ntication"
 msgstr "ధృవీకరణన� వ�పయోగించ�మ� (_n)"
 
-#: ../mail/mail-config.ui.h:148 ../plugins/caldav/caldav-source.c:225
-#: ../plugins/google-account-setup/google-contacts-source.c:286
-#: ../plugins/google-account-setup/google-source.c:623
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
-msgid "User_name:"
-msgstr "వినియోగదారి నామమ�(_n):"
-
-#: ../mail/mail-config.ui.h:149
-msgid "V_ariable-width:"
-msgstr "వేరియబ�ల�-వెడల�ప�(_a):"
+#: ../mail/mail-config.ui.h:141
+#, fuzzy
+#| msgid "User_name:"
+msgid "User _Name:"
+msgstr "వినియోగదారి పేర�(_n):"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:142
 msgid "_Add Signature"
 msgstr "సంతకాన�ని కల�ప�మ�(_A)"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:143
 msgid "_Always load images from the Internet"
 msgstr "ఎల�లప�ప�డ� చిత�రాలన� ఇంటర�నెట� న�ండి లోడ�చేయ�మ�(_A)"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:144
 msgid "_Authentication Type"
 msgstr "దృవీకరణ రకం (_A)"
 
-#: ../mail/mail-config.ui.h:153
-msgid "_Default junk plugin:"
-msgstr "అప�రమేయ నిరర�ధక ప�లగ�ఇన�(_D):"
-
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:145
 msgid "_Direct connection to the Internet"
 msgstr "ఇంటర�నెట�‌క� నేర�గా అన�సంధానం (_D)"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:146
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "సమావేశ అభ�యర�దనలన� సతంకం చేయవద�ద�(_D) (అవ�ట�‌ల�క� సారూప�యతకొరక�)"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:147
 msgid "_Forward style:"
 msgstr "మ�ంద�క�పంప� శైలి(_F):"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:148
 #, fuzzy
 msgid "_Junk Folder:"
 msgstr "ప�రస�త�త సంచయం"
 
-#: ../mail/mail-config.ui.h:158
-msgid "_Keep Signature above the original message on replying"
+#: ../mail/mail-config.ui.h:149
+#, fuzzy
+#| msgid "_Keep Signature above the original message on replying"
+msgid "_Keep signature above the original message on replying"
 msgstr "ప�రత�య�త�తరమ� ఇచ�చ�నప�ప�డ� సంతకాన�ని వాస�తవ సందేశంపైన ఉంచ�మ�(_K)"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:150
 #, fuzzy
 msgid "_Languages"
 msgstr "భాష"
 
-#: ../mail/mail-config.ui.h:160
-msgid "_Load images in messages from contacts"
+#: ../mail/mail-config.ui.h:151
+#, fuzzy
+#| msgid "_Load images in messages from contacts"
+msgid "_Load images only in messages from contacts"
 msgstr "సందేంశమ�లనంద� చిత�రాలన� పరిచయాలన�ండి నింప�మ� (_L)"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:152
 msgid "_Lookup in local address book only"
 msgstr "స�థానిక చిర�నామా ప�స�తకంనంద� మాత�రమే చూడ�మ� (_L)"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:153
 msgid "_Make this my default account"
 msgstr "దీనిని నా అప�రమేయ ఖాతా లా చేయ�మ�(_M)"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:154
 msgid "_Manual proxy configuration:"
 msgstr "మానవీయ ప�రోక�సీ ఆకృతీకరణ (_M):"
 
-#: ../mail/mail-config.ui.h:164
-msgid "_Mark messages as read after"
-msgstr "దీనితర�వాత సందేశాలన� చదివినట�ల� గర�త�ంచ�(_M)"
-
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:156
 msgid "_Never load images from the Internet"
 msgstr "చిత�రాలన� ఇంటర�నెట� న�ండి ఎప�ప�డ� నింపవద�ద�(_N)"
 
-#: ../mail/mail-config.ui.h:167
-msgid "_Path:"
-msgstr "పాత�(_P):"
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
+msgid "_Port:"
+msgstr "పోర�ట�(_P):"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:159
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML సందేశాలన� వాటిని కోరని పరిచయాలక� పంప�త�న�నప�ప�డ� అడ�గ�మ� (_P)"
 
-#: ../mail/mail-config.ui.h:169
-msgid "_Prompt when sending messages with an empty subject line"
-msgstr "సందేశాలన� ఖాళీ సంగతిపంక�తి తో పంప�త�న�నప�ప�డ� అడ�గ�మ�(_P)"
-
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:160
 msgid "_Reply style:"
 msgstr "ప�రత�య�త�తరమ� శైలి(_R):"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:161
 msgid "_Script:"
 msgstr "లిపి(_S):"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:162
 msgid "_Secure HTTP Proxy:"
 msgstr "రక�షిత HTTP ప�రోక�సీ (_S):"
 
-#: ../mail/mail-config.ui.h:174 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:164 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "సేవిక(_S):"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:176
-msgid "_Show image animations"
-msgstr "చిత�రమ� యానిమేషన�‌లన� చూప�మ�(_S)"
+#: ../mail/mail-config.ui.h:166
+#, fuzzy
+#| msgid "Show animated images as animations."
+msgid "_Show animated images"
+msgstr "యానిమేషన�లలాగా యానిమేటెడ� చిత�రాలన� చూప�మ�."
 
-#: ../mail/mail-config.ui.h:177
+#: ../mail/mail-config.ui.h:167
 msgid "_Show the photograph of sender in the message preview"
 msgstr "సందేశం ఉపదర�శనంలో పంపకందారి యొక�క ఛాయాచిత�రంన� చూప�మ� (_S)"
 
-#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:179
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "To / Cc / Bcc పీఠికల� కూడా ష�రింక�‌చేయ�మ�(_S)"
-
-#: ../mail/mail-config.ui.h:180
+#: ../mail/mail-config.ui.h:168
 #, fuzzy
 msgid "_Trash Folder:"
 msgstr "డ�రాఫ�ట�  సంచయం(_F):"
 
-#: ../mail/mail-config.ui.h:181
-msgid "_Use Secure Connection:"
-msgstr "రక�షిత అన�సంధానంన� ఉపయోగించ�మ�(_U):"
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
+msgstr "రక�షిత బంధాన�ని ఉపయోగించ�మ�(U):"
 
-#: ../mail/mail-config.ui.h:182
+#: ../mail/mail-config.ui.h:170
 msgid "_Use system defaults"
 msgstr "సిస�టమ� అప�రమేయాలన� వ�పయోగించ� (_U)"
 
-#: ../mail/mail-config.ui.h:183
+#: ../mail/mail-config.ui.h:171
 msgid "_Use the same fonts as other applications"
 msgstr "ఇతర అన�వర�తనంలలాగా అవే ఫాంట�లన� ఉపయోగించ�మ�(_U)"
 
-#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
 #, fuzzy
 msgid "a"
 msgstr "am"
 
-#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:186
-msgid "addresses"
-msgstr "చిర�నామాల�"
-
-#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
 #, fuzzy
 msgid "b"
 msgstr "ద�వారా"
 
-#: ../mail/mail-config.ui.h:188
+#: ../mail/mail-config.ui.h:174
 msgid "color"
 msgstr "వర�ణమ�"
 
-#: ../mail/mail-config.ui.h:189
+#: ../mail/mail-config.ui.h:175
 msgid "description"
 msgstr "వివరణ"
 
@@ -13053,15 +12418,11 @@ msgstr "అన�ని స�థానిక సంచయాల�"
 msgid "Call"
 msgstr "à°•à°¾"
 
-#: ../mail/mail-dialogs.ui.h:5
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "పూర�తేనది(_m)"
 
-#: ../mail/mail-dialogs.ui.h:6
-#, fuzzy
-msgid "Collapse _all"
-msgstr "క�ప�పకూల�చ�మ�"
-
 #: ../mail/mail-dialogs.ui.h:7
 #, fuzzy
 msgid "Digital Signature"
@@ -13073,68 +12434,51 @@ msgstr "మ�ంద�క� పంపవద�ద�"
 
 #: ../mail/mail-dialogs.ui.h:9
 #, fuzzy
-msgid "E_xpand all"
-msgstr "అన�ని తంత�లన� విస�తరించ�మ�(_x)"
-
-#: ../mail/mail-dialogs.ui.h:10
-#, fuzzy
 msgid "Encryption"
 msgstr "ఎన�క�రిప�ట�"
 
-#: ../mail/mail-dialogs.ui.h:11
-msgid "Folder Subscriptions"
-msgstr "సచయం చందాల�"
-
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "అన�సరించ�"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "మీ సమాచారం కొరక�"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "మ�ంద�"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "లైసెన�స� ఒప�పందం"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "� ప�రతిస�పందన అవసరంలేద�"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "అన�నిట�టికి సమాధానం ఇవ�వ�"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "పరిశీలించ�"
 
-#: ../mail/mail-dialogs.ui.h:22
-msgid "S_erver:"
-msgstr "సేవిక(_e):"
-
-#: ../mail/mail-dialogs.ui.h:23
-msgid "S_how only items containing:"
-msgstr ""
-
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:20
 #, fuzzy
 msgid "Search Folder Sources"
 msgstr "సంచయం మూలంన� శోధించ�"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "రక�షణ సమాచారం"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Specific folders"
 msgstr "నిర�దేశిత సంచయాల�"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:23
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13142,334 +12486,178 @@ msgstr ""
 "అన�సరించ�టక� మీర� ఎంచ�క�న�న సందేశాల� క�రిందన జాబితా చేయబడినవి.\n"
 "\"ఫ�లాగ�\" మెనూ న�ండి అన�సరించవలిసిన చర�యన� దయచేసి ఎంపికచేయ�మ�."
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr "లైసెన�స� ని ఆమోదించ�(_A)"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Due By:"
 msgstr "పూర�వ నిర�ణీతం(_D):"
 
-#: ../mail/mail-dialogs.ui.h:31
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Flag:"
 msgstr "ప�లాగ�(_F):"
 
-#: ../mail/mail-dialogs.ui.h:32
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Tick this to accept the license agreement"
 msgstr "లైసెన�స� ఒప�పందాన�ని ఆమోదించ�టక� దీనిని టిక�‌చేయ�మ�(_T)"
 
-#: ../mail/mail-folder-cache.c:783
+#: ../mail/mail-folder-cache.c:779
 #, c-format
 msgid "Pinging %s"
 msgstr "పింగింగ� %s"
 
-#: ../mail/mail-ops.c:84
+#: ../mail/mail-ops.c:85
 msgid "Filtering Selected Messages"
 msgstr "ఎంపికచేసిన సందేశాలన� వడపోయ�చ�న�నది"
 
-#: ../mail/mail-ops.c:245
+#: ../mail/mail-ops.c:205
 msgid "Fetching Mail"
 msgstr "మెయిల� న� సంగ�రహిస�తోంది"
 
-#: ../mail/mail-ops.c:592
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "బయటక�వెళ�ళ� వడపోతలన� ఆపాదించ�టలో వైఫల�యం: %s"
-
-#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
-#, fuzzy, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"%s క� కల�ప�టలో విఫలమైంది: %s\n"
-"బద�ల�గా స�థానిక `పంపినవాటి' సంచయం క� కల�ప�మ�."
-
-#: ../mail/mail-ops.c:654
-#, fuzzy, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "స�థానిక `పంపినవాటి' సంచయంక� కల�ప�టలో వైఫల�యం: %s"
-
-#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
-msgid "Sending message"
-msgstr "సందేశాన�ని పంప�త�న�నది"
-
-#: ../mail/mail-ops.c:782
+#: ../mail/mail-ops.c:821
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$d యొక�క %1$d సందేశాన�ని పంప�త�న�నది"
 
-#: ../mail/mail-ops.c:826
+#: ../mail/mail-ops.c:869
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%2$d యొక�క %1$d సందేశాలన� పంప�టలో విఫలమైంది"
 
-#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:758
+#: ../mail/mail-ops.c:873 ../mail/mail-send-recv.c:837
 msgid "Canceled."
 msgstr "రద�ద�చేయబడిన."
 
-#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:875 ../mail/mail-send-recv.c:839
 msgid "Complete."
 msgstr "పూర�తయినది."
 
-#: ../mail/mail-ops.c:938
-#, fuzzy, c-format
-msgid "Saving message to folder '%s'"
-msgstr "సందేశాన�ని సంచయంక� దాయ�చ�న�నది"
-
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:985
 #, fuzzy, c-format
 msgid "Moving messages to '%s'"
 msgstr "సందేశాలన� %s క� కద�ప�చ�న�నది"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:986
 #, fuzzy, c-format
 msgid "Copying messages to '%s'"
 msgstr "%s క� సందేశాలన� నకల�తీస�త�న�నది"
 
-#: ../mail/mail-ops.c:1127
-#, fuzzy, c-format
-msgid "Scanning folders in '%s'"
-msgstr "\"%s\" నందలి సంచయాల స�కానింగ�"
-
-#: ../mail/mail-ops.c:1235
-msgid "Forwarded messages"
-msgstr "మ�ంద�క�పంపిన సందేశాల�"
-
-#: ../mail/mail-ops.c:1276
-#, fuzzy, c-format
-msgid "Opening folder '%s'"
-msgstr "%s సంచయాన�ని తెర�స�త�ంది"
-
-#: ../mail/mail-ops.c:1342
-#, fuzzy, c-format
-msgid "Retrieving quota information for folder '%s'"
-msgstr "%s ఫోల�డర� కొరక� కోటా సమాచారాన�ని వెలికితీస�తోంది"
-
-#: ../mail/mail-ops.c:1414
-#, fuzzy, c-format
-msgid "Opening store '%s'"
-msgstr "నిల�వ %s న� తెర�స�త�న�నది"
-
-#: ../mail/mail-ops.c:1485
-#, fuzzy, c-format
-msgid "Removing folder '%s'"
-msgstr "%s సంచయాన�ని తొలగిస�త�న�నది"
-
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1104
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "'%s' సంచయాన�ని దాస�త�ంది"
 
-#: ../mail/mail-ops.c:1672
+#: ../mail/mail-ops.c:1179
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ఖాతా '%s' న� కొట�టివేయ�చ�న�నది మరియ� నిల�వచేయ�చ�న�నది"
 
-#: ../mail/mail-ops.c:1673
+#: ../mail/mail-ops.c:1180
 #, c-format
 msgid "Storing account '%s'"
 msgstr "'%s' ఖాతాని దాస�త�ంది"
 
-#: ../mail/mail-ops.c:1727
+#: ../mail/mail-ops.c:1242
 #, fuzzy, c-format
 msgid "Refreshing folder '%s'"
 msgstr "సంచయాన�ని ప�నర�వికాసపర�స�త�ంది"
 
-#: ../mail/mail-ops.c:1767
+#: ../mail/mail-ops.c:1432
 #, fuzzy, c-format
 msgid "Expunging folder '%s'"
 msgstr "సంచయాన�ని కొట�టివేయ�చ�న�నది"
 
-#: ../mail/mail-ops.c:1812
+#: ../mail/mail-ops.c:1517
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' నందలి చెత�తన� ఖాళీచేస�తోంది"
 
-#: ../mail/mail-ops.c:1813
-msgid "Local Folders"
-msgstr "స�థానిక సంచయాల�"
-
-#: ../mail/mail-ops.c:2016
-#, c-format
-msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] "%d సందేశాన�ని వెలికితీస�త�ంది"
-msgstr[1] "%d సందేశాలన� వెలికితీస�త�ంది"
-
-#: ../mail/mail-ops.c:2105
-#, c-format
-msgid "Saving %d message"
-msgid_plural "Saving %d messages"
-msgstr[0] "%d సందేశాన�ని దాస�త�ంది"
-msgstr[1] "%d సందేశాన�ని దాస�త�ంది"
-
-#: ../mail/mail-ops.c:2192
+#: ../mail/mail-ops.c:1619
 #, fuzzy, c-format
-msgid "Error saving messages to: %s:\n"
-msgstr ""
-"సందేశాన�ని దీనికి దాయ�టలో దోషం: %s:\n"
-" %s"
-
-#: ../mail/mail-ops.c:2265
-msgid "Saving attachment"
-msgstr "అన�బంధాన�ని దాస�త�న�నది"
-
-#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"అవ�ట�‌ప�ట� దస�త�రాన�ని సృష�టించలేకపోయింది: %s:\n"
-" %s"
-
-#: ../mail/mail-ops.c:2310
-#, fuzzy
-msgid "Could not write data: "
-msgstr "దత�తాంశాన�ని రాయలేకపోయింది: %s"
-
-#: ../mail/mail-ops.c:2454
-#, fuzzy, c-format
-msgid "Disconnecting from '%s'"
+msgid "Disconnecting %s"
 msgstr "%s న�ండి అనన�సంధానిస�తోంది"
 
-#: ../mail/mail-ops.c:2454
-#, fuzzy, c-format
-msgid "Reconnecting to '%s'"
-msgstr "%s క� తిరిగిఅన�సంధానించబడ�తోంది"
-
-#: ../mail/mail-ops.c:2550
-#, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "లైన�వెల�పలకి '%s' ఖాతాన�ని తయార�చేస�త�ంది"
-
-#: ../mail/mail-ops.c:2636
-msgid "Checking Service"
-msgstr "సేవన� పరిశీలిస�తోంది"
-
-#: ../mail/mail-send-recv.c:184
+#: ../mail/mail-send-recv.c:198
 msgid "Canceling..."
 msgstr "రద�ద�చేస�తోంది..."
 
-#: ../mail/mail-send-recv.c:424
+#: ../mail/mail-send-recv.c:454
 msgid "Send & Receive Mail"
 msgstr "మెయిల� న� పంప� & స�వీకరించ�"
 
-#: ../mail/mail-send-recv.c:441
+#: ../mail/mail-send-recv.c:470
 msgid "Cancel _All"
 msgstr "అన�నిటిని రద�ద�చేయి(_A)"
 
-#: ../mail/mail-send-recv.c:551
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:979
 msgid "Updating..."
 msgstr "తాజాపర�చ�మ�..."
 
-#: ../mail/mail-send-recv.c:551 ../mail/mail-send-recv.c:628
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:691
 msgid "Waiting..."
 msgstr "వేచిఉంది..."
 
-#: ../mail/mail-send-recv.c:866
+#: ../mail/mail-send-recv.c:959
 #, c-format
 msgid "Checking for new mail"
 msgstr "కొత�త మెయిల� కొరక� పరిశీలిస�తోంది"
 
-#: ../mail/mail-session.c:225
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "%s కొరక� రహస�యపదాన�ని ప�రవేశపెట�టండి"
-
-#: ../mail/mail-session.c:227
-msgid "Enter Passphrase"
-msgstr "రహస�యపదమ�న� ప�రవేశపెట�టండి"
-
-#: ../mail/mail-session.c:230
-#, c-format
-msgid "Enter Password for %s"
-msgstr "%s క� రహస�యపద ప�రవేశ"
-
-#: ../mail/mail-session.c:232
-msgid "Enter Password"
-msgstr "రహస�యపదాన�ని ప�రవేశించ�"
-
-#: ../mail/mail-session.c:277
-#, c-format
-msgid "User canceled operation."
-msgstr "వినియోగదార�డ� రద�ద�చేసిన కార�యం"
-
-#: ../mail/mail-session.c:723
-#, c-format
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
-msgstr "� గమ�యస�థానప� చిర�నామా అందివ�వలేద�, సందేశమ�యొక�క కొనసాగింప� రద�దైనది."
-
-#: ../mail/mail-session.c:732
-#, c-format
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "ఉపయోగించ�టక� � ఖాతా కనబడలేద�, సందేశమ�యొక�క కొనసాగింప� రద�దైనది."
-
-#: ../mail/mail-tools.c:128
+#: ../mail/mail-tools.c:72
 #, fuzzy, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "స�పూల� సంచయం `%s' న� సృష�టించలేకపోయింది: %s"
 
-#: ../mail/mail-tools.c:161
+#: ../mail/mail-tools.c:106
 #, fuzzy, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "non-mbox మూలం `%s' క� మెయిల� న� కద�ప�టక� ప�రయత�నిస�తోంది"
 
-#: ../mail/mail-tools.c:273
+#: ../mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "మ�ంద�క�పంప�త�న�న సందేశం - %s"
 
-#: ../mail/mail-tools.c:275
+#: ../mail/mail-tools.c:217
 msgid "Forwarded message"
 msgstr "మ�ంద�క�పంప�త�న�న సందేశం"
 
-#: ../mail/mail-tools.c:318
-#, fuzzy, c-format
-msgid "Invalid folder: '%s'"
-msgstr "చెల�లని సంచయం: `%s'"
-
-#: ../mail/mail-vfolder.c:85
+#: ../mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up Search Folder: %s"
-msgstr "శోధన సంచయాన�ని అమర�చ�తోంది: %s"
-
-#: ../mail/mail-vfolder.c:224
-#, c-format
-msgid "Updating Search Folders for '%s:%s'"
-msgstr "శోధన సంచయాలన� '%s:%s' కొరక� నవీకరిస�తోంది"
+msgstr "అన�వేషణ సంచయాన�ని అమర�చ�తోంది: %s"
 
-#: ../mail/mail-vfolder.c:231
-#, c-format
-msgid "Updating Search Folders for '%s'"
-msgstr "శోధన సంచయాలన� '%s' కొరక� నవీకరిస�తోంది"
-
-#. Translators: The first %s is name of the affected search folder(s),
-#. the second %s is uri of the 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:674
+#: ../mail/mail-vfolder.c:232
+#, fuzzy, c-format
+#| msgid "Updating Search Folders for '%s:%s'"
+msgid "Updating Search Folders for '%s' : %s"
+msgstr "అన�వేషణ సంచయాలన� '%s:%s' కొరక� నవీకరిస�తోంది"
+
+#. Translators: The first %s is name of the affected
+#. * search folder(s), the second %s is the URI of the
+#. * 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:678
 #, c-format
 msgid ""
-"The Search Folder \"%s\" has been updated, because it used just removed "
+"The Search Folder \"%s\" has been modified to account for the deleted "
 "folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following Search Folders\n"
-"%s have been updated, because they used just removed folder\n"
+"%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/mail-vfolder.c:1179
+#: ../mail/mail-vfolder.c:1314
 msgid "Edit Search Folder"
-msgstr "శోధన సంచయాన�ని సరిచేస�తోంది"
+msgstr "అన�వేషణ సంచయాన�ని సరిచేస�తోంది"
 
-#: ../mail/mail-vfolder.c:1284
+#: ../mail/mail-vfolder.c:1423
 msgid "New Search Folder"
-msgstr "కొత�త శోధన సంచయం"
+msgstr "కొత�త అన�వేషణ సంచయం"
 
 #: ../mail/mail.error.xml.h:1
 #, fuzzy
@@ -13488,11 +12676,12 @@ msgstr "నిరరà±�ధకం వైఫలà±�యం కానిదానà±�à
 
 #: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
-msgstr "\"{0}\" నామమ�గల సంచయం యిప�పటికేవ�ంది. దయచేసి వేరొక నామమ�న� వ�పయోగించండి."
+msgstr "\"{0}\" పేర�గల సంచయం యిప�పటికేవ�ంది. దయచేసి వేరొక పేర�న� వ�పయోగించండి."
 
 #: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "\"{1}\" నామమ�గల సంచయం యిప�పటికే వ�ంది. దయచేసి వేరొక నామమ�న� వ�పయోగించండి."
+msgstr ""
+"\"{1}\" పేర�గల సంచయం యిప�పటికే వ�ంది. దయచేసి వేరొక పేర�న� వ�పయోగించండి."
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
@@ -13503,27 +12692,31 @@ msgid ""
 msgstr ""
 "non-empty సంచయం \"{1}\" వద�ద యిప�పటికే వ�ంది.\n"
 "\n"
-"మీర� ఈ సంచయంన� వదిలివేయ�ట యెంచ�కొనవచ�చ�, దీని సారాలన� తిరిగివ�రాయవచ�చ� లేదా కల�పవచ�చ�, లేదా "
+"మీర� ఈ సంచయంన� వదిలివేయ�ట యెంచ�కొనవచ�చ�, దీని సారాలన� తిరిగివ�రాయవచ�చ� లేదా "
+"కల�పవచ�చ�, లేదా "
 "బహష�కరించవచ�చ�."
 
 #: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
-msgstr "చదివినదాని రశీద� నోటీస� \"{1}\" కొరక� అభ�యర�దించబడింది. రశీద� నోటీస�న� {0}క� పంపండి?"
+msgstr ""
+"చదివినదాని రశీద� నోటీస� \"{1}\" కొరక� అభ�యర�దించబడింది. రశీద� నోటీస�న� {0}క� "
+"పంపండి?"
 
 #: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
-msgstr "ఒక సంతకం యిప�పటికే నామమ� \"{0}\"తో వ�ంది. దయచేసి వేరొకనామమ�న� తెల�ప�మ�."
+msgstr "ఒక సంతకం యిప�పటికే పేర� \"{0}\"తో వ�ంది. దయచేసి వేరొకపేర�న� తెల�ప�మ�."
 
 #: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 msgstr ""
-"మీ సందేశాలక� అర�దవంతమైన సంగతిపంక�తిని కల�ప�టవలన అది మీ స�వీకరణదార�లక� మీ సందేశం దేనిగ�రించో "
+"మీ సందేశాలక� అర�దవంతమైన సంగతిపంక�తిని కల�ప�టవలన అది మీ స�వీకరణదార�లక� మీ "
+"సందేశం దేనిగ�రించో "
 "అవగాహన కల�గజేస�త�ంది."
 
 #: ../mail/mail.error.xml.h:12
@@ -13547,13 +12740,16 @@ msgstr ""
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
-msgstr "సంచయాలలోని అన�ని తొలగించిన సందేశాలన� మీర� శాశ�వతంగా తీసివేద�దామన�క�ంట�న�నారా?"
+msgstr ""
+"సంచయాలలోని అన�ని తొలగించిన సందేశాలన� మీర� శాశ�వతంగా తీసివేద�దామన�క�ంట�న�నారా?"
 
 #: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
-msgstr "ఫోల�డర� \"{0}\"లోని అన�ని తొలగించిన సందేశాలన� ఖచ�చితంగా మీర� శాశ�వతంగా తీసివేద�దామన�క�ంట�న�నారా?"
+msgstr ""
+"ఫోల�డర� \"{0}\"లోని అన�ని తొలగించిన సందేశాలన� ఖచ�చితంగా మీర� శాశ�వతంగా "
+"తీసివేద�దామన�క�ంట�న�నారా?"
 
 #: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
@@ -13583,7 +12779,7 @@ msgstr "బ�లింక� సంతకం"
 
 #: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
-msgstr "శోధన సంచయం \"{0}\"న� జతచేయలేక పోయింది."
+msgstr "అన�వేషణ సంచయం \"{0}\"న� జతచేయలేక పోయింది."
 
 #: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
@@ -13611,7 +12807,7 @@ msgstr "సిసà±�à°Ÿà°®à±� సంచయం \"{0}\"à°¨à±� తొలగింà°
 
 #: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr "శోధన సంచయం \"{0}\"న� సరికూర�చలేక పోయింది అదిలేని కారణంగా."
+msgstr "అన�వేషణ సంచయం \"{0}\"న� సరికూర�చలేక పోయింది అదిలేని కారణంగా."
 
 #: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
@@ -13635,7 +12831,8 @@ msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
 msgstr ""
-"లైసెన�స� దస�త�రం \"{0}\"న� చద�వలేక పోయింది, సంస�థాపనా సమస�యవలన. మీర� ఈ ఉత�పాదక�డన� వాని లైసెన�స� "
+"లైసెన�స� ఫైల� \"{0}\"న� చద�వలేక పోయింది, సంస�థాపనా సమస�యవలన. మీర� ఈ "
+"ఉత�పాదక�డన� వాని లైసెన�స� "
 "ఆమోదించ�నంతవరకూ వ�పయోగించ�కోలేర�."
 
 #: ../mail/mail.error.xml.h:36
@@ -13656,7 +12853,7 @@ msgstr "డైరెక�టరి \"{0}\"క� దాయలేమ�."
 
 #: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
-msgstr "దస�త�రం \"{0}\"క� దాయలేద�."
+msgstr "ఫైల� \"{0}\"క� దాయలేద�."
 
 #: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
@@ -13667,16 +12864,19 @@ msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 msgstr ""
-"మీ సంకేతపదం సరిగా స�పెల�‌చేయబడిందేమో పరిశీలించ�మ�. సంకేతపదాల� చిన�నపెద�దబడి తేడాన� కిలిగఉన�నాయని "
+"మీ సంకేతపదం సరిగా స�పెల�‌చేయబడిందేమో పరిశీలించ�మ�. సంకేతపదాల� చిన�నపెద�దబడి "
+"తేడాన� కిలిగఉన�నాయని "
 "గర�త�ంచ�కోండి; మీ కాప�స� లాక� ఆన�అయి ఉండవచ�చ�."
 
 #: ../mail/mail.error.xml.h:43
-msgid "Could not save signature file."
-msgstr "సంతకం దస�త�రాన�ని దాయలేకపోయింది."
+#, fuzzy
+#| msgid "Close this window"
+msgid "Close message window."
+msgstr "ఈ గవాక�షాన�ని మూయ�మ�"
 
 #: ../mail/mail.error.xml.h:44
-msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "శోధన సంచయంలో ఉన�న సందేశాలన� తొలగించాలా \"{0}\"?"
+msgid "Could not save signature file."
+msgstr "సంతకం ఫైల�న� దాయలేకపోయింది."
 
 #: ../mail/mail.error.xml.h:46
 #, fuzzy
@@ -13697,11 +12897,19 @@ msgstr "కాలనియమత చేయవద�ద�(_D)"
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
-msgstr "ఆఫ�‌లైన� ఉపయోగార�దం గ�ర�త�ంచబడిన సంచయాలన� మీర� స�థానికంగా కాలనియమత చేద�దామన�క�ంట�న�నారా?"
+msgstr ""
+"ఆఫ�‌లైన� ఉపయోగార�దం గ�ర�త�ంచబడిన సంచయాలన� మీర� స�థానికంగా కాలనియమత "
+"చేద�దామన�క�ంట�న�నారా?"
 
+<<<<<<< HEAD
+#: ../mail/evolution-mail.schemas.in.h:119
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr "సందేశ-ప�రదర�శన శైలి (సాదారణ: \"normal\", పూర�తి పీఠికల�: \"full headers\", మూలం: \"source\")"
+=======
 #: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "మీర� అన�ని సందేశాలన� చదివిన వాటిలా గ�ర�త�ంచ�దామని అన�క�ంట�న�నారా?"
+>>>>>>> master
 
 #: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
@@ -13727,37 +12935,110 @@ msgid "Error while {0}."
 msgstr "{0} అప�ప�డ� దోషం."
 
 #: ../mail/mail.error.xml.h:59
+msgid ""
+"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"mail must be migrated to the new format before Evolution can proceed. Do you "
+"want to migrate now?\n"
+"\n"
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:62
+msgid "Evolution's local mail format has changed."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:63
+#, fuzzy
+#| msgid "_Download Messages for Offline Usage"
+msgid "Failed to download messages for offline viewing."
+msgstr "ఆఫ�‌లైన� వ�పయోగమ�ల కొరక� సందేశాల న� దిగ�మతిచేయ�మ� (_D)"
+
+#: ../mail/mail.error.xml.h:64
+#, fuzzy
+#| msgid "Failed to send %d of %d messages"
+msgid "Failed to find duplicate messages."
+msgstr "%2$d యొక�క %1$d సందేశాలన� పంప�టలో విఫలమైంది"
+
+#: ../mail/mail.error.xml.h:65
+#, fuzzy
+#| msgid "failed to open book"
+msgid "Failed to open folder."
+msgstr "ప�స�తకం తెర�చ�టలో విఫలం"
+
+#: ../mail/mail.error.xml.h:66
+#, fuzzy
+#| msgid "Querying server for a list of supported authentication mechanisms."
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr ""
+"మద�దత�ఇచ�చ�నట�వంటి దృవీకరణ యంత�రమ�ల జాబితా కొరక� సేవికన� ప�రశ�నిస�త�న�నది."
+
+#: ../mail/mail.error.xml.h:67
+#, fuzzy
+msgid "Failed to remove attachments from messages."
+msgstr "మెయిల� సందేశమ�లనంద� vకార�డ�లన� నేర�గా చూప�మ�."
+
+#: ../mail/mail.error.xml.h:68
+#, fuzzy
+#| msgid "Unable to retrieve message"
+msgid "Failed to retrieve messages."
+msgstr "సందేశాన�ని వెలికితీయలేద�."
+
+#: ../mail/mail.error.xml.h:69
+#, fuzzy
+#| msgid "Failed to send %d of %d messages"
+msgid "Failed to save messages to disk."
+msgstr "%2$d యొక�క %1$d సందేశాలన� పంప�టలో విఫలమైంది"
+
+#: ../mail/mail.error.xml.h:70
+#, fuzzy
+#| msgid "Really unsubscribe from folder \"%s\"?"
+msgid "Failed to unsubscribe from folder."
+msgstr "నిజంగా సంచయం \"%s\" క� చందాదార�కావ�టలేదా?"
+
+#: ../mail/mail.error.xml.h:71
 msgid "File exists but cannot overwrite it."
-msgstr "దస�త�రం కలద� కాని తిరిగివ�రాయలేమ�."
+msgstr "ఫైల� కలద� కాని తిరిగివ�రాయలేమ�."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:72
 msgid "File exists but is not a regular file."
-msgstr " దస�త�రం కలద� కాని వాడ�కలోలేని దస�త�రం."
+msgstr " ఫైల� కలద� కాని వాడ�కలోలేని ఫైల�."
+
+#. Translators: {0} is replaced with a folder name
+#: ../mail/mail.error.xml.h:74
+#, fuzzy
+#| msgid "The attachment does not contain a valid calendar message"
+msgid "Folder '{0}' doesn't contain any duplicate message."
+msgstr "అన�బంధం లో వర�తించ� క�యాలెండర� సందేశాల� లేవ�"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:75
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "మీర� కొనసాగించితే, మీర� ఈ సందేశాలన� తిరిగిపొందలేర�."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:76
 #, fuzzy
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
-"మీర� సంచయాన�ని తొలగించితే, దానియొక�క అన�ని సారమ�ల� మరియ� దాని ఉపసంచయాల సారమ�ల� శాశ�వతంగా తొలిగించబడతాయి."
+"మీర� సంచయాన�ని తొలగించితే, దానియొక�క అన�ని సారమ�ల� మరియ� దాని ఉపసంచయాల "
+"సారమ�ల� శాశ�వతంగా తొలిగించబడతాయి."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:77
 #, fuzzy
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
-"మీర� సంచయాన�ని తొలగించితే, దానియొక�క అన�ని సారమ�ల� మరియ� దాని ఉపసంచయాల సారమ�ల� శాశ�వతంగా తొలిగించబడతాయి."
+"మీర� సంచయాన�ని తొలగించితే, దానియొక�క అన�ని సారమ�ల� మరియ� దాని ఉపసంచయాల "
+"సారమ�ల� శాశ�వతంగా తొలిగించబడతాయి."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:78
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "మీర� కొనసాగితే, అన�ని ప�రాక�సీ ఖాతాల� శాశ�వతంగా తొలగించబడతాయి."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:79
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13765,145 +13046,186 @@ msgstr ""
 "మీర� కొనసాగితే, ఖాతా సమాచారం మరియ�\n"
 "ప�రాక�సీ సమాచారం అంతా శాశ�వతంగా తొలగించబడ�త�ంది."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:81
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "మీర� కొనసాగితే, ఖాతా సమాచారం శాశ�వతంగా తొలగించబడ�త�ంది."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
-msgstr "మీర� నిష�క�రమించితే, ఈ సందేశాల� ఎవాల�యూషన� తిరగిప�రారంభమగ�వరక� పంపబడబోవ�."
+msgstr ""
+"మీర� నిష�క�రమించితే, ఈ సందేశాల� ఎవాల�యూషన� తిరగిప�రారంభమగ�వరక� పంపబడబోవ�."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:83
 msgid "Ignore"
 msgstr "వదిలివేయి"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:84
 msgid "Invalid authentication"
 msgstr "సరికాని దృవీకరణ"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:85
 msgid "Mail Deletion Failed"
 msgstr "మెయిల� న� తొలగించ�ట విఫలమైంది"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:86
 msgid "Mail filters automatically updated."
 msgstr "మెయిల� వడపోతల� స�వయంచాలకంగా నవీకరించబడతాయి."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:87
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
 msgstr ""
-"చాలా ఈమెయిల� సిస�టమ� ల� BCC స�వీకరణదార�ల� కలిగిఉన�న సందేశాలక� అప�పెరెంట�లీ-టూ పీఠికన� జతచేస�తాయి. ఈ "
-"పీఠిక, జత చేస�తే, అది మీ స�వీకరణదార�లన� మీ సందేశం క� జాబితాచేస�త�ంది. దీనిని తీసివేయ�టక�, మీర� తప�ప�క "
+"చాలా ఈమెయిల� సిస�టమ� ల� BCC స�వీకరణదార�ల� కలిగిఉన�న సందేశాలక� అప�పెరెంట�లీ-టూ "
+"పీఠికన� జతచేస�తాయి. ఈ "
+"పీఠిక, జత చేస�తే, అది మీ స�వీకరణదార�లన� మీ సందేశం క� జాబితాచేస�త�ంది. దీనిని "
+"తీసివేయ�టక�, మీర� తప�ప�క "
 "ఒక క�: లేదా CC: స�వీకరణదారిని జతచేయాలి."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:88
+#, fuzzy
+#| msgid ""
+#| "Warning: Deleting messages from a Search Folder will delete the actual "
+#| "message from one of your local or remote folders.\n"
+#| "Do you really want to do this?"
+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 ""
+"హెచ�చరిక: అన�వేషణ సంచయంన�ండి సందేశం న� తొలగించ�ట అనేది అది మీ స�థానిక లేదా "
+"దూరస�థ సంచయాలలోని సందేశంన� "
+"తొలగిస�త�ంది.\n"
+"మీర� ఖచ�చితంగా దీనిని చేద�దామ�ని అన�క�ంట�న�నర�?"
+
+#: ../mail/mail.error.xml.h:89
 msgid "Missing folder."
 msgstr "కనబడని సంచయం"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:91
+#, fuzzy
+#| msgid "Never"
+msgid "N_ever"
+msgstr "ఎప�పటికివద�ద�"
+
+#: ../mail/mail.error.xml.h:92
+#, fuzzy
+#| msgid "Unfinished messages found"
+msgid "No duplicate messages found."
+msgstr "పూర�తిచేయనట�వంటి సందేశాల� కన�గొనబడినవి."
+
+#: ../mail/mail.error.xml.h:93
 msgid "No sources selected."
 msgstr "� వనర�లన� ఎంచ�కోలేద�"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:94
 msgid "Opening too many messages at once may take a long time."
 msgstr "ఒకేసారి ఎక�క�వ సందేశాలన� తెర�వటవలన చాలాసమయం పట�టవచ�చ�న�."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:95
 msgid "Please check your account settings and try again."
 msgstr "దయచేసి మీ ఖాతా అమరికలన� చూస�కొని మరలా ప�రయత�నించ�మ�"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:96
 msgid "Please enable the account or send using another account."
 msgstr "దయచేసి ఖాతాన� చేతనం చేయ�మ� లేదా వేరే ఖాతా న� ఉపయోగించి పంప�మ�."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
 msgstr ""
-"దయచేసి సరైన ఈమెయిల� చిర�నామాన� క�: క�షేత�రమ�నంద� ప�రవేశపెట�ట�మ�. మీర� ఈమెయిల� చిర�నామా కొరక� "
+"దయచేసి సరైన ఈమెయిల� చిర�నామాన� క�: క�షేత�రమ�నంద� ప�రవేశపెట�ట�మ�. మీర� ఈమెయిల� "
+"చిర�నామా కొరక� "
 "శోధించవచ�చ� దీనిపై నొక�క�ట ద�వారా క�: ప�రవేశ పెట�టెక� తర�వాతనే ఉన�న బటన�."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
 "{0}"
 msgstr ""
-"దయచేసి క�రిందని ఉన�న స�వీకరణదార�ల� HTML ఈమెయిల�‌న� పొందగల�గ�నట�ల� మరియ� పొందగోర�నట�ల� "
+"దయచేసి క�రిందని ఉన�న స�వీకరణదార�ల� HTML ఈమెయిల�‌న� పొందగల�గ�నట�ల� మరియ� "
+"పొందగోర�నట�ల� "
 "చూస�కొన�మ�:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:100
 msgid "Please provide an unique name to identify this signature."
-msgstr "ఈ సంతకాన�ని గ�ర�తించ�టక� దయచేసి ఒక �కమైన నామమ�న� ప�రవేశపెట�ట�మ�."
+msgstr "ఈ సంతకాన�ని గ�ర�తించ�టక� దయచేసి ఒక �కమైన పేర�న� ప�రవేశపెట�ట�మ�."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:101
 msgid "Please wait."
 msgstr "దయచేసి ఆగ�మ�"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:102
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "పాత మెయిల� సంచయం \"{0}\"న� వలసపంప�త�న�నప�ప�డ� సమస�య."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:103
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "మద�దత�ఇచ�చ�నట�వంటి దృవీకరణ యంత�రమ�ల జాబితా కొరక� సేవికన� ప�రశ�నిస�త�న�నది."
+msgstr ""
+"మద�దత�ఇచ�చ�నట�వంటి దృవీకరణ యంత�రమ�ల జాబితా కొరక� సేవికన� ప�రశ�నిస�త�న�నది."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:104
 msgid "Read receipt requested."
 msgstr "చదివినదాని రశీద� అభ�యర�దించబడింది."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:105
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "నిజంగా సంచయం \"{0}\" మరియ� దానియొక�క అన�ని ఉపసంచయాలన� తొలగించాలా?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:106
 #, fuzzy
 msgid "Really delete folder \"{0}\"?"
 msgstr "సంచయం \"{0}\"న� తొలగించలేక పోయింది."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:107
+#, fuzzy
+#| msgid "Remove the delegate %s?"
+msgid "Remove duplicate messages?"
+msgstr "ప�రతినిధి %s న� తొలగించాలా?"
+
+#: ../mail/mail.error.xml.h:108
 #, fuzzy
 msgid "Reply _Privately"
 msgstr "స�వంత(_P)"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:111
 msgid "Search Folders automatically updated."
-msgstr "శోధన సంచయాల� స�వయంచాలకంగా నవీకరించబడతాయి."
+msgstr "అన�వేషణ సంచయాల� స�వయంచాలకంగా నవీకరించబడతాయి."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:112
 msgid "Send private reply?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:113
 #, fuzzy
 msgid "Send reply to all recipients?"
 msgstr "పంపేవార� లేదా స�వీకరించేవార�"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:114
 msgid "Signature Already Exists"
 msgstr "సంతంకం ఇప�పటికే ఉంది"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:115
 msgid "Synchronize folders locally for offline usage?"
 msgstr "సంచయాలన� స�థానికంగా అఫ�‌లైన� ఉపయోగార�దం కాలనియమత చేయాలా?"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 msgstr ""
-"సిస�టమ� సంచయాల� ఎవాల�యూషన� సరిగా పనిచేయ�టక� కావాలి మరియ� ప�నఃనామకరణ కాబడవ�, కదల�చబడవ�, లేదా "
+"సిస�టమ� సంచయాల� ఎవాల�యూషన� సరిగా పనిచేయ�టక� కావాలి మరియ� ప�నఃనామకరణ కాబడవ�, "
+"కదల�చబడవ�, లేదా "
 "తొలగించబడవ�."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13912,285 +13234,348 @@ msgid ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 msgstr ""
-"మీర� పంప�త�న�న పరిచయాల జాబితా స�వీకరణదార�ల జాబితా మర�గ�పర�చ�నట�ల� ఆకృతీకరించబడిఉంది\n"
+"మీర� పంప�త�న�న పరిచయాల జాబితా స�వీకరణదార�ల జాబితా మర�గ�పర�చ�నట�ల� "
+"ఆకృతీకరించబడిఉంది\n"
 "\n"
-"చాలా ఈమెయిల� సిస�టమ� ల� BCC స�వీకరణదార�ల� కలిగిఉన�న సందేశాలక� అప�పెరెంట�లీ-టూ పీఠికన� జతచేస�తాయి. ఈ "
-"పీఠిక, జత చేస�తే, అది మీ స�వీకరణదార�లన� మీ సందేశం నంద� జాబితాచేస�త�ంది. దీనిని తీసివేయ�టక�, మీర� "
+"చాలా ఈమెయిల� సిస�టమ� ల� BCC స�వీకరణదార�ల� కలిగిఉన�న సందేశాలక� అప�పెరెంట�లీ-టూ "
+"పీఠికన� జతచేస�తాయి. ఈ "
+"పీఠిక, జత చేస�తే, అది మీ స�వీకరణదార�లన� మీ సందేశం నంద� జాబితాచేస�త�ంది. "
+"దీనిని తీసివేయ�టక�, మీర� "
 "తప�ప�క ఒక క�: లేదా CC: స�వీకరణదారిని జతచేయాలి."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:125
 msgid "The script file must exist and be executable."
 msgstr "లిపి దస�త�రమ� తప�పక ఉండాలి మరియ� నిర�వర�తించబడ�నట�ల� ఉండాలి."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:126
+#, fuzzy
+#| msgid "Text message part limit"
+msgid "These messages are not copies."
+msgstr "పాఠ�య సందేశ భాగప� పరిమితి"
+
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 "ఈ సంచయం అతర�గతంగా కల�పబడి ఉండవచ�చ�,\n"
-"బహిర�గతంగా కల�ప�టక� శోధన సంచయం కూర�పరికి వెళ�ళ�మ�, అవసరమైతే."
+"బహిర�గతంగా కల�ప�టక� అన�వేషణ సంచయం కూర�పరికి వెళ�ళ�మ�, అవసరమైతే."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "ఈ సందేశం పంపబడద� ఎంచేతంటే పంప�టక� ఎంచ�క�న�న ఖాతా చేతనంగా లేద�"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:130
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
-msgstr "ఈ సందేశం పంపబడలేద� ఎంచేతంటే మీర� � స�వీకరణదార�ల నామమ�న� తెల�పలేద�"
+msgstr "ఈ సందేశం పంపబడలేద� ఎంచేతంటే మీర� � స�వీకరణదార�ల పేర�న� తెల�పలేద�"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
-msgstr "ఈ సేవిక ఈ రకమైన దృవీకరణక� మద�దత�నీయద� మరియ� దృవీకరణన� ఎప�పటికి మద�దత�నీయకపోవచ�చ�."
+msgstr ""
+"ఈ సేవిక ఈ రకమైన దృవీకరణక� మద�దత�నీయద� మరియ� దృవీకరణన� ఎప�పటికి "
+"మద�దత�నీయకపోవచ�చ�."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:132
 msgid "This signature has been changed, but has not been saved."
 msgstr "ఈ సంతకం మార�చబడింది, అయితే దాయబడలేద�."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:133
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr ""
-"ఇది ఎంచ�క�న�న సంచయంనంద� మరియ� దాని ఉపసంచయాలనంద� అన�ని సందేశాలన� చదివినట�ల� గ�ర�త�ంచ�త�ంది."
+"ఇది ఎంచ�క�న�న సంచయంనంద� మరియ� దాని ఉపసంచయాలనంద� అన�ని సందేశాలన� చదివినట�ల� "
+"గ�ర�త�ంచ�త�ంది."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:134
 #, fuzzy
 msgid "This will mark all messages as read in the selected folder."
 msgstr ""
-"ఇది ఎంచ�క�న�న సంచయంనంద� మరియ� దాని ఉపసంచయాలనంద� అన�ని సందేశాలన� చదివినట�ల� గ�ర�త�ంచ�త�ంది."
+"ఇది ఎంచ�క�న�న సంచయంనంద� మరియ� దాని ఉపసంచయాలనంద� అన�ని సందేశాలన� చదివినట�ల� "
+"గ�ర�త�ంచ�త�ంది."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:135
 msgid "Unable to connect to the GroupWise server."
 msgstr "సమూహతరహా సేవికక� అన�సంధానించబడ లేకపోయింది."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:136
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
-"డ�రాఫ�ట�స� సంచయాలన� ఈ ఖాతా కొరక� తెర�వలేక పోయింది. బద�ల�గా సిస�టమ� డ�రాఫ�ట�స� సంచయాలన� ఉపయోగించాలా?"
+"డ�రాఫ�ట�స� సంచయాలన� ఈ ఖాతా కొరక� తెర�వలేక పోయింది. బద�ల�గా సిస�టమ� డ�రాఫ�ట�స� "
+"సంచయాలన� ఉపయోగించాలా?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:137
 msgid "Unable to read license file."
-msgstr "లైసెన�స� దస�త�రాన�ని చద�వలేక పోతోంది."
+msgstr "లైసెన�స� ఫైల�న� చద�వలేక పోతోంది."
+
+#: ../mail/mail.error.xml.h:138
+#, fuzzy
+#| msgid "Unable to retrieve message"
+msgid "Unable to retrieve message."
+msgstr "సందేశాన�ని వెలికితీయలేద�."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:139
 msgid "Use _Default"
 msgstr "అప�రమేయాన�న ఉపయోగించ�(_D)"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:140
 msgid "Use default drafts folder?"
 msgstr "అప�రమేయ డ�రాఫ�ట�స�  సంచయాన�ని ఉపయోగించ�?"
 
-#: ../mail/mail.error.xml.h:120
-msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual "
-"message from one of your local or remote folders.\n"
-"Do you really want to do this?"
-msgstr ""
-"హెచ�చరిక: శోధన సంచయంన�ండి సందేశం న� తొలగించ�ట అనేది అది మీ స�థానిక లేదా దూరస�థ సంచయాలలోని సందేశంన� "
-"తొలగిస�త�ంది.\n"
-"మీర� ఖచ�చితంగా దీనిని చేద�దామ�ని అన�క�ంట�న�నర�?"
+#: ../mail/mail.error.xml.h:141
+#, fuzzy
+#| msgid "Would you like to accept it?"
+msgid "Would you like to close the message window?"
+msgstr "మీర� దీనిని ఆమోందించ�టక� యిష�టపడతారా?"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:142
 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 ""
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:143
 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 ""
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:144
 #, fuzzy
 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 ""
-"సందేశం తిప�ప�కొన�టవలన అది స�వీకరణదారి మెయిల�‌బాక�స��‌న�ండి తీసివేయబడవచ�చ�. మీర� ఖచ�చితంగా దీనిని "
+"సందేశం తిప�ప�కొన�టవలన అది స�వీకరణదారి మెయిల�‌బాక�స��‌న�ండి తీసివేయబడవచ�చ�. "
+"మీర� ఖచ�చితంగా దీనిని "
 "చేద�దామన�క�ంట�న�నారా?"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:145
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ఈ మెయిల� న� తొలగించ�టక� మీర� సరిపోవ�నంత అన�మత�లన� కలిగిలేర�."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:146
 msgid "You have not filled in all of the required information."
 msgstr "కావలిసి సమాచారం అంతటిని మీర� నింపలేద�."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:147
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "మీర� పంపని సందేశాలన� కలిగిఉన�నార�, �మైనా బహిష�కరిద�దామన�క�ంట�న�నారా?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:148
 msgid "You may not create two accounts with the same name."
-msgstr "మీర� ఒకే నామమ�తో రెండ� ఖాతాలన� సృష�టించలేక పోవచ�చ�."
+msgstr "మీర� ఒకే పేర�తో రెండ� ఖాతాలన� సృష�టించలేక పోవచ�చ�."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:149
 msgid "You must name this Search Folder."
-msgstr "మీర� ఈ శోధన సంచయంక� నామకరణం చేయాలి."
+msgstr "మీర� ఈ అన�వేషణ సంచయంక� నామకరణం చేయాలి."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:150
 msgid "You must specify a folder."
 msgstr "మీర� తప�పక ఒక సంచయాన�ని తెల�పవలెన�."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:151
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 msgstr ""
 "మీర� తప�పక ఒక సంచయంనైనా మూలంగా తెల�పవలెన�.\n"
-"సంచయాలన� వేర�వేర� ఎంచ�టద�వారా గాని, మరియ�/లేదా అన�ని స�థానిక సంచయాలన� ఎంచ�టద�వారా, అన�ని దూరస�థ "
+"సంచయాలన� వేర�వేర� ఎంచ�టద�వారా గాని, మరియ�/లేదా అన�ని స�థానిక సంచయాలన� "
+"ఎంచ�టద�వారా, అన�ని దూరస�థ "
 "సంచయాలన� ఎంచ�ట ద�వారా,లేదా రెండూ."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:153
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "మీ సేవిక \"{0}\"క� \"{0}\"లాగా మీలాగిన� విఫలమైంది."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:154
+#, fuzzy
+#| msgid "Always"
+msgid "_Always"
+msgstr "యెల�లప�ప�డ�"
+
+#: ../mail/mail.error.xml.h:155
 msgid "_Append"
 msgstr "జతచేయ�మ�(_A)"
 
-#: ../mail/mail.error.xml.h:135
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../mail/mail.error.xml.h:156
+#: ../plugins/publish-calendar/publish-calendar.c:619
 msgid "_Disable"
 msgstr "అచేతనపర�చ�మ�(_D)"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:157
 msgid "_Discard changes"
 msgstr "మార�ప�లన� తీసివేయ�మ�(_D)"
 
-#: ../mail/mail.error.xml.h:137
-#: ../modules/mail/e-mail-shell-view-actions.c:827
+#: ../mail/mail.error.xml.h:158
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "_Empty Trash"
 msgstr "చెత�తక�ండీని ఖాళీచేయ�మ�(_E)"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:159
+#, fuzzy
+#| msgid "Evolution"
+msgid "_Exit Evolution"
+msgstr "ఎవాల�యూషన�"
+
+#: ../mail/mail.error.xml.h:160
 msgid "_Expunge"
 msgstr "కొట�టివేయ�మ�(_E)"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:161
+#, fuzzy
+#| msgid "Migration"
+msgid "_Migrate Now"
+msgstr "వలసపంప�ట"
+
+#: ../mail/mail.error.xml.h:162
+#, fuzzy
+#| msgid "No"
+msgid "_No"
+msgstr "కాద�"
+
+#: ../mail/mail.error.xml.h:163
 msgid "_Open Messages"
 msgstr "సందేశాలన� తెర�వ�మ�(_O)"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:166
 #, fuzzy
 msgid "_Send Receipt"
 msgstr "రశీద�న� పంప�మ�"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:167
 #, fuzzy
 msgid "_Synchronize"
 msgstr "కాలనియమత"
 
-#: ../mail/message-list.c:1170
+#: ../mail/mail.error.xml.h:168
+#, fuzzy
+#| msgid "Yes"
+msgid "_Yes"
+msgstr "అవ�న�"
+
+#: ../mail/mail.error.xml.h:169
+msgid "{0}"
+msgstr "{0}"
+
+#: ../mail/message-list.c:1261
 msgid "Unseen"
 msgstr "చూడని"
 
-#: ../mail/message-list.c:1171
+#: ../mail/message-list.c:1262
 msgid "Seen"
 msgstr "చూసి"
 
-#: ../mail/message-list.c:1172
+#: ../mail/message-list.c:1263
 msgid "Answered"
 msgstr "సమాధానమిచ�చిన"
 
-#: ../mail/message-list.c:1173
+#: ../mail/message-list.c:1264
 msgid "Forwarded"
 msgstr "పంపబడిన"
 
-#: ../mail/message-list.c:1174
+#: ../mail/message-list.c:1265
 msgid "Multiple Unseen Messages"
 msgstr "చూడనట�వంటి బహ�ళ సందేశాల�"
 
-#: ../mail/message-list.c:1175
+#: ../mail/message-list.c:1266
 msgid "Multiple Messages"
 msgstr "బహ�ళ సందేశాల�"
 
-#: ../mail/message-list.c:1179
+#: ../mail/message-list.c:1270
 msgid "Lowest"
 msgstr "అతితక�క�వ"
 
-#: ../mail/message-list.c:1180
+#: ../mail/message-list.c:1271
 msgid "Lower"
 msgstr "తక�క�వ"
 
-#: ../mail/message-list.c:1184
+#: ../mail/message-list.c:1275
 msgid "Higher"
 msgstr "ఎక�క�వ"
 
-#: ../mail/message-list.c:1185
+#: ../mail/message-list.c:1276
 msgid "Highest"
 msgstr "అతిఎక�క�వ"
 
-#: ../mail/message-list.c:1795 ../widgets/table/e-cell-date.c:46
+#: ../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:1802 ../plugins/itip-formatter/itip-view.c:205
+#. * in 12-hour format, without seconds.
+#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "ఈ రోజ�·%l:%M·%p"
 
-#: ../mail/message-list.c:1811
+#: ../mail/message-list.c:1925
 msgid "Yesterday %l:%M %p"
 msgstr "నిన�న·%l:%M·%p"
 
-#: ../mail/message-list.c:1823
+#: ../mail/message-list.c:1937
 msgid "%a %l:%M %p"
 msgstr "%a·%l:%M·%p"
 
-#: ../mail/message-list.c:1831
+#: ../mail/message-list.c:1945
 msgid "%b %d %l:%M %p"
 msgstr "%b·%d·%l:%M·%p"
 
-#: ../mail/message-list.c:1833
+#: ../mail/message-list.c:1947
 msgid "%b %d %Y"
 msgstr "%b·%d·%Y"
 
-#: ../mail/message-list.c:2598
+#: ../mail/message-list.c:2752
 msgid "Select all visible messages"
 msgstr "కనపడే సందేశాలన�నిటిని ఎంచ�కొన�మ�"
 
+#: ../mail/message-list.c:2912 ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "సందేశాల�"
+
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:4160
+#, fuzzy
+#| msgid "Follow-Up"
+msgid "Follow-up"
+msgstr "అన�సరించ�"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4402 ../mail/message-list.c:4809
+#: ../mail/message-list.c:4675 ../mail/message-list.c:5098
 msgid "Generating message list"
 msgstr "సందేశ జాబితాన� సంభనింపచేయ�ట"
 
-#: ../mail/message-list.c:4633
+#: ../mail/message-list.c:4912
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
-"మీ శోధన విధానాన�ని � సందేశం తృప�తిపర�చ�టలేద�. శోధన->శ�భ�రంచేయి మెనూ అంశంద�వారా శోధనన� శ�భ�రంచేయ�మ� "
+"మీ అన�వేషణ విధానాన�ని � సందేశం తృప�తిపర�చ�టలేద�. అన�వేషణ->శ�భ�రంచేయి మెనూ "
+"అంశంద�వారా అన�వేషణన� శ�భ�రంచేయ�మ� "
 "లేదా దానిని మార�చ�టద�వారా చేయ�మ�."
 
-#: ../mail/message-list.c:4635
+#: ../mail/message-list.c:4914
 msgid "There are no messages in this folder."
 msgstr "ఈ సంచయంనంద� సందేశాల� లేవ�."
 
@@ -14219,7 +13604,7 @@ msgid "Sent Messages"
 msgstr "పంపిన సందేశాల�"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:560
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Size"
 msgstr "పరిమాణం"
 
@@ -14228,27 +13613,27 @@ msgid "Subject - Trimmed"
 msgstr "సంగతి - ట�రిమ�మ�డ�"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1218
+#: ../modules/mail/e-mail-shell-view-actions.c:1562
 msgid "Body contains"
 msgstr "మ�ఖ�యభాగమ� కలిగినది"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1225
+#: ../modules/mail/e-mail-shell-view-actions.c:1569
 msgid "Message contains"
 msgstr "సందేశం కలిగినది"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1232
+#: ../modules/mail/e-mail-shell-view-actions.c:1576
 msgid "Recipients contain"
 msgstr "స�వీకరణదార�ల� కలిగిఉంటే"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1239
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
 msgid "Sender contains"
 msgstr "పంపినవార� కలిగిఉంటే"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1246
+#: ../modules/mail/e-mail-shell-view-actions.c:1590
 msgid "Subject contains"
 msgstr "సంగతి కలిగిఉంటే"
 
@@ -14256,92 +13641,100 @@ msgstr "సంగతి కలిగిఉంటే"
 msgid "Subject or Addresses contains"
 msgstr "ఇది కలిగివ�న�న సంగతి లేదా చిర�నామాల�"
 
-#: ../modules/addressbook/addressbook-config.c:206
+#: ../modules/addressbook/addressbook-config.c:207
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
 msgstr ""
-"ఈ �చ�చికంన� ఎంచ�కొన�ట వలన ఎవాల�యూషన� మీ LDAP సేవికక� అన�సంధానించబడ�త�ంది మీ LDAP సేవిక SSL "
+"ఈ �చ�చికంన� ఎంచ�కొన�ట వలన ఎవాల�యూషన� మీ LDAP సేవికక� అన�సంధానించబడ�త�ంది మీ "
+"LDAP సేవిక SSL "
 "క� మద�దతిస�త�ంటే."
 
-#: ../modules/addressbook/addressbook-config.c:208
+#: ../modules/addressbook/addressbook-config.c:209
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
 msgstr ""
-"ఈ �చ�చికంన� ఎంచ�కొన�ట వలన ఎవాల�యూషన� మీ LDAP సేవికక� అన�సంధానించబడ�త�ంది మీ LDAP సేవిక TLS "
+"ఈ �చ�చికంన� ఎంచ�కొన�ట వలన ఎవాల�యూషన� మీ LDAP సేవికక� అన�సంధానించబడ�త�ంది మీ "
+"LDAP సేవిక TLS "
 "క� మద�దతిస�త�ంటే."
 
-#: ../modules/addressbook/addressbook-config.c:210
+#: ../modules/addressbook/addressbook-config.c:211
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
 "vulnerable to security exploits."
 msgstr ""
-"ఈ �చ�చికంన� ఎంచ�కొన�ట అర�ధం మీ సేవిక SSl లేదా TLS క� మద�దతీయండంలేద�. దీనర�ధం మీ అన�సంధానంక� "
+"ఈ �చ�చికంన� ఎంచ�కొన�ట అర�ధం మీ సేవిక SSl లేదా TLS క� మద�దతీయండంలేద�. దీనర�ధం "
+"మీ అన�సంధానంక� "
 "రక�షణలేద�, మరియ� రక�షణ భేద�యమ�లపై మీర� అన�మానించబడతార�."
 
-#: ../modules/addressbook/addressbook-config.c:602
+#: ../modules/addressbook/addressbook-config.c:641
 #, fuzzy
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "ప�ట�టినరోజ�ల� & వార�షికోత�సవాల�"
 
-#: ../modules/addressbook/addressbook-config.c:638
+#: ../modules/addressbook/addressbook-config.c:683
 msgid "Copy _book content locally for offline operation"
 msgstr "ఆఫ�‌లైన� ఆపరేషన�‌కొరక� ప�సక�తం సారమ�న� స�థానికంగా నకల�తీయ�మ� (_b)"
 
-#: ../modules/addressbook/addressbook-config.c:746
+#: ../modules/addressbook/addressbook-config.c:798
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
 "port you should specify."
 msgstr ""
-"ఎవాల�యూషన� అన�సంధానమగ�టక� ప�రయత�నించే LDAP పోర�ట� ఇదే. ప�రామాణిక పోర�ట�ల జాబితా ఇవ�వబడింది. మీర� � "
+"ఎవాల�యూషన� అన�సంధానమగ�టక� ప�రయత�నించే LDAP పోర�ట� ఇదే. ప�రామాణిక పోర�ట�ల "
+"జాబితా ఇవ�వబడింది. మీర� � "
 "పోర�ట� న� తెల�పవలెనో మీ సిస�టమ� నిర�వహణాధికారిని అడగండి."
 
-#: ../modules/addressbook/addressbook-config.c:820
+#: ../modules/addressbook/addressbook-config.c:879
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 msgstr ""
-"మిమ�మ�లి దృవీకరించ�టక� ఎవాల�యూషన� వాడే పద�దితి ఇదే. దీనిని \" ఈమెయిల� చిర�నామా\" క� అమర�చ�ట వలన మీ "
+"మిమ�మ�లి దృవీకరించ�టక� ఎవాల�యూషన� వాడే పద�దితి ఇదే. దీనిని \" ఈమెయిల� "
+"చిర�నామా\" క� అమర�చ�ట వలన మీ "
 "LDAP సేవికక� ఎనానిమస� ప�రవేశం అవసరమౌత�ందని గమనించండి."
 
-#: ../modules/addressbook/addressbook-config.c:895
+#: ../modules/addressbook/addressbook-config.c:962
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
 "your search base. A search scope of \"one\" will only include the entries "
 "one level beneath your base."
 msgstr ""
-"శోధన వ�యాప�తి మీర� ఎంత లోత�గా సంచయ వృక�షం లోపలికి విస�తరించి శోధించ�దామని అన�క�ంట�న�న�రారో "
-"నిర�వచిస�త�ంది. \"sub\" యొక�క శోధన వ�యాప�తి మీ శోధన ఆధారం క�రిందన ఉన�న అన�ని ప�రవేశాలన� చేర�చ�త�ంది. "
-"\"one\" యొక�క శోధన వ�యాప�తి మీ శోధన ఆధారం క�రింద ఉన�న ఒక స�థాయి ప�రవేశాలన� మాత�రమే చేర�చ�త�ంది."
+"అన�వేషణ వ�యాప�తి మీర� ఎంత లోత�గా సంచయ వృక�షం లోపలికి విస�తరించి శోధించ�దామని "
+"అన�క�ంట�న�న�రారో "
+"నిర�వచిస�త�ంది. \"sub\" యొక�క అన�వేషణ వ�యాప�తి మీ అన�వేషణ ఆధారం క�రిందన ఉన�న "
+"అన�ని ప�రవేశాలన� చేర�చ�త�ంది. "
+"\"one\" యొక�క అన�వేషణ వ�యాప�తి మీ అన�వేషణ ఆధారం క�రింద ఉన�న ఒక స�థాయి "
+"ప�రవేశాలన� మాత�రమే చేర�చ�త�ంది."
 
-#: ../modules/addressbook/addressbook-config.c:1011
+#: ../modules/addressbook/addressbook-config.c:1086
 msgid "Server Information"
 msgstr "సేవిక సమాచారం"
 
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1091
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "వివరాల�"
 
-#: ../modules/addressbook/addressbook-config.c:1017
-#: ../modules/mail/e-mail-shell-view.c:54
+#: ../modules/addressbook/addressbook-config.c:1092
+#: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "వెత�క�త�న�నది"
 
-#: ../modules/addressbook/addressbook-config.c:1019
+#: ../modules/addressbook/addressbook-config.c:1094
 msgid "Downloading"
 msgstr "దిగ�మతి అవ�త�న�నది"
 
-#: ../modules/addressbook/addressbook-config.c:1225
+#: ../modules/addressbook/addressbook-config.c:1309
 msgid "Address Book Properties"
 msgstr "చిర�నామ ప�స�తకం లక�షణాల�"
 
-#: ../modules/addressbook/addressbook-config.c:1227
+#: ../modules/addressbook/addressbook-config.c:1311
 msgid "New Address Book"
 msgstr "కొత చిర�నామా ప�స�తకం"
 
@@ -14380,14 +13773,32 @@ msgid "Position of the contact preview pane when oriented vertically."
 msgstr ""
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
-msgid "Show autocompleted name with an address"
-msgstr "స�వయంచాలకంగామ�గియ� నామమ�న� వొక చిర�నామాతో చూప�మ�"
+#, fuzzy
+#| msgid "evolution address book"
+msgid "Primary address book"
+msgstr "ఎవల�యూషన� చిర�నామా ప�స�తకం"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+msgid "Show autocompleted name with an address"
+msgstr "స�వయంచాలకంగామ�గియ� పేర�న� వొక చిర�నామాతో చూప�మ�"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+#, fuzzy
+#| msgid "Show Animations"
+msgid "Show maps"
+msgstr "యానిమేషన�లన� చూప�మ�"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid "Show preview pane"
 msgstr "ఉపదర�శన పలకాన�ని చూపించ�మ�"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid ""
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 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 "
@@ -14395,375 +13806,419 @@ msgid ""
 "contact list."
 msgstr ""
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
-msgstr "ఎవాల�యూషన� స�వయంచాలకమ�గింప� క� ప�రయత�నించ�టక� మ�న�ప� ప�రవెశపెట�టవలిసిన అక�షరమ�ల సంఖ�య."
+msgstr ""
+"ఎవాల�యూషన� స�వయంచాలకమ�గింప� క� ప�రయత�నించ�టక� మ�న�ప� ప�రవెశపెట�టవలిసిన "
+"అక�షరమ�ల సంఖ�య."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "URI for the folder last used in the select names dialog"
-msgstr "ఎంచ�క�న�న నామమ�ల డైలాగ� నంద� చివరిగా ఉపయోగించిన సంచయం కొరక� URI"
+msgstr "ఎంచ�క�న�న పేర�ల డైలాగ� నంద� చివరిగా ఉపయోగించిన సంచయం కొరక� URI"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "URI for the folder last used in the select names dialog."
-msgstr "ఎంచ�క�న�న నామమ�ల డైలాగ� నంద� చివరిగా ఉపయోగించిన సంచయం కొరక� URI."
+msgstr "ఎంచ�క�న�న పేర�ల డైలాగ� నంద� చివరిగా ఉపయోగించిన సంచయం కొరక� URI."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
-msgstr "స�వయంచాలకంగామ�గియ� పరిచయం నామమ�తో మెయిల� చిర�నామాన� ప�రవేశమ�నంద� బలవంతంగా చూయించాలా"
+msgstr ""
+"స�వయంచాలకంగామ�గియ� పరిచయం పేర�తో మెయిల� చిర�నామాన� ప�రవేశమ�నంద� బలవంతంగా "
+"చూయించాలా"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+#, fuzzy
+#| msgid "Whether to show the preview pane."
+msgid "Whether to show maps in preview pane."
+msgstr "ఉపదర�శనం తలంన� చూపించవలెనా."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid "Whether to show the preview pane."
 msgstr "ఉపదర�శనం తలంన� చూపించవలెనా."
 
 #. 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:159
-#: ../modules/mail/em-mailer-prefs.c:1165
+#: ../modules/addressbook/autocompletion-config.c:194
+#: ../modules/mail/em-mailer-prefs.c:1049
 #, fuzzy
 msgid "_Table column:"
 msgstr "పట�టిక నిల�వ�వర�స:"
 
-#: ../modules/addressbook/autocompletion-config.c:162
+#: ../modules/addressbook/autocompletion-config.c:197
 msgid "Autocompletion"
 msgstr "స�వయంచాలకంగాపూర�తి"
 
-#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/addressbook/autocompletion-config.c:200
 msgid "Always _show address of the autocompleted contact"
 msgstr "స�వయంచాలకంగామ�గియ� పరిచయంయొక�క చిర�నామాన� ఎల�లప�ప�డ� చూప�మ� (_s)"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:97
-#: ../modules/addressbook/e-book-shell-migrate.c:148
+#: ../modules/addressbook/e-book-shell-backend.c:102
+#: ../modules/addressbook/e-book-shell-migrate.c:154
 msgid "On LDAP Servers"
 msgstr "LDAP సేవికలపై"
 
-#: ../modules/addressbook/e-book-shell-backend.c:267
+#: ../modules/addressbook/e-book-shell-backend.c:302
 msgctxt "New"
 msgid "_Contact"
 msgstr "పరిచయం (_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:757
+#: ../modules/addressbook/e-book-shell-backend.c:304
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new contact"
 msgstr "కొత�త పరిచయాన�ని సృష�టించ�"
 
-#: ../modules/addressbook/e-book-shell-backend.c:274
+#: ../modules/addressbook/e-book-shell-backend.c:309
 msgctxt "New"
 msgid "Contact _List"
 msgstr "పరిచయాల జాబితా (_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:764
+#: ../modules/addressbook/e-book-shell-backend.c:311
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "Create a new contact list"
 msgstr "కొత�త పరిచయ జాబితాని సృష�టించ�"
 
-#: ../modules/addressbook/e-book-shell-backend.c:284
+#: ../modules/addressbook/e-book-shell-backend.c:319
 msgctxt "New"
 msgid "Address _Book"
 msgstr "చిర�నామా ప�స�తకం (_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-backend.c:321
+#: ../modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Create a new address book"
 msgstr "కొత చిర�నామా ప�స�తకాన�ని సృష�టించ�"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:398
-#: ../modules/calendar/e-cal-shell-backend.c:104
-#: ../modules/calendar/e-cal-shell-migrate.c:57
+#: ../modules/addressbook/e-book-shell-backend.c:338
+#: ../modules/addressbook/e-book-shell-view.c:405
+#: ../modules/calendar/e-cal-shell-backend.c:115
+#: ../modules/calendar/e-cal-shell-migrate.c:63
+#: ../modules/online-accounts/e-online-accounts-google.c:366
 msgid "Contacts"
 msgstr "పరిచయాల�"
 
+#: ../modules/addressbook/e-book-shell-backend.c:348
+msgid "Certificates"
+msgstr "యోగ�యతా పత�రికల�"
+
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:263
-#: ../modules/addressbook/e-book-shell-view-actions.c:541
+#: ../modules/addressbook/e-book-shell-view-actions.c:387
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
 #, fuzzy
 msgid "Save as vCard"
 msgstr "Vపలకంగా దాయ�మ�..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
 msgid "Co_py All Contacts To..."
 msgstr "అన�ని పరిచయాలన� నకల�తీయ�మ�(p)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:666
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
 #, fuzzy
 msgid "Copy the contacts of the selected address book to another"
 msgstr "ఎంచ�క�న�న సంచయమ� యొక�క పరిచయాలన� వేరే సంచయమ�క� నకల� తీయ�మ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
 #, fuzzy
 msgid "D_elete Address Book"
 msgstr "చిర�నామా ప�స�తకాన�ని తొలగించ�మ�(_e)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:673
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 #, fuzzy
 msgid "Delete the selected address book"
 msgstr "ఎంచ�క�న�న సంచయాన�ని తొలగించ�మ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
 msgid "Mo_ve All Contacts To..."
 msgstr "అన�ని పరిచయాలన� కద�ప�మ�(_v)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
 #, fuzzy
 msgid "Move the contacts of the selected address book to another"
 msgstr "ఎంచ�క�న�న సంచయమ� యొక�క పరిచయాలన� వేరే సంచయమ�క� జర�ప�మ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-view-actions.c:833
 msgid "_New Address Book"
 msgstr "కొత చిర�నామా ప�స�తకం(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
 msgid "Address _Book Properties"
 msgstr "చిర�నామా ప�స�తకం లక�షణాల�(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 #, fuzzy
 msgid "Show properties of the selected address book"
 msgstr "ఎంచ�క�న�న సంచయమ� యొక�క లక�షణాలన� మార�చ�మ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
-#: ../modules/calendar/e-cal-shell-view-actions.c:1354
-#: ../modules/calendar/e-memo-shell-view-actions.c:620
-#: ../modules/calendar/e-task-shell-view-actions.c:744
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
+#, fuzzy
+#| msgid "Address Book"
+msgid "Address Book _Map"
+msgstr "చిర�నామా ప�స�తకం"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#, fuzzy
+msgid "Show map with all contacts from selected address book"
+msgstr "ఎంచ�క�న�న సంచయమ� యొక�క పరిచయాలన� వేరే సంచయమ�క� నకల� తీయ�మ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:854
+#: ../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
 msgid "_Rename..."
 msgstr "ప�నఃనామకరణ(_R)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
 #, fuzzy
 msgid "Rename the selected address book"
 msgstr "ఎంచ�క�న�న సంచయాన�ని ప�న:నామకరణం చేయ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
-#, fuzzy
-msgid "S_ave Address Book as vCard"
-msgstr "చిరనామాప�స�తకాన�ని Vకార�డ� లా దాయ�మ�(_a)"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:708
-#, fuzzy
-msgid "Save the contacts of the selected address book as a vCard"
-msgstr "ఎంపికచేసిన సంచయం పరిచయాలన� Vకార�డ� లాగా దాయ�మ�"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:715
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 #, fuzzy
 msgid "Stop loading"
 msgstr "నింప�టన� ఆప�మ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
 #, fuzzy
 msgid "_Copy Contact To..."
 msgstr "పరిచయాన�ని క� నకల�తీయ�మ�(_C)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:722
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 #, fuzzy
 msgid "Copy selected contacts to another address book"
 msgstr "ఎంచ�క�న�న పరిచయాలన� వేరే సంచయంలోకి నకల� తీయ�మ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
 msgid "_Delete Contact"
 msgstr "పరిచయాన�ని తొలగించ�(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:882
 #, fuzzy
 msgid "_Find in Contact..."
 msgstr "పరిచయాన�ని మ�ంద�క� పంప�మ�(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
 #, fuzzy
 msgid "Search for text in the displayed contact"
 msgstr "ప�రదర�శించబడిన సందేశం మ�ఖ�యభాగమ�లో పాఠ�యమ�న� వెత�క�మ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:889
 msgid "_Forward Contact..."
 msgstr "పరిచయాన�ని మ�ంద�క� పంప�మ�(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:743
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
 msgid "Send selected contacts to another person"
 msgstr "ఎంచ�క�న�న పరిచయాలన� వేరే వ�యక�తికి పంప�మ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
 #, fuzzy
 msgid "_Move Contact To..."
 msgstr "పరిచయాలన� దీనికి కద�ప�మ�(_M)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:750
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
 #, fuzzy
 msgid "Move selected contacts to another address book"
 msgstr "ఎంచ�క�న�న పరిచయాలన� వేరే సంచయమ�క� జర�ప�మ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
 msgid "_New Contact..."
 msgstr "కొత�త పరిచయం(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-view-actions.c:910
 msgid "New Contact _List..."
 msgstr "కొత�త చిర�నామాల జాబితా(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:917
 #, fuzzy
 msgid "_Open Contact"
 msgstr "పరిచయం (_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
 msgid "View the current contact"
 msgstr "ప�రస�త�త పరిచయాన�ని దర�శించ�మ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:924
 msgid "_Send Message to Contact..."
 msgstr "పరిచయానికి సందేశం పంప�మ�(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:778
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
 msgid "Send a message to the selected contacts"
 msgstr "ఎంచ�క�న�న పరిచయాలక� సందేశాన�ని పంప�మ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:785
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/addressbook/e-book-shell-view-actions.c:933
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Actions"
 msgstr "క�రియల�(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:792
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
-#: ../modules/calendar/e-task-shell-view-actions.c:809
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../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
 msgid "_Preview"
 msgstr "ఉపదర�శనం(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1513
-#: ../modules/calendar/e-memo-shell-view-actions.c:670
-#: ../modules/calendar/e-task-shell-view-actions.c:822
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../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 "తొలగించ�(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:805
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "_Properties"
 msgstr "లక�షణాల�(_P)"
 
-#. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:814
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
-msgid "_Save as vCard..."
-msgstr "Vపలకంగా దాయ�మ�(_S)..."
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#, fuzzy
+#| msgid "Address Book"
+msgid "Address Book Map"
+msgstr "చిర�నామా ప�స�తకం"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:842
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Contact _Preview"
 msgstr "పరిచయం ఉపదర�శనం(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:844
+#: ../modules/addressbook/e-book-shell-view-actions.c:991
 msgid "Show contact preview window"
 msgstr "పరిచయ ఉపదర�శన గవాక�షాన�ని చూప�మ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:863
-#: ../modules/calendar/e-memo-shell-view-actions.c:727
-#: ../modules/calendar/e-task-shell-view-actions.c:891
-#: ../modules/mail/e-mail-shell-view-actions.c:1128
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#, fuzzy
+#| msgid "Show as list"
+msgid "Show _Maps"
+msgstr "జాబితాగా చూప�మ�"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:999
+#, fuzzy
+#| msgid "Show contact preview window"
+msgid "Show maps in contact preview window"
+msgstr "పరిచయ ఉపదర�శన గవాక�షాన�ని చూప�మ�"
+
+#: ../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
 msgid "_Classic View"
 msgstr "సాంప�రదాయకమైన దర�శనం(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:865
+#: ../modules/addressbook/e-book-shell-view-actions.c:1020
 #, fuzzy
 msgid "Show contact preview below the contact list"
 msgstr "సందేశ జాబితా కింద సందేశ ఉపదర�శనాన�ని చూప�మ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:870
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:898
-#: ../modules/mail/e-mail-shell-view-actions.c:1135
+#: ../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
 msgid "_Vertical View"
 msgstr "నిల�వ� దర�శనం(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:872
+#: ../modules/addressbook/e-book-shell-view-actions.c:1027
 #, fuzzy
 msgid "Show contact preview alongside the contact list"
 msgstr "పరిచయ ఉపదర�శన గవాక�షాన�ని చూప�మ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:880
-#: ../modules/calendar/e-cal-shell-view-actions.c:1656
-#: ../modules/calendar/e-memo-shell-view-actions.c:744
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../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 "�దైన విభాగం"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:887
-#: ../modules/calendar/e-cal-shell-view-actions.c:1670
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:970
 msgid "Unmatched"
 msgstr "సరిఉజ�జీ కాలేద�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:897
-#: ../modules/calendar/e-cal-shell-view-actions.c:1680
-#: ../modules/calendar/e-memo-shell-view-actions.c:761
-#: ../modules/calendar/e-task-shell-view-actions.c:960
-#: ../modules/mail/e-mail-shell-view-actions.c:1211
-#: ../shell/e-shell-content.c:459
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../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
 msgid "Advanced Search"
 msgstr "ఉన�నతమైన వెత�క�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#: ../modules/addressbook/e-book-shell-view-actions.c:1085
 #, fuzzy
 msgid "Print all shown contacts"
 msgstr "ఎంచ�క�న�న పరిచయాలన� మ�ద�రించ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:1092
 #, fuzzy
 msgid "Preview the contacts to be printed"
 msgstr "మ�ద�రించాల�సిన పరిచయాలన� ఉపదర�శనమిస�త�ంది"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
+#: ../modules/addressbook/e-book-shell-view-actions.c:1099
 msgid "Print selected contacts"
 msgstr "ఎంచ�క�న�న పరిచయాలన� మ�ద�రించ�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:962
+#: ../modules/addressbook/e-book-shell-view-actions.c:1114
+#, fuzzy
+msgid "S_ave Address Book as vCard"
+msgstr "చిరనామాప�స�తకాన�ని Vకార�డ� లా దాయ�మ�(_a)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+#, fuzzy
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "ఎంపికచేసిన సంచయం పరిచయాలన� Vకార�డ� లాగా దాయ�మ�"
+
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:1122
+#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+msgid "_Save as vCard..."
+msgstr "Vపలకంగా దాయ�మ�(_S)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1124
 #, fuzzy
 msgid "Save selected contacts as a vCard"
 msgstr "ఎంపికచేసిన పరిచయాలన� Vకార�డ�లాగా దాయ�మ�."
 
-#: ../modules/addressbook/e-book-shell-view.c:342
+#: ../modules/addressbook/e-book-shell-view.c:349
 msgid "_Forward Contacts"
 msgstr "చిర�నామాలని మ�ంద�క� పంప�(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:344
+#: ../modules/addressbook/e-book-shell-view.c:351
 msgid "_Forward Contact"
 msgstr "చిర�నామాన�ని మ�ందికిపంప�(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:382
 #, fuzzy
 msgid "_Send Message to Contacts"
 msgstr "చిర�నామాలక� సందేశం పంప�(_M)"
 
-#: ../modules/addressbook/e-book-shell-view.c:377
+#: ../modules/addressbook/e-book-shell-view.c:384
 #, fuzzy
 msgid "_Send Message to List"
 msgstr "జాబితాక� సందేశం పంప�(_M)"
 
-#: ../modules/addressbook/e-book-shell-view.c:379
+#: ../modules/addressbook/e-book-shell-view.c:386
 #, fuzzy
 msgid "_Send Message to Contact"
 msgstr "చిర�నామాక� సందేశం పంప�(_M)"
 
-#: ../modules/addressbook/eab-composer-util.c:137
+#: ../modules/addressbook/eab-composer-util.c:149
 msgid "Multiple vCards"
 msgstr "బహ�ళ Vకార�డ�స��"
 
-#: ../modules/addressbook/eab-composer-util.c:145
+#: ../modules/addressbook/eab-composer-util.c:157
 #, c-format
 msgid "vCard for %s"
 msgstr "%s కొరక� Vకార�డ��"
 
-#: ../modules/addressbook/eab-composer-util.c:157
-#: ../modules/addressbook/eab-composer-util.c:184
+#: ../modules/addressbook/eab-composer-util.c:169
+#: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information"
 msgstr "చిర�నామా సమాచారం"
 
-#: ../modules/addressbook/eab-composer-util.c:186
+#: ../modules/addressbook/eab-composer-util.c:198
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s కొరక� చిర�నామా సమాచారం"
@@ -14799,7 +14254,7 @@ msgstr "ఆన�‌లైన�"
 
 #: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
-msgstr "శోధన వడపోత"
+msgstr "అన�వేషణ వడపోత"
 
 #: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
@@ -14807,15 +14262,16 @@ msgstr "వెత�క� మూలం(_b):"
 
 #: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
-msgstr "శోధన వడపోత(_f):"
+msgstr "అన�వేషణ వడపోత(_f):"
 
 #: ../modules/addressbook/ldap-config.ui.h:16
 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 ""
-"శోధన వడపోత అన�నది దేనికొరకైతే శోధన జరగాలో ఆ ఆబ�జక�ట� రకమైనవ�ంట�ంది. ఇది సవరించిఉండకపోతే, అప�రమేయంగా "
-"శోధన \"వ�యక�తి\" రకం యొక�క అంశప�తరగతి పై జర�గ�త�ంది."
+"అన�వేషణ వడపోత అన�నది దేనికొరకైతే అన�వేషణ జరగాలో ఆ ఆబ�జక�ట� రకమైనవ�ంట�ంది. ఇది "
+"సవరించిఉండకపోతే, అప�రమేయంగా "
+"అన�వేషణ \"వ�యక�తి\" రకం యొక�క అంశప�తరగతి పై జర�గ�త�ంది."
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
 #: ../modules/addressbook/ldap-config.ui.h:18
@@ -14833,7 +14289,7 @@ msgid "Using distinguished name (DN)"
 msgstr ""
 "పేర�లేక�ండా\n"
 "ఈ మెయిల� చిర�నామా వ�పయోగించి\n"
-"విభజిత నామమ� వ�పయోగించి (DN)"
+"విభజిత పేర� వ�పయోగించి (DN)"
 
 #: ../modules/addressbook/ldap-config.ui.h:22
 #, fuzzy
@@ -14852,10 +14308,6 @@ msgstr "సాధ�యమైన వెత�క� మూలాలన� కన
 msgid "_Login method:"
 msgstr "ప�రవేశ పద�దతి(_L):"
 
-#: ../modules/addressbook/ldap-config.ui.h:27
-msgid "_Port:"
-msgstr "పోర�ట�(_P):"
-
 #: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "వెత�క� లక�ష�యం(_S):"
@@ -14864,475 +14316,1364 @@ msgstr "వెత�క� లక�ష�యం(_S):"
 msgid "_Timeout:"
 msgstr "సమయం మించినది(_T):"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Use secure connection:"
-msgstr "రక�షిత బంధాన�ని ఉపయోగించ�మ�(U):"
-
 #: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "పలకాల�"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../modules/bogofilter/evolution-bogofilter.c:146
+#, fuzzy, c-format
+#| msgid "Failed to apply outgoing filters: %s"
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "బయటక�వెళ�ళ� వడపోతలన� ఆపాదించ�టలో వైఫల�యం: %s"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:164
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr ""
+
+#: ../modules/bogofilter/evolution-bogofilter.c:213
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr ""
+
+#: ../modules/bogofilter/evolution-bogofilter.c:312
+msgid "Bogofilter Options"
+msgstr "Bogofilter �చ�చికాల�"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:321
+msgid "Convert message text to _Unicode"
+msgstr "సందేశ పాఠ�యమ�న� యూనికోడ�‌క� మార�చ�మ� (_U)"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:477
+#, fuzzy
+#| msgid "Bogofilter Options"
+msgid "Bogofilter"
+msgstr "Bogofilter �చ�చికాల�"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "మెయిల� సందేశాలన� య�నికోడ� క� మార�చ�మ�"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"వేర�వేర� అక�షర సమిత�ల న�ండి వచ�చ� spam/ham టోకెన�స� న� యూనిఫై చేయ�టక� సందేశం "
+"పాఠ�యమ�న� "
+"Unicode UTF-8 క� మార�చ�మ�."
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#, fuzzy, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr ""
+"<i>%u మరియ� %d ఈ మెయిల� చిర�నామా న�ండి వినియోగదార�డ� మరియ� అధికారక�షేత�రమ� "
+"చేత ప�నఃస�థాపించబడతాయి.</"
+"i>"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
+msgid "(Shown in a Day View)"
+msgstr "(రోజ� దర�శనంలో చూప�మ�)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
+#, fuzzy
+msgid "05 minutes"
+msgstr "నిమిషాల�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
+#, fuzzy
+msgid "10 minutes"
+msgstr "నిమిషాల�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
+#, fuzzy
+msgid "15 minutes"
+msgstr "నిమిషాల�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
+#, fuzzy
+msgid "30 minutes"
+msgstr "నిమిషాల�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
+#, fuzzy
+msgid "60 minutes"
+msgstr "నిమిషాల�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
+#, fuzzy
+msgid "Alerts"
+msgstr "హెచ�చరికల�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
+msgid "Day _ends:"
+msgstr "రోజ� పూర�తయినది(_e):"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#, fuzzy
+msgid "Days"
+msgstr "రోజ�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+#, fuzzy
+msgid "Default Free/Busy Server"
+msgstr "<span weight=\"bold\">అప�రమేయ ఖాళి/తీరకలేని సేవిక</span>"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
+msgid "Display"
+msgstr "ప�రదర�శించ�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#, fuzzy
+#| msgid "Display alarms in _notification area only"
+msgid "Display reminders in _notification area only"
+msgstr "ప�రకటన ప�రాంతమ�లో మాత�రమే ఆలారమ�లన� ప�రదర�శించ�మ� (_n)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#, fuzzy
+msgid "Hours"
+msgstr "à°—à°‚à°Ÿ"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
+#, fuzzy
+msgid "Minutes"
+msgstr "నిమిషాల�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#, fuzzy
+#| msgid "Publishing Location"
+msgid "Publishing Information"
+msgstr "స�థానాన�ని ప�రచ�రిస�తోంది"
+
+#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+msgid "S_un"
+msgstr "ఆది(_u)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
+msgid "Sc_roll Month View by a week"
+msgstr "నెల దర�శనమ�న� వారమ� ద�వారా స�క�రాల� చేయ�మ� (_r)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Se_cond zone:"
+msgstr "రెండవ క�షేత�రమ� (_c):"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
+#| msgid "Select the calendars for alarm notification"
+msgid "Select the calendars for reminder notification"
+msgstr "అలారం తాఖీద� ఇచ�చ�టక� క�యాలెండర�లన� ఎంచ�కొన�మ�"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Sh_ow a reminder"
+msgstr "గ�ర�తిచ�దానిని చూప�మ�(_o)"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
+msgid "Show a _reminder"
+msgstr "గ�ర�త�చేయ�దానిని చూపమ� (_r)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
+msgid "Show r_ecurring events in italic in bottom left calendar"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
+#, fuzzy
+msgid "Show week _numbers"
+msgstr "వారమ� సంఖ�యలన� తేది మార�చ�దానిలో చూప�మ�(_n)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "T_asks due today:"
+msgstr "ఈ రోజ�క� మిగిలిన కర�తవ�యాల�(_a):"
+
+#. Thursday
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
+msgid "T_hu"
+msgstr "గ�ర�(_h)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
+msgid "Template:"
+msgstr "మాదిది:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../widgets/misc/e-dateedit.c:592
+msgid "Time"
+msgstr "సమయం"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
+msgid "Time format:"
+msgstr "కాల రూపకం:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
+msgid "Use s_ystem time zone"
+msgstr "సిస�టమ� సమయ క�షేత�రమ�న� వ�పయోగించ�మ�"
+
+#. A weekday like "Monday" follows
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
+msgid "Wee_k starts on:"
+msgstr "వారమ� ప�రారంభించబడ�త�ంది(_k):"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+msgid "Work Week"
+msgstr "పని వారం"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
+msgid "Work days:"
+msgstr "పని రోజ�ల�:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "_12 hour (AM/PM)"
+msgstr "_12 గంటల�(AM/PM)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_24 hour"
+msgstr "_24గంటల�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "_Ask for confirmation when deleting items"
+msgstr "అంశాలన� తొలగించేమ�ంద� దృవీకరించ�కొన�మ�(_A)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
+msgid "_Compress weekends in month view"
+msgstr "నెల దర�శనం లో వారాంతమ�లన� క�చింపచేయ�మ�(_C)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
+msgid "_Day begins:"
+msgstr "రోజ� ప�రారంభమయింది(_D):"
+
+#. Friday
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
+msgid "_Fri"
+msgstr "శ�క�ర(_F)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
+msgid "_Hide completed tasks after"
+msgstr "పూర�తయిన కర�తవ�యాలన� తర�వాత అదృశ�యపర�చ�మ�(_H)"
+
+#. Monday
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+msgid "_Mon"
+msgstr "సోమ(_M)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
+msgid "_Overdue tasks:"
+msgstr "సమయంమించిన కర�తవ�యమ�ల�(_O):"
+
+#. Saturday
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
+msgid "_Sat"
+msgstr "శని(_S)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
+msgid "_Show appointment end times in week and month view"
+msgstr "వారమ� మరియ� నెల దర�శనమ�లో నియామకం మ�గియ� సమయాన�ని చూప�మ�(_S)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
+msgid "_Time divisions:"
+msgstr "సమయ భాగమ�ల�(_T):"
+
+#. Tuesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
+msgid "_Tue"
+msgstr "మంగళ(_T)"
+
+#. Wednesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
+msgid "_Wed"
+msgstr "బ�ధ(_W)"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
+msgid "before every anniversary/birthday"
+msgstr "ప�రతి వార�షికమ�/ప�ట�టినరోజ�క� మ�ంద�"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
+msgid "before every appointment"
+msgstr "ప�రతి నియామకం మ�ంద�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+msgid "Ask for confirmation when deleting items"
+msgstr "అంశమ�లన� తొలగించ�త�న�నప�ప�డ� నిర�ధారణకొరక� అడ�గ�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr ""
+"ఈ రోజ�క� మిగిలి ఉన�న బ�యాక�‌గ�రౌండ� వర�ణప� కర�తవ�యం, \"#rrggbb\" రూపంలో."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr "ఇంకా సమయంఉన�న బ�యాక�‌గ�రౌండ� వర�ణప� కర�తవ�యమ�ల�, \"#rrggbb\" రూపంలో."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#, fuzzy
+#| msgid "Birthdays & Anniversaries"
+msgid "Birthday and anniversary reminder"
+msgstr "ప�ట�టినరోజ�ల� & వార�షికోత�సవాల�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+#, fuzzy
+#| msgid "Birthdays & Anniversaries"
+msgid "Birthday and anniversary reminder units"
+msgstr "ప�ట�టినరోజ�ల� & వార�షికోత�సవాల�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+#, fuzzy
+#| msgid "Birthdays & Anniversaries"
+msgid "Birthday and anniversary reminder value"
+msgstr "ప�ట�టినరోజ�ల� & వార�షికోత�సవాల�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#| msgid "Calendars to run alarms for"
+msgid "Calendars to run reminders for"
+msgstr "దీని కొరక� అలారాల� నడ�ప�టక� క�యాలెండర�ల�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "సమయ పట�టీ పై మార�కస� బైన�స� వర�సన� గీయ�టక� వర�ణమ� (అప�రమేయంగా ఖాళీ)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr "తేదీ దర�శని లో మార�కస� బైన�స� వర�సన� గీయ�టక� వర�ణమ�."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+msgid "Compress weekends in month view"
+msgstr "వారాంతం లన� నెల దర�శనం లో క�చింప�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+msgid "Confirm expunge"
+msgstr "కొట�టివేతన� నిర�ధరించ�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr "ప�రారంభ మరియ� మ�గింప� పని గంటలన� సూచించవలిసిన రోజ�ల�."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+msgid "Default appointment reminder"
+msgstr "అప�రమేయ నియామకాన�ని గ�ర�తించ�నది"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+msgid "Default reminder units"
+msgstr "అప�రమేయంగా గ�ర�త�చేయ� భాగమ�ల�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+msgid "Default reminder value"
+msgstr "అప�రమేయంగా గ�ర�త�చేయ�దాని విల�వ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#| msgid "Directory for saving alarm audio files"
+msgid "Directory for saving reminder audio files"
+msgstr "అలారం ఆడియో ఫైళ�ళన� దాయ�టక� డైరెక�టరీ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
+msgid "Free/busy server URLs"
+msgstr "ఖాళీ/తీరికలేని సేవిక URLs"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+msgid "Free/busy template URL"
+msgstr "ఖాళీ/తీరికలేని మాదిరి URL"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+msgid "Hide completed tasks"
+msgstr "పూర�తయిన కర�తవ�యాలన� దాయ�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+msgid "Hide task units"
+msgstr "కర�తవ�యం యూనిట�లన� మర�గ�పర�చ�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+msgid "Hide task value"
+msgstr "కర�తవ�య విల�వన� దాయ�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+msgid "Horizontal pane position"
+msgstr "సమతలంగా ఉన�న పలక స�థానమ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr "పనిరోజ� పూర�తగ� గంట, ఇరవై నాల�గ� గంటల రూపంలో, 0 న�ండి 23"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr "పనిరోజ� ప�రారంభమగ� గంట, ఇరవై నాల�గ� గంటల రూపంలో, 0 న�ండి 23"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr "రోజ� లో చూపబడ� విరామాల� మరియ� పనివారాల దర�శనంల�, నిమషాలలో."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#| msgid "Last alarm time"
+msgid "Last reminder time"
+msgstr "చివరి అలారం సమయం"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+msgid "List of recently used second time zones in a Day View."
+msgstr "రోజ� దర�శనంలో యిటీవల వ�పయోగించిన సమయక�షేత�రాల యొక�క జాబితా."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+msgid "List of server URLs for free/busy publishing."
+msgstr "ఖాళీ/తీరికలేని పబ�లిషింగ� కొరక� సేవిక URLs యొక�క జాబితా."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+msgid "Marcus Bains Line"
+msgstr "మార�కస� బైన�స�  వర�స"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+msgid "Marcus Bains Line Color - Day View"
+msgstr "మార�కస� బైన�స� వర�స వర�ణమ� - రోజ� దర�శనం"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+msgid "Marcus Bains Line Color - Time bar"
+msgstr "మార�కస� బైన�స� వర�స వర�ణం - సమయ పట�టీ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr ""
+"'day_second_zones' జాబితానంద� గ�ర�త�ంచ�కొన�టక� యిటీవల వ�పయోగించిన "
+"సమయక�షేత�రమ�లయొక�క గరిష�ట "
+"సంఖ�య."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+msgid "Maximum number of recently used timezones to remember."
+msgstr "గ�ర�త�ంచ�కొనవలసిన యిటీవలవ�పయోగించిన సమయక�షేత�రమ�ల గరిష�ట సంఖ�య."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+#, fuzzy
+msgid "Memo layout style"
+msgstr "ప�రత�య�త�తరమ� శైలి(_R):"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+msgid "Memo preview pane position (horizontal)"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+#, fuzzy
+msgid "Memo preview pane position (vertical)"
+msgstr "నిల�వ పలక స�థానమ�లో నెల దర�శనాన�ని చూప�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "పనిరోజ� మ�గియ� నిమషం, 0 న�ండి 59."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "పనిరోజ� ప�రారంభం మగ� నిమ�షం, 0 న�ండి 59."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+msgid "Month view horizontal pane position"
+msgstr "క�యాలెండర� లో నెల దర�శనాన�ని సమాతల పలక స�థానమ�లో చూప�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+msgid "Month view vertical pane position"
+msgstr "నిల�వ పలక స�థానమ�లో నెల దర�శనాన�ని చూప�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+#, fuzzy
+#| msgid "Number of units for determining a default reminder."
+msgid "Number of units for determining a birthday or anniversary reminder."
+msgstr "అప�రమేయంగా గర�త�చేయ�దానిని నిర�దారించ�ట కొరక� యూనిట�ల సంఖ�య."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+msgid "Number of units for determining a default reminder."
+msgstr "అప�రమేయంగా గర�త�చేయ�దానిని నిర�దారించ�ట కొరక� యూనిట�ల సంఖ�య."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+msgid "Number of units for determining when to hide tasks."
+msgstr "కర�తవ�యాలన� ఎప�ప�డ� మర�గ�పరచాలో గ�ర�త�చేయ�దాని కొరక� యూనిట�ల సంఖ�య."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+msgid "Overdue tasks color"
+msgstr "అతక�రమించ� కర�తవ�యం వర�ణమ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+msgstr ""
+"సమాంతర తలం యొక�క స�థానమ�, నెల దర�శనిలో లేనప�ప�డ� తేదీ మార�చ� క�యాలెండర� మరియ� "
+"కర�తవ�య జాబితా ల మధ�య, "
+"పిక�సెల�స� లో."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"సమాంతర తలం యొక�క స�థానమ�, నెల దర�శిని లో దర�శనం మరియ� తేదీ నేవిగేటర� "
+"క�యాలెండర� మరియ� కర�తవ�యజాబితా మధ�య, "
+"పిక�సెల�స� లో."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+msgid "Position of the task preview pane when oriented vertically."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr ""
+"నిల�వ� తలం యొక�క స�థానమ�, క�యాలెండర� జాబితా మరియ� తేదీ మార�చ� క�యాలెండర� మధ�య."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"నిల�వ� తలం యొక�క స�థానమ�, నెల దర�శనం లో దర�శనం మరియ� తేది మార�చ� క�యాలెండర� "
+"మరియ� కర�తవ�యం జాబితా ల "
+"మధ�య, పిక�సెల�స� లో."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+"నిల�వ� తలం యొక�క స�థానమ�, నెల దర�శనం లో లేనప�ప�డ� దర�శనం మరియ� తేది మార�చ� "
+"క�యాలెండర� మరియ� "
+"కర�తవ�యం జాబితా ల మధ�య, పిక�సెల�స� లో."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+msgid "Primary calendar"
+msgstr "ప�రాధమిక క�యాలెండర�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+msgid "Primary memo list"
+msgstr "ప�రాధమిక మెమో జాబితా"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+msgid "Primary task list"
+msgstr "ప�రాధమిక కర�తవ�య జాబితా"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#| msgid "Programs that are allowed to be run by alarms."
+msgid "Programs that are allowed to be run by reminders."
+msgstr "అలారమ�లచే నడ�చ�టక� కార�యక�రమాల� అన�మతింబడ�డాయి."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+msgid "Recently used second time zones in a Day View"
+msgstr "రోజ� దర�శనమ�నంద� యిటీవలవ�పయోగించిన రెండవ సమయ క�షేత�రమ�ల�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+#, fuzzy
+#| msgid "Recurrence date is invalid"
+msgid "Recurrent Events in Italic"
+msgstr "ప�నరావృతి తారీఖ� నిస�సారం"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#, fuzzy
+#| msgid "Reminder Notes"
+msgid "Reminder programs"
+msgstr "గ�ర�త�చేయ� గమనికల�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
+#| msgid "Save directory for alarm audio"
+msgid "Save directory for reminder audio"
+msgstr "అలారం ఆడియో కొరక� డైరెక�టరీ దాయి"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
+msgid "Scroll Month View by a week"
+msgstr "నెల దర�శనమ�న� వారమ� ద�వారా స�క�రాల� చేయ�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "RSVP క�షేత�రమ�న� ఘటన/కర�తవ�యం/సమావేశం కూర�పరి లో చూప�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "పాత�ర క�షేత�రమ�న� ఘటన/కర�తవ�యం/సమావేశం కూర�పరి నంద� చూప�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
+msgid "Show appointment end times in week and month views"
+msgstr "వారమ� మరియ� నెల దర�శనంలలో నియామకాల మ�గియ� సమయాన�ని చూప�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
+msgid "Show categories field in the event/meeting/task editor"
+msgstr "వర�గమ�ల క�షేత�రమ�న� ఘటన/కర�తవ�యం/సమావేశం కూర�పరి నంద� చూప�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
+msgid "Show days with recurrent events in italic font in bottom left calendar."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
+#, fuzzy
+#| msgid "Show display alarms in notification tray"
+msgid "Show display reminders in notification tray"
+msgstr "ప�రకటన ట�రే లో ప�రదర�శన అలారంలన� చూప�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
+msgid "Show status field in the event/task/meeting editor"
+msgstr "స�థితి క�షేత�రమ�న� ఘటన/కర�తవ�యం/సమావేశం కూర�పరిని చూప�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
+#, fuzzy
+msgid "Show the memo preview pane"
+msgstr "\"ఉపదర�శన\" పలకాన�ని చూప�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
+#, fuzzy
+msgid "Show the task preview pane"
+msgstr "\"ఉపదర�శన\" పలకాన�ని చూప�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
+msgid "Show timezone field in the event/meeting editor"
+msgstr "సమయక�షేత�ర క�షేత�రమ�న� ఘటన/సమావేశం కూర�పరి నంద� చూప�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
+msgid "Show type field in the event/task/meeting editor"
+msgstr "టైప� క�షేత�రమ�న� ఘటన/కర�తవ�యం/సమావేశం కూర�పరినంద� చూప�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
+#, fuzzy
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr "వారప� సంఖ�యన� తేదీ మరియ� పని వారప� దర�శనమ�లో చూప�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+"అమర�చివ�న�నట�లైతే, రోజ�లో రెండవ సమయ క�షేత�రమ�న� చూపమ�. విల�వ 'సమయక�షేత�రమ�' "
+"కీనంద� వ�పయోగించిన "
+"దానికి సరిపోల�త�ంది."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
+msgid "Task layout style"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
+#, fuzzy
+msgid "Task preview pane position (horizontal)"
+msgstr "నిల�వ� పలక స�థానం యొక�క కర�తవ�యాల�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
+#, fuzzy
+msgid "Task preview pane position (vertical)"
+msgstr "నిల�వ� పలక స�థానం యొక�క కర�తవ�యాల�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
+msgid "Tasks due today color"
+msgstr "ఈ రోజ�తో అయిపోవ� కర�తవ�యమ�ల వర�ణమ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
+msgid ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
+msgid ""
+"The UID of the selected (or \"primary\") memo list in the sidebar of the "
+"\"Memos\" view."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+msgid ""
+"The UID of the selected (or \"primary\") task list in the sidebar of the "
+"\"Tasks\" view."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+"ఖాళీ/తిరకలేని డాటా ఫాల�‌బ�యాక� గా ఉపయోగించ�టక� URL మాదిరి, %s మెయిల� చిర�నామా "
+"యొక�క వినియోగదారి బాగమ� చేత "
+"ప�నఃస�థాపించబడింది మరియ� %d డెమోన� చేత ప�నఃస�థాపించబడింది."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"క�యాలెండర� నందలి తేదీల� మరియ� సమయాలక� ఉపయోగించ�టక� అప�రమేయ సమయక�షేత�రం, "
+"\"America/New York\" "
+"లాంటి అన�వాదించలేని ఓల�సన� సమయక�షేత�ర డాటాబేస� స�థానమ�."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"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 ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
+msgid "The second timezone for a Day View"
+msgstr "రోజ� దర�శనంక� రెండవ సమయక�షేత�రమ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+"ఇది మూడ� విల�వ�లన� కలిగివ�ండవచ�చ�. దోషమ�ల కొరక� 0. హెచ�చరికల కొరక� 1. డీబగ� "
+"సందేశాల కొరక� 2."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
+msgid "Time divisions"
+msgstr "సమయ విభాగమ�ల�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
+#, fuzzy
+#| msgid "Time the last alarm ran, in time_t."
+msgid "Time the last reminder ran, in time_t."
+msgstr "చివరి అలారం నడ�వవలిసిన సమయం, time_t లో."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+msgid "Timezone"
+msgstr "సమయక�షేత�రం"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
+msgid "Twenty four hour time format"
+msgstr "ఇరవైనాల�గ� గంటల సమయ రూపలావణ�యమ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
+#, fuzzy
+#| msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\"."
+msgstr ""
+"అప�రమేయంగా గ�ర�తించ�దాని యొక�క ప�రమాణంల�, \"నిమ�షాల�\", \"గంటల�\" లేదా "
+"\"రోజ�ల�\"."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"అప�రమేయంగా గ�ర�తించ�దాని యొక�క ప�రమాణంల�, \"నిమ�షాల�\", \"గంటల�\" లేదా "
+"\"రోజ�ల�\"."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"కర�తవ�యాలన� ఎప�ప�డ� మర�గ�పరచాలో నిర�ధారించ�టక� ప�రమాణమ�ల�, \"నిమ�షాల�\", "
+"\"గంటల�\" లేదా "
+"\"రోజ�ల�\"."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
+msgid "Use system timezone"
+msgstr "సిస�టమ� సమయక�షేత�రమ�న� వ�పయోగించ�మ�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr ""
+"ఎవాల�యూషన� నంద� యెంపికచేసిన సమయక�షేత�రమ�నక� బద�ల�గా సిస�టమ� సమయక�షేత�రమ�న� "
+"వ�పయోగించ�మ�."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
+msgid "Vertical pane position"
+msgstr "నిల�వ�గావ�న�న పలక స�థానం"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
+msgid "Week start"
+msgstr "ప�రారంభ వారం"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgstr "వారమ� ప�రారంభంలో వారమ�రోజ�, ఆదివారం (0) న�ండి శనివారం (6) వరక�."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
+#, fuzzy
+#| msgid "Whether or not to use the notification tray for display alarms."
+msgid "Whether or not to use the notification tray for display reminders."
+msgstr "ప�రదర�శన అలారమ�లక� ప�రకటన ట�రే న� ఉపయోగించాలా వద�దా."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr ""
+"ఒక నియామకాన�ని లేదా కర�తవ�యాన�ని తొలగిస�త�న�నప�పడ� నిర�దారణ కొరక� అడగవలెనా."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr ""
+"కర�తవ�యాలన� మరియ� నియామకాలన� కొట�టివేయ�చ�న�నప�పడ� నిర�దారణ కొరక� అడగవలెనా."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+"నెల దర�శని లో వారాంతమ�లన� క�చించ వలెనా, �దైతే శనివారమ� మరియ� ఆదివారమ�లన� ఒక "
+"వారమ�రోజ� స�థలమ�లో "
+"ఉంచ�త�ందో."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
+msgid "Whether to display the end time of events in the week and month views."
+msgstr "వారమ� మరియ� నెల దర�శనమ�లలో ఘటనల యొక�క మ�గియ�కాలాన�ని ప�రదర�శించవలెనా."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr ""
+"క�యాలండర� నంద� మార�కస� బైన�స� వర�సన (ప�రస�త�త సమయం వద�ద వర�స) న� గీయవలెనా."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr "పూర�తైన కర�తవ�యమ�లన� కర�తవ�య దర�శని లో మర�గ�పరచాలా."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr "నెల దర�శనమ�న� నెలన� అన�సరించి కాక, వారమ� ద�వారా స�క�రాల� చేయాలా."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
+msgid "Whether to set a default reminder for appointments."
+msgstr "నియామకాలక� అప�రమేయంగా గ�ర�తించ�దానిని అమర�చాలా."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
+#, fuzzy
+#| msgid "Whether to set a default reminder for appointments."
+msgid "Whether to set a reminder for birthdays and anniversaries."
+msgstr "నియామకాలక� అప�రమేయంగా గ�ర�తించ�దానిని అమర�చాలా."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr "RSVP క�షేత�రాన�ని ఘటన/కర�తవ�యం/సమావేశం కూర�పరి నంద� చూపాలా"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "వర�గమ�ల క�షేత�రాన�ని ఘటన/సమావేశం కూర�పరి నంద� చూపాలా"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr "పాత�ర క�షేత�రాన�ని ఘటన/కర�తవ�యం/సమావేశం కూర�పరి నంద� చూపాలా"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr "స�థితి క�షేత�రాన�ని ఘటన/కర�తవ�యం/సమావేశం కూర�పరి నంద� చూపాలా"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
+msgstr "సమయాన�ని am/pm విధానం బద�ల�గా ఇరవై నాల�గ� గంటల రూపంలో చూపించాలా."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "సమయక�షేత�ర క�షేత�రమ�న� ఘటన/సమావేశం కూర�పరి నంద� చూపాలా"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr "టైప� క�షేత�రాన�ని ఘటన/కర�తవ�యం/సమావేశం కూర�పరి నంద� చూపాలా"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
+#, fuzzy
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr "వారప� సంఖ�యలన� తేదీ మార�చ�దానిలో చూపాలా."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
+msgid "Work days"
+msgstr "పనిరోజ�ల�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
+msgid "Workday end hour"
+msgstr "పనిరోజ�లో చివరి గంట"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+msgid "Workday end minute"
+msgstr "పనిరోజ� చివరి నిమిషం"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+msgid "Workday start hour"
+msgstr "పనిరోజ� ప�రారంభ గంట"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
+msgid "Workday start minute"
+msgstr "పనిరోజ� ప�రారంభ నిమిషం"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:312
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "దిగ�మతి (_m)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:341
+#: ../modules/calendar/e-cal-attachment-handler.c:393
 msgid "Select a Calendar"
 msgstr "క�యాలెండర�‌న� ఎంపికచేయ�మ�"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:368
+#: ../modules/calendar/e-cal-attachment-handler.c:420
 msgid "Select a Task List"
 msgstr "కర�తవ�యం జాబితాన� ఎంపికచేయ�మ�"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:378
+#: ../modules/calendar/e-cal-attachment-handler.c:430
 msgid "I_mport to Calendar"
 msgstr "క�యాలెండర�‌క� దిగ�మతిచేయ�మ� (_m)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:385
+#: ../modules/calendar/e-cal-attachment-handler.c:437
 msgid "I_mport to Tasks"
 msgstr "కర�తవ�యమ�లక� దిగ�మతి చేయ�మ� (_m)"
 
+#: ../modules/calendar/e-calendar-preferences.c:461
+#| msgid "Selected Calendars for Alarms"
+msgid "Selected Calendars for Reminders"
+msgstr "అలారమ�ల కొరక� యెంచ�కొన�న క�యాలెండర�ల�"
+
+#: ../modules/calendar/e-calendar-preferences.c:863
+#, fuzzy
+msgid "Ti_me and date:"
+msgstr "సమయం మరియ� తేది:"
+
+#: ../modules/calendar/e-calendar-preferences.c:864
+#, fuzzy
+msgid "_Date only:"
+msgstr "తేది మాత�రమే:"
+
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:106
-#: ../modules/calendar/e-cal-shell-migrate.c:176
-#: ../modules/calendar/e-memo-shell-backend.c:94
-#: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:94
-#: ../modules/calendar/e-task-shell-migrate.c:145
+#: ../modules/calendar/e-cal-shell-backend.c:117
+#: ../modules/calendar/e-cal-shell-migrate.c:198
+#: ../modules/calendar/e-memo-shell-backend.c:104
+#: ../modules/calendar/e-memo-shell-migrate.c:152
+#: ../modules/calendar/e-task-shell-backend.c:104
+#: ../modules/calendar/e-task-shell-migrate.c:164
 msgid "On The Web"
 msgstr "మహాతలం పైన"
 
-#: ../modules/calendar/e-cal-shell-backend.c:108
-#: ../plugins/calendar-weather/calendar-weather.c:117
+#: ../modules/calendar/e-cal-shell-backend.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:127
 msgid "Weather"
 msgstr "వాతావరణం"
 
-#: ../modules/calendar/e-cal-shell-backend.c:193
-#: ../modules/calendar/e-cal-shell-migrate.c:60
+#: ../modules/calendar/e-cal-shell-backend.c:206
+#: ../modules/calendar/e-cal-shell-migrate.c:66
 msgid "Birthdays & Anniversaries"
 msgstr "ప�ట�టినరోజ�ల� & వార�షికోత�సవాల�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:396
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgctxt "New"
 msgid "_Appointment"
 msgstr "నియామకం (_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:398
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Create a new appointment"
 msgstr "కొత�త నియామకమ�న� సృష�టించ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:403
+#: ../modules/calendar/e-cal-shell-backend.c:446
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "పూర�తిరోజ� నియామకం (_p)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:405
+#: ../modules/calendar/e-cal-shell-backend.c:448
 msgid "Create a new all-day appointment"
 msgstr "కొత�త పూర�తిరోజ� నియామకాన�ని సృష�టించ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:410
+#: ../modules/calendar/e-cal-shell-backend.c:453
 msgctxt "New"
 msgid "M_eeting"
 msgstr "సమావేశం (_e)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:412
+#: ../modules/calendar/e-cal-shell-backend.c:455
 msgid "Create a new meeting request"
 msgstr "కొత�త సమావేశ అభ�యర�థన న� సృష�టించ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:420
+#: ../modules/calendar/e-cal-shell-backend.c:463
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "క�యాలెండర� (_n)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:422
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Create a new calendar"
 msgstr "కొత�త క�యాలెండర� న� సృష�టించ�"
 
-#: ../modules/calendar/e-cal-shell-backend.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2667
+#: ../modules/calendar/e-cal-shell-backend.c:788
 msgid "Calendar and Tasks"
 msgstr "క�యాలెండర� మరియ� కర�తవ�యాల�"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:169
-#: ../modules/calendar/e-memo-shell-sidebar.c:163
-#: ../modules/calendar/e-task-shell-sidebar.c:163
-#, fuzzy, c-format
-msgid ""
-"Error on %s\n"
-"%s"
-msgstr ""
-"%s పై దోషం:\n"
-" %s"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:237
+#: ../modules/calendar/e-cal-shell-sidebar.c:184
 #, fuzzy
 msgid "Loading calendars"
 msgstr "క�యాలెండర� న� నింప�త�ంది"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:664
+#: ../modules/calendar/e-cal-shell-sidebar.c:755
 #, fuzzy
 msgid "_New Calendar..."
 msgstr "కొత�త క�యాలెండర�(_N)"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:681
+#: ../modules/calendar/e-cal-shell-sidebar.c:772
 #, fuzzy
 msgid "Calendar Selector"
 msgstr "క�యాలెండర� వనర� ఎంపికచేసేది"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1022
+#: ../modules/calendar/e-cal-shell-sidebar.c:1123
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "క�యాలెండర�‌న� తెర�చ�చ�న�నది"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
 msgid "Print"
 msgstr "మ�ద�రణ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:306
+#: ../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."
 msgstr ""
-"ఎంపికచేసిన సమయ మెత�తానికి పూర�వమైన అన�ని ఘటనలన� ఈ ఆపరెషన� శాశ�వతంగా తొలగించివేస�త�ంది. మీర� "
+"ఎంపికచేసిన సమయ మెత�తానికి పూర�వమైన అన�ని ఘటనలన� ఈ ఆపరెషన� శాశ�వతంగా "
+"తొలగించివేస�త�ంది. మీర� "
 "కొనసాగించినట�లైతే, మీర� ఈ ఘటనలన� మరలా తిరిగిపొందలేర�."
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:323
+#: ../modules/calendar/e-cal-shell-view-actions.c:337
 msgid "Purge events older than"
 msgstr "దీనికన�నా పాతవైన ఘటనలన� కొట�టివేయ�మ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:534
+#: ../modules/calendar/e-cal-shell-view-actions.c:564
 #, fuzzy
 msgid "Copying Items"
 msgstr "అంశాల నకల�తీస�త�ంది"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-actions.c:848
 #, fuzzy
 msgid "Moving Items"
 msgstr "అంశాలన� జర�ప�త�ంది"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1126
+#: ../modules/calendar/e-cal-shell-view-actions.c:1175
 #, fuzzy
 msgid "event"
 msgstr "పంపిన"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1128
-#: ../modules/calendar/e-cal-shell-view-memopad.c:210
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:504
-#: ../modules/calendar/e-task-shell-view-actions.c:621
+#: ../modules/calendar/e-cal-shell-view-actions.c:1177
+#: ../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
 #, fuzzy
 msgid "Save as iCalendar"
 msgstr "క�యాలెండర�‌న� ఎంపికచేయ�మ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1284
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
 msgid "_Copy..."
 msgstr "నకల�తీయ�(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 #, fuzzy
 msgid "D_elete Calendar"
 msgstr "క�యాలెండర�‌న� ఎంపికచేయ�మ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
 #, fuzzy
 msgid "Delete the selected calendar"
 msgstr "ఎంచ�క�న�న సంచయాన�ని తొలగించ�మ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
 #, fuzzy
 msgid "Go Back"
 msgstr "వెనక�కి వెళ�ళ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
 #, fuzzy
 msgid "Go Forward"
 msgstr "మ�ంద�క� వెళ�ళ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Select today"
 msgstr "ఈ రోజ�న� ఎంచ�కొన�మ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Select _Date"
 msgstr "తేదీనిఎంచ�కొన�మ�(_D) "
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Select a specific date"
 msgstr "నిర�దిష�టమైన తేదీని ఎంచ�కొన�మ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
 msgid "_New Calendar"
 msgstr "కొత�త క�యాలెండర�(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1340
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "Purg_e"
 msgstr "కొట�టివేయ�మ�(_e)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Purge old appointments and meetings"
 msgstr "పాత నియామకాలన� మరియ� సమావేశాలన� కొట�టివేయ�మ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1347
-#: ../modules/calendar/e-memo-shell-view-actions.c:613
-#: ../modules/calendar/e-task-shell-view-actions.c:737
+#: ../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 "రీఫ�రెష�(_f)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 #, fuzzy
 msgid "Refresh the selected calendar"
 msgstr "ఎంచ�క�న�న సంచయాన�ని ప�న:నామకరణం చేయ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 #, fuzzy
 msgid "Rename the selected calendar"
 msgstr "ఎంచ�క�న�న సంచయాన�ని ప�న:నామకరణం చేయ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
 #, fuzzy
 msgid "Show _Only This Calendar"
 msgstr "ఈ క�యాలెండర� మాత�రమే చూప�మ�(_o)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1368
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Cop_y to Calendar..."
 msgstr "క�యాలెండర� క� నకల�తీయ�(_y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
 msgid "_Delegate Meeting..."
 msgstr "సమావేశాల కాలాన�ని నియమించ�(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 #, fuzzy
 msgid "_Delete Appointment"
 msgstr "నియామకాన�ని తొలగించ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 #, fuzzy
 msgid "Delete selected appointments"
 msgstr "నియామకాన�ని తొలగించ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
 #, fuzzy
 msgid "Delete This _Occurrence"
 msgstr "ఈ సంభవాన�ని తీసివేయ�(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Delete this occurrence"
 msgstr "ఈ సంభవాన�ని తొలగించ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 #, fuzzy
 msgid "Delete All Occ_urrences"
 msgstr "సంభవాలన�నింటి తీసివేయ�(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "Delete all occurrences"
 msgstr "సంభవాలన�నింటి తొలగించ�మ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
 #, fuzzy
 msgid "New All Day _Event..."
 msgstr "కొత�త రోజ� ఘటన(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 #, fuzzy
 msgid "Create a new all day event"
 msgstr "కొత�త పూర�తిరోజ� నియామకాన�ని సృష�టించ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1410
-#: ../modules/calendar/e-cal-shell-view-memopad.c:244
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:578
-#: ../modules/calendar/e-task-shell-view-actions.c:702
+#: ../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 "iక�యాలెండర� గా మ�ంద�క� పంప�(_F)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
 #, fuzzy
 msgid "New _Meeting..."
 msgstr "కొత�త సమావేశం(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 #, fuzzy
 msgid "Create a new meeting"
 msgstr "కొత�త సమావేశ అభ�యర�థన న� సృష�టించ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1424
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Mo_ve to Calendar..."
 msgstr "క�యాలెండర� క� పంప�(_v)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1431
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "New _Appointment..."
 msgstr "కొత�త నియామకం(_A)..."
 
 #
-#: ../modules/calendar/e-cal-shell-view-actions.c:1438
+#: ../modules/calendar/e-cal-shell-view-actions.c:1489
 msgid "Make this Occurrence _Movable"
 msgstr "ఈ సంభవాన�ని కదిపించేది గా చేయ�(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1445
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
 msgid "_Open Appointment"
 msgstr "నియామకాన�ని తెర�వ�మ�(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "View the current appointment"
 msgstr "ప�రస�త�త నియామకాన�ని దర�శించ�మ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
 msgid "_Reply"
 msgstr "ప�రత�య�త�తరమ�(_R):"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1466
-#: ../modules/calendar/e-cal-shell-view-memopad.c:272
-#, fuzzy
-msgid "Save as iCalendar..."
-msgstr "Vపలకంగా దాయ�మ�..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1473
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
 msgid "_Schedule Meeting..."
 msgstr "సమావేశాల కాలాన�ని నియమించ�(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
 #, fuzzy
 msgid "Converts an appointment to a meeting"
 msgstr "పాత నియామకాలన� మరియ� సమావేశాలన� కొట�టివేయ�మ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1480
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
 #, fuzzy
 msgid "Conv_ert to Appointment..."
 msgstr "కొత�త నియామకం(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
 #, fuzzy
 msgid "Converts a meeting to an appointment"
 msgstr "%s నియామకం పూర�తయినప�ప�డ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
 #, fuzzy
 msgid "Quit"
 msgstr "త�యజించ�(_Q)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../modules/calendar/e-cal-shell-view-actions.c:1651
 msgid "Day"
 msgstr "రోజ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1613
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 msgid "Show one day"
 msgstr "ఒక రోజ�న� చూప�మ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
 msgid "List"
 msgstr "జాబితా"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1620
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 msgid "Show as list"
 msgstr "జాబితాగా చూప�మ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-cal-shell-view-actions.c:1665
 msgid "Month"
 msgstr "నెల"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 msgid "Show one month"
 msgstr "ఒక నెలన� చూప�మ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../modules/calendar/e-cal-shell-view-actions.c:1672
 msgid "Week"
 msgstr "వారం"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1634
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
 msgid "Show one week"
 msgstr "ఒక వారాన�ని చూప�మ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1681
 #, fuzzy
 msgid "Show one work week"
 msgstr "ఒక వారాన�ని చూప�మ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1649
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
 msgid "Active Appointments"
 msgstr "చేతనమైన నియామకాల�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1663
+#: ../modules/calendar/e-cal-shell-view-actions.c:1703
 msgid "Next 7 Days' Appointments"
 msgstr "తర�వాతి 7రోజ�ల' నియామకాల�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1694
-#: ../modules/calendar/e-memo-shell-view-actions.c:775
-#: ../modules/calendar/e-task-shell-view-actions.c:974
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-memo-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:994
 msgid "Description contains"
 msgstr "వివరణ కలిగివ�ంది"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1701
-#: ../modules/calendar/e-memo-shell-view-actions.c:782
-#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-memo-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:1001
 msgid "Summary contains"
 msgstr "సంక�షిప�తమ� కలిగివ�ంది"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1713
+#: ../modules/calendar/e-cal-shell-view-actions.c:1753
 msgid "Print this calendar"
 msgstr "ఈ క�యాలెండర� న� మ�ద�రించ�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-cal-shell-view-actions.c:1760
 #, fuzzy
 msgid "Preview the calendar to be printed"
 msgstr "మ�ద�రించాల�సిన క�యాలెండర� న� ఉపదర�శనమిస�త�ంది"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1793
+#: ../modules/calendar/e-cal-shell-view-actions.c:1782
+#: ../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
+#, fuzzy
+msgid "_Save as iCalendar..."
+msgstr "iక�యాలెండర� గా మ�ంద�క� పంప�(_F)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1859
 msgid "Go To"
 msgstr "వెళ�ళ�మ�"
 
 #. 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:208
-#: ../modules/calendar/e-memo-shell-view-actions.c:502
+#: ../modules/calendar/e-cal-shell-view-memopad.c:217
+#: ../modules/calendar/e-memo-shell-view-actions.c:522
 #, fuzzy
 msgid "memo"
 msgstr "మెమో"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:251
-#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
 #, fuzzy
 msgid "New _Memo"
 msgstr "కొత�త మెమో"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:253
-#: ../modules/calendar/e-memo-shell-backend.c:279
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../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:656
 msgid "Create a new memo"
 msgstr "కొత�త మెమోన� సృష�టించ�"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:258
-#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-memopad.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:661
 msgid "_Open Memo"
 msgstr "మెమోన� తెర�వ�మ�(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:260
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-cal-shell-view-memopad.c:269
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
 msgid "View the selected memo"
 msgstr "ఎంపికచేసిన మెమోలన� దర�శించ�"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:265
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:648
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../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 "మహాతల ప�టన� తెర�వ�(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:284
-#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-cal-shell-view-memopad.c:286
+#: ../modules/calendar/e-memo-shell-view-actions.c:828
 #, fuzzy
 msgid "Print the selected memo"
 msgstr "ఎంపికచేసిన మెమోలన� దర�శించ�"
@@ -15341,874 +15682,880 @@ msgstr "ఎంపికచేసిన మెమోలనà±� దరà±�శింà
 #. * 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:275
-#: ../modules/calendar/e-task-shell-view-actions.c:619
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:284
+#: ../modules/calendar/e-task-shell-view-actions.c:639
 #, fuzzy
 msgid "task"
 msgstr "కార�యం"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:681
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
+#: ../modules/calendar/e-task-shell-view-actions.c:701
 msgid "_Assign Task"
 msgstr "కర�తవ�యాన�ని అప�పగించ�మ�(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:758
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:778
 msgid "_Mark as Complete"
 msgstr "పూర�తయిన�నట� గా గ�ర�త�పెట�ట�(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../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 "పూర�తయినట�ట� ఎంచ�క�న�న కర�తవ�యాలన� గ�ర�త� పెట�ట�మ�"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 msgid "_Mark as Incomplete"
 msgstr "అసంపూర�తిగా గ�ర�త�పెట�ట�(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:342
+#: ../modules/calendar/e-task-shell-view-actions.c:787
 #, fuzzy
 msgid "Mark selected tasks as incomplete"
 msgstr "పూర�తయినట�ట� ఎంచ�క�న�న కర�తవ�యాలన� గ�ర�త� పెట�ట�మ�"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "New _Task"
 msgstr "కొత�త కార�యం(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:277
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../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:794
 msgid "Create a new task"
 msgstr "కొత�త కార�యాన�ని సృష�టించ�"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:779
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
+#: ../modules/calendar/e-task-shell-view-actions.c:799
 msgid "_Open Task"
 msgstr "కర�తవ�యాన�ని తెర�వ�మ�(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "View the selected task"
 msgstr "ఎంచ�క�న�న కర�తవ�యాన�ని చూడ�మ�"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:823
-#: ../modules/calendar/e-task-shell-view-actions.c:1022
-#, fuzzy
-msgid "_Save as iCalendar..."
-msgstr "iక�యాలెండర� గా మ�ంద�క� పంప�(_F)"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:1007
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-task-shell-view-actions.c:1027
 #, fuzzy
 msgid "Print the selected task"
 msgstr "ఎంచ�క�న�న కర�తవ�యాన�ని చూడ�మ�"
 
-#: ../modules/calendar/e-memo-shell-backend.c:277
+#: ../modules/calendar/e-memo-shell-backend.c:298
 msgctxt "New"
 msgid "Mem_o"
 msgstr "మెమో (_o)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:284
+#: ../modules/calendar/e-memo-shell-backend.c:305
 #, fuzzy
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "భాగస�వామ�య మెమో (_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:286
+#: ../modules/calendar/e-memo-shell-backend.c:307
 #, fuzzy
 msgid "Create a new shared memo"
 msgstr "కొత�త భాగస�వామ�య మెమోన� సృష�టించ�"
 
-#: ../modules/calendar/e-memo-shell-backend.c:294
+#: ../modules/calendar/e-memo-shell-backend.c:315
 #, fuzzy
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "మెమో జాబితా"
 
-#: ../modules/calendar/e-memo-shell-backend.c:296
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Create a new memo list"
 msgstr "కొత�త మెమోజాబితా న� సృష�టించ�"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:231
+#: ../modules/calendar/e-memo-shell-sidebar.c:179
 msgid "Loading memos"
 msgstr "మెమోలన� నింప�త�ంది"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:603
+#: ../modules/calendar/e-memo-shell-sidebar.c:696
 #, fuzzy
 msgid "Memo List Selector"
 msgstr "మెమో మూలంన� ఎంపికచేయ�నది"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:908
+#: ../modules/calendar/e-memo-shell-sidebar.c:1009
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s వద�ద మెమోలన� తెర�స�తోంది"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
 msgid "Print Memos"
 msgstr "మెమోలన� మ�ద�రించ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:564
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
 #, fuzzy
 msgid "_Delete Memo"
 msgstr "సందేశాన�ని తొలగించ�మ�(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 #, fuzzy
 msgid "_Find in Memo..."
 msgstr "సందేశంలో కన�గొన�మ�(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:573
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
 #, fuzzy
 msgid "Search for text in the displayed memo"
 msgstr "ప�రదర�శించబడిన సందేశం మ�ఖ�యభాగమ�లో పాఠ�యమ�న� వెత�క�మ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
 #, fuzzy
 msgid "D_elete Memo List"
 msgstr "కొత�త సంపర�క జాబితా(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:594
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
 #, fuzzy
 msgid "Delete the selected memo list"
 msgstr "ఎంపికచేసిన మెమోన� తొలగించ�మ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
 msgid "_New Memo List"
 msgstr "కొత�త సంపర�క జాబితా(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
 #, fuzzy
 msgid "Refresh the selected memo list"
 msgstr "ఎంపికచేసిన మెమోన� తొలగించ�మ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 #, fuzzy
 msgid "Rename the selected memo list"
 msgstr "ఎంచ�క�న�న సంచయాన�ని ప�న:నామకరణం చేయ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:627
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
 #, fuzzy
 msgid "Show _Only This Memo List"
 msgstr "ఈ మెమో జాబితా మాత�రమే చూప�మ�(_o)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:706
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
 #, fuzzy
 msgid "Memo _Preview"
 msgstr "ఉపదర�శనం(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:708
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
 #, fuzzy
 msgid "Show memo preview pane"
 msgstr "ఉపదర�శన పలకాన�ని చూపించ�మ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:729
+#: ../modules/calendar/e-memo-shell-view-actions.c:749
 #, fuzzy
 msgid "Show memo preview below the memo list"
 msgstr "సందేశ జాబితా కింద సందేశ ఉపదర�శనాన�ని చూప�మ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:736
+#: ../modules/calendar/e-memo-shell-view-actions.c:756
 #, fuzzy
 msgid "Show memo preview alongside the memo list"
 msgstr "సందేశ జాబితా కింద సందేశ ఉపదర�శనాన�ని చూప�మ�"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:794
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
 msgid "Print the list of memos"
 msgstr "మెమోల జాబితాన� మ�ద�రిస�త�ంది"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:801
+#: ../modules/calendar/e-memo-shell-view-actions.c:821
 #, fuzzy
 msgid "Preview the list of memos to be printed"
 msgstr "మ�ద�రించవలిసిన మెమోలజాబితాన� ఉపదర�శనంచేస�త�ంది"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:416
+#: ../modules/calendar/e-memo-shell-view.c:227
+#, fuzzy
+msgid "Delete Memos"
+msgstr "సందేశాన�ని తొలగించ�మ�(_D)"
+
+#: ../modules/calendar/e-memo-shell-view.c:229
+#, fuzzy
+msgid "Delete Memo"
+msgstr "క� ప�రతినిదిగా"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:424
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d మెమో"
 msgstr[1] "%d మెమోల�"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:420
-#: ../modules/calendar/e-task-shell-view-private.c:569
+#: ../modules/calendar/e-memo-shell-view-private.c:428
+#: ../modules/calendar/e-task-shell-view-private.c:585
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr ", %d ఎంపికచేయబడెన�"
 
-#: ../modules/calendar/e-memo-shell-view.c:223
-#, fuzzy
-msgid "Delete Memos"
-msgstr "సందేశాన�ని తొలగించ�మ�(_D)"
-
-#: ../modules/calendar/e-memo-shell-view.c:225
-#, fuzzy
-msgid "Delete Memo"
-msgstr "క� ప�రతినిదిగా"
-
-#: ../modules/calendar/e-task-shell-backend.c:275
+#: ../modules/calendar/e-task-shell-backend.c:297
 msgctxt "New"
 msgid "_Task"
 msgstr "కార�యం(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:282
+#: ../modules/calendar/e-task-shell-backend.c:304
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "అప�పగించబడిన కార�తవ�యం (_d)"
 
-#: ../modules/calendar/e-task-shell-backend.c:284
+#: ../modules/calendar/e-task-shell-backend.c:306
 msgid "Create a new assigned task"
 msgstr "కొత�తగా స�థానం ఇవ�వబడ�డ కార�యాన�ని సృష�టించ�"
 
-#: ../modules/calendar/e-task-shell-backend.c:292
+#: ../modules/calendar/e-task-shell-backend.c:314
 #, fuzzy
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "కర�తవ�యం జాబితా"
 
-#: ../modules/calendar/e-task-shell-backend.c:294
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-task-shell-backend.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "Create a new task list"
 msgstr "కొత�త కార�యజాబితా న� సృష�టించ�"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:231
+#: ../modules/calendar/e-task-shell-sidebar.c:179
 msgid "Loading tasks"
 msgstr "కార�తవ�యాలన� నింప�త�ంది"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:603
+#: ../modules/calendar/e-task-shell-sidebar.c:696
 #, fuzzy
 msgid "Task List Selector"
 msgstr "కర�తవ�యం మూల ఎంపికదారి"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:908
+#: ../modules/calendar/e-task-shell-sidebar.c:1010
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s వద�ద కార�తవ�యాలన� తెర�స�తోంది"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
 msgid "Print Tasks"
 msgstr "కార�యాల� మ�ద�రించ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:563
+#: ../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"
 "Really erase these tasks?"
 msgstr ""
-"పూర�తియినట�ట� గ�ర�త�పెట�టిన అన�ని కార�తవ�యాలన� ఈ కార�యం శాశ�వతంగా తొలిగిస�త�ంది.మీర� మ�ంద�కెళీతే, ఈ "
+"పూర�తియినట�ట� గ�ర�త�పెట�టిన అన�ని కార�తవ�యాలన� ఈ కార�యం శాశ�వతంగా "
+"తొలిగిస�త�ంది.మీర� మ�ంద�కెళీతే, ఈ "
 "కర�తవ�యాలన� తిరిగి పొందలేర�\n"
 "\n"
 "ఈ కర�తవ�యాలన�ని నింజంగా తొలిగించాలా?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:688
+#: ../modules/calendar/e-task-shell-view-actions.c:590
+#, fuzzy
+msgid "Do not ask me again"
+msgstr "నన�న� మళ�ళీ అడగొద�ద�."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:708
 #, fuzzy
 msgid "_Delete Task"
 msgstr "తొలగించ�(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:695
+#: ../modules/calendar/e-task-shell-view-actions.c:715
 #, fuzzy
 msgid "_Find in Task..."
 msgstr "సందేశంలో కన�గొన�మ�(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:697
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 #, fuzzy
 msgid "Search for text in the displayed task"
 msgstr "ప�రదర�శించబడిన సందేశం మ�ఖ�యభాగమ�లో పాఠ�యమ�న� వెత�క�మ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:729
 #, fuzzy
 msgid "Copy..."
 msgstr "నకల�తీయ�(_C)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:736
 #, fuzzy
 msgid "D_elete Task List"
 msgstr "కర�తవ�యం జాబితాన� ఎంపికచేయ�మ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:718
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 #, fuzzy
 msgid "Delete the selected task list"
 msgstr "ఎంచ�క�న�న కర�తవ�యాలన� తొలగించ�మ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:723
+#: ../modules/calendar/e-task-shell-view-actions.c:743
 msgid "_New Task List"
 msgstr "కొత�త కర�తవ�యంజాబితా(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 #, fuzzy
 msgid "Refresh the selected task list"
 msgstr "ఎంచ�క�న�న కర�తవ�యాలన� తొలగించ�మ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-view-actions.c:766
 #, fuzzy
 msgid "Rename the selected task list"
 msgstr "ఎంచ�క�న�న సంచయాన�ని ప�న:నామకరణం చేయ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 #, fuzzy
 msgid "Show _Only This Task List"
 msgstr "ఈ కర�తవ�య జాబితా మాత�రమే చూప�మ�(_o)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:785
 #, fuzzy
 msgid "Mar_k as Incomplete"
 msgstr "అసంపూర�తిగా గ�ర�త�పెట�ట�(_M)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:815
 msgid "Delete completed tasks"
 msgstr "పూర�తయిన కర�తవ�యాలన� తొలగించ�మ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:870
+#: ../modules/calendar/e-task-shell-view-actions.c:890
 msgid "Task _Preview"
 msgstr "కర�తవ�య ఉపదర�శనం(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:872
+#: ../modules/calendar/e-task-shell-view-actions.c:892
 #, fuzzy
 msgid "Show task preview pane"
 msgstr "ఉపదర�శన పలకాన�ని చూపించ�మ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:893
+#: ../modules/calendar/e-task-shell-view-actions.c:913
 #, fuzzy
 msgid "Show task preview below the task list"
 msgstr "సందేశ జాబితా కింద సందేశ ఉపదర�శనాన�ని చూప�మ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:900
+#: ../modules/calendar/e-task-shell-view-actions.c:920
 #, fuzzy
 msgid "Show task preview alongside the task list"
 msgstr "సందేశ జాబితా కింద సందేశ ఉపదర�శనాన�ని చూప�మ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:908
+#: ../modules/calendar/e-task-shell-view-actions.c:928
 msgid "Active Tasks"
 msgstr "చేతనమైన కర�తవ�యాల�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-task-shell-view-actions.c:942
 msgid "Completed Tasks"
 msgstr "పూర�తయిన కర�తవ�యాల�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:929
+#: ../modules/calendar/e-task-shell-view-actions.c:949
 msgid "Next 7 Days' Tasks"
 msgstr "తర�వాతి 7 రోజ�ల' కర�తవ�యాల�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:936
+#: ../modules/calendar/e-task-shell-view-actions.c:956
 msgid "Overdue Tasks"
 msgstr "సమయంమించిన కర�తవ�యాల�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:963
 msgid "Tasks with Attachments"
 msgstr "అన�బంధాలతో కర�తవ�యాల�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:993
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "Print the list of tasks"
 msgstr "కర�తవ�యాల జాబితాన� మ�ద�రించ�మ�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1000
+#: ../modules/calendar/e-task-shell-view-actions.c:1020
 #, fuzzy
 msgid "Preview the list of tasks to be printed"
 msgstr "మ�ద�రించాల�సిన కర�తవ�యాల జాబితాన� ఉపదర�శనమిస�త�ంది "
 
-#: ../modules/calendar/e-task-shell-view-private.c:463
+#: ../modules/calendar/e-task-shell-view.c:362
+#, fuzzy
+msgid "Delete Tasks"
+msgstr "పూర�తయిన కర�తవ�యాల�"
+
+#: ../modules/calendar/e-task-shell-view.c:364
+#, fuzzy
+msgid "Delete Task"
+msgstr "క� ప�రతినిదిగా"
+
+#: ../modules/calendar/e-task-shell-view-private.c:472
 msgid "Expunging"
 msgstr "కొట�టివేయ�చ�న�నది"
 
-#: ../modules/calendar/e-task-shell-view-private.c:565
+#: ../modules/calendar/e-task-shell-view-private.c:581
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d కర�తవ�యం"
 msgstr[1] "%d కర�తవ�యాల�"
 
-#: ../modules/calendar/e-task-shell-view.c:351
-#, fuzzy
-msgid "Delete Tasks"
-msgstr "పూర�తయిన కర�తవ�యాల�"
+#: ../modules/mail/em-account-prefs.c:219
+msgid "Evolution Account Assistant"
+msgstr "ఎవాల�యూషన� ఖాతా సహాయక�డ�"
 
-#: ../modules/calendar/e-task-shell-view.c:353
-#, fuzzy
-msgid "Delete Task"
-msgstr "క� ప�రతినిదిగా"
+#: ../modules/mail/em-account-prefs.c:268
+msgid "Account Editor"
+msgstr "ఖాతా కూర�పరి"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:333
+#: ../modules/mail/e-mail-attachment-handler.c:384
 #, c-format
 msgid "%d attached messages"
 msgstr "%d అన�భందించిన సందేశమ�ల�"
 
-#. Translators: "None" for a junk hook name,
-#. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:89
-#, fuzzy
-msgctxt "mail-junk-hook"
-msgid "None"
-msgstr "�దికాద�"
-
-#: ../modules/mail/e-mail-shell-backend.c:169
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "తపాలా సందేశం (_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:171
+#: ../modules/mail/e-mail-shell-backend.c:197
 msgid "Compose a new mail message"
 msgstr "కొత�త మెయిల� సందేశం న� కూర�చ�మ�"
 
-#: ../modules/mail/e-mail-shell-backend.c:179
+#: ../modules/mail/e-mail-shell-backend.c:205
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "మెయిల� ఫోల�డర� (_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:181
+#: ../modules/mail/e-mail-shell-backend.c:207
 msgid "Create a new mail folder"
 msgstr "కొత�త మెయిల� సంచయంన� సృష�టించ�మ�"
 
-#: ../modules/mail/e-mail-shell-backend.c:200
+#: ../modules/mail/e-mail-shell-backend.c:412
 msgid "Mail Accounts"
 msgstr "మెయిల� ఖాతాల�"
 
-#: ../modules/mail/e-mail-shell-backend.c:208
+#: ../modules/mail/e-mail-shell-backend.c:420
 msgid "Mail Preferences"
 msgstr "మెయిల� అభీష�టాల�"
 
-#: ../modules/mail/e-mail-shell-backend.c:216
+#: ../modules/mail/e-mail-shell-backend.c:428
 msgid "Composer Preferences"
 msgstr "కూర�పరి అభీష�టాల�"
 
-#: ../modules/mail/e-mail-shell-backend.c:224
+#: ../modules/mail/e-mail-shell-backend.c:436
 msgid "Network Preferences"
 msgstr "నెట�వర�క�� అభీష�టాల�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:820
-#: ../modules/mail/e-mail-shell-view.c:870
+#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view.c:960
 #, fuzzy
 msgid "_Disable Account"
 msgstr "ఖాతాన� అచేతనంచేయ�మ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:822
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
 #, fuzzy
 msgid "Disable this account"
 msgstr "ఖాతాన� అచేతనంచేయ�మ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:829
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 #, fuzzy
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "తొలగించిన సందేశాలని అన�ని సంచయాల న�ండి శాశ�వతంగా తీసివేయ�మ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:834
-msgid "C_reate Search Folder From Search..."
-msgstr "శోధన కొరక� శోధన సంచయాన�ని సృష�టించ�మ�(_r)..."
-
-#: ../modules/mail/e-mail-shell-view-actions.c:841
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "_Download Messages for Offline Usage"
 msgstr "ఆఫ�‌లైన� వ�పయోగమ�ల కొరక� సందేశాల న� దిగ�మతిచేయ�మ� (_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:843
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 #, fuzzy
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "ఆఫ�‌లైన� కొరక� గ�ర�త�ంచిన ఖాతాల/సంచయాల యొక�క సందేశాలన� దిగ�మతి చేయ�మ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:848
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
 msgid "Fl_ush Outbox"
 msgstr "అవ�ట�‌బాక�స�  న� త�డిచివేయ�మ�(_u)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "_Copy Folder To..."
 msgstr "సంచయాన�ని ఇక�కడికి నకల� తీయ�మ�(_C)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "Copy the selected folder into another folder"
 msgstr "ఎంచ�క�న�న సంచయాన�ని వేరే సంచయానికి నకల� తీయ�మ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Permanently remove this folder"
 msgstr "శాశ�వతంగా ఈ సంచయాన�ని తొలగించ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
 msgid "E_xpunge"
 msgstr "కొట�టివేయ�మ�(_x)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:871
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "తొలగించిన సందేశాలన� ఈ సంచయమ� న�ండి శాశ�వతంగా తీసివేయ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "Mar_k All Messages as Read"
 msgstr "అన�ని సందేశాలని చదివినవిగా గ�ర�త� పెట�ట�మ�(_k)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Mark all messages in the folder as read"
 msgstr "సంచయంలోనిఅన�ని సందేశాలని చదివినవిగా గ�ర�త� పెట�ట�మ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
 msgid "_Move Folder To..."
 msgstr "సంచయం న� ఇక�కడికి జర�ప�మ�(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:885
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "Move the selected folder into another folder"
 msgstr "ఎంచ�క�న�న సంచయాన�ని వేరే సంచయం లోకి జర�ప�మ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "_New..."
 msgstr "కొత�త(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "Create a new folder for storing mail"
 msgstr "మెయిల� దాయ�టక� కొత�త సంచయాన�ని సృష�టించ�మ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "Change the properties of this folder"
 msgstr "ఈ సంచయ లక�షణాలన� మార�చ�మ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "Refresh the folder"
 msgstr "సంచయాన�ని ప�నర�వికాసపర�చ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "Change the name of this folder"
 msgstr "ఈ సంచయ నామాన�ని మార�చ�మ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
 msgid "Select Message _Thread"
 msgstr "సందేశం తంతిని ఎంపికచేయ�మ�(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 msgid "Select all messages in the same thread as the selected message"
 msgstr "ఎంపికచేసిన సందేశం లాగా అదే తంతిలోని అన�ని సందేశాలన� ఎంపికచేయ�మ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
 msgid "Select Message S_ubthread"
 msgstr "సందేశం ఉపతంతిని ఎంపికచేయ�మ�(_u)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "Select all replies to the currently selected message"
 msgstr "ప�రస�త�తం ఎంచ�కోబడని సందేశంక� అన�ని ప�రత�య�త�తరమ�లన� ఎంచ�కొన�మ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:932
-msgid "_Unsubscribe"
-msgstr "చందావిరమించ�మ�(_U)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:934
-#, fuzzy
-msgid "Unsubscribe from the selected folder"
-msgstr "ఎంచ�క�న�న సంచయాన�ని ప�న:నామకరణం చేయ�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:939
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
 msgid "Empty _Trash"
 msgstr "చెత�తన� ఖాళీ చేయ�(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 #, fuzzy
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "తొలగించిన సందేశాలని అన�ని సంచయాల న�ండి శాశ�వతంగా తీసివేయ�మ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
 msgid "_New Label"
 msgstr "కొత�త లేబ�ల�(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
 #, fuzzy
 msgid "N_one"
 msgstr "�దికాద�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
+#, fuzzy
+#| msgid "_Subscriptions..."
+msgid "_Manage Subscriptions"
+msgstr "చందాల�... (_S)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "దూరస�థ సేవికల సంచయాల తో చందాదార�కండి లేదా చందావిరమించ�కోండి"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
+msgid "Send / _Receive"
+msgstr "పంప�మ�/తీస�కొన�మ�(_R)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
+msgid "Send queued items and retrieve new items"
+msgstr "వర�సపర�చిన అంశాలన� పంప� మరియ� కొత�త అంశాలన� వెలికితీయ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#, fuzzy
+#| msgid "Received"
+msgid "R_eceive All"
+msgstr "తీస�కోబడిం"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#, fuzzy
+msgid "Receive new items from all accounts"
+msgstr "తొలగించిన సందేశాలని అన�ని సంచయాల న�ండి శాశ�వతంగా తీసివేయ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#, fuzzy
+#| msgid "_Send"
+msgid "_Send All"
+msgstr "పంప�మ�(_S)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#, fuzzy
+#| msgid "Send queued items and retrieve new items"
+msgid "Send queued items in all accounts"
+msgstr "వర�సపర�చిన అంశాలన� పంప� మరియ� కొత�త అంశాలన� వెలికితీయ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../widgets/misc/e-activity-proxy.c:310
+msgid "Cancel"
+msgstr "రద�ద�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
 msgid "Cancel the current mail operation"
 msgstr "ప�రస�త�త మెయిల�  కార�యమ�న� రద�ద�చేయ�మ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:983
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Collapse All _Threads"
 msgstr "అన�ని తంత�లన� కూల�చ�త�ంది(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "Collapse all message threads"
 msgstr "అన�ని సందేశ తంత�లన� కూల�చ�త�ంది"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
 msgid "E_xpand All Threads"
 msgstr "అన�ని తంత�లన� విస�తరించ�మ�(_x)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:992
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
 msgid "Expand all message threads"
 msgstr "సందేశం అన�ని తంత�లన� వస�తరింప�మ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
 msgid "_Message Filters"
 msgstr "సందేశం వడపోతల�(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:999
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "Create or edit rules for filtering new mail"
 msgstr "కొత�త మెయిల� న� వడపోయ�టక� నియమాలన� సృష�టించ�మ� లేదా సరిచేయ�మ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
-msgid "Search F_olders"
-msgstr "సంచయాలన� వెత�క�మ�(_o)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
-#, fuzzy
-msgid "Create or edit search folder definitions"
-msgstr "వెత�క� సంచయం నిర�వచనాలన� సృష�టించ� లేదా సరిచేయ�మ�"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
 msgid "_Subscriptions..."
 msgstr "చందాల�... (_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "దూరస�థ సేవికల సంచయాల తో చందాదార�కండి లేదా చందావిరమించ�కోండి"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1020
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "F_older"
 msgstr "సంచయం(_o)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1027
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
 msgid "_Label"
 msgstr "లెబ�ల�(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1367
+msgid "C_reate Search Folder From Search..."
+msgstr "అన�వేషణ కొరక� అన�వేషణ సంచయాన�ని సృష�టించ�మ�(_r)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1374
+msgid "Search F_olders"
+msgstr "సంచయాలన� వెత�క�మ�(_o)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#, fuzzy
+msgid "Create or edit search folder definitions"
+msgstr "వెత�క� సంచయం నిర�వచనాలన� సృష�టించ� లేదా సరిచేయ�మ�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1407
 msgid "_New Folder..."
 msgstr "కొత�త సంచయం(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1091
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
 msgid "Show Message _Preview"
 msgstr "సందేశ ఉపదర�శనాన�ని చూప�మ�(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1093
+#: ../modules/mail/e-mail-shell-view-actions.c:1437
 #, fuzzy
 msgid "Show message preview pane"
 msgstr "సందేశ ఉపదర�శన గవాక�షాన�ని చూప�మ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 #, fuzzy
 msgid "Show _Deleted Messages"
 msgstr "తొలగించిన సందేశాలన� అదృశ�యపర�చ�మ�(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1101
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
 #, fuzzy
 msgid "Show deleted messages with a line through them"
 msgstr "సందేశ-జాబితా నంద� తొలగించిన సందేశాలన� (కొట�టివేత తో) చూప�మ�."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1107
+#: ../modules/mail/e-mail-shell-view-actions.c:1451
 msgid "_Group By Threads"
 msgstr "సమూహం ద�వారా తంత�ల�(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1109
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
 #, fuzzy
 msgid "Threaded message list"
 msgstr "తంతీకరణ సందేశ జాబితా"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1130
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
 msgid "Show message preview below the message list"
 msgstr "సందేశ జాబితా కింద సందేశ ఉపదర�శనాన�ని చూప�మ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1137
+#: ../modules/mail/e-mail-shell-view-actions.c:1481
 #, fuzzy
 msgid "Show message preview alongside the message list"
 msgstr "సందేశ జాబితా కింద సందేశ ఉపదర�శనాన�ని చూప�మ�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1489
 msgid "All Messages"
 msgstr "అన�ని సందేశాల�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1152
+#: ../modules/mail/e-mail-shell-view-actions.c:1496
 msgid "Important Messages"
 msgstr "మ�ఖ�యమైన సందేశాల�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1503
 msgid "Last 5 Days' Messages"
 msgstr "గత 5 రోజ�ల' సందేశాల�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1510
 msgid "Messages Not Junk"
 msgstr "నిరర�ధకమ�కాని సందేశాల�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1517
 msgid "Messages with Attachments"
 msgstr "అన�భందమ�లతో సందేశాల�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1524
 msgid "No Label"
 msgstr "లేబ�ల� లేద�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1531
 msgid "Read Messages"
 msgstr "చదివిన సందేశాల�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1538
 msgid "Recent Messages"
 msgstr "ఇటీవలి సందేశాల�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
 msgid "Unread Messages"
 msgstr "చద�వని సందేశాల�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1253
+#: ../modules/mail/e-mail-shell-view-actions.c:1597
 #, fuzzy
 msgid "Subject or Addresses contain"
 msgstr "ఇది కలిగివ�న�న సంగతి లేదా చిర�నామాల�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1263
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "All Accounts"
 msgstr "అన�ని ఖాతాల�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1270
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Current Account"
 msgstr "ప�రస�త�త ఖాతా"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1277
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Current Folder"
 msgstr "ప�రస�త�త సంచయం"
 
-#: ../modules/mail/e-mail-shell-view-private.c:936
+#: ../modules/mail/e-mail-shell-view.c:563
+msgid "All Account Search"
+msgstr "అన�ని ఖాతాల అన�వేషణ"
+
+#: ../modules/mail/e-mail-shell-view.c:736
+msgid "Account Search"
+msgstr "ఖాతా అన�వేషణ"
+
+#: ../modules/mail/e-mail-shell-view.c:958
+msgid "Proxy _Logout"
+msgstr "ప�రాక�సీ లాగ�అవ�ట�(_L)"
+
+#: ../modules/mail/e-mail-shell-view-private.c:997
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d ఎంపికచేయబడెన�, "
 msgstr[1] "%d ఎంపికచేయబడెన�, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:947
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d తొలగించబడెన�"
 msgstr[1] "%d తొలగించబడెన�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:953
-#: ../modules/mail/e-mail-shell-view-private.c:960
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d నిరర�ధకమైన"
 msgstr[1] "%d నిరర�ధకమైన"
 
-#: ../modules/mail/e-mail-shell-view-private.c:966
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d డ�రాఫ�ట�స�"
 msgstr[1] "%d డ�రాఫ�ట�స�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:972
+#: ../modules/mail/e-mail-shell-view-private.c:1033
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d పంపని"
 msgstr[1] "%d పంపని"
 
-#: ../modules/mail/e-mail-shell-view-private.c:978
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d పంపిన"
 msgstr[1] "%d పంపిన"
 
-#: ../modules/mail/e-mail-shell-view-private.c:990
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d చదవని, "
 msgstr[1] "%d చదవని, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:993
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d మొత�తం"
 msgstr[1] "%d మొత�తం"
 
-#: ../modules/mail/e-mail-shell-view.c:548
-msgid "All Account Search"
-msgstr "అన�ని ఖాతాల శోధన"
-
-#: ../modules/mail/e-mail-shell-view.c:675
-msgid "Account Search"
-msgstr "ఖాతా శోధన"
-
-#: ../modules/mail/e-mail-shell-view.c:868
-msgid "Proxy _Logout"
-msgstr "ప�రాక�సీ లాగ�అవ�ట�(_L)"
-
-#: ../modules/mail/em-account-prefs.c:129
-msgid "Evolution Account Assistant"
-msgstr "ఎవాల�యూషన� ఖాతా సహాయక�డ�"
+#: ../modules/mail/e-mail-shell-view-private.c:1074
+#, fuzzy
+#| msgid "Task"
+msgid "Trash"
+msgstr "కార�యం"
 
-#: ../modules/mail/em-account-prefs.c:178
-msgid "Account Editor"
-msgstr "ఖాతా కూర�పరి"
+#: ../modules/mail/e-mail-shell-view-private.c:1542
+msgid "Send / Receive"
+msgstr "పంప�మ�/తీస�కొన�మ�"
 
-#: ../modules/mail/em-composer-prefs.c:498
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
+#: ../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
 msgid "Enabled"
 msgstr "క�రియాశీలీకరించిన"
 
-#: ../modules/mail/em-composer-prefs.c:502
+#: ../modules/mail/em-composer-prefs.c:499
 msgid "Language(s)"
 msgstr "భాష(ల�)"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "ప�రతి సారి"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "రోజ�క� ఒక సారి"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "వారమ�నక� ఒక సారి"
 
-#: ../modules/mail/em-mailer-prefs.c:100
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "నెలక� ఒక సారి"
 
-#: ../modules/mail/em-mailer-prefs.c:225
-msgid "Add Custom Junk Header"
-msgstr "మ�ల�చ�క�న�న నిరర�దకప� పీఠికన� జతచేయ�మ�"
-
-#: ../modules/mail/em-mailer-prefs.c:233
-msgid "Header Name:"
-msgstr "పీఠిక నామమ�:"
-
-#: ../modules/mail/em-mailer-prefs.c:234
-msgid "Header Value Contains:"
-msgstr "పీఠిక విల�వ కలిగిఉండ�న�:"
-
-#: ../modules/mail/em-mailer-prefs.c:334
+#: ../modules/mail/em-mailer-prefs.c:293
 msgid "Header"
 msgstr "పీఠిక"
 
-#: ../modules/mail/em-mailer-prefs.c:338
+#: ../modules/mail/em-mailer-prefs.c:297
 msgid "Contains Value"
 msgstr "కలిగిఉండ� విల�వ"
 
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:802
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "%s ప�లగ�ఇన� అంద�బాట�లోఉంది మరియ� బైనరీ సంస�థాపించబడెన�."
-
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:739 ../modules/mail/em-mailer-prefs.c:811
-#, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
-msgstr "%s ప�లగ�ఇన� అంద�బాట�లో లేద�. దయచేసి ప�యాకేజి సంస�థాపించబడిందేమో పరీక�షించండి."
-
-#: ../modules/mail/em-mailer-prefs.c:775
-#, fuzzy
-msgid "No junk plugin available"
-msgstr "� నిరర�ధక ప�లగ�ఇన� అంద�బాట�లో లేద�"
-
 #. 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:1167
+#: ../modules/mail/em-mailer-prefs.c:1051
 #, fuzzy
 msgid "_Date header:"
 msgstr "తేదీ పీఠిక:"
 
-#: ../modules/mail/em-mailer-prefs.c:1168
+#: ../modules/mail/em-mailer-prefs.c:1052
 #, fuzzy
 msgid "Show _original header value"
 msgstr "వాస�తవ పరిమాణంన� చూప�మ�(_O)"
@@ -16220,20 +16567,87 @@ msgstr "ఎవాలà±�యూషనà±� à°…à°ªà±�రమేయ మెయిలరà
 #: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
-msgstr "ఎవాల�యూషన� ప�రారంభమైనప�ప�డ� , అది అప�రమేయంగా మెయిల� చూపించ�నదో కాదా పరిశీలించ�మ�."
+msgstr ""
+"ఎవాల�యూషన� ప�రారంభమైనప�ప�డ� , అది అప�రమేయంగా మెయిల� చూపించ�నదో కాదా "
+"పరిశీలించ�మ�."
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:138
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
 #, fuzzy
 msgid "Do you want to make Evolution your default email client?"
-msgstr "మీర� ఎవాల�యూషన� న� మీ అప�రమేయ ఇ-మెయిల� కక�షిదారిగా చేద�దామన�క�ంట�న�నారా?"
+msgstr ""
+"మీర� ఎవాల�యూషన� న� మీ అప�రమేయ ఇ-మెయిల� కక�షిదారిగా చేద�దామన�క�ంట�న�నారా?"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Hello Python"
-msgstr "హెల�లో పైథాన�"
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+msgid "Click 'Work Online' to return to online mode."
+msgstr ""
 
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Python Plugin Loader tests"
-msgstr "పైథాన� ప�లగ�ఇన� లోడర� పరిశీలనల�"
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
+#, fuzzy
+msgid "Evolution is currently offline due to a network outage."
+msgstr ""
+"ఎవల�యూషన� ప�రస�త�తం ఆఫ�‌లైన�లో వ�ంది.\n"
+"ఆన�‌లైన�లో పనిచేయడానికి ఈ బొత�తమ�న� నొక�కండి."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
+#, fuzzy
+msgid "Evolution is currently offline."
+msgstr "ఆఫ�‌లైన� రీతినంద� ప�రారంభించ�మ�"
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
+#, fuzzy
+msgid ""
+"Evolution will return to online mode once a network connection is "
+"established."
+msgstr ""
+"ఎవల�యూషన� ప�రస�త�తం ఆఫ�‌లైన�లో వ�ంది.\n"
+"ఆన�‌లైన�లో పనిచేయడానికి ఈ బొత�తమ�న� నొక�కండి."
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an authentication token."
+msgstr ""
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+#, fuzzy
+#| msgid "Other"
+msgid "OAuth"
+msgstr "ఇతరమ�ల�"
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+msgid ""
+"This option will connect to the server by way of the GNOME Online Accounts "
+"service"
+msgstr ""
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:70
+msgid "Author(s)"
+msgstr "ఆథర�(ల�)"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:256
+msgid "Plugin Manager"
+msgstr "ప�లగ�గిన� అభికర�త"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:271
+msgid "Note: Some changes will not take effect until restart"
+msgstr "గమనిక: ప�నఃప�రారంభించ� నంతవరక� కొన�ని మార�ప�ల� ప�రభావితం కావ�"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:300
+msgid "Overview"
+msgstr "అవలోకనం"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:369
+#: ../modules/plugin-manager/evolution-plugin-manager.c:452
+msgid "Plugin"
+msgstr "ప�లగ�ఇన�"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:490
+msgid "_Plugins"
+msgstr "ప�లగ�ఇన�స�(_P)"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:491
+msgid "Enable and disable plugins"
+msgstr "ప�లగ�ఇన�స� న� చేతనం మరియ� అచేతనం చేయ�మ�"
 
 #: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
 msgid "Python Test Plugin"
@@ -16243,51 +16657,127 @@ msgstr "పైథాన� పరిశీలనా ప�లగ�ఇన�"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "పైథాన� ఈప�లగ�ఇన� లోడర� కొరక� పరిశీలనా ప�లగ�ఇన�."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:270
-#: ../widgets/misc/e-import-assistant.c:389
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "హెల�లో పైథాన�"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "పైథాన� ప�లగ�ఇన� లోడర� పరిశీలనల�"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:191
+#, c-format
+msgid "Failed to spawn SpamAssassin (%s): "
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:214
+#, fuzzy
+#| msgid "Filter junk messages using SpamAssassin."
+msgid "Failed to stream mail message content to SpamAssassin: "
+msgstr "SpamAssassin వ�పయోగించి నిరర�దక సందేశమ�లన� వడపోయ�న�."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:233
+#, fuzzy, c-format
+#| msgid "Failed to send %d of %d messages"
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "%2$d యొక�క %1$d సందేశాలన� పంప�టలో విఫలమైంది"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:261
+msgid "Failed to read output from SpamAssassin: "
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:316
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:835
+msgid "SpamAssassin Options"
+msgstr "SpamAssassin �చ�చికాల�"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:850
+msgid "I_nclude remote tests"
+msgstr "ద�రస�థ పరిశీలనలన� చేర�చ�త�ంది(_n)"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:864
+#, fuzzy
+#| msgid "This will make SpamAssassin more reliable, but slower"
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr "ఇది స�పామ�‌యెస�సాసిన�‌న� నమ�మదగినదిగా చేస�త�ంది, అయితే నిదానమైనది"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:1073
+#, fuzzy
+#| msgid "SpamAssassin Options"
+msgid "SpamAssassin"
+msgstr "SpamAssassin �చ�చికాల�"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use SpamAssassin daemon and client"
+msgstr "స�పామ�ఎస�సైన� డెమోన� మరియ� కక�షిదార�న� ఉపయోగించ�మ�"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "స�పామ�ఎస�సైన� డెమోన� మరియ� కక�షిదార� (spamc/spamd)న� వ�పయోగించ�మ�."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
+msgid "Use only local spam tests."
+msgstr "స�థానిక స�పామ� పరిశీలనలన� మాత�రమే ఉపయోగించ�మ�."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
+msgid "Use only the local spam tests (no DNS)."
+msgstr "స�థానిక స�పామ� పరిశీలనలన� మాత�రమే పరిశీలించ�మ� (DNS కాద�)."
+
+#: ../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 "మీర� దిగ�మతి చేయ�టక� ఇష�టపడే సమాచారాన�ని దయచేసి ఎంచ�కొన�మ�:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:302
-#: ../widgets/misc/e-import-assistant.c:545
+#: ../modules/startup-wizard/evolution-startup-wizard.c:312
+#: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "%s న�ండి:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:313
-#: ../modules/startup-wizard/evolution-startup-wizard.c:410
+#: ../modules/startup-wizard/evolution-startup-wizard.c:323
+#: ../modules/startup-wizard/evolution-startup-wizard.c:421
 #, fuzzy
 msgid "Importing Files"
 msgstr "దస�త�రాలన� దిగ�మతిచేస�తోంది"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:388
+#: ../modules/startup-wizard/evolution-startup-wizard.c:399
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr ""
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:406
+#: ../modules/startup-wizard/evolution-startup-wizard.c:417
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr ""
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:466
+#: ../modules/startup-wizard/evolution-startup-wizard.c:497
 msgid "Evolution Setup Assistant"
 msgstr "ఎవాల�యూషన� అమర�ప� సహాయకి"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:472
+#: ../modules/startup-wizard/evolution-startup-wizard.c:503
 msgid "Welcome"
 msgstr "స�వాగతం"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+#: ../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"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"ఎవాల�యూషన� క� స�వాగతం. తర�వాతి కొన�ని తెరల� ఎవాల�యూషన� న� మీ ఈమెయిల� ఖాతాలక� అన�సందానించ�టక� "
+"ఎవాల�యూషన� క� స�వాగతం. తర�వాతి కొన�ని తెరల� ఎవాల�యూషన� న� మీ ఈమెయిల� ఖాతాలక� "
+"అన�సందానించ�టక� "
 "అన�మతిస�తాయి, మరియ� ఇతర అన�వర�తనంల న�ండి దస�త�రాలన� దిగ�మతికి.\n"
 "\n"
 "దయచేసి \"మ�ంద�క�పంప�\" బటన� న� కొనసాగించ�టక� నొక�క�మ�. "
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:613
+#, fuzzy
+#| msgid "Loading..."
+msgid "Loading accounts..."
+msgstr "నింపబడ�త�న�న..."
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "స�థానిక చిర�నామా ప�స�తకమ�లన� ఎవాల�యూషన�‌క� జతచేయి."
@@ -16302,8 +16792,12 @@ msgid ""
 "body"
 msgstr "ఆన�భందంన� గ�ర�త�చేయ� ప�లగ�ఇన� సందేశం బాడీ నంద� చూడ�టక� అనవాళ�ళ జాబితా"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:451
-#: ../plugins/templates/templates.c:409
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
+msgid "_Do not show this message again."
+msgstr "ఈ సందేశంన� మళ�ళీ చూపవద�ద� (_D)."
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:464
+#: ../plugins/templates/templates.c:462
 msgid "Keywords"
 msgstr "కీపదాల�"
 
@@ -16312,7 +16806,8 @@ msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
 msgstr ""
-"ఈ సందేశం ఒక అన�భందాన�ని కలిగిఉంది అని సూచించే కొన�ని కీపదాలన� ఎవాల�యూషన� కన�గొంది, అయితే అన�భందాన�ని "
+"ఈ సందేశం ఒక అన�భందాన�ని కలిగిఉంది అని సూచించే కొన�ని కీపదాలన� ఎవాల�యూషన� "
+"కన�గొంది, అయితే అన�భందాన�ని "
 "కన�గొనలేకపోయింది."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
@@ -16320,7 +16815,9 @@ msgid "Message has no attachments"
 msgstr "సందేశం � అన�భందాలన� కలిగిలేద�"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-msgid "_Add attachment..."
+#, fuzzy
+#| msgid "_Add attachment..."
+msgid "_Add Attachment..."
 msgstr "అన�భందంన� జతపర�చ�మ�(_A)..."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
@@ -16333,7 +16830,8 @@ msgstr "అన�బంధం న� గ�ర�త�చేయ�నది"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
 msgid "Reminds you when you forgot to add an attachment to a mail message."
-msgstr "మెయిల� సందేశమ�నక� అన�భందమ�న� జతచేయ�ట మీర� మరచినప�ప�డ� మీక� గర�త�చేస�త�ంది."
+msgstr ""
+"మెయిల� సందేశమ�నక� అన�భందమ�న� జతచేయ�ట మీర� మరచినప�ప�డ� మీక� గర�త�చేస�త�ంది."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 #, fuzzy
@@ -16345,259 +16843,295 @@ msgstr "ఇన�‌లైన� vకార�డ�ల�"
 msgid "Play audio attachments directly in mail messages."
 msgstr "ఆడియో అన�భందమ�లన� నేర�గా ఎవాల�యూషన� న�ండి ప�లే చేయ�మ�."
 
-#: ../plugins/backup-restore/backup-restore.c:160
+#: ../plugins/backup-restore/backup-restore.c:192
 msgid "Select name of the Evolution backup file"
-msgstr "ఎవాల�యూషన� బ�యాక�అప� దస�త�రం యొక�క నామమ�న� ఎంపికచేయ�మ�"
+msgstr "ఎవాల�యూషన� బ�యాక�అప� ఫైల� యొక�క పేర�న� ఎంపికచేయ�మ�"
 
-#: ../plugins/backup-restore/backup-restore.c:191
+#: ../plugins/backup-restore/backup-restore.c:225
 msgid "_Restart Evolution after backup"
 msgstr "బ�యాక�అప� తర�వాత ఎవాల�యూషన� న� ప�నఃప�రారంభించ�మ�(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:217
+#: ../plugins/backup-restore/backup-restore.c:251
 msgid "Select name of the Evolution backup file to restore"
-msgstr "ఎవాల�యూషన� బ�యాక�అప� దస�త�రం యొక�క నామమ�న� తిరిగినిల�వఉంచ�టక� ఎంపికచేయ�మ�"
+msgstr "ఎవాల�యూషన� బ�యాక�అప� ఫైల� యొక�క పేర�న� తిరిగినిల�వఉంచ�టక� ఎంపికచేయ�మ�"
 
-#: ../plugins/backup-restore/backup-restore.c:230
+#: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restart Evolution after restore"
 msgstr "ఎవాల�యూషన� న� తిరిగినిల�వ చేసినతర�వాత ప�నఃప�రారంభిచ�మ�(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:298
+#: ../plugins/backup-restore/backup-restore.c:337
 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 ""
-"మీర� ఎవాల�యూషన� మీ బ�యాక�అప� న�ండి తిరిగినిల�వ చేస�కొనవచ�చ�. ఇది అన�ని మెయిల�స�, క�యాలెండర�ల�, కర�తవ�యాల�, "
-"మెమోస�, పరిచయాలన� తిరిగినిల�వచేస�త�ంది.ఇది మీ వ�యక�తిగత అమరికల�, మెయిల� వడపోతల� మెద. వాటిని తిరిగినిల�వ "
+"మీర� ఎవాల�యూషన� మీ బ�యాక�అప� న�ండి తిరిగినిల�వ చేస�కొనవచ�చ�. ఇది అన�ని "
+"మెయిల�స�, క�యాలెండర�ల�, కర�తవ�యాల�, "
+"మెమోస�, పరిచయాలన� తిరిగినిల�వచేస�త�ంది.ఇది మీ వ�యక�తిగత అమరికల�, మెయిల� "
+"వడపోతల� మెద. వాటిని తిరిగినిల�వ "
 "ఉంచ�త�ంది."
 
-#: ../plugins/backup-restore/backup-restore.c:305
+#: ../plugins/backup-restore/backup-restore.c:344
 msgid "_Restore Evolution from the backup file"
 msgstr "ఎవాల�యూషన�‌న� బ�యాక�అప� దస�త�రమ�లన�ండి తిరిగినిల�వ చేయ�మ� (_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:312
+#: ../plugins/backup-restore/backup-restore.c:351
 msgid "Please select an Evolution Archive to restore:"
 msgstr "దయచేసి ఒక ఎవాల�యూషన� ఆర�చివ�‌న� తిరిగినిల�వచేయ�టక� ఎంచ�కొన�మ�:"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:354
 msgid "Choose a file to restore"
-msgstr "తిరిగినిల�వఉంచ�కొన�టక� ఒక దస�త�రాన�ని ఎంచ�కొన�మ�"
+msgstr "తిరిగినిల�వఉంచ�కొన�టక� ఒక ఫైల�న� ఎంచ�కొన�మ�"
 
-#: ../plugins/backup-restore/backup-restore.c:323
+#: ../plugins/backup-restore/backup-restore.c:362
 msgid "Restore from backup"
 msgstr "బ�యాక�అప� న�ండి తిరిగినిల�వఉంచ�మ�"
 
-#: ../plugins/backup-restore/backup-restore.c:361
+#: ../plugins/backup-restore/backup-restore.c:402
 #, fuzzy
-msgid "_Backup Evolution Settings..."
-msgstr "బ�యాక�అప� అమరికల�(_B)..."
+#| msgid "Backing up Evolution Data"
+msgid "_Back up Evolution Data..."
+msgstr "ఎవాల�యూషన� డాటాన� బ�యాక�అప� తీస�త�ంది"
 
-#: ../plugins/backup-restore/backup-restore.c:363
+#: ../plugins/backup-restore/backup-restore.c:404
 #, fuzzy
-msgid "Backup Evolution data and settings to an archive file"
+msgid "Back up Evolution data and settings to an archive file"
 msgstr "ఎవాల�యూషన� డాటా మరియ� అమరికలన� బ�యాక�అప� మరియ� తిరిగినిల�వఉంచ�మ�"
 
-#: ../plugins/backup-restore/backup-restore.c:368
+#: ../plugins/backup-restore/backup-restore.c:409
 #, fuzzy
-msgid "R_estore Evolution Settings..."
-msgstr "అమరికలన� తిరిగినిల�వఉంచ�(_e)..."
+#| msgid "Restoring Evolution Data"
+msgid "R_estore Evolution Data..."
+msgstr "ఎవాల�యూషన� డాటాన� తిరిగివ�ంచ�తోంది"
 
-#: ../plugins/backup-restore/backup-restore.c:370
+#: ../plugins/backup-restore/backup-restore.c:411
 #, fuzzy
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "ఎవాల�యూషన� డాటా మరియ� అమరికలన� బ�యాక�అప� మరియ� తిరిగినిల�వఉంచ�మ�"
 
-#: ../plugins/backup-restore/backup.c:63
-msgid "Backup Evolution directory"
+#: ../plugins/backup-restore/backup.c:77
+#, fuzzy
+#| msgid "Backup Evolution directory"
+msgid "Back up Evolution directory"
 msgstr "ఎవాల�యూషన� సంచయాన�ని బ�యాక�అప� తీయ�మ�"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:79
 msgid "Restore Evolution directory"
 msgstr "ఎవాల�యూషన� సంచయాన�ని తిరిగినిల�వఉంచ�మ�"
 
-#: ../plugins/backup-restore/backup.c:67
-msgid "Check Evolution Backup"
+#: ../plugins/backup-restore/backup.c:81
+#, fuzzy
+#| msgid "Check Evolution Backup"
+msgid "Check Evolution Back up"
 msgstr "ఎవాల�యూషన� బ�యాక�అప�‌న� పరిశీలించ�మ�"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:83
 msgid "Restart Evolution"
 msgstr "ఎవల�యూషన� న� ప�న:ప�రారంభించ�"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:85
 msgid "With Graphical User Interface"
 msgstr "చిత�రసంభంద వినియోగదారి ఇంటర�‌ఫేస� తో"
 
-#: ../plugins/backup-restore/backup.c:189
-#: ../plugins/backup-restore/backup.c:251
+#. FIXME Will the versioned setting always work?
+#: ../plugins/backup-restore/backup.c:299
+#: ../plugins/backup-restore/backup.c:418
 msgid "Shutting down Evolution"
 msgstr "ఎవల�యూషన� న� మూయ�మ�"
 
-#: ../plugins/backup-restore/backup.c:196
+#: ../plugins/backup-restore/backup.c:308
 msgid "Backing Evolution accounts and settings"
 msgstr "ఎవాల�యూషన� ఖాతాలన� మరియ� అమరికలన� వెన�కక�తెస�తోంది"
 
-#: ../plugins/backup-restore/backup.c:202
+#: ../plugins/backup-restore/backup.c:318
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr "ఎవాల�యూషన� డాటాన� వెన�కక� తెస�తోంది (మెయిల�స�, పరిచయాల�, క�యాలెండర�, కర�తవ�యాల�, మెమోస�)"
+msgstr ""
+"ఎవాల�యూషన� డాటాన� వెన�కక� తెస�తోంది (మెయిల�స�, పరిచయాల�, క�యాలెండర�, "
+"కర�తవ�యాల�, మెమోస�)"
 
-#: ../plugins/backup-restore/backup.c:213
-msgid "Backup complete"
+#: ../plugins/backup-restore/backup.c:331
+#, fuzzy
+#| msgid "Backup complete"
+msgid "Back up complete"
 msgstr "బ�యాక�అప� పూర�తిఅయినది"
 
-#: ../plugins/backup-restore/backup.c:218
-#: ../plugins/backup-restore/backup.c:239
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:527
 msgid "Restarting Evolution"
 msgstr "ఎవాల�యూషన� న� ప�నఃప�రారంభిస�త�న�నది"
 
-#: ../plugins/backup-restore/backup.c:255
+#: ../plugins/backup-restore/backup.c:424
 #, fuzzy
 msgid "Back up current Evolution data"
 msgstr "ప�రస�త�త ఎవాల�యూషన� డాటాన� బ�యాక�అప� తీస�తోంది"
 
-#: ../plugins/backup-restore/backup.c:260
-msgid "Extracting files from backup"
+#: ../plugins/backup-restore/backup.c:432
+#, fuzzy
+#| msgid "Extracting files from backup"
+msgid "Extracting files from back up"
 msgstr "దస�త�రాలన� బ�యాక�అప� న�ండి బయటక�తీస�తోంది"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:491
 msgid "Loading Evolution settings"
 msgstr "ఎవాల�యూషన� అమరికలన� నింప�తోంది"
 
-#: ../plugins/backup-restore/backup.c:274
-msgid "Removing temporary backup files"
+#: ../plugins/backup-restore/backup.c:508
+#, fuzzy
+#| msgid "Removing temporary backup files"
+msgid "Removing temporary back up files"
 msgstr "తాత�కాలికంగా దాయబడిన దస�త�రాలన� తొలగిస�త�న�నది"
 
-#: ../plugins/backup-restore/backup.c:281
+#: ../plugins/backup-restore/backup.c:520
 msgid "Ensuring local sources"
 msgstr "స�థానిక మూలాలన� ఖచ�చితపర�స�త�ంది"
 
-#: ../plugins/backup-restore/backup.c:428
+#: ../plugins/backup-restore/backup.c:707
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "ఫోల�డర� %sక� బ�యాక�అప� తీస�త�ంది"
 
-#: ../plugins/backup-restore/backup.c:433
+#: ../plugins/backup-restore/backup.c:712
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "%s సంచయం న�ండి తిరిగినిల�వచేస�తోంది"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:455
-msgid "Evolution Backup"
+#: ../plugins/backup-restore/backup.c:736
+#, fuzzy
+#| msgid "Evolution Backup"
+msgid "Evolution Back up"
 msgstr "ఎవాల�యూషన� బ�యాక�అప�"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:736
 msgid "Evolution Restore"
 msgstr "ఎవల�యూషన� తిరిగినిల�వచేయ�మ�"
 
-#: ../plugins/backup-restore/backup.c:494
+#: ../plugins/backup-restore/backup.c:774
 msgid "Backing up Evolution Data"
 msgstr "ఎవాల�యూషన� డాటాన� బ�యాక�అప� తీస�త�ంది"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:775
 msgid "Please wait while Evolution is backing up your data."
 msgstr "మీడాటాన� ఎవాల�యూషన� బ�యాక�అప� తీస�త�న�నప�ప�డ� దయచేసి వేచివ�ండండి."
 
-#: ../plugins/backup-restore/backup.c:497
+#: ../plugins/backup-restore/backup.c:777
 msgid "Restoring Evolution Data"
 msgstr "ఎవాల�యూషన� డాటాన� తిరిగివ�ంచ�తోంది"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:778
 msgid "Please wait while Evolution is restoring your data."
 msgstr "ఎవాల�యూషన� మీడాటాన� తిరిగివ�ంచ�త�న�నప�పడ� దయచేసి వేచివ�ండండి."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:796
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "మీ ఖాతానందలి డాటామొత�తమ�పై ఆధారపడి యిది కొంతసమయం తీస�కొంట�ంది."
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-msgid "Backup and Restore"
+#, fuzzy
+#| msgid "Backup and Restore"
+msgid "Back up and Restore"
 msgstr "బ�యాకప�‌తీయి మరియ� తిరిగినిల�వవ�ంచ�"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore your Evolution data and settings."
-msgstr "మీ ఎవాల�యూషన� డాటా మరియ� అమరికలన� బ�యాకప�‌తీచి మరియ� తిరిగినిల�వవ�ంచ�త�ంది."
+#, fuzzy
+#| msgid "Backup and restore your Evolution data and settings."
+msgid "Back up and restore your Evolution data and settings."
+msgstr ""
+"మీ ఎవాల�యూషన� డాటా మరియ� అమరికలన� బ�యాకప�‌తీచి మరియ� తిరిగినిల�వవ�ంచ�త�ంది."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
 msgstr "మీర� ఖచ�చితంగా ఎవాల�యూషన� మూయాలని అన�క�ంట�న�నారా?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to restore Evolution from the selected backup file?"
 msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
-msgstr "మీర� ఎంపికచేసిన బ�యాక�అప� దస�త�రంన�ండి ఎవాల�యూషన� న� తిరిగినిల�వ ఉంచ�దామని అన�క�ంట�న�నారా?"
+"Are you sure you want to restore Evolution from the selected back up file?"
+msgstr ""
+"మీర� ఎంపికచేసిన బ�యాక�అప� ఫైల�న�ండి ఎవాల�యూషన� న� తిరిగినిల�వ ఉంచ�దామని "
+"అన�క�ంట�న�నారా?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid ""
-"Evolution backup can start only when Evolution is not running. Please make "
-"sure that you save and close all your unsaved windows before proceeding.  If "
-"you want Evolution to restart automatically after backup, please enable the "
-"toggle button."
-msgstr ""
-"ఎవాల�యూషన� నడవనప�ప�డ� మాత�రమే ఎవాల�యూషన� బ�యాక�అప� ప�రారంభమౌత�ంది. దయచేసి మీర� ఉద�య�క�త�ల� అయ�యేమ�ంద� "
-"అన�ని దాయని విండోలన� మూయండి.  మీర� ఎవాల�యూషన� బ�యక�అప� తర�వాత స�వయంచాలకంగా ప�నఃప�రారంభమవ�వాలంటే , "
-"దయచేసి మార�ప�బటన� చేతనంచేయ�మ�."
+#, fuzzy
+#| msgid "Backing up Evolution Data"
+msgid "Close and Back up Evolution"
+msgstr "ఎవాల�యూషన� డాటాన� బ�యాక�అప� తీస�త�ంది"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-msgid "Insufficient Permissions"
-msgstr "సరిపోని అన�మత�ల�"
+#, fuzzy
+#| msgid "Cannot start Evolution"
+msgid "Close and Restore Evolution"
+msgstr "ఎవల�యూషన�‌న� ప�రారంభించలేద�"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Invalid Evolution backup file"
-msgstr "సరికాని ఎవాల�యూషన� బ�యాక�అప� దస�త�రం"
+msgid "Insufficient Permissions"
+msgstr "సరిపోని అన�మత�ల�"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid "Please select a valid backup file to restore."
-msgstr "తిరిగినిల�వ చేయ�టక� దయచేసి విల�వైన బ�యాక�అప� దస�త�రాన�ని ఎంపికచేయ�మ�"
+#, fuzzy
+#| msgid "Invalid Evolution backup file"
+msgid "Invalid Evolution back up file"
+msgstr "సరికాని ఎవాల�యూషన� బ�యాక�అప� ఫైల�"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#, fuzzy
+#| msgid "Please select a valid backup file to restore."
+msgid "Please select a valid back up file to restore."
+msgstr "తిరిగినిల�వ చేయ�టక� దయచేసి విల�వైన బ�యాక�అప� ఫైల�న� ఎంపికచేయ�మ�"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid "The selected folder is not writable."
 msgstr "ఎంచ�క�న�న సంచయం వ�రాయ�టక� వీలగ�నది కాద�."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid ""
+"To back up your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
 msgid ""
-"This will delete all your current Evolution data and settings and restore "
-"them from your backup. Evolution restore can start only when Evolution is "
-"not running. Please make sure that you close all your unsaved windows before "
-"you proceed. If you want Evolution to restart automatically restart after "
-"restore, please enable the toggle button."
+"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 ""
-"ఇది మీ ప�రస�త�త ఎవాల�యూషన� డాటాన� మరియ� అమరికలన� తొలగించి వాటిని బ�యాక�అప� న�ండి తిరిగి నిల�వచేస�త�ంది. "
-"ఎవాల�యూషన� నడవనప�ప�డ� మాత�రమే ఎవాల�యూషన� ప�నఃనిల�వ సాధ�యమౌత�ంది. మీర� ఉద�య�క�త�ల� అయ�యేమ�ంద� దయచేసి "
-"అన�ని దాయని విండోలన� మూయ�మ�. మీర� ఎవాల�యూషన� ప�నఃనిల�వ తర�వాత స�వయంచాలకంగా ప�నఃప�రారంభమవ�వాలంటే , "
-"దయచేసి మార�ప�బటన� చేతనంచేయ�మ�."
 
-#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
+#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "స�వయంచాలక పరిచయాల�"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:709
+#: ../plugins/bbdb/bbdb.c:710
 msgid "Create _address book entries when sending mails"
 msgstr "సందేశమ�లన� పంప�నప�ప�డ� చిర�నామా ప�స�తకం ప�రవేశాలన� సృష�టిస�త�ంది (_a)"
 
-#: ../plugins/bbdb/bbdb.c:715
+#: ../plugins/bbdb/bbdb.c:716
 msgid "Select Address book for Automatic Contacts"
 msgstr "స�వయంచాలక పరిచయాల కొరక� చిర�నామా ప�స�తంకంన� ఎంపికచేయ�మ�"
 
-#: ../plugins/bbdb/bbdb.c:730
+#: ../plugins/bbdb/bbdb.c:731
 msgid "Instant Messaging Contacts"
 msgstr "త�వరిత సందేశ పరిచయాల�"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:745
+#: ../plugins/bbdb/bbdb.c:746
 #, fuzzy
 msgid "_Synchronize contact info and images from Pidgin buddy list"
-msgstr "పిడిగిన� మిత�ర జాబితాన�ండి పరిచయాల మరియ� చిత�రాల సమాచారాన�ని క�రమంగా కాలనియమత చేయ�మ�"
+msgstr ""
+"పిడిగిన� మిత�ర జాబితాన�ండి పరిచయాల మరియ� చిత�రాల సమాచారాన�ని క�రమంగా కాలనియమత "
+"చేయ�మ�"
 
-#: ../plugins/bbdb/bbdb.c:751
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Pidgin buddy list"
 msgstr "పిడిగిన� మిత�ర జాబితా కొరక� చిర�నామా ప�స�తకాన�ని ఎంచ�కొన�మ�"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:762
+#: ../plugins/bbdb/bbdb.c:763
 msgid "Synchronize with _buddy list now"
 msgstr "మిత�ర జాబితా తో ఇప�ప�డ� కాలనియమత చేయ�మ�(_b)"
 
@@ -16615,103 +17149,51 @@ msgid ""
 msgstr ""
 "మీ చిర�నామా ప�స�తకం నిర�వహించ�టక� చేయవలసిన పనిని యిదిచేస�త�ంది.\n"
 "\n"
-"మీర� సందేశాలక� ప�రత�య�త�తరమ� ఇచ�చినట�ల�గా మీ చిర�నామాప�స�తకం న� నామమ�ల� మరియ ఈమోయిల� చిర�నామాలతో "
-"స�వయంచాలకంగా నింప�త�ంది. మీ మిత�ర జాబితాలన�ండి కూడా IM పరిచయాల సమాచారాన�ని నింప�త�ంది."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
-#, c-format
-msgid "Bogofilter is not available. Please install it first."
-msgstr ""
-
-#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
-#, c-format
-msgid "Error occurred while spawning %s: %s."
-msgstr "%s స�పానింగ�‌లో వొకదోషమ� సంభవించింది: %s"
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
-#, c-format
-msgid "Bogofilter child process does not respond, killing..."
-msgstr "బోగోఫిల�టర� చైల�డ�� కార�యక�రమం స�పందించ�టలేద�, నశింపబడ�తోంది..."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
-#, c-format
-msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr "బోగోఫిల�టర� చైల�డ�� కార�యక�రమం అంతరాయంక� వేచివ�ండ�మ�, సమాప�తంచేయబడ�తోంది..."
+"మీర� సందేశాలక� ప�రత�య�త�తరమ� ఇచ�చినట�ల�గా మీ చిర�నామాప�స�తకం న� పేర�ల� మరియ "
+"ఈమోయిల� చిర�నామాలతో "
+"స�వయంచాలకంగా నింప�త�ంది. మీ మిత�ర జాబితాలన�ండి కూడా IM పరిచయాల సమాచారాన�ని "
+"నింప�త�ంది."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
-#, c-format
-msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr "బోగోఫిల�టర� వైఫల�యానికి పైప�, దోషమ� కోడ�: %d."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
-msgid "Convert message text to _Unicode"
-msgstr "సందేశ పాఠ�యమ�న� యూనికోడ�‌క� మార�చ�మ� (_U)"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
-msgid "Convert mail messages to Unicode"
-msgstr "మెయిల� సందేశాలన� య�నికోడ� క� మార�చ�మ�"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-msgstr ""
-"వేర�వేర� అక�షర సమిత�ల న�ండి వచ�చ� spam/ham టోకెన�స� న� యూనిఫై చేయ�టక� సందేశం పాఠ�యమ�న� "
-"Unicode UTF-8 క� మార�చ�మ�."
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Junk Filter"
-msgstr "Bogofilter నిరర�ధక ఫిల�టర�"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter Options"
-msgstr "Bogofilter �చ�చికాల�"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filter junk messages using Bogofilter."
-msgstr "Bogofilterన� ఉపయోగించి నిరర�దక సందేశాలన� వడపోయ�మ�."
-
-#: ../plugins/caldav/caldav-browse-server.c:197
+#: ../plugins/caldav/caldav-browse-server.c:214
 msgid "Authentication failed. Server requires correct login."
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:199
+#: ../plugins/caldav/caldav-browse-server.c:216
 msgid "Given URL cannot be found."
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:220
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
 "%d - %s"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:333
-#: ../plugins/caldav/caldav-browse-server.c:584
+#: ../plugins/caldav/caldav-browse-server.c:360
+#: ../plugins/caldav/caldav-browse-server.c:694
 #, fuzzy
 msgid "Failed to parse server response."
 msgstr "ప�రతినిధ�లన� నవీకరించ�ట లో విఫలమైంది:"
 
-#: ../plugins/caldav/caldav-browse-server.c:427
+#: ../plugins/caldav/caldav-browse-server.c:454
 #, fuzzy
 msgid "Events"
 msgstr "అంతమౌత�ంది"
 
-#: ../plugins/caldav/caldav-browse-server.c:449
+#: ../plugins/caldav/caldav-browse-server.c:476
 #, fuzzy
 msgid "User's calendars"
 msgstr "కొత�త క�యాలెండర�"
 
-#: ../plugins/caldav/caldav-browse-server.c:557
-#: ../plugins/caldav/caldav-browse-server.c:628
+#: ../plugins/caldav/caldav-browse-server.c:588
+#: ../plugins/caldav/caldav-browse-server.c:763
 #, fuzzy
 msgid "Failed to get server URL."
 msgstr "LDAP సేవిక తో ప�రామాణీకరించడంలో విఫలమయినది."
 
-#: ../plugins/caldav/caldav-browse-server.c:626
-#: ../plugins/caldav/caldav-browse-server.c:667
-#: ../plugins/caldav/caldav-browse-server.c:1277
+#: ../plugins/caldav/caldav-browse-server.c:761
+#: ../plugins/caldav/caldav-browse-server.c:802
+#: ../plugins/caldav/caldav-browse-server.c:1493
 #, fuzzy
 msgid "Searching for user's calendars..."
 msgstr ""
@@ -16719,35 +17201,35 @@ msgstr ""
 "\n"
 "పరిచయాలకొరక� శోధిస�త�న�నది..."
 
-#: ../plugins/caldav/caldav-browse-server.c:665
+#: ../plugins/caldav/caldav-browse-server.c:800
 #, fuzzy
 msgid "Could not find any user calendar."
 msgstr "� క�యాలెండర�లన� కన�గోనలేకపోయింది"
 
-#: ../plugins/caldav/caldav-browse-server.c:794
+#: ../plugins/caldav/caldav-browse-server.c:938
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:796
+#: ../plugins/caldav/caldav-browse-server.c:940
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:801
+#: ../plugins/caldav/caldav-browse-server.c:945
 #, fuzzy, c-format
 msgid "Enter password for user %s on server %s"
 msgstr "%s (వినియోగదారి %s) కొరక� సంకేతపదాన�ని ప�రవేశపెట�టండి"
 
-#: ../plugins/caldav/caldav-browse-server.c:860
+#: ../plugins/caldav/caldav-browse-server.c:1008
 #, fuzzy, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr ""
-"అవ�ట�‌ప�ట� దస�త�రాన�ని సృష�టించలేకపోయింది: %s:\n"
+"అవ�ట�‌ప�ట� ఫైల�న� సృష�టించలేకపోయింది: %s:\n"
 " %s"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1095
+#: ../plugins/caldav/caldav-browse-server.c:1266
 #, fuzzy
 msgid "Searching folder content..."
 msgstr ""
@@ -16755,50 +17237,72 @@ msgstr ""
 "\n"
 "పరిచయాలకొరక� శోధిస�త�న�నది..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1138
+#: ../plugins/caldav/caldav-browse-server.c:1325
+#: ../plugins/caldav/caldav-source.c:261
+msgid "Server _handles meeting invitations"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:1332
 #, fuzzy
 msgid "List of available calendars:"
 msgstr "స�థానిక క�యాలెండర�‌ల�"
 
-#: ../plugins/caldav/caldav-browse-server.c:1175
+#: ../plugins/caldav/caldav-browse-server.c:1370
 #, fuzzy
 msgid "Supports"
 msgstr "హ�లా మద�దత�"
 
-#: ../plugins/caldav/caldav-browse-server.c:1254
+#: ../plugins/caldav/caldav-browse-server.c:1397
+#: ../plugins/caldav/caldav-source.c:259
+#, fuzzy
+#| msgid "New email"
+msgid "User e_mail:"
+msgstr "కొత�త ఈమెయిల�"
+
+#: ../plugins/caldav/caldav-browse-server.c:1469
 #, fuzzy, c-format
 msgid "Failed to create thread: %s"
 msgstr "పైప� సృష�టించ�టలో విఫలమైంది: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1362
+#: ../plugins/caldav/caldav-browse-server.c:1585
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:1368
+#: ../plugins/caldav/caldav-browse-server.c:1591
 msgid "Browse for a CalDAV calendar"
 msgstr ""
 
-#: ../plugins/caldav/caldav-source.c:216
-#: ../plugins/calendar-http/calendar-http.c:100
+#: ../plugins/caldav/caldav-source.c:240
+#: ../plugins/calendar-http/calendar-http.c:107
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:223
-#: ../plugins/google-account-setup/google-contacts-source.c:308
-msgid "Use _SSL"
-msgstr "·_SSL న� ఉపయోగించ�మ�"
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:145
+#: ../plugins/google-account-setup/google-contacts-source.c:359
+#, fuzzy
+#| msgid "_Use secure connection:"
+msgid "Use _secure connection"
+msgstr "రక�షిత బంధాన�ని ఉపయోగించ�మ�(U):"
+
+#: ../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 "వినియోగదారి పేర�(_n):"
 
-#: ../plugins/caldav/caldav-source.c:235
+#: ../plugins/caldav/caldav-source.c:264
 msgid "Brows_e server for a calendar"
 msgstr ""
 
-#: ../plugins/caldav/caldav-source.c:251
-#: ../plugins/calendar-file/calendar-file.c:191
-#: ../plugins/calendar-http/calendar-http.c:119
-#: ../plugins/calendar-weather/calendar-weather.c:395
-#: ../plugins/google-account-setup/google-contacts-source.c:326
-#: ../plugins/google-account-setup/google-source.c:630
+#: ../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 "రీఫ�రెష� (_f):"
 
@@ -16810,31 +17314,31 @@ msgstr "ఎవాల�యూషన�‌క� CalDAV మద�దత�న�
 msgid "CalDAV Support"
 msgstr "CalDAV మద�దత�"
 
-#: ../plugins/calendar-file/calendar-file.c:125
+#: ../plugins/calendar-file/calendar-file.c:134
 msgid "_Customize options"
 msgstr "మల�చ�కొనిన �చ�చికమ�ల� (_C)"
 
-#: ../plugins/calendar-file/calendar-file.c:144
+#: ../plugins/calendar-file/calendar-file.c:153
 msgid "File _name:"
-msgstr "దస�త�రం పేర� (_n):"
+msgstr "ఫైల� పేర� (_n):"
 
-#: ../plugins/calendar-file/calendar-file.c:148
+#: ../plugins/calendar-file/calendar-file.c:157
 msgid "Choose calendar file"
 msgstr "కాలెండర� దస�త�రమ�న� యెంచ�కొన�మ�"
 
-#: ../plugins/calendar-file/calendar-file.c:196
+#: ../plugins/calendar-file/calendar-file.c:209
 msgid "On open"
 msgstr "తెర�వ�ట పై"
 
-#: ../plugins/calendar-file/calendar-file.c:197
+#: ../plugins/calendar-file/calendar-file.c:210
 msgid "On file change"
 msgstr "దస�త�రమ� మార�చ�ట పై"
 
-#: ../plugins/calendar-file/calendar-file.c:198
+#: ../plugins/calendar-file/calendar-file.c:211
 msgid "Periodically"
 msgstr "కాలక�రమంగా"
 
-#: ../plugins/calendar-file/calendar-file.c:213
+#: ../plugins/calendar-file/calendar-file.c:228
 msgid "Force read _only"
 msgstr "చద�వ�ట మాత�రమే బలవంతంచేయి (_o)"
 
@@ -16846,13 +17350,9 @@ msgstr "ఎవాలà±�యూషనà±�‌కà±� à°¸à±�థానిక కాలà
 msgid "Local Calendars"
 msgstr "స�థానిక క�యాలెండర�‌ల�"
 
-#: ../plugins/calendar-http/calendar-http.c:134
-msgid "_Secure connection"
-msgstr "రక�షణ బంధమ�(_S)"
-
-#: ../plugins/calendar-http/calendar-http.c:194
+#: ../plugins/calendar-http/calendar-http.c:207
 msgid "Userna_me:"
-msgstr "వినియోగదారినామమ� (_m):"
+msgstr "వినియోగదారిపేర� (_m):"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "Add web calendars to Evolution."
@@ -16862,63 +17362,63 @@ msgstr "ఎవాలà±�యూషనà±�‌కà±� వెబà±� à°•à±�యాలెà
 msgid "Web Calendars"
 msgstr "వెబ� క�యాలెండర�ల�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:60
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Fog"
 msgstr "వాతావరణ: పొగమంచ�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Cloudy"
 msgstr "వాతావరణ: మేఘావృతం"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Cloudy Night"
 msgstr "వాతావరణం: మేఘావృత రాత�రి"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Overcast"
 msgstr "వాతావరణం: వర�షం"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Showers"
 msgstr "వాతావరణం: మంచ�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:70
 msgid "Weather: Snow"
 msgstr "వాతావరణం: మంచ�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:71
 msgid "Weather: Sunny"
 msgstr "వాతావరణం: ఎండ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:72
 msgid "Weather: Clear Night"
 msgstr "వాతావరణం: ప�రకాశమైన రాత�రి"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:73
 msgid "Weather: Thunderstorms"
 msgstr "వాతావరణం: చలిగాల�ల�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:222
+#: ../plugins/calendar-weather/calendar-weather.c:239
 msgid "Select a location"
 msgstr "ఒక స�థానమ�న� ఎంపికచేయ�మ�"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:328
-#: ../plugins/calendar-weather/calendar-weather.c:373
+#: ../plugins/calendar-weather/calendar-weather.c:350
+#: ../plugins/calendar-weather/calendar-weather.c:398
 #, fuzzy
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "�దికాద�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:448
+#: ../plugins/calendar-weather/calendar-weather.c:477
 msgid "_Units:"
 msgstr "ప�రామాణాల�(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:455
+#: ../plugins/calendar-weather/calendar-weather.c:486
 msgid "Metric (Celsius, cm, etc)"
 msgstr "మెట�రిక� (Celsius, cm, etc)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:456
+#: ../plugins/calendar-weather/calendar-weather.c:489
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "ఇంపీరియల� (ఫారెన�‌హీట�, అంగ�ళాల�, మొద.)"
 
@@ -16930,32 +17430,7 @@ msgstr "ఎవాలà±�యూషనà±�‌కà±� వాతావరణ కాలà
 msgid "Weather Calendars"
 msgstr "వాతావరణ క�యాలెండర�‌ల�"
 
-#: ../plugins/contacts-map/contacts-map.c:55
-#: ../plugins/contacts-map/contacts-map.c:201
-#, fuzzy
-msgid "Contacts map"
-msgstr "చిర�నామాల�: "
-
-#: ../plugins/contacts-map/contacts-map.c:56
-#, fuzzy
-msgid "Show a map of all the contacts"
-msgstr "ఎంచ�క�న�న పరిచయాలక� సందేశాన�ని పంప�మ�"
-
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
-msgid "Add a map showing the location of contacts when possible."
-msgstr ""
-
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
-#, fuzzy
-msgid "Map for contacts"
-msgstr "చిర�నామాల� లేవ�"
-
-#: ../plugins/dbx-import/dbx-importer.c:232
-#, fuzzy
-msgid "Select folder to import OE folder into"
-msgstr "దీనిలోకి దిగ�మతిచేయ�టక� సంచయంన� ఎంపికచేయ�మ�"
-
-#: ../plugins/dbx-import/dbx-importer.c:251
+#: ../plugins/dbx-import/dbx-importer.c:284
 #, fuzzy
 msgid "Importing Outlook Express data"
 msgstr "Outlook డాటాన� దిగ�మతిచేస�తోంది"
@@ -16975,24 +17450,24 @@ msgstr "Outlook PST దిగ�మతి"
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "Outlook వ�యక�తిగత సంచయమ�ల� (.pst)"
 
-#: ../plugins/default-source/default-source.c:83
+#: ../plugins/default-source/default-source.c:168
 msgid "Mark as _default address book"
 msgstr "అప�రమేయ చిర�నామా ప�స�తకంగా గ�ర�త�ంచ�మ� (_d)"
 
-#: ../plugins/default-source/default-source.c:96
+#: ../plugins/default-source/default-source.c:182
 #, fuzzy
 msgid "A_utocomplete with this address book"
-msgstr "స�వయంచాలకంగామ�గియ� నామమ�న� వొక చిర�నామాతో చూప�మ�"
+msgstr "స�వయంచాలకంగామ�గియ� పేర�న� వొక చిర�నామాతో చూప�మ�"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:191
 msgid "Mark as _default calendar"
 msgstr "అప�రమేయ క�యాలెండర�‌గా గ�ర�త�ంచ�మ� (_d)"
 
-#: ../plugins/default-source/default-source.c:106
+#: ../plugins/default-source/default-source.c:192
 msgid "Mark as _default task list"
 msgstr "అప�రమేయ కర�తవ�య జాబితాగా గ�ర�త�ంచ�మ� (_d)"
 
-#: ../plugins/default-source/default-source.c:107
+#: ../plugins/default-source/default-source.c:193
 msgid "Mark as _default memo list"
 msgstr "అప�రమేయ మెమో జాబితాగా గ�ర�త�ంచ�మ� (_d)"
 
@@ -17014,58 +17489,86 @@ msgid ""
 "message. The format for specifying a Header and Header value is: Name of the "
 "custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
-"బయటక�వెళ�ళ� సందేశాలక� జతచేయగల మల�చ�కొనిన పీఠికల జాబితాన� కీ తెల�ప�త�ంది. పీఠికన� మరియ� పీఠిక "
-"విల�వన� తెల�ప�టక� విధానం: మ�లచ�కొనిన పీఠిక నామమ� \"=\" మ�ంద� వ�ండాలి మరియ� విల�వల� \";\" "
+"బయటక�వెళ�ళ� సందేశాలక� జతచేయగల మల�చ�కొనిన పీఠికల జాబితాన� కీ తెల�ప�త�ంది. "
+"పీఠికన� మరియ� పీఠిక "
+"విల�వన� తెల�ప�టక� విధానం: మ�లచ�కొనిన పీఠిక పేర� \"=\" మ�ంద� వ�ండాలి మరియ� "
+"విల�వల� \";\" "
 "చేత వేర�చేయబడాలి"
 
-#: ../plugins/email-custom-header/email-custom-header.c:316
+#: ../plugins/email-custom-header/email-custom-header.c:322
+#, fuzzy
+#| msgid "Security:"
+msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "రక�షణ:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:321
+#: ../plugins/email-custom-header/email-custom-header.c:326
+#, fuzzy
+#| msgid "Personal"
+msgctxt "email-custom-header-Security"
+msgid "Personal"
+msgstr "వ�యక�తిగత"
+
+#: ../plugins/email-custom-header/email-custom-header.c:327
+#, fuzzy
+#| msgid "Unclassified"
+msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "వర�గీకరించని"
 
-#: ../plugins/email-custom-header/email-custom-header.c:322
+#: ../plugins/email-custom-header/email-custom-header.c:328
+#, fuzzy
+#| msgid "Protected"
+msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "రక�షించబడిన"
 
-#: ../plugins/email-custom-header/email-custom-header.c:324
-#: ../widgets/misc/e-send-options.ui.h:18
+#: ../plugins/email-custom-header/email-custom-header.c:329
+#, fuzzy
+#| msgid "Confidential"
+msgctxt "email-custom-header-Security"
+msgid "Confidential"
+msgstr "గోప�యమైన"
+
+#: ../plugins/email-custom-header/email-custom-header.c:330
+#, fuzzy
+#| msgid "Secret"
+msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "రహస�యం"
 
-#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../plugins/email-custom-header/email-custom-header.c:331
+#, fuzzy
+#| msgid "Top secret"
+msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "అత�యంతరహస�యం"
 
-#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
-#. indicating the header will not be added to a mail message
-#: ../plugins/email-custom-header/email-custom-header.c:379
+#: ../plugins/email-custom-header/email-custom-header.c:388
 #, fuzzy
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "�దికాద�"
 
-#: ../plugins/email-custom-header/email-custom-header.c:571
+#: ../plugins/email-custom-header/email-custom-header.c:584
 msgid "_Custom Header"
 msgstr "మల�చ�కొనిన పీఠిక (_C)"
 
 #. 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:830
+#: ../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 \";\"."
 msgstr ""
 "మల�చ�కొనిని పీఠిక కీవిల�వక� తెల�పబడిన విధానం:\n"
-"మల�చ�కొనిని పీఠిక కీవిల�వల నామమ� \";\" చేత వేర�చేయబడతాయి."
+"మల�చ�కొనిని పీఠిక కీవిల�వల పేర� \";\" చేత వేర�చేయబడతాయి."
 
-#: ../plugins/email-custom-header/email-custom-header.c:884
+#: ../plugins/email-custom-header/email-custom-header.c:901
 msgid "Key"
 msgstr "à°•à±€"
 
-#: ../plugins/email-custom-header/email-custom-header.c:900
-#: ../plugins/templates/templates.c:415
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:468
 msgid "Values"
 msgstr "విల�వల�"
 
@@ -17084,10 +17587,11 @@ msgstr "మలà±�à°šà±�కొనిన పీఠికనà±� ఈమెయిలà
 
 #: ../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 ""
+"మెయిల� కూర�పరినంద� కీ వత�తబడినప�ప�డ� సరికూర�పరిని స�వయంచాలకంగా ఆరంభిస�త�ంది"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:126
+#: ../plugins/external-editor/external-editor.c:132
 msgid "Automatically launch when a new mail is edited"
 msgstr "కొత�త మెయిల� సరికూర�చినప�ప�డ� స�వయంచాలకంగా ఆరంభించ�మ�"
 
@@ -17099,11 +17603,11 @@ msgstr "à°…à°ªà±�రమేయ బహిరà±�à°—à°¤ సరికూరà±�పరà
 msgid "The default command that must be used as the editor."
 msgstr "తప�పక సరికూర�పరిలా వ�పయోగించవలసిన అప�రమేయ ఆదేశం."
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:121
 msgid "Command to be executed to launch the editor: "
 msgstr "సరికూర�పరిని దించ�టక� నిర�వర�తించవలసిన సందేశం: "
 
-#: ../plugins/external-editor/external-editor.c:116
+#: ../plugins/external-editor/external-editor.c:122
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -17111,8 +17615,8 @@ msgstr ""
 "Emacs కొరక� \"xemacs\" వ�పయోగించండి\n"
 "VI కొరక� \"gvim -f\" వ�పయోగించండి"
 
-#: ../plugins/external-editor/external-editor.c:382
-#: ../plugins/external-editor/external-editor.c:384
+#: ../plugins/external-editor/external-editor.c:402
+#: ../plugins/external-editor/external-editor.c:404
 msgid "Compose in External Editor"
 msgstr "బాహ�య సరికూర�పరినంద� కూర�చ�మ�"
 
@@ -17122,11 +17626,12 @@ msgstr "బహిర�గత కూర�పరి"
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
 msgid "Use an external editor to compose plain-text mail messages."
-msgstr "సాదా-పాఠ�యప� మెయిల� సందేశమ�లన� కూర�చ�టక� బాహ�య సరికూర�పరిని వ�పయోగించ�మ�."
+msgstr ""
+"సాదా-పాఠ�యప� మెయిల� సందేశమ�లన� కూర�చ�టక� బాహ�య సరికూర�పరిని వ�పయోగించ�మ�."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
-msgstr "తాత�కాలిక దస�త�రాన�ని సృష�టించలేక పోయింది"
+msgstr "తాత�కాలిక ఫైల�న� సృష�టించలేక పోయింది"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
@@ -17137,7 +17642,8 @@ msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
 msgstr ""
-"మీమెయిల�‌న� భద�రపరచ�టక� ఎవాల�యూషన� తాత�కాలిక దస�త�రంన� సృష�టించలేకపోయింది. తర�వాత మరలాప�రయత�నించండి."
+"మీమెయిల�‌న� భద�రపరచ�టక� ఎవాల�యూషన� తాత�కాలిక ఫైల�న� సృష�టించలేకపోయింది. "
+"తర�వాత మరలాప�రయత�నించండి."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
 msgid "External editor still running"
@@ -17148,7 +17654,8 @@ msgid ""
 "The external editor is still running. The mail composer window cannot be "
 "closed as long as the editor is active."
 msgstr ""
-"బాహ�య సరికూర�పరి యింకా నడ�చ�చ�న�నది. సరికూర�పరి క�రియాశీలమ�గా వ�న�నంతవరక� మెయిల� కూర�పరి విండో "
+"బాహ�య సరికూర�పరి యింకా నడ�చ�చ�న�నది. సరికూర�పరి క�రియాశీలమ�గా వ�న�నంతవరక� "
+"మెయిల� కూర�పరి విండో "
 "మూయబడద�."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
@@ -17156,7 +17663,8 @@ msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 msgstr ""
-"మీప�లగ�ఇన� ఆభీష�టాలనంద� అమర�చివ�న�న బహిర�గత సరికూర�పరి ప�రారంభింపబడద�. వేరే సరికూర�పరిని అమర�చ�టక� "
+"మీప�లగ�ఇన� ఆభీష�టాలనంద� అమర�చివ�న�న బహిర�గత సరికూర�పరి ప�రారంభింపబడద�. వేరే "
+"సరికూర�పరిని అమర�చ�టక� "
 "ప�రయత�నించ�మ�."
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
@@ -17169,25 +17677,26 @@ msgid ""
 "should be set before checking this, otherwise nothing happens."
 msgstr ""
 
-#: ../plugins/face/face.c:286
+#: ../plugins/face/face.c:292
 #, fuzzy
-msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
-msgstr "(48*48) png పరిమాణం న� ఎంపికచేయ�మ� < 700bytes"
+#| msgid "Select a File"
+msgid "Select a Face Picture"
+msgstr "ఫైల� న�  ఎంచ�కొన�మ�"
 
-#: ../plugins/face/face.c:296
+#: ../plugins/face/face.c:302
 #, fuzzy
 msgid "Image files"
 msgstr "దస�త�రాలన� దిగ�మతిచేస�తోంది"
 
-#: ../plugins/face/face.c:355
+#: ../plugins/face/face.c:359
 msgid "_Insert Face picture by default"
 msgstr ""
 
-#: ../plugins/face/face.c:366
+#: ../plugins/face/face.c:370
 msgid "Load new _Face picture"
 msgstr ""
 
-#: ../plugins/face/face.c:422
+#: ../plugins/face/face.c:429
 #, fuzzy
 msgid "Include _Face"
 msgstr "తంత�లన� చేర�చ�మ�(_n)"
@@ -17225,18 +17734,20 @@ msgstr "అంశాన�ని పంపిచలేకపోయింది!\
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr ""
 
-#: ../plugins/google-account-setup/google-contacts-source.c:274
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+#: ../plugins/google-account-setup/google-contacts-source.c:325
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
 #, fuzzy
 msgid "Server"
 msgstr "సేవిక(_S):"
 
-#: ../plugins/google-account-setup/google-source.c:437
+#: ../plugins/google-account-setup/google-source.c:459
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr "సబ�‌స�క�రైబ� అయిన క�యాలెండర�స�� జాబితాన� వాడ�కొన�టక� %s వినియోగదారి సంకేతపదమ�న� ప�రవేశపెట�టండి."
+msgstr ""
+"సబ�‌స�క�రైబ� అయిన క�యాలెండర�స�� జాబితాన� వాడ�కొన�టక� %s వినియోగదారి "
+"సంకేతపదమ�న� ప�రవేశపెట�టండి."
 
-#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/google-account-setup/google-source.c:576
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17245,17 +17756,17 @@ msgstr ""
 "గూగ�ల� సేవికన�ండి డాటాన� చద�వలేద�.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:548
-#: ../plugins/mail-to-task/mail-to-task.c:736
-#: ../plugins/mail-to-task/mail-to-task.c:952
+#: ../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
 msgid "Unknown error."
 msgstr "అపరిచిత దోషం."
 
-#: ../plugins/google-account-setup/google-source.c:634
+#: ../plugins/google-account-setup/google-source.c:679
 msgid "Cal_endar:"
 msgstr "క�యాలెండర� (_e):"
 
-#: ../plugins/google-account-setup/google-source.c:669
+#: ../plugins/google-account-setup/google-source.c:714
 #, fuzzy
 msgid "Retrieve _List"
 msgstr "జాబితాన� వెలికితీయి (_l)"
@@ -17268,435 +17779,6 @@ msgstr "ఎవాలà±�యూషనà±�‌కà±� గూగà±�à°²à±� కాలెà
 msgid "Google Calendars"
 msgstr "గూగ�ల� కాలెండర�ల�"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-msgid "Checklist"
-msgstr "పరిశీలనజాబితా"
-
-#: ../plugins/groupwise-features/gw-ui.c:112
-msgid "New _Shared Folder..."
-msgstr "కొత�త భాగస�వామ�య సంచయం(_S)..."
-
-#: ../plugins/groupwise-features/gw-ui.c:119
-msgid "_Proxy Login..."
-msgstr "ప�రాక�సీ లాగిన�(_P)..."
-
-#: ../plugins/groupwise-features/gw-ui.c:170
-msgid "Junk Mail Settings..."
-msgstr "నిరర�ధకం మెయిల� అమరికల�..."
-
-#: ../plugins/groupwise-features/gw-ui.c:177
-msgid "Track Message Status..."
-msgstr "సందేశం స�థితిని గమనించ�మ�..."
-
-#: ../plugins/groupwise-features/gw-ui.c:183
-msgid "Retract Mail"
-msgstr "మెయిల� న� తిప�ప�కొన�ట"
-
-#: ../plugins/groupwise-features/gw-ui.c:338
-msgid "Accept Tentatively"
-msgstr "పరిశీలనాత�మకంగా ఆమోదించ�మ�"
-
-#: ../plugins/groupwise-features/gw-ui.c:352
-msgid "Rese_nd Meeting..."
-msgstr "సమావేశమ�న� తిరిగిపంప�మ�... (_n)"
-
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
-msgid "Create folder"
-msgstr "సంచయంన� సృష�టించ�ట"
-
-#: ../plugins/groupwise-features/install-shared.c:217
-#, fuzzy, c-format
-msgid ""
-"The user '%s' has shared a folder with you\n"
-"\n"
-"Message from '%s'\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"Click 'Apply' to install the shared folder\n"
-"\n"
-msgstr ""
-"వినియోగదారి '%s' మీతో ఒక సంచయంన� పంచ�కొన�నాడ�\n"
-"\n"
-"'%s' న�ండి సందేశం\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"భాగస�వామ�య సంచయం క� సంస�థాపించ�టక� 'మ�ంద�క�పంప�' నొక�క�మ�\n"
-"\n"
-
-#: ../plugins/groupwise-features/install-shared.c:229
-msgid "Install the shared folder"
-msgstr "భాగస�వామ�య సంచయంన� సంస�థాపించ�మ�"
-
-#: ../plugins/groupwise-features/install-shared.c:233
-msgid "Shared Folder Installation"
-msgstr "భాగస�వామ�య సంచయం సంస�థాపన"
-
-#: ../plugins/groupwise-features/junk-mail-settings.c:82
-msgid "Junk Settings"
-msgstr "నిరర�ధకంక� అమరికల�"
-
-#: ../plugins/groupwise-features/junk-mail-settings.c:96
-#: ../plugins/groupwise-features/junk-settings.ui.h:3
-msgid "Junk Mail Settings"
-msgstr "నిరర�దక మెయిల� అమరికల�"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:1
-msgid "Email:"
-msgstr "ఈమెయిల�:"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:2
-#, fuzzy
-msgid "Junk List:"
-msgstr "నిరర�ధకం జాబితా(_J)"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:6
-msgid "_Enable"
-msgstr "చేతనం(_E)"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:7
-msgid "_Junk List"
-msgstr "నిరర�ధకం జాబితా(_J)"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:13
-#: ../widgets/table/e-table-config.ui.h:21
-msgid "_Remove"
-msgstr "తీసివేయ�(_R)"
-
-#: ../plugins/groupwise-features/mail-retract.c:81
-msgid "Message Retract"
-msgstr "సందేశం తిప�ప�కొన�ట"
-
-#: ../plugins/groupwise-features/mail-retract.c:90
-#, fuzzy
-msgid ""
-"Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this?"
-msgstr ""
-"సందేశం తిప�ప�కొన�టవలన అది స�వీకరణదారి మెయిల�‌బాక�స��‌న�ండి తీసివేయబడవచ�చ�. మీర� ఖచ�చితంగా దీనిని "
-"చేద�దామన�క�ంట�న�నారా?"
-
-#: ../plugins/groupwise-features/mail-retract.c:111
-msgid "Message retracted successfully"
-msgstr "సందేశం సమర�దవంతంగా తిరిగిగమనించబడింది"
-
-#: ../plugins/groupwise-features/mail-send-options.c:202
-msgid "Insert Send options"
-msgstr "పంప� ఇచ�చాపూర�వకాలన� అమర�చ�మ�"
-
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to GroupWise messages"
-msgstr "పంపించ� �చ�చికాలన� సమూహతరహా సందేశాలక� జతచేయ�మ�"
-
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "Fine-tune your GroupWise accounts."
-msgstr "మీ సమూహ తరహా ఖాతాలన� బాగా-అమర�చండి."
-
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "GroupWise Features"
-msgstr "సమూహతరహా సౌలభ�యాల�"
-
-#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
-msgid "Message retract failed"
-msgstr "సందేశం తిప�ప�కొన�ట విఫలమైంది"
-
-#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
-msgid "The server did not allow the selected message to be retracted."
-msgstr "ఎంపికకాబడిన సందేశం తిప�ప�కొన�టక� సేవిక అన�మతించలేద�."
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "&quot;{0}&quot; ఖాతా యిప�పటికే వ�ంది. దయచేసి మీసంచయం ట�రీన� పరిశీలించండి."
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
-msgid "Account Already Exists"
-msgstr "ఖాతా యిప�పటికేవ�ంది"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
-msgid "Invalid user"
-msgstr "చెల�లని వినియోగదారి"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"&quot;{0}&quot;లా ప�రోక�సీ లాగిన� విఫలమైంది. దయచేసి మీఈమెయిల� చిర�నామాన� పరిశీలించి మరలా ప�రయత�నించండి."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
-msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "ప�రోక�సీ యాక�సిస� వినియోగదారి &quot;{0}&quot;క� యివ�వబడద�"
-
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
-msgid "Specify User"
-msgstr "వినియోగదారిని తెల�ప�మ�"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
-msgid "You have already given proxy permissions to this user."
-msgstr "ఈవినియోగదారికి మీర� యిప�పటికే ప�రోక�సీ అన�మత�లన� యిచ�చివ�న�నార�."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
-msgid "You have to specify a valid user name to give proxy rights."
-msgstr "ప�రోక�సీ అన�మత�లన� యివ�వ�టక� మీర� చెల�ల�నట�వంటి వినియోగదారి నామమ�న� తెల�పవలెన�."
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "తెల�పబడిన వినియోగదారి &quot;{0}&quot;తో మీర� సంచయంన� పంచ�కోలేర�"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
-msgid "You have to specify a user name which you want to add to the list"
-msgstr "మీర� జాబితాక� జతచేయాలన�క�ంట�న�న వినియోగదారి నామమ�న� తెల�పవలెన�"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
-#, fuzzy
-msgid "Do you want to resend the meeting?"
-msgstr "మీర� సమావేశమ�న� తిరిగి పంపాలని అన�కొన�చ�న�నారా ?"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-#, fuzzy
-msgid "Do you want to resend the recurring meeting?"
-msgstr "మీర� ప�నరావృత సమావేశమ�న� తిరిగిపంపాలని అన�కొన�చ�న�నారా?"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-#, fuzzy
-msgid "Do you want to retract the original item?"
-msgstr "మీర� వాస�తవ అంశాన�ని బయటక� తేవాలని అన�కొన�చ�న�నారా?"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
-msgid "The original will be removed from the recipient's mailbox."
-msgstr "వాస�తవం అన�నది స�వీకర�తల మెయిల�‌పెట�టెన�ండి తీసివేయబడ�త�ంది."
-
-#
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
-msgid "This is a recurring meeting"
-msgstr "ఇది ప�నఃసంభవమిస�త�న�న వొక సమావేశం"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
-msgid "This will create a new meeting using the existing meeting details."
-msgstr "ఉన�న సమావేశ వివరమ�లన� వ�పయోగించి యిది కొత�త సమావేశమ�న� సృష�టించ�న�."
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
-msgid ""
-"This will create a new meeting with the existing meeting details. The "
-"recurrence rule needs to be re-entered."
-msgstr ""
-"ఉన�న సమావేశ వివరమ�లన� వ�పయోగించి యిది కొత�త సమావేశమ�న� సృష�టించ�న�. ప�నరావృత నియమం తిరిగి-"
-"ప�రవేశపెట�టవలసి వ�ంది."
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
-msgid "Would you like to accept it?"
-msgstr "మీర� దీనిని ఆమోందించ�టక� యిష�టపడతారా?"
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
-msgid "Would you like to decline it?"
-msgstr "మీర� దీనిని తిరస�కరించ�టక� యిష�టపడతారా?"
-
-#: ../plugins/groupwise-features/properties.ui.h:1
-msgid "C_ustomize notification message"
-msgstr "ప�రకటన సందేశాన�ని మల�చ�కొన�మ� (_u)"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
-msgid "Con_tacts..."
-msgstr "పరిచయాల�(_t)..."
-
-#: ../plugins/groupwise-features/properties.ui.h:5
-msgid "Shared Folder Notification"
-msgstr "భాగస�వామ�య సంచయం ప�రకటన"
-
-#: ../plugins/groupwise-features/properties.ui.h:7
-msgid "The participants will receive the following notification.\n"
-msgstr "పాల�గోనేవార� ఈ క�రింది ప�రకటనన� పొంద�తార�.\n"
-
-#: ../plugins/groupwise-features/properties.ui.h:9
-#, fuzzy
-msgid "Users:"
-msgstr "వినియోగదార�ల�"
-
-#: ../plugins/groupwise-features/properties.ui.h:12
-msgid "_Not Shared"
-msgstr "పంచ�కొనని(_N)"
-
-#: ../plugins/groupwise-features/properties.ui.h:14
-msgid "_Shared With..."
-msgstr "తొ పంచ�కొన�మ�(_S)..."
-
-#: ../plugins/groupwise-features/properties.ui.h:15
-msgid "_Sharing"
-msgstr "పంచ�కొన�చ�న�న(_S)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
-msgid "Access Rights"
-msgstr "వాడిక హక�క�ల�"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
-msgid "Add/Edit"
-msgstr "జతచేయ�మ�/సరిచేయ�మ�"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
-msgid "Con_tacts"
-msgstr "పరిచయాల�(_t)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
-msgid "Modify _folders/options/rules/"
-msgstr "_folders/options/rules/ న� సవరించ�మ�"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
-msgid "Read items marked _private"
-msgstr "వ�యక�తిగతం గా గ�ర�త�ంచిన అంశమ�లన� చద�వ�మ�(_p)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
-msgid "Reminder Notes"
-msgstr "గ�ర�త�చేయ� గమనికల�"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
-msgid "Subscribe to my _alarms"
-msgstr "నా అలారమ�లక� చందాదార� కమ�మ�(_a)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
-msgid "Subscribe to my _notifications"
-msgstr "నాయొక�క ప�రకటనలక� చందాదార� కమ�మ�(_n)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
-msgid "_Write"
-msgstr "వ�రాయ�మ�(_W)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
-msgid "permission to read|_Read"
-msgstr "చద�వ�టక� అన�మతి|_Read"
-
-#: ../plugins/groupwise-features/proxy-listing.ui.h:1
-msgid "Proxy"
-msgstr "ప�రాక�సీ"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:224
-#, fuzzy
-msgid "Account Name"
-msgstr "ఖాతా నామమ�"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
-msgid "Proxy Login"
-msgstr "ప�రాక�సీ లాగిన�"
-
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:251
-#: ../plugins/groupwise-features/proxy.c:493
-#: ../plugins/groupwise-features/send-options.c:84
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s కొరక� రహస�యపదాన�ని ప�రవేశపెట�టండి %s (వినియోగదార� %s)"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:689
-msgid "The Proxy tab will be available only when the account is online."
-msgstr "ఖాతా ఆన�‌లైన� లో ఉన�నప�పడ� మాత�రమే ప�రాక�సీ టాబ� అంద�బాట�లో ఉంట�ంది."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:695
-msgid "The Proxy tab will be available only when the account is enabled."
-msgstr "ఖాతా చేతనంగా ఉన�నప�ప�డ� మాత�రమే ప�రాక�సీ టాబ� అంద�బాట�లో ఉంట�ంది."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:700
-#, fuzzy
-msgctxt "GW"
-msgid "Proxy"
-msgstr "ప�రాక�సీ"
-
-#: ../plugins/groupwise-features/proxy.c:926
-#: ../plugins/groupwise-features/share-folder.c:691
-msgid "Add User"
-msgstr "వినియోగదార�ని జతచేయ�మ�"
-
-#: ../plugins/groupwise-features/send-options.c:212
-msgid "Advanced send options"
-msgstr "పంప�టక� ఆధ�నిక �చ�చికాల�"
-
-#: ../plugins/groupwise-features/share-folder-common.c:309
-#: ../plugins/groupwise-features/share-folder.c:726
-msgid "Users"
-msgstr "వినియోగదార�ల�"
-
-#: ../plugins/groupwise-features/share-folder-common.c:310
-msgid "Enter the users and set permissions"
-msgstr "వినియోగదార�లన� ప�రవేశపెట�టండి మరియ� అన�మత�లన� అమర�చండి"
-
-#: ../plugins/groupwise-features/share-folder-common.c:410
-msgid "Sharing"
-msgstr "పంచ�కొన�చ�న�న"
-
-#: ../plugins/groupwise-features/share-folder.c:529
-msgid "Custom Notification"
-msgstr "మల�చ�కొనిన నోటీస�"
-
-#: ../plugins/groupwise-features/share-folder.c:731
-msgid "Add   "
-msgstr "జతచేయ�మ�   "
-
-#: ../plugins/groupwise-features/status-track.c:123
-msgid "Message Status"
-msgstr "సందేశం స�థితి"
-
-#. Subject
-#: ../plugins/groupwise-features/status-track.c:137
-msgid "Subject:"
-msgstr "సంగతి:"
-
-#: ../plugins/groupwise-features/status-track.c:151
-msgid "From:"
-msgstr "న�ండి:"
-
-#: ../plugins/groupwise-features/status-track.c:166
-msgid "Creation date:"
-msgstr "సృష�టించిన నాటి తేది:"
-
-#: ../plugins/groupwise-features/status-track.c:206
-msgid "Recipient: "
-msgstr "స�వీకరణదారి: "
-
-#: ../plugins/groupwise-features/status-track.c:213
-msgid "Delivered: "
-msgstr "పంపబడింది: "
-
-#: ../plugins/groupwise-features/status-track.c:219
-msgid "Opened: "
-msgstr "తెరిచిన: "
-
-#: ../plugins/groupwise-features/status-track.c:224
-msgid "Accepted: "
-msgstr "ఆమొదించబడినది: "
-
-#: ../plugins/groupwise-features/status-track.c:229
-msgid "Deleted: "
-msgstr "తొలగించబడినది: "
-
-#: ../plugins/groupwise-features/status-track.c:234
-msgid "Declined: "
-msgstr "తిరస�కరించబడింది: "
-
-#: ../plugins/groupwise-features/status-track.c:239
-msgid "Completed: "
-msgstr "పూర�తైనది: "
-
-#: ../plugins/groupwise-features/status-track.c:244
-msgid "Undelivered: "
-msgstr "పంపబడని: "
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 #, fuzzy
 msgid "Inline Image"
@@ -17707,12 +17789,12 @@ msgstr "ఇన�‌లైన� vకార�డ�ల�"
 msgid "View image attachments directly in mail messages."
 msgstr "మెయిల� సందేశమ�లనంద� vకార�డ�లన� నేర�గా చూప�మ�."
 
-#: ../plugins/imap-features/imap-headers.c:330
+#: ../plugins/imap-features/imap-headers.c:337
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "మల�చ�కొనిన పీఠికల�"
 
-#: ../plugins/imap-features/imap-headers.c:343
+#: ../plugins/imap-features/imap-headers.c:349
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP పీఠికల�"
@@ -17739,8 +17821,12 @@ msgstr ""
 "మీర� ఎక�క�వ పీఠికలన� కలిగఉంటే దిగ�మతి అవ�వటానికి ఎక�క�వ సమయం తీస�క�ంట�ంది."
 
 #: ../plugins/imap-features/imap-headers.ui.h:8
+#, fuzzy
+#| msgid ""
+#| "_Basic Headers - (Fastest) \n"
+#| "Use this if you do not have filters based on mailing lists"
 msgid ""
-"_Basic Headers - (Fastest) \n"
+"_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
 "ప�రాధమిక పీఠికల� - (వేగవంతమైన) \n"
@@ -17759,240 +17845,267 @@ msgid "IMAP Features"
 msgstr "IMAP సౌలభ�యాల�"
 
 #. Translators: The first '%s' is replaced with a calendar name,
-#. the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:485
+#. * the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:499
 #, fuzzy, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "క�యాలెండర� '%s'న� లోడ�చేయలేకపోయింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:649
+#: ../plugins/itip-formatter/itip-formatter.c:659
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "క�యాలెండర� '%s' నందలి ఒక నియామకం ఈ సమావేశం తో విభేదిస�త�న�నది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:685
+#: ../plugins/itip-formatter/itip-formatter.c:683
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "క�యాలెండర� '%s' నంద� ఒక నియామకాన�ని కన�గొన�మ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:784
+#: ../plugins/itip-formatter/itip-formatter.c:789
 msgid "Unable to find any calendars"
 msgstr "� క�యాలెండర�లన� కన�గోనలేకపోయింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:796
 msgid "Unable to find this meeting in any calendar"
 msgstr "ఈ సమావేశాన�ని � క�యాలెండర� నందూ కన�గొనలేకపోయింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:800
 msgid "Unable to find this task in any task list"
 msgstr "� కర�తవ�య జాబితాలోన� ఈ కర�తవ�యమ�న� కన�గొనలేకపోయింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:799
+#: ../plugins/itip-formatter/itip-formatter.c:804
 msgid "Unable to find this memo in any memo list"
 msgstr "ఈ మెమోన� � మెమో జాబితానంద� కన�గొనలేక పోయింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
-msgid "Opening the calendar. Please wait.."
+#: ../plugins/itip-formatter/itip-formatter.c:1082
+#, fuzzy
+#| msgid "Opening the calendar. Please wait.."
+msgid "Opening the calendar. Please wait..."
 msgstr "క�యాలెండర�‌న� తెర�చ�చ�న�నది. దయచేసి వేచివ�ండ�..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:1085
 msgid "Searching for an existing version of this appointment"
 msgstr "ఈ నియామకం యొక�క ఉన�న వర�షన� కొరక� శోధిస�త�న�నది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1362
 msgid "Unable to parse item"
 msgstr "అంశమ�న� పార�శ చేయలేకపోతోంది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1451
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "అంశమ�న� క�యాలెండర� '%s' క� పంపలేకపోయింది.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1463
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ఆమోదించినట�ల�గా క�యాలెండర� '%s' క� పంపినది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1467
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "పరిశీలించినట�ల�గా క�యాలెండర� '%s' క� పంపింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1472
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "తిరస�కరించినట�ల�గా క�యాలెండర� '%s' క� పంపింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1477
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "రద�ద�చేసినట�ల�గా క�యాలెండర� '%s' క� పంపింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1579
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "నిర�వాహకి ప�రతినిధి %s న� తీసివేసింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1586
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ప�రతినిధికి రద�ద� నొటీస�న� పంపినది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "రద�ద� నోటీస�న� ప�రతినిదికి పంపలేక పోయింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1700
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "హాజరైనవారి స�థితి నవీకరించబడలేద� ఎంచేతంటే ఆ స�థితి చెల�లనిది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1729
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "హాజరైనవ�యక�తిని ని నవీకరించలేమ�. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1733
 msgid "Attendee status updated"
 msgstr "హజరైనవ�యక�తి స�థితి నవీకరించబడింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1737
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "అంశం లేనంద�న జవాబ�దార�ని స�థితి తాజాపరచబడలేద�"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1759
 msgid "Meeting information sent"
 msgstr " సమావేశ సమాచారం పంపబడింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 msgid "Task information sent"
 msgstr "కర�తవ�య సమాచారం పంపబడింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1765
 msgid "Memo information sent"
 msgstr "మెమో సమాచారం పంపబడింది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1774
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "సమావేశం సమాచారాన�ని పంపలేక పోయింది, సమావేశం లేద�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1777
 msgid "Unable to send task information, the task does not exist"
 msgstr "కర�తవ�యం సమాచారాన�ని పంపలేకపోయింది, కర�తవ�యం లేద�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1780
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "మెమో సమాచరాన�ని పంపలేకపోయింది, మెమో లేద�"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1846
 #, fuzzy
 msgid "calendar.ics"
 msgstr "క�యాలెండర� ల�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1851
 #, fuzzy
 msgid "Save Calendar"
 msgstr "కొత�త క�యాలెండర�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1914
+#: ../plugins/itip-formatter/itip-formatter.c:1925
 msgid "The calendar attached is not valid"
 msgstr "అన�భందించిన క�యాలెండర� విల�వైనది కాద�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
+#: ../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 "క�యాలెండర� కలిగిఉండ�టక� సందేశం ఉంది, అయితే క�యాలెండర� విల�వైన �క�యాలెండర� కాద�."
+msgstr ""
+"క�యాలెండర� కలిగిఉండ�టక� సందేశం ఉంది, అయితే క�యాలెండర� విల�వైన �క�యాలెండర� "
+"కాద�."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../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 "క�యాలెండర� నంద� ఉన�న అంశమ� విల�వైనది కాద�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../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 ""
-"సందేశం క�యాలెండర�న� కలిగిఉంది, అయితే క�యాలెండర� � ఘటనలన�, కర�తవ�యాలన� లేదా ఖాళీ/తీరికలేని సమాచారంన� "
+"సందేశం క�యాలెండర�న� కలిగిఉంది, అయితే క�యాలెండర� � ఘటనలన�, కర�తవ�యాలన� లేదా "
+"ఖాళీ/తీరికలేని సమాచారంన� "
 "కలిగిలేద�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:2008
 msgid "The calendar attached contains multiple items"
 msgstr "అన�భందించిన క�యాలెండర� బహ�ళ అంశమ�లన� కలిగిఉంది"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:2009
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
-msgstr "ఈ అంశమ�లన�నింటిని నడ�ప�టక�, దస�త�రం తప�పక దాయాలి మరియ� క�యాలెండర� దిగ�మతి కావాలి"
+msgstr ""
+"ఈ అంశమ�లన�నింటిని నడ�ప�టక�, ఫైల� తప�పక దాయాలి మరియ� క�యాలెండర� దిగ�మతి "
+"కావాలి"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2672
+#, fuzzy
+msgctxt "cal-itip"
+msgid "None"
+msgstr "�దికాద�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2452
+#: ../plugins/itip-formatter/itip-formatter.c:2688
+msgid "Tentatively Accepted"
+msgstr "ప�రయోగాత�మకంగా ఆమొదించబడినది"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2806
 msgid "This meeting recurs"
 msgstr "సమావేశం ప�నరావృతి"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2455
+#: ../plugins/itip-formatter/itip-formatter.c:2809
 msgid "This task recurs"
 msgstr "కర�తవ�యం ప�నరావృతి"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2458
+#: ../plugins/itip-formatter/itip-formatter.c:2812
 msgid "This memo recurs"
 msgstr "మెమో ప�నరావృతి"
 
+#: ../plugins/itip-formatter/itip-formatter.c:3036
+#, fuzzy
+#| msgid "Meeting Information"
+msgid "Meeting Invitations"
+msgstr "సమావేశ సమాచారం"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2692
+#: ../plugins/itip-formatter/itip-formatter.c:3061
 msgid "_Delete message after acting"
 msgstr "సందేశాన�ని స�పందిచిన తర�వాత తొలగించమ�(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2702
-#: ../plugins/itip-formatter/itip-formatter.c:2735
+#: ../plugins/itip-formatter/itip-formatter.c:3071
+#: ../plugins/itip-formatter/itip-formatter.c:3104
 msgid "Conflict Search"
-msgstr "విభేందించ� శోధన"
+msgstr "విభేందించ� అన�వేషణ"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2717
+#: ../plugins/itip-formatter/itip-formatter.c:3086
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "సమావేశ విభేదాలన� శోధించ�టక� క�యాలెండర� న� ఎంపికచేస�కొన�మ�"
 
 #. 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 "ఈరోజ� %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 "ఈరోజ� %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 "ఈరోజ� %l:%M:%S %p"
 
 #. 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 "మర�నాడ� %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 "మర�నాడ� %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 "మర�నాడ� %l:%M %p"
 
 #. 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 "మర�నాడ� %l:%M:%S %p"
@@ -18004,56 +18117,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"
@@ -18064,366 +18177,381 @@ msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
+#. * time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
+#. * time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
+#. * time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
+#. * time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:367
-#: ../plugins/itip-formatter/itip-view.c:455
-#: ../plugins/itip-formatter/itip-view.c:542
-#, fuzzy, c-format
-msgid "Please respond on behalf of %s"
-msgstr "<b>%s</b> తర�ప�న ప�రతిస�పందించ�మ�"
+#: ../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 "అపరిచిత వ�యక�తి"
 
 #: ../plugins/itip-formatter/itip-view.c:369
 #: ../plugins/itip-formatter/itip-view.c:457
 #: ../plugins/itip-formatter/itip-view.c:544
 #, fuzzy, c-format
+msgid "Please respond on behalf of %s"
+msgstr "<b>%s</b> తర�ప�న ప�రతిస�పందించ�మ�"
+
+#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:546
+#, fuzzy, c-format
 msgid "Received on behalf of %s"
 msgstr "<b>%s</b> తర�ప�న స�వీకరించింది"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, fuzzy, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది సమావేశ సమాచారాన�ని ప�రచ�రించినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, fuzzy, c-format
 msgid "%s has published the following meeting information:"
 msgstr "<b>%s</b> ఈ క�రింది సమావేశ సమాచారాన�ని ప�రచ�రించినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:383
 #, fuzzy, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "<b>%s</b> ఈ క�రింది సమావేశాన�ని మీక� ప�రాతినిధ�యవహించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:386
 #, fuzzy, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది సమావేశం వద�ద మీ హాజర�న� అభ�యర�ధించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
 #, fuzzy, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "<b>%s</b> ఈ క�రింది సమావేశం వద�ద మీ హాజర�న� అభ�యర�ధించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, fuzzy, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> గ�ండా %s ఉన�న సమావేశాన�ని జోడించదలచింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, fuzzy, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ఉన�న సమావేశాన�ని జోడించదలచింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, fuzzy, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
-msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది సమాశం కొరక� తాజా సమాచారాన�ని పొంద దల�చినది:"
+msgstr ""
+"<b>%s</b> గ�ండా %s ఈ క�రింది సమాశం కొరక� తాజా సమాచారాన�ని పొంద దల�చినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, fuzzy, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> ఈ క�రింది సమావేశం కొరక� తాజా సమాచారాన�ని పొంద దల�చినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, fuzzy, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది సమావేశం స�పందనన� వెన�కక� పంపినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, fuzzy, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "<b>%s</b> ఈ క�రింది సమావేశం స�పందనన� వెన�కక� పంపినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:410
+#: ../plugins/itip-formatter/itip-view.c:412
 #, fuzzy, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది సమావేశాన�ని రద�ద� చేసింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:412
+#: ../plugins/itip-formatter/itip-view.c:414
 #, fuzzy, c-format
 msgid "%s has canceled the following meeting."
 msgstr "<b>%s</b> సమావేశాన�ని రద�ద� చేసింది."
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:418
 #, fuzzy, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది సమావేశ మార�పలన� ప�రస�తావించింది."
 
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:420
 #, fuzzy, c-format
 msgid "%s has proposed the following meeting changes."
 msgstr "<b>%s</b> ఈ క�రింది సమావేశ మార�ప�లన� ప�రస�తావించింది."
 
-#: ../plugins/itip-formatter/itip-view.c:422
+#: ../plugins/itip-formatter/itip-view.c:424
 #, fuzzy, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది సమావేశ మార�ప�లన� తిరస�కరించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:426
 #, fuzzy, c-format
 msgid "%s has declined the following meeting changes."
 msgstr "<b>%s</b> ఈ క�రింది సమావేశ మార�ప�లన� తిరస�కరించింది."
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, fuzzy, c-format
 msgid "%s through %s has published the following task:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది కర�తవ�యాన�ని ప�రచ�రించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, fuzzy, c-format
 msgid "%s has published the following task:"
 msgstr "<b>%s</b> ఈ క�రింది కర�తవ�యాన�ని ప�రచ�రించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../plugins/itip-formatter/itip-view.c:471
 #, fuzzy, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> ఈ క�రింది కర�తవ�యమ�నక� %s యొక�క చెరికన� అభ�యర�దించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:472
+#: ../plugins/itip-formatter/itip-view.c:474
 #, fuzzy, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "<b>%s</b> గ�ండా %s మీక� ఒక కర�తవ�యాన�ని అప�పగిస�త�ంది:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
 #, fuzzy, c-format
 msgid "%s has assigned you a task:"
 msgstr "<b>%s</b> మీక� ఒక కర�తవ�యాన�ని అప�పగించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, fuzzy, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> గ�ండా %s  ఉన�న కార�తవ�యాన�ని జోడించిదల�చింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, fuzzy, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "<b>%s</b> ఉన�న కార�తవ�యాన�ని జోడించిదల�చింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, fuzzy, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
-msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది అప�పగించన కర�తవ�యమ�నక� తాజా సమాచారాన�ని పొంద దల�చినది:"
+msgstr ""
+"<b>%s</b> గ�ండా %s ఈ క�రింది అప�పగించన కర�తవ�యమ�నక� తాజా సమాచారాన�ని పొంద "
+"దల�చినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
 #, fuzzy, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
-msgstr "<b>%s</b> ఈ క�రింది అప�పగించిన కర�తవ�యానికి తాజా కార�య సమాచారాన�ని పొంద దల�చినది:"
+msgstr ""
+"<b>%s</b> ఈ క�రింది అప�పగించిన కర�తవ�యానికి తాజా కార�య సమాచారాన�ని పొంద "
+"దల�చినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, fuzzy, c-format
 msgid "%s through %s has sent back the following assigned task response:"
-msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది అప�పగించిన కర�తవ�యం స�పందనన� వెన�కక� పంపినది:"
+msgstr ""
+"<b>%s</b> గ�ండా %s ఈ క�రింది అప�పగించిన కర�తవ�యం స�పందనన� వెన�కక� పంపినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, fuzzy, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "<b>%s</b> ఈ క�రింది అప�పగించిన కర�తవ�యం స�పందనన� వెన�కక� పంపినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:498
+#: ../plugins/itip-formatter/itip-view.c:500
 #, fuzzy, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది అప�పగించిన కర�తవ�యం రద�ద�చేసినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:500
+#: ../plugins/itip-formatter/itip-view.c:502
 #, fuzzy, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "<b>%s</b> ఈ క�రింది అప�పగించిన కర�తవ�యం రద�ద�చేసినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:504
+#: ../plugins/itip-formatter/itip-view.c:506
 #, fuzzy, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది కర�తవ�యం అప�పగింత మార�ప�లన� ప�రస�తావించింది:"
+msgstr ""
+"<b>%s</b> గ�ండా %s ఈ క�రింది కర�తవ�యం అప�పగింత మార�ప�లన� ప�రస�తావించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:506
+#: ../plugins/itip-formatter/itip-view.c:508
 #, fuzzy, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ఈ క�రింది కర�తవ�యం అప�పగింత మార�ప�లన� ప�రస�తావించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:510
+#: ../plugins/itip-formatter/itip-view.c:512
 #, fuzzy, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "<b>%s</b> గ�ండా %s ఈ క�రింది అప�పగించిన కర�తవ�యాన�ని తిరస�కరించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:512
+#: ../plugins/itip-formatter/itip-view.c:514
 #, fuzzy, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "<b>%s</b> క�రింది అప�పగించిన కర�తవ�యాన�ని తిరస�కరించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../plugins/itip-formatter/itip-view.c:551
 #, fuzzy, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "<b>%s</b> న�ండి %s క�రింది మెమోన� ప�రచ�రించినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:551
+#: ../plugins/itip-formatter/itip-view.c:553
 #, fuzzy, c-format
 msgid "%s has published the following memo:"
 msgstr "<b>%s</b> క�రింది మెమోన� ప�రచ�రించింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:556
+#: ../plugins/itip-formatter/itip-view.c:558
 #, fuzzy, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> గ�ండా %s ఉన�న మెమో న� జోడించదలచింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:558
+#: ../plugins/itip-formatter/itip-view.c:560
 #, fuzzy, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "<b>%s</b> ఉన�న మెమో న� జోడించదలచింది:"
 
-#: ../plugins/itip-formatter/itip-view.c:562
+#: ../plugins/itip-formatter/itip-view.c:564
 #, fuzzy, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> గ�ండా %s ఈక�రింది భాగస�వామ�య మెమోన� రద�ద�చేసినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:564
+#: ../plugins/itip-formatter/itip-view.c:566
 #, fuzzy, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "<b>%s</b>ఈక�రింది భాగస�వామ�య మెమోన� రద�ద�చేసినది:"
 
-#: ../plugins/itip-formatter/itip-view.c:688
+#: ../plugins/itip-formatter/itip-view.c:690
 msgid "All day:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:700
 #, fuzzy
 msgid "Start day:"
 msgstr "ప�రారంభ తేది(_r):"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1053
+#: ../plugins/itip-formatter/itip-view.c:700
+#: ../plugins/itip-formatter/itip-view.c:1062
 msgid "Start time:"
 msgstr "ప�రారంభ సమయం:"
 
-#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:712
 #, fuzzy
 msgid "End day:"
 msgstr "%d రోజ�"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:712
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "End time:"
 msgstr "మ�గింప� సమయం:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Open Calendar"
 msgstr "క�యాలెండర�‌న� తెర�వ�మ�(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:849
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:859
-#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../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 "తిరస�కరించ�(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:850
 #: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:862
-#: ../plugins/itip-formatter/itip-view.c:878
+#: ../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
 #, fuzzy
 msgid "A_ccept"
 msgstr "ఆమోదించ�"
 
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Decline all"
 msgstr "అన�నీ తిరస�కరించ�(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative all"
 msgstr "అన�నిటిని పరిశీలించ�(_T)"
 
-#: ../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: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 "పరిశీలకంగా(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 #, fuzzy
 msgid "A_ccept all"
 msgstr "అన�నీ ఆమోదించ�(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:866
+#: ../plugins/itip-formatter/itip-view.c:871
 msgid "_Send Information"
 msgstr "సమాచారాన�ని పంప�(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:875
 msgid "_Update Attendee Status"
 msgstr "హాజరైనవాని స�థితిని నవీకరించ�మ�(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:873
+#: ../plugins/itip-formatter/itip-view.c:878
 msgid "_Update"
 msgstr "నవీకరించ�మ�(_U)"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1084
-#: ../plugins/itip-formatter/itip-view.c:1138
+#: ../plugins/itip-formatter/itip-view.c:1093
+#: ../plugins/itip-formatter/itip-view.c:1147
 msgid "Comment:"
 msgstr "వ�యాఖ�య:"
 
-#: ../plugins/itip-formatter/itip-view.c:1123
+#: ../plugins/itip-formatter/itip-view.c:1132
 msgid "Send _reply to sender"
 msgstr "పంపినవానికి ప�రత�య�త�తరమ� పంప�మ�(_r)"
 
-#: ../plugins/itip-formatter/itip-view.c:1153
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "Send _updates to attendees"
 msgstr "హాజరైనవానికి నవీకరణలన� పంప�మ�(_u)"
 
-#: ../plugins/itip-formatter/itip-view.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "_Apply to all instances"
 msgstr "అన�ని ఇన�‌స�టాన�స�లక� ఆపాదించ�మ�(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1171
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "Show time as _free"
 msgstr "సమయం న� తీరికగా చూప�మ�(_f)"
 
-#: ../plugins/itip-formatter/itip-view.c:1174
+#: ../plugins/itip-formatter/itip-view.c:1183
 msgid "_Preserve my reminder"
 msgstr "నాక� గ�ర�త�చేయ�దానిని నిల�వవ�ంచ�మ� (_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1180
+#: ../plugins/itip-formatter/itip-view.c:1189
 msgid "_Inherit reminder"
 msgstr "పారంపరంగా గ�ర�త�చేయ�నది (_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1923
+#: ../plugins/itip-formatter/itip-view.c:1965
 msgid "_Tasks:"
 msgstr "కర�తవ�యాల�(_T):"
 
-#: ../plugins/itip-formatter/itip-view.c:1925
+#: ../plugins/itip-formatter/itip-view.c:1967
 msgid "_Memos:"
 msgstr "మెమోల� (_M):"
 
@@ -18439,7 +18567,8 @@ msgstr "Itip రూపీకరణి"
 #, fuzzy
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr ""
-"&quot;{0}&quot; సమావేశంక� ప�రాతినిధ�యం వహించింది. మీర� ప�రతినిధి &quot;{1}&quot; ని "
+"&quot;{0}&quot; సమావేశంక� ప�రాతినిధ�యం వహించింది. మీర� ప�రతినిధి "
+"&quot;{1}&quot; ని "
 "జతచాయాలన�క�ంట�న�నారా?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -18449,92 +18578,65 @@ msgstr "ఈ సమావేశం ప�రాతినిధ�యం వహి
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
-msgstr "ఈ సమాధానం వర�తమాన జవాబ�దార�నిన�ండి రాలేద�. పంపినవానిని జవాబ�దార�నిగా జోడించండి?"
+msgstr ""
+"ఈ సమాధానం వర�తమాన జవాబ�దార�నిన�ండి రాలేద�. పంపినవానిని జవాబ�దార�నిగా "
+"జోడించండి?"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
-msgstr "శబ�దప� దస�త�రం న� బీప� లేదా ప�లే చేయ�మ�"
+msgstr "శబ�దప� ఫైల� న� బీప� లేదా ప�లే చేయ�మ�"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Blink icon in notification area."
-msgstr "ప�రకటన ప�రదేశంనంద� ప�రతిమన� బ�లింక�‌చేయ�మ�."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
-msgid "Enable D-Bus messages."
-msgstr "D-Bus సందేశాలన� చేతనంచేయ�మ�."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Enable icon in notification area."
 msgstr "ప�రకటన ప�రదేశంనంద� ప�రతిమన� చేతనంచేయ�మ�."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
-msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr "కొత�త మెయిల� సందేశం వచ�చినప�ప�డ� D-Bus సందేశంన� సంభవింపచేస�త�ంది."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
-msgstr "నిజమైతే, బీప� చేయాలి, లేకపోతే సందేశం వచ�చినప�ప�డ� శబ�దప� దస�త�రంన� ప�లేచేయాలి."
+msgstr ""
+"నిజమైతే, బీప� చేయాలి, లేకపోతే సందేశం వచ�చినప�ప�డ� శబ�దప� ఫైల�న� ప�లేచేయాలి."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Notify new messages for Inbox only."
 msgstr "ఇన�‌బాక�స��‌క� మాత�రమే కొత�త సందేశాల ప�రకటనన�యివ�వ�."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid "Play sound when new messages arrive."
 msgstr "కొత�త సందేశం వచ�చినప�ప�డ� శబ�దమ�న� ప�లే చేయ�మ�."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 #, fuzzy
 msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr "కొత�త సందేశం వచ�చినప�ప�డ� శబ�దప� దస�త�రం ప�లేకావాలి, బీప� రీతి నంద� లేకపోతే."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
-msgid "Popup message together with the icon."
-msgstr "సందేశంన� ప�రతిమతో కలిపి పాప�అప� చేయ�మ�."
+msgstr ""
+"కొత�త సందేశం వచ�చినప�ప�డ� శబ�దప� ఫైల� ప�లేకావాలి, బీప� రీతి నంద� లేకపోతే."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "ప�రకటన ప�రదేశంలో కొత�త సందేశం రాగానే కొత�త మెయిల� ప�రతిమన� చూప�మ�."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Sound file name to be played."
-msgstr "ప�లే చేయ�టక� శబ�దప� దస�త�రం నామమ�."
+msgstr "ప�లే చేయ�టక� శబ�దప� ఫైల� పేర�."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
-msgstr "కొత�త సందేశం వచ�చినప�ప�డ� శబ�దప� దస�త�రం ప�లేకావాలి, బీప� రీతి నంద� లేకపోతే."
+msgstr ""
+"కొత�త సందేశం వచ�చినప�ప�డ� శబ�దప� ఫైల� ప�లేకావాలి, బీప� రీతి నంద� లేకపోతే."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Use sound theme"
 msgstr ""
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "కొత�తసందేశం వచ�చనప�ప�డ� శబ�దం ప�లే చేయాలా లేదా బీప� ప�లే చేయాలా."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
-msgid "Whether show message over the icon when new messages arrive."
-msgstr "కొత�త సందేశం వచ�చినప�ప�డ� ప�రతిమ పై సందేశం చూపాలా."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
-msgid "Whether the icon should blink or not."
-msgstr "ప�రతిమ బ�లింక� కావాలా వద�దా."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "ఇన�‌బాక�స� సంచయం నందలి కొత�త సందేశాలన� మాత�రమే తెల�పాలా."
 
-#: ../plugins/mail-notification/mail-notification.c:355
-msgid "Evolution's Mail Notification"
-msgstr "ఎవాల�యూషన�‌యొక�క మెయిల� ప�రకటన"
-
-#: ../plugins/mail-notification/mail-notification.c:377
-msgid "Mail Notification Properties"
-msgstr "మెయిల� ప�రకటన లక�షణాల�"
-
-#: ../plugins/mail-notification/mail-notification.c:513
+#: ../plugins/mail-notification/mail-notification.c:391
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18549,72 +18651,66 @@ msgstr[1] ""
 "మీర� %d కొత�త సందేశంన�\n"
 "%sనంద� పొందార�."
 
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user@example.com"
-#: ../plugins/mail-notification/mail-notification.c:525
-#, fuzzy, c-format
-msgid "From: %s"
-msgstr "%s న�ండి:"
-
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:538
+#: ../plugins/mail-notification/mail-notification.c:416
 #, fuzzy, c-format
 msgid "Subject: %s"
 msgstr "సంగతి:"
 
-#: ../plugins/mail-notification/mail-notification.c:548
+#: ../plugins/mail-notification/mail-notification.c:427
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "మీర� %d కొత�త సందేశాన�ని పొందార�."
 msgstr[1] "మీర� %d కొత�త సందేశాన�ని పొందార�."
 
-#: ../plugins/mail-notification/mail-notification.c:570
-#: ../plugins/mail-notification/mail-notification.c:577
+#: ../plugins/mail-notification/mail-notification.c:436
+#: ../plugins/mail-notification/mail-notification.c:444
+#: ../plugins/mail-notification/mail-notification.c:447
 msgid "New email"
 msgstr "కొత�త ఈమెయిల�"
 
-#: ../plugins/mail-notification/mail-notification.c:638
-msgid "Show icon in _notification area"
-msgstr "ప�రకటన ప�రదేశంలో ప�రతిమన� చూప�మ�(_n)"
-
-#: ../plugins/mail-notification/mail-notification.c:666
-msgid "B_link icon in notification area"
-msgstr "ప�రకటన ప�రదేశం లో ప�రతిమన� బ�లింక� చేయ�మ�(_l)"
-
-#: ../plugins/mail-notification/mail-notification.c:676
-msgid "Popup _message together with the icon"
-msgstr "ప�రతిమతో కూడి సందేశాన�ని పాప�అప� చేయ�మ�(_m)"
+#. Translators: The '%s' is a mail
+#. * folder name.  (e.g. "Show Inbox")
+#: ../plugins/mail-notification/mail-notification.c:468
+#, fuzzy, c-format
+#| msgid "Show"
+msgid "Show %s"
+msgstr "చూప�మ�"
 
-#: ../plugins/mail-notification/mail-notification.c:863
-msgid "_Play sound when new messages arrive"
+#: ../plugins/mail-notification/mail-notification.c:673
+#, fuzzy
+#| msgid "_Play sound when new messages arrive"
+msgid "_Play sound when a new message arrives"
 msgstr "కొత�త సందేశం వచ�చినప�ప�డ� శబ�దమ�న� ప�లే చేయ�మ� (_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:892
+#: ../plugins/mail-notification/mail-notification.c:703
 msgid "_Beep"
 msgstr "బీప�(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:905
+#: ../plugins/mail-notification/mail-notification.c:716
 msgid "Use sound _theme"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:924
+#: ../plugins/mail-notification/mail-notification.c:735
 #, fuzzy
 msgid "Play _file:"
-msgstr "శబ�దప� దస�త�రాన�ని ప�లే చేయ�మ�(_s)"
+msgstr "శబ�దప� ఫైల�న� ప�లే చేయ�మ�(_s)"
 
-#: ../plugins/mail-notification/mail-notification.c:935
+#: ../plugins/mail-notification/mail-notification.c:744
 msgid "Select sound file"
-msgstr "శబ�దప� దస�త�రాన�ని ఎంపికచేయ�మ�"
+msgstr "శబ�దప� ఫైల�న� ఎంపికచేయ�మ�"
 
-#: ../plugins/mail-notification/mail-notification.c:993
+#: ../plugins/mail-notification/mail-notification.c:801
 msgid "Notify new messages for _Inbox only"
 msgstr "ఇన�‌బాక�స� క� కొత�త సందేశాలన� మాత�రమే ప�రకటింట�మ�(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:1002
-msgid "Generate a _D-Bus message"
-msgstr "_D-Bus సందేశాన�ని సంభంవింపచేయ�మ�"
+#: ../plugins/mail-notification/mail-notification.c:811
+#, fuzzy
+#| msgid "Show new mail icon in notification area when new messages arrive."
+msgid "Show _notification when a new message arrives"
+msgstr "ప�రకటన ప�రదేశంలో కొత�త సందేశం రాగానే కొత�త మెయిల� ప�రతిమన� చూప�మ�."
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
@@ -18625,196 +18721,151 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "కొత�త మెయిల� సందేశమ�ల� వచ�చినప�ప�డ� మీక� తెలియజేస�త�ంది."
 
 #. 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:158
+#: ../plugins/mail-to-task/mail-to-task.c:238
 #, c-format
 msgid "Created from a mail by %s"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:489
+#: ../plugins/mail-to-task/mail-to-task.c:603
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr ""
-"ఎంపికచేసిన క�యాలెండర� యిప�పటికే ఘటన '%s'న� కలిగివ�ంది. మీర� పాత ఘటనన� సరికూర�చాలని అన�కొన�చ�న�నారా?"
+"ఎంపికచేసిన క�యాలెండర� యిప�పటికే ఘటన '%s'న� కలిగివ�ంది. మీర� పాత ఘటనన� "
+"సరికూర�చాలని అన�కొన�చ�న�నారా?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:492
+#: ../plugins/mail-to-task/mail-to-task.c:606
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 msgstr ""
-"ఎంపికచేసిన కర�తవ�య జాబితా యిప�పటికే కర�తవ�యం '%s'న� కలిగివ�ంది. మీర� పాత కర�తవ�యాన�ని సరికూర�చ�టక� "
+"ఎంపికచేసిన కర�తవ�య జాబితా యిప�పటికే కర�తవ�యం '%s'న� కలిగివ�ంది. మీర� పాత "
+"కర�తవ�యాన�ని సరికూర�చ�టక� "
 "యిష�టపడతారా?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:495
+#: ../plugins/mail-to-task/mail-to-task.c:609
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 msgstr ""
-"ఎంపికైన మెమో జాబితా యిప�పటికే మెమో '%s'న� కలిగివ�ంది. మీర� పాత మెమోన� సరికూర�చాలని అన�కొన�చ�న�నారా?"
+"ఎంపికైన మెమో జాబితా యిప�పటికే మెమో '%s'న� కలిగివ�ంది. మీర� పాత మెమోన� "
+"సరికూర�చాలని అన�కొన�చ�న�నారా?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:515
+#: ../plugins/mail-to-task/mail-to-task.c:626
+#, c-format
 msgid ""
-"Selected calendar contains some events for the given mails already. Would "
-"you like to create new events anyway?"
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
 msgstr ""
-"ఎంపికచేసిన క�యాలెండర� కొన�ని ఘటనలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త ఘటనలన� "
-"సృష�టించ�దామని అన�కొన�చ�న�నరా?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:521
+#: ../plugins/mail-to-task/mail-to-task.c:629
+#, c-format
 msgid ""
-"Selected task list contains some tasks for the given mails already. Would "
-"you like to create new tasks anyway?"
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
 msgstr ""
-"ఎంపికచేసిన కర�తవ�య జాబితా కొన�ని కర�తవ�యాలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త "
-"కర�తవ�యాలన� సృష�టించ�దామని అన�కొన�చ�న�నరా?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:527
+#: ../plugins/mail-to-task/mail-to-task.c:632
+#, c-format
 msgid ""
-"Selected memo list contains some memos for the given mails already. Would "
-"you like to create new memos anyway?"
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
 msgstr ""
-"ఎంపికచేసిన మెమో జాబితా కొన�ని మెమోలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త మెమోలన� "
-"సృష�టించ�దామని అన�కొన�చ�న�నరా?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:548
-msgid ""
-"Selected calendar contains an event for the given mail already. Would you "
-"like to create new event anyway?"
-msgid_plural ""
-"Selected calendar contains events for the given mails already. Would you "
-"like to create new events anyway?"
-msgstr[0] ""
-"ఎంపికచేసిన క�యాలెండర� వొక ఘటనన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త ఘటనన� "
-"సృష�టించ�దామని అన�కొన�చ�న�నరా?"
-msgstr[1] ""
-"ఎంపికచేసిన క�యాలెండర� కొన�ని ఘటనలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త ఘటనలన� "
-"సృష�టించ�దామని అన�కొన�చ�న�నరా?"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:557
-msgid ""
-"Selected task list contains a task for the given mail already. Would you "
-"like to create new task anyway?"
-msgid_plural ""
-"Selected task list contains tasks for the given mails already. Would you "
-"like to create new tasks anyway?"
-msgstr[0] ""
-"ఎంపికచేసిన కర�తవ�య జాబితా వొక కర�తవ�యమ�న� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త "
-"కర�తవ�యమ�న� సృష�టించ�దామని అన�కొన�చ�న�నరా?"
-msgstr[1] ""
-"ఎంపికచేసిన కర�తవ�య జాబితా కొన�ని కర�తవ�యాలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త "
-"కర�తవ�యాలన� సృష�టించ�దామని అన�కొన�చ�న�నరా?"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:566
-msgid ""
-"Selected memo list contains a memo for the given mail already. Would you "
-"like to create new memo anyway?"
-msgid_plural ""
-"Selected memo list contains memos for the given mails already. Would you "
-"like to create new memos anyway?"
-msgstr[0] ""
-"ఎంపికచేసిన మెమో జాబితా వొక మెమోన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త మెమోలన� "
-"సృష�టించ�దామని అన�కొన�చ�న�నరా?"
-msgstr[1] ""
-"ఎంపికచేసిన మెమో జాబితాన� కొన�ని మెమోలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త మెమోలన� "
-"సృష�టించ�దామని అన�కొన�చ�న�నరా?"
+#: ../plugins/mail-to-task/mail-to-task.c:651
+#, fuzzy
+#| msgid "Do you wish to overwrite it?"
+msgid "Do you wish to continue converting remaining mails?"
+msgstr "మీర� దీనిని మరల వ�రాయదల�చ�క�ంట�న�నారా?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:726
 msgid "[No Summary]"
 msgstr "[సంక�షిప�తసమాచారమ� లేద�]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:636
+#: ../plugins/mail-to-task/mail-to-task.c:738
 msgid "Invalid object returned from a server"
 msgstr "సేవికన�ండి చెల�లని ఆబ�జక�ట� తిరిగివచ�చింది"
 
-#: ../plugins/mail-to-task/mail-to-task.c:707
+#: ../plugins/mail-to-task/mail-to-task.c:788
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "ప�రోసెసింగ�‌నంద� వొక దోషమ� యెద�రైంది: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:813
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "క�యాలెండర� న� తెర�వలేద�. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:743
+#: ../plugins/mail-to-task/mail-to-task.c:820
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 msgstr ""
-"ఎంపికచేసిన మూలం చద�వ�టక� మాత�రమే, అంటే అక�కడ ఘటనన� సృష�టించలేమ�. వేరే మూలాన�ని ఎంపికచేయ�మ�, "
+"ఎంపికచేసిన మూలం చద�వ�టక� మాత�రమే, అంటే అక�కడ ఘటనన� సృష�టించలేమ�. వేరే "
+"మూలాన�ని ఎంపికచేయ�మ�, "
 "దయచేసి."
 
-#: ../plugins/mail-to-task/mail-to-task.c:746
+#: ../plugins/mail-to-task/mail-to-task.c:823
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr ""
-"ఎంపికచేసిన మూలం చద�వ�టక� మాత�రమే, అంటే అక�కడ కర�తవ�యాన�ని సృష�టించలేమ�. వేరే మూలాన�ని ఎంపికచేయ�మ�, "
+"ఎంపికచేసిన మూలం చద�వ�టక� మాత�రమే, అంటే అక�కడ కర�తవ�యాన�ని సృష�టించలేమ�. వేరే "
+"మూలాన�ని ఎంపికచేయ�మ�, "
 "దయచేసి."
 
-#: ../plugins/mail-to-task/mail-to-task.c:749
+#: ../plugins/mail-to-task/mail-to-task.c:826
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 msgstr ""
-"ఎంపికచేసిన మూలం చద�వ�టక� మాత�రమే, అంటే అక�కడ మెమోన� సృష�టించలేమ�. వేరే మూలాన�ని ఎంపికచేయ�మ�, "
+"ఎంపికచేసిన మూలం చద�వ�టక� మాత�రమే, అంటే అక�కడ మెమోన� సృష�టించలేమ�. వేరే "
+"మూలాన�ని ఎంపికచేయ�మ�, "
 "దయచేసి."
 
-#: ../plugins/mail-to-task/mail-to-task.c:952
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "మూలమ� జాబితాన� పొందలేమ�. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1071
+#: ../plugins/mail-to-task/mail-to-task.c:1138
+#, fuzzy
+#| msgid "No description available."
+msgid "No writable calendar is available."
+msgstr "వివరణ అంద�బాట�లో లేద�"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1230
 msgid "Create an _Event"
 msgstr "ఘటనన� సృష�టించ�మ� (_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1073
+#: ../plugins/mail-to-task/mail-to-task.c:1232
 msgid "Create a new event from the selected message"
 msgstr "ఎంపికచేసిన సందేశమ�న�ండి కొత�త ఘటనన� సృష�టించ�మ�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1078
+#: ../plugins/mail-to-task/mail-to-task.c:1237
 msgid "Create a Mem_o"
 msgstr "మెమోన� సృష�టించ�మ� (_o)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1080
+#: ../plugins/mail-to-task/mail-to-task.c:1239
 msgid "Create a new memo from the selected message"
 msgstr "ఎంపికచేసిన సందేశమ�న�ండి కొత�త మెమోన� సృష�టించ�మ�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1085
+#: ../plugins/mail-to-task/mail-to-task.c:1244
 msgid "Create a _Task"
 msgstr "కర�తవ�యాన�ని సృష�టించ�మ� (_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1087
+#: ../plugins/mail-to-task/mail-to-task.c:1246
 msgid "Create a new task from the selected message"
 msgstr "ఎంపికచేసన సందేశం న�ండి కొత�త కర�తవ�యాన�ని సృష�టించండి"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1095
+#: ../plugins/mail-to-task/mail-to-task.c:1254
 msgid "Create a _Meeting"
 msgstr "సమావేశాన�ని సృష�టించ�మ� (_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1097
+#: ../plugins/mail-to-task/mail-to-task.c:1256
 msgid "Create a new meeting from the selected message"
 msgstr "ఎంపికచేసిన సందేశమ�న�ండి కొత�త సమావేశమ�న� సృష�టించ�మ�"
 
@@ -18822,56 +18873,56 @@ msgstr "ఎంపికచేసిన సందేశమà±�à°¨à±�à°‚à°¡à°¿ à°•à
 msgid "Convert a mail message to a task."
 msgstr "మెయిల� సందేశాన�ని కర�తవ�యానికి మార�చ�మ�."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:346
 msgid "Get List _Archive"
 msgstr "జాబితా ఆర�చివ� న� పొంద�మ�(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:348
 msgid "Get an archive of the list this message belongs to"
 msgstr "ఈ సందేశంక� చెందిన జాబితా యొక�క ఆర�చివ� న� పొంద�మ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:353
 msgid "Get List _Usage Information"
 msgstr "జాబితా ఉపయోగప� సమాచారాన�ని పొంద�మ�(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:355
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "ఈ సందేశంక� చెందిన జాబితా యొక�క ఉపయోగం గ�రించిన సమాచారాన�ని పొంద�మ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:360
 msgid "Contact List _Owner"
 msgstr "పరిచయ జాబితా స�వతందార�(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:362
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "ఈ సందేశం క� చెందిన మెయిలింగ� జాబితా యజమానిని సంప�రదించ�మ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
 msgid "_Post Message to List"
 msgstr "సందేశాన�ని జాబితాక� పోస�ట�చేయ�మ�(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "ఈ సందేశం క� చెందిన మెయిలింగ� జాబితాక� సందేశంన� పోస�ట� చేయ�మ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
 msgid "_Subscribe to List"
 msgstr "జాబితాక� చందాదార� కమ�మ�(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "ఈ సందేశంక� చెందిన మెయిలింగ� జాబితాక� చందాదార� కమ�మ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
 msgid "_Unsubscribe from List"
 msgstr "జాబితాన�ండి చందావిరమించ�కొన�మ�(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
 #, fuzzy
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "ఈ సందేశం క� చెందిన మెయిలింగ� జాబితాక� చందావిరమించ�కొన�మ�"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:330
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
 msgid "Mailing _List"
 msgstr "మెయిలింగ� జాబితా(_L)"
 
@@ -18881,7 +18932,8 @@ msgstr "మెయిలింగ� జాబితా చర�యల�"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
-msgstr "ఉమ�మడి మెయిలింగ� జాబితా ఆదేశాలన� జర�ప�మ� (చందాదార�కమ�మ�,చందావిరమించ�, మొ.)."
+msgstr ""
+"ఉమ�మడి మెయిలింగ� జాబితా ఆదేశాలన� జర�ప�మ� (చందాదార�కమ�మ�,చందావిరమించ�, మొ.)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
@@ -18895,7 +18947,8 @@ msgid ""
 "You should receive an answer from the mailing list shortly after the message "
 "has been sent."
 msgstr ""
-"ఒక ఈ-మెయిల� సందేశం URL \"{0} క� పంపబడింది. మీర� సందేశాన�ని స�వయంచాలకంగా పంపవచ�చ�, లేదా దానిని "
+"ఒక ఈ-మెయిల� సందేశం URL \"{0} క� పంపబడింది. మీర� సందేశాన�ని స�వయంచాలకంగా "
+"పంపవచ�చ�, లేదా దానిని "
 "చూడ�మ� మరియ� మార�చ�మ�.\n"
 "\n"
 "సందేశం పంపబడిన తర�వాత మీర� త�వరలోనే మెయిలింగ� జాబితాన�ండి సమాధానం పొంద�తార�."
@@ -18917,7 +18970,8 @@ msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
 msgstr ""
-"ఈ మెయిలింగ� జాబితా క� పోస�టింగ� అన�మతించబడద�. సాధ�యమ�గా, ఇది చద�వ�ట-మాత�రమే మెయిలింగ� జాబితా. "
+"ఈ మెయిలింగ� జాబితా క� పోస�టింగ� అన�మతించబడద�. సాధ�యమ�గా, ఇది చద�వ�ట-మాత�రమే "
+"మెయిలింగ� జాబితా. "
 "వివరమ�లకొరక� జాబితా యజమానిని సంప�రదించ�మ�."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
@@ -18968,18 +19022,19 @@ msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
 msgstr ""
-"మీర� సందేశాల� చదివినట�ల�గా ప�రస�త�త సంచయంనంద� మాత�రమే గ�ర�త�ంచాలన�క�ంట�న�నారా, లేక ప�రస�త�త "
+"మీర� సందేశాల� చదివినట�ల�గా ప�రస�త�త సంచయంనంద� మాత�రమే "
+"గ�ర�త�ంచాలన�క�ంట�న�నారా, లేక ప�రస�త�త "
 "సంచయంనంద� అదేవిదంగా దాని వ�పసంచయాలనంద� కూడానా?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:194
+#: ../plugins/mark-all-read/mark-all-read.c:215
 msgid "In Current Folder and _Subfolders"
 msgstr "ప�రస�త�త సంచయం మరియ� వ�పసంచయాలనంద� (_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:208
+#: ../plugins/mark-all-read/mark-all-read.c:229
 msgid "In Current _Folder Only"
 msgstr "ప�రస�త�త సంచయంనంద� మాత�రమే (_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:437
+#: ../plugins/mark-all-read/mark-all-read.c:575
 msgid "Mark Me_ssages as Read"
 msgstr "చదివిన సందేశాల�గా గ�ర�త�పెట�ట�మ�"
 
@@ -18991,40 +19046,6 @@ msgstr "à°…à°¨à±�ని చదివినవిగా à°—à±�à°°à±�తించà
 msgid "Mark all messages in a folder as read."
 msgstr "ఒక ఫోల�డర�నంద� అన�ని సందేశాలన� చదివినట�ల� గ�ర�త�ంచ�మ�."
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "Manage your Evolution plugins."
-msgstr "మీ ఎవాల�యూషన� ప�లగిన�లన� నిర�వహించ�మ�."
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:244
-msgid "Plugin Manager"
-msgstr "ప�లగ�గిన� అభికర�త"
-
-#: ../plugins/plugin-manager/plugin-manager.c:59
-msgid "Author(s)"
-msgstr "ఆథర�(ల�)"
-
-#: ../plugins/plugin-manager/plugin-manager.c:259
-msgid "Note: Some changes will not take effect until restart"
-msgstr "గమనిక: ప�నఃప�రారంభించ� నంతవరక� కొన�ని మార�ప�ల� ప�రభావితం కావ�"
-
-#: ../plugins/plugin-manager/plugin-manager.c:285
-msgid "Overview"
-msgstr "అవలోకనం"
-
-#: ../plugins/plugin-manager/plugin-manager.c:356
-#: ../plugins/plugin-manager/plugin-manager.c:418
-msgid "Plugin"
-msgstr "ప�లగ�ఇన�"
-
-#: ../plugins/plugin-manager/plugin-manager.c:430
-msgid "_Plugins"
-msgstr "ప�లగ�ఇన�స�(_P)"
-
-#: ../plugins/plugin-manager/plugin-manager.c:432
-msgid "Enable and disable plugins"
-msgstr "ప�లగ�ఇన�స� న� చేతనం మరియ� అచేతనం చేయ�మ�"
-
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
@@ -19036,54 +19057,48 @@ msgstr "సాదా పాఠà±�యమà±�à°¨à±� అభీషà±�టపరచà±�à
 
 #: ../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 "మెయిల� సందేశమ�లన� సాదా పాఠ�యమ� వలె దర�శించ�మ�, అవి HTML సారమ�న� కలిగివ�న�నా కూడా."
+msgstr ""
+"మెయిల� సందేశమ�లన� సాదా పాఠ�యమ� వలె దర�శించ�మ�, అవి HTML సారమ�న� కలిగివ�న�నా "
+"కూడా."
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:251
 msgid "Show HTML if present"
 msgstr "ఉన�నట�లైతే HTML న� చూప�మ�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:252
 msgid "Let Evolution choose the best part to show."
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:255
 #, fuzzy
 msgid "Show plain text if present"
 msgstr "ఉన�నట�లైతే HTML న� చూప�మ�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:256
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:260
 #, fuzzy
 msgid "Only ever show plain text"
 msgstr "ఎప�ప�డ� సాదాన� మాత�రమే చూప�మ�"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:261
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:247
+#: ../plugins/prefer-plain/prefer-plain.c:313
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:267
+#: ../plugins/prefer-plain/prefer-plain.c:333
 msgid "HTML _Mode"
 msgstr "HTML రీతి (_M)"
 
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
-msgid "Evolution Profiler"
-msgstr "ఎవల�యూషన� ప�రొఫైల�"
-
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Profile data events in Evolution (for developers only)."
-msgstr "ఎవాల�యూషన�‌నంద� ప�రొఫైల� డాటా ఘటనల� (అభివృద�దికార�లక� మాత�రమే)."
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
 msgstr "PST దస�త�రమ� న�ండి Outlook సందేశమ�లన� దిగ�మతిచేయ�మ�"
@@ -19096,41 +19111,38 @@ msgstr "Outlook PST దిగ�మతి"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook వ�యక�తిగత సంచయమ�ల� (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:295
+#: ../plugins/pst-import/pst-importer.c:450
 msgid "_Mail"
 msgstr "మెయిల�(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:307
+#: ../plugins/pst-import/pst-importer.c:469
 msgid "Destination folder:"
 msgstr "గమ�యస�థాన సంచయం:"
 
-#. Address book
-#: ../plugins/pst-import/pst-importer.c:313
+#: ../plugins/pst-import/pst-importer.c:475
 msgid "_Address Book"
 msgstr "చిర�నామా ప�స�తకం (_A)"
 
-#. Appointments
-#: ../plugins/pst-import/pst-importer.c:320
+#: ../plugins/pst-import/pst-importer.c:476
 msgid "A_ppointments"
 msgstr "నియామకాల� (_p)"
 
-#. Tasks
-#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:477 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "కర�తవ�యాల�(_T)"
 
-#. Journal
-#: ../plugins/pst-import/pst-importer.c:332
+#: ../plugins/pst-import/pst-importer.c:478
 msgid "_Journal entries"
 msgstr "పత�రిక ప�రవేశమ�ల� (_J)"
 
-#: ../plugins/pst-import/pst-importer.c:347
+#: ../plugins/pst-import/pst-importer.c:585
 msgid "Importing Outlook data"
 msgstr "Outlook డాటాన� దిగ�మతిచేస�తోంది"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:146
-#: ../plugins/publish-calendar/publish-calendar.c:153
+#: ../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 "క�యాలెండర� ప�రచ�రణ"
 
@@ -19142,49 +19154,49 @@ msgstr "స�థానమ�ల�"
 msgid "Publish calendars to the web."
 msgstr "కాలెండర�లన� వెబ�‌నక� ప�రచ�రించ�మ�."
 
-#: ../plugins/publish-calendar/publish-calendar.c:208
-#: ../plugins/publish-calendar/publish-calendar.c:449
+#: ../plugins/publish-calendar/publish-calendar.c:216
+#: ../plugins/publish-calendar/publish-calendar.c:471
 #, c-format
 msgid "Could not open %s:"
 msgstr "%sన� తెర�వలేక పోయింది:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:210
+#: ../plugins/publish-calendar/publish-calendar.c:218
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "%sన� తెర�వలేక పోయింది: తెలియని దోషమ�"
 
-#: ../plugins/publish-calendar/publish-calendar.c:230
+#: ../plugins/publish-calendar/publish-calendar.c:238
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "%sనక� ప�రచ�రించ�నప�ప�డ� అక�కడ వొక దోషమ�వ�ంది:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:232
+#: ../plugins/publish-calendar/publish-calendar.c:240
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "%sనక� ప�రచ�రించ�ట సమర�ధవంతంగా పూర�తైనది"
 
-#: ../plugins/publish-calendar/publish-calendar.c:276
+#: ../plugins/publish-calendar/publish-calendar.c:288
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "%sయొక�క మరల�ప� విఫలమైంది:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:619
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "E_nable"
 msgstr "చేతనం(_n)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:739
+#: ../plugins/publish-calendar/publish-calendar.c:767
 msgid "Are you sure you want to remove this location?"
 msgstr "మీర� ఖచ�చితంగా ఈ స�థానమ�న� తీసవేద�దామని అన�కొన�చ�న�నారా?"
 
 #. 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:1051
+#. * 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
 msgid "Could not create publish thread."
 msgstr "ప�రచ�రణ తంతి సృష�టించబడలేక పోయింది."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1059
+#: ../plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "క�యాలెండర� సమాచారంన� మ�ద�రించ�మ�(_P)"
 
@@ -19265,7 +19277,7 @@ msgstr "గవాక�షమ�(_W)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_File:"
-msgstr "దస�త�రం(_F):"
+msgstr "ఫైల�(_F):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Password:"
@@ -19281,162 +19293,112 @@ msgstr "రహస�యపదాన�ని గ�ర�తించ�మ�(_
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Username:"
-msgstr "వినియోగదార�డి నామమ�(_U):"
+msgstr "వినియోగదార�డి పేర�(_U):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:31
 #, fuzzy
 msgid "iCal"
 msgstr "à°•à°¾"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:69
-#: ../plugins/publish-calendar/publish-format-ical.c:82
+#: ../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 "కాలెండర�‌న� ప�రచ�రించలేక పోయింది: కాలెండర� బ�యాకెండ� యింకా లేద�"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:476
+#: ../plugins/publish-calendar/url-editor-dialog.c:518
 msgid "New Location"
 msgstr "కొత�త స�థానమ�"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:520
 msgid "Edit Location"
 msgstr "స�థానమ� సరికూర�చ�మ�"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
-#, c-format
-msgid "SpamAssassin not found, code: %d"
-msgstr "స�పామ�ఎస�సాసిన� కనబడలేద�, కోడ�: %d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
-#, c-format
-msgid "Failed to create pipe: %s"
-msgstr "పైప� సృష�టించ�టలో విఫలమైంది: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
-#, c-format
-msgid "Error after fork: %s"
-msgstr "ఫోర�క�� తర�వాత దోషమ�: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
-#, c-format
-msgid "SpamAssassin child process does not respond, killing..."
-msgstr "స�పామ�‌యెస�సాసిన� చైల�డ�� కార�యక�రమం స�పందించ�టలేద�, నశింపబడ�తోంది..."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
-#, c-format
-msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr "స�పామ�‌యెస�సాసిన� చైల�డ�� కార�యక�రమం అంతరాయంక� వేచివ�ండ�, సమాప�తం చేయబడ�తోంది..."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
-#, c-format
-msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr "స�పామ�‌యెస�సాసిన� వైఫల�యానికి పైప�, దోషమ� కోడ�: %d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
-#, fuzzy, c-format
-msgid "SpamAssassin is not available. Please install it first."
-msgstr "స�పామ�‌యెస�సాసిన� అంద�బాట�లో లేద�."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
-msgid "This will make SpamAssassin more reliable, but slower"
-msgstr "ఇది స�పామ�‌యెస�సాసిన�‌న� నమ�మదగినదిగా చేస�త�ంది, అయితే నిదానమైనది"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
-msgid "I_nclude remote tests"
-msgstr "ద�రస�థ పరిశీలనలన� చేర�చ�త�ంది(_n)"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Filter junk messages using SpamAssassin."
-msgstr "SpamAssassin వ�పయోగించి నిరర�దక సందేశమ�లన� వడపోయ�న�."
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Junk Filter"
-msgstr "SpamAssassin నిరర�ధక వడపోత"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin Options"
-msgstr "SpamAssassin �చ�చికాల�"
-
-#.
-#. * Translator: the %F %T is the thirth argument for a strftime function.
-#. * It lets you define the formatting of the date in the csv-file.
-#. *
-#: ../plugins/save-calendar/csv-format.c:161
+#. 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:168
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Description List"
 msgstr "వివరణ జాబితా"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Categories List"
 msgstr "వర�గమ�ల జాబితా"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Comment List"
 msgstr "వ�యాఖ�యానం జాబితా"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Contact List"
 msgstr "పరిచయమ�ల జాబితా"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Start"
 msgstr "ప�రారంభమౌత�ంది"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:391
 msgid "End"
 msgstr "మ�గ�స�త�ంది"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:392
+msgid "Due"
+msgstr "పూర�వనిర�ణిత"
+
+#: ../plugins/save-calendar/csv-format.c:393
 msgid "percent Done"
 msgstr "శాతం పూర�తైంది"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:395
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:396
 msgid "Attendees List"
 msgstr "హాజరైనవారి జాబితా"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:398
 msgid "Modified"
 msgstr "సవరించబడింది"
 
-#: ../plugins/save-calendar/csv-format.c:530
+#: ../plugins/save-calendar/csv-format.c:573
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV ఫార�మాట� కొరక� అధ�నాతన �చ�చికల� (_d)"
 
-#: ../plugins/save-calendar/csv-format.c:537
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Prepend a _header"
 msgstr "పీఠికన� మ�ంద� చేర�చ� (_h)"
 
-#: ../plugins/save-calendar/csv-format.c:546
+#: ../plugins/save-calendar/csv-format.c:590
 msgid "_Value delimiter:"
 msgstr "విల�వ నిర�ధారకి (_V):"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:601
 msgid "_Record delimiter:"
 msgstr "రికార�డ�  నిర�దారకి (_R):"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:612
 msgid "_Encapsulate values with:"
 msgstr "విల�వలన� దీనితో చ�ట�టిఉంచ� (_E):"
 
-#: ../plugins/save-calendar/csv-format.c:582
-msgid "Comma separated value format (.csv)"
+#: ../plugins/save-calendar/csv-format.c:638
+#, fuzzy
+#| msgid "Comma separated value format (.csv)"
+msgid "Comma separated values (.csv)"
 msgstr "కామా తో విభజించిన విల�వ రూపం (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:162
-msgid "iCalendar format (.ics)"
-msgstr "�క�యాలెండర� రూపం(.ics)"
+#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:225
+#, fuzzy
+msgid "iCalendar (.ics)"
+msgstr "�క�యాలెండర� ఫైల�ల� (.ics)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
@@ -19451,80 +19413,71 @@ msgstr "à°¡à°¿à°¸à±�à°•à±�నకà±� కాలెండరà±�‌నà±� లేదà
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:147
+#: ../plugins/save-calendar/rdf-format.c:156
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:369
-msgid "RDF format (.rdf)"
+#: ../plugins/save-calendar/rdf-format.c:389
+#, fuzzy
+#| msgid "RDF format (.rdf)"
+msgid "RDF (.rdf)"
 msgstr "RDF రూపం (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../plugins/save-calendar/save-calendar.c:127
 msgid "_Format:"
 msgstr "ఫార�మాట� (_F):"
 
-#: ../plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:189
 msgid "Select destination file"
-msgstr "గమ�య దస�త�రాన�ని ఎంపికచేయ�మ�"
+msgstr "గమ�య ఫైల�న� ఎంపికచేయ�మ�"
 
-#: ../plugins/save-calendar/save-calendar.c:334
+#: ../plugins/save-calendar/save-calendar.c:344
 #, fuzzy
 msgid "Save the selected calendar to disk"
 msgstr "ఎంచ�క�న�న సందేశాలన� పాఠ�య దస�త�రమ�గా దాయ�మ�"
 
-#: ../plugins/save-calendar/save-calendar.c:365
+#: ../plugins/save-calendar/save-calendar.c:375
 #, fuzzy
 msgid "Save the selected memo list to disk"
 msgstr "ఎంచ�క�న�న సందేశాలన� పాఠ�య దస�త�రమ�గా దాయ�మ�"
 
-#: ../plugins/save-calendar/save-calendar.c:396
+#: ../plugins/save-calendar/save-calendar.c:406
 #, fuzzy
 msgid "Save the selected task list to disk"
 msgstr "డిస�క�నక� కాలెండర�‌న� లేదా కర�తవ�య జాబితాన� దాయ�మ�."
 
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Sort mail message threads by subject."
-msgstr "సంగతి ద�వారా మెయిల� సందేశ తంత�లన� క�రమపరచ�మ�."
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
-msgid "Subject Threading"
-msgstr "సంగతి తంతీకరణ"
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
-msgid "Thread messages by subject"
-msgstr "సంగతి ద�వారా తంతి సందేశాల�"
-
-#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:63
-msgid "F_all back to threading messages by subject"
-msgstr "సంగతి ద�వారా తంతీకరణ సందేశాలక� తిరిగివెళ�ళ�మ� (_a)"
-
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
-msgstr "సందేశం బాడీనంద� ప�రతిక�షేపించ�టక� టెంప�లేట�స�� ప�లగ�ఇన� కొరక� కీబోర�డ��/విల�వ జో�డీల జాబితా."
+msgstr ""
+"సందేశం బాడీనంద� ప�రతిక�షేపించ�టక� టెంప�లేట�స�� ప�లగ�ఇన� కొరక� కీబోర�డ��/విల�వ "
+"జో�డీల జాబితా."
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "డ�రాఫ�ట�స�� ఆధారిత మాదిరి ప�లగ�ఇన�"
+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 ""
 
-#: ../plugins/templates/templates.c:616
+#: ../plugins/templates/templates.c:1094
 #, fuzzy
 msgid "No Title"
 msgstr "శీర�షిక లేద�"
 
-#: ../plugins/templates/templates.c:687
+#: ../plugins/templates/templates.c:1195
 msgid "Save as _Template"
 msgstr "మాదిరిలా దాయ�మ� (_T)"
 
-#: ../plugins/templates/templates.c:689
+#: ../plugins/templates/templates.c:1197
 msgid "Save as Template"
 msgstr "మాదిరిలా దాయ�మ�"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
-msgstr "Microsoft అవ�ట�‌ల�క�‌ న�ండి TNEF(winmail.dat) అన�భందాలన� డీకోడ� చేయ�మ�."
+msgstr ""
+"Microsoft అవ�ట�‌ల�క�‌ న�ండి TNEF(winmail.dat) అన�భందాలన� డీకోడ� చేయ�మ�."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Decoder"
@@ -19538,27 +19491,27 @@ msgstr "ఇన�‌లైన� vకార�డ�ల�"
 msgid "Show vCards directly in mail messages."
 msgstr "మెయిల� సందేశమ�లనంద� vకార�డ�లన� నేర�గా చూప�మ�."
 
-#: ../plugins/vcard-inline/vcard-inline.c:164
-#: ../plugins/vcard-inline/vcard-inline.c:249
+#: ../plugins/vcard-inline/vcard-inline.c:207
+#: ../plugins/vcard-inline/vcard-inline.c:292
 msgid "Show Full vCard"
 msgstr "పూర�తి Vకార�డ� చూపించ�మ�"
 
-#: ../plugins/vcard-inline/vcard-inline.c:167
+#: ../plugins/vcard-inline/vcard-inline.c:210
 msgid "Show Compact vCard"
 msgstr "సూక�ష�మ Vకార�డ� చూపించ�మ�"
 
-#: ../plugins/vcard-inline/vcard-inline.c:228
+#: ../plugins/vcard-inline/vcard-inline.c:271
 msgid "There is one other contact."
 msgstr "అక�కడ యింకో పరిచయ చిర�నామావ�ంది."
 
-#: ../plugins/vcard-inline/vcard-inline.c:237
+#: ../plugins/vcard-inline/vcard-inline.c:280
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "అక�కడ %d పరిచయ చిర�నామాఉంది."
 msgstr[1] "అక�కడ %d పరిచయ చిర�నామాల� ఉన�నాయి."
 
-#: ../plugins/vcard-inline/vcard-inline.c:258
+#: ../plugins/vcard-inline/vcard-inline.c:301
 msgid "Save in Address Book"
 msgstr "చిర�నామా ప�స�తకం లో దాచ�మ�"
 
@@ -19574,11 +19527,11 @@ msgstr "WebDAV పరిచయాల�"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:283
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "IfMatch తప�పించ�మ� ( apache < 2.2.8 నంద� అవసరం) (_A)"
 
@@ -19623,13 +19576,14 @@ msgstr "అప�రమేయ విండో వెడల�ప�"
 #: ../shell/apps_evolution_shell.schemas.in.h:10
 #, fuzzy
 msgid "Enable express mode"
-msgstr "శోధన సంచయాలన� చేతనం చేయ�మ�"
+msgstr "అన�వేషణ సంచయాలన� చేతనం చేయ�మ�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
-"ఇంటర�నెట�‌నంద� HTTP/Secure HTTPన� వాడ�కొన�చ�న�నప�ప�డ� ప�రోక�సీ అమరికలన� చేతనం చేస�త�ంది."
+"ఇంటర�నెట�‌నంద� HTTP/Secure HTTPన� వాడ�కొన�చ�న�నప�ప�డ� ప�రోక�సీ అమరికలన� చేతనం "
+"చేస�త�ంది."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "Flag that enables a much simplified user interface."
@@ -19637,7 +19591,7 @@ msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy host name"
-msgstr "HTTP ప�రోక�సీ హోస�ట�� నామమ�"
+msgstr "HTTP ప�రోక�సీ హోస�ట�� పేర�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy password"
@@ -19649,11 +19603,12 @@ msgstr "HTTP ప�రోక�సీ పోర�ట��"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "HTTP proxy username"
-msgstr "HTTP ప�రోక�సీ వినియోగదారినామమ�"
+msgstr "HTTP ప�రోక�సీ వినియోగదారిపేర�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr "కాంపోనెంట� యొక�క ID లేదా మరియొకనామమ� ప�రారంభంనంద� అప�రమేయంగా చూపించబడాలి."
+msgstr ""
+"కాంపోనెంట� యొక�క ID లేదా మరియొకపేర� ప�రారంభంనంద� అప�రమేయంగా చూపించబడాలి."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
@@ -19662,8 +19617,10 @@ msgid ""
 "authentication_user\" GConf key, and the password is retrieved from either "
 "gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
-"నిజమైతే, ప�రోక�సీ సేవికక� అన�సంధానాలక� ధృవీకరణ అవసరమ�. వినియోగదారినామమ� \"/apps/evolution/"
-"shell/network_config/authentication_user\" GConf కీన�ండి తీస�కోబడ�త�ంది, మరియ� "
+"నిజమైతే, ప�రోక�సీ సేవికక� అన�సంధానాలక� ధృవీకరణ అవసరమ�. వినియోగదారిపేర� "
+"\"/apps/evolution/"
+"shell/network_config/authentication_user\" GConf కీన�ండి తీస�కోబడ�త�ంది, "
+"మరియ� "
 "సంకేతపదమ� gnome-keyring న�ండిగాని లేదా ~/.gnome2_private/Evolution సంకేతపదమ� "
 "దస�త�రమ�న�ండిగాని తీస�కోబడ�త�ంది."
 
@@ -19683,7 +19640,9 @@ msgstr "GtkFileChooser డైలాగà±�à°² కొరకà±� à°ªà±�రాధమà
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
-msgstr "అన�భంద పట�టీ విడ�జట�ల కొరక� ప�రాధమిక దర�శనం. \"0\" ప�రతిమ దర�శనం, \"1\" జాబితా దర�శనం."
+msgstr ""
+"అన�భంద పట�టీ విడ�జట�ల కొరక� ప�రాధమిక దర�శనం. \"0\" ప�రతిమ దర�శనం, \"1\" "
+"జాబితా దర�శనం."
 
 #
 #: ../shell/apps_evolution_shell.schemas.in.h:23
@@ -19693,7 +19652,8 @@ msgstr "చివరిగా నవీకరించబడిన ఆకృతà
 #: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
-msgstr "ఆఫ�‌లైన� ఉపయోగం కొరక� డిస�క� క� �కకాలం చేయబడ� సంచయాల కొరక� పాత� ల జాబితా"
+msgstr ""
+"ఆఫ�‌లైన� ఉపయోగం కొరక� డిస�క� క� �కకాలం చేయబడ� సంచయాల కొరక� పాత� ల జాబితా"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Non-proxy hosts"
@@ -19709,7 +19669,7 @@ msgstr "ప�రోక�సీ ఆకృతీకరణ రీతి"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "SOCKS proxy host name"
-msgstr "SOCKS ప�రోక�సీ హోస�ట�� నామమ�"
+msgstr "SOCKS ప�రోక�సీ హోస�ట�� పేర�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "SOCKS proxy port"
@@ -19717,7 +19677,7 @@ msgstr "SOCKS ప�రోక�సీ పోర�ట��"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Secure HTTP proxy host name"
-msgstr "స�రక�షిత HTTP ప�రోక�సీ హోస�ట�� నామమ�"
+msgstr "స�రక�షిత HTTP ప�రోక�సీ హోస�ట�� పేర�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Secure HTTP proxy port"
@@ -19730,9 +19690,12 @@ msgid ""
 "configuration\" and \"use proxy configuration provided in the autoconfig url"
 "\" respectively."
 msgstr ""
-"ప�రోక�సీ ఆకృతీకరణ రీతిని ఎంపికచేయ�మ�. మద�దత�నిచ�చ� విల�వల� 0,1,2, మరియ� 3 అవి వర�సగా వీటిని "
-"\"సిస�టమ� అమరికలన� వ�పయోగించ�మ�\", \"ప�రోక�సీ లేద�\", \"మానవీయ ప�రోక�సీ ఆకృతీకరణన� వ�పయోగించ�మ�"
-"\" మరియ� \"autoconfig urlనంద� యివ�వబడిన ప�రోక�సీ ఆకృతీకరణన� వ�పయోగించ�మ�\" ప�రస�ప�టంచేస�తాయి."
+"ప�రోక�సీ ఆకృతీకరణ రీతిని ఎంపికచేయ�మ�. మద�దత�నిచ�చ� విల�వల� 0,1,2, మరియ� 3 అవి "
+"వర�సగా వీటిని "
+"\"సిస�టమ� అమరికలన� వ�పయోగించ�మ�\", \"ప�రోక�సీ లేద�\", \"మానవీయ ప�రోక�సీ "
+"ఆకృతీకరణన� వ�పయోగించ�మ�"
+"\" మరియ� \"autoconfig urlనంద� యివ�వబడిన ప�రోక�సీ ఆకృతీకరణన� వ�పయోగించ�మ�\" "
+"ప�రస�ప�టంచేస�తాయి."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Sidebar is visible"
@@ -19742,7 +19705,7 @@ msgstr "à°ªà±�à°°à°•à±�కపటà±�à°Ÿà°¿ దరà±�శితం à°…à°µà±�à°¤à±�à
 msgid "Skip development warning dialog"
 msgstr "అభివృద�ది హెచ�చరిక డైలాగ� న� వదిలివేస�త�ంది"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:331
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
 msgid "Start in offline mode"
 msgstr "ఆఫ�‌లైన� రీతినంద� ప�రారంభించ�మ�"
 
@@ -19754,7 +19717,9 @@ msgstr "à°¸à±�థితిపటà±�à°Ÿà±€ దరà±�శితమౌతోందà°
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
-msgstr "ఎవాల�యూషన� యొక�క ఆకృతీకరణ వర�షన�, పెద�ద/చిన�న/ఆకృతీకరణ స�థాయి తో (ఉదాహరణ క� \"2.6.0\")."
+msgstr ""
+"ఎవాల�యూషన� యొక�క ఆకృతీకరణ వర�షన�, పెద�ద/చిన�న/ఆకృతీకరణ స�థాయి తో (ఉదాహరణ క� "
+"\"2.6.0\")."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
 #, fuzzy
@@ -19783,26 +19748,28 @@ msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
 msgstr ""
-"చివిరగా నవీకరించిన ఎవాల�యూషన� యొక�క ఆకృతీకరణ, పెద�ద/చిన�న/ఆకృతీకరణ స�థాయి తో (ఉదాహరణక� \"2.6.0\")."
+"చివిరగా నవీకరించిన ఎవాల�యూషన� యొక�క ఆకృతీకరణ, పెద�ద/చిన�న/ఆకృతీకరణ స�థాయి తో "
+"(ఉదాహరణక� \"2.6.0\")."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy HTTP through."
-msgstr "HTTP ప�రోక�సీ చేయ�టక� మిషన� నామమ�"
+msgstr "HTTP ప�రోక�సీ చేయ�టక� మిషన� పేర�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "The machine name to proxy secure HTTP through."
-msgstr "స�రక�షిక HTTP ప�రోక�సీ చేయ�టక� మిషన� నామమ�."
+msgstr "స�రక�షిక HTTP ప�రోక�సీ చేయ�టక� మిషన� పేర�."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "The machine name to proxy socks through."
-msgstr "socks ప�రోక�సీ చేయ�టక� మిషన� నామమ�."
+msgstr "socks ప�రోక�సీ చేయ�టక� మిషన� పేర�."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 msgstr ""
-"మీర� ప�రోక�సీ చేయ� \"/apps/evolution/shell/network_config/http_host\" చేత నిర�వచించబడిన "
+"మీర� ప�రోక�సీ చేయ� \"/apps/evolution/shell/network_config/http_host\" చేత "
+"నిర�వచించబడిన "
 "మిషన�‌నందలి పోర�ట��."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:48
@@ -19827,8 +19794,10 @@ msgid ""
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
-"విండో బటన�స� యొక�క శైలి. అవి \"text\", \"icons\", \"both\", \"toolbar\" కావచ�చ�. ఒకవేళ "
-"\"toolbar\" అమర�చితే, బటన�స� యొక�క శైలి GNOME సాధనమ�లపట�టీ అమరికల ద�వారా నిర�ణయించబడ�త�ంది."
+"విండో బటన�స� యొక�క శైలి. అవి \"text\", \"icons\", \"both\", \"toolbar\" "
+"కావచ�చ�. ఒకవేళ "
+"\"toolbar\" అమర�చితే, బటన�స� యొక�క శైలి GNOME సాధనమ�లపట�టీ అమరికల ద�వారా "
+"నిర�ణయించబడ�త�ంది."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
@@ -19837,9 +19806,12 @@ msgid ""
 "(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
-"ప�రోక�సీ(క�రియాశీలంగా వ�ంటే) ద�వారాకాక , నేర�గా అన�సంధానించబడివ�న�న హోస�ట�స�� జాబితాన� ఈకీ కలిగివ�ంది. "
-"ఆవిల�వల� హోస�ట�� నామమ�ల� కావచ�చ�, డొమైన�స�� కావచ�చ� (ప�రాధమిక వైల�డ��‌కార�డ�� *.foo.com వంటివి), IP హోస�ట�� "
-"చిర�నామాల� (IPv4 మరియ� IPv6) కావచ�చ� మరియ� నెట�‌మాస�క�� (192.168.0.0/24 లాంటి) వాటితో నెట�‌వర�క�� "
+"ప�రోక�సీ(క�రియాశీలంగా వ�ంటే) ద�వారాకాక , నేర�గా అన�సంధానించబడివ�న�న హోస�ట�స�� "
+"జాబితాన� ఈకీ కలిగివ�ంది. "
+"ఆవిల�వల� హోస�ట�� పేర�ల� కావచ�చ�, డొమైన�స�� కావచ�చ� (ప�రాధమిక వైల�డ��‌కార�డ�� "
+"*.foo.com వంటివి), IP హోస�ట�� "
+"చిర�నామాల� (IPv4 మరియ� IPv6) కావచ�చ� మరియ� నెట�‌మాస�క�� (192.168.0.0/24 "
+"లాంటి) వాటితో నెట�‌వర�క�� "
 "చిర�నామాల� కావచ�చ�."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
@@ -19856,8 +19828,11 @@ msgid "Use HTTP proxy"
 msgstr "HTTP ప�రోక�సీ వ�పయోగించ�"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "User name to pass as authentication when doing HTTP proxying."
-msgstr "HTTP ప�రోక�సీంగ� చేస�త�న�నప�ప�డ� ధృవీకరణ వ�త�తీర�ణమ�కొరక� వినియోగదారినామమ�."
+#, fuzzy
+#| msgid "User name to pass as authentication when doing HTTP proxying."
+msgid "Username to pass as authentication when doing HTTP proxying."
+msgstr ""
+"HTTP ప�రోక�సీంగ� చేస�త�న�నప�ప�డ� ధృవీకరణ వ�త�తీర�ణమ�కొరక� వినియోగదారిపేర�."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether Evolution will start up in offline mode instead of online mode."
@@ -19882,7 +19857,8 @@ msgstr "సాధనమà±�à°² పటà±�à°Ÿà±€ à°ªà±�రదరà±�శితమవà
 #: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
-msgstr "ఎవాల�యూషన� యొక�క అభివృద�దీకరణ వర�షన� లంద� హెచ�చరిక డైలాగ� వదిలేయాలా వద�దా."
+msgstr ""
+"ఎవాల�యూషన� యొక�క అభివృద�దీకరణ వర�షన� లంద� హెచ�చరిక డైలాగ� వదిలేయాలా వద�దా."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Whether the window buttons should be visible."
@@ -19896,11 +19872,11 @@ msgstr "గవాక�ష బొత�తమ� శైలి"
 msgid "Window buttons are visible"
 msgstr "గవాక�ష బొత�తమ�ల� కనబడ�త�న�నాయి"
 
-#: ../shell/e-shell-content.c:520 ../shell/e-shell-content.c:521
+#: ../shell/e-shell-content.c:729 ../shell/e-shell-content.c:730
 msgid "Searches"
-msgstr "శోధనల�"
+msgstr "అన�వేషణల�"
 
-#: ../shell/e-shell-content.c:563
+#: ../shell/e-shell-content.c:773
 msgid "Save Search"
 msgstr "వెతికిన దానిని దాచ�మ�"
 
@@ -19908,40 +19884,39 @@ msgstr "వెతికిన దానిని దాచ�మ�"
 #. * 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:921
+#: ../shell/e-shell-searchbar.c:938
 #, fuzzy
 msgid "Sho_w:"
 msgstr "చూప�మ�:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:952
+#: ../shell/e-shell-searchbar.c:971
 #, fuzzy
 msgid "Sear_ch:"
 msgstr "శోధించ�(_c): "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1013
+#: ../shell/e-shell-searchbar.c:1034
 #, fuzzy
 msgid "i_n"
 msgstr "లోపల(_n)"
 
-#: ../shell/e-shell-utils.c:253
+#: ../shell/e-shell-utils.c:223
 #, fuzzy
 msgid "vCard (.vcf)"
 msgstr "vకార�డ�� (.vcf, .gcrd)"
 
-#: ../shell/e-shell-utils.c:255
-#, fuzzy
-msgid "iCalendar (.ics)"
-msgstr "�క�యాలెండర� దస�త�రంల� (.ics)"
-
-#: ../shell/e-shell-utils.c:276
+#: ../shell/e-shell-utils.c:246
 #, fuzzy
 msgid "All Files (*)"
 msgstr "అన�ని దస�త�రాల�"
 
+#: ../shell/e-shell-view.c:296
+msgid "Saving user interface state"
+msgstr ""
+
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -19953,325 +19928,324 @@ msgstr "అన�వాదకర�త పరపత�ల�"
 msgid "Evolution Website"
 msgstr "ఎవల�యూషన� వెబ�‌సైట�"
 
-#: ../shell/e-shell-window-actions.c:1235
+#: ../shell/e-shell-window-actions.c:902
+#, fuzzy
+#| msgid "Categories List"
+msgid "Categories Editor"
+msgstr "వర�గమ�ల జాబితా"
+
+#: ../shell/e-shell-window-actions.c:1237
 #, fuzzy
 msgid "Bug Buddy is not installed."
 msgstr "బగ� బడ�డీ ప�రతిష�టించిలేద�"
 
-#: ../shell/e-shell-window-actions.c:1237
+#: ../shell/e-shell-window-actions.c:1239
 #, fuzzy
 msgid "Bug Buddy could not be run."
 msgstr "బగ� బడ�డీ నడవడం క�దరద�"
 
-#: ../shell/e-shell-window-actions.c:1418
+#: ../shell/e-shell-window-actions.c:1420
 msgid "Show information about Evolution"
 msgstr "ఎవల�యూషన� గ�రించి సమాచారం చూప�మ�"
 
-#: ../shell/e-shell-window-actions.c:1423
-#: ../shell/e-shell-window-actions.c:1437
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1439
 msgid "_Close Window"
 msgstr "గవాక�షమ�న� మూయ�మ�(_C)"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1446
 #, fuzzy
 msgid "_Contents"
 msgstr "నియామకాల� (_p)"
 
-#: ../shell/e-shell-window-actions.c:1446
+#: ../shell/e-shell-window-actions.c:1448
 #, fuzzy
 msgid "Open the Evolution User Guide"
 msgstr "వేరే వినియోగదార�ల సంచయాలన� తెర�వ�మ�"
 
-#: ../shell/e-shell-window-actions.c:1472
-msgid "Evolution _FAQ"
-msgstr "ఎవల�యూషన� _FAQ"
-
 #: ../shell/e-shell-window-actions.c:1474
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "తర�చూ అడ�గ� ప�రశ�నల� వెబ�‌ప�టన� తెర�వ�మ�"
-
-#: ../shell/e-shell-window-actions.c:1479
 msgid "_Forget Passwords"
 msgstr "రహస�య పదమ�లన� మర�చిపోండి(_F)"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1476
 #, fuzzy
 msgid "Forget all remembered passwords"
-msgstr "మీర� గ�ర�త�ంచ�క�న�న అన�ని సంకేతపదాలన� ఖచ�చితంగా మర�చిపోవాలన�క�ంట�న�నారా?"
+msgstr ""
+"మీర� గ�ర�త�ంచ�క�న�న అన�ని సంకేతపదాలన� ఖచ�చితంగా మర�చిపోవాలన�క�ంట�న�నారా?"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1481
 msgid "I_mport..."
 msgstr "దిగ�మతి(_m)..."
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Import data from other programs"
 msgstr "ఇతర కార�యక�రమాలన�ండి దత�తాంశాన�ని దిగ�మతిచేయ�మ�"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1488
 msgid "New _Window"
-msgstr "కొత�త గవాక�షం(_W)"
+msgstr "కొత�త విండో(_W)"
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1490
 #, fuzzy
 msgid "Create a new window displaying this view"
 msgstr "ఈ సంచయాన�ని ప�రదర�శిస�త� కొత�త గవాక�షాన�ని సృష�టించ�మ�"
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1502
 #, fuzzy
-msgid "Configure Evolution"
-msgstr "ఆకృతీకరణ"
+#| msgid "Available Fields"
+msgid "Available Cate_gories"
+msgstr "అంద�బాట�లోవ�న�న క�షేత�రాల�"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1504
+#, fuzzy
+#| msgid "_Make available for offline use"
+msgid "Manage available categories"
+msgstr "ఆఫ�‌లైన� ఉపయోగార�దం అంద�బాట�చేయ�మ� (_M)"
+
+#: ../shell/e-shell-window-actions.c:1516
 msgid "_Quick Reference"
 msgstr "చ�ర�కైన నివేదన(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1518
 #, fuzzy
 msgid "Show Evolution's shortcut keys"
 msgstr "ఎవల�యూషన� యొక�క అమరికలన� మార�చ�మ�"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Exit the program"
 msgstr "కార�యక�రమం న�ండి బయటక� రమ�మ�"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1530
 msgid "_Advanced Search..."
-msgstr "అద�నాతన శోధన(_A)..."
+msgstr "అద�నాతన అన�వేషణ(_A)..."
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Construct a more advanced search"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1539
 #, fuzzy
 msgid "Clear the current search parameters"
-msgstr "శోధనన� శ�భ�రపరచ�మ�"
+msgstr "అన�వేషణన� శ�భ�రపరచ�మ�"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Edit Saved Searches..."
 msgstr "దాచిన వెత�క�ఫలితాలన� సరిచేయ�(_E)..."
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1546
 #, fuzzy
 msgid "Manage your saved searches"
 msgstr "మీ ఈమెయిల� న� నిర�వహించ�మ�, పరిచయాల� మరియ� ప�రణాళిక"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1553
 msgid "Click here to change the search type"
-msgstr "శోధన రకాన�ని మార�చ�టక� ఇక�కడ నొక�కండి"
+msgstr "అన�వేషణ రకాన�ని మార�చ�టక� ఇక�కడ నొక�కండి"
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1558
 msgid "_Find Now"
 msgstr "ఇప�ప�డ� కన�గొన�మ�(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1560
 #, fuzzy
 msgid "Execute the current search parameters"
 msgstr "ప�రస�త�త మెయిల�  కార�యమ�న� రద�ద�చేయ�మ�"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1565
 msgid "_Save Search..."
 msgstr "వెత�క�న� దాయ�మ�(_S)..."
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1567
 #, fuzzy
 msgid "Save the current search parameters"
-msgstr "ప�రస�త�త దస�త�రాన�ని దాయ�మ�"
-
-#: ../shell/e-shell-window-actions.c:1577
-msgid "Send / _Receive"
-msgstr "పంప�మ�/తీస�కొన�మ�(_R)"
+msgstr "ప�రస�త�త ఫైల�న� దాయ�మ�"
 
 #: ../shell/e-shell-window-actions.c:1579
-msgid "Send queued items and retrieve new items"
-msgstr "వర�సపర�చిన అంశాలన� పంప� మరియ� కొత�త అంశాలన� వెలికితీయ�మ�"
-
-#: ../shell/e-shell-window-actions.c:1584
 #, fuzzy
 msgid "Submit _Bug Report..."
 msgstr "బగ� నివేదిక న� పంప�మ�(_B)"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1581
 msgid "Submit a bug report using Bug Buddy"
 msgstr "బగ� బడ�డీతో బగ� నివేదికన� పంప�మ�"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1586
 msgid "_Work Offline"
 msgstr "లైన�వెల�పల పనిచేయ�మ�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1588
 #, fuzzy
 msgid "Put Evolution into offline mode"
 msgstr "ఆఫ�‌లైన� రీతినంద� ప�రారంభించ�మ�"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1593
 msgid "_Work Online"
 msgstr "లైన�లో పనిచేయ�మ�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1595
 #, fuzzy
 msgid "Put Evolution into online mode"
 msgstr "లైన�లోపలి సంవిధానంలో ప�రారంభించ�"
 
-#: ../shell/e-shell-window-actions.c:1628
+#: ../shell/e-shell-window-actions.c:1623
 msgid "Lay_out"
 msgstr "కూర�ప�(_o)"
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1630
 msgid "_New"
 msgstr "కొత�త(_N)"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Search"
 msgstr "వెత�క�(_S)"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1644
 msgid "_Switcher Appearance"
 msgstr "స�విచ�చర� కనిపించ�విదం(_S)"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1658
 msgid "_Window"
 msgstr "గవాక�షమ�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1692
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show Side _Bar"
 msgstr "ప�రక�కపట�టీని చూప�మ�(_B)"
 
-#: ../shell/e-shell-window-actions.c:1694
+#: ../shell/e-shell-window-actions.c:1689
 #, fuzzy
 msgid "Show the side bar"
 msgstr "ప�రక�కపట�టీని చూప�మ�(_B)"
 
-#: ../shell/e-shell-window-actions.c:1700
+#: ../shell/e-shell-window-actions.c:1695
 #, fuzzy
 msgid "Show _Buttons"
 msgstr "యానిమేషన�లన� చూప�మ�"
 
-#: ../shell/e-shell-window-actions.c:1702
+#: ../shell/e-shell-window-actions.c:1697
 #, fuzzy
 msgid "Show the switcher buttons"
 msgstr "రెండవ సమయ క�షేత�రాన�ని చూప�మ�"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show _Status Bar"
 msgstr "స�స�థిత పట�టీ ని చూప�మ�(_S)"
 
-#: ../shell/e-shell-window-actions.c:1710
+#: ../shell/e-shell-window-actions.c:1705
 #, fuzzy
 msgid "Show the status bar"
 msgstr "స�స�థిత పట�టీ ని చూప�మ�(_S)"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1711
 #, fuzzy
 msgid "Show _Tool Bar"
 msgstr "పనిమ�ట�లపట�టా ని చూప�మ�(_T)"
 
-#: ../shell/e-shell-window-actions.c:1718
+#: ../shell/e-shell-window-actions.c:1713
 #, fuzzy
 msgid "Show the tool bar"
 msgstr "పనిమ�ట�లపట�టా ని చూప�మ�(_T)"
 
-#: ../shell/e-shell-window-actions.c:1740
+#: ../shell/e-shell-window-actions.c:1735
 msgid "_Icons Only"
 msgstr "ప�రతిమల� మాత�రమే (_I)"
 
-#: ../shell/e-shell-window-actions.c:1742
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Display window buttons with icons only"
 msgstr "చిత�రాలతో ఉన�న గవాక�ష బొత�తమ�లన� ప�రదర�శించ�మ�"
 
-#: ../shell/e-shell-window-actions.c:1747
+#: ../shell/e-shell-window-actions.c:1742
 msgid "_Text Only"
 msgstr "పాఠ�యమ� మాత�రమే (_T)"
 
-#: ../shell/e-shell-window-actions.c:1749
+#: ../shell/e-shell-window-actions.c:1744
 msgid "Display window buttons with text only"
 msgstr "పాఠ�యమ� తో ఉన�న గవాక�ష బొత�తమ�లన� ప�రదర�శించ�మ�"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Icons _and Text"
 msgstr "ప�రతిమల� మరియ� పాఠ�యమ� (_a)"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1751
 msgid "Display window buttons with icons and text"
 msgstr "చిత�రాల� మరియ� పాఠ�యమ� తో ఉన�న గవాక�ష బొత�తమ�లన� ప�రదర�శించ�మ�"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Tool_bar Style"
 msgstr "పనిమ�ట�ల పట�టీ శైలి (_b)"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1758
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr "రంగస�థల పనిమ�ట�లపట�టా అమరికన� ఉపయోగించి  గవాక�ష బొత�తమ�లన� ప�రదర�శించ�మ�"
+msgstr ""
+"రంగస�థల పనిమ�ట�లపట�టా అమరికన� ఉపయోగించి  గవాక�ష బొత�తమ�లన� ప�రదర�శించ�మ�"
 
-#: ../shell/e-shell-window-actions.c:1771
+#: ../shell/e-shell-window-actions.c:1766
 msgid "Define Views..."
 msgstr "దర�శనమ�లన� నిర�వచించ�..."
 
-#: ../shell/e-shell-window-actions.c:1773
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Create or edit views"
 msgstr "దర�శనాలన� సృష�టించ� లేదా సరిచేయ�"
 
-#: ../shell/e-shell-window-actions.c:1778
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Save Custom View..."
 msgstr "మలచిన దర�శనమ�న� దాయ�మ�..."
 
-#: ../shell/e-shell-window-actions.c:1780
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Save current custom view"
 msgstr "ప�రస�త�త మలచిన దర�శనమ�న� దాయ�మ�"
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1782
 msgid "C_urrent View"
 msgstr "ప�రస�త�త దర�శనం(_u)"
 
-#: ../shell/e-shell-window-actions.c:1797
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Custom View"
 msgstr "మలచిన దర�శనమ�"
 
-#: ../shell/e-shell-window-actions.c:1799
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Current view is a customized view"
 msgstr "ప�రస�త�త దర�శనం మలచ�కొనబడ�డ దర�శనమ�న�"
 
-#: ../shell/e-shell-window-actions.c:1809
+#: ../shell/e-shell-window-actions.c:1804
 #, fuzzy
 msgid "Change the page settings for your current printer"
 msgstr "మీ ప�రస�త�త మ�ద�రణ యంత�రమ�క� ప�ట అమరికలన� అమర�చ�మ�"
 
-#: ../shell/e-shell-window-actions.c:2182
+#: ../shell/e-shell-window-actions.c:2194
 #, c-format
 msgid "Switch to %s"
 msgstr "%s క� మార�మ�"
 
-#: ../shell/e-shell-window-actions.c:2395
+#: ../shell/e-shell-window-actions.c:2414
 msgid "Execute these search parameters"
 msgstr ""
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:576
+#: ../shell/e-shell-window-private.c:584
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - ఎవాల�యూషన�"
 
-#: ../shell/e-shell-window.c:416
+#: ../shell/e-shell-window.c:442
 msgid "New"
 msgstr "కొత�త"
 
-#: ../shell/e-shell.c:226
+#: ../shell/e-shell.c:361
 #, fuzzy
 msgid "Preparing to go offline..."
 msgstr "లైన�వెల�పలకి '%s' ఖాతాన�ని తయార�చేస�త�ంది"
 
-#: ../shell/e-shell.c:276
+#: ../shell/e-shell.c:414
 #, fuzzy
 msgid "Preparing to go online..."
 msgstr "లైన�వెల�పలకి '%s' ఖాతాన�ని తయార�చేస�త�ంది"
 
-#: ../shell/e-shell.c:335
+#: ../shell/e-shell.c:476
 msgid "Preparing to quit..."
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:180
+#: ../shell/main.c:195
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20296,7 +20270,8 @@ msgstr ""
 "ఈ ఎవాల�యూషన� వర�షన� ఇంకా పూర�తికాలేద�. దగ�గరపడ�త�న�నది,\n"
 "అయితే కొన�ని సౌలభ�యాల� ఇంకా పూర�తికాలేద� లేదా సరిగా పని చేయటంలేద�.\n"
 "\n"
-"మీర� స�థిరమైన ఎవాల�యూషన� వర�షన� కోర�క�న�నట�లైతే, మేమ� ఈ వర�షన� సంస�థాపన తీసివేసి,\n"
+"మీర� స�థిరమైన ఎవాల�యూషన� వర�షన� కోర�క�న�నట�లైతే, మేమ� ఈ వర�షన� సంస�థాపన "
+"తీసివేసి,\n"
 " మరియ� వర�షన� %s న� సంస�థాపించమని చెప�తామ�.\n"
 "\n"
 "మీర� దోషంలన� కన�గొనినట�లైతే, దయచేసి వాటిని మాక� bugzilla.gnome.org నంద�\n"
@@ -20306,7 +20281,7 @@ msgstr ""
 "మీర� మా శ�రమ యొక�క ఫలితాలన� ఆనందిస�తారని నమ�మ�త�న�నామ�, మరియ� మేమ�\n"
 "మీ సహకారం కొరక� ఎద�చూస�త�న�నామ�!\n"
 
-#: ../shell/main.c:204
+#: ../shell/main.c:219
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20314,69 +20289,94 @@ msgstr ""
 "ధన�యవాదమ�ల�\n"
 "ఎవల�యూషన� టీం\n"
 
-#: ../shell/main.c:211
+#: ../shell/main.c:226
 msgid "Do not tell me again"
 msgstr "నాక� మళ�ళీ చెప�పవద�ద�"
 
-#: ../shell/main.c:327
-msgid "Start Evolution activating the specified component"
-msgstr "ఎవల�యూషన� నిర�దేశిత భాగాన�ని క�రియాశీలీకరించడాన�ని ప�రారంభించ�"
+#. Translators: Do NOT translate the five component
+#. * names, they MUST remain in English!
+#: ../shell/main.c:308
+msgid ""
+"Start Evolution showing the specified component. Available options are "
+"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+msgstr ""
 
-#: ../shell/main.c:329
+#: ../shell/main.c:312
 msgid "Apply the given geometry to the main window"
 msgstr ""
 
-#: ../shell/main.c:333
+#: ../shell/main.c:316
 msgid "Start in online mode"
 msgstr "లైన�లోపలి సంవిధానంలో ప�రారంభించ�"
 
-#: ../shell/main.c:335
+#: ../shell/main.c:318
+msgid "Ignore network availability"
+msgstr ""
+
+#: ../shell/main.c:320
 #, fuzzy
 msgid "Start in \"express\" mode"
 msgstr "లైన�లోపలి సంవిధానంలో ప�రారంభించ�"
 
-#: ../shell/main.c:338
+#: ../shell/main.c:323
 #, fuzzy
 msgid "Forcibly shut down Evolution"
 msgstr "ఎవల�యూషన� భాగాలన� బలవంతంగా మూసివేయ�మ�"
 
-#: ../shell/main.c:341
+#: ../shell/main.c:326
 msgid "Send the debugging output of all components to a file."
-msgstr "అన�ని మూలకాల డీబగ�గింగ� అవ�ట�‌ప�ట� న� దస�త�రం క� పంప�మ�."
+msgstr "అన�ని మూలకాల డీబగ�గింగ� అవ�ట�‌ప�ట� న� ఫైల� క� పంప�మ�."
 
-#: ../shell/main.c:343
+#: ../shell/main.c:328
 msgid "Disable loading of any plugins."
 msgstr "ప�లగ�గిన� ల� నింపబడడాన�ని క�రియాహీనం చేయ�మ�."
 
-#: ../shell/main.c:345
+#: ../shell/main.c:330
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr "మెయిల� యొక�క ఉపదర�శనం పలకాన�ని, పరిచయాలన� మరియ� కర�తవ�యాలన� అచేతనం చేయ�మ�."
+msgstr ""
+"మెయిల� యొక�క ఉపదర�శనం పలకాన�ని, పరిచయాలన� మరియ� కర�తవ�యాలన� అచేతనం చేయ�మ�."
 
-#: ../shell/main.c:349
+#: ../shell/main.c:334
 msgid "Import URIs or file names given as rest of arguments."
 msgstr ""
 
-#: ../shell/main.c:351
+#: ../shell/main.c:336
 #, fuzzy
 msgid "Request a running Evolution process to quit"
 msgstr "ఎవాల�యూషన� న� ప�నఃప�రారంభిస�త�న�నది"
 
-#: ../shell/main.c:475 ../shell/main.c:483
+#: ../shell/main.c:512 ../shell/main.c:520
 msgid "- The Evolution PIM and Email Client"
 msgstr "- ఎవల�యూషన� PIM మరియ� ఈ మెయిల� క�లైంట�"
 
-#: ../shell/main.c:546
-#, c-format
+#: ../shell/main.c:583
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: --online and --offline cannot be used together.\n"
+#| "  Use %s --help for more information.\n"
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
-"  Use %s --help for more information.\n"
+"  Run '%s --help' for more information.\n"
+msgstr ""
+"%s: --ఆన�‌లైన� మరియ� ఆఫ�‌లైన� కలిపి ఉపయోగించబడవ�.\n"
+"  అధిక సమాచారం కొరక� %s --సహాయం న� ఉపయోగించ�మ�.\n"
+
+#: ../shell/main.c:589
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: --online and --offline cannot be used together.\n"
+#| "  Use %s --help for more information.\n"
+msgid ""
+"%s: --force-online and --offline cannot be used together.\n"
+"  Run '%s --help' for more information.\n"
 msgstr ""
 "%s: --ఆన�‌లైన� మరియ� ఆఫ�‌లైన� కలిపి ఉపయోగించబడవ�.\n"
 "  అధిక సమాచారం కొరక� %s --సహాయం న� ఉపయోగించ�మ�.\n"
 
 #: ../shell/shell.error.xml.h:1
 msgid "Are you sure you want to forget all remembered passwords?"
-msgstr "మీర� గ�ర�త�ంచ�క�న�న అన�ని సంకేతపదాలన� ఖచ�చితంగా మర�చిపోవాలన�క�ంట�న�నారా?"
+msgstr ""
+"మీర� గ�ర�త�ంచ�క�న�న అన�ని సంకేతపదాలన� ఖచ�చితంగా మర�చిపోవాలన�క�ంట�న�నారా?"
 
 #: ../shell/shell.error.xml.h:2
 #, fuzzy
@@ -20400,7 +20400,8 @@ msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
-"మీ సంకేతపదాలన� మర�చపోవ�ట అన�ని గ�ర�త�ంచ�కొన�న సంకేతపదాలన� త�డిచివేస�త�ంది. తర�వాతి సారి అవి "
+"మీ సంకేతపదాలన� మర�చపోవ�ట అన�ని గ�ర�త�ంచ�కొన�న సంకేతపదాలన� త�డిచివేస�త�ంది. "
+"తర�వాతి సారి అవి "
 "అవసరమైనప�ప�డ� మీర� మళ�ళీ అడగబడ�తార�."
 
 #: ../shell/shell.error.xml.h:7
@@ -20427,97 +20428,98 @@ msgid ""
 msgstr ""
 "{1}\n"
 "\n"
-"మీర� కొనసాగించ�ట ఎంచ�కొన�నట�లైతే, మీర� కొంత మీ పాత డాటా న� వాడ�కొనలేక పోవచ�చ�.\n"
+"మీర� కొనసాగించ�ట ఎంచ�కొన�నట�లైతే, మీర� కొంత మీ పాత డాటా న� వాడ�కొనలేక పోవచ�చ�."
+"\n"
 
-#: ../shell/test/e-test-shell-backend.c:60
+#: ../shell/test/e-test-shell-backend.c:56
 #, fuzzy
 msgctxt "New"
 msgid "_Test Item"
 msgstr "పరీక�ష (_T)"
 
-#: ../shell/test/e-test-shell-backend.c:62
+#: ../shell/test/e-test-shell-backend.c:58
 msgid "Create a new test item"
 msgstr "కొత�త పరీక�షా అంశాన�ని సృష�టించ�మ�"
 
-#: ../shell/test/e-test-shell-backend.c:70
+#: ../shell/test/e-test-shell-backend.c:66
 #, fuzzy
 msgctxt "New"
 msgid "Test _Source"
 msgstr "వనర�"
 
-#: ../shell/test/e-test-shell-backend.c:72
+#: ../shell/test/e-test-shell-backend.c:68
 #, fuzzy
 msgid "Create a new test source"
 msgstr "కొత�త పరీక�షా అంశాన�ని సృష�టించ�మ�"
 
-#: ../smclient/eggdesktopfile.c:165
+#: ../smclient/eggdesktopfile.c:166
 #, c-format
 msgid "File is not a valid .desktop file"
 msgstr ""
 
-#: ../smclient/eggdesktopfile.c:188
+#: ../smclient/eggdesktopfile.c:189
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr ""
 
-#: ../smclient/eggdesktopfile.c:958
+#: ../smclient/eggdesktopfile.c:959
 #, fuzzy, c-format
 msgid "Starting %s"
 msgstr "%s న� స�కానింగ� చేస�తోంది"
 
-#: ../smclient/eggdesktopfile.c:1100
+#: ../smclient/eggdesktopfile.c:1102
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr ""
 
-#: ../smclient/eggdesktopfile.c:1168
+#: ../smclient/eggdesktopfile.c:1170
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr ""
 
-#: ../smclient/eggdesktopfile.c:1373
+#: ../smclient/eggdesktopfile.c:1370
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
 
-#: ../smclient/eggdesktopfile.c:1394
+#: ../smclient/eggdesktopfile.c:1391
 #, fuzzy, c-format
 msgid "Not a launchable item"
 msgstr "సరికూర�పరి దించదగ�నది కాద�"
 
-#: ../smclient/eggsmclient.c:227
+#: ../smclient/eggsmclient.c:226
 #, fuzzy
 msgid "Disable connection to session manager"
 msgstr "ఇంటర�నెట�‌క� నేర�గా అన�సంధానం (_D)"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:229
 #, fuzzy
 msgid "Specify file containing saved configuration"
 msgstr "చ�క�కాని రూపకరణన� అమర�చ�మ�"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:229
 msgid "FILE"
 msgstr ""
 
-#: ../smclient/eggsmclient.c:233
+#: ../smclient/eggsmclient.c:232
 msgid "Specify session management ID"
 msgstr ""
 
-#: ../smclient/eggsmclient.c:233
+#: ../smclient/eggsmclient.c:232
 #, fuzzy
 msgid "ID"
 msgstr "UID"
 
-#: ../smclient/eggsmclient.c:254
+#: ../smclient/eggsmclient.c:253
 msgid "Session management options:"
 msgstr ""
 
-#: ../smclient/eggsmclient.c:255
+#: ../smclient/eggsmclient.c:254
 #, fuzzy
 msgid "Show session management options"
 msgstr "ప�రతిబింబప� యానిమేషన�లన� చూప�మ�"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:107
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20528,111 +20530,154 @@ msgstr ""
 "\n"
 "నమ�మిక అమర�ప�లన� సరిచేయ�మ�:"
 
-#: ../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 ""
-"ఎంచేతంటే ఈ దృవీకరణపత�రం న� జారి చేసిన దృవీకరణ అధికారికం న� మీర� నమ�మార�, అప�ప�డ� మీర� ఈ "
+"ఎంచేతంటే ఈ దృవీకరణపత�రం న� జారి చేసిన దృవీకరణ అధికారికం న� మీర� నమ�మార�, "
+"అప�ప�డ� మీర� ఈ "
 "దృవీకరణపత�రం యొక�క ప�రామాణికతన� నమ�మాలి ఇక�కడ సూచించి ఉంటే తప�ప"
 
-#: ../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 ""
-"ఎంచేతంటే ఈ దృవీకరణపత�రం న� జారి చేసిన దృవీకరణ అధికారికం న� మీర� నమ�మలేద�, అప�ప�డ� మీర� ఈ "
+"ఎంచేతంటే ఈ దృవీకరణపత�రం న� జారి చేసిన దృవీకరణ అధికారికం న� మీర� నమ�మలేద�, "
+"అప�ప�డ� మీర� ఈ "
 "దృవీకరణపత�రం యొక�క ప�రామాణికతన� నమ�మవద�ద� ఇక�కడ సూచించి ఉంటే తప�ప"
 
-#: ../smime/gui/certificate-manager.c:148
-#: ../smime/gui/certificate-manager.c:460
-#: ../smime/gui/certificate-manager.c:697
-msgid "Select a certificate to import..."
-msgstr "దిగ�మతికి ఒక యోగ�యతాపత�రికన� ఎంచ�కొన�మ�..."
-
-#: ../smime/gui/certificate-manager.c:157
-msgid "All PKCS12 files"
-msgstr "అన�నిPKCS12 దస�త�రాల�"
+#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+msgid "Certificate Name"
+msgstr "యోగ�యతాపత�రిక నామంస�"
 
-#: ../smime/gui/certificate-manager.c:163
-#: ../smime/gui/certificate-manager.c:475
-#: ../smime/gui/certificate-manager.c:711
-msgid "All files"
-msgstr "అన�ని దస�త�రాల�"
+#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+#, fuzzy
+#| msgid "Or_ganization:"
+msgid "Issued To Organization"
+msgstr "నిర�వహణాసంస�థ(_g):"
 
-#: ../smime/gui/certificate-manager.c:182
+#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
 #, fuzzy
-msgid "Failed to import user's certificate"
-msgstr "దిగ�మతి అయిన యోగ�యతాపత�రిక"
+#| msgid "Organizational Unit (OU)"
+msgid "Issued To Organizational Unit"
+msgstr "నిర�మాణ సంస�థ భాగమ�(OU)"
 
-#: ../smime/gui/certificate-manager.c:352
-#: ../smime/gui/certificate-manager.c:574
-#: ../smime/gui/certificate-manager.c:808
-msgid "Certificate Name"
-msgstr "యోగ�యతాపత�రిక నామంస�"
+#: ../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
+msgid "Serial Number"
+msgstr "వర�సలో ఉన�న సంఖ�య"
 
-#: ../smime/gui/certificate-manager.c:361
-#: ../smime/gui/certificate-manager.c:592
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:115
 msgid "Purposes"
 msgstr "అభిప�రాయాల�"
 
-#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
-#: ../smime/lib/e-cert.c:566
-msgid "Serial Number"
-msgstr "వర�సలో ఉన�న సంఖ�య"
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+#, fuzzy
+msgid "Issued By"
+msgstr "పై జారీఅయింది"
+
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:117
+#, fuzzy
+#| msgid "Or_ganization:"
+msgid "Issued By Organization"
+msgstr "నిర�వహణాసంస�థ(_g):"
 
-#: ../smime/gui/certificate-manager.c:378
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118
+#, fuzzy
+#| msgid "Organizational Unit (OU)"
+msgid "Issued By Organizational Unit"
+msgstr "నిర�మాణ సంస�థ భాగమ�(OU)"
+
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
+#, fuzzy
+#| msgid "Issuer"
+msgid "Issued"
+msgstr "జారీచేయ�వాడ�"
+
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120
 msgid "Expires"
 msgstr "కాలంచెల�లేది"
 
-#: ../smime/gui/certificate-manager.c:469
-msgid "All email certificate files"
-msgstr "అన�ని ఈ మెయిల� యోగ�యతాపత�రిక దస�త�రాల�"
+#: ../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 వేలిమ�ద�ర"
 
-#: ../smime/gui/certificate-manager.c:502
+#: ../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 వేలిమ�ద�ర"
+
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
 #, fuzzy
-msgid "Failed to import contact's certificate"
-msgstr "పరిచయాన�ని తొలగించడంలో విఫలమయినది"
+#| msgid "Email _Address:"
+msgid "Email Address"
+msgstr "ఈ మెయిల� చిర�నామ(_A):"
 
-#: ../smime/gui/certificate-manager.c:583
-msgid "E-Mail Address"
-msgstr "ఈ మెయిల� చిర�నామా"
+#: ../smime/gui/certificate-manager.c:575
+msgid "Select a certificate to import..."
+msgstr "దిగ�మతికి ఒక యోగ�యతాపత�రికన� ఎంచ�కొన�మ�..."
 
-#: ../smime/gui/certificate-manager.c:706
-msgid "All CA certificate files"
-msgstr "యోగ�యతాపత�రిక యొక�క ప�రామాణీకరణ కలిగిన అన�ని దస�త�రాల�"
+#: ../smime/gui/certificate-manager.c:588
+msgid "All files"
+msgstr "అన�ని దస�త�రాల�"
 
-#: ../smime/gui/certificate-manager.c:737
-msgid "Failed to import certificate authority's certificate"
-msgstr ""
+#: ../smime/gui/certificate-manager.c:623
+#, fuzzy
+msgid "Failed to import certificate"
+msgstr "దిగ�మతి అయిన యోగ�యతాపత�రిక"
 
-#: ../smime/gui/certificate-manager.c:1156
-msgid "Certificates"
-msgstr "యోగ�యతా పత�రికల�"
+#: ../smime/gui/certificate-manager.c:991
+msgid "All PKCS12 files"
+msgstr "అన�నిPKCS12 దస�త�రాల�"
 
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-manager.c:1009
+msgid "All email certificate files"
+msgstr "అన�ని ఈ మెయిల� యోగ�యతాపత�రిక దస�త�రాల�"
+
+#: ../smime/gui/certificate-manager.c:1027
+msgid "All CA certificate files"
+msgstr "యోగ�యతాపత�రిక యొక�క ప�రామాణీకరణ కలిగిన అన�ని దస�త�రాల�"
+
+#: ../smime/gui/certificate-viewer.c:345
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "యోగ�యతాపత�రిక దర�శిని:%s"
 
-#: ../smime/gui/component.c:46
+#: ../smime/gui/component.c:50
 #, fuzzy, c-format
 msgid "Enter the password for '%s'"
 msgstr "`%s' క� రహస�యపదాన�ని ప�రవేశపెట�టండి"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:69
+#: ../smime/gui/component.c:76
 msgid "Enter new password for certificate database"
 msgstr "యోగ�యతాపత�రిక దత�తాంశస�థానం కొరక� కొత�త రహస�యపదాన�ని ప�రవేశపెట�టండి"
 
-#: ../smime/gui/component.c:71
+#: ../smime/gui/component.c:78
 msgid "Enter new password"
 msgstr "కొత�త రహస�యపదాన�ని ప�రవేశపెట�ట�మ�"
 
 #. 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"
@@ -20641,7 +20686,7 @@ msgstr ""
 "క� జారీఅయింది:\n"
 "  సంగతి: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:119
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20650,7 +20695,7 @@ msgstr ""
 "ద�వారా జారీఅయింది:\n"
 "  సంగతి: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:172
 msgid "Select certificate"
 msgstr "యోగ�యతాపత�రమ�న� ఎంచ�కొన�మ�"
 
@@ -20672,10 +20717,11 @@ msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
 msgstr ""
-"� ప�రయోజనం కొరకైనా ఈ CA న� నమ�మేమ�ందల, మీర� తప�పక దాని దృవీకరణ పత�రంన� నిర�దారించాలి మరియ� దాని "
+"� ప�రయోజనం కొరకైనా ఈ CA న� నమ�మేమ�ందల, మీర� తప�పక దాని దృవీకరణ పత�రంన� "
+"నిర�దారించాలి మరియ� దాని "
 "విధానం మరియ� పద�దత�ల� కూడా (అంద�బాట�లోఉంటే)."
 
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1097
 msgid "Certificate"
 msgstr "యోగ�యతాపత�రిక"
 
@@ -20739,11 +20785,6 @@ msgstr "క�షేత�ర నామం"
 msgid "Fingerprints"
 msgstr "MD5 వేలిమ�ద�ర"
 
-#: ../smime/gui/smime-ui.ui.h:23
-#, fuzzy
-msgid "Issued By"
-msgstr "పై జారీఅయింది"
-
 #: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "పై జారీఅయింది"
@@ -20753,10 +20794,6 @@ msgstr "పై జారీఅయింది"
 msgid "Issued To"
 msgstr "పై జారీఅయింది"
 
-#: ../smime/gui/smime-ui.ui.h:26
-msgid "MD5 Fingerprint"
-msgstr "MD5 వేలిమ�ద�ర"
-
 #: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "నిర�మాణ సంస�థ(O)"
@@ -20765,15 +20802,11 @@ msgstr "నిర�మాణ సంస�థ(O)"
 msgid "Organizational Unit (OU)"
 msgstr "నిర�మాణ సంస�థ భాగమ�(OU)"
 
-#: ../smime/gui/smime-ui.ui.h:29
-msgid "SHA1 Fingerprint"
-msgstr "SHA1 వేలిమ�ద�ర"
-
-#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:829
 msgid "SSL Client Certificate"
 msgstr "SSL క�లైంట� యోగ�యతాపత�రిక"
 
-#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:833
 msgid "SSL Server Certificate"
 msgstr "SSL సేవిక యోగ�యతాపత�రిక"
 
@@ -20788,16 +20821,21 @@ msgstr "యోగà±�యతాపతà±�à°°à°¿à°• యొకà±�à°• à°ªà±�రామà
 
 #: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
-msgstr "ఈ మెయిల� వినియోగదార�లని గ�ర�తించ�టక� ఈ యోగ�యతాపత�రిక యొక�క ప�రామాణీకరణన� విశ�వసించ�మ�"
+msgstr ""
+"ఈ మెయిల� వినియోగదార�లని గ�ర�తించ�టక� ఈ యోగ�యతాపత�రిక యొక�క ప�రామాణీకరణన� "
+"విశ�వసించ�మ�"
 
 #: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
-msgstr "సాఫ�ట�వేర� అభివృద�దికార�లన� గ�ర�తించ�టక� ఈ యోగ�యతాపత�రిక యొక�క ప�రామాణీకరణన� విశ�వసించ�మ�"
+msgstr ""
+"సాఫ�ట�వేర� అభివృద�దికార�లన� గ�ర�తించ�టక� ఈ యోగ�యతాపత�రిక యొక�క ప�రామాణీకరణన� "
+"విశ�వసించ�మ�"
 
 #: ../smime/gui/smime-ui.ui.h:37
 #, fuzzy
 msgid "Trust this CA to identify websites."
-msgstr "మహాతల ప�రదేశాలన� గ�ర�తించ�టక� యోగ�యతాపత�రిక యొక�క ప�రామాణీకరణన� విశ�వసించ�మ�"
+msgstr ""
+"మహాతల ప�రదేశాలన� గ�ర�తించ�టక� యోగ�యతాపత�రిక యొక�క ప�రామాణీకరణన� విశ�వసించ�మ�"
 
 #: ../smime/gui/smime-ui.ui.h:38
 #, fuzzy
@@ -20811,26 +20849,29 @@ msgstr "మిమ�మల�ని గ�ర�తించ�టక� ఈ స
 #: ../smime/gui/smime-ui.ui.h:40
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
-msgstr "యోగ�యతాపత�రికల అధికార�లన� గ�ర�తించ�టక�  మీక� యోగ�యతాపత�రికల� దస�త�రం పై ఉన�నాయి:"
+msgstr ""
+"యోగ�యతాపత�రికల అధికార�లన� గ�ర�తించ�టక�  మీక� యోగ�యతాపత�రికల� ఫైల� పై "
+"ఉన�నాయి:"
 
 #: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
-msgstr "ఈ జనాలని గ�ర�తించ�టక�  మీక� యోగ�యతాపత�రికల� దస�త�రం పై ఉన�నాయి:"
+msgstr "ఈ జనాలని గ�ర�తించ�టక�  మీక� యోగ�యతాపత�రికల� ఫైల� పై ఉన�నాయి:"
 
 #: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "మీ యోగ�యతాపత�రికల�"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:44
 #, fuzzy
 msgid "_Backup"
 msgstr "భద�రపర�చ�"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "_Edit CA Trust"
 msgstr "CA నమ�మికన� సరిచేయ�మ�(_E)"
 
-#: ../smime/lib/e-cert-db.c:906
+#: ../smime/lib/e-cert-db.c:912
 msgid "Certificate already exists"
 msgstr "యోగ�యతాపత�రిక మ�ందే ఉన�న"
 
@@ -20839,194 +20880,196 @@ msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:414
+#: ../smime/lib/e-cert.c:417
 msgid "Sign"
 msgstr "సంతకం"
 
-#: ../smime/lib/e-cert.c:415
+#: ../smime/lib/e-cert.c:418
 msgid "Encrypt"
 msgstr "ఎన�క�రిప�ట�"
 
-#: ../smime/lib/e-cert.c:527
+#: ../smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "వివరణం"
 
-#: ../smime/lib/e-cert.c:542
+#: ../smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "వివరణం 1"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "వివరణం 2"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "వివరణం 3"
 
-#: ../smime/lib/e-cert.c:630
+#: ../smime/lib/e-cert.c:634
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "RSA ఎన�క�రిప�షన� తొ PKCS #1 MD2"
 
-#: ../smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:637
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "RSA ఎన�క�రిప�షన� తొ PKCS #1 MD5"
 
-#: ../smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:640
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "RSA ఎన�క�రిప�షన� తొ PKCS #1 SHA-1"
 
-#: ../smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:643
 #, fuzzy
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "RSA ఎన�క�రిప�షన� తొ PKCS #1 SHA-1"
 
-#: ../smime/lib/e-cert.c:642
+#: ../smime/lib/e-cert.c:646
 #, fuzzy
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "RSA ఎన�క�రిప�షన� తొ PKCS #1 SHA-1"
 
-#: ../smime/lib/e-cert.c:645
+#: ../smime/lib/e-cert.c:649
 #, fuzzy
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "RSA ఎన�క�రిప�షన� తొ PKCS #1 SHA-1"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:676
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA ఎన�క�రిప�షన�"
 
-#: ../smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:679
 msgid "Certificate Key Usage"
 msgstr "దృవీకరణపత�రం కీ ఉపయోగం"
 
-#: ../smime/lib/e-cert.c:678
+#: ../smime/lib/e-cert.c:682
 msgid "Netscape Certificate Type"
 msgstr "నెట� స�కేప� యోగ�యతాపత�రిక రకం"
 
-#: ../smime/lib/e-cert.c:681
+#: ../smime/lib/e-cert.c:685
 msgid "Certificate Authority Key Identifier"
 msgstr "దృవీకరణపత�రం అధికారికం కీ గ�ర�తింప�దారి"
 
-#: ../smime/lib/e-cert.c:693
+#: ../smime/lib/e-cert.c:697
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "ఆబ�జక�ట� గ�ర�తింప�దారి (%s)"
 
-#: ../smime/lib/e-cert.c:744
+#: ../smime/lib/e-cert.c:749
 msgid "Algorithm Identifier"
 msgstr "వర�సక�రమ విధానం గ�ర�తింప�చిహ�నం"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:757
 msgid "Algorithm Parameters"
 msgstr "వర�సక�రమ విధానం పరామిత�ల�"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Info"
 msgstr "సంగతి పబ�లిక� కీ సమాచారం"
 
-#: ../smime/lib/e-cert.c:779
+#: ../smime/lib/e-cert.c:784
 msgid "Subject Public Key Algorithm"
 msgstr "సంగతి పబ�లిక� కీ అల�గార�ధెమ�"
 
-#: ../smime/lib/e-cert.c:794
+#: ../smime/lib/e-cert.c:799
 msgid "Subject's Public Key"
 msgstr "సంగతి యొక�క పబ�లిక� కీ"
 
-#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:820 ../smime/lib/e-cert.c:870
 msgid "Error: Unable to process extension"
 msgstr "దోషం: విస�తరింప�న� నిర�వర�తించలేద�"
 
-#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:841 ../smime/lib/e-cert.c:853
 msgid "Object Signer"
 msgstr "ఆబ�జక�ట� సంతకంచేయ�నది"
 
-#: ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:845
 msgid "SSL Certificate Authority"
 msgstr "SSL యోగ�యతాపత�రిక అధికారమ�"
 
-#: ../smime/lib/e-cert.c:844
+#: ../smime/lib/e-cert.c:849
 msgid "Email Certificate Authority"
 msgstr "ఈ మెయిల� యోగ�యతాపత�రిక అధికారమ�"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:878
 msgid "Signing"
 msgstr "సంతకంచేయ�ట"
 
-#: ../smime/lib/e-cert.c:876
+#: ../smime/lib/e-cert.c:882
 msgid "Non-repudiation"
 msgstr "Non-repudiation"
 
-#: ../smime/lib/e-cert.c:880
+#: ../smime/lib/e-cert.c:886
 msgid "Key Encipherment"
 msgstr "కీ ఎన�‌సిఫర�‌మెంట�"
 
-#: ../smime/lib/e-cert.c:884
+#: ../smime/lib/e-cert.c:890
 msgid "Data Encipherment"
 msgstr "డాటా ఎన�‌సిఫర�‌మెంట�"
 
-#: ../smime/lib/e-cert.c:888
+#: ../smime/lib/e-cert.c:894
 msgid "Key Agreement"
 msgstr "మీట ఒప�పందం"
 
-#: ../smime/lib/e-cert.c:892
+#: ../smime/lib/e-cert.c:898
 msgid "Certificate Signer"
 msgstr "యోగ�యతాపత�రిక సంతకంచేసేది"
 
-#: ../smime/lib/e-cert.c:896
+#: ../smime/lib/e-cert.c:902
 msgid "CRL Signer"
 msgstr "CRL సంతకంచేసేది"
 
-#: ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:951
 msgid "Critical"
 msgstr "విషమం"
 
-#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
+#: ../smime/lib/e-cert.c:953 ../smime/lib/e-cert.c:956
 msgid "Not Critical"
 msgstr "విషమం కాద�"
 
-#: ../smime/lib/e-cert.c:970
+#: ../smime/lib/e-cert.c:977
 msgid "Extensions"
 msgstr "పొడగింప�ల�"
 
-#. Translators: This string is used in Certificate details for fields like Issuer
-#. or Subject, which shows the field name on the left and its respective value
-#. on the right, both as stored in the certificate itself. You probably do not
-#. need to change this string, unless changing the order of name and value.
-#. As a result example: "OU = VeriSign Trust Network"
-#.
-#: ../smime/lib/e-cert.c:1045
+#. Translators: This string is used in Certificate
+#. * details for fields like Issuer or Subject, which
+#. * shows the field name on the left and its respective
+#. * value on the right, both as stored in the
+#. * certificate itself.  You probably do not need to
+#. * 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
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
+#: ../smime/lib/e-cert.c:1111 ../smime/lib/e-cert.c:1234
 msgid "Certificate Signature Algorithm"
 msgstr "యోగ�యతా సంతకం వర�సక�రమ విధానం"
 
-#: ../smime/lib/e-cert.c:1109
+#: ../smime/lib/e-cert.c:1120
 msgid "Issuer"
 msgstr "జారీచేయ�వాడ�"
 
-#: ../smime/lib/e-cert.c:1164
+#: ../smime/lib/e-cert.c:1175
 msgid "Issuer Unique ID"
 msgstr "జారీచేయ�వాన�ని �కైక ID"
 
-#: ../smime/lib/e-cert.c:1183
+#: ../smime/lib/e-cert.c:1194
 msgid "Subject Unique ID"
 msgstr "విషయం �కైక ID"
 
-#: ../smime/lib/e-cert.c:1229
+#: ../smime/lib/e-cert.c:1240
 msgid "Certificate Signature Value"
 msgstr "యోగ�యతాపత�రిక సంతకం విల�వ"
 
-#: ../smime/lib/e-pkcs12.c:250
+#: ../smime/lib/e-pkcs12.c:256
 msgid "PKCS12 File Password"
 msgstr "PKCS12 దస�త�ర రహస�యపదం"
 
-#: ../smime/lib/e-pkcs12.c:251
+#: ../smime/lib/e-pkcs12.c:257
 msgid "Enter password for PKCS12 file:"
 msgstr "PKCS12 దస�త�రానికి రహస�యపదమ�న� ప�రవేశపెట�టండి:"
 
-#: ../smime/lib/e-pkcs12.c:353
+#: ../smime/lib/e-pkcs12.c:363
 msgid "Imported Certificate"
 msgstr "దిగ�మతి అయిన యోగ�యతాపత�రిక"
 
@@ -21107,7 +21150,7 @@ msgstr "స�స�థితి తో(_S)"
 #: ../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:779
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:789
 msgid "UTC"
 msgstr "UTC"
 
@@ -21130,7 +21173,8 @@ msgid ""
 "zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
-"పఠమ� నంద� ఒక ప�రదేశం పై జూమ� చేయ�టక� మౌస� ఎడమ బటన� ఉపయోగించ�మ� మరియ� సమయక�షేత�రంన� "
+"పఠమ� నంద� ఒక ప�రదేశం పై జూమ� చేయ�టక� మౌస� ఎడమ బటన� ఉపయోగించ�మ� మరియ� "
+"సమయక�షేత�రంన� "
 "ఎంచ�కొన�మ�.\n"
 "జూమ� తగ�గించ�టక� మౌస� క�డి బటన� న� ఉపయోగించ�మ�."
 
@@ -21139,14 +21183,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "ఎంపిక సంవిధానం"
 
-#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../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 "%s క� దర�శనాలన� నిర�వచించ�"
 
-#: ../widgets/menus/gal-define-views-dialog.c:354
-#: ../widgets/menus/gal-define-views-dialog.c:356
+#: ../widgets/menus/gal-define-views-dialog.c:367
+#: ../widgets/menus/gal-define-views-dialog.c:369
 msgid "Define Views"
 msgstr "దర�శనాలన� నిర�వచించ�"
 
@@ -21155,11 +21199,11 @@ msgstr "దర�శనాలన� నిర�వచించ�"
 msgid "Define Views for \"%s\""
 msgstr "\"%s\" క� దర�శనాలన� నిర�వచించ�"
 
-#: ../widgets/menus/gal-view-factory-etable.c:113
+#: ../widgets/menus/gal-view-factory-etable.c:111
 msgid "Table"
 msgstr "పట�టిక"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:274
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "ప�రస�త�త దర�శనాన�ని దాయ�మ�"
 
@@ -21171,7 +21215,7 @@ msgstr "కొతà±�à°¤ దరà±�శనానà±�ని సృషà±�à°Ÿà°¿à°‚à°šà
 msgid "_Replace existing view"
 msgstr "ఉన�న దర�శనమ�న� ప�న:స�థాపించ�మ�(_R)"
 
-#: ../widgets/menus/gal-view-new-dialog.c:106
+#: ../widgets/menus/gal-view-new-dialog.c:108
 msgid "Define New View"
 msgstr "కొత�త దర�శనమ�న� నిర�వచించ�"
 
@@ -21187,116 +21231,138 @@ msgstr "దర�శనం రకం"
 msgid "Type of view:"
 msgstr "దర�శన రకం:"
 
-#: ../widgets/misc/e-account-manager.c:348
+#: ../widgets/misc/e-account-manager.c:353
 msgid "De_fault"
 msgstr "అప�రమేయ(_f)"
 
-#: ../widgets/misc/e-account-tree-view.c:255
+#: ../widgets/misc/e-account-tree-view.c:243
+#, fuzzy
+msgid "Account Name"
+msgstr "ఖాతా పేర�"
+
+#: ../widgets/misc/e-account-tree-view.c:274
 msgid "Protocol"
 msgstr "నియమం"
 
-#: ../widgets/misc/e-attachment-dialog.c:305
+#: ../widgets/misc/e-attachment-dialog.c:308
 msgid "Attachment Properties"
 msgstr "అన�బంధం లక�షణాల�"
 
-#: ../widgets/misc/e-attachment-dialog.c:328
+#: ../widgets/misc/e-attachment-dialog.c:330
 msgid "_Filename:"
-msgstr "దస�త�రనామమ� (_F):"
+msgstr "దస�త�రపేర� (_F):"
 
-#: ../widgets/misc/e-attachment-dialog.c:363
+#: ../widgets/misc/e-attachment-dialog.c:365
 msgid "MIME Type:"
 msgstr "MIME à°°à°•à°‚:"
 
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:550
+#: ../widgets/misc/e-attachment-dialog.c:373
+#: ../widgets/misc/e-attachment-store.c:559
 msgid "_Suggest automatic display of attachment"
 msgstr "స�వయంచాలక అన�బంధ ప�రదర�శనాన�ని సూచించ�మ�(_S)"
 
-#: ../widgets/misc/e-attachment-handler-image.c:97
+#: ../widgets/misc/e-attachment-handler-image.c:95
 msgid "Could not set as background"
 msgstr "బ�యాక�‌గ�రౌండ� వలె అమర�చలేక పోయింది"
 
-#: ../widgets/misc/e-attachment-handler-image.c:149
+#: ../widgets/misc/e-attachment-handler-image.c:145
 msgid "Set as _Background"
 msgstr "బ�యాక�‌గ�రౌండ� లా అమర�చ�మ�(_B)"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#: ../widgets/misc/e-attachment-handler-sendto.c:93
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "అన�భందమ�న� పంపలేక పోయింది"
 msgstr[1] "అన�భందమ�లన� పంపలేక పోయింది"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:129
+#: ../widgets/misc/e-attachment-handler-sendto.c:135
 msgid "_Send To..."
 msgstr "దీనికి పంపించ�... (_S)"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#: ../widgets/misc/e-attachment-handler-sendto.c:137
 msgid "Send the selected attachments somewhere"
 msgstr "ఎంపికచేసిన అన�భందాలన� యేదోవొక చోటకి పంప�మ�"
 
-#: ../widgets/misc/e-attachment-icon-view.c:495
-#: ../widgets/misc/e-attachment-tree-view.c:535
+#: ../widgets/misc/e-attachment-icon-view.c:162
+#: ../widgets/misc/e-attachment-tree-view.c:547
 msgid "Loading"
 msgstr "లోడవ�చ�న�నది"
 
-#: ../widgets/misc/e-attachment-icon-view.c:507
-#: ../widgets/misc/e-attachment-tree-view.c:547
+#: ../widgets/misc/e-attachment-icon-view.c:174
+#: ../widgets/misc/e-attachment-tree-view.c:559
 msgid "Saving"
 msgstr "దాయ�చ�న�నది"
 
-#: ../widgets/misc/e-attachment-paned.c:87
+#: ../widgets/misc/e-attachment-paned.c:97
 #, fuzzy
 msgid "Hide Attachment _Bar"
 msgstr "అన�భంద పట�టీని మర�గ�పర�చ�మ�(_A)"
 
-#: ../widgets/misc/e-attachment-paned.c:89
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../widgets/misc/e-attachment-paned.c:99
+#: ../widgets/misc/e-attachment-paned.c:639
 #, fuzzy
 msgid "Show Attachment _Bar"
 msgstr "అన�భంద పట�టీని చూప�మ�(_A)"
 
-#: ../widgets/misc/e-attachment-store.c:538
+#: ../widgets/misc/e-attachment-store.c:547
 msgid "Add Attachment"
 msgstr "అన�భందమ�న� జతచేయి"
 
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:550
 msgid "A_ttach"
 msgstr "అన�భందమ�(_t)"
 
-#: ../widgets/misc/e-attachment-store.c:604
+#: ../widgets/misc/e-attachment-store.c:613
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "అన�భందమ�న� దాయి"
 msgstr[1] "అన�భందమ�లన� దాయి"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1808 ../widgets/misc/e-attachment.c:2348
+#: ../widgets/misc/e-attachment-store.c:642
+#: ../widgets/misc/e-attachment.c:1810 ../widgets/misc/e-attachment.c:2352
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:301
+#: ../widgets/misc/e-attachment-view.c:404
+msgid "Open With Other Application..."
+msgstr ""
+
+#: ../widgets/misc/e-attachment-view.c:411
 msgid "S_ave All"
 msgstr "అన�నిటినీ దాయ�మ�(_a)"
 
-#: ../widgets/misc/e-attachment-view.c:327
+#: ../widgets/misc/e-attachment-view.c:437
 msgid "A_dd Attachment..."
 msgstr "అన�భందంన� జతపర�చ�మ�... (_d)"
 
-#: ../widgets/misc/e-attachment-view.c:351
+#: ../widgets/misc/e-attachment-view.c:461
 msgid "_Hide"
 msgstr "మర�గ�పర�చ�(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:358
+#: ../widgets/misc/e-attachment-view.c:468
+#, fuzzy
+#| msgid "S_ave All"
+msgid "Hid_e All"
+msgstr "అన�నిటినీ దాయ�మ�(_a)"
+
+#: ../widgets/misc/e-attachment-view.c:475
 msgid "_View Inline"
 msgstr "ఇన�‌లైన� న� దర�శించ�(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:640
-#, c-format
-msgid "Open with \"%s\""
+#: ../widgets/misc/e-attachment-view.c:482
+#, fuzzy
+#| msgid "_View Inline"
+msgid "Vie_w All Inline"
+msgstr "ఇన�‌లైన� న� దర�శించ�(_V)"
+
+#: ../widgets/misc/e-attachment-view.c:803
+#, fuzzy, c-format
+#| msgid "Open with \"%s\""
+msgid "Open With \"%s\""
 msgstr "\"%s\"తో తెర�వ�మ�"
 
-#: ../widgets/misc/e-attachment-view.c:643
+#: ../widgets/misc/e-attachment-view.c:806
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "%s నంద� ఈ అన�భందమ�న� తెర�వ�మ�"
@@ -21305,88 +21371,93 @@ msgstr "%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:1021
+#: ../widgets/misc/e-attachment.c:998
 msgid "Attached message"
 msgstr "అన�భందించిన సందేశమ�"
 
-#: ../widgets/misc/e-attachment.c:1849 ../widgets/misc/e-attachment.c:2650
+#: ../widgets/misc/e-attachment.c:1853 ../widgets/misc/e-attachment.c:2654
 msgid "A load operation is already in progress"
 msgstr "లోడ� ఆపరేషన� యిప�పటికే ప�రోగతిలో వ�ంది"
 
-#: ../widgets/misc/e-attachment.c:1857 ../widgets/misc/e-attachment.c:2658
+#: ../widgets/misc/e-attachment.c:1861 ../widgets/misc/e-attachment.c:2662
 msgid "A save operation is already in progress"
 msgstr "దాయ� ఆపరేషన� యిప�పటికే ప�రోగతిలోవ�ంది"
 
-#: ../widgets/misc/e-attachment.c:1949
+#: ../widgets/misc/e-attachment.c:1953
 #, c-format
 msgid "Could not load '%s'"
 msgstr "'%s' లోడ� చేయలేక పోయింది"
 
-#: ../widgets/misc/e-attachment.c:1952
+#: ../widgets/misc/e-attachment.c:1956
 #, c-format
 msgid "Could not load the attachment"
 msgstr "అన�భందమ�న� లోడ� చేయలేక పోయింది"
 
-#: ../widgets/misc/e-attachment.c:2228
+#: ../widgets/misc/e-attachment.c:2232
 #, c-format
 msgid "Could not open '%s'"
 msgstr "'%s'న� తెర�వలేక పోయింది"
 
-#: ../widgets/misc/e-attachment.c:2231
+#: ../widgets/misc/e-attachment.c:2235
 #, c-format
 msgid "Could not open the attachment"
 msgstr "అన�భందమ�న� తెర�వలేక పోయింది"
 
-#: ../widgets/misc/e-attachment.c:2666
+#: ../widgets/misc/e-attachment.c:2670
 msgid "Attachment contents not loaded"
 msgstr "అన�భందమ� సారమ�ల� లోడ� కాలేద�"
 
-#: ../widgets/misc/e-attachment.c:2742
+#: ../widgets/misc/e-attachment.c:2746
 #, c-format
 msgid "Could not save '%s'"
 msgstr "'%s'న� దాయలేక పోయింది"
 
-#: ../widgets/misc/e-attachment.c:2745
+#: ../widgets/misc/e-attachment.c:2749
 #, c-format
 msgid "Could not save the attachment"
 msgstr "అన�భందమ�న� దాయలేక పోయింది"
 
 #. 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:359
+#: ../widgets/misc/e-buffer-tagger.c:387
 #, fuzzy
 msgid "Ctrl-click to open a link"
 msgstr "%s తెర�వ�టక� నొకండి"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1255
+#: ../widgets/misc/e-calendar-item.c:1249
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:217
+#: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "నెల క�యాలెండర�"
 
-#: ../widgets/misc/e-charset-combo-box.c:93
+#: ../widgets/misc/e-charset-combo-box.c:96
 msgid "Character Encoding"
 msgstr "అక�షర సంకేతరచన"
 
-#: ../widgets/misc/e-charset-combo-box.c:117
+#: ../widgets/misc/e-charset-combo-box.c:119
 msgid "Enter the character set to use"
 msgstr "ఉపయోగించడానికి అక�షరమాలన� ఎక�కించ�మ�"
 
-#: ../widgets/misc/e-charset-combo-box.c:336
+#: ../widgets/misc/e-charset-combo-box.c:339
 msgid "Other..."
 msgstr "ఇతర..."
 
-#: ../widgets/misc/e-dateedit.c:502
+#: ../widgets/misc/e-contact-map-window.c:355
+#, fuzzy
+msgid "Contacts Map"
+msgstr "చిర�నామాల�: "
+
+#: ../widgets/misc/e-dateedit.c:501
 msgid "Date and Time"
 msgstr "తేది మరియ� సమయం"
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:522
 msgid "Text entry to input date"
 msgstr "ఎగ�బడి తేదీని పాఠ�యమ� గా ఎక�కించ�మ�"
 
-#: ../widgets/misc/e-dateedit.c:545
+#: ../widgets/misc/e-dateedit.c:544
 msgid "Click this button to show a calendar"
 msgstr "క�యాలెండర� ని చూపించ�టక� బొత�తం న� నొక�కండి"
 
@@ -21403,66 +21474,67 @@ msgid "_Today"
 msgstr "ఈ రోజ�(_T)"
 
 #. 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 "�దికాద�(_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
+#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1921
 #, fuzzy
 msgctxt "date"
 msgid "None"
 msgstr "�దికాద�"
 
-#: ../widgets/misc/e-dateedit.c:1809
+#: ../widgets/misc/e-dateedit.c:1815
 msgid "Invalid Date Value"
 msgstr "నిస�సార తారీఖ� విల�వ"
 
-#: ../widgets/misc/e-dateedit.c:1853
+#: ../widgets/misc/e-dateedit.c:1859
 msgid "Invalid Time Value"
 msgstr "చెల�లని కాలం విల�వ"
 
-#: ../widgets/misc/e-import-assistant.c:242
+#: ../widgets/misc/e-import-assistant.c:249
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr ""
-"ఎవాల�యూషన� క� దిగ�మతి చేయాలన�క�ంట�న�న దస�త�రాన�ని ఎంచ�కొన�మ�, మరియ� జాబితాన�ండి � రకమైన దస�త�రమో "
+"ఎవాల�యూషన� క� దిగ�మతి చేయాలన�క�ంట�న�న ఫైల�న� ఎంచ�కొన�మ�, మరియ� "
+"జాబితాన�ండి � రకమైన దస�త�రమో "
 "ఎంచ�కొన�మ�."
 
-#: ../widgets/misc/e-import-assistant.c:259
+#: ../widgets/misc/e-import-assistant.c:266
 msgid "F_ilename:"
-msgstr "దస�త�రనామమ�(_i):"
+msgstr "దస�త�రపేర�(_i):"
 
-#: ../widgets/misc/e-import-assistant.c:269
+#: ../widgets/misc/e-import-assistant.c:276
 msgid "Select a file"
-msgstr "ఒక దస�త�రాన�ని ఎంచ�కొన�మ�"
+msgstr "ఒక ఫైల�న� ఎంచ�కొన�మ�"
 
-#: ../widgets/misc/e-import-assistant.c:283
-#: ../widgets/misc/e-import-assistant.c:458
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
 msgid "File _type:"
-msgstr "దస�త�రం రకం(_t):"
+msgstr "ఫైల� రకం(_t):"
 
-#: ../widgets/misc/e-import-assistant.c:326
-#: ../widgets/misc/e-import-assistant.c:909
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:913
 msgid "Choose the destination for this import"
 msgstr "ఈ దిగ�మతికి గమ�యాన�ని ఎంచ�కొన�మ�"
 
-#: ../widgets/misc/e-import-assistant.c:351
+#: ../widgets/misc/e-import-assistant.c:358
 msgid "Choose the type of importer to run:"
 msgstr "నడ�చ�టక� దిగ�మతిచేయ� రకాన�ని ఎంచ�కొన�మ�:"
 
-#: ../widgets/misc/e-import-assistant.c:359
+#: ../widgets/misc/e-import-assistant.c:366
 msgid "Import data and settings from _older programs"
 msgstr "పాత కార�యక�రమాలన�ండి దత�తాంశాన�ని మరియ� అమరికలన� దిగ�మతి చేయ�మ�"
 
-#: ../widgets/misc/e-import-assistant.c:367
+#: ../widgets/misc/e-import-assistant.c:374
 msgid "Import a _single file"
-msgstr "ఒకేఒక దస�త�రాన�ని దిగ�మతిచేయ�(_s)"
+msgstr "ఒకేఒక ఫైల�న� దిగ�మతిచేయ�(_s)"
 
-#: ../widgets/misc/e-import-assistant.c:519
+#: ../widgets/misc/e-import-assistant.c:526
 #, fuzzy
 msgid ""
 "Evolution checked for settings to import from the following applications: "
@@ -21475,36 +21547,36 @@ msgstr ""
 "ఇష�టపడితే, దయచేసి \"వెన�కక�\" బటన� న� నొక�కండి.\n"
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:766
+#: ../widgets/misc/e-import-assistant.c:768
 #, fuzzy
 msgid "_Cancel Import"
 msgstr "మ�ఖ�యమైన(_I)"
 
-#: ../widgets/misc/e-import-assistant.c:908
+#: ../widgets/misc/e-import-assistant.c:912
 #, fuzzy
 msgid "Preview data to be imported"
 msgstr "మ�ద�రించాల�సిన సందేశాన�ని ప�న:దర�శనం చేయ�మ�"
 
-#: ../widgets/misc/e-import-assistant.c:914
-#: ../widgets/misc/e-import-assistant.c:927
+#: ../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:1342
-#: ../widgets/misc/e-import-assistant.c:1351
+#: ../widgets/misc/e-import-assistant.c:1352
+#: ../widgets/misc/e-import-assistant.c:1361
 #, fuzzy
 msgid "Import Data"
 msgstr "మ�ఖ�యమైన"
 
-#: ../widgets/misc/e-import-assistant.c:922
+#: ../widgets/misc/e-import-assistant.c:926
 msgid "Select what type of file you want to import from the list."
 msgstr ""
 
-#: ../widgets/misc/e-import-assistant.c:1268
-#: ../widgets/misc/e-import-assistant.c:1300
+#: ../widgets/misc/e-import-assistant.c:1266
+#: ../widgets/misc/e-import-assistant.c:1301
 msgid "Evolution Import Assistant"
 msgstr "ఎవల�యూషన� దిగ�మతి సహాయక�డ�"
 
 #: ../widgets/misc/e-import-assistant.c:1283
-#: ../widgets/misc/e-import-assistant.c:1330
+#: ../widgets/misc/e-import-assistant.c:1339
 msgid "Import Location"
 msgstr "స�థానాన�ని దిగ�మతి చేయ�మ�"
 
@@ -21519,33 +21591,34 @@ msgstr ""
 "ఈ సహాయకి ద�వారా మీర� బహిర�గత దస�త�రాలన� ఎవాల�యూషన� క� దిగ�మతి చేయ�\n"
 "కార�యక�రమం నంద� మార�గదర�శనం చేయబడతార�."
 
-#: ../widgets/misc/e-import-assistant.c:1308
+#: ../widgets/misc/e-import-assistant.c:1311
 msgid "Importer Type"
 msgstr "దిగ�మతిదార�ని  రకం"
 
-#: ../widgets/misc/e-import-assistant.c:1316
+#: ../widgets/misc/e-import-assistant.c:1321
 msgid "Select Information to Import"
 msgstr "దిగ�మతిచేయ�టక� సమాచారమ�న� ఎంపికచేయ�మ�"
 
-#: ../widgets/misc/e-import-assistant.c:1323
+#: ../widgets/misc/e-import-assistant.c:1330
 msgid "Select a File"
-msgstr "దస�త�రం న�  ఎంచ�కొన�మ�"
+msgstr "ఫైల� న�  ఎంచ�కొన�మ�"
 
-#: ../widgets/misc/e-import-assistant.c:1337
+#: ../widgets/misc/e-import-assistant.c:1347
 #, fuzzy
 msgid "Click \"Apply\" to begin importing the file into Evolution."
-msgstr "దస�త�రాన�ని ఎవాల�యూషన� క� దిగ�మతిచేయ�ట ప�రారభించ�టక� \"దిగ�మతి\" నొక�కండి. "
+msgstr "ఫైల�న� ఎవాల�యూషన� క� దిగ�మతిచేయ�ట ప�రారభించ�టక� \"దిగ�మతి\" నొక�కండి. "
 
-#: ../widgets/misc/e-map.c:624
+#: ../widgets/misc/e-map.c:883
 msgid "World Map"
 msgstr "ప�రపంచ పట�టా"
 
-#: ../widgets/misc/e-map.c:626
+#: ../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 ""
-"సమయక�షేత�రాన�ని ఎంచ�కొన�టక� మౌస�-ఆదారిత పరిస�పందిత పఠం విడ�జట�. కీబోర�డ� వినియోగదార�ల� సమయక�షేత�రాన�ని "
+"సమయక�షేత�రాన�ని ఎంచ�కొన�టక� మౌస�-ఆదారిత పరిస�పందిత పఠం విడ�జట�. కీబోర�డ� "
+"వినియోగదార�ల� సమయక�షేత�రాన�ని "
 "క�రింది డ�రాప�-డౌన� య�గళ పెట�టె న�ండి ఎంచ�కొవలెన�."
 
 #: ../widgets/misc/e-online-button.c:27
@@ -21569,56 +21642,56 @@ msgstr ""
 "ఎవల�యూషన� ప�రస�త�తం ఆఫ�‌లైన�లో వ�ంది.\n"
 "ఆన�‌లైన�లో పనిచేయడానికి ఈ బొత�తమ�న� నొక�కండి."
 
-#: ../widgets/misc/e-preferences-window.c:266
+#: ../widgets/misc/e-preferences-window.c:279
 msgid "Evolution Preferences"
 msgstr "ఎవల�యూషన� అభీష�టాల�"
 
-#: ../widgets/misc/e-search-bar.c:77
+#: ../widgets/misc/e-search-bar.c:81
 #, c-format
 msgid "Matches: %d"
 msgstr "జోడీల�: %d"
 
-#: ../widgets/misc/e-search-bar.c:554
+#: ../widgets/misc/e-search-bar.c:563
 msgid "Close the find bar"
 msgstr "కన�గొన� పట�టీన� మూయ�మ�"
 
-#: ../widgets/misc/e-search-bar.c:562
+#: ../widgets/misc/e-search-bar.c:571
 msgid "Fin_d:"
 msgstr "కన�గొన�మ� (_d):"
 
-#: ../widgets/misc/e-search-bar.c:574
+#: ../widgets/misc/e-search-bar.c:583
 msgid "Clear the search"
-msgstr "శోధనన� శ�భ�రపరచ�మ�"
+msgstr "అన�వేషణన� శ�భ�రపరచ�మ�"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Previous"
 msgstr "మ�ందలి(_P)"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:613
 msgid "Find the previous occurrence of the phrase"
 msgstr "పదమ�యొక�క మ�న�పటి సంభవాన�ని కన�గొన�మ�"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:626
 msgid "_Next"
 msgstr "తర�వాతి(_N)"
 
-#: ../widgets/misc/e-search-bar.c:619
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Find the next occurrence of the phrase"
 msgstr "పదమ� యొక�క తర�వాతి సంభవమ�న� కన�గొన�మ�"
 
-#: ../widgets/misc/e-search-bar.c:629
+#: ../widgets/misc/e-search-bar.c:645
 msgid "Mat_ch case"
 msgstr "సరిపోల� సందర�భమ� (_c)"
 
-#: ../widgets/misc/e-search-bar.c:657
+#: ../widgets/misc/e-search-bar.c:673
 msgid "Reached bottom of page, continued from top"
 msgstr "పేజీ క�రిందక� చేర�కొన�నది, పైన�ండి కొనసాగిస�త�ంది"
 
-#: ../widgets/misc/e-search-bar.c:679
+#: ../widgets/misc/e-search-bar.c:695
 msgid "Reached top of page, continued from bottom"
 msgstr "పేజీ పైనక� చేర�కొన�నది, క�రింది న�ండి కొనసాగిస�త�ంది"
 
-#: ../widgets/misc/e-send-options.c:515
+#: ../widgets/misc/e-send-options.c:552
 msgid "When de_leted:"
 msgstr "తొలగించబడినప�ప�డ�(_l)"
 
@@ -21640,144 +21713,172 @@ msgid "Delivery Options"
 msgstr "<b>పంపించ�టక� ఇచ�చాపూర�వకాల�</b>"
 
 #: ../widgets/misc/e-send-options.ui.h:6
+#, fuzzy
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "అప�పటివరక�(_U):"
+
+#: ../widgets/misc/e-send-options.ui.h:7
+#, fuzzy
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "తర�వాత(_A):"
+
+#: ../widgets/misc/e-send-options.ui.h:8
+#, fuzzy
+#| msgid "days"
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "రోజ�ల�"
+
+#: ../widgets/misc/e-send-options.ui.h:9
+#, fuzzy
+#| msgid "Wi_thin"
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "లోపల(_t)"
+
+#: ../widgets/misc/e-send-options.ui.h:10
+#, fuzzy
+#| msgid "days"
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "రోజ�ల�"
+
+#: ../widgets/misc/e-send-options.ui.h:11
 msgid "For Your Eyes Only"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.ui.h:7
+#: ../widgets/misc/e-send-options.ui.h:12
 msgid "Gene_ral Options"
 msgstr "సాధారణ ఇచ�చాపూర�వకాల�(_r)"
 
-#: ../widgets/misc/e-send-options.ui.h:10
+#: ../widgets/misc/e-send-options.ui.h:15
 #, fuzzy
 msgid "Mail Receipt"
 msgstr ""
 "�దీకాద�\n"
 "మెయిల� రశీద�"
 
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../widgets/misc/e-send-options.ui.h:17
 #, fuzzy
 msgid "Proprietary"
 msgstr "ప�రాధాన�యత"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "R_eply requested"
 msgstr "జవాబ� కోరినది(_e)"
 
-#: ../widgets/misc/e-send-options.ui.h:17
+#: ../widgets/misc/e-send-options.ui.h:20
 #, fuzzy
 msgid "Return Notification"
 msgstr "<b>తాఖీద�న� వెనక�కి పంప�మ�</b>"
 
-#: ../widgets/misc/e-send-options.ui.h:20
+#: ../widgets/misc/e-send-options.ui.h:21
+msgid "Secret"
+msgstr "రహస�యం"
+
+#: ../widgets/misc/e-send-options.ui.h:23
 msgid "Sta_tus Tracking"
 msgstr "స�స�థితిని  గమనించ�ట(_t)"
 
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../widgets/misc/e-send-options.ui.h:24
 #, fuzzy
 msgid "Standard"
 msgstr "ప�రామాణిక ఫాంట�(_t):"
 
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:25
 #, fuzzy
 msgid "Status Tracking"
 msgstr "స�స�థితిని  గమనించ�ట(_t)"
 
-#: ../widgets/misc/e-send-options.ui.h:23
+#: ../widgets/misc/e-send-options.ui.h:26
 #, fuzzy
 msgid "Top Secret"
 msgstr "అత�యంతరహస�యం"
 
-#: ../widgets/misc/e-send-options.ui.h:25
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "When acce_pted:"
 msgstr "ఆమోదించినప�ప�డ�(_p):"
 
-#: ../widgets/misc/e-send-options.ui.h:26
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "When co_mpleted:"
 msgstr "పూర�తయినప�ప�డ�(_m):"
 
-#: ../widgets/misc/e-send-options.ui.h:27
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "When decli_ned:"
 msgstr "క�షీణించబడినప�ప�డ�(_n):"
 
-#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "Wi_thin"
-msgstr "లోపల(_t)"
-
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../widgets/misc/e-send-options.ui.h:31
-#, fuzzy
-msgid "_After"
-msgstr "తర�వాత(_A):"
-
-#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "సమాచారం అంతా(_A)"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Classification:"
 msgstr "వర�గీకరణ (_C):"
 
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delay message delivery"
 msgstr "ఆలస�య సందేశం చేరినది(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delivered"
 msgstr "చేరినది(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Set expiration date"
 msgstr "కాలంచెల�లే తేదీని ఆమర�చ�(_S)"
 
-#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
-#: ../widgets/misc/e-send-options.ui.h:39
-#, fuzzy
-msgid "_Until"
-msgstr "అప�పటివరక�(_U):"
-
-#: ../widgets/misc/e-send-options.ui.h:40
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
 msgstr "అన�కూలమైనప�ప�డ�(_W)"
 
-#: ../widgets/misc/e-send-options.ui.h:41
+#: ../widgets/misc/e-send-options.ui.h:38
 msgid "_When opened:"
 msgstr "తెరచినప�ప�డ�(_W):"
 
-#: ../widgets/misc/e-signature-editor.c:133
-#: ../widgets/misc/e-signature-editor.c:549
-#: ../widgets/misc/e-signature-manager.c:349
-#: ../widgets/misc/e-signature-script-dialog.c:218
+#. Translators: Used in send options dialog
+#: ../widgets/misc/e-send-options.ui.h:40
+#, fuzzy
+#| msgid "None"
+msgctxt "send-options"
+msgid "None"
+msgstr "�దికాద�"
+
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:564
+#: ../widgets/misc/e-signature-manager.c:372
+#: ../widgets/misc/e-signature-script-dialog.c:219
 msgid "Unnamed"
-msgstr "నామమ�లేని"
+msgstr "పేర�లేని"
 
-#: ../widgets/misc/e-signature-editor.c:210
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_Save and Close"
 msgstr "దాయి మరియ� మూయ�మ� (_S)"
 
-#: ../widgets/misc/e-signature-editor.c:389
+#: ../widgets/misc/e-signature-editor.c:431
 msgid "Edit Signature"
 msgstr "సంతకాన�ని సరిచేయి"
 
-#: ../widgets/misc/e-signature-editor.c:404
+#: ../widgets/misc/e-signature-editor.c:446
 msgid "_Signature Name:"
-msgstr "సంతకమ� నామమ� (_S):"
+msgstr "సంతకమ� పేర� (_S):"
 
-#: ../widgets/misc/e-signature-manager.c:294
+#: ../widgets/misc/e-signature-manager.c:317
 #, fuzzy
 msgid "Add Signature Script"
 msgstr "సతకం లిపిని జతపర�చ�మ�"
 
-#: ../widgets/misc/e-signature-manager.c:359
+#: ../widgets/misc/e-signature-manager.c:382
 #, fuzzy
 msgid "Edit Signature Script"
 msgstr "సంతకాన�ని సరిచేయి"
 
-#: ../widgets/misc/e-signature-manager.c:576
+#: ../widgets/misc/e-signature-manager.c:602
 msgid "Add _Script"
 msgstr "లిపిని కల�ప�మ�(_S)"
 
-#: ../widgets/misc/e-signature-script-dialog.c:266
+#: ../widgets/misc/e-signature-script-dialog.c:268
 #, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
@@ -21785,136 +21886,148 @@ msgid ""
 "for display purposes only."
 msgstr ""
 "ఈ లిపి యొక�క అవ�ట�‌ప�ట� మీ సంతకంలాగా\n"
-"ఉపయోగించబడ�త�ంది. మీర� తెలిపిన నామమ� ప�రదర�శన వినియోగార�దం మాత�రమే ఉపయోగించబడ�త�ంది."
+"ఉపయోగించబడ�త�ంది. మీర� తెలిపిన పేర� ప�రదర�శన వినియోగార�దం మాత�రమే "
+"ఉపయోగించబడ�త�ంది."
 
-#: ../widgets/misc/e-signature-script-dialog.c:311
+#: ../widgets/misc/e-signature-script-dialog.c:313
 #, fuzzy
 msgid "S_cript:"
 msgstr "లిపి(_S):"
 
-#: ../widgets/misc/e-signature-script-dialog.c:342
+#: ../widgets/misc/e-signature-script-dialog.c:344
 #, fuzzy
 msgid "Script file must be executable."
 msgstr "లిపి దస�త�రమ� తప�పక ఉండాలి మరియ� నిర�వర�తించబడ�నట�ల� ఉండాలి."
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:78
 msgid "Click here to go to URL"
 msgstr "URL క� వెళ�ళ�టక� ఇక�కడ నొక�కండి"
 
-#: ../widgets/misc/e-web-view.c:369
+#: ../widgets/misc/e-web-view.c:410
 msgid "_Copy Link Location"
 msgstr "జోడిక స�థానాన�ని నకల� తీయ�మ�(_C)"
 
-#: ../widgets/misc/e-web-view.c:371
+#: ../widgets/misc/e-web-view.c:412
 #, fuzzy
 msgid "Copy the link to the clipboard"
 msgstr "క�లిప�‌బోర�డ�నక� విషయమ�లన� నకల�తీయి."
 
-#: ../widgets/misc/e-web-view.c:379
+#: ../widgets/misc/e-web-view.c:420
 msgid "_Open Link in Browser"
 msgstr "అన�వేషి లో జోడికన� తెర�వ�మ�(_O)"
 
-#: ../widgets/misc/e-web-view.c:381
+#: ../widgets/misc/e-web-view.c:422
 #, fuzzy
 msgid "Open the link in a web browser"
 msgstr "అన�వేషి లో జోడికన� తెర�వ�మ�(_O)"
 
-#: ../widgets/misc/e-web-view.c:389
+#: ../widgets/misc/e-web-view.c:430
 #, fuzzy
 msgid "_Copy Email Address"
 msgstr "ఈమెయిల� చిర�నామాన�ని నకల� తీయ�మ�(_E)"
 
-#: ../widgets/misc/e-web-view.c:418 ../widgets/misc/e-web-view.c:1073
+#: ../widgets/misc/e-web-view.c:447
+#, fuzzy
+#| msgid "_No image"
+msgid "_Copy Image"
+msgstr "ప�రతిరూపం లేద�(_N)"
+
+#: ../widgets/misc/e-web-view.c:449
+#, fuzzy
+msgid "Copy the image to the clipboard"
+msgstr "క�లిప�‌బోర�డ�నక� విషయమ�లన� నకల�తీయి."
+
+#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
 #, fuzzy
 msgid "Select all text and images"
 msgstr "ఒక సందేశమ�లో  పాఠ�యమ�నంతా ఎంచ�కొన�మ�"
 
-#: ../widgets/misc/e-web-view.c:850 ../widgets/misc/e-web-view.c:852
-#: ../widgets/misc/e-web-view.c:854
+#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
+#: ../widgets/misc/e-web-view.c:986
 #, c-format
 msgid "Click to call %s"
 msgstr "%s క� కాల�‌చేయ�టక� నొక�క�మ�"
 
-#: ../widgets/misc/e-web-view.c:856
+#: ../widgets/misc/e-web-view.c:988
 msgid "Click to hide/unhide addresses"
 msgstr "చిర�నామాలన� మర�గ�పరచ�టక�/బయల�పరచ�టక� నొక�కమ�"
 
-#: ../widgets/misc/e-web-view.c:858
+#: ../widgets/misc/e-web-view.c:990
 #, c-format
 msgid "Click to open %s"
 msgstr "%s తెర�వ�టక� నొకండి"
 
-#: ../widgets/misc/ea-calendar-item.c:299
-#: ../widgets/misc/ea-calendar-item.c:308
+#: ../widgets/misc/ea-calendar-item.c:306
+#: ../widgets/misc/ea-calendar-item.c:315
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 # ద�, c-format
-#: ../widgets/misc/ea-calendar-item.c:311
+#: ../widgets/misc/ea-calendar-item.c:318
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "క�యాలెండర�: %s న�ండి %s వరక�"
 
-#: ../widgets/misc/ea-calendar-item.c:347
+#: ../widgets/misc/ea-calendar-item.c:354
 msgid "evolution calendar item"
 msgstr "ఎవల�యూషన� క�యాలెండర� అంశమ�"
 
-#: ../widgets/table/e-cell-combo.c:174
+#: ../widgets/table/e-cell-combo.c:187
 msgid "popup list"
 msgstr "ప�రత�యక�ష జాబితా"
 
-#: ../widgets/table/e-cell-date-edit.c:303
+#: ../widgets/table/e-cell-date-edit.c:299
 msgid "Now"
 msgstr "ఇప�ప�డ�"
 
 #. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:320
+#: ../widgets/table/e-cell-date-edit.c:316
 #, fuzzy
 msgctxt "table-date"
 msgid "None"
 msgstr "�దికాద�"
 
-#: ../widgets/table/e-cell-date-edit.c:328
+#: ../widgets/table/e-cell-date-edit.c:324
 msgid "OK"
 msgstr "సరే"
 
-#: ../widgets/table/e-cell-date-edit.c:872
+#: ../widgets/table/e-cell-date-edit.c:868
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "సమయం %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 "శాతం విల�వ తప�పక 0 మరియ� 100 మద�య ఉండాలి, కల�ప�కొని"
 
-#: ../widgets/table/e-table-click-to-add.c:595
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
+#: ../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:143
 msgid "click to add"
 msgstr "జతచేయ�టక� నొక�కండి"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
 msgid "(Ascending)"
 msgstr "(ఆరోహణాక�రమం)"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
 msgid "(Descending)"
 msgstr "(అవరోహణాక�రమం)"
 
-#: ../widgets/table/e-table-config.c:388
+#: ../widgets/table/e-table-config.c:400
 msgid "Not sorted"
 msgstr "క�రమపద�దతిలో లేద�"
 
-#: ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:441
 msgid "No grouping"
 msgstr "� సమూహం లేద�"
 
-#: ../widgets/table/e-table-config.c:647
+#: ../widgets/table/e-table-config.c:666
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "క�షేత�రాలన� చూపించ�మ�"
 
-#: ../widgets/table/e-table-config.c:667
+#: ../widgets/table/e-table-config.c:686
 msgid "Available Fields"
 msgstr "అంద�బాట�లోవ�న�న క�షేత�రాల�"
 
@@ -21923,7 +22036,7 @@ msgid "A_vailable Fields:"
 msgstr "అంద�బాట�లోవ�న�న క�షేత�రాల�(_v):"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1717
 msgid "Ascending"
 msgstr "ఆరోహణాక�రమం"
 
@@ -21936,7 +22049,7 @@ msgid "Clear _All"
 msgstr "అన�నిటిని శ�బ�రం చేయ�(_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1717
 msgid "Descending"
 msgstr "అవరోహణాక�రమం"
 
@@ -21984,6 +22097,10 @@ msgstr "చూపించబడిన క�షేత�రాల�(_F)..."
 msgid "_Group By..."
 msgstr "సమూహం దీని ద�వారా(_G)..."
 
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "తీసివేయ�(_R)"
+
 #: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "దర�శనం లో క�షేత�రాన�ని చూపించ�మ�(_S)"
@@ -21996,12 +22113,12 @@ msgstr "à°ˆ à°•à±�షేతà±�రాలనà±� à°•à±�రమపదà±�దతిలà
 msgid "_Sort..."
 msgstr "క�రమపద�దతి(_S)..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:117
+#: ../widgets/table/e-table-field-chooser-dialog.c:119
 #, fuzzy
 msgid "Add a Column"
 msgstr "నిల�వ� పట�టీని జతచేయ�మ�..."
 
-#: ../widgets/table/e-table-field-chooser.c:151
+#: ../widgets/table/e-table-field-chooser.c:153
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -22010,13 +22127,13 @@ msgstr ""
 "అక�కడికి మీర� పట�టికక� జతపర�చిన నిల�వ� పట�టీని జర�ప�మ�."
 
 #. 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:351
+#: ../widgets/table/e-table-group-container.c:361
 #, fuzzy, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -22024,120 +22141,1344 @@ msgstr[0] "%s : %s (%d అంశమ�)"
 msgstr[1] "%s : %s (%d అంశమ�ల�)"
 
 #. 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:363
+#: ../widgets/table/e-table-group-container.c:373
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d అంశం)"
 msgstr[1] "%s (%d అంశాల�)"
 
-#: ../widgets/table/e-table-header-item.c:1546
+#: ../widgets/table/e-table-header-item.c:1557
 msgid "Customize Current View"
 msgstr "ప�రస�త�త దర�శనాన�ని మల�చ�కొన�మ�"
 
-#: ../widgets/table/e-table-header-item.c:1567
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Sort _Ascending"
 msgstr "ఆరోహణాక�రమం లో  చేయ�మ�(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1570
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Sort _Descending"
 msgstr "అవరోహణాక�రమం లో చేయ�మ�(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1573
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "_Unsort"
 msgstr "అక�రమపద�దతి(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1576
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "Group By This _Field"
 msgstr "ఈ క�షేత�రమ� ద�వారా సమూహం(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1591
 msgid "Group By _Box"
 msgstr "పెట�టె ద�వారా సమూహం(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Remove This _Column"
 msgstr "ఈ నిల�వ� పట�టీని తొలగించ�మ�"
 
-#: ../widgets/table/e-table-header-item.c:1586
+#: ../widgets/table/e-table-header-item.c:1598
 msgid "Add a C_olumn..."
 msgstr "నిల�వ� పట�టీని జతచేయ�మ�..."
 
-#: ../widgets/table/e-table-header-item.c:1590
+#: ../widgets/table/e-table-header-item.c:1602
 msgid "A_lignment"
 msgstr "కేటాయింప�"
 
-#: ../widgets/table/e-table-header-item.c:1593
+#: ../widgets/table/e-table-header-item.c:1605
 msgid "B_est Fit"
 msgstr "సరి తగిన"
 
-#: ../widgets/table/e-table-header-item.c:1596
+#: ../widgets/table/e-table-header-item.c:1608
 msgid "Format Column_s..."
 msgstr "నిల�వ� పట�టిలన� రూపలావణ�యం చేయ�మ�"
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1612
 msgid "Custo_mize Current View..."
 msgstr "ప�రస�త�త దర�శనమ�న� మల�చ�కొన�మ�(_m)..."
 
-#: ../widgets/table/e-table-header-item.c:1659
+#: ../widgets/table/e-table-header-item.c:1674
 msgid "_Sort By"
 msgstr "దీనితో క�రమపర�చ� (_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1677
+#: ../widgets/table/e-table-header-item.c:1692
 msgid "_Custom"
 msgstr "మలచ�కొన�(_C)"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:123
+#: ../widgets/table/gal-a11y-e-cell-popup.c:125
 msgid "popup a child"
 msgstr "చైల�డ� న� పాప�‌చేయి"
 
-#. Translators: description of an "edit" action
-#: ../widgets/table/gal-a11y-e-cell-text.c:618
-msgid "begin editing this cell"
-msgstr "ఈ అరన�  సరిచేయడం ప�రారంభించండి"
-
 #. Translators: description of a "toggle" action
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:178
 msgid "toggle the cell"
 msgstr "అరన� మార�చ�మ�"
 
 #. Translators: description of an "expand" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:212
+#: ../widgets/table/gal-a11y-e-cell-tree.c:214
 msgid "expands the row in the ETree containing this cell"
 msgstr "ETree కలిగివ�న�న అర లోని అడ�డపట�టీని విస�తరిస�త�ంది"
 
 #. Translators: description of a "collapse" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:219
+#: ../widgets/table/gal-a11y-e-cell-tree.c:221
 msgid "collapses the row in the ETree containing this cell"
 msgstr "అరన� కలిగిఉన�న ETree లోని అడ�డ�వర�సన� క�ప�పకూల�చ�మ�"
 
-#: ../widgets/table/gal-a11y-e-cell.c:119
+#: ../widgets/table/gal-a11y-e-cell.c:123
 msgid "Table Cell"
 msgstr "పట�టికలో  అర"
 
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
 msgid "click"
 msgstr "మీటన� నొక�క�మ�"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:154
+#: ../widgets/table/gal-a11y-e-table-column-header.c:158
 msgid "sort"
 msgstr " చక�కదిద�ద�"
 
-#: ../widgets/text/e-text.c:2533
+#: ../widgets/text/e-text.c:2327
 msgid "Select All"
 msgstr "అన�నిటిని ఎంచ�కొన�మ�"
 
-#: ../widgets/text/e-text.c:2545
+#: ../widgets/text/e-text.c:2339
 msgid "Input Methods"
 msgstr "ఎగ�బడి పద�దత�ల�"
 
+#~ msgid "(map)"
+#~ msgstr "(పటం)"
+
+#~ msgid "map"
+#~ msgstr "పటం"
+
+#~ msgid "Accessing LDAP Server anonymously"
+#~ msgstr "LDAP సేవికన� అనామకంగా సాంగత�యం చేస�త�న�నది"
+
+#~ msgid "Failed to authenticate.\n"
+#~ msgstr "ప�రమాణీకరించడంలో విఫలం.\n"
+
+#~ msgid "Enter password for %s (user %s)"
+#~ msgstr "%s (వినియోగదారి %s) కొరక� సంకేతపదాన�ని ప�రవేశపెట�టండి"
+
+#~ msgid "Alarm programs"
+#~ msgstr "అలారం ప�రోగ�రామ�‌ల�"
+
+#~ msgid "Count of default recurrence for a new event. -1 means forever."
+#~ msgstr "కొత�త ఘటన కొరక� అప�రమేయ ప�నరావృతమ� యొక�క లెక�క. -1 అంటే ఎప�పటికీ."
+
+#~ msgid "Default recurrence count"
+#~ msgstr "అప�రమేయ ప�నరావృత లెక�క"
+
+#~ msgid "Event Gradient"
+#~ msgstr "ఘటన క�రమాన�గతమార�ప�"
+
+#~ msgid "Event Transparency"
+#~ msgstr "ఘటన పారదర�శకత"
+
+#~ msgid "Gradient of the events in calendar views."
+#~ msgstr "క�యాలెండర� దర�శనాలలో ఘటనల యొక�క క�రమాన�గతమార�ప�"
+
+#~ msgid ""
+#~ "Transparency of the events in calendar views, a value between 0 "
+#~ "(transparent) and 1 (opaque)."
+#~ msgstr "క�యాలెండర� దర�శనంలలో ఘటనల యొక�క పారదర�శకత, 0(పారదర�శకం) మరియ� 1 (ఒపాక�యూ) ఒక విల�వ."
+
+#~ msgid "URI of the highlighted (\"primary\") calendar"
+#~ msgstr "ఉద�దీపనం చేసిన (\"ప�రాధమిక\") క�యాలెండర� యొక�క URI"
+
+#~ msgid "URI of the highlighted (\"primary\") memo list"
+#~ msgstr "ఉద�దీపనంచేసిన (\"ప�రాధమిక\") మెమో జాబితా యొక�క URI"
+
+#~ msgid "URI of the highlighted (\"primary\") task list"
+#~ msgstr "ఉద�దీపనంచేసిన (\"ప�రాధమిక\") కర�తవ�య జాబితా యొక�క URI"
+
+#~ msgid "Invalid object"
+#~ msgstr "చెల�లని ఆబ�జక�ట�"
+
+#~ msgid "Edit Alarm"
+#~ msgstr "అలారమ�న� సరిచేయ�మ�"
+
+#~ msgid "Add Alarm"
+#~ msgstr "హెచ�చరిక న� జతపర�చ�"
+
+#, fuzzy
+#~ msgid "Alarm"
+#~ msgstr "హెచ�చరికల�"
+
+#~ msgid "Alarms"
+#~ msgstr "హెచ�చరికల�"
+
+#~ msgid "Click here to close the current window"
+#~ msgstr "ప�రస�త�త గవాక�షాన�ని మూయ�టక� ఇక�కడ నొక�కండి"
+
+#~ msgid "Click here to view help available"
+#~ msgstr "సహాయం అంద�బాట�లో ఉందోలేదో చూడటానికి ఇక�కడ నొక�కండి"
+
+#~ msgid "Click here to save the current window"
+#~ msgstr "ప�రస�త�త గవాక�షాన�ని దాయ�టక� ఇక�కడ నొక�కండి"
+
+#~ msgid "Click here to attach a file"
+#~ msgstr "దస�త�రాన�ని జతపర�చ�టక� ఇక�కడ నొక�కండి"
+
+#~ msgid "_Alarms"
+#~ msgstr "అలారమ�ల�(_A)"
+
+#~ msgid "The organizer selected no longer has an account."
+#~ msgstr "ఎంపికచేసిన వ�యస�థీకరింపచేసెదానికి ఖాతా లేద� "
+
+#, fuzzy
+#~ msgctxt "cal-alarms"
+#~ msgid "None"
+#~ msgstr "�దికాద�"
+
+#~ msgid "Custom Alarm:"
+#~ msgstr "మల�చ�కొన� అలారమ�:"
+
+#~ msgid "_Alarm"
+#~ msgstr "అలారమ�(_A)"
+
+#~ msgid "_Group:"
+#~ msgstr "సమూహం(_G):"
+
+#, fuzzy
+#~ msgid "Recurring:"
+#~ msgstr "ప�నరావృతికరణ"
+
+#~ msgid "Yes. (Complex Recurrence)"
+#~ msgstr "అవ�న�. (క�లిష�టమైన ప�నరావృతి)"
+
+#~ msgid "Every day"
+#~ msgid_plural "Every %d days"
+#~ msgstr[0] "ప�రతి రోజ�"
+#~ msgstr[1] "ప�రతి%d రోజ�ల�"
+
+#~ msgid "Every week"
+#~ msgid_plural "Every %d weeks"
+#~ msgstr[0] "ప�రతి వారం"
+#~ msgstr[1] "ప�రతి %d వారాల�"
+
+#~ msgid "Every week on "
+#~ msgid_plural "Every %d weeks on "
+#~ msgstr[0] "ప�రతి వారం మొదల�"
+#~ msgstr[1] "ప�రతి %d వారాల మొదల� "
+
+#~ msgid " and "
+#~ msgstr " మరియ�"
+
+#~ msgid "The %s day of "
+#~ msgstr "%s రోజైన"
+
+#~ msgid "The %s %s of "
+#~ msgstr " %s %s అయిన "
+
+#~ msgid "every month"
+#~ msgid_plural "every %d months"
+#~ msgstr[0] "ప�రతి %d నెల"
+#~ msgstr[1] "ప�రతి %d నెలల�"
+
+#~ msgid "Every year"
+#~ msgid_plural "Every %d years"
+#~ msgstr[0] "ప�రతి %d సంవత�సరం"
+#~ msgstr[1] "ప�రతి %d సంవత�సరాల�"
+
+#~ msgid "a total of %d time"
+#~ msgid_plural "a total of %d times"
+#~ msgstr[0] " %d సమయంయొక�క మొత�తమ�"
+#~ msgstr[1] "%d సమయాలయొక�క మొత�తమ�"
+
+#~ msgid ", ending on "
+#~ msgstr ", పైన అంతం "
+
+#~ msgid "Starts"
+#~ msgstr "మొదలౌత�ంది"
+
+#~ msgid "Ends"
+#~ msgstr "అంతమౌత�ంది"
+
+#~ msgid "iCalendar Information"
+#~ msgstr "iక�యాలెండర� సమాచారం"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "iక�యాలెండర� దోషం"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please review the following information, and then select an action from "
+#~ "the menu below."
+#~ msgstr "<br> ఈ సమాచారమ�న� సమీక�షించి, కింది జాబితాన�ంచి క�రియన� ఎంపికచేస�కోండి"
+
+#~ msgid ""
+#~ "The meeting has been canceled, however it could not be found in your "
+#~ "calendars"
+#~ msgstr "సమావేశం రద�ద� చేయబడినది, కాని అది మీ క�యాలెండర� లో కనిపించలేద� "
+
+#~ msgid ""
+#~ "The task has been canceled, however it could not be found in your task "
+#~ "lists"
+#~ msgstr " కార�యం రద�ద� చేయబడినది, కాని అది మీ కార�యజాబితా లో కనిపించలేద�"
+
+#, fuzzy
+#~ msgid "%s has published meeting information."
+#~ msgstr "<b>%s</b> సమావేశ సమాచారాన�ని మ�ద�రించినది"
+
+#, fuzzy
+#~ msgid "%s requests the presence of %s at a meeting."
+#~ msgstr "%s యొక�క హాజర� ఒక సమావేశం వద�ద <b>%s</b> అభ�యర�ధించింది"
+
+#, fuzzy
+#~ msgid "%s requests your presence at a meeting."
+#~ msgstr "<b>%s</b> సమావేశం వద�ద మీ హాజర�న� అభ�యర�ధించింది."
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "సమావేశ ప�రతిపాదన"
+
+#, fuzzy
+#~ msgid "%s wishes to be added to an existing meeting."
+#~ msgstr "<b>%s</b> అభినందనల� ఉన�న సమావేశానికి కల�పబడతాయి."
+
+#~ msgid "Meeting Update"
+#~ msgstr "సమావేశ తాజా వివరం"
+
+#, fuzzy
+#~ msgid "%s wishes to receive the latest meeting information."
+#~ msgstr "<b>%s</b> సమావేశ తాజా సమాచారాన�ని కొర�త�ంది"
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "సమావేశ తాజా వివరాల అభ�యర�ధన"
+
+#, fuzzy
+#~ msgid "%s has replied to a meeting request."
+#~ msgstr "<b>%s</b> సమావేశ అభ�యర�ధన క� జవాబ� చెపింది"
+
+#~ msgid "Meeting Reply"
+#~ msgstr "సమావేశం యొక�క జవాబ�"
+
+#, fuzzy
+#~ msgid "%s has canceled a meeting."
+#~ msgstr "<b>%s</b> సమావేశాన�ని రద�ద� చేసింది."
+
+#~ msgid "Meeting Cancelation"
+#~ msgstr "సమావేశ రద�ద�"
+
+#, fuzzy
+#~ msgid "%s has sent an unintelligible message."
+#~ msgstr "<b>%s</b> అవివేక సందేశాన�ని పంపినది"
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "చెడ�డ సమావేశ సందేశం"
+
+#, fuzzy
+#~ msgid "%s has published task information."
+#~ msgstr "<b>%s</b> కార�య సమాచారాన�ని ప�రచ�రించినది"
+
+#~ msgid "Task Information"
+#~ msgstr "కార�య సమాచారం"
+
+#, fuzzy
+#~ msgid "%s requests %s to perform a task."
+#~ msgstr "%s ఒక కార�యాన�ని నిర�వతించాడినికి<b>%s</b> అభ�యర�ధించినది"
+
+#, fuzzy
+#~ msgid "%s requests you perform a task."
+#~ msgstr "<b>%s</b> ఒక కార�యాన�ని నిర�వతించాడినికి అభ�యర�ధించినది"
+
+#~ msgid "Task Proposal"
+#~ msgstr "కార�య ప�రతిపాదన"
+
+#, fuzzy
+#~ msgid "%s wishes to be added to an existing task."
+#~ msgstr "<b>%s</b> అభినందనల� ఉన�న కార�యానికి చెంద�తాయి."
+
+#~ msgid "Task Update"
+#~ msgstr "కార�య తాజా వివరం"
+
+#, fuzzy
+#~ msgid "%s wishes to receive the latest task information."
+#~ msgstr "<b>%s</b> తాజా కార�య సమాచారాన�ని పొంద దల�చినది"
+
+#~ msgid "Task Update Request"
+#~ msgstr "కార�యాన�ని తాజాపర�చ�టక� అభ�యర�ధన"
+
+#, fuzzy
+#~ msgid "%s has replied to a task assignment."
+#~ msgstr "<b>%s</b> కార�య కేటాయింప� జవాబ� ఇచ�చింది"
+
+#~ msgid "Task Reply"
+#~ msgstr "కార�య జవాబ�"
+
+#, fuzzy
+#~ msgid "%s has canceled a task."
+#~ msgstr "<b>%s</b>ఒక కార�తవ�యాన�ని రద�ద� చేసింది."
+
+#~ msgid "Task Cancelation"
+#~ msgstr "కర�తవ�యం రద�ద�"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "చెడ�డ కార�య సందేశం"
+
+#, fuzzy
+#~ msgid "%s has published free/busy information."
+#~ msgstr "<b>%s</b> తీరక/తీరకలేద� సమాచారాన�ని ప�రచ�రించ�"
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "తీరక/తీరకలేద� సమాచారం"
+
+#, fuzzy
+#~ msgid "%s requests your free/busy information."
+#~ msgstr "<b>%s</b> తీరక/తీరకలేద� సమాచారాన�ని కోర�త�ంది"
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "తీరక/తీరకలేద� కోరండి"
+
+#, fuzzy
+#~ msgid "%s has replied to a free/busy request."
+#~ msgstr "<b>%s</b> తీరక/తీరకలేద� కోరికక� జవాబ� ఇచ�చింది"
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "తీరక/తీరకలేద� జవాబ�"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "తీరక/తీరకలేద� చెడ�డ సందేశం"
+
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "సందేశం సరిగ�గ �ర�పర�చినట�ట�లేద�"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "సహకారం లేని కోరికల� మాత�రమే సందేశం లో ఉన�నాయి"
+
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "అన�బంధం లో చూడదగ�గ క�యాలెండర� అంశాల� లేవ�"
+
+#~ msgid "Update complete\n"
+#~ msgstr "తాజాపర�చ�ట పూర�తియింది\n"
+
+#~ msgid "Object is invalid and cannot be updated\n"
+#~ msgstr "అంశం వర�తించద� కన�క తాజాపర�చ�ట సాధ�యపడద�\n"
+
+#~ msgid "This response is not from a current attendee.  Add as an attendee?"
+#~ msgstr "ఈ సమాధానం వర�తమాన జవాబ�దార�నిన�ండి రాలేద�. జవాబ�దార�నిగా జోడించండి?"
+
+#~ msgid "Attendee status could not be updated because of an invalid status!\n"
+#~ msgstr "వర�తించని స�థితి కారణంగా జవాబ�దార�ని స�థితి తాజాపరచబడలేద�!\n"
+
+#~ msgid "Attendee status updated\n"
+#~ msgstr "జవాబ�దార�ని స�థితి తాజాపరచబడినది\n"
+
+#~ msgid "Item sent!\n"
+#~ msgstr "అంశం పంపబడినది!\n"
+
+#~ msgid "The item could not be sent!\n"
+#~ msgstr "అంశాన�ని పంపిచలేకపోయింది!\n"
+
+#~ msgid "Choose an action:"
+#~ msgstr "క�రియన� ఎంచ�కోండ:"
+
+#~ msgid "Update"
+#~ msgstr "తాజా పర�చ�"
+
+#~ msgid "Accept"
+#~ msgstr "ఆమోదించ�"
+
+#~ msgid "Tentatively accept"
+#~ msgstr "తాత�కాలికంగా ఆమొదించ�"
+
+#~ msgid "Decline"
+#~ msgstr "తిరస�కరించ�"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "తీరిక/తీరికలేద� సమాచారాన�ని పంప�"
+
+#~ msgid "Update respondent status"
+#~ msgstr "సమాధనం ఇచ�చెవారి స�ధితిని తాజాపర�చ�"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "తాజా సమాచారాన�ని పంప�"
+
+#~ msgid "--to--"
+#~ msgstr "--క�--"
+
+#~ msgid "Calendar Message"
+#~ msgstr "క�యాలెండర� సందేశం"
+
+#~ msgid "Date:"
+#~ msgstr "తారీఖ�:"
+
+#~ msgid "Loading Calendar"
+#~ msgstr "క�యాలెండర� న� నింప�త�ంది"
+
+#~ msgid "Loading calendar..."
+#~ msgstr "క�యాలెండర� న� నింప�త�ంది..."
+
+#~ msgid "Organizer:"
+#~ msgstr "నిర�వాహక�డ�:"
+
+#~ msgid "Server Message:"
+#~ msgstr "సేవిక సందేశం:"
+
+#~ msgid "It has alarms."
+#~ msgstr "హెచ�చరిక జారిచెయ� సౌలభ�యం కలద�"
+
+#, fuzzy
+#~ msgctxt "iCalImp"
+#~ msgid "has alarms"
+#~ msgstr "హెచ�చరిక జారిచెయ� సౌలభ�యం కలద�"
+
+#, fuzzy
+#~ msgid "Unable to reconstruct message from autosave file"
+#~ msgstr "సరికూర�పరిన�ండి సందేశాన�ని వెలికితీయలేద�"
+
+#~ msgid "Could not create composer window."
+#~ msgstr "కూర�పరి విండోన� సృష�టించలేకపోయింది."
+
+#~ msgid ""
+#~ "Unable to activate the HTML editor control.\n"
+#~ "\n"
+#~ "Please make sure that you have the correct version of gtkhtml and "
+#~ "libgtkhtml installed."
+#~ msgstr ""
+#~ "HTML కూర�పరి నియంత�రికన� చేతనం చేయలేద�.\n"
+#~ "\n"
+#~ "దయచేసి మీర� ఖచ�చితమైన gtkhtml మరియ� libgtkhtml న� కిలిగిఉన�నారేమో సరిచూస�కొనండి."
+
+#~ msgid "Unable to activate the address selector control."
+#~ msgstr "చిర�నామా ఎంపికదారి నియంత�రిక చేతనం చేయలేద�."
+
+#, fuzzy
+#~ msgid "Make Anjal the default email client"
+#~ msgstr "అప�రమేయ మెమో జాబితాగా గ�ర�త�ంచ�మ� (_d)"
+
+#, fuzzy
+#~ msgid "Anjal email client"
+#~ msgstr "అప�రమేయ మెయిల� కక�షిదార�"
+
+#, fuzzy
+#~ msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
+#~ msgstr "<span weight=\"bold\">మెయిల� తొలగించ�</span>"
+
+#, fuzzy
+#~ msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
+#~ msgstr "<span weight=\"bold\">రక�షణ</span>"
+
+#, fuzzy
+#~ msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
+#~ msgstr "<span weight=\"bold\">రక�షణ</span>"
+
+#, fuzzy
+#~ msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
+#~ msgstr "<span weight=\"bold\">ప�రోక�సీ అమరికల�</span>"
+
+#, fuzzy
+#~ msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
+#~ msgstr "<span weight=\"bold\">ప�రోక�సీ అమరికల�</span>"
+
+#, fuzzy
+#~ msgid "%s..."
+#~ msgstr "%s (...)"
+
+#~ msgid "Evolution Error"
+#~ msgstr "ఎవాల�యూషన� దోషం"
+
+#~ msgid "Evolution Warning"
+#~ msgstr "ఎవాల�యూషన� హెచ�చరిక"
+
+#~ msgid "Internal error, unknown error '%s' requested"
+#~ msgstr "అంతర�గత దోషం, తెలియని దోషం '%s' అభ�యర�దించబడింది"
+
+#, fuzzy
+#~ msgid "%d day from now"
+#~ msgid_plural "%d days from now"
+#~ msgstr[0] "ఇప�పడి న�ండి %d రోజ�ల�"
+#~ msgstr[1] "ఇప�పడి న�ండి %d రోజ�ల�"
+
+#, fuzzy
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%d రోజ�ల క�రితం"
+#~ msgstr[1] "%d రోజ�ల క�రితం"
+
+#~ msgid "Debug Logs"
+#~ msgstr "డీబగ� లాగ�‌ల�"
+
+#~ msgid "Show _errors in the status bar for"
+#~ msgstr "దీని కొరక� స�థితపట�టీ నంద� దోషాలన� చూప�మ�(_e)"
+
+#~ msgid "second(s)."
+#~ msgstr "సెకన�(ల�)."
+
+#~ msgid "Log Messages:"
+#~ msgstr "లాగ� సందేశాల�:"
+
+#~ msgid "Log Level"
+#~ msgstr "లాగ� స�థాయి"
+
+#~ msgid "Error"
+#~ msgstr "దోషం"
+
+#~ msgid "Errors"
+#~ msgstr "దోషాల�"
+
+#~ msgid "Warnings and Errors"
+#~ msgstr "హెచ�చరికల� మరియ� దోషాల�"
+
+#~ msgid "Debug"
+#~ msgstr "డీబగ�"
+
+#~ msgid "Error, Warnings and Debug messages"
+#~ msgstr "దోషం, హెచ�చరికల� మరియ� డీబగ� సందేశాల�"
+
+#~ msgid "%s License Agreement"
+#~ msgstr "%s లైసెన�స� ఒప�పందం"
+
+#~ msgid ""
+#~ "\n"
+#~ "Please read carefully the license agreement\n"
+#~ "for %s displayed below\n"
+#~ "and tick the check box for accepting it\n"
+#~ msgstr ""
+#~ "\n"
+#~ "%s కొరక� క�రింద ప�రదర�శించబడిన లైసెన�స� ఒప�పందంన�\n"
+#~ "జాగ�రత�తగా చదవండి మరియ� దానిని ఆమోదించ�టక� చెక�‌బాక�స�న� గ�ర�త�పెట�టండి\n"
+
+#~ msgid "Account Management"
+#~ msgstr "ఖాతా నిర�వహణ"
+
+#, fuzzy
+#~ msgid "Please select a folder from the current account."
+#~ msgstr "ఈ పరిచయమ�నక�   దయచేసి ఒక ప�రతిరూపమ�న� ఎంపిక చేయండి"
+
+#~ msgid "Scanning folders in \"%s\""
+#~ msgstr "\"%s\" నందలి సంచయాల స�కానింగ�"
+
+#, fuzzy
+#~ msgid "Creating folder '%s'"
+#~ msgstr "సంచయం `%s' న� సృష�టించ�ట"
+
+#~ msgid "This store does not support subscriptions, or they are not enabled."
+#~ msgstr "ఈ నిల�వ చందాలక� మద�దత�నీయద�, లేదా అవి చేతనంకాబడిలేవ�."
+
+#~ msgid "Please select a server."
+#~ msgstr "దయచేసి ఒక సేవికన� ఎంపికచేయ�మ�."
+
+#~ msgid "No server has been selected"
+#~ msgstr "�సేవిక ఎంపికకాబడలేద�"
+
+#~ msgid "Default height of the subscribe dialog."
+#~ msgstr "సబ�‌స�క�రైబ� డైలాగ� యొక�క అప�రమేయ ఎత�త�."
+
+#~ msgid "Default width of the subscribe dialog."
+#~ msgstr "సబ�‌స�క�రైబ� డైలాగ� యొక�క అప�పమేయ వెడల�ప�."
+
+#~ msgid "Subscribe dialog default height"
+#~ msgstr "చందా డైలాగ� అప�రమేయ ఎత�త�"
+
+#~ msgid "Subscribe dialog default width"
+#~ msgstr "చందా డైలాగ� అప�రమేయ వెడల�ప�"
+
+#~ msgid "(Note: Requires restart of the application)"
+#~ msgstr "(గమనిక: అన�వర�తనం ప�నఃప�రారంభం అవసరం)"
+
+#~ msgid "Checks incoming mail messages to be Junk"
+#~ msgstr "లోనకివస�త�న�న సందేశాలలో నిరర�ధకం కొరక� పరిశీలించ�"
+
+#, fuzzy
+#~ msgid "Do not display messages when text si_ze exceeds"
+#~ msgstr "పాఠ�య పరిమాణం మించితే సందేశాలన� రూపీకరించవద�ద� (_z)"
+
+#~ msgid "Enable Magic S_pacebar"
+#~ msgstr "మాయా స�పేస�‌బార� న� చేతనంచేయ�మ� (_p)"
+
+#~ msgid "Enable Sea_rch Folders"
+#~ msgstr "శోధన సంచయాలన� చేతనంచేయ�మ�(_r)"
+
+#~ msgid "Fi_xed-width:"
+#~ msgstr "నిర�దేశిత-వెడల�ప�(_x):"
+
+#~ msgid "Font Properties"
+#~ msgstr "ఫాంట� లక�షణాల�"
+
+#~ msgid "KB"
+#~ msgstr "KB"
+
+#, fuzzy
+#~ msgid "Message Fonts"
+#~ msgstr "సందేశం కలిగినది"
+
+#~ msgid ""
+#~ "Note: you will not be prompted for a password until you connect for the "
+#~ "first time"
+#~ msgstr "గమనిక: మీర� మొదటిసారి అన�సంధానించ బడనంతవరక� మీర� సంకేతపదం కొరక� అడ�గబడర�"
+
+#, fuzzy
+#~ msgid "Printed Fonts"
+#~ msgstr "మెమోలన� మ�ద�రించ�"
+
+#, fuzzy
+#~ msgid "Prompt when sending replies to _many recipients"
+#~ msgstr "సందేశాలన� Bcc స�వీకరణదార�లన� ఉద�దేశించి పంప�త�న�నప�పడ� అడ�గ�మ�(_o)"
+
+#, fuzzy
+#~ msgid "Select Drafts Folder"
+#~ msgstr "సంచయాన�ని ఎంపికచేస�కొన�మ�"
+
+#~ msgid "Select HTML fixed width font for printing"
+#~ msgstr "మ�ద�రణ కొరక� HTML నిర�ధారిత వెడల�ప� ఫాంట�న� ఎంపికచేయ�మ�"
+
+#~ msgid "Select HTML variable width font for printing"
+#~ msgstr "మ�ద�రణ కొరక� HTML వేరియబ�ల� వెడల�ప� ఫాంట�న� ఎంపికచేయ�మ�"
+
+#, fuzzy
+#~ msgid "Select Junk Folder"
+#~ msgstr "సంచయాన�ని ఎంపికచేస�కొన�మ�"
+
+#, fuzzy
+#~ msgid "Select Sent Folder"
+#~ msgstr "సంచయాన�ని ఎంపికచేస�కొన�మ�"
+
+#, fuzzy
+#~ msgid "Select Trash Folder"
+#~ msgstr "సంచయాన�ని ఎంపికచేస�కొన�మ�"
+
+#~ msgid "Sending Mail"
+#~ msgstr "మెయిల� న� పంప�త�న�నది"
+
+#, fuzzy
+#~ msgid "Sent and Draft Messages"
+#~ msgstr "పంపిన సందేశాల�"
+
+#, fuzzy
+#~ msgid "Top Posting Option"
+#~ msgstr "గమ�యాన�ని పోస�ట�చేస�త�న�నది"
+
+#~ msgid "V_ariable-width:"
+#~ msgstr "వేరియబ�ల�-వెడల�ప�(_a):"
+
+#~ msgid "_Default junk plugin:"
+#~ msgstr "అప�రమేయ నిరర�ధక ప�లగ�ఇన�(_D):"
+
+#~ msgid "_Mark messages as read after"
+#~ msgstr "దీనితర�వాత సందేశాలన� చదివినట�ల� గర�త�ంచ�(_M)"
+
+#~ msgid "_Show image animations"
+#~ msgstr "చిత�రమ� యానిమేషన�‌లన� చూప�మ�(_S)"
+
+#~ msgid "_Shrink To / Cc / Bcc headers to "
+#~ msgstr "To / Cc / Bcc పీఠికల� కూడా ష�రింక�‌చేయ�మ�(_S)"
+
+#~ msgid "_Use Secure Connection:"
+#~ msgstr "రక�షిత అన�సంధానంన� ఉపయోగించ�మ�(_U):"
+
+#~ msgid "addresses"
+#~ msgstr "చిర�నామాల�"
+
+#~ msgid "S_erver:"
+#~ msgstr "సేవిక(_e):"
+
+#, fuzzy
+#~ msgid "Scanning folders in '%s'"
+#~ msgstr "\"%s\" నందలి సంచయాల స�కానింగ�"
+
+#, fuzzy
+#~ msgid "Opening folder '%s'"
+#~ msgstr "%s సంచయాన�ని తెర�స�త�ంది"
+
+#, fuzzy
+#~ msgid "Retrieving quota information for folder '%s'"
+#~ msgstr "%s ఫోల�డర� కొరక� కోటా సమాచారాన�ని వెలికితీస�తోంది"
+
+#, fuzzy
+#~ msgid "Opening store '%s'"
+#~ msgstr "నిల�వ %s న� తెర�స�త�న�నది"
+
+#, fuzzy
+#~ msgid "Error saving messages to: %s:\n"
+#~ msgstr ""
+#~ "సందేశాన�ని దీనికి దాయ�టలో దోషం: %s:\n"
+#~ " %s"
+
+#~ msgid ""
+#~ "Cannot create output file: %s:\n"
+#~ " %s"
+#~ msgstr ""
+#~ "అవ�ట�‌ప�ట� దస�త�రాన�ని సృష�టించలేకపోయింది: %s:\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Could not write data: "
+#~ msgstr "దత�తాంశాన�ని రాయలేకపోయింది: %s"
+
+#~ msgid "Checking Service"
+#~ msgstr "సేవన� పరిశీలిస�తోంది"
+
+#~ msgid "Updating Search Folders for '%s'"
+#~ msgstr "శోధన సంచయాలన� '%s' కొరక� నవీకరిస�తోంది"
+
+#~ msgid "Delete messages in Search Folder \"{0}\"?"
+#~ msgstr "శోధన సంచయంలో ఉన�న సందేశాలన� తొలగించాలా \"{0}\"?"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error on %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s పై దోషం:\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Save as iCalendar..."
+#~ msgstr "Vపలకంగా దాయ�మ�..."
+
+#, fuzzy
+#~ msgctxt "mail-junk-hook"
+#~ msgid "None"
+#~ msgstr "�దికాద�"
+
+#~ msgid "Header Value Contains:"
+#~ msgstr "పీఠిక విల�వ కలిగిఉండ�న�:"
+
+#~ msgid "%s plugin is available and the binary is installed."
+#~ msgstr "%s ప�లగ�ఇన� అంద�బాట�లోఉంది మరియ� బైనరీ సంస�థాపించబడెన�."
+
+#~ msgid ""
+#~ "%s plugin is not available. Please check whether the package is installed."
+#~ msgstr "%s ప�లగ�ఇన� అంద�బాట�లో లేద�. దయచేసి ప�యాకేజి సంస�థాపించబడిందేమో పరీక�షించండి."
+
+#, fuzzy
+#~ msgid "No junk plugin available"
+#~ msgstr "� నిరర�ధక ప�లగ�ఇన� అంద�బాట�లో లేద�"
+
+#, fuzzy
+#~ msgid "_Backup Evolution Settings..."
+#~ msgstr "బ�యాక�అప� అమరికల�(_B)..."
+
+#, fuzzy
+#~ msgid "R_estore Evolution Settings..."
+#~ msgstr "అమరికలన� తిరిగినిల�వఉంచ�(_e)..."
+
+#~ msgid ""
+#~ "Evolution backup can start only when Evolution is not running. Please "
+#~ "make sure that you save and close all your unsaved windows before "
+#~ "proceeding.  If you want Evolution to restart automatically after backup, "
+#~ "please enable the toggle button."
+#~ msgstr ""
+#~ "ఎవాల�యూషన� నడవనప�ప�డ� మాత�రమే ఎవాల�యూషన� బ�యాక�అప� ప�రారంభమౌత�ంది. దయచేసి మీర� ఉద�య�క�త�ల� "
+#~ "అయ�యేమ�ంద� అన�ని దాయని విండోలన� మూయండి.  మీర� ఎవాల�యూషన� బ�యక�అప� తర�వాత స�వయంచాలకంగా "
+#~ "ప�నఃప�రారంభమవ�వాలంటే , దయచేసి మార�ప�బటన� చేతనంచేయ�మ�."
+
+#~ msgid ""
+#~ "This will delete all your current Evolution data and settings and restore "
+#~ "them from your backup. Evolution restore can start only when Evolution is "
+#~ "not running. Please make sure that you close all your unsaved windows "
+#~ "before you proceed. If you want Evolution to restart automatically "
+#~ "restart after restore, please enable the toggle button."
+#~ msgstr ""
+#~ "ఇది మీ ప�రస�త�త ఎవాల�యూషన� డాటాన� మరియ� అమరికలన� తొలగించి వాటిని బ�యాక�అప� న�ండి తిరిగి నిల�వచేస�త�ంది. "
+#~ "ఎవాల�యూషన� నడవనప�ప�డ� మాత�రమే ఎవాల�యూషన� ప�నఃనిల�వ సాధ�యమౌత�ంది. మీర� ఉద�య�క�త�ల� అయ�యేమ�ంద� "
+#~ "దయచేసి అన�ని దాయని విండోలన� మూయ�మ�. మీర� ఎవాల�యూషన� ప�నఃనిల�వ తర�వాత స�వయంచాలకంగా "
+#~ "ప�నఃప�రారంభమవ�వాలంటే , దయచేసి మార�ప�బటన� చేతనంచేయ�మ�."
+
+#~ msgid "Bogofilter child process does not respond, killing..."
+#~ msgstr "బోగోఫిల�టర� చైల�డ�� కార�యక�రమం స�పందించ�టలేద�, నశింపబడ�తోంది..."
+
+#~ msgid "Wait for Bogofilter child process interrupted, terminating..."
+#~ msgstr "బోగోఫిల�టర� చైల�డ�� కార�యక�రమం అంతరాయంక� వేచివ�ండ�మ�, సమాప�తంచేయబడ�తోంది..."
+
+#~ msgid "Pipe to Bogofilter failed, error code: %d."
+#~ msgstr "బోగోఫిల�టర� వైఫల�యానికి పైప�, దోషమ� కోడ�: %d."
+
+#~ msgid "Bogofilter Junk Filter"
+#~ msgstr "Bogofilter నిరర�ధక ఫిల�టర�"
+
+#~ msgid "Filter junk messages using Bogofilter."
+#~ msgstr "Bogofilterన� ఉపయోగించి నిరర�దక సందేశాలన� వడపోయ�మ�."
+
+#~ msgid "Use _SSL"
+#~ msgstr "·_SSL న� ఉపయోగించ�మ�"
+
+#~ msgid "_Secure connection"
+#~ msgstr "రక�షణ బంధమ�(_S)"
+
+#, fuzzy
+#~ msgid "Show a map of all the contacts"
+#~ msgstr "ఎంచ�క�న�న పరిచయాలక� సందేశాన�ని పంప�మ�"
+
+#, fuzzy
+#~ msgid "Map for contacts"
+#~ msgstr "చిర�నామాల� లేవ�"
+
+#, fuzzy
+#~ msgid "Select folder to import OE folder into"
+#~ msgstr "దీనిలోకి దిగ�మతిచేయ�టక� సంచయంన� ఎంపికచేయ�మ�"
+
+#, fuzzy
+#~ msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
+#~ msgstr "(48*48) png పరిమాణం న� ఎంపికచేయ�మ� < 700bytes"
+
+#~ msgid "Checklist"
+#~ msgstr "పరిశీలనజాబితా"
+
+#~ msgid "New _Shared Folder..."
+#~ msgstr "కొత�త భాగస�వామ�య సంచయం(_S)..."
+
+#~ msgid "_Proxy Login..."
+#~ msgstr "ప�రాక�సీ లాగిన�(_P)..."
+
+#~ msgid "Junk Mail Settings..."
+#~ msgstr "నిరర�ధకం మెయిల� అమరికల�..."
+
+#~ msgid "Track Message Status..."
+#~ msgstr "సందేశం స�థితిని గమనించ�మ�..."
+
+#~ msgid "Retract Mail"
+#~ msgstr "మెయిల� న� తిప�ప�కొన�ట"
+
+#~ msgid "Accept Tentatively"
+#~ msgstr "పరిశీలనాత�మకంగా ఆమోదించ�మ�"
+
+#~ msgid "Rese_nd Meeting..."
+#~ msgstr "సమావేశమ�న� తిరిగిపంప�మ�... (_n)"
+
+#~ msgid "Create folder"
+#~ msgstr "సంచయంన� సృష�టించ�ట"
+
+#, fuzzy
+#~ msgid ""
+#~ "The user '%s' has shared a folder with you\n"
+#~ "\n"
+#~ "Message from '%s'\n"
+#~ "\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "\n"
+#~ "Click 'Apply' to install the shared folder\n"
+#~ "\n"
+#~ msgstr ""
+#~ "వినియోగదారి '%s' మీతో ఒక సంచయంన� పంచ�కొన�నాడ�\n"
+#~ "\n"
+#~ "'%s' న�ండి సందేశం\n"
+#~ "\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "\n"
+#~ "భాగస�వామ�య సంచయం క� సంస�థాపించ�టక� 'మ�ంద�క�పంప�' నొక�క�మ�\n"
+#~ "\n"
+
+#~ msgid "Shared Folder Installation"
+#~ msgstr "భాగస�వామ�య సంచయం సంస�థాపన"
+
+#~ msgid "Junk Settings"
+#~ msgstr "నిరర�ధకంక� అమరికల�"
+
+#~ msgid "Junk Mail Settings"
+#~ msgstr "నిరర�దక మెయిల� అమరికల�"
+
+#~ msgid "Email:"
+#~ msgstr "ఈమెయిల�:"
+
+#, fuzzy
+#~ msgid "Junk List:"
+#~ msgstr "నిరర�ధకం జాబితా(_J)"
+
+#~ msgid "_Enable"
+#~ msgstr "చేతనం(_E)"
+
+#~ msgid "_Junk List"
+#~ msgstr "నిరర�ధకం జాబితా(_J)"
+
+#~ msgid "Message Retract"
+#~ msgstr "సందేశం తిప�ప�కొన�ట"
+
+#, fuzzy
+#~ msgid ""
+#~ "Retracting a message may remove it from the recipient's mailbox. Are you "
+#~ "sure you want to do this?"
+#~ msgstr ""
+#~ "సందేశం తిప�ప�కొన�టవలన అది స�వీకరణదారి మెయిల�‌బాక�స��‌న�ండి తీసివేయబడవచ�చ�. మీర� ఖచ�చితంగా దీనిని "
+#~ "చేద�దామన�క�ంట�న�నారా?"
+
+#~ msgid "Message retracted successfully"
+#~ msgstr "సందేశం సమర�దవంతంగా తిరిగిగమనించబడింది"
+
+#~ msgid "Insert Send options"
+#~ msgstr "పంప� ఇచ�చాపూర�వకాలన� అమర�చ�మ�"
+
+#~ msgid "Add Send Options to GroupWise messages"
+#~ msgstr "పంపించ� �చ�చికాలన� సమూహతరహా సందేశాలక� జతచేయ�మ�"
+
+#~ msgid "Fine-tune your GroupWise accounts."
+#~ msgstr "మీ సమూహ తరహా ఖాతాలన� బాగా-అమర�చండి."
+
+#~ msgid "GroupWise Features"
+#~ msgstr "సమూహతరహా సౌలభ�యాల�"
+
+#~ msgid "Message retract failed"
+#~ msgstr "సందేశం తిప�ప�కొన�ట విఫలమైంది"
+
+#~ msgid "The server did not allow the selected message to be retracted."
+#~ msgstr "ఎంపికకాబడిన సందేశం తిప�ప�కొన�టక� సేవిక అన�మతించలేద�."
+
+#~ msgid ""
+#~ "Account &quot;{0}&quot; already exists. Please check your folder tree."
+#~ msgstr "&quot;{0}&quot; ఖాతా యిప�పటికే వ�ంది. దయచేసి మీసంచయం ట�రీన� పరిశీలించండి."
+
+#~ msgid "Account Already Exists"
+#~ msgstr "ఖాతా యిప�పటికేవ�ంది"
+
+#~ msgid "Invalid user"
+#~ msgstr "చెల�లని వినియోగదారి"
+
+#~ msgid ""
+#~ "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+#~ "address and try again."
+#~ msgstr ""
+#~ "&quot;{0}&quot;లా ప�రోక�సీ లాగిన� విఫలమైంది. దయచేసి మీఈమెయిల� చిర�నామాన� పరిశీలించి మరలా ప�రయత�నించండి."
+
+#~ msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+#~ msgstr "ప�రోక�సీ యాక�సిస� వినియోగదారి &quot;{0}&quot;క� యివ�వబడద�"
+
+#~ msgid "Specify User"
+#~ msgstr "వినియోగదారిని తెల�ప�మ�"
+
+#~ msgid "You have already given proxy permissions to this user."
+#~ msgstr "ఈవినియోగదారికి మీర� యిప�పటికే ప�రోక�సీ అన�మత�లన� యిచ�చివ�న�నార�."
+
+#~ msgid "You have to specify a valid user name to give proxy rights."
+#~ msgstr "ప�రోక�సీ అన�మత�లన� యివ�వ�టక� మీర� చెల�ల�నట�వంటి వినియోగదారి నామమ�న� తెల�పవలెన�."
+
+#~ msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+#~ msgstr "తెల�పబడిన వినియోగదారి &quot;{0}&quot;తో మీర� సంచయంన� పంచ�కోలేర�"
+
+#~ msgid "You have to specify a user name which you want to add to the list"
+#~ msgstr "మీర� జాబితాక� జతచేయాలన�క�ంట�న�న వినియోగదారి నామమ�న� తెల�పవలెన�"
+
+#, fuzzy
+#~ msgid "Do you want to resend the meeting?"
+#~ msgstr "మీర� సమావేశమ�న� తిరిగి పంపాలని అన�కొన�చ�న�నారా ?"
+
+#, fuzzy
+#~ msgid "Do you want to resend the recurring meeting?"
+#~ msgstr "మీర� ప�నరావృత సమావేశమ�న� తిరిగిపంపాలని అన�కొన�చ�న�నారా?"
+
+#, fuzzy
+#~ msgid "Do you want to retract the original item?"
+#~ msgstr "మీర� వాస�తవ అంశాన�ని బయటక� తేవాలని అన�కొన�చ�న�నారా?"
+
+#~ msgid "The original will be removed from the recipient's mailbox."
+#~ msgstr "వాస�తవం అన�నది స�వీకర�తల మెయిల�‌పెట�టెన�ండి తీసివేయబడ�త�ంది."
+
+#
+#~ msgid "This is a recurring meeting"
+#~ msgstr "ఇది ప�నఃసంభవమిస�త�న�న వొక సమావేశం"
+
+#~ msgid "This will create a new meeting using the existing meeting details."
+#~ msgstr "ఉన�న సమావేశ వివరమ�లన� వ�పయోగించి యిది కొత�త సమావేశమ�న� సృష�టించ�న�."
+
+#~ msgid ""
+#~ "This will create a new meeting with the existing meeting details. The "
+#~ "recurrence rule needs to be re-entered."
+#~ msgstr ""
+#~ "ఉన�న సమావేశ వివరమ�లన� వ�పయోగించి యిది కొత�త సమావేశమ�న� సృష�టించ�న�. ప�నరావృత నియమం తిరిగి-"
+#~ "ప�రవేశపెట�టవలసి వ�ంది."
+
+#~ msgid "Would you like to decline it?"
+#~ msgstr "మీర� దీనిని తిరస�కరించ�టక� యిష�టపడతారా?"
+
+#~ msgid "C_ustomize notification message"
+#~ msgstr "ప�రకటన సందేశాన�ని మల�చ�కొన�మ� (_u)"
+
+#~ msgid "Con_tacts..."
+#~ msgstr "పరిచయాల�(_t)..."
+
+#~ msgid "The participants will receive the following notification.\n"
+#~ msgstr "పాల�గోనేవార� ఈ క�రింది ప�రకటనన� పొంద�తార�.\n"
+
+#, fuzzy
+#~ msgid "Users:"
+#~ msgstr "వినియోగదార�ల�"
+
+#~ msgid "_Not Shared"
+#~ msgstr "పంచ�కొనని(_N)"
+
+#~ msgid "_Shared With..."
+#~ msgstr "తొ పంచ�కొన�మ�(_S)..."
+
+#~ msgid "_Sharing"
+#~ msgstr "పంచ�కొన�చ�న�న(_S)"
+
+#~ msgid "Access Rights"
+#~ msgstr "వాడిక హక�క�ల�"
+
+#~ msgid "Add/Edit"
+#~ msgstr "జతచేయ�మ�/సరిచేయ�మ�"
+
+#~ msgid "Con_tacts"
+#~ msgstr "పరిచయాల�(_t)"
+
+#~ msgid "Modify _folders/options/rules/"
+#~ msgstr "_folders/options/rules/ న� సవరించ�మ�"
+
+#~ msgid "Read items marked _private"
+#~ msgstr "వ�యక�తిగతం గా గ�ర�త�ంచిన అంశమ�లన� చద�వ�మ�(_p)"
+
+#~ msgid "Subscribe to my _alarms"
+#~ msgstr "నా అలారమ�లక� చందాదార� కమ�మ�(_a)"
+
+#~ msgid "Subscribe to my _notifications"
+#~ msgstr "నాయొక�క ప�రకటనలక� చందాదార� కమ�మ�(_n)"
+
+#~ msgid "_Write"
+#~ msgstr "వ�రాయ�మ�(_W)"
+
+#~ msgid "permission to read|_Read"
+#~ msgstr "చద�వ�టక� అన�మతి|_Read"
+
+#~ msgid "Proxy"
+#~ msgstr "ప�రాక�సీ"
+
+#~ msgid "Proxy Login"
+#~ msgstr "ప�రాక�సీ లాగిన�"
+
+#~ msgid "%sEnter password for %s (user %s)"
+#~ msgstr "%s కొరక� రహస�యపదాన�ని ప�రవేశపెట�టండి %s (వినియోగదార� %s)"
+
+#~ msgid "The Proxy tab will be available only when the account is online."
+#~ msgstr "ఖాతా ఆన�‌లైన� లో ఉన�నప�పడ� మాత�రమే ప�రాక�సీ టాబ� అంద�బాట�లో ఉంట�ంది."
+
+#~ msgid "The Proxy tab will be available only when the account is enabled."
+#~ msgstr "ఖాతా చేతనంగా ఉన�నప�ప�డ� మాత�రమే ప�రాక�సీ టాబ� అంద�బాట�లో ఉంట�ంది."
+
+#, fuzzy
+#~ msgctxt "GW"
+#~ msgid "Proxy"
+#~ msgstr "ప�రాక�సీ"
+
+#~ msgid "Add User"
+#~ msgstr "వినియోగదార�ని జతచేయ�మ�"
+
+#~ msgid "Advanced send options"
+#~ msgstr "పంప�టక� ఆధ�నిక �చ�చికాల�"
+
+#~ msgid "Users"
+#~ msgstr "వినియోగదార�ల�"
+
+#~ msgid "Enter the users and set permissions"
+#~ msgstr "వినియోగదార�లన� ప�రవేశపెట�టండి మరియ� అన�మత�లన� అమర�చండి"
+
+#~ msgid "Sharing"
+#~ msgstr "పంచ�కొన�చ�న�న"
+
+#~ msgid "Custom Notification"
+#~ msgstr "మల�చ�కొనిన నోటీస�"
+
+#~ msgid "Add   "
+#~ msgstr "జతచేయ�మ�   "
+
+#~ msgid "Message Status"
+#~ msgstr "సందేశం స�థితి"
+
+#~ msgid "Subject:"
+#~ msgstr "సంగతి:"
+
+#~ msgid "From:"
+#~ msgstr "న�ండి:"
+
+#~ msgid "Creation date:"
+#~ msgstr "సృష�టించిన నాటి తేది:"
+
+#~ msgid "Recipient: "
+#~ msgstr "స�వీకరణదారి: "
+
+#~ msgid "Delivered: "
+#~ msgstr "పంపబడింది: "
+
+#~ msgid "Opened: "
+#~ msgstr "తెరిచిన: "
+
+#~ msgid "Accepted: "
+#~ msgstr "ఆమొదించబడినది: "
+
+#~ msgid "Deleted: "
+#~ msgstr "తొలగించబడినది: "
+
+#~ msgid "Declined: "
+#~ msgstr "తిరస�కరించబడింది: "
+
+#~ msgid "Completed: "
+#~ msgstr "పూర�తైనది: "
+
+#~ msgid "Undelivered: "
+#~ msgstr "పంపబడని: "
+
+#~ msgid "Blink icon in notification area."
+#~ msgstr "ప�రకటన ప�రదేశంనంద� ప�రతిమన� బ�లింక�‌చేయ�మ�."
+
+#~ msgid "Enable D-Bus messages."
+#~ msgstr "D-Bus సందేశాలన� చేతనంచేయ�మ�."
+
+#~ msgid "Generates a D-Bus message when new mail messages arrive."
+#~ msgstr "కొత�త మెయిల� సందేశం వచ�చినప�ప�డ� D-Bus సందేశంన� సంభవింపచేస�త�ంది."
+
+#~ msgid "Popup message together with the icon."
+#~ msgstr "సందేశంన� ప�రతిమతో కలిపి పాప�అప� చేయ�మ�."
+
+#~ msgid "Whether show message over the icon when new messages arrive."
+#~ msgstr "కొత�త సందేశం వచ�చినప�ప�డ� ప�రతిమ పై సందేశం చూపాలా."
+
+#~ msgid "Whether the icon should blink or not."
+#~ msgstr "ప�రతిమ బ�లింక� కావాలా వద�దా."
+
+#~ msgid "Evolution's Mail Notification"
+#~ msgstr "ఎవాల�యూషన�‌యొక�క మెయిల� ప�రకటన"
+
+#~ msgid "Mail Notification Properties"
+#~ msgstr "మెయిల� ప�రకటన లక�షణాల�"
+
+#~ msgid "Show icon in _notification area"
+#~ msgstr "ప�రకటన ప�రదేశంలో ప�రతిమన� చూప�మ�(_n)"
+
+#~ msgid "B_link icon in notification area"
+#~ msgstr "ప�రకటన ప�రదేశం లో ప�రతిమన� బ�లింక� చేయ�మ�(_l)"
+
+#~ msgid "Popup _message together with the icon"
+#~ msgstr "ప�రతిమతో కూడి సందేశాన�ని పాప�అప� చేయ�మ�(_m)"
+
+#~ msgid "Generate a _D-Bus message"
+#~ msgstr "_D-Bus సందేశాన�ని సంభంవింపచేయ�మ�"
+
+#~ msgid ""
+#~ "Selected calendar contains some events for the given mails already. Would "
+#~ "you like to create new events anyway?"
+#~ msgstr ""
+#~ "ఎంపికచేసిన క�యాలెండర� కొన�ని ఘటనలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త ఘటనలన� "
+#~ "సృష�టించ�దామని అన�కొన�చ�న�నరా?"
+
+#~ msgid ""
+#~ "Selected task list contains some tasks for the given mails already. Would "
+#~ "you like to create new tasks anyway?"
+#~ msgstr ""
+#~ "ఎంపికచేసిన కర�తవ�య జాబితా కొన�ని కర�తవ�యాలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త "
+#~ "కర�తవ�యాలన� సృష�టించ�దామని అన�కొన�చ�న�నరా?"
+
+#~ msgid ""
+#~ "Selected memo list contains some memos for the given mails already. Would "
+#~ "you like to create new memos anyway?"
+#~ msgstr ""
+#~ "ఎంపికచేసిన మెమో జాబితా కొన�ని మెమోలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త మెమోలన� "
+#~ "సృష�టించ�దామని అన�కొన�చ�న�నరా?"
+
+#~ msgid ""
+#~ "Selected calendar contains an event for the given mail already. Would you "
+#~ "like to create new event anyway?"
+#~ msgid_plural ""
+#~ "Selected calendar contains events for the given mails already. Would you "
+#~ "like to create new events anyway?"
+#~ msgstr[0] ""
+#~ "ఎంపికచేసిన క�యాలెండర� వొక ఘటనన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త ఘటనన� "
+#~ "సృష�టించ�దామని అన�కొన�చ�న�నరా?"
+#~ msgstr[1] ""
+#~ "ఎంపికచేసిన క�యాలెండర� కొన�ని ఘటనలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త ఘటనలన� "
+#~ "సృష�టించ�దామని అన�కొన�చ�న�నరా?"
+
+#~ msgid ""
+#~ "Selected task list contains a task for the given mail already. Would you "
+#~ "like to create new task anyway?"
+#~ msgid_plural ""
+#~ "Selected task list contains tasks for the given mails already. Would you "
+#~ "like to create new tasks anyway?"
+#~ msgstr[0] ""
+#~ "ఎంపికచేసిన కర�తవ�య జాబితా వొక కర�తవ�యమ�న� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త "
+#~ "కర�తవ�యమ�న� సృష�టించ�దామని అన�కొన�చ�న�నరా?"
+#~ msgstr[1] ""
+#~ "ఎంపికచేసిన కర�తవ�య జాబితా కొన�ని కర�తవ�యాలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త "
+#~ "కర�తవ�యాలన� సృష�టించ�దామని అన�కొన�చ�న�నరా?"
+
+#~ msgid ""
+#~ "Selected memo list contains a memo for the given mail already. Would you "
+#~ "like to create new memo anyway?"
+#~ msgid_plural ""
+#~ "Selected memo list contains memos for the given mails already. Would you "
+#~ "like to create new memos anyway?"
+#~ msgstr[0] ""
+#~ "ఎంపికచేసిన మెమో జాబితా వొక మెమోన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త మెమోలన� "
+#~ "సృష�టించ�దామని అన�కొన�చ�న�నరా?"
+#~ msgstr[1] ""
+#~ "ఎంపికచేసిన మెమో జాబితాన� కొన�ని మెమోలన� యిప�పటికే యిచ�చిన మెయిల�స� కొరక� కలిగివ�ంది. మీర� కొత�త మెమోలన� "
+#~ "సృష�టించ�దామని అన�కొన�చ�న�నరా?"
+
+#~ msgid "Manage your Evolution plugins."
+#~ msgstr "మీ ఎవాల�యూషన� ప�లగిన�లన� నిర�వహించ�మ�."
+
+#~ msgid "Evolution Profiler"
+#~ msgstr "ఎవల�యూషన� ప�రొఫైల�"
+
+#~ msgid "Profile data events in Evolution (for developers only)."
+#~ msgstr "ఎవాల�యూషన�‌నంద� ప�రొఫైల� డాటా ఘటనల� (అభివృద�దికార�లక� మాత�రమే)."
+
+#~ msgid "SpamAssassin not found, code: %d"
+#~ msgstr "స�పామ�ఎస�సాసిన� కనబడలేద�, కోడ�: %d"
+
+#~ msgid "Failed to create pipe: %s"
+#~ msgstr "పైప� సృష�టించ�టలో విఫలమైంది: %s"
+
+#~ msgid "Error after fork: %s"
+#~ msgstr "ఫోర�క�� తర�వాత దోషమ�: %s"
+
+#~ msgid "SpamAssassin child process does not respond, killing..."
+#~ msgstr "స�పామ�‌యెస�సాసిన� చైల�డ�� కార�యక�రమం స�పందించ�టలేద�, నశింపబడ�తోంది..."
+
+#~ msgid "Wait for SpamAssassin child process interrupted, terminating..."
+#~ msgstr "స�పామ�‌యెస�సాసిన� చైల�డ�� కార�యక�రమం అంతరాయంక� వేచివ�ండ�, సమాప�తం చేయబడ�తోంది..."
+
+#~ msgid "Pipe to SpamAssassin failed, error code: %d"
+#~ msgstr "స�పామ�‌యెస�సాసిన� వైఫల�యానికి పైప�, దోషమ� కోడ�: %d"
+
+#, fuzzy
+#~ msgid "SpamAssassin is not available. Please install it first."
+#~ msgstr "స�పామ�‌యెస�సాసిన� అంద�బాట�లో లేద�."
+
+#~ msgid "SpamAssassin Junk Filter"
+#~ msgstr "SpamAssassin నిరర�ధక వడపోత"
+
+#~ msgid "iCalendar format (.ics)"
+#~ msgstr "�క�యాలెండర� రూపం(.ics)"
+
+#~ msgid "Sort mail message threads by subject."
+#~ msgstr "సంగతి ద�వారా మెయిల� సందేశ తంత�లన� క�రమపరచ�మ�."
+
+#~ msgid "Subject Threading"
+#~ msgstr "సంగతి తంతీకరణ"
+
+#~ msgid "Thread messages by subject"
+#~ msgstr "సంగతి ద�వారా తంతి సందేశాల�"
+
+#~ msgid "Drafts based template plugin"
+#~ msgstr "డ�రాఫ�ట�స�� ఆధారిత మాదిరి ప�లగ�ఇన�"
+
+#~ msgid "Evolution _FAQ"
+#~ msgstr "ఎవల�యూషన� _FAQ"
+
+#~ msgid "Open the Frequently Asked Questions webpage"
+#~ msgstr "తర�చూ అడ�గ� ప�రశ�నల� వెబ�‌ప�టన� తెర�వ�మ�"
+
+#~ msgid "Start Evolution activating the specified component"
+#~ msgstr "ఎవల�యూషన� నిర�దేశిత భాగాన�ని క�రియాశీలీకరించడాన�ని ప�రారంభించ�"
+
+#, fuzzy
+#~ msgid "Failed to import contact's certificate"
+#~ msgstr "పరిచయాన�ని తొలగించడంలో విఫలమయినది"
+
+#~ msgid "E-Mail Address"
+#~ msgstr "ఈ మెయిల� చిర�నామా"
+
+#~ msgid "begin editing this cell"
+#~ msgstr "ఈ అరన�  సరిచేయడం ప�రారంభించండి"
+
 #~ msgid "search bar"
 #~ msgstr "వెత�క� పట�టా"
 
@@ -22171,9 +23512,6 @@ msgstr "ఎగ�బడి పద�దత�ల�"
 #~ msgid "Server Version"
 #~ msgstr "సేవిక వివరణమ�"
 
-#~ msgid "{0}"
-#~ msgstr "{0}"
-
 #~ msgid "{1}"
 #~ msgstr "{1}"
 
@@ -22573,9 +23911,6 @@ msgstr "ఎగ�బడి పద�దత�ల�"
 #~ msgid "Calendar repository is offline."
 #~ msgstr "క�యాలెండర� రిపోజిటరీ ఆఫ�‌లైన�లోవ�ంది."
 
-#~ msgid "Error on '{0}'"
-#~ msgstr "{0} పై దోషం"
-
 #~ msgid "No response from the server."
 #~ msgstr "సేవికన�ండి యెట�వంటి స�పందనలేద�."
 
@@ -22683,9 +24018,6 @@ msgstr "ఎగ�బడి పద�దత�ల�"
 #~ msgid "Location contains"
 #~ msgstr "స�థానం కలిగివ�ంది"
 
-#~ msgid "_Make available for offline use"
-#~ msgstr "ఆఫ�‌లైన� ఉపయోగార�దం అంద�బాట�చేయ�మ� (_M)"
-
 #~ msgid "_Do not make available for offline use"
 #~ msgstr "ఆఫ�‌లైన� వ�పయోగం కొరక� అంద�బాట� చేయవద�ద� (_D)"
 
@@ -23120,9 +24452,6 @@ msgstr "ఎగ�బడి పద�దత�ల�"
 #~ msgid "Toggles whether the From chooser is displayed"
 #~ msgstr "ఎంపికదారి న�ండి ప�రదర�శించబడితే మార�మ�"
 
-#~ msgid "Show"
-#~ msgstr "చూప�మ�"
-
 #~ msgid "Hide"
 #~ msgstr "మర�గ�పర�చ�"
 
@@ -23146,9 +24475,6 @@ msgstr "ఎగ�బడి పద�దత�ల�"
 #~ "ఈ సంచయం యొక�క సారాలన� అన�భందించ�టక�, సంచయంనందలి దస�త�రాలన� ఒక�కొక�కటే అన�భందించ�మ�, లేదా "
 #~ "సంచయంక� ఆర�చవ�‌న� తయార�చేసి మరియ� అన�భందించ�మ�."
 
-#~ msgid "Unfinished messages found"
-#~ msgstr "పూర�తిచేయనట�వంటి సందేశాల� కన�గొనబడినవి."
-
 #~ msgid "Warning: Modified Message"
 #~ msgstr "హెచ�చరిక: సవరించబడిన సందేశం"
 
@@ -23401,9 +24727,6 @@ msgstr "ఎగ�బడి పద�దత�ల�"
 #~ "మెయిల� సందేశమ�న� పంప�నప�ప�డ� \"From\" క�షేత�రమ�న� చూప�మ�. మెయిల� ఖాతా యెంచ�కొనబడినప�ప�డ� "
 #~ "దర�శన మెనూన�ండి యిది నియంత�రించబడ�త�ంది."
 
-#~ msgid "Text message part limit"
-#~ msgstr "పాఠ�య సందేశ భాగప� పరిమితి"
-
 #~ msgid "Thread the message list."
 #~ msgstr "సందేశ జాబితాన� తంతిచేయ�మ�."
 
@@ -23619,9 +24942,6 @@ msgstr "ఎగ�బడి పద�దత�ల�"
 #~ msgid "Check whether Evolution is the default mail client on startup."
 #~ msgstr "ప�రారంభమ�నంద� ఎవాల�యూషన� అప�రమేయ మెయిల� కక�షిదారి అవ�నో కాదో పరిశీలించండి."
 
-#~ msgid "_Account:"
-#~ msgstr "ఖాతా(_A):"
-
 #~ msgid "_Folder Name:"
 #~ msgstr "సంచయం నామం(_F):"
 
@@ -23776,9 +25096,6 @@ msgstr "ఎగ�బడి పద�దత�ల�"
 #~ msgid "You have been designated as a delegate for %s"
 #~ msgstr "మీర� %s కొరక� ప�రతినిధిగా గ�ర�తించబడ�డార�"
 
-#~ msgid "Remove the delegate %s?"
-#~ msgstr "ప�రతినిధి %s న� తొలగించాలా?"
-
 #~ msgid "Could not access Active Directory"
 #~ msgstr "క�రియాశీల సంచయాన�ని వాడ�కొనలేక పోయింది"
 
@@ -23860,9 +25177,6 @@ msgstr "ఎగ�బడి పద�దత�ల�"
 #~ msgid "Unsubscribe Folder..."
 #~ msgstr "సంచయానకి చందాదార�కావద�ద�..."
 
-#~ msgid "Really unsubscribe from folder \"%s\"?"
-#~ msgstr "నిజంగా సంచయం \"%s\" క� చందాదార�కావ�టలేదా?"
-
 #~ msgid "Unsubscribe from \"%s\""
 #~ msgstr "\"%s\" న�ండి చందాదార�గా తొలగ�మ�"
 
@@ -24181,9 +25495,6 @@ msgstr "ఎగ�బడి పద�దత�ల�"
 #~ msgid "Please restart Evolution for changes to take effect"
 #~ msgstr "మార�ప�ల� ప�రభావితం కావ�టక� దయచేసి ఎవాల�యూషన� ప�నఃప�రారంభించ�మ�"
 
-#~ msgid "Please select a user."
-#~ msgstr "దయచేసి వినియోగదారిని ఎంపికచేస�కొన�మ�."
-
 #~ msgid "Server rejected password because it is too weak."
 #~ msgstr "సేవిక సంకేతపదాన�ని తిరస�కరించింది ఎంచేతంటే అది బలహీనంగా ఉంది."
 
@@ -24271,9 +25582,6 @@ msgstr "ఎగ�బడి పద�దత�ల�"
 #~ msgid "{0} is already a delegate"
 #~ msgstr "{0} ఇప�పటికే ఒక ప�రతినిధి"
 
-#~ msgid "{0} is already in the list"
-#~ msgstr "{0} ఇప�పటికే జాబితా నంద�ఉంది"
-
 #~ msgid "Subscribe to Other User's Tasks"
 #~ msgstr "ఇతర వినియోగదార�ల కర�తవ�యాలక� చందాదార�కండి"
 
@@ -24528,9 +25836,6 @@ msgstr "ఎగ�బడి పద�దత�ల�"
 #~ msgid "Forcibly re-migrate from Evolution 1.4"
 #~ msgstr "ఎవాల�యూషన� 1.4 న�ండి బలవంతంగా తిరిగి-వలసపంప�"
 
-#~ msgid "Cannot start Evolution"
-#~ msgstr "ఎవల�యూషన�‌న� ప�రారంభించలేద�"
-
 #~ msgid "Evolution can not start."
 #~ msgstr "ఎవల�యూషన� ప�రారంభమవ�వద�"
 
@@ -24635,9 +25940,6 @@ msgstr "ఎగ�బడి పద�దత�ల�"
 #~ msgid "Import"
 #~ msgstr "దిగ�మతి"
 
-#~ msgid "View"
-#~ msgstr "దర�శనం"
-
 #~ msgid "Could not execute '%s': %s\n"
 #~ msgstr "'%s' న� నిర�వర�తించలేద�: %s\n"
 
@@ -24716,9 +26018,6 @@ msgstr "ఎగ�బడి పద�దత�ల�"
 #~ msgid "Cut selected message(s) to the clipboard"
 #~ msgstr "ఎంపికచేసిన సందేశాలన� క�లిప�‌బోర�డ�క� కత�తిరించ�మ�"
 
-#~ msgid "Hide S_elected Messages"
-#~ msgstr "ఎంచ�క�న�న సందేశాలన� అదృశ�యపర�చ�మ�(_e)"
-
 #~ msgid "Hide _Read Messages"
 #~ msgstr "చదివిన సందేశాలన� అదృశ�యపర�చ�మ�(_R)"
 
@@ -24798,9 +26097,6 @@ msgstr "ఎగ�బడి పద�దత�ల�"
 #~ msgid "Prefere_nces"
 #~ msgstr "అభీష�టాల�"
 
-#~ msgid "Send / Receive"
-#~ msgstr "పంప�మ�/తీస�కొన�మ�"
-
 #~ msgid "Submit Bug Report"
 #~ msgstr "బగ� నివేదిక న� పంప�మ�"
 
diff --git a/po/vi.po b/po/vi.po
index 7589e6b953..8bcb4b5963 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,16 +1,28 @@
 # Vietnamese Translation for Evolution.
 # Copyright © 2009 Gnome i18n Project for Vietnamese.
+<<<<<<< HEAD
 # Nguyễn Thái Ng�c Duy <pclouds@gmail.com>, 2002-2004,2007,2010.
+=======
+# Nguyễn Thái Ng�c Duy <pclouds@gmail.com>, 2002-2004,2007,2010-2011.
+>>>>>>> master
 # Clytie Siddall <clytie@riverland.net.au>, 2005-2009.
 #
+#: ../shell/main.c:570
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4 GNOME TRUNK\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+<<<<<<< HEAD
 "product=evolution\n"
 "POT-Creation-Date: 2010-12-08 13:33+0000\n"
 "PO-Revision-Date: 2011-03-06 19:58+0700\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+=======
+"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"
+"Last-Translator: Nguyễn Thái Ng�c Duy <pclouds@gmail.com>\n"
+>>>>>>> master
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,8 +36,13 @@ msgid ""
 "'{0}' is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
 msgstr ""
+<<<<<<< HEAD
 "« {0} » là một sổ địa chỉ chỉ-đ�c nên không sửa đổi được. Hãy ch�n một sổ địa "
 "chỉ khác trong khung l� của ô Xem Liên Lạc."
+=======
+"« {0} » là một sổ địa chỉ chỉ-đ�c nên không sửa đổi được. Hãy ch�n một sổ "
+"địa chỉ khác trong khung l� của ô Xem Liên Lạc."
+>>>>>>> master
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -36,22 +53,41 @@ msgstr ""
 "chỉ chứ?"
 
 #: ../addressbook/addressbook.error.xml.h:4
+#| msgid ""
+#| "The name or email of this contact already exists in this folder.  Would "
+#| "you like to add it anyway?"
+msgid ""
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
+msgstr ""
+"Danh sách liên lạc tên '{0}' đã có trong danh sách liên lạc này. Bạn vẫn còn "
+"muốn thêm nó chứ?"
+
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Add with duplicates"
+msgstr "Thêm trùng lắp"
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Address '{0}' already exists."
 msgstr "�ịa chỉ '{0}' đã có."
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Cannot add new contact"
 msgstr "Không thể thêm liên lạc mới"
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Cannot move contact."
 msgstr "Không thể di chuyển liên lạc."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Category editor not available."
 msgstr "Không có bộ sửa phân loại."
 
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:8
+=======
+#: ../addressbook/addressbook.error.xml.h:10
+>>>>>>> master
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -61,10 +97,11 @@ msgstr ""
 "phương thức đăng nhập được hỗ trợ. Lưu ý rằng nhi�u mật khẩu phân biệt chữ "
 "hoa, chữ thư�ng; và hãy chắc đã tắt phím Caps Lock của bạn."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Could not get schema information for LDAP server."
 msgstr "Không thể lấy thông tin giản đồ cho máy chủ LDAP."
 
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:10
 msgid "Could not remove address book."
 msgstr "Không thể gỡ b� sổ địa chỉ."
@@ -74,6 +111,13 @@ msgstr "Không thể gỡ b� sổ địa chỉ."
 #| "Currently you can access only GroupWise System Address Book from "
 #| "Evolution. Please use some other GroupWise mail client once, to get your "
 #| "GroupWise Frequent Contacts and GroupWise Personal Contacts folders."
+=======
+#: ../addressbook/addressbook.error.xml.h:12
+msgid "Could not remove address book."
+msgstr "Không thể gỡ b� sổ địa chỉ."
+
+#: ../addressbook/addressbook.error.xml.h:13
+>>>>>>> master
 msgid ""
 "Currently you can only access the GroupWise System Address Book from "
 "Evolution. Please use some other GroupWise mail client once to get your "
@@ -84,34 +128,45 @@ msgstr ""
 "các thư mục GroupWise Frequent Contacts (liên lạc thư�ng gặp) và các thư mục "
 "GroupWise Personal Contacts (liên lạc cá nhân)."
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Delete address book '{0}'?"
 msgstr "Xoá sổ địa chỉ « {0} » không?"
 
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:13
 #: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:49
 #| msgid "Do not delete"
+=======
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+>>>>>>> master
 msgid "Do _Not Delete"
 msgstr "�ừng _xoá"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Gặp lỗi khi lưu {0} vào {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Failed to authenticate with LDAP server."
 msgstr "Việc xác thực với máy chủ LDAP bị lỗi."
 
+<<<<<<< HEAD
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1280
+=======
+#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
+>>>>>>> master
 msgid "Failed to delete contact"
 msgstr "Lỗi xoá liên lạc"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "GroupWise Address book creation:"
 msgstr "Tạo Sổ địa chỉ GroupWise:"
 
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "Máy chủ LDAP không trả l�i với thông tin giản đồ hợp lệ."
@@ -181,6 +236,90 @@ msgid "Would you like to save your changes?"
 msgstr "Bạn có muốn lưu các thay đổi chứ?"
 
 #: ../addressbook/addressbook.error.xml.h:32
+=======
+#: ../addressbook/addressbook.error.xml.h:20
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Máy chủ LDAP không trả l�i với thông tin giản đồ hợp lệ."
+
+#: ../addressbook/addressbook.error.xml.h:21
+#| msgid "{0} is already in the list"
+msgid "List '{0}' is already in this contact list."
+msgstr "Danh sách '{0}' đã có trong danh bạ."
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "Skip duplicates"
+msgstr "B� qua trùng lắp"
+
+#: ../addressbook/addressbook.error.xml.h:23
+msgid "Some addresses already exist in this contact list."
+msgstr "Vài địa chỉ đã có trong danh sách liên lạc."
+
+#: ../addressbook/addressbook.error.xml.h:24
+msgid "Some features may not work properly with your current server"
+msgstr ""
+"Có lẽ một số tính năng sẽ không hoạt động với máy chủ hiện th�i của bạn."
+
+#: ../addressbook/addressbook.error.xml.h:25
+msgid "The Evolution address book has quit unexpectedly."
+msgstr "Sổ địa chỉ Evolution đã thoát bất thư�ng."
+
+#: ../addressbook/addressbook.error.xml.h:26
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr "Có ảnh lớn. Bạn có muốn thay đổi kích cỡ nó, và cất giữ nó không?"
+
+#: ../addressbook/addressbook.error.xml.h:27
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"Máy chủ LDAP này có lẽ dùng phiên bản LDAP cũ mà không hỗ trợ tính năng này "
+"hoặc bị cấu hình sai. Hãy h�i quản trị hệ thống v� những cơ sở tìm kiếm được "
+"hỗ trợ."
+
+#: ../addressbook/addressbook.error.xml.h:28
+msgid "This address book could not be opened."
+msgstr "Không thể mở sổ địa chỉ này."
+
+#: ../addressbook/addressbook.error.xml.h:29
+msgid "This address book server does not have any suggested search bases."
+msgstr "Máy chủ sổ địa chỉ này không đ� xuất cơ sở tìm kiếm nào."
+
+#: ../addressbook/addressbook.error.xml.h:30
+msgid ""
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+"Không thể tiếp cận máy chủ sổ địa chỉ này, hoặc tên máy chủ đã gõ sai, hoặc "
+"bị ngắt kết nối."
+
+#: ../addressbook/addressbook.error.xml.h:31
+msgid "This address book will be removed permanently."
+msgstr "Sổ địa chỉ này sẽ bị gỡ b� hoàn toàn."
+
+#: ../addressbook/addressbook.error.xml.h:32
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Máy chủ này không hỗ trợ thông tin giản đồ LDAPv3."
+
+#: ../addressbook/addressbook.error.xml.h:33
+msgid "Unable to open address book"
+msgstr "Không thể mở sổ địa chỉ"
+
+#: ../addressbook/addressbook.error.xml.h:34
+msgid "Unable to perform search."
+msgstr "Không thể trực hiện tìm kiếm."
+
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "Unable to save {0}."
+msgstr "Không thể lưu « {0} »."
+
+#: ../addressbook/addressbook.error.xml.h:36
+msgid "Would you like to save your changes?"
+msgstr "Bạn có muốn lưu các thay đổi chứ?"
+
+#: ../addressbook/addressbook.error.xml.h:37
+>>>>>>> master
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -188,6 +327,7 @@ msgstr ""
 "Bạn đang thử di chuyển một liên lạc từ sổ địa chỉ này sang sổ địa chỉ khác "
 "nhưng mà không thể gỡ b� nó kh�i nguồn. Bạn có muốn lưu một bản sao để thay "
 "thế không?"
+<<<<<<< HEAD
 
 #: ../addressbook/addressbook.error.xml.h:33
 msgid ""
@@ -204,45 +344,86 @@ msgid "You do not have permission to delete contacts in this address book."
 msgstr "Bạn không có đù quy�n để xoá liên lạc kh�i sổ địa chỉ này."
 
 #: ../addressbook/addressbook.error.xml.h:35
+=======
+
+#: ../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"
+msgstr ""
+"Bạn đang kết nối đến một máy chủ Groupwise không được hỗ trợ thì có lẽ sẽ "
+"gặp khó khăn sử dụng trình Evolution. �ể được kết quả tốt nhất, bạn nên nâng "
+"cấp máy chủ lên một phiên bản được hỗ trợ."
+
+#: ../addressbook/addressbook.error.xml.h:39
+#| msgid ""
+#| "The name or email address of this contact already exists\n"
+#| "in this folder.  Would you like to add it anyway?"
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr ""
+"Bạn đang cố thêm địa chỉ đã có trong danh sách này. Bạn vẫn muốn thêm chứ?"
+
+#: ../addressbook/addressbook.error.xml.h:40
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "Bạn không có đù quy�n để xoá liên lạc kh�i sổ địa chỉ này."
+
+#: ../addressbook/addressbook.error.xml.h:41
+>>>>>>> master
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Bạn đã chỉnh sửa liên lạc này, thì có muốn lưu các thay đổi lại chứ?"
 
 #. Translators: {0} is replaced with an address book name which will not be available
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:37
+=======
+#: ../addressbook/addressbook.error.xml.h:43
+>>>>>>> master
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Các liên lạc của bạn cho « {0} » không thể sử dụng cho tới khi khởi chạy lại "
 "Evolution."
 
+<<<<<<< HEAD
 #: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:603
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:9
+=======
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:618
+>>>>>>> master
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Thêm"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "_Discard"
 msgstr "_Hủy"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "_Do not save"
 msgstr "_Không lưu"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:47
 msgid "_Resize"
 msgstr "�ổ_i cỡ"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:48
 msgid "_Use as it is"
 msgstr "_Dùng như thế"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
 #: ../calendar/gui/e-calendar-view.c:2084
+=======
+#: ../addressbook/gui/widgets/eab-contact-display.c:715
+#: ../calendar/gui/e-calendar-view.c:2104
+>>>>>>> master
 msgid "Anniversary"
 msgstr "Kỷ niệm"
 
@@ -252,53 +433,91 @@ msgstr "Kỷ niệm"
 #. * 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
+<<<<<<< HEAD
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
 #: ../calendar/gui/e-calendar-view.c:2083 ../capplet/anjal-settings-main.c:123
 #: ../shell/main.c:133
+=======
+#: ../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
+>>>>>>> master
 msgid "Birthday"
 msgstr "Ngày sinh"
 
 #. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+<<<<<<< HEAD
 #| msgid "Blog"
+=======
+>>>>>>> master
 msgid "Blog:"
 msgstr "Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+<<<<<<< HEAD
 #: ../calendar/gui/dialogs/event-page.ui.h:4
+=======
+#: ../calendar/gui/dialogs/event-page.ui.h:3
+>>>>>>> master
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "_Loại.."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+<<<<<<< HEAD
 #| msgid "_Calendar:"
+=======
+>>>>>>> master
 msgid "Calendar:"
 msgstr "Lịch:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+<<<<<<< HEAD
 #: ../addressbook/importers/evolution-vcard-importer.c:957
+=======
+#: ../addressbook/importers/evolution-vcard-importer.c:991
+>>>>>>> master
 msgid "Contact"
 msgstr "Liên lạc"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+<<<<<<< HEAD
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:592
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:607
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2607
+=======
+#: ../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
+>>>>>>> master
 msgid "Contact Editor"
 msgstr "Bộ sửa liên lạc"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+<<<<<<< HEAD
 #: ../addressbook/gui/merging/eab-contact-merging.c:298
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
 #: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
+=======
+#: ../addressbook/gui/merging/eab-contact-merging.c:386
+#: ../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
+>>>>>>> master
 msgid "Email"
 msgstr "Thư điện tử"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+<<<<<<< HEAD
 #| msgid "_Free/Busy:"
+=======
+>>>>>>> master
 msgid "Free/Busy:"
 msgstr "Rảnh/Bận:"
 
@@ -307,13 +526,23 @@ msgid "Full _Name..."
 msgstr "H� tê_n..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+<<<<<<< HEAD
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
+=======
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:1323
+#: ../widgets/misc/e-contact-map.c:295
+>>>>>>> master
 msgid "Home"
 msgstr "Nhà"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+<<<<<<< HEAD
 #| msgid "_Home Page:"
+=======
+>>>>>>> master
 msgid "Home Page:"
 msgstr "Trang chủ:"
 
@@ -322,7 +551,10 @@ msgid "Image"
 msgstr "Ảnh"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+<<<<<<< HEAD
 #| msgid "<b>Instant Messaging</b>"
+=======
+>>>>>>> master
 msgid "Instant Messaging"
 msgstr "Tin nhắn"
 
@@ -336,7 +568,10 @@ msgstr "�ịa chỉ thư tín"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
+<<<<<<< HEAD
 #| msgid "Miscelleneous"
+=======
+>>>>>>> master
 msgid "Miscellaneous"
 msgstr "Linh tinh"
 
@@ -345,18 +580,28 @@ msgid "Nic_kname:"
 msgstr "Tên _hiệu:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+<<<<<<< HEAD
 #: ../modules/calendar/e-memo-shell-migrate.c:260
 #: ../plugins/groupwise-features/camel-gw-listener.c:423
 #: ../plugins/groupwise-features/camel-gw-listener.c:448
 #: ../plugins/groupwise-features/camel-gw-listener.c:563
+=======
+>>>>>>> master
 msgid "Notes"
 msgstr "Ghi chú"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+<<<<<<< HEAD
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
 #: ../calendar/gui/e-calendar-view.c:1789
+=======
+#: ../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
+>>>>>>> master
 msgid "Other"
 msgstr "Khác"
 
@@ -369,6 +614,7 @@ msgid "Telephone"
 msgstr "�iện thoại"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+<<<<<<< HEAD
 #| msgid "_Video Chat:"
 msgid "Video Chat:"
 msgstr "Trò chuyện ảnh động:"
@@ -1102,11 +1348,688 @@ msgstr ""
 "Tìm kiếm liên lạc,\n"
 "\n"
 "hay nhấp đúp vào đây để tạo liên lạc mới."
+=======
+msgid "Video Chat:"
+msgstr "Trò chuyện ảnh động:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+msgid "Web Addresses"
+msgstr "�ịa chỉ Web"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+msgid "Web addresses"
+msgstr "�ịa chỉ Web"
+
+#: ../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:694
+#: ../addressbook/gui/widgets/eab-contact-display.c:1320
+#: ../widgets/misc/e-contact-map.c:303
+msgid "Work"
+msgstr "Chỗ làm"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+msgid "_Address:"
+msgstr "�ị_a chỉ:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+msgid "_Anniversary:"
+msgstr "_Kỷ niệm:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+msgid "_Assistant:"
+msgstr "_Phụ tá:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+msgid "_Birthday:"
+msgstr "Ngày _sinh:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+msgid "_Blog:"
+msgstr "_Blog:"
+
+#: ../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:1963
+msgid "_Calendar:"
+msgstr "_Lịch:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+msgid "_City:"
+msgstr "_Phố:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+msgid "_Company:"
+msgstr "_Công ty:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+msgid "_Country:"
+msgstr "_Quốc gia:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+msgid "_Department:"
+msgstr "_CÆ¡ quan:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+msgid "_File under:"
+msgstr "_LÆ°u dÆ°á»›i:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+msgid "_Free/Busy:"
+msgstr "_Rảnh/Bận:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+msgid "_Home Page:"
+msgstr "Trang _chủ:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+msgid "_Manager:"
+msgstr "_Quản lý:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+msgid "_Office:"
+msgstr "_Văn phòng:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+msgid "_PO Box:"
+msgstr "Hộ_p bưu điện:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+msgid "_Profession:"
+msgstr "_Ngh� nghiệp:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+msgid "_Spouse:"
+msgstr "_Vợ chồng:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+msgid "_State/Province:"
+msgstr "_Tỉnh/Bang:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
+msgid "_Title:"
+msgstr "_Tá»±a:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+msgid "_Video Chat:"
+msgstr "Trò chu_yện ảnh động:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+msgid "_Wants to receive HTML mail"
+msgstr "Muốn nhận thư kiểu _HTML"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
+msgid "_Where:"
+msgstr "_NÆ¡i:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
+msgid "_Zip/Postal Code:"
+msgstr "Mã _bưu điện:"
+
+# Name: don't translate / Tên: đừng dịch
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../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:658
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../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:661
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../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:657
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../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:662
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
+#: ../addressbook/gui/widgets/eab-gui-util.c:469
+msgid "Error adding contact"
+msgstr "Gặp lỗi khi thêm liên lạc"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
+msgid "Error modifying contact"
+msgstr "Gặp lỗi khi sửa đổi liên lạc"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
+msgid "Error removing contact"
+msgstr "Gặp lỗi khi gỡ b� liên lạc"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:670
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2919
+#, c-format
+msgid "Contact Editor - %s"
+msgstr "Bộ sửa liên lạc — %s"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3398
+msgid "Please select an image for this contact"
+msgstr "Hãy ch�n ảnh cho liên lạc này"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3399
+msgid "_No image"
+msgstr "Khô_ng có ảnh"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3730
+msgid ""
+"The contact data is invalid:\n"
+"\n"
+msgstr ""
+"Dữ liệu liên lạc không hợp lệ:\n"
+"\n"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr "« %s » có định dạng không hợp lệ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3743
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr "%s« %s » có định dạng không hợp lệ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3756
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3770
+#, c-format
+msgid "%s'%s' is empty"
+msgstr "%s« %s » là rỗng"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3785
+msgid "Invalid contact."
+msgstr "Liên lạc không hợp lệ."
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:437
+msgid "Contact Quick-Add"
+msgstr "Thêm nhanh liên lạc"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:440
+msgid "_Edit Full"
+msgstr "_Sửa đầy"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:488
+msgid "_Full name"
+msgstr "_H� tên"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:499
+msgid "E_mail"
+msgstr "_ThÆ°"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:510
+msgid "_Select Address Book"
+msgstr "Ch�n _Sổ địa chỉ"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:1
+msgid "Dr."
+msgstr "TS."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:2
+msgid "Esq."
+msgstr "Esq."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Full Name"
+msgstr "Tên đầy đủ"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:4
+msgid "I"
+msgstr "I"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:5
+msgid "II"
+msgstr "II"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:6
+msgid "III"
+msgstr "III"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:7
+msgid "Jr."
+msgstr "Con."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:8
+msgid "Miss"
+msgstr "Cô"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:9
+msgid "Mr."
+msgstr "Ông"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:10
+msgid "Mrs."
+msgstr "Bà"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:11
+msgid "Ms."
+msgstr "Cô/Bà"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:12
+msgid "Sr."
+msgstr "Ông"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
+msgid "_First:"
+msgstr "Tê_n:"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+msgid "_Last:"
+msgstr "_H�:"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
+msgid "_Middle:"
+msgstr "Tên _lót:"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
+msgid "_Suffix:"
+msgstr "_Hậu tố:"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:742
+msgid "Contact List Editor"
+msgstr "Bộ sửa danh sách liên lạc"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+msgid "Members"
+msgstr "Thành viên"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+msgid "_Hide addresses when sending mail to this list"
+msgstr "Ẩn các địa c_hỉ khi gửi thư tới danh sách này"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
+msgid "_List name:"
+msgstr "Tên _danh sách:"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+#: ../mail/mail-config.ui.h:163
+msgid "_Select..."
+msgstr "_Ch�n..."
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
+msgid "_Type an email address or drag a contact into the list below:"
+msgstr "Nhập địa chỉ _thư hoặc kéo liên lạc vào danh sách dưới đây:"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:865
+msgid "Contact List Members"
+msgstr "Thành viên danh sách"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1440
+msgid "Error adding list"
+msgstr "Gặp lỗi khi thêm danh sách"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1455
+msgid "Error modifying list"
+msgstr "Gặp lỗi khi sửa đổi danh sách"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1470
+msgid "Error removing list"
+msgstr "Gặp lỗi khi gỡ b� danh sách"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1601
+msgid "_Members"
+msgstr "Thành _viên"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
+msgid "Changed Contact:"
+msgstr "Liên lạc đã đổi:"
+
+#. Translators: Heading of the contact which has same name or email address in this folder already.
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+msgid "Conflicting Contact:"
+msgstr "Liên lạc xung đột:"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
+msgid "Duplicate Contact Detected"
+msgstr "Phát hiện liên lạc trùng"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
+#| msgid ""
+#| "The name or email of this contact already exists in this folder.  Would "
+#| "you like to add it anyway?"
+msgid ""
+"The name or email of this contact already exists in this folder. Would you "
+"like to save the changes anyway?"
+msgstr ""
+"Tên hay địa chỉ thư điện tử của liên lạc này đã tồn tại trong thư mục này. "
+"Bạn vẫn còn muốn thêm nó không?"
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
+msgid "New Contact:"
+msgstr "Liên lạc mới:"
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
+msgid "Original Contact:"
+msgstr "Liên lạc gốc:"
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
+msgstr ""
+"�ã có tên hoặc địa chỉ thư điện từ của liên lạc này\n"
+"trong thư mục này. Bạn vẫn muốn thêm nữa chứ?"
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:332
+msgid "_Merge"
+msgstr "T_rá»™n"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:315
+msgid "Merge Contact"
+msgstr "Trộn liên lạc"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../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-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
+msgid "Any field contains"
+msgstr "Trư�ng nào chứa"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
+msgid "Email begins with"
+msgstr "�ịa chỉ thư bắt đầu bằng"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
+msgid "Name contains"
+msgstr "Tên chứa"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:157
+msgid "No contacts"
+msgstr "Không có liên lạc"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:161
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d liên lạc"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:357
+msgid "Error getting book view"
+msgstr "Gập lỗi khi g�i ô xem sổ"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:771
+msgid "Search Interrupted"
+msgstr "Tìm kiếm bị ngắt"
+
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:158
+msgid "Error modifying card"
+msgstr "Gặp lỗi khi sửa đổi thẻ"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
+msgid "Cut selected contacts to the clipboard"
+msgstr "Cắt liên lạc đã ch�n vào bảng nháp"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
+msgid "Copy selected contacts to the clipboard"
+msgstr "Chép liên lạc đã ch�n sang bảng nháp"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+msgid "Paste contacts from the clipboard"
+msgstr "Dán liên lạc từ bảng nháp"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
+msgid "Delete selected contacts"
+msgstr "Xoá các liên lạc đã ch�n"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:648
+msgid "Select all visible contacts"
+msgstr "Ch�n m�i liên lạc hiện diện"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
+msgid "Are you sure you want to delete these contact lists?"
+msgstr "Bạn có chắc muốn xoá những danh sách liên lạc này không?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+msgid "Are you sure you want to delete this contact list?"
+msgstr "Bạn có chắc muốn xoá danh sách liên lạc này không?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
+#, c-format
+msgid "Are you sure you want to delete this contact list (%s)?"
+msgstr "Bạn có chắc muốn xoá danh sách liên lạc này (%s) không?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1340
+msgid "Are you sure you want to delete these contacts?"
+msgstr "Bạn có chắc muốn xoá những liên lạc này không?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1344
+msgid "Are you sure you want to delete this contact?"
+msgstr "Bạn có chắc muốn xoá liên lạc này không?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1348
+#, c-format
+msgid "Are you sure you want to delete this contact (%s)?"
+msgstr "Bạn có chắc muốn xoá liên lạc này (%s) không?"
+
+#. Translators: This is shown for > 5 contacts.
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1504
+#, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgid_plural ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr[0] ""
+"Mở %d liên lạc sẽ mở %d cửa sổ mới cùng lúc.\n"
+"Bạn có thật sự muốn hiển thị tất cả liên lạc này không?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1512
+msgid "_Don't Display"
+msgstr "�ừ_ng hiện"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
+msgid "Display _All Contacts"
+msgstr "Hiện _m�i liên lạc"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
+msgid "Assistant"
+msgstr "Phụ tá"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "�iện thoại phụ tá"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "�iện thư Kinh doanh"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "�iện thoại kinh doanh"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "�iện thoại kinh doanh 2"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "Số g�i lại"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "�iện thoại xe"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:1
+#: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:1
+msgid "Categories"
+msgstr "Loại"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
+msgid "Company"
+msgstr "Công ty"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "�iện thoại công ty"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 2"
+msgstr "Thư điện từ 2"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Email 3"
+msgstr "Thư điện từ 3"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "Family Name"
+msgstr "H�"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+msgid "File As"
+msgstr "Tập tin dạng"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Given Name"
+msgstr "Tên hay g�i"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Fax"
+msgstr "�iện thư ở Nhà"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone"
+msgstr "�iện thoại ở nhà"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone 2"
+msgstr "�iện thoại ở nhà 2"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "ISDN Phone"
+msgstr "�iện thoại ISDN"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Journal"
+msgstr "Nhật ký"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
+msgid "Manager"
+msgstr "Quản lý"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:712
+msgid "Mobile Phone"
+msgstr "�iện thoại di động"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
+msgid "Nickname"
+msgstr "Tên hiệu"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:739
+msgid "Note"
+msgstr "Ghi chú"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Văn phòng"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "�iện thư khác"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "�iện thoại khác"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Máy nhắn tin"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "�iện thoại chính"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Rađiô"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: ../calendar/gui/e-meeting-list-view.c:610
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Vai trò"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-display.c:716
+msgid "Spouse"
+msgstr "Vợ/Chồng"
+
+#. Translators: This is a vcard standard and stands for the type of
+#. phone used by the hearing impaired. TTY stands for "teletype"
+#. (familiar from Unix device names), and TDD is "Telecommunications
+#. Device for Deaf". However, you probably want to leave this
+#. abbreviation unchanged unless you know that there is actually a
+#. different and established translation for this in your language.
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+msgid "Telex"
+msgstr "Telex"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+msgid "Title"
+msgstr "Tá»±a"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Unit"
+msgstr "�ơn vị"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Web Site"
+msgstr "Chá»— Web"
+>>>>>>> master
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
+<<<<<<< HEAD
 "There are no items to show in this view.\n"
 "\n"
 "Double-click here to create a new Contact."
@@ -1126,11 +2049,33 @@ msgstr ""
 "\n"
 "\n"
 "Tìm kiếm liên lạc."
+=======
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"�ang tìm kiếm các Liên lạc..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
+msgid ""
+"\n"
+"\n"
+"Search for the Contact\n"
+"\n"
+"or double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Tìm kiếm liên lạc,\n"
+"\n"
+"hay nhấp đúp vào đây để tạo liên lạc mới."
+>>>>>>> master
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
+<<<<<<< HEAD
 "There are no items to show in this view."
 msgstr ""
 "\n"
@@ -2033,6 +2978,913 @@ msgstr "Th�i điểm đầu:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
+=======
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Không có mục nào để xem trong khung nhìn này.\n"
+"\n"
+"Nhấp đúp vào đây để tạo liên lạc mới."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
+msgid ""
+"\n"
+"\n"
+"Search for the Contact."
+msgstr ""
+"\n"
+"\n"
+"Tìm kiếm liên lạc."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:204
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Không có mục nào để xem trong khung nhìn này."
+
+#: ../addressbook/gui/widgets/e-minicard.c:100
+msgid "Work Email"
+msgstr "�ịa chỉ thư ở chỗ làm"
+
+#: ../addressbook/gui/widgets/e-minicard.c:101
+msgid "Home Email"
+msgstr "�ịa chỉ thư ở nhà"
+
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:819
+msgid "Other Email"
+msgstr "�ịa chỉ thư khác"
+
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+#: ../addressbook/gui/widgets/ea-minicard-view.c:187
+msgid "evolution address book"
+msgstr "sổ địa chỉ Evolution"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact"
+msgstr "Liên lạc mới"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:37
+msgid "New Contact List"
+msgstr "Danh sách liên lạc mới"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:170
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "thư mục sổ địa chỉ hiện th�i %s có %d thẻ"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:34
+msgid "Open"
+msgstr "Mở"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:156
+msgid "Contact List: "
+msgstr "Danh sách liên lạc: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:157
+msgid "Contact: "
+msgstr "Liên lạc: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:183
+msgid "evolution minicard"
+msgstr "thẻ tí tị evolution"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:182
+msgid "Copy _Email Address"
+msgstr "Chép địa chỉ _thư"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:184
+#: ../widgets/misc/e-web-view.c:432
+msgid "Copy the email address to the clipboard"
+msgstr "Chép địa chỉ thư vào bảng nháp"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../widgets/misc/e-web-view.c:437
+msgid "_Send New Message To..."
+msgstr "_Gá»­i thÆ° má»›i cho..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../widgets/misc/e-web-view.c:439
+msgid "Send a mail message to this address"
+msgstr "Gửi thư đến địa chỉ này"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:215
+#| msgid "Open"
+msgid "Open map"
+msgstr "Mở bản đồ"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#| msgid "List Members"
+msgid "List Members:"
+msgstr "Thành viên danh sách:"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
+msgid "Department"
+msgstr "Phòng ban"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
+msgid "Profession"
+msgstr "Ngh� nghiệp"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
+msgid "Position"
+msgstr "Vị trí"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
+msgid "Video Chat"
+msgstr "Trò chuyện ảnh động"
+
+#: ../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:513
+#: ../modules/online-accounts/e-online-accounts-google.c:294
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:528
+msgid "Calendar"
+msgstr "Lịch"
+
+#: ../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 "Rảnh/Bận"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:689
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
+msgid "Phone"
+msgstr "�iện thoại"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
+msgid "Fax"
+msgstr "�iện thư"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:691
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
+msgid "Address"
+msgstr "�ịa chỉ"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:708
+msgid "Home Page"
+msgstr "Trang chủ"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
+msgid "Web Log"
+msgstr "Nhật ký Web"
+
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person memo list
+#. Create the default Person task list
+#: ../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
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-memo-shell-backend.c:122
+#: ../modules/calendar/e-memo-shell-migrate.c:120
+#: ../modules/calendar/e-task-shell-backend.c:122
+#: ../modules/calendar/e-task-shell-migrate.c:132
+msgid "Personal"
+msgstr "Cá nhân"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:986
+msgid "List Members"
+msgstr "Thành viên danh sách"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1004
+msgid "Job Title"
+msgstr "Tên ngh�"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1041
+msgid "Home page"
+msgstr "Trang chủ"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1050
+msgid "Blog"
+msgstr "Nhật ký Web"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1248
+#: ../widgets/misc/e-web-view.c:980
+#, c-format
+msgid "Click to mail %s"
+msgstr "Nhấn để gửi thư cho %s"
+
+#: ../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 ""
+"Sổ địa chỉ này không mở được. Có nghĩa là sổ này hoặc không đánh dấu để sử "
+"dụng ngoại tuyến, hoặc chưa được tải v� để sử dụng ngoại tuyến. Hãy nạp sổ "
+"địa chỉ này một lần trong chế độ trực tuyến để tải v� nội dung của nó."
+
+#: ../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 ""
+"Sổ địa chỉ này không mở được. Hãy kiểm tra đư�ng dẫn %s vẫn còn tồn tại và "
+"đặt quy�n hạn cho phép truy cập."
+
+#: ../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 ""
+"Phiên bản Evolution này không có hỗ trợ LDAP được biên dịch vào. �ể sử dụng "
+"LDAP trong Evolution, một gói Evolution hiệu lực LDAP phải được cài đặt."
+
+#: ../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 ""
+"Sổ địa chỉ này không mở được. Có nghĩa là hoặc địa chỉ URI bị gõ sai, hoặc "
+"không thể tiếp cận máy chủ."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid "Detailed error message:"
+msgstr "Thông điệp lỗi chi tiết:"
+
+#: ../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"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+"Nhi�u thẻ tương ứng với truy vấn này hơn\n"
+"khả năng trả lại của cấu hình máy chủ\n"
+"hay khả năng hiển thị của cấu hình Evolution.\n"
+"Hãy tạo một việc tìm kiếm chính xác hơn,\n"
+"hoặc tăng giới hạn kết quả trong các tùy ch�n\n"
+"phục vụ sổ ghi ngư�i dùng đối với sổ địa chỉ này."
+
+#: ../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"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this address book."
+msgstr ""
+"Th�i gian thực hiện truy vấn này vượt quá giới hạn máy chủ\n"
+"hay giới hạn được cấu hình cho sổ địa chỉ này.\n"
+"Hãy tạo một việc tìm kiếm chính xác hơn,\n"
+"hoặc tăng giới hạn th�i gian trong các tùy ch�n\n"
+"phục vụ sổ ghi ngư�i dùng đối với sổ địa chỉ này."
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../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 ""
+"Hậu phương cho sổ địa chỉ này không thể phân tích cú pháp của truy vấn này. "
+"%s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "Hậu phương cho sổ địa chỉ này đã từ chối thực hiện truy vấn này. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../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 "Truy vấn không hoàn tất. %s"
+
+# Filename: do not translate/ tên tập tin: đừng dịch
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:263
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
+msgid "Select Address Book"
+msgstr "Ch�n Sổ địa chỉ"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
+msgid "list"
+msgstr "danh sách"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:552
+msgid "Move contact to"
+msgstr "Chuyển liên lạc sang"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:554
+msgid "Copy contact to"
+msgstr "Chép liên lạc sang"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:557
+msgid "Move contacts to"
+msgstr "Chuyển các liên lạc sang"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:559
+msgid "Copy contacts to"
+msgstr "Chép các liên lạc sang"
+
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
+msgid "Card View"
+msgstr "Xem thẻ"
+
+#: ../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:902
+#: ../calendar/importers/icalendar-importer.c:941 ../shell/shell.error.xml.h:6
+msgid "Importing..."
+msgstr "�ang nhập..."
+
+#: ../addressbook/importers/evolution-csv-importer.c:1072
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr "CSV hay Tab kiểu Outlook (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1073
+msgid "Outlook CSV and Tab Importer"
+msgstr "Bộ nhập CSV vả Tab Outlook"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1081
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr "CSV hay Tab kiểu Mozilla (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1082
+msgid "Mozilla CSV and Tab Importer"
+msgstr "Bộ Nhập CSV và Tab Mozilla"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1090
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr "CSV hay Tab kiểu Evolution (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1091
+msgid "Evolution CSV and Tab Importer"
+msgstr "Bộ nhập CSV vả Tab Evolution"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:796
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "�ịnh dạng chuyển đổi lẫn nhau dữ liệu LDAP (.ldif)"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:797
+msgid "Evolution LDIF importer"
+msgstr "Bộ nhập LDIF Evolution"
+
+# Name: do not translate/ tên: đừng dịch
+#: ../addressbook/importers/evolution-vcard-importer.c:658
+msgid "vCard (.vcf, .gcrd)"
+msgstr "vCard (.vcf, .gcrd)"
+
+#: ../addressbook/importers/evolution-vcard-importer.c:659
+msgid "Evolution vCard Importer"
+msgstr "Bộ nhập vCard Evolution"
+
+#. 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:719
+#, c-format
+msgid "Page %d"
+msgstr "Trang %d"
+
+#: ../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 "Không thể mở tập tin"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#, c-format
+#| msgid "Couldn't get list of address books"
+msgid "Couldn't get list of address books: %s"
+msgstr "Không thể lấy danh sách sổ địa chỉ: %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
+#: ../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
+msgid "Unknown error"
+msgstr "Lỗi lạ"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#, c-format
+#| msgid "Failed to load the calendar '%s'"
+msgid "Failed to open client '%s': %s"
+msgstr "Lỗi mở trình khác '%s': %s"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:60
+msgid "Specify the output file instead of standard output"
+msgstr "Ghi rõ tập tin xuất thay vào thiết bị xuất chuẩn"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:61
+msgid "OUTPUTFILE"
+msgstr "TẬP_TIN_XUẤT"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:64
+msgid "List local address book folders"
+msgstr "Liệt kê các thư mục sổ địa chỉ cục bộ"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:67
+msgid "Show cards as vcard or csv file"
+msgstr ""
+"Hiển thị m�i thẻ kiểu tập tin vCard (thẻ ảo) hoặc .csv (định giới bằng dấu "
+"phẩy)"
+
+# Format name: do not translate/ tên dạng thức: đừng dịch
+#: ../addressbook/tools/evolution-addressbook-export.c:68
+msgid "[vcard|csv]"
+msgstr "[vcard|csv]"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:71
+msgid "Export in asynchronous mode"
+msgstr "Xuất theo chế độ không đồng bộ"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:74
+msgid ""
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
+msgstr ""
+"Số thẻ trong một tập tin kết xuất riêng lẻ ở chế độ không đồng bộ: kích cỡ "
+"mặc định là 100."
+
+#: ../addressbook/tools/evolution-addressbook-export.c:76
+msgid "NUMBER"
+msgstr "S�"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:139
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+"Lỗi đối số dòng lệnh, hãy dùng tùy ch�n « --help » (trợ giúp) để xem cách sử "
+"dụng đúng."
+
+#: ../addressbook/tools/evolution-addressbook-export.c:153
+msgid "Only support csv or vcard format."
+msgstr "Chỉ hỗ trợ định dạng .csv hoặc vCard (thẻ ảo)."
+
+#: ../addressbook/tools/evolution-addressbook-export.c:162
+msgid "In async mode, output must be file."
+msgstr "Trong chế độ không đồng bộ, kết xuất phải là tập tin."
+
+#: ../addressbook/tools/evolution-addressbook-export.c:170
+msgid "In normal mode, there is no need for the size option."
+msgstr "Trong chế độ thư�ng, không cần tùy ch�n v� kích thước."
+
+#: ../addressbook/tools/evolution-addressbook-export.c:201
+msgid "Unhandled error"
+msgstr "Lỗi không được quản lý"
+
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:2
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr ""
+"« {0} » là một lịch chỉ-đ�c nên không sửa đổi được. Hãy ch�n một lịch khác "
+"trong khung l� của ô xem Lịch."
+
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:4
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr ""
+"« {0} » là một lịch chỉ-đ�c thì không sửa đổi được. Hãy ch�n một lịch khác "
+"mà có khả năng chấp nhận cuộc hẹn."
+
+#: ../calendar/calendar.error.xml.h:5
+msgid ""
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
+msgstr ""
+"Bằng cách thêm một tóm tắt hữu ích vào cuộc hẹn, bạn sẽ cho ngư�i nhận biết "
+"sơ lược v� cuộc hẹn này."
+
+#: ../calendar/calendar.error.xml.h:6
+msgid ""
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
+msgstr ""
+"Bằng cách thêm một tóm tắt hữu ích vào cuộc hẹn, bạn sẽ cho ngư�i nhận biết "
+"sơ lược v� tác vụ này."
+
+#: ../calendar/calendar.error.xml.h:7
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr "M�i thông tin của những bản ghi nhớ này sẽ bị xoá hoàn toàn."
+
+#: ../calendar/calendar.error.xml.h:8
+msgid "All information in this memo will be deleted and can not be restored."
+msgstr "M�i thông tin của bản ghi nhớ này sẽ bị xoá hoàn toàn."
+
+#: ../calendar/calendar.error.xml.h:9
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr "M�i thông tin của những cuộc hẹn này sẽ bị xoá hoàn toàn."
+
+#: ../calendar/calendar.error.xml.h:10
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr "M�i thông tin của những tác vụ này sẽ bị xoá hoàn toàn."
+
+#: ../calendar/calendar.error.xml.h:11
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr "M�i thông tin của cuộc hẹn này sẽ bị xoá hoàn toàn."
+
+#: ../calendar/calendar.error.xml.h:12
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr "M�i thông tin của cuộc h�p này sẽ bị xoá hoàn toàn."
+
+#: ../calendar/calendar.error.xml.h:13
+msgid "All information on this memo will be deleted and can not be restored."
+msgstr "M�i thông tin của bản ghi nhớ này sẽ bị xoá hoàn toàn."
+
+#: ../calendar/calendar.error.xml.h:14
+msgid "All information on this task will be deleted and can not be restored."
+msgstr "M�i thông tin của tác vụ này sẽ bị xoá hoàn toàn."
+
+#: ../calendar/calendar.error.xml.h:15
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Bạn có chắc muốn xoá tác vụ « {0} » không?"
+
+#: ../calendar/calendar.error.xml.h:16
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Bạn có chắc muốn xoá cuộc hẹn tên « {0} » không?"
+
+#: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "Bạn có chắc muốn xoá cuộc h�p tên '{0}' chứ?"
+
+#: ../calendar/calendar.error.xml.h:18
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr "Bạn có chắc muốn xoá bản ghi nhớ « {0} » không?"
+
+#: ../calendar/calendar.error.xml.h:19
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Bạn có chắc muốn xoá các {0} cuộc hẹn này không?"
+
+#: ../calendar/calendar.error.xml.h:20
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "Bạn có chắc muốn xoá các {0} bản ghi nhớ này không?"
+
+#: ../calendar/calendar.error.xml.h:21
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Bạn có chắc muốn xoá các {0} tác vụ này không?"
+
+#: ../calendar/calendar.error.xml.h:22
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Bạn có chắc muốn xoá cuộc hẹn này không?"
+
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:191
+#, c-format
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Bạn có chắc muốn xoá cuộc h�p này không?"
+
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:197
+#, c-format
+msgid "Are you sure you want to delete this memo?"
+msgstr "Bạn có chắc muốn xoá bản ghi nhớ này không?"
+
+#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/gui/dialogs/delete-comp.c:194
+#, c-format
+msgid "Are you sure you want to delete this task?"
+msgstr "Bạn có chắc muốn xoá tác vụ này không?"
+
+#: ../calendar/calendar.error.xml.h:26
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "Bạn có chắc muốn lưu cuộc hẹn mà không có tóm tắt gì không?"
+
+#: ../calendar/calendar.error.xml.h:27
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Bạn có chắc muốn lưu bản ghi nhớ không có tóm tắt không?"
+
+#: ../calendar/calendar.error.xml.h:28
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "Bạn có chắc muốn lưu một tác vụ mà không có tóm tắt gì không?"
+
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot create a new event"
+msgstr "Không thể tạo sự kiện mới"
+
+#: ../calendar/calendar.error.xml.h:30
+msgid "Cannot save event"
+msgstr "Không thể lưu sự kiện"
+
+#: ../calendar/calendar.error.xml.h:31
+msgid "Delete calendar '{0}'?"
+msgstr "Xoá lịch « {0} » không?"
+
+#: ../calendar/calendar.error.xml.h:32
+msgid "Delete memo list '{0}'?"
+msgstr "Xoá danh sách ghi nhớ « {0} » không?"
+
+#: ../calendar/calendar.error.xml.h:33
+msgid "Delete task list '{0}'?"
+msgstr "Xoá danh sách tác vụ « {0} » không?"
+
+#: ../calendar/calendar.error.xml.h:35
+msgid "Do _not Send"
+msgstr "�ừ_ng gửi"
+
+#: ../calendar/calendar.error.xml.h:36
+msgid "Download in progress. Do you want to save the appointment?"
+msgstr "�ang tải v�. Bạn có muốn lưu cuộc hẹn không?"
+
+#: ../calendar/calendar.error.xml.h:37
+msgid "Download in progress. Do you want to save the task?"
+msgstr "�ang tải v�. Bạn có muốn lưu tác vụ không?"
+
+#: ../calendar/calendar.error.xml.h:38
+msgid "Editor could not be loaded."
+msgstr "Không thể nạp trình soạn thảo."
+
+#: ../calendar/calendar.error.xml.h:39
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+"L�i m�i thư điện từ sẽ được gửi cho m�i ngư�i dự và cho phép h� chấp nhận "
+"tác vụ."
+
+#: ../calendar/calendar.error.xml.h:40
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+"L�i m�i thư điện tử sẽ được gửi cho m�i ngư�i dự và cho phép h� trả l�i."
+
+#: ../calendar/calendar.error.xml.h:41
+msgid "Error loading calendar"
+msgstr "Gặp lỗi khi nạp lịch"
+
+#: ../calendar/calendar.error.xml.h:42
+msgid "Error loading memo list"
+msgstr "Gặp lỗi khi nạp danh sách ghi nhớ"
+
+#: ../calendar/calendar.error.xml.h:43
+msgid "Error loading task list"
+msgstr "Gặp lỗi khi nạp danh sách tác vụ"
+
+#. 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
+msgid "Error on {0}: {1}"
+msgstr "Gặp lỗi với {0}: {1}"
+
+#: ../calendar/calendar.error.xml.h:47
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+"Nếu bạn không gửi thông báo hủy b�, những ngư�i dự khác có thể sẽ không biết "
+"cuộc h�p đã được hủy b�."
+
+#: ../calendar/calendar.error.xml.h:48
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
+msgstr ""
+"Nếu bạn không gửi thông báo hủy b�, những ngư�i dự khác có thể sẽ không biết "
+"bản ghi nhớ đã được xoá."
+
+#: ../calendar/calendar.error.xml.h:49
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+"Nếu bạn không gửi thông báo hủy b�, những ngư�i dự khác có thể sẽ không biết "
+"tác vụ đã được xoá."
+
+#: ../calendar/calendar.error.xml.h:50
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+"Gửi thông tin cập nhật cho phép những ngư�i dự khác cập nhật lại lịch của h�."
+
+#: ../calendar/calendar.error.xml.h:51
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+"Gửi thông tin cập nhật cho phép những ngư�i dự khác cập nhật danh sách tác "
+"vụ của h�."
+
+#: ../calendar/calendar.error.xml.h:52
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
+"Hiện th�i đang tải v� một số đính kèm. Khi lưu cuộc hẹn này, sẽ cũng mất các "
+"đính kèm này."
+
+#: ../calendar/calendar.error.xml.h:53
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+"Hiện th�i đang tải v� một số đính kèm. Khi lưu tác vụ này, sẽ cũng mất các "
+"đính kèm này."
+
+#: ../calendar/calendar.error.xml.h:54
+msgid "Some features may not work properly with your current server."
+msgstr ""
+"Có lẽ một số tính năng sẽ không hoạt động với máy chủ hiện th�i của bạn."
+
+#: ../calendar/calendar.error.xml.h:55
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Lịch Evolution đã thoát bất ng�."
+
+#: ../calendar/calendar.error.xml.h:56
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "Các lịch Evolution đã thoát bất thư�ng."
+
+#: ../calendar/calendar.error.xml.h:57
+msgid "The Evolution memo has quit unexpectedly."
+msgstr "Ghi nhớ Evolution đã thoát bất ng�."
+
+#: ../calendar/calendar.error.xml.h:58
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr "Tác vụ Evolution đã thoát bất ng�."
+
+#: ../calendar/calendar.error.xml.h:59
+msgid "The calendar is not marked for offline usage."
+msgstr "Chưa đánh dấu lịch này để sử dụng khi ngoại tuyến."
+
+#: ../calendar/calendar.error.xml.h:60
+msgid "The memo list is not marked for offline usage."
+msgstr "Danh sách các ghi nhớ không phải đánh dấu để sử dụng ngoại tuyến."
+
+#: ../calendar/calendar.error.xml.h:61
+msgid "The task list is not marked for offline usage."
+msgstr "Chưa đánh dấu danh sách tác vụ này để sử dụng khi ngoại tuyến."
+
+#: ../calendar/calendar.error.xml.h:62
+msgid "This calendar will be removed permanently."
+msgstr "Lịch này sẽ bị xoá hoàn toàn."
+
+#: ../calendar/calendar.error.xml.h:63
+msgid "This memo list will be removed permanently."
+msgstr "Danh sách ghi nhớ này sẽ bị xoá hoàn toàn."
+
+#: ../calendar/calendar.error.xml.h:64
+msgid "This task list will be removed permanently."
+msgstr "Danh sách tác vụ này sẽ bị xoá hoàn toàn."
+
+#: ../calendar/calendar.error.xml.h:65
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Bạn có muốn lưu các thay đổi của cuộc hẹn này không?"
+
+#: ../calendar/calendar.error.xml.h:66
+msgid "Would you like to save your changes to this meeting?"
+msgstr "Bạn có muốn lưu các thay đổi trong ghi nhớ này không?"
+
+#: ../calendar/calendar.error.xml.h:67
+msgid "Would you like to save your changes to this memo?"
+msgstr "Bạn có muốn lưu các thay đổi của ghi nhớ này không?"
+
+#: ../calendar/calendar.error.xml.h:68
+msgid "Would you like to save your changes to this task?"
+msgstr "Bạn có muốn lưu các thay đổi của tác vụ này không?"
+
+#: ../calendar/calendar.error.xml.h:69
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr "Bạn có muốn gửi thông báo hủy b� v� bản ghi nhớ này không?"
+
+#: ../calendar/calendar.error.xml.h:70
+msgid "Would you like to send all the participants a cancelation notice?"
+msgstr "Bạn có muốn gửi cho m�i ngư�i dự một thông báo hủy b� không?"
+
+#: ../calendar/calendar.error.xml.h:71
+msgid "Would you like to send meeting invitations to participants?"
+msgstr "Bạn có muốn gửi l�i m�i h�p đến những ngư�i dự không?"
+
+#: ../calendar/calendar.error.xml.h:72
+msgid "Would you like to send this task to participants?"
+msgstr "Bạn có muốn gửi tác vụ này cho những ngư�i dự không?"
+
+#: ../calendar/calendar.error.xml.h:73
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+"Bạn có muốn gửi thông tin cuộc h�p đã cập nhật cho những ngư�i dự không?"
+
+#: ../calendar/calendar.error.xml.h:74
+msgid "Would you like to send updated task information to participants?"
+msgstr "Bạn có muốn gửi thông tin tác vụ cập nhật cho những ngư�i dự không?"
+
+#: ../calendar/calendar.error.xml.h:75
+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 ""
+"Bạn đang kết nối đến một máy chủ Groupwise không được hỗ trợ thì có lẽ sẽ "
+"gặp khó khăn sử dụng trình Evolution. �ể được kết quả tốt nhất, bạn nên nâng "
+"cấp trình phục vụ lên một phiên bản được hỗ trợ."
+
+#: ../calendar/calendar.error.xml.h:76
+msgid "You have changed this appointment, but not yet saved it."
+msgstr "Bạn đã sửa đổi cuộc hẹn này, nhưng chưa lưu lại."
+
+#: ../calendar/calendar.error.xml.h:77
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "Bạn đã sửa đổi cuộc h�p này, nhưng chưa lưu lại."
+
+#: ../calendar/calendar.error.xml.h:78
+msgid "You have changed this task, but not yet saved it."
+msgstr "Bạn đã sửa đổi tác vụ này, nhưng chưa lưu lại."
+
+#: ../calendar/calendar.error.xml.h:79
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr "Bạn đã sửa đổi ghi nhớ này, nhưng chưa lưu lại."
+
+#: ../calendar/calendar.error.xml.h:80
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+"Các lịch của bạn sẽ không sẵn sàng cho đến khi bạn khởi động lại Evolution."
+
+#: ../calendar/calendar.error.xml.h:81
+msgid "Your memos will not be available until Evolution is restarted."
+msgstr ""
+"Các bản ghi nhớ của bạn sẽ không sẵn sàng cho đến khi bạn khởi chạy lại "
+"Evolution."
+
+#: ../calendar/calendar.error.xml.h:82
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+"Các tác vụ của bạn sẽ không sẵn sàng cho đến khi bạn khởi động lại Evolution."
+
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Discard Changes"
+msgstr "_Hủy thay đổi"
+
+#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:317
+msgid "_Save"
+msgstr "_LÆ°u"
+
+#: ../calendar/calendar.error.xml.h:85
+msgid "_Save Changes"
+msgstr "_Lưu thay đổi"
+
+#: ../calendar/calendar.error.xml.h:86
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Send"
+msgstr "_Gá»­i"
+
+#: ../calendar/calendar.error.xml.h:87
+msgid "_Send Notice"
+msgstr "_Gửi thông báo"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:107
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "phút"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "gi�"
+
+#. 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:133
+#: ../calendar/gui/dialogs/recurrence-page.c:1190
+#| msgid "day"
+msgid "day"
+msgid_plural "days"
+msgstr[0] "ngày"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:313
+msgid "Start time"
+msgstr "Th�i điểm đầu"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
+>>>>>>> master
 msgid "Appointments"
 msgstr "Cuộc hẹn"
 
@@ -2042,9 +3894,15 @@ msgstr "Hủy tất _cả"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1598
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1604
 #: ../plugins/itip-formatter/itip-view.c:1044
+=======
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1739
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1749
+#: ../plugins/itip-formatter/itip-view.c:1052
+>>>>>>> master
 msgid "Location:"
 msgstr "�ịa điểm:"
 
@@ -2052,7 +3910,11 @@ msgstr "�ịa điểm:"
 msgid "Snooze _time:"
 msgstr "_Th�i gian ch� ngắn:"
 
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:882
+=======
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:919
+>>>>>>> master
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "_Hủy"
@@ -2061,6 +3923,7 @@ msgstr "_Hủy"
 msgid "_Snooze"
 msgstr "_Ch� tí"
 
+<<<<<<< HEAD
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
 #: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:427
@@ -2191,6 +4054,142 @@ msgid "Week View"
 msgstr "Xem tuần"
 
 #: ../calendar/gui/calendar-view-factory.c:126
+=======
+#. Translators: This is the last part of the sentence:
+#. * "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:454
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
+#: ../plugins/google-account-setup/google-contacts-source.c:387
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+msgid "days"
+msgstr "ngày"
+
+#: ../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:453
+#: ../filter/filter.ui.h:15
+#: ../plugins/google-account-setup/google-contacts-source.c:386
+msgid "hours"
+msgstr "gi�"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+msgid "location of appointment"
+msgstr "địa điểm cuộc hẹn"
+
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../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:452
+#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/google-account-setup/google-contacts-source.c:385
+msgid "minutes"
+msgstr "phút"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+msgid "No summary available."
+msgstr "Không có tóm tắt"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+msgid "No description available."
+msgstr "Không có mô tả."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1607
+msgid "No location information available."
+msgstr "Không có thông tin v� địa điểm."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
+#, c-format
+#| msgid "You have %d alarm"
+#| msgid_plural "You have %d alarms"
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] "Bạn có %d nhắc nhở"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1853
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
+msgid "Warning"
+msgstr "Cảnh báo"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1857
+msgid ""
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email.  Evolution will display\n"
+"a normal reminder dialog box instead."
+msgstr ""
+"Evolution chưa hỗ trợ bộ nhắc nhở lịch thông qua\n"
+"thư điện tử, nhưng mà bộ nhắc nhở này đã được\n"
+"cấu hình để gửi thư. Thay vào đó, Evolution\n"
+"sẽ hiển thị một hộp thoại nhắc nhở thông thư�ng."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1894
+#, c-format
+msgid ""
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
+msgstr ""
+"Lịch Evolution sắp nhắc nhở bạn. Bộ nhắc nhở này được cấu hình để chạy những "
+"chương trình sau:\n"
+"\n"
+"        %s\n"
+"\n"
+"Bạn có chắc muốn chạy chương trình này không?"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1909
+msgid "Do not ask me about this program again."
+msgstr "�ừng h�i tôi v� chương trình này lần nữa."
+
+#: ../calendar/gui/alarm-notify/util.c:45
+msgid "invalid time"
+msgstr "Th�i gian không hợp lệ"
+
+#. 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
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d gi�"
+
+#. 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
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d phút"
+
+#. 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:81 ../calendar/gui/e-alarm-list.c:417
+#: ../calendar/gui/misc.c:128
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d giây"
+
+#: ../calendar/gui/calendar-view-factory.c:116
+msgid "Day View"
+msgstr "Xem ngày"
+
+#: ../calendar/gui/calendar-view-factory.c:119
+msgid "Work Week View"
+msgstr "Xem tuần làm việc"
+
+#: ../calendar/gui/calendar-view-factory.c:122
+msgid "Week View"
+msgstr "Xem tuần"
+
+#: ../calendar/gui/calendar-view-factory.c:125
+>>>>>>> master
 msgid "Month View"
 msgstr "Xem tháng"
 
@@ -2219,16 +4218,26 @@ msgstr "Loại"
 msgid "Classification"
 msgstr "Phân loại"
 
+<<<<<<< HEAD
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
 #: ../calendar/gui/e-cal-model.c:780 ../calendar/gui/e-task-table.c:495
+=======
+#: ../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
+>>>>>>> master
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Mật"
 
 #: ../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
+<<<<<<< HEAD
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 #: ../widgets/misc/e-attachment-tree-view.c:524
+=======
+#: ../modules/plugin-manager/evolution-plugin-manager.c:71
+#: ../widgets/misc/e-attachment-tree-view.c:526
+>>>>>>> master
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "Mô tả"
@@ -2250,9 +4259,15 @@ msgstr "Tồn tại"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
+<<<<<<< HEAD
 #: ../plugins/publish-calendar/publish-calendar.c:835
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
+=======
+#: ../plugins/publish-calendar/publish-calendar.c:863
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../plugins/save-calendar/csv-format.c:397
+>>>>>>> master
 msgid "Location"
 msgstr "�ịa chỉ"
 
@@ -2260,6 +4275,7 @@ msgstr "�ịa chỉ"
 #: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Bộ tổ chức:"
+<<<<<<< HEAD
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
 #: ../calendar/gui/e-cal-model.c:778 ../calendar/gui/e-task-table.c:494
@@ -27302,6 +29318,24491 @@ msgstr "Cách nhập"
 #~ msgid "Draw button"
 #~ msgstr "Nút vẽ"
 
+=======
+
+#: ../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/memotypes.xml.h:12
+msgid "Private"
+msgstr "Riêng tư"
+
+#: ../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/e-task-table.c:502 ../calendar/gui/memotypes.xml.h:13
+msgid "Public"
+msgstr "Công cộng"
+
+#: ../calendar/gui/caltypes.xml.h:16
+#: ../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 "�ịnh kỳ"
+
+#: ../calendar/gui/caltypes.xml.h:17
+#: ../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
+msgid "Summary"
+msgstr "Tóm tắt"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Summary Contains"
+msgstr "Tóm tắt chứa"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "chứa"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "không chứa"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
+msgid "is"
+msgstr "bằng"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
+msgid "is not"
+msgstr "không phải"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:636
+#| msgid "Reminder!"
+msgid "Edit Reminder"
+msgstr "Sửa nhắc nhở"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:827
+#: ../calendar/gui/e-alarm-list.c:447
+msgid "Pop up an alert"
+msgstr "Bật lên báo động"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:828
+#: ../calendar/gui/e-alarm-list.c:443
+msgid "Play a sound"
+msgstr "Phát âm thanh"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:829
+#: ../calendar/gui/e-alarm-list.c:455
+msgid "Run a program"
+msgstr "Chạy chương trình"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:830
+#: ../calendar/gui/e-alarm-list.c:451
+msgid "Send an email"
+msgstr "Gá»­i thÆ°"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
+#| msgid "Reminder!"
+msgid "Add Reminder"
+msgstr "Thêm nhắc nhở"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+msgid "Custom _message"
+msgstr "Thư tự _ch�n"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+#| msgid "Custom alarm sound"
+msgid "Custom reminder sound"
+msgstr "Âm thanh nhắc nhở tự ch�n"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
+msgid "Mes_sage:"
+msgstr "_ThÆ°:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
+msgid "Options"
+msgstr "Tùy ch�n"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+#| msgid "Reminder!"
+msgid "Reminder"
+msgstr "Nhắc nhở"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+msgid "Repeat"
+msgstr "Lặp lại"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+msgid "Select A File"
+msgstr "Ch�n tập tin"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+msgid "Send To:"
+msgstr "Gá»­i cho:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
+msgid "_Arguments:"
+msgstr "�ối _số:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
+msgid "_Program:"
+msgstr "_Chương trình:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
+#| msgid "_Repeat the alarm"
+msgid "_Repeat the reminder"
+msgstr "_Lặp lại nhắc nhở"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
+msgid "_Sound:"
+msgstr "Â_m thanh:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+msgid "after"
+msgstr "sau"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
+msgid "before"
+msgstr "trÆ°á»›c"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+msgid "day(s)"
+msgstr "ngày"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+msgid "end of appointment"
+msgstr "kết thúc cuộc hẹn"
+
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+msgid "extra times every"
+msgstr "lần thêm nữa mỗi"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+msgid "hour(s)"
+msgstr "gi�"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+msgid "minute(s)"
+msgstr "phút"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
+msgid "start of appointment"
+msgstr "bắt đầu cuộc hẹn"
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:245
+msgid "Action/Trigger"
+msgstr "Hành động/Gây ra"
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
+msgid "A_dd"
+msgstr "_Thêm"
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#| msgid "Reminder!"
+msgid "Reminders"
+msgstr "Nhắc nhở"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:169
+msgid "Type:"
+msgstr "Kiểu:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:185
+#: ../modules/addressbook/addressbook-config.c:530
+msgid "_Type:"
+msgstr "_Kiểu:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:155
+#: ../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 "Tê_n:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:300
+msgid "Cop_y calendar contents locally for offline operation"
+msgstr "Chép nội dung lịch cục bộ để hoạt động ngoại tu_yến"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:302
+msgid "Cop_y task list contents locally for offline operation"
+msgstr "Chép nội dung danh sách tác vụ cục bộ để hoạt động ngoại tu_yến"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:304
+msgid "Cop_y memo list contents locally for offline operation"
+msgstr "Chép nội dung danh sách ghi nhớ cục bộ để hoạt động ngoại tu_yến"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:350
+#| msgid "Shared Folder Notification"
+msgid "Sh_ow reminder notifications"
+msgstr "_Hiện thông báo nhắc nhở"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:425
+msgid "Colo_r:"
+msgstr "Mà_u:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:448
+#: ../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/calendar/e-calendar-preferences.ui.h:17
+#: ../plugins/itip-formatter/itip-formatter.c:3045
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "General"
+msgstr "Chung"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:461
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
+msgid "Task List"
+msgstr "Danh sách tác vụ"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:472
+msgid "Memo List"
+msgstr "Danh sách Ghi nhớ"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:564
+msgid "Calendar Properties"
+msgstr "Thuộc tính Lịch"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:564
+msgid "New Calendar"
+msgstr "Lịch mới"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:624
+msgid "Task List Properties"
+msgstr "Thuộc tính Danh sách Tác vụ"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:624
+msgid "New Task List"
+msgstr "Danh sách Tác vụ mới"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:684
+msgid "Memo List Properties"
+msgstr "Thuộc tính Danh sách Ghi nhớ"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:684
+msgid "New Memo List"
+msgstr "Danh sách Ghi nhớ Mới"
+
+#: ../calendar/gui/dialogs/changed-comp.c:62
+msgid "This event has been deleted."
+msgstr "Sự kiện này bị xoá."
+
+#: ../calendar/gui/dialogs/changed-comp.c:66
+msgid "This task has been deleted."
+msgstr "Tác vụ này bị xoá."
+
+#: ../calendar/gui/dialogs/changed-comp.c:70
+msgid "This memo has been deleted."
+msgstr "Bản ghi nhớ này đã bị xoá."
+
+#: ../calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+"%s  Bạn đã tạo ra một vài thay đổi. B� qua những thay đổi này và đóng bộ "
+"biên soạn sao không?"
+
+#: ../calendar/gui/dialogs/changed-comp.c:81
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr "%s  Bạn chưa thay đổi gì, đóng bộ sửa không?"
+
+#: ../calendar/gui/dialogs/changed-comp.c:86
+msgid "This event has been changed."
+msgstr "Sự kiện này đã được thay đổi."
+
+#: ../calendar/gui/dialogs/changed-comp.c:90
+msgid "This task has been changed."
+msgstr "Tác vụ này đã được thay đổi."
+
+#: ../calendar/gui/dialogs/changed-comp.c:94
+msgid "This memo has been changed."
+msgstr "Bản ghi nhớ này đã bị sửa đổi."
+
+#: ../calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+"%s  Bạn đã tạo ra vài thay đổi. B� qua những thay đổi này và cập nhật bộ "
+"biên soạn không?"
+
+#: ../calendar/gui/dialogs/changed-comp.c:105
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr "%s  Bạn chưa thay đổi gì, còn cập nhật bộ sửa không?"
+
+#: ../calendar/gui/dialogs/comp-editor-page.c:461
+#, c-format
+msgid "Validation error: %s"
+msgstr "Lỗi hợp lệ hoá: %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:273
+msgid "Could not save attachments"
+msgstr "Không thể lưu đính kèm"
+
+#: ../calendar/gui/dialogs/comp-editor.c:613
+msgid "Could not update object"
+msgstr "Không thể cập nhật đối tượng"
+
+#: ../calendar/gui/dialogs/comp-editor.c:741
+msgid "Edit Appointment"
+msgstr "Sửa cuộc hẹn"
+
+#: ../calendar/gui/dialogs/comp-editor.c:748
+#, c-format
+msgid "Meeting - %s"
+msgstr "Cuộc h�p - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:750
+#, c-format
+msgid "Appointment - %s"
+msgstr "Cuộc hẹn - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:756
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Tác vụ đã gán - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:758
+#, c-format
+msgid "Task - %s"
+msgstr "Tác vụ - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:763
+#, c-format
+msgid "Memo - %s"
+msgstr "Ghi nhớ — %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:779
+msgid "No Summary"
+msgstr "Không có bản tóm tắt"
+
+#: ../calendar/gui/dialogs/comp-editor.c:900
+msgid "Keep original item?"
+msgstr "Giữ mục gốc ?"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1101
+#| msgid "Close the current file"
+msgid "Close the current window"
+msgstr "�óng cửa sổhiện th�i"
+
+#: ../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
+msgid "Copy the selection"
+msgstr "Chép vùng ch�n"
+
+#: ../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
+msgid "Cut the selection"
+msgstr "Cắt vùng ch�n"
+
+#: ../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
+msgid "Delete the selection"
+msgstr "Xoá vùng ch�n"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1129
+#| msgid "View"
+msgid "View help"
+msgstr "Xem trợ giúp"
+
+#: ../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
+msgid "Paste the clipboard"
+msgstr "Dán bảng nháp"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1157
+#| msgid "Save Current View"
+msgid "Save current changes"
+msgstr "Lưu thay đổi hiện th�i"
+
+#: ../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
+msgid "Select all text"
+msgstr "Ch�n toàn bộ văn bản"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1171
+msgid "_Classification"
+msgstr "_Phân loại"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../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
+#: ../shell/e-shell-window-actions.c:1602
+#: ../widgets/menus/gal-define-views.ui.h:5
+msgid "_Edit"
+msgstr "_Sá»­a"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1185 ../mail/e-mail-browser.c:169
+#: ../shell/e-shell-window-actions.c:1609
+#: ../widgets/misc/e-signature-editor.c:221
+msgid "_File"
+msgstr "_Tập tin"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1192
+#: ../shell/e-shell-window-actions.c:1616
+msgid "_Help"
+msgstr "Trợ g_iúp"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1199
+msgid "_Insert"
+msgstr "C_hèn"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../composer/e-composer-actions.c:340
+msgid "_Options"
+msgstr "Tù_y ch�n"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1213 ../mail/e-mail-browser.c:183
+#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
+msgid "_View"
+msgstr "_Xem"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../composer/e-composer-actions.c:289
+msgid "_Attachment..."
+msgstr "�ồ đính _kèm.."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1225
+#: ../composer/e-composer-actions.c:291
+#: ../widgets/misc/e-attachment-view.c:439
+msgid "Attach a file"
+msgstr "�ính kèm tập tin"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1233
+msgid "_Categories"
+msgstr "_Loại"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1235
+msgid "Toggles whether to display categories"
+msgstr "Bật tắt hiển thị các loại"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1241
+msgid "Time _Zone"
+msgstr "_Múi gi�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1243
+msgid "Toggles whether the time zone is displayed"
+msgstr "Bật tắt hiển thị Múi gi�"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1252
+msgid "Pu_blic"
+msgstr "_Công"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1254
+msgid "Classify as public"
+msgstr "Phân loại là Công"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1259
+msgid "_Private"
+msgstr "_Riêng"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1261
+msgid "Classify as private"
+msgstr "Phân loại là Riêng"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1266
+msgid "_Confidential"
+msgstr "_Mật"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1268
+msgid "Classify as confidential"
+msgstr "Phân loại Mật"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "R_ole Field"
+msgstr "Trư�ng _Vai trò"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1278
+msgid "Toggles whether the Role field is displayed"
+msgstr "Bật tắt hiển thị trư�ng Vai trò"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1284
+msgid "_RSVP"
+msgstr "_Vui lòng hồi âm"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1286
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Bật tắt hiển thị trư�ng RSVP (Vui lòng hồi âm)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1292
+msgid "_Status Field"
+msgstr "Trư�ng T_rạng thái"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1294
+msgid "Toggles whether the Status field is displayed"
+msgstr "Bật tắt hiển thị trư�ng Trạng thái"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1300
+msgid "_Type Field"
+msgstr "_Trư�ng Kiểu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1302
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Bật tắt hiển thị trư�ng Kiểu ngư�i dự"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../composer/e-composer-private.c:77
+msgid "Recent _Documents"
+msgstr "Tài liệu _vừa mở"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2059
+#: ../composer/e-composer-actions.c:508
+msgid "Attach"
+msgstr "�ính kèm"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2397
+#: ../calendar/gui/dialogs/comp-editor.c:2560
+#: ../calendar/gui/dialogs/comp-editor.c:3549
+msgid "Changes made to this item may be discarded if an update arrives"
+msgstr "Thay đổi trên mục này có thể bị hủy nếu bản cập nhật đến vào."
+
+#: ../calendar/gui/dialogs/comp-editor.c:3513
+#: ../plugins/prefer-plain/prefer-plain.c:67
+msgid "attachment"
+msgstr "đính kèm"
+
+#: ../calendar/gui/dialogs/comp-editor.c:3581
+msgid "Unable to use current version!"
+msgstr "Không thể dùng phiên bản hiện th�i."
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:114
+msgid "Could not open destination"
+msgstr "Không thể mở đích."
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+msgid "Destination is read only"
+msgstr "�ích chỉ cho phép đ�c thôi."
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:164
+#| msgid "Cannot create a new event"
+msgid "Cannot create object"
+msgstr "Không thể tạo đối tượng"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:193
+msgid "Could not open source"
+msgstr "Không thể mở nguồn."
+
+#: ../calendar/gui/dialogs/delete-comp.c:214
+msgid "_Delete this item from all other recipient's mailboxes?"
+msgstr "_Xoá mục này ra hộp thư của m�i ngư�i nhận khác không?"
+
+#: ../calendar/gui/dialogs/delete-comp.c:217
+msgid "_Retract comment"
+msgstr "_Rút lại ý kiến"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:57
+#, c-format
+msgid "The event could not be deleted due to a dbus error: %s"
+msgstr "Không thể xoá sự kiện vì gặp lỗi dbus: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:61
+#, c-format
+msgid "The task could not be deleted due to a dbus error: %s"
+msgstr "Không thể xoá tác vụ vì gặp lỗi dbus: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:65
+#, c-format
+msgid "The memo could not be deleted due to a dbus error: %s"
+msgstr "Không thể xoá bản ghi nhớ vì gặp lỗi dbus: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:69
+#, c-format
+msgid "The item could not be deleted due to a dbus error: %s"
+msgstr "Không thể xoá mục vì gặp lỗi dbus: %s"
+
+#: ../calendar/gui/dialogs/delete-error.c:76
+msgid "The event could not be deleted because permission was denied"
+msgstr "Không thể xoá sự kiện vì không đủ quy�n."
+
+#: ../calendar/gui/dialogs/delete-error.c:79
+msgid "The task could not be deleted because permission was denied"
+msgstr "Không thể xoá tác vụ vì không đủ quy�n."
+
+#: ../calendar/gui/dialogs/delete-error.c:82
+msgid "The memo could not be deleted because permission was denied"
+msgstr "Không thể xoá bản ghi nhớ vì không đủ quy�n."
+
+#: ../calendar/gui/dialogs/delete-error.c:85
+msgid "The item could not be deleted because permission was denied"
+msgstr "Không thể xoá mục vì không đủ quy�n."
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:93
+#, c-format
+msgid "The event could not be deleted due to an error: %s"
+msgstr "Không thể xoá sự kiện vì gặp lỗi: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:97
+#, c-format
+msgid "The task could not be deleted due to an error: %s"
+msgstr "Không thể xoá tác vụ vì gặp lỗi: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:101
+#, c-format
+msgid "The memo could not be deleted due to an error: %s"
+msgstr "Không thể xoá bản ghi nhớ vì gặp lỗi: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:105
+#, c-format
+msgid "The item could not be deleted due to an error: %s"
+msgstr "Không thể xoá mục vì gặp lỗi: %s"
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
+msgid "Contacts..."
+msgstr "Liên lạc..."
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
+msgid "Delegate To:"
+msgstr "Ủy nhiệm cho:"
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
+msgid "Enter Delegate"
+msgstr "Nhập ngư�i ủy nhiệm"
+
+#: ../calendar/gui/dialogs/event-editor.c:212
+#| msgid "Reminder!"
+msgid "_Reminders"
+msgstr "_Nhắc nhở"
+
+#: ../calendar/gui/dialogs/event-editor.c:214
+#| msgid "Click here to set or unset alarms for this event"
+msgid "Set or unset reminders for this event"
+msgstr "�ặt hoặc b� nhắc nhở cho sự kiện này"
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Show Time as _Busy"
+msgstr "Hiện gi� là _Bận"
+
+#: ../calendar/gui/dialogs/event-editor.c:224
+msgid "Toggles whether to show time as busy"
+msgstr "Bật tắt hiển thị gi� là bận"
+
+#: ../calendar/gui/dialogs/event-editor.c:233
+msgid "_Recurrence"
+msgstr "�ịnh _kỳ"
+
+#: ../calendar/gui/dialogs/event-editor.c:235
+msgid "Make this a recurring event"
+msgstr "�ặt là sự kiện lặp"
+
+#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../widgets/misc/e-send-options.ui.h:22
+msgid "Send Options"
+msgstr "Tùy ch�n Gửi"
+
+#: ../calendar/gui/dialogs/event-editor.c:242
+#: ../calendar/gui/dialogs/task-editor.c:128
+msgid "Insert advanced send options"
+msgstr "Chèn tùy ch�n gửi cấp cao"
+
+#: ../calendar/gui/dialogs/event-editor.c:250
+msgid "All _Day Event"
+msgstr "Sự kiện ng_uyên ngày"
+
+#: ../calendar/gui/dialogs/event-editor.c:252
+msgid "Toggles whether to have All Day Event"
+msgstr "Bật tắt có dự kiện nguyên ngày"
+
+#: ../calendar/gui/dialogs/event-editor.c:261
+msgid "_Free/Busy"
+msgstr "Rảnh/_Bận"
+
+#: ../calendar/gui/dialogs/event-editor.c:263
+msgid "Query free / busy information for the attendees"
+msgstr "Truy vấn thông tin Rảnh/Bận cho các ngư�i dự"
+
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3310
+msgid "Appointment"
+msgstr "Cuộc hẹn"
+
+#: ../calendar/gui/dialogs/event-editor.c:384
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/e-meeting-list-view.c:161
+msgid "Attendees"
+msgstr "Ngư�i dự"
+
+#: ../calendar/gui/dialogs/event-editor.c:582
+msgid "Print this event"
+msgstr "In sự kiện này"
+
+#: ../calendar/gui/dialogs/event-page.c:558
+msgid "Event's start time is in the past"
+msgstr "Th�i điểm bắt đầu sự kiện trong quá khứ"
+
+#: ../calendar/gui/dialogs/event-page.c:635
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr "Không thể sửa sự kiện vì lịch được ch�n là chỉ đ�c"
+
+#: ../calendar/gui/dialogs/event-page.c:639
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr "Không thể sửa hoàn toàn sự kiện vì bạn không phải ngư�i tổ chức"
+
+#: ../calendar/gui/dialogs/event-page.c:651
+#: ../calendar/gui/dialogs/event-page.c:3080
+#| msgid "This event has alarms"
+msgid "This event has reminders"
+msgstr "Sự kiện này có nhắc nhở"
+
+#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
+msgid "Or_ganizer:"
+msgstr "_Tổ chức:"
+
+#: ../calendar/gui/dialogs/event-page.c:1263
+msgid "Event with no start date"
+msgstr "Sự kiện không có ngày bắt đầu"
+
+#: ../calendar/gui/dialogs/event-page.c:1266
+msgid "Event with no end date"
+msgstr "Sự kiện không có ngày kết thúc"
+
+#: ../calendar/gui/dialogs/event-page.c:1439
+#: ../calendar/gui/dialogs/memo-page.c:708
+#: ../calendar/gui/dialogs/task-page.c:819
+msgid "Start date is wrong"
+msgstr "Ngày bắt đầu sai"
+
+#: ../calendar/gui/dialogs/event-page.c:1449
+msgid "End date is wrong"
+msgstr "Ngày kết thúc sai"
+
+#: ../calendar/gui/dialogs/event-page.c:1472
+msgid "Start time is wrong"
+msgstr "Th�i điểm đầu sai"
+
+#: ../calendar/gui/dialogs/event-page.c:1479
+msgid "End time is wrong"
+msgstr "Th�i điểm kết thúc sai"
+
+#: ../calendar/gui/dialogs/event-page.c:1644
+#: ../calendar/gui/dialogs/memo-page.c:749
+#: ../calendar/gui/dialogs/task-page.c:873
+msgid "An organizer is required."
+msgstr "Cần một bộ tổ chức."
+
+#: ../calendar/gui/dialogs/event-page.c:1678
+#: ../calendar/gui/dialogs/task-page.c:907
+msgid "At least one attendee is required."
+msgstr "Cần ít nhất một ngư�i dự."
+
+#: ../calendar/gui/dialogs/event-page.c:1885
+msgid "_Delegatees"
+msgstr "Ngư�i ủ_y nhiệm"
+
+#: ../calendar/gui/dialogs/event-page.c:1887
+msgid "Atte_ndees"
+msgstr "Ngư�i _dự"
+
+#: ../calendar/gui/dialogs/event-page.c:2921
+#, c-format
+#| msgid "Unable to open the calendar '%s'."
+msgid "Unable to open the calendar '%s': %s"
+msgstr "Không thể mở lịch \"%s\": %s"
+
+#. Translators: This string is used when we are creating an Event
+#. * (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
+#. 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/memo-page.c:1012
+#: ../calendar/gui/dialogs/task-page.c:1838
+#, c-format
+msgid "You are acting on behalf of %s"
+msgstr "Bạn đang hoạt động thay mặt cho %s"
+
+#: ../calendar/gui/dialogs/event-page.c:3325
+#, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "%d ngày trước cuộc hẹn"
+
+#: ../calendar/gui/dialogs/event-page.c:3331
+#, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "%d gi� trước cuộc hẹn"
+
+#: ../calendar/gui/dialogs/event-page.c:3337
+#, c-format
+msgid "%d minute before appointment"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "%d phút trước cuộc hẹn"
+
+#: ../calendar/gui/dialogs/event-page.c:3356
+msgid "Customize"
+msgstr "Tùy chỉnh"
+
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/dialogs/event-page.c:3362
+#| msgid "None"
+msgctxt "cal-reminders"
+msgid "None"
+msgstr "Không"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:564
+msgid "Atte_ndees..."
+msgstr "Ngư�i _dự..."
+
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+#| msgid "Custom Header"
+msgid "Custom Reminder:"
+msgstr "Nhắc nhở tự ch�n:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:6
+msgid "Event Description"
+msgstr "Mô tả sự kiện"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
+msgid "Time _zone:"
+msgstr "Múi _gi�:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:8
+#: ../widgets/misc/e-attachment-dialog.c:347
+msgid "_Description:"
+msgstr "_Mô tả:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../plugins/calendar-weather/calendar-weather.c:381
+msgid "_Location:"
+msgstr "�ịa điể_m:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#| msgid "Reminder!"
+msgid "_Reminder"
+msgstr "_Nhắc nhở"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+msgid "_Summary:"
+msgstr "_Tóm tắt:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+msgid "_Time:"
+msgstr "_Gi�:"
+
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "1 ngày trước cuộc hẹn"
+
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "1 gi� trước cuộc hẹn"
+
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:21
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "15 phút trước cuộc hẹn"
+
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+msgctxt "eventpage"
+msgid "for"
+msgstr "trong"
+
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+msgctxt "eventpage"
+msgid "until"
+msgstr "tá»›i khi"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
+msgid "April"
+msgstr "Tháng Tư"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
+msgid "August"
+msgstr "Tháng Tám"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
+msgid "December"
+msgstr "Tháng Chạp"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
+msgid "February"
+msgstr "Tháng Hai"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
+msgid "January"
+msgstr "Tháng Giêng"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
+msgid "July"
+msgstr "Tháng Bảy"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
+msgid "June"
+msgstr "Tháng Sáu"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
+msgid "March"
+msgstr "Tháng Ba"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
+msgid "May"
+msgstr "Tháng Năm"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
+msgid "November"
+msgstr "Tháng Mư�i Một"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
+msgid "October"
+msgstr "Tháng Mư�i"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "Select Date"
+msgstr "Ch�n ngày"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+msgid "Select _Today"
+msgstr "Ch�n _hôm nay"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
+msgid "September"
+msgstr "Tháng Chín"
+
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3314
+msgid "Memo"
+msgstr "Ghi nhá»›"
+
+#: ../calendar/gui/dialogs/memo-editor.c:156
+msgid "Print this memo"
+msgstr "In bản ghi nhớ này"
+
+#: ../calendar/gui/dialogs/memo-page.c:405
+msgid "Memo's start date is in the past"
+msgstr "Ngày bắt đầu bản ghi nhớ trong quá khứ"
+
+#: ../calendar/gui/dialogs/memo-page.c:442
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr "Không thể sửa ghi nhớ vì danh sách ghi nhớ được ch�n là chỉ đ�c"
+
+#: ../calendar/gui/dialogs/memo-page.c:446
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "Không thể sửa hoàn toàn ghi nhớ vì bạn không phải ngư�i tổ chức"
+
+#: ../calendar/gui/dialogs/memo-page.c:936
+#, c-format
+#| msgid "Unable to open memos in '%s'."
+msgid "Unable to open memos in '%s': %s"
+msgstr "Không thể mở ghi nhớ trong '%s': %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
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
+msgid "To"
+msgstr "Cho"
+
+#: ../calendar/gui/dialogs/memo-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:5
+msgid "Sta_rt date:"
+msgstr "Ngày _bắt đầu:"
+
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "Tó_m tắt:"
+
+#: ../calendar/gui/dialogs/memo-page.ui.h:5
+msgid "T_o:"
+msgstr "�ế_n:"
+
+#: ../calendar/gui/dialogs/memo-page.ui.h:7
+#: ../calendar/gui/dialogs/task-page.c:333
+#: ../calendar/gui/dialogs/task-page.ui.h:9
+#| msgid "_Last:"
+msgid "_List:"
+msgstr "_Danh sách:"
+
+#: ../calendar/gui/dialogs/recur-comp.c:55
+#, c-format
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr "Bạn đang sửa đổi sự kiện lặp, bạn muốn sửa đổi cái nào?"
+
+#: ../calendar/gui/dialogs/recur-comp.c:57
+#, c-format
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr "Bạn đang ủy nhiệm sự kiện lặp, bạn muốn ủy nhiệm cái nào?"
+
+#: ../calendar/gui/dialogs/recur-comp.c:61
+#, c-format
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr "Bạn đang sửa đổi tác vụ lặp, bạn muốn sửa đổi cái nào?"
+
+#: ../calendar/gui/dialogs/recur-comp.c:65
+#, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "Bạn đang sửa đổi bản ghi nhớ lặp: bạn muốn sửa đổi cái nào?"
+
+#: ../calendar/gui/dialogs/recur-comp.c:91
+msgid "This Instance Only"
+msgstr "Chỉ lần này"
+
+#: ../calendar/gui/dialogs/recur-comp.c:95
+msgid "This and Prior Instances"
+msgstr "Lần này và những lần trước"
+
+#: ../calendar/gui/dialogs/recur-comp.c:101
+msgid "This and Future Instances"
+msgstr "Lần này và những lần sau này"
+
+#: ../calendar/gui/dialogs/recur-comp.c:106
+msgid "All Instances"
+msgstr "M�i lần"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:575
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Cuộc hẹn chứa nhi�u lần lặp lại mà Evolution không thể hiệu chỉnh."
+
+#: ../calendar/gui/dialogs/recurrence-page.c:964
+msgid "Recurrence date is invalid"
+msgstr "Ngày lặp không hợp lệ"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1004
+msgid "End time of the recurrence was before event's start"
+msgstr "Gi� cuối của sự kiện lặp lại nằm trước gi� đầu"
+
+#. 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
+msgid "on"
+msgstr "vào"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
+msgid "first"
+msgstr "thứ nhắt"
+
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1103
+msgid "second"
+msgstr "giây"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
+msgid "third"
+msgstr "thứ ba"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+msgid "fourth"
+msgstr "thứ tư"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (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
+msgid "fifth"
+msgstr "thứ năm"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
+msgid "last"
+msgstr "cuối cùng"
+
+#. 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
+msgid "Other Date"
+msgstr "Ngày khác"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1153
+msgid "1st to 10th"
+msgstr "ngày mồng 1 đến 10"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1159
+msgid "11th to 20th"
+msgstr "ngày 11 đến 20"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
+msgid "21st to 31st"
+msgstr "ngày 21 đến 31"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
+msgid "Monday"
+msgstr "Thứ Hai"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "Tuesday"
+msgstr "Thứ Ba"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
+msgid "Wednesday"
+msgstr "Thứ Tư"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+msgid "Thursday"
+msgstr "Thứ Năm"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+msgid "Friday"
+msgstr "Thứ Sáu"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1196
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
+msgid "Saturday"
+msgstr "Thứ Bảy"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1197
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
+msgid "Sunday"
+msgstr "Chủ Nhật"
+
+#. 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
+msgid "on the"
+msgstr "vào"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1496
+msgid "occurrences"
+msgstr "lần"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2214
+msgid "Add exception"
+msgstr "Thêm ngoại lệ"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2255
+msgid "Could not get a selection to modify."
+msgstr "Không thể lấy vùng ch�n cần sửa đổi."
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2261
+msgid "Modify exception"
+msgstr "Sửa đổi ngoại lệ"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2305
+msgid "Could not get a selection to delete."
+msgstr "Không thể lấy vùng ch�n cần xoá."
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2439
+msgid "Date/Time"
+msgstr "Ngày/Gi�"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
+msgid "Every"
+msgstr "Má»—i"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
+msgid "Exceptions"
+msgstr "Ngoại lệ"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
+msgid "Preview"
+msgstr "Xem trÆ°á»›c"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
+msgid "This appointment rec_urs"
+msgstr "C_uộc hẹn này lặp lại"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "ngày"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgctxt "recurrpage"
+msgid "for"
+msgstr "trong"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+msgctxt "recurrpage"
+msgid "forever"
+msgstr "mãi mãi"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
+msgctxt "recurrpage"
+msgid "month(s)"
+msgstr "tháng"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+msgctxt "recurrpage"
+msgid "until"
+msgstr "tá»›i khi"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
+msgctxt "recurrpage"
+msgid "week(s)"
+msgstr "tuần"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+msgctxt "recurrpage"
+msgid "year(s)"
+msgstr "năm"
+
+#: ../calendar/gui/dialogs/send-comp.c:198
+#| msgid "Send my alarms with this event"
+msgid "Send my reminders with this event"
+msgstr "Gửi nhắc nhở với sự kiện này"
+
+#: ../calendar/gui/dialogs/send-comp.c:200
+msgid "Notify new attendees _only"
+msgstr "Chỉ thông báo cho ngư�i tham dự _mới"
+
+#: ../calendar/gui/dialogs/task-details-page.c:351
+#: ../calendar/gui/dialogs/task-details-page.c:373
+msgid "Completed date is wrong"
+msgstr "Ngày hoàn tất sai"
+
+#: ../calendar/gui/dialogs/task-details-page.c:488
+msgid "Web Page"
+msgstr "Trang Web"
+
+#. 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: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
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
+#, c-format
+msgid "Canceled"
+msgstr "Bị thôi"
+
+#. 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: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:217 ../calendar/gui/e-task-table.c:232
+#: ../calendar/gui/e-task-table.c:605 ../calendar/gui/print.c:3397
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:387
+msgid "Completed"
+msgstr "Hoàn tất"
+
+#. 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:526 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1274 ../widgets/misc/e-send-options.ui.h:13
+msgid "High"
+msgstr "Cao"
+
+#. 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: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:3394
+msgid "In Progress"
+msgstr "�ang tiến hành"
+
+#. 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:528 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1272 ../widgets/misc/e-send-options.ui.h:14
+msgid "Low"
+msgstr "Thấp"
+
+#. 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/tasktypes.xml.h:17 ../mail/message-list.c:1273
+#: ../widgets/misc/e-send-options.ui.h:16
+msgid "Normal"
+msgstr "Chuẩn"
+
+#. 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: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
+msgid "Not Started"
+msgstr "Chưa bắt đầu"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
+msgid "P_ercent complete:"
+msgstr "_Phần trăm hoàn tất:"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
+msgid "Stat_us:"
+msgstr "T_rạng thái:"
+
+#. 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-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
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Trạng thái"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:20
+#: ../calendar/gui/e-task-table.c:529 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:27
+msgid "Undefined"
+msgstr "Chưa định nghĩa"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:21
+msgid "_Date completed:"
+msgstr "_Ngày hoàn tất:"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:35
+msgid "_Priority:"
+msgstr "�ộ ư_u tiên:"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:23
+msgid "_Web Page:"
+msgstr "Trang _Web:"
+
+#: ../calendar/gui/dialogs/task-editor.c:116
+msgid "_Status Details"
+msgstr "Chi tiết t_rạng thái"
+
+#: ../calendar/gui/dialogs/task-editor.c:118
+msgid "Click to change or view the status details of the task"
+msgstr "Nhấn để thay đổi hay xem chi tiết trạng thái v� tác vụ"
+
+#: ../calendar/gui/dialogs/task-editor.c:126
+msgid "_Send Options"
+msgstr "Tùy ch�n _Gửi"
+
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3312
+#: ../widgets/misc/e-send-options.c:535
+msgid "Task"
+msgstr "Tác vụ"
+
+#: ../calendar/gui/dialogs/task-editor.c:324
+msgid "Task Details"
+msgstr "Chi tiết tác vụ"
+
+#: ../calendar/gui/dialogs/task-editor.c:366
+msgid "Print this task"
+msgstr "In tác vụ này"
+
+#: ../calendar/gui/dialogs/task-page.c:251
+msgid "Task's start date is in the past"
+msgstr "Ngày bắt đầu tác vụ trong quá khứ"
+
+#: ../calendar/gui/dialogs/task-page.c:252
+msgid "Task's due date is in the past"
+msgstr "Ngày đến hạn tác vụ trong quá khứ"
+
+#: ../calendar/gui/dialogs/task-page.c:286
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "Không thể sửa tác vụ vì danh sách tác vụ được ch�n là chỉ đ�c"
+
+#: ../calendar/gui/dialogs/task-page.c:290
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "Không thể sửa tác vụ này vì bạn không phải ngư�i tổ chức."
+
+#: ../calendar/gui/dialogs/task-page.c:341
+#: ../calendar/gui/dialogs/task-page.ui.h:4
+msgid "Organi_zer:"
+msgstr "_Tổ chức:"
+
+#: ../calendar/gui/dialogs/task-page.c:801
+msgid "Due date is wrong"
+msgstr "Ngày đến hạn sai"
+
+#: ../calendar/gui/dialogs/task-page.c:1757
+#, c-format
+#| msgid "Unable to open tasks in '%s'."
+msgid "Unable to open tasks in '%s': %s"
+msgstr "Không thể mở tác vụ trong '%s': %s"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:2
+msgid "Categor_ies..."
+msgstr "Loạ_i.."
+
+#: ../calendar/gui/dialogs/task-page.ui.h:3
+msgid "D_ue date:"
+msgstr "N_gày đến hạn:"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:7
+msgid "Time zone:"
+msgstr "Múi gi�:"
+
+#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d ngày"
+
+#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:399
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d tuần"
+
+#: ../calendar/gui/e-alarm-list.c:461
+msgid "Unknown action to be performed"
+msgstr "Không biết hành động cần thực hiện."
+
+#. 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:475
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s trước khi bắt đầu cuộc hẹn"
+
+#. 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:480
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s sau khi bắt đầu cuộc hẹn"
+
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s lúc bắt đầu cuộc hẹn"
+
+#. 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:498
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s trước khi kết thúc cuộc hẹn"
+
+#. 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:503
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s sau khi kết thúc cuộc hẹn"
+
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:510
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s lúc kết thúc cuộc hẹn"
+
+#. 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:534
+#, c-format
+msgid "%s at %s"
+msgstr "%s lúc %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:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s cho kiểu gây ra lạ"
+
+#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:671
+msgid "Untitled"
+msgstr "Không tên"
+
+#: ../calendar/gui/e-cal-component-preview.c:200
+msgid "Categories:"
+msgstr "Loại:"
+
+#: ../calendar/gui/e-cal-component-preview.c:239
+msgid "Summary:"
+msgstr "Tóm tắt:"
+
+#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:263
+msgid "Start Date:"
+msgstr "Ngày bắt đầu:"
+
+#: ../calendar/gui/e-cal-component-preview.c:277
+msgid "Due Date:"
+msgstr "Ngày đến hạn:"
+
+#. Status
+#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../plugins/itip-formatter/itip-view.c:1083
+msgid "Status:"
+msgstr "Trạng thái:"
+
+#: ../calendar/gui/e-cal-component-preview.c:317
+msgid "Priority:"
+msgstr "�ộ ưu tiên:"
+
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
+msgid "Description:"
+msgstr "Mô tả:"
+
+#: ../calendar/gui/e-cal-component-preview.c:373
+msgid "Web Page:"
+msgstr "Trang Web:"
+
+#: ../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:388
+msgid "Created"
+msgstr "�ã tạo"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
+msgid "End Date"
+msgstr "Ngày kết thúc"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:4
+msgid "Last modified"
+msgstr "Sửa lần cuối"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:5
+msgid "Start Date"
+msgstr "Ngày bắt đầu"
+
+#: ../calendar/gui/e-cal-model-calendar.c:188
+#: ../calendar/gui/e-task-table.c:580
+msgid "Free"
+msgstr "Rảnh"
+
+#: ../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 "Bận"
+
+#: ../calendar/gui/e-cal-model-tasks.c:665
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Vị trí địa lý phải được nhập theo định dạng:\n"
+"\n"
+"10.783114,106.699804 (Sài Gòn)"
+
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:717
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "Không"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
+#: ../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 "Có"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:190
+msgid "No"
+msgstr "Không"
+
+#: ../calendar/gui/e-cal-model.c:776 ../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
+#: ../plugins/itip-formatter/itip-formatter.c:469
+#: ../plugins/itip-formatter/itip-formatter.c:2697
+msgid "Unknown"
+msgstr "Không biết"
+
+#: ../calendar/gui/e-cal-model.c:1580
+msgid "Recurring"
+msgstr "Lặp lại"
+
+#: ../calendar/gui/e-cal-model.c:1582
+msgid "Assigned"
+msgstr "�ã gán"
+
+#: ../calendar/gui/e-cal-model.c:2937
+#, c-format
+msgid "Opening %s"
+msgstr "�ang mở %s..."
+
+#: ../calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% hoàn tất"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "Nhấn để thêm tác vụ"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:5
+msgid "Complete"
+msgstr "Hoàn tất"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:6
+msgid "Completion date"
+msgstr "Ngày hoàn tất"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due date"
+msgstr "Ngày đến hạn"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:20
+#: ../plugins/save-calendar/csv-format.c:394
+msgid "Priority"
+msgstr "�ộ ưu tiên"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+msgid "Start date"
+msgstr "Ngày bắt đầu"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../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 "Kiểu"
+
+#: ../calendar/gui/e-calendar-view.c:420
+msgid "Cut selected events to the clipboard"
+msgstr "Cắt sự kiện đã ch�n vào bảng nháp"
+
+#: ../calendar/gui/e-calendar-view.c:426
+msgid "Copy selected events to the clipboard"
+msgstr "Chép sự kiện đã ch�n sang bảng nháp"
+
+#: ../calendar/gui/e-calendar-view.c:432
+msgid "Paste events from the clipboard"
+msgstr "Dán sự kiện từ bảng nháp"
+
+#: ../calendar/gui/e-calendar-view.c:438
+msgid "Delete selected events"
+msgstr "Xoá các sự kiện đã ch�n"
+
+#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-task-table.c:269
+msgid "Deleting selected objects"
+msgstr "�ang xoá các đối tượng đã ch�n..."
+
+#: ../calendar/gui/e-calendar-view.c:650 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-task-table.c:1104
+msgid "Updating objects"
+msgstr "�ang cập nhật các đối tượng..."
+
+#: ../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 "�ã chấp nhận"
+
+#: ../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 "Bị từ chối"
+
+#: ../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 "Tạm chấp nhận"
+
+#: ../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 "Ủy nhiệm"
+
+#: ../calendar/gui/e-calendar-view.c:1805
+msgid "Needs action"
+msgstr "Cần hành vi"
+
+#. 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
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Tổ chức: %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
+#, c-format
+msgid "Organizer: %s"
+msgstr "Tổ chức: %s"
+
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:1969 ../calendar/gui/print.c:3346
+#, c-format
+msgid "Location: %s"
+msgstr "�ịa điểm: %s"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:2000
+#, c-format
+msgid "Time: %s %s"
+msgstr "Gi�: %s %s"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: ../calendar/gui/e-cell-date-edit-text.c:156
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: ../calendar/gui/e-cell-date-edit-text.c:159
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: ../calendar/gui/e-cell-date-edit-text.c:167
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"%s"
+msgstr ""
+"Ngày phải được nhập theo định dạng: \n"
+"%s"
+
+#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
+#. * to change the length of the time division in the calendar day view, e.g.
+#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
+#.
+#: ../calendar/gui/e-day-view-time-item.c:809
+#, c-format
+msgid "%02i minute divisions"
+msgstr "lệch %02i phút"
+
+#: ../calendar/gui/e-day-view-time-item.c:830
+msgid "Show the second time zone"
+msgstr "Hiện múi gi� thứ hai"
+
+#. Translators: "None" indicates no second time zone set for a day view
+#: ../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:231
+msgctxt "cal-second-zone"
+msgid "None"
+msgstr "Không"
+
+#: ../calendar/gui/e-day-view-time-item.c:879
+#: ../calendar/gui/e-timezone-entry.c:319
+#: ../modules/calendar/e-calendar-preferences.c:258
+msgid "Select..."
+msgstr "Ch�n..."
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. * %B = full month name. Don't use any other specifiers.
+#. strftime format %A = full weekday name, %d = day of
+#. * month, %B = full month name. You can change the
+#. * order but don't change the specifiers or add
+#. * anything.
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1819
+#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1968
+msgid "%A %d %B"
+msgstr "%A %d %B"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1836
+#: ../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
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1852
+#: ../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
+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
+msgid "am"
+msgstr "sáng"
+
+#. 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
+msgid "pm"
+msgstr "chi�u/tối"
+
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2636
+#, c-format
+msgid "Week %d"
+msgstr "Tuần %d"
+
+#: ../calendar/gui/e-meeting-list-view.c:64
+msgid "Chair Persons"
+msgstr "Ngư�i chủ trì"
+
+#: ../calendar/gui/e-meeting-list-view.c:65
+msgid "Required Participants"
+msgstr "Ngư�i dự yêu cầu"
+
+#: ../calendar/gui/e-meeting-list-view.c:66
+msgid "Optional Participants"
+msgstr "Ngư�i dự tùy ch�n"
+
+#: ../calendar/gui/e-meeting-list-view.c:67
+msgid "Resources"
+msgstr "Tài nguyên"
+
+#: ../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
+msgid "Individual"
+msgstr "Riêng lẻ"
+
+#: ../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
+msgid "Group"
+msgstr "Nhóm"
+
+#: ../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
+msgid "Resource"
+msgstr "Tài nguyên"
+
+#: ../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
+msgid "Room"
+msgstr "Phòng"
+
+#: ../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
+msgid "Chair"
+msgstr "Chủ trì"
+
+#: ../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
+msgid "Required Participant"
+msgstr "Ngư�i dự cần thiết"
+
+#: ../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
+msgid "Optional Participant"
+msgstr "Ngư�i dự tùy ch�n"
+
+#: ../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
+msgid "Non-Participant"
+msgstr "Ngư�i không tham dự"
+
+#: ../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:1060
+msgid "Needs Action"
+msgstr "Cần hành động"
+
+#. The extra space is just a hack to occupy more space for Attendee
+#: ../calendar/gui/e-meeting-list-view.c:578
+msgid "Attendee                          "
+msgstr "Ngư�i dự                          "
+
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:623
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "Vui lòng hồi âm"
+
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
+msgid "In Process"
+msgstr "Trong tiến trình"
+
+#: ../calendar/gui/e-meeting-store.c:1876
+#, c-format
+msgid "Enter password to access free/busy information on server %s as user %s"
+msgstr ""
+"Nhập mật khẩu để truy cập thông tin bận/rảnh trên máy chủ %s với tư cách "
+"ngư�i dùng %s"
+
+#: ../calendar/gui/e-meeting-store.c:1886
+#, c-format
+msgid "Failure reason: %s"
+msgstr "Nguyên nhân thất bại: %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
+msgid "Enter password"
+msgstr "Gõ mật khẩu"
+
+#. 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:445
+#: ../calendar/gui/e-meeting-time-sel.c:2379
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. * name, %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. * %m = month number, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:449
+#: ../calendar/gui/e-meeting-time-sel.c:2410
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. * %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:453
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: ../calendar/gui/e-meeting-time-sel.c:548
+msgid "Out of Office"
+msgstr "Ở ngoại văn phòng"
+
+#: ../calendar/gui/e-meeting-time-sel.c:549
+msgid "No Information"
+msgstr "Không có thông tin"
+
+#: ../calendar/gui/e-meeting-time-sel.c:585
+msgid "O_ptions"
+msgstr "Tù_y ch�n"
+
+#: ../calendar/gui/e-meeting-time-sel.c:603
+msgid "Show _only working hours"
+msgstr "Hiện chỉ gi� làm _việc"
+
+#: ../calendar/gui/e-meeting-time-sel.c:614
+msgid "Show _zoomed out"
+msgstr "Hiện Thu _nh�"
+
+#: ../calendar/gui/e-meeting-time-sel.c:630
+msgid "_Update free/busy"
+msgstr "Cậ_p nhật Rảnh/Bận"
+
+#: ../calendar/gui/e-meeting-time-sel.c:645
+msgid "_<<"
+msgstr "_<<"
+
+#: ../calendar/gui/e-meeting-time-sel.c:663
+msgid "_Autopick"
+msgstr "_Tự động ch�n"
+
+#: ../calendar/gui/e-meeting-time-sel.c:678
+msgid ">_>"
+msgstr ">_>"
+
+#: ../calendar/gui/e-meeting-time-sel.c:696
+msgid "_All people and resources"
+msgstr "_M�i ngư�i và tài nguyên đ�u"
+
+#: ../calendar/gui/e-meeting-time-sel.c:706
+msgid "All _people and one resource"
+msgstr "M�i _ngư�i và một tài nguyên"
+
+#: ../calendar/gui/e-meeting-time-sel.c:716
+msgid "_Required people"
+msgstr "Ngư�i _cần thiết"
+
+#: ../calendar/gui/e-meeting-time-sel.c:725
+msgid "Required people and _one resource"
+msgstr "Ngư�i cần thiết _và một tài nguyên"
+
+#: ../calendar/gui/e-meeting-time-sel.c:774
+msgid "_Start time:"
+msgstr "Th�i điểm đầ_u:"
+
+#: ../calendar/gui/e-meeting-time-sel.c:814
+msgid "_End time:"
+msgstr "Th�i điểm _cuối:"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Nhấn vào đây để thêm ngư�i dự"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Tên chung"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "�ược ủy nhiệm từ"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "�ã ủy nhiệm cho"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Ngôn ngữ"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Thành viên"
+
+#: ../calendar/gui/e-memo-table.c:420
+#: ../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:458
+msgid "Memos"
+msgstr "Ghi nhá»›"
+
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:733
+msgid "* No Summary *"
+msgstr "* Không có bản tóm tắt *"
+
+#. 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
+msgid "Start: "
+msgstr "Bắt đầu: "
+
+#. 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
+msgid "Due: "
+msgstr "�ến hạn: "
+
+#: ../calendar/gui/e-memo-table.c:726
+msgid "Cut selected memos to the clipboard"
+msgstr "Cắt các ghi nhớ đã ch�n vào bảng nháp"
+
+#: ../calendar/gui/e-memo-table.c:732
+msgid "Copy selected memos to the clipboard"
+msgstr "Chép các ghi nhớ đã ch�n vào bảng nháp"
+
+#: ../calendar/gui/e-memo-table.c:738
+msgid "Paste memos from the clipboard"
+msgstr "Dán ghi nhớ từ bảng nháp"
+
+#: ../calendar/gui/e-memo-table.c:744
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
+msgid "Delete selected memos"
+msgstr "Xoá các ghi nhớ đã ch�n"
+
+#: ../calendar/gui/e-memo-table.c:750
+msgid "Select all visible memos"
+msgstr "Ch�n m�i ghi nhớ đang hiện"
+
+#: ../calendar/gui/e-memo-table.etspec.h:2
+msgid "Click to add a memo"
+msgstr "Nhấn để thêm ghi nhớ"
+
+#. 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%
+#.
+#: ../calendar/gui/e-task-table.c:555
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: ../calendar/gui/e-task-table.c:652 ../calendar/gui/print.c:2273
+#: ../calendar/importers/icalendar-importer.c:85
+#: ../calendar/importers/icalendar-importer.c:1043
+#: ../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
+#: ../modules/calendar/e-task-shell-view-actions.c:269
+#: ../modules/calendar/e-task-shell-view.c:448
+#: ../plugins/caldav/caldav-browse-server.c:456
+msgid "Tasks"
+msgstr "Tác vụ"
+
+#: ../calendar/gui/e-task-table.c:968
+msgid "Cut selected tasks to the clipboard"
+msgstr "Cắt tác vụ đã ch�n vào bảng nháp"
+
+#: ../calendar/gui/e-task-table.c:974
+msgid "Copy selected tasks to the clipboard"
+msgstr "Chép tác vụ đã ch�n sang bảng nháp"
+
+#: ../calendar/gui/e-task-table.c:980
+msgid "Paste tasks from the clipboard"
+msgstr "Dán các tác vụ từ bảng nháp"
+
+#: ../calendar/gui/e-task-table.c:986
+#: ../modules/calendar/e-task-shell-view-actions.c:710
+msgid "Delete selected tasks"
+msgstr "Xoá các tác vụ đã ch�n"
+
+#: ../calendar/gui/e-task-table.c:992
+msgid "Select all visible tasks"
+msgstr "Ch�n m�i tác vụ đang hiện"
+
+#: ../calendar/gui/e-timezone-entry.c:330
+msgid "Select Timezone"
+msgstr "Ch�n múi gi�"
+
+#. strftime format %d = day of month, %B = full
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1949
+msgid "%d %B"
+msgstr "%d %B"
+
+#: ../calendar/gui/ea-cal-view-event.c:290
+#| msgid "It has recurrences."
+msgid "It has reminders."
+msgstr "Có nhắc nhở."
+
+#: ../calendar/gui/ea-cal-view-event.c:293
+msgid "It has recurrences."
+msgstr "Lặp lại."
+
+#: ../calendar/gui/ea-cal-view-event.c:296
+msgid "It is a meeting."
+msgstr "Là cuộc h�p."
+
+#: ../calendar/gui/ea-cal-view-event.c:303
+#, c-format
+msgid "Calendar Event: Summary is %s."
+msgstr "Sự kiện lịch: tóm tắt là %s."
+
+#: ../calendar/gui/ea-cal-view-event.c:306
+msgid "Calendar Event: It has no summary."
+msgstr "Sự kiện lịch: chưa có tóm tắt."
+
+#: ../calendar/gui/ea-cal-view-event.c:328
+msgid "calendar view event"
+msgstr "sự kiện xem lịch"
+
+#: ../calendar/gui/ea-cal-view-event.c:557
+msgid "Grab Focus"
+msgstr "Bắt tiêu điểm"
+
+#: ../calendar/gui/ea-cal-view.c:315
+msgid "New Appointment"
+msgstr "Cuộc hẹn mới"
+
+#: ../calendar/gui/ea-cal-view.c:316
+msgid "New All Day Event"
+msgstr "Sự kiện nguyên ngày mới"
+
+#: ../calendar/gui/ea-cal-view.c:317
+msgid "New Meeting"
+msgstr "Cuộc h�p mới"
+
+#: ../calendar/gui/ea-cal-view.c:318
+msgid "Go to Today"
+msgstr "�i tới ngày hôm nay"
+
+#: ../calendar/gui/ea-cal-view.c:319
+msgid "Go to Date"
+msgstr "�i tới ngày"
+
+#: ../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 "một bảng cho phép xem và ch�n phạm vi th�i gian hiện có"
+
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
+#, c-format
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "Nó có %d sự kiện."
+
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:154
+msgid "It has no events."
+msgstr "Nó không có sự kiện."
+
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:163
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "Xem tuần làm việc: %s. %s"
+
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:169
+#, c-format
+msgid "Day View: %s. %s"
+msgstr "Xem ngày: %s. %s"
+
+#: ../calendar/gui/ea-day-view.c:203
+msgid "calendar view for a work week"
+msgstr "ô xem lịch cho một tuần làm việc"
+
+#: ../calendar/gui/ea-day-view.c:205
+msgid "calendar view for one or more days"
+msgstr "ô xem lịch cho một hay nhi�u ngày"
+
+#: ../calendar/gui/ea-gnome-calendar.c:50
+#: ../calendar/gui/ea-gnome-calendar.c:58
+#: ../calendar/importers/icalendar-importer.c:1077
+msgid "Gnome Calendar"
+msgstr "Lịch Gnome"
+
+#: ../calendar/gui/ea-gnome-calendar.c:201
+#: ../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: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 %d %b %Y"
+
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../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: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 "%d %b %Y"
+
+#: ../calendar/gui/ea-jump-button.c:150
+msgid "Jump button"
+msgstr "Nút nhảy"
+
+#: ../calendar/gui/ea-jump-button.c:159
+msgid "Click here, you can find more events."
+msgstr "Nhấn vào đây để tìm sự kiện thêm nữa"
+
+#: ../calendar/gui/ea-week-view.c:159
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "Xem tháng: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:163
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "Xem tuần: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:197
+msgid "calendar view for a month"
+msgstr "ô xem lịch cho một tháng"
+
+#: ../calendar/gui/ea-week-view.c:199
+msgid "calendar view for one or more weeks"
+msgstr "ô xem lịch cho một hay nhi�u tuần"
+
+#: ../calendar/gui/gnome-cal.c:2250
+msgid "Purging"
+msgstr "�ang tẩy..."
+
+#: ../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 "Phải ch�n một bộ tổ chức."
+
+#: ../calendar/gui/itip-utils.c:558
+msgid "At least one attendee is necessary"
+msgstr "Cần ít nhất một ngư�i dự."
+
+#: ../calendar/gui/itip-utils.c:755 ../calendar/gui/itip-utils.c:916
+msgid "Event information"
+msgstr "Thông tin sự kiện"
+
+#: ../calendar/gui/itip-utils.c:758 ../calendar/gui/itip-utils.c:919
+msgid "Task information"
+msgstr "Thông tin tác vụ"
+
+#: ../calendar/gui/itip-utils.c:761 ../calendar/gui/itip-utils.c:922
+msgid "Memo information"
+msgstr "Thông tin ghi nhớ"
+
+#: ../calendar/gui/itip-utils.c:764 ../calendar/gui/itip-utils.c:940
+msgid "Free/Busy information"
+msgstr "Thông tin rảnh/bận"
+
+#: ../calendar/gui/itip-utils.c:767
+msgid "Calendar information"
+msgstr "Thông tin lịch"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:804
+msgctxt "Meeting"
+msgid "Accepted"
+msgstr "�ã chấp nhận"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Tentatively Accepted: Meeting Name".
+#: ../calendar/gui/itip-utils.c:811
+msgctxt "Meeting"
+msgid "Tentatively Accepted"
+msgstr "Tạm chấp nhận"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Declined: Meeting Name".
+#. Translators: This is part of the subject line of a
+#. * meeting request or update email.  The full subject
+#. * line would be: "Declined: Meeting Name".
+#: ../calendar/gui/itip-utils.c:818 ../calendar/gui/itip-utils.c:866
+msgctxt "Meeting"
+msgid "Declined"
+msgstr "Bị từ chối"
+
+#. Translators: This is part of the subject
+#. * line of a meeting request or update email.
+#. * The full subject line would be:
+#. * "Delegated: Meeting Name".
+#: ../calendar/gui/itip-utils.c:825
+msgctxt "Meeting"
+msgid "Delegated"
+msgstr "Ủy nhiệm"
+
+#. 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:838
+msgctxt "Meeting"
+msgid "Updated"
+msgstr "�ã cập nhật"
+
+#. 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:845
+msgctxt "Meeting"
+msgid "Cancel"
+msgstr "Thôi"
+
+#. 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:852
+msgctxt "Meeting"
+msgid "Refresh"
+msgstr "Cập nhật"
+
+#. 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:859
+msgctxt "Meeting"
+msgid "Counter-proposal"
+msgstr "Phản đ� nghị"
+
+#: ../calendar/gui/itip-utils.c:937
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Thông tin Rảnh/Bận (%s đến %s)"
+
+#: ../calendar/gui/itip-utils.c:945
+msgid "iCalendar information"
+msgstr "Thông tin iCalendar"
+
+#: ../calendar/gui/itip-utils.c:970
+msgid "Unable to book a resource, the new event collides with some other."
+msgstr ""
+"Không thể đặt trước tài nguyên, sự kiện mới có thể xung đột với các sự kiện "
+"khác."
+
+#: ../calendar/gui/itip-utils.c:974
+msgid "Unable to book a resource, error: "
+msgstr "Không thể đặt trước tài nguyên, lỗi: "
+
+#: ../calendar/gui/itip-utils.c:1137
+msgid "You must be an attendee of the event."
+msgstr "Bạn phải là ngư�i dự sự kiện ấy."
+
+#: ../calendar/gui/print.c:581
+msgid "1st"
+msgstr "mồng 1"
+
+#: ../calendar/gui/print.c:581
+msgid "2nd"
+msgstr "mồng 2"
+
+#: ../calendar/gui/print.c:581
+msgid "3rd"
+msgstr "mồng 3"
+
+#: ../calendar/gui/print.c:581
+msgid "4th"
+msgstr "mồng 4"
+
+#: ../calendar/gui/print.c:581
+msgid "5th"
+msgstr "mồng 5"
+
+#: ../calendar/gui/print.c:582
+msgid "6th"
+msgstr "mồng 6"
+
+#: ../calendar/gui/print.c:582
+msgid "7th"
+msgstr "mồng 7"
+
+#: ../calendar/gui/print.c:582
+msgid "8th"
+msgstr "mồng 8"
+
+#: ../calendar/gui/print.c:582
+msgid "9th"
+msgstr "mồng 9"
+
+#: ../calendar/gui/print.c:582
+msgid "10th"
+msgstr "mồng 10"
+
+#: ../calendar/gui/print.c:583
+msgid "11th"
+msgstr "11"
+
+#: ../calendar/gui/print.c:583
+msgid "12th"
+msgstr "12"
+
+#: ../calendar/gui/print.c:583
+msgid "13th"
+msgstr "13"
+
+#: ../calendar/gui/print.c:583
+msgid "14th"
+msgstr "14"
+
+#: ../calendar/gui/print.c:583
+msgid "15th"
+msgstr "15"
+
+#: ../calendar/gui/print.c:584
+msgid "16th"
+msgstr "16"
+
+#: ../calendar/gui/print.c:584
+msgid "17th"
+msgstr "17"
+
+#: ../calendar/gui/print.c:584
+msgid "18th"
+msgstr "18"
+
+#: ../calendar/gui/print.c:584
+msgid "19th"
+msgstr "19"
+
+#: ../calendar/gui/print.c:584
+msgid "20th"
+msgstr "20"
+
+#: ../calendar/gui/print.c:585
+msgid "21st"
+msgstr "21"
+
+#: ../calendar/gui/print.c:585
+msgid "22nd"
+msgstr "22"
+
+#: ../calendar/gui/print.c:585
+msgid "23rd"
+msgstr "23"
+
+#: ../calendar/gui/print.c:585
+msgid "24th"
+msgstr "24"
+
+#: ../calendar/gui/print.c:585
+msgid "25th"
+msgstr "25"
+
+#: ../calendar/gui/print.c:586
+msgid "26th"
+msgstr "26"
+
+#: ../calendar/gui/print.c:586
+msgid "27th"
+msgstr "27"
+
+#: ../calendar/gui/print.c:586
+msgid "28th"
+msgstr "28"
+
+#: ../calendar/gui/print.c:586
+msgid "29th"
+msgstr "29"
+
+#: ../calendar/gui/print.c:586
+msgid "30th"
+msgstr "30"
+
+#: ../calendar/gui/print.c:587
+msgid "31st"
+msgstr "31"
+
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:644
+msgid "Su"
+msgstr "CN"
+
+#: ../calendar/gui/print.c:644
+msgid "Mo"
+msgstr "T2"
+
+#: ../calendar/gui/print.c:644
+msgid "Tu"
+msgstr "T3"
+
+#: ../calendar/gui/print.c:644
+msgid "We"
+msgstr "T4"
+
+#: ../calendar/gui/print.c:645
+msgid "Th"
+msgstr "T5"
+
+#: ../calendar/gui/print.c:645
+msgid "Fr"
+msgstr "T6"
+
+#: ../calendar/gui/print.c:645
+msgid "Sa"
+msgstr "T7"
+
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:3139
+msgid " to "
+msgstr " tá»›i "
+
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:3149
+msgid " (Completed "
+msgstr " (Hoàn tất "
+
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:3155
+msgid "Completed "
+msgstr "Hoàn tất "
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:3165
+msgid " (Due "
+msgstr " (�ến hạn "
+
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:3172
+msgid "Due "
+msgstr "�ến hạn "
+
+#: ../calendar/gui/print.c:3337
+#, c-format
+msgid "Summary: %s"
+msgstr "Tóm tắt: %s"
+
+#: ../calendar/gui/print.c:3364
+msgid "Attendees: "
+msgstr "Ngư�i dự:"
+
+#: ../calendar/gui/print.c:3407
+#, c-format
+msgid "Status: %s"
+msgstr "Trạng thái: %s"
+
+#: ../calendar/gui/print.c:3422
+#, c-format
+msgid "Priority: %s"
+msgstr "�ộ ưu tiên: %s"
+
+#: ../calendar/gui/print.c:3440
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Phần trăm hoàn tất: %i"
+
+#: ../calendar/gui/print.c:3451
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: ../calendar/gui/print.c:3464
+#, c-format
+msgid "Categories: %s"
+msgstr "Loại: %s"
+
+#: ../calendar/gui/print.c:3475
+msgid "Contacts: "
+msgstr "Liên lạc: "
+
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% hoàn tất"
+
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Cancelled"
+msgstr "Bị thôi"
+
+#: ../calendar/gui/tasktypes.xml.h:15
+msgid "In progress"
+msgstr "�ang tiến hành"
+
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+msgid "is greater than"
+msgstr "trên"
+
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
+msgid "is less than"
+msgstr "dÆ°á»›i"
+
+#: ../calendar/importers/icalendar-importer.c:84
+msgid "Appointments and Meetings"
+msgstr "Cuộc hẹn và Cuộc h�p"
+
+#: ../calendar/importers/icalendar-importer.c:435
+#: ../calendar/importers/icalendar-importer.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:2170
+msgid "Opening calendar"
+msgstr "�ang mở lịch..."
+
+#: ../calendar/importers/icalendar-importer.c:583
+msgid "iCalendar files (.ics)"
+msgstr "Tập tin iCalendar (.ics)"
+
+#: ../calendar/importers/icalendar-importer.c:584
+msgid "Evolution iCalendar importer"
+msgstr "Bộ nhập lịch iCalendar"
+
+#: ../calendar/importers/icalendar-importer.c:674
+msgid "Reminder!"
+msgstr "••• Nhắc nhở •••"
+
+#: ../calendar/importers/icalendar-importer.c:758
+msgid "vCalendar files (.vcs)"
+msgstr "Tập tin vCalendar (.vcf)"
+
+#: ../calendar/importers/icalendar-importer.c:759
+msgid "Evolution vCalendar importer"
+msgstr "Bộ nhập lịch vCalendar"
+
+#: ../calendar/importers/icalendar-importer.c:1038
+msgid "Calendar Events"
+msgstr "Sự kiện lịch"
+
+#: ../calendar/importers/icalendar-importer.c:1078
+msgid "Evolution Calendar intelligent importer"
+msgstr "Bộ nhập lịch thông minh Evolution"
+
+#: ../calendar/importers/icalendar-importer.c:1146
+#: ../calendar/importers/icalendar-importer.c:1464
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "Cuộc h�p"
+
+#: ../calendar/importers/icalendar-importer.c:1146
+#: ../calendar/importers/icalendar-importer.c:1464
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "Sự kiện"
+
+#: ../calendar/importers/icalendar-importer.c:1149
+#: ../calendar/importers/icalendar-importer.c:1465
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "Tác vụ"
+
+#: ../calendar/importers/icalendar-importer.c:1152
+#: ../calendar/importers/icalendar-importer.c:1466
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "Ghi nhá»›"
+
+#: ../calendar/importers/icalendar-importer.c:1161
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "có lặp lại"
+
+#: ../calendar/importers/icalendar-importer.c:1166
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "là một thể hiện"
+
+#: ../calendar/importers/icalendar-importer.c:1171
+#| msgid "Sh_ow a reminder"
+msgctxt "iCalImp"
+msgid "has reminders"
+msgstr "có nhắc nhở"
+
+#: ../calendar/importers/icalendar-importer.c:1176
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "có đính kèm"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:1189
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "Công cộng"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:1192
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "Riêng tư"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:1195
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "Mật"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:1199
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "Phân loại"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:1204
+#: ../calendar/importers/icalendar-importer.c:1505
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "Tóm tắt"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:1210
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "�ịa chỉ"
+
+#. 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
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "Bắt đầu"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1229
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "�ến hạn"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1241
+msgctxt "iCalImp"
+msgid "End"
+msgstr "Kết thúc"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1251
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "Phân loại"
+
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1275
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "Hoàn tất"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1283
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "URL"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1294
+#: ../calendar/importers/icalendar-importer.c:1297
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "Tổ chức"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1317
+#: ../calendar/importers/icalendar-importer.c:1320
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "Ngư�i dự"
+
+#: ../calendar/importers/icalendar-importer.c:1334
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "Mô tả"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1497
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "Kiểu"
+
+#.
+#. *
+#. * This program is free software; you can redistribute it and/or
+#. * modify it under the terms of the GNU Lesser General Public
+#. * License as published by the Free Software Foundation; either
+#. * version 2 of the License, or (at your option) version 3.
+#. *
+#. * This program is distributed in the hope that it will be useful,
+#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#. * Lesser General Public License for more details.
+#. *
+#. * You should have received a copy of the GNU Lesser General Public
+#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. *
+#. *
+#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+#. *
+#.
+#.
+#. * These are the timezone names from the Olson timezone data.
+#. * We only place them here so gettext picks them up for translation.
+#. * Don't include in any C files.
+#.
+#: ../calendar/zones.h:26
+msgid "Africa/Abidjan"
+msgstr "Châu Phi/Abidjan"
+
+#: ../calendar/zones.h:27
+msgid "Africa/Accra"
+msgstr "Châu Phi/Accra"
+
+#: ../calendar/zones.h:28
+msgid "Africa/Addis_Ababa"
+msgstr "Châu Phi/Addis_Ababa"
+
+#: ../calendar/zones.h:29
+msgid "Africa/Algiers"
+msgstr "Châu Phi/Algiers"
+
+#: ../calendar/zones.h:30
+msgid "Africa/Asmera"
+msgstr "Châu Phi/Asmera"
+
+#: ../calendar/zones.h:31
+msgid "Africa/Bamako"
+msgstr "Châu Phi/Bamako"
+
+#: ../calendar/zones.h:32
+msgid "Africa/Bangui"
+msgstr "Châu Phi/Bangui"
+
+#: ../calendar/zones.h:33
+msgid "Africa/Banjul"
+msgstr "Châu Phi/Banjul"
+
+#: ../calendar/zones.h:34
+msgid "Africa/Bissau"
+msgstr "Châu Phi/Bissau"
+
+#: ../calendar/zones.h:35
+msgid "Africa/Blantyre"
+msgstr "Châu Phi/Blantyre"
+
+#: ../calendar/zones.h:36
+msgid "Africa/Brazzaville"
+msgstr "Châu Phi/Brazzaville"
+
+#: ../calendar/zones.h:37
+msgid "Africa/Bujumbura"
+msgstr "Châu Phi/Bujumbura"
+
+#: ../calendar/zones.h:38
+msgid "Africa/Cairo"
+msgstr "Châu Phi/Cairo"
+
+#: ../calendar/zones.h:39
+msgid "Africa/Casablanca"
+msgstr "Châu Phi/Casablanca"
+
+#: ../calendar/zones.h:40
+msgid "Africa/Ceuta"
+msgstr "Châu Phi/Ceuta"
+
+#: ../calendar/zones.h:41
+msgid "Africa/Conakry"
+msgstr "Châu Phi/Conakry"
+
+#: ../calendar/zones.h:42
+msgid "Africa/Dakar"
+msgstr "Châu Phi/Dakar"
+
+#: ../calendar/zones.h:43
+msgid "Africa/Dar_es_Salaam"
+msgstr "Châu Phi/Dar_es_Salaam"
+
+#: ../calendar/zones.h:44
+msgid "Africa/Djibouti"
+msgstr "Châu Phi/Djibouti"
+
+#: ../calendar/zones.h:45
+msgid "Africa/Douala"
+msgstr "Châu Phi/Douala"
+
+#: ../calendar/zones.h:46
+msgid "Africa/El_Aaiun"
+msgstr "Châu Phi/El_Aaiun"
+
+#: ../calendar/zones.h:47
+msgid "Africa/Freetown"
+msgstr "Châu Phi/Freetown"
+
+#: ../calendar/zones.h:48
+msgid "Africa/Gaborone"
+msgstr "Châu Phi/Gaborone"
+
+#: ../calendar/zones.h:49
+msgid "Africa/Harare"
+msgstr "Châu Phi/Harare"
+
+#: ../calendar/zones.h:50
+msgid "Africa/Johannesburg"
+msgstr "Châu Phi/Johannesburg"
+
+#: ../calendar/zones.h:51
+msgid "Africa/Kampala"
+msgstr "Châu Phi/Kampala"
+
+#: ../calendar/zones.h:52
+msgid "Africa/Khartoum"
+msgstr "Châu Phi/Khartoum"
+
+#: ../calendar/zones.h:53
+msgid "Africa/Kigali"
+msgstr "Châu Phi/Kigali"
+
+#: ../calendar/zones.h:54
+msgid "Africa/Kinshasa"
+msgstr "Châu Phi/Kinshasa"
+
+#: ../calendar/zones.h:55
+msgid "Africa/Lagos"
+msgstr "Châu Phi/Lagos"
+
+#: ../calendar/zones.h:56
+msgid "Africa/Libreville"
+msgstr "Châu Phi/Libreville"
+
+#: ../calendar/zones.h:57
+msgid "Africa/Lome"
+msgstr "Châu Phi/Lome"
+
+#: ../calendar/zones.h:58
+msgid "Africa/Luanda"
+msgstr "Châu Phi/Luanda"
+
+#: ../calendar/zones.h:59
+msgid "Africa/Lubumbashi"
+msgstr "Châu Phi/Lubumbashi"
+
+#: ../calendar/zones.h:60
+msgid "Africa/Lusaka"
+msgstr "Châu Phi/Lusaka"
+
+#: ../calendar/zones.h:61
+msgid "Africa/Malabo"
+msgstr "Châu Phi/Malabo"
+
+#: ../calendar/zones.h:62
+msgid "Africa/Maputo"
+msgstr "Châu Phi/Maputo"
+
+#: ../calendar/zones.h:63
+msgid "Africa/Maseru"
+msgstr "Châu Phi/Maseru"
+
+#: ../calendar/zones.h:64
+msgid "Africa/Mbabane"
+msgstr "Châu Phi/Mbabane"
+
+#: ../calendar/zones.h:65
+msgid "Africa/Mogadishu"
+msgstr "Châu Phi/Mogadishu"
+
+#: ../calendar/zones.h:66
+msgid "Africa/Monrovia"
+msgstr "Châu Phi/Monrovia"
+
+#: ../calendar/zones.h:67
+msgid "Africa/Nairobi"
+msgstr "Châu Phi/Nairobi"
+
+#: ../calendar/zones.h:68
+msgid "Africa/Ndjamena"
+msgstr "Châu Phi/Ndjamena"
+
+#: ../calendar/zones.h:69
+msgid "Africa/Niamey"
+msgstr "Châu Phi/Niamey"
+
+#: ../calendar/zones.h:70
+msgid "Africa/Nouakchott"
+msgstr "Châu Phi/Nouakchott"
+
+#: ../calendar/zones.h:71
+msgid "Africa/Ouagadougou"
+msgstr "Châu Phi/Ouagadougou"
+
+#: ../calendar/zones.h:72
+msgid "Africa/Porto-Novo"
+msgstr "Châu Phi/Porto-Novo"
+
+#: ../calendar/zones.h:73
+msgid "Africa/Sao_Tome"
+msgstr "Châu Phi/Sao_Tome"
+
+#: ../calendar/zones.h:74
+msgid "Africa/Timbuktu"
+msgstr "Châu Phi/Timbuktu"
+
+#: ../calendar/zones.h:75
+msgid "Africa/Tripoli"
+msgstr "Châu Phi/Tripoli"
+
+#: ../calendar/zones.h:76
+msgid "Africa/Tunis"
+msgstr "Châu Phi/Tunis"
+
+#: ../calendar/zones.h:77
+msgid "Africa/Windhoek"
+msgstr "Châu Phi/Windhoek"
+
+#: ../calendar/zones.h:78
+msgid "America/Adak"
+msgstr "Châu Mỹ/Adak"
+
+#: ../calendar/zones.h:79
+msgid "America/Anchorage"
+msgstr "Châu Mỹ/Anchorage"
+
+#: ../calendar/zones.h:80
+msgid "America/Anguilla"
+msgstr "Châu Mỹ/Anguilla"
+
+#: ../calendar/zones.h:81
+msgid "America/Antigua"
+msgstr "Châu Mỹ/Antigua"
+
+#: ../calendar/zones.h:82
+msgid "America/Araguaina"
+msgstr "Châu Mỹ/Araguaina"
+
+#: ../calendar/zones.h:83
+msgid "America/Aruba"
+msgstr "Châu Mỹ/Aruba"
+
+#: ../calendar/zones.h:84
+msgid "America/Asuncion"
+msgstr "Châu Mỹ/Asuncion"
+
+#: ../calendar/zones.h:85
+msgid "America/Barbados"
+msgstr "Châu Mỹ/Barbados"
+
+#: ../calendar/zones.h:86
+msgid "America/Belem"
+msgstr "Châu Mỹ/Belem"
+
+#: ../calendar/zones.h:87
+msgid "America/Belize"
+msgstr "Châu Mỹ/Belize"
+
+#: ../calendar/zones.h:88
+msgid "America/Boa_Vista"
+msgstr "Châu Mỹ/Boa_Vista"
+
+#: ../calendar/zones.h:89
+msgid "America/Bogota"
+msgstr "Châu Mỹ/Bogota"
+
+#: ../calendar/zones.h:90
+msgid "America/Boise"
+msgstr "Châu Mỹ/Boise"
+
+#: ../calendar/zones.h:91
+msgid "America/Buenos_Aires"
+msgstr "Châu Mỹ/Buenos_Aires"
+
+#: ../calendar/zones.h:92
+msgid "America/Cambridge_Bay"
+msgstr "Châu Mỹ/Cambridge_Bay"
+
+#: ../calendar/zones.h:93
+msgid "America/Cancun"
+msgstr "Châu Mỹ/Cancun"
+
+#: ../calendar/zones.h:94
+msgid "America/Caracas"
+msgstr "Châu Mỹ/Caracas"
+
+#: ../calendar/zones.h:95
+msgid "America/Catamarca"
+msgstr "Châu Mỹ/Catamarca"
+
+#: ../calendar/zones.h:96
+msgid "America/Cayenne"
+msgstr "Châu Mỹ/Cayenne"
+
+#: ../calendar/zones.h:97
+msgid "America/Cayman"
+msgstr "Châu Mỹ/Cayman"
+
+#: ../calendar/zones.h:98
+msgid "America/Chicago"
+msgstr "Châu Mỹ/Chicago"
+
+#: ../calendar/zones.h:99
+msgid "America/Chihuahua"
+msgstr "Châu Mỹ/Chihuahua"
+
+#: ../calendar/zones.h:100
+msgid "America/Cordoba"
+msgstr "Châu Mỹ/Cordoba"
+
+#: ../calendar/zones.h:101
+msgid "America/Costa_Rica"
+msgstr "Châu Mỹ/Costa_Rica"
+
+#: ../calendar/zones.h:102
+msgid "America/Cuiaba"
+msgstr "Châu Mỹ/Cuiaba"
+
+#: ../calendar/zones.h:103
+msgid "America/Curacao"
+msgstr "Châu Mỹ/Curacao"
+
+#: ../calendar/zones.h:104
+msgid "America/Danmarkshavn"
+msgstr "Châu Mỹ/Danmarkshavn"
+
+#: ../calendar/zones.h:105
+msgid "America/Dawson"
+msgstr "Châu Mỹ/Dawson"
+
+#: ../calendar/zones.h:106
+msgid "America/Dawson_Creek"
+msgstr "Châu Mỹ/Dawson_Creek"
+
+#: ../calendar/zones.h:107
+msgid "America/Denver"
+msgstr "Châu Mỹ/Denver"
+
+#: ../calendar/zones.h:108
+msgid "America/Detroit"
+msgstr "Châu Mỹ/Detroit"
+
+#: ../calendar/zones.h:109
+msgid "America/Dominica"
+msgstr "Châu Mỹ/Dominica"
+
+#: ../calendar/zones.h:110
+msgid "America/Edmonton"
+msgstr "Châu Mỹ/Edmonton"
+
+#: ../calendar/zones.h:111
+msgid "America/Eirunepe"
+msgstr "Châu Mỹ/Eirunepe"
+
+#: ../calendar/zones.h:112
+msgid "America/El_Salvador"
+msgstr "Châu Mỹ/El_Salvador"
+
+#: ../calendar/zones.h:113
+msgid "America/Fortaleza"
+msgstr "Châu Mỹ/Fortaleza"
+
+#: ../calendar/zones.h:114
+msgid "America/Glace_Bay"
+msgstr "Châu Mỹ/Glace_Bay"
+
+#: ../calendar/zones.h:115
+msgid "America/Godthab"
+msgstr "Châu Mỹ/Godthab"
+
+#: ../calendar/zones.h:116
+msgid "America/Goose_Bay"
+msgstr "Châu Mỹ/Goose_Bay"
+
+#: ../calendar/zones.h:117
+msgid "America/Grand_Turk"
+msgstr "Châu Mỹ/Grand_Turk"
+
+#: ../calendar/zones.h:118
+msgid "America/Grenada"
+msgstr "Châu Mỹ/Grenada"
+
+#: ../calendar/zones.h:119
+msgid "America/Guadeloupe"
+msgstr "Châu Mỹ/Guadeloupe"
+
+#: ../calendar/zones.h:120
+msgid "America/Guatemala"
+msgstr "Châu Mỹ/Guatemala"
+
+#: ../calendar/zones.h:121
+msgid "America/Guayaquil"
+msgstr "Châu Mỹ/Guayaquil"
+
+#: ../calendar/zones.h:122
+msgid "America/Guyana"
+msgstr "Châu Mỹ/Guyana"
+
+#: ../calendar/zones.h:123
+msgid "America/Halifax"
+msgstr "Châu Mỹ/Halifax"
+
+#: ../calendar/zones.h:124
+msgid "America/Havana"
+msgstr "Châu Mỹ/Havana"
+
+#: ../calendar/zones.h:125
+msgid "America/Hermosillo"
+msgstr "Châu Mỹ/Hermosillo"
+
+#: ../calendar/zones.h:126
+msgid "America/Indiana/Indianapolis"
+msgstr "Châu Mỹ/Indiana/Indianapolis"
+
+#: ../calendar/zones.h:127
+msgid "America/Indiana/Knox"
+msgstr "Châu Mỹ/Indiana/Knox"
+
+#: ../calendar/zones.h:128
+msgid "America/Indiana/Marengo"
+msgstr "Châu Mỹ/Indiana/Marengo"
+
+#: ../calendar/zones.h:129
+msgid "America/Indiana/Vevay"
+msgstr "Châu Mỹ/Indiana/Vevay"
+
+#: ../calendar/zones.h:130
+msgid "America/Indianapolis"
+msgstr "Châu Mỹ/Indianapolis"
+
+#: ../calendar/zones.h:131
+msgid "America/Inuvik"
+msgstr "Châu Mỹ/Inuvik"
+
+#: ../calendar/zones.h:132
+msgid "America/Iqaluit"
+msgstr "Châu Mỹ/Iqaluit"
+
+#: ../calendar/zones.h:133
+msgid "America/Jamaica"
+msgstr "Châu Mỹ/Cha-mê-ca"
+
+#: ../calendar/zones.h:134
+msgid "America/Jujuy"
+msgstr "Châu Mỹ/Jujuy"
+
+#: ../calendar/zones.h:135
+msgid "America/Juneau"
+msgstr "Châu Mỹ/Juneau"
+
+#: ../calendar/zones.h:136
+msgid "America/Kentucky/Louisville"
+msgstr "Châu Mỹ/Kentucky/Louisville"
+
+#: ../calendar/zones.h:137
+msgid "America/Kentucky/Monticello"
+msgstr "Châu Mỹ/Kentucky/Monticello"
+
+#: ../calendar/zones.h:138
+msgid "America/La_Paz"
+msgstr "Châu Mỹ/La_Paz"
+
+#: ../calendar/zones.h:139
+msgid "America/Lima"
+msgstr "Châu Mỹ/Li-ma"
+
+#: ../calendar/zones.h:140
+msgid "America/Los_Angeles"
+msgstr "Châu Mỹ/Los_Angeles"
+
+#: ../calendar/zones.h:141
+msgid "America/Louisville"
+msgstr "Châu Mỹ/Louisville"
+
+#: ../calendar/zones.h:142
+msgid "America/Maceio"
+msgstr "Châu Mỹ/Maceio"
+
+#: ../calendar/zones.h:143
+msgid "America/Managua"
+msgstr "Châu Mỹ/Managua"
+
+#: ../calendar/zones.h:144
+msgid "America/Manaus"
+msgstr "Châu Mỹ/Manaus"
+
+#: ../calendar/zones.h:145
+msgid "America/Martinique"
+msgstr "Châu Mỹ/Martinique"
+
+#: ../calendar/zones.h:146
+msgid "America/Mazatlan"
+msgstr "Châu Mỹ/Mazatlan"
+
+#: ../calendar/zones.h:147
+msgid "America/Mendoza"
+msgstr "Châu Mỹ/Mendoza"
+
+#: ../calendar/zones.h:148
+msgid "America/Menominee"
+msgstr "Châu Mỹ/Menominee"
+
+#: ../calendar/zones.h:149
+msgid "America/Merida"
+msgstr "Châu Mỹ/Merida"
+
+#: ../calendar/zones.h:150
+msgid "America/Mexico_City"
+msgstr "Châu Mỹ/TP_Mexico"
+
+#: ../calendar/zones.h:151
+msgid "America/Miquelon"
+msgstr "Châu Mỹ/Miquelon"
+
+#: ../calendar/zones.h:152
+msgid "America/Monterrey"
+msgstr "Châu Mỹ/Monterrey"
+
+#: ../calendar/zones.h:153
+msgid "America/Montevideo"
+msgstr "Châu Mỹ/Montevideo"
+
+#: ../calendar/zones.h:154
+msgid "America/Montreal"
+msgstr "Châu Mỹ/Montréal"
+
+#: ../calendar/zones.h:155
+msgid "America/Montserrat"
+msgstr "Châu Mỹ/Montserrat"
+
+#: ../calendar/zones.h:156
+msgid "America/Nassau"
+msgstr "Châu Mỹ/Nassau"
+
+#: ../calendar/zones.h:157
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
+msgid "America/New_York"
+msgstr "Châu Mỹ/New_York"
+
+#: ../calendar/zones.h:158
+msgid "America/Nipigon"
+msgstr "Châu Mỹ/Nipigon"
+
+#: ../calendar/zones.h:159
+msgid "America/Nome"
+msgstr "Châu Mỹ/Nome"
+
+#: ../calendar/zones.h:160
+msgid "America/Noronha"
+msgstr "Châu Mỹ/Noronha"
+
+#: ../calendar/zones.h:161
+msgid "America/North_Dakota/Center"
+msgstr "Châu Mỹ/North_Dakota/Center"
+
+#: ../calendar/zones.h:162
+msgid "America/Panama"
+msgstr "Châu Mỹ/Panama"
+
+#: ../calendar/zones.h:163
+msgid "America/Pangnirtung"
+msgstr "Châu Mỹ/Pangnirtung"
+
+#: ../calendar/zones.h:164
+msgid "America/Paramaribo"
+msgstr "Châu Mỹ/Paramaribo"
+
+#: ../calendar/zones.h:165
+msgid "America/Phoenix"
+msgstr "Châu Mỹ/Phoenix"
+
+#: ../calendar/zones.h:166
+msgid "America/Port-au-Prince"
+msgstr "Châu Mỹ/Port-au-Prince"
+
+#: ../calendar/zones.h:167
+msgid "America/Port_of_Spain"
+msgstr "Châu Mỹ/Port_of_Spain"
+
+#: ../calendar/zones.h:168
+msgid "America/Porto_Velho"
+msgstr "Châu Mỹ/Porto_Velho"
+
+#: ../calendar/zones.h:169
+msgid "America/Puerto_Rico"
+msgstr "Châu Mỹ/Puerto_Rico"
+
+#: ../calendar/zones.h:170
+msgid "America/Rainy_River"
+msgstr "Châu Mỹ/Rainy_River"
+
+#: ../calendar/zones.h:171
+msgid "America/Rankin_Inlet"
+msgstr "Châu Mỹ/Rankin_Inlet"
+
+#: ../calendar/zones.h:172
+msgid "America/Recife"
+msgstr "Châu Mỹ/Recife"
+
+#: ../calendar/zones.h:173
+msgid "America/Regina"
+msgstr "Châu Mỹ/Regina"
+
+#: ../calendar/zones.h:174
+msgid "America/Rio_Branco"
+msgstr "Châu Mỹ/Rio_Branco"
+
+#: ../calendar/zones.h:175
+msgid "America/Rosario"
+msgstr "Châu Mỹ/Rosario"
+
+#: ../calendar/zones.h:176
+msgid "America/Santiago"
+msgstr "Châu Mỹ/Santiago"
+
+#: ../calendar/zones.h:177
+msgid "America/Santo_Domingo"
+msgstr "Châu Mỹ/Santo_Domingo"
+
+#: ../calendar/zones.h:178
+msgid "America/Sao_Paulo"
+msgstr "Châu Mỹ/Sao_Paulo"
+
+#: ../calendar/zones.h:179
+msgid "America/Scoresbysund"
+msgstr "Châu Mỹ/Scoresbysund"
+
+#: ../calendar/zones.h:180
+msgid "America/Shiprock"
+msgstr "Châu Mỹ/Shiprock"
+
+#: ../calendar/zones.h:181
+msgid "America/St_Johns"
+msgstr "Châu Mỹ/St_Johns"
+
+#: ../calendar/zones.h:182
+msgid "America/St_Kitts"
+msgstr "Châu Mỹ/St_Kitts"
+
+#: ../calendar/zones.h:183
+msgid "America/St_Lucia"
+msgstr "Châu Mỹ/St_Lucia"
+
+#: ../calendar/zones.h:184
+msgid "America/St_Thomas"
+msgstr "Châu Mỹ/St_Thomas"
+
+#: ../calendar/zones.h:185
+msgid "America/St_Vincent"
+msgstr "Châu Mỹ/St_Vincent"
+
+#: ../calendar/zones.h:186
+msgid "America/Swift_Current"
+msgstr "Châu Mỹ/Swift_Current"
+
+#: ../calendar/zones.h:187
+msgid "America/Tegucigalpa"
+msgstr "Châu Mỹ/Tegucigalpa"
+
+#: ../calendar/zones.h:188
+msgid "America/Thule"
+msgstr "Châu Mỹ/Thule"
+
+#: ../calendar/zones.h:189
+msgid "America/Thunder_Bay"
+msgstr "Châu Mỹ/Thunder_Bay"
+
+#: ../calendar/zones.h:190
+msgid "America/Tijuana"
+msgstr "Châu Mỹ/Tijuana"
+
+#: ../calendar/zones.h:191
+msgid "America/Tortola"
+msgstr "Châu Mỹ/Tortola"
+
+#: ../calendar/zones.h:192
+msgid "America/Vancouver"
+msgstr "Châu Mỹ/Vancouver"
+
+#: ../calendar/zones.h:193
+msgid "America/Whitehorse"
+msgstr "Châu Mỹ/Whitehorse"
+
+#: ../calendar/zones.h:194
+msgid "America/Winnipeg"
+msgstr "Châu Mỹ/Winnipeg"
+
+#: ../calendar/zones.h:195
+msgid "America/Yakutat"
+msgstr "Châu Mỹ/Yakutat"
+
+#: ../calendar/zones.h:196
+msgid "America/Yellowknife"
+msgstr "Châu Mỹ/Yellowknife"
+
+#: ../calendar/zones.h:197
+msgid "Antarctica/Casey"
+msgstr "Nam Cá»±c/Casey"
+
+#: ../calendar/zones.h:198
+msgid "Antarctica/Davis"
+msgstr "Nam Cá»±c/Davis"
+
+#: ../calendar/zones.h:199
+msgid "Antarctica/DumontDUrville"
+msgstr "Nam Cá»±c/DumontDUrville"
+
+#: ../calendar/zones.h:200
+msgid "Antarctica/Mawson"
+msgstr "Nam Cá»±c/Mawson"
+
+#: ../calendar/zones.h:201
+msgid "Antarctica/McMurdo"
+msgstr "Nam Cá»±c/McMurdo"
+
+#: ../calendar/zones.h:202
+msgid "Antarctica/Palmer"
+msgstr "Nam Cá»±c/Palmer"
+
+#: ../calendar/zones.h:203
+msgid "Antarctica/South_Pole"
+msgstr "Nam Cá»±c/South_Pole"
+
+#: ../calendar/zones.h:204
+msgid "Antarctica/Syowa"
+msgstr "Nam Cá»±c/Syowa"
+
+#: ../calendar/zones.h:205
+msgid "Antarctica/Vostok"
+msgstr "Nam Cá»±c/Vostok"
+
+#: ../calendar/zones.h:206
+msgid "Arctic/Longyearbyen"
+msgstr "Arctic/Longyearbyen"
+
+#: ../calendar/zones.h:207
+msgid "Asia/Aden"
+msgstr "Châu �/Aden"
+
+#: ../calendar/zones.h:208
+msgid "Asia/Almaty"
+msgstr "Châu �/Almaty"
+
+#: ../calendar/zones.h:209
+msgid "Asia/Amman"
+msgstr "Châu �/Amman"
+
+#: ../calendar/zones.h:210
+msgid "Asia/Anadyr"
+msgstr "Châu �/Anadyr"
+
+#: ../calendar/zones.h:211
+msgid "Asia/Aqtau"
+msgstr "Châu �/Aqtau"
+
+#: ../calendar/zones.h:212
+msgid "Asia/Aqtobe"
+msgstr "Châu �/Aqtobe"
+
+#: ../calendar/zones.h:213
+msgid "Asia/Ashgabat"
+msgstr "Châu �/Ashgabat"
+
+#: ../calendar/zones.h:214
+msgid "Asia/Baghdad"
+msgstr "Châu �/Baghdad"
+
+#: ../calendar/zones.h:215
+msgid "Asia/Bahrain"
+msgstr "Châu �/Bahrain"
+
+#: ../calendar/zones.h:216
+msgid "Asia/Baku"
+msgstr "Châu �/Baku"
+
+#: ../calendar/zones.h:217
+msgid "Asia/Bangkok"
+msgstr "Châu �/Bangkok"
+
+#: ../calendar/zones.h:218
+msgid "Asia/Beirut"
+msgstr "Châu �/Beirut"
+
+#: ../calendar/zones.h:219
+msgid "Asia/Bishkek"
+msgstr "Châu �/Bishkek"
+
+#: ../calendar/zones.h:220
+msgid "Asia/Brunei"
+msgstr "Châu �/Bợ-ru-nei"
+
+#: ../calendar/zones.h:221
+msgid "Asia/Calcutta"
+msgstr "Châu �/Calcutta"
+
+#: ../calendar/zones.h:222
+msgid "Asia/Choibalsan"
+msgstr "Châu �/Choibalsan"
+
+#: ../calendar/zones.h:223
+msgid "Asia/Chongqing"
+msgstr "Châu �/Chongqing"
+
+#: ../calendar/zones.h:224
+msgid "Asia/Colombo"
+msgstr "Châu �/Colombo"
+
+#: ../calendar/zones.h:225
+msgid "Asia/Damascus"
+msgstr "Châu �/Damascus"
+
+#: ../calendar/zones.h:226
+msgid "Asia/Dhaka"
+msgstr "Châu �/Dhaka"
+
+#: ../calendar/zones.h:227
+msgid "Asia/Dili"
+msgstr "Châu �/Dili"
+
+#: ../calendar/zones.h:228
+msgid "Asia/Dubai"
+msgstr "Châu �/Dubai"
+
+#: ../calendar/zones.h:229
+msgid "Asia/Dushanbe"
+msgstr "Châu �/Dushanbe"
+
+#: ../calendar/zones.h:230
+msgid "Asia/Gaza"
+msgstr "Châu �/Gaza"
+
+#: ../calendar/zones.h:231
+msgid "Asia/Harbin"
+msgstr "Châu �/Harbin"
+
+#: ../calendar/zones.h:232
+msgid "Asia/Hong_Kong"
+msgstr "Châu �/Hồng_Kông"
+
+#: ../calendar/zones.h:233
+msgid "Asia/Hovd"
+msgstr "Châu �/Hovd"
+
+#: ../calendar/zones.h:234
+msgid "Asia/Irkutsk"
+msgstr "Châu �/Irkutsk"
+
+#: ../calendar/zones.h:235
+msgid "Asia/Istanbul"
+msgstr "Châu �/Istanbul"
+
+#: ../calendar/zones.h:236
+msgid "Asia/Jakarta"
+msgstr "Châu �/Jakarta"
+
+#: ../calendar/zones.h:237
+msgid "Asia/Jayapura"
+msgstr "Châu �/Jayapura"
+
+#: ../calendar/zones.h:238
+msgid "Asia/Jerusalem"
+msgstr "Châu �/Jerusalem"
+
+#: ../calendar/zones.h:239
+msgid "Asia/Kabul"
+msgstr "Châu �/Kabul"
+
+#: ../calendar/zones.h:240
+msgid "Asia/Kamchatka"
+msgstr "Châu �/Kamchatka"
+
+#: ../calendar/zones.h:241
+msgid "Asia/Karachi"
+msgstr "Châu �/Karachi"
+
+#: ../calendar/zones.h:242
+msgid "Asia/Kashgar"
+msgstr "Châu �/Kashgar"
+
+#: ../calendar/zones.h:243
+msgid "Asia/Katmandu"
+msgstr "Châu �/Katmandu"
+
+#: ../calendar/zones.h:244
+msgid "Asia/Krasnoyarsk"
+msgstr "Châu �/Krasnoyarsk"
+
+#: ../calendar/zones.h:245
+msgid "Asia/Kuala_Lumpur"
+msgstr "Châu �/Kuala_Lumpur"
+
+#: ../calendar/zones.h:246
+msgid "Asia/Kuching"
+msgstr "Châu �/Kuching"
+
+#: ../calendar/zones.h:247
+msgid "Asia/Kuwait"
+msgstr "Châu �/Cu-ouait"
+
+#: ../calendar/zones.h:248
+msgid "Asia/Macao"
+msgstr "Châu �/Macao"
+
+#: ../calendar/zones.h:249
+msgid "Asia/Macau"
+msgstr "Châu �/Ma-cao"
+
+#: ../calendar/zones.h:250
+msgid "Asia/Magadan"
+msgstr "Châu �/Magadan"
+
+#: ../calendar/zones.h:251
+msgid "Asia/Makassar"
+msgstr "Châu �/Makassar"
+
+#: ../calendar/zones.h:252
+msgid "Asia/Manila"
+msgstr "Châu �/Manila"
+
+#: ../calendar/zones.h:253
+msgid "Asia/Muscat"
+msgstr "Châu �/Muscat"
+
+#: ../calendar/zones.h:254
+msgid "Asia/Nicosia"
+msgstr "Châu �/Nicosia"
+
+#: ../calendar/zones.h:255
+msgid "Asia/Novosibirsk"
+msgstr "Châu �/Novosibirsk"
+
+#: ../calendar/zones.h:256
+msgid "Asia/Omsk"
+msgstr "Châu �/Omsk"
+
+#: ../calendar/zones.h:257
+msgid "Asia/Oral"
+msgstr "Châu �/Oral"
+
+#: ../calendar/zones.h:258
+msgid "Asia/Phnom_Penh"
+msgstr "Châu �/Phnom_Penh"
+
+#: ../calendar/zones.h:259
+msgid "Asia/Pontianak"
+msgstr "Châu �/Pontianak"
+
+#: ../calendar/zones.h:260
+msgid "Asia/Pyongyang"
+msgstr "Châu �/Pyongyang"
+
+#: ../calendar/zones.h:261
+msgid "Asia/Qatar"
+msgstr "Châu �/Qatar"
+
+#: ../calendar/zones.h:262
+msgid "Asia/Qyzylorda"
+msgstr "Châu �/Qyzylorda"
+
+#: ../calendar/zones.h:263
+msgid "Asia/Rangoon"
+msgstr "Châu �/Rangoon"
+
+#: ../calendar/zones.h:264
+msgid "Asia/Riyadh"
+msgstr "Châu �/Riyadh"
+
+#: ../calendar/zones.h:265
+msgid "Asia/Saigon"
+msgstr "Châu �/Sài_Gòn"
+
+#: ../calendar/zones.h:266
+msgid "Asia/Sakhalin"
+msgstr "Châu �/Sakhalin"
+
+#: ../calendar/zones.h:267
+msgid "Asia/Samarkand"
+msgstr "Châu �/Samarkand"
+
+#: ../calendar/zones.h:268
+msgid "Asia/Seoul"
+msgstr "Châu �/Seoul"
+
+#: ../calendar/zones.h:269
+msgid "Asia/Shanghai"
+msgstr "Châu �/Shanghai"
+
+#: ../calendar/zones.h:270
+msgid "Asia/Singapore"
+msgstr "Châu �/Xing-a-poa"
+
+#: ../calendar/zones.h:271
+msgid "Asia/Taipei"
+msgstr "Châu �/Tai-pei"
+
+#: ../calendar/zones.h:272
+msgid "Asia/Tashkent"
+msgstr "Châu �/Tashkent"
+
+#: ../calendar/zones.h:273
+msgid "Asia/Tbilisi"
+msgstr "Châu �/Tbilisi"
+
+#: ../calendar/zones.h:274
+msgid "Asia/Tehran"
+msgstr "Châu �/Tehran"
+
+#: ../calendar/zones.h:275
+msgid "Asia/Thimphu"
+msgstr "Châu �/Thimphu"
+
+#: ../calendar/zones.h:276
+msgid "Asia/Tokyo"
+msgstr "Châu �/Tokyo"
+
+#: ../calendar/zones.h:277
+msgid "Asia/Ujung_Pandang"
+msgstr "Châu �/Ujung_Pandang"
+
+#: ../calendar/zones.h:278
+msgid "Asia/Ulaanbaatar"
+msgstr "Châu �/Ulaanbaatar"
+
+#: ../calendar/zones.h:279
+msgid "Asia/Urumqi"
+msgstr "Châu �/Urumqi"
+
+#: ../calendar/zones.h:280
+msgid "Asia/Vientiane"
+msgstr "Châu �/Vientiane"
+
+#: ../calendar/zones.h:281
+msgid "Asia/Vladivostok"
+msgstr "Châu �/Vladivostok"
+
+#: ../calendar/zones.h:282
+msgid "Asia/Yakutsk"
+msgstr "Châu �/Yakutsk"
+
+#: ../calendar/zones.h:283
+msgid "Asia/Yekaterinburg"
+msgstr "Châu �/Yekaterinburg"
+
+#: ../calendar/zones.h:284
+msgid "Asia/Yerevan"
+msgstr "Châu �/Yerevan"
+
+#: ../calendar/zones.h:285
+msgid "Atlantic/Azores"
+msgstr "�ại Tây Dương/Azores"
+
+#: ../calendar/zones.h:286
+msgid "Atlantic/Bermuda"
+msgstr "�ại Tây Dương/Bermuda"
+
+#: ../calendar/zones.h:287
+msgid "Atlantic/Canary"
+msgstr "�ại Tây Dương/Canary"
+
+#: ../calendar/zones.h:288
+msgid "Atlantic/Cape_Verde"
+msgstr "�ại Tây Dương/Cape_Verde"
+
+#: ../calendar/zones.h:289
+msgid "Atlantic/Faeroe"
+msgstr "�ại Tây Dương/Faeroe"
+
+#: ../calendar/zones.h:290
+msgid "Atlantic/Jan_Mayen"
+msgstr "�ại Tây Dương/Jan_Mayen"
+
+#: ../calendar/zones.h:291
+msgid "Atlantic/Madeira"
+msgstr "�ại Tây Dương/Madeira"
+
+#: ../calendar/zones.h:292
+msgid "Atlantic/Reykjavik"
+msgstr "�ại Tây Dương/Reykjavik"
+
+#: ../calendar/zones.h:293
+msgid "Atlantic/South_Georgia"
+msgstr "�ại Tây Dương/South_Georgia"
+
+#: ../calendar/zones.h:294
+msgid "Atlantic/St_Helena"
+msgstr "�ại Tây Dương/St_Helena"
+
+#: ../calendar/zones.h:295
+msgid "Atlantic/Stanley"
+msgstr "�ại Tây Dương/Stanley"
+
+#: ../calendar/zones.h:296
+msgid "Australia/Adelaide"
+msgstr "Châu Úc/Adelaide"
+
+#: ../calendar/zones.h:297
+msgid "Australia/Brisbane"
+msgstr "Châu Úc/Brisbane"
+
+#: ../calendar/zones.h:298
+msgid "Australia/Broken_Hill"
+msgstr "Châu Úc/Broken_Hill"
+
+#: ../calendar/zones.h:299
+msgid "Australia/Darwin"
+msgstr "Châu Úc/Darwin"
+
+#: ../calendar/zones.h:300
+msgid "Australia/Hobart"
+msgstr "Châu Úc/Hobart"
+
+#: ../calendar/zones.h:301
+msgid "Australia/Lindeman"
+msgstr "Châu Úc/Lindeman"
+
+#: ../calendar/zones.h:302
+msgid "Australia/Lord_Howe"
+msgstr "Châu Úc/Lord_Howe"
+
+#: ../calendar/zones.h:303
+msgid "Australia/Melbourne"
+msgstr "Châu Úc/Melbourne"
+
+#: ../calendar/zones.h:304
+msgid "Australia/Perth"
+msgstr "Châu Úc/Perth"
+
+#: ../calendar/zones.h:305
+msgid "Australia/Sydney"
+msgstr "Châu Úc/Sydney"
+
+#: ../calendar/zones.h:306
+msgid "Europe/Amsterdam"
+msgstr "Châu Âu/Amsterdam"
+
+#: ../calendar/zones.h:307
+msgid "Europe/Andorra"
+msgstr "Châu Âu/Andorra"
+
+#: ../calendar/zones.h:308
+msgid "Europe/Athens"
+msgstr "Châu Âu/Athens"
+
+#: ../calendar/zones.h:309
+msgid "Europe/Belfast"
+msgstr "Châu Âu/Belfast"
+
+#: ../calendar/zones.h:310
+msgid "Europe/Belgrade"
+msgstr "Châu Âu/Belgrade"
+
+#: ../calendar/zones.h:311
+msgid "Europe/Berlin"
+msgstr "Châu Âu/Berlin"
+
+#: ../calendar/zones.h:312
+msgid "Europe/Bratislava"
+msgstr "Châu Âu/Bratislava"
+
+#: ../calendar/zones.h:313
+msgid "Europe/Brussels"
+msgstr "Châu Âu/Brussels"
+
+#: ../calendar/zones.h:314
+msgid "Europe/Bucharest"
+msgstr "Châu Âu/Bucharest"
+
+#: ../calendar/zones.h:315
+msgid "Europe/Budapest"
+msgstr "Châu Âu/Budapest"
+
+#: ../calendar/zones.h:316
+msgid "Europe/Chisinau"
+msgstr "Châu Âu/Chisinau"
+
+#: ../calendar/zones.h:317
+msgid "Europe/Copenhagen"
+msgstr "Châu Âu/Copenhagen"
+
+#: ../calendar/zones.h:318
+msgid "Europe/Dublin"
+msgstr "Châu Âu/Dublin"
+
+#: ../calendar/zones.h:319
+msgid "Europe/Gibraltar"
+msgstr "Châu Âu/Gibraltar"
+
+#: ../calendar/zones.h:320
+msgid "Europe/Helsinki"
+msgstr "Châu Âu/Helsinki"
+
+#: ../calendar/zones.h:321
+msgid "Europe/Istanbul"
+msgstr "Châu Âu/Istanbul"
+
+#: ../calendar/zones.h:322
+msgid "Europe/Kaliningrad"
+msgstr "Châu Âu/Kaliningrad"
+
+#: ../calendar/zones.h:323
+msgid "Europe/Kiev"
+msgstr "Châu Âu/Kiev"
+
+#: ../calendar/zones.h:324
+msgid "Europe/Lisbon"
+msgstr "Châu Âu/Lisbon"
+
+#: ../calendar/zones.h:325
+msgid "Europe/Ljubljana"
+msgstr "Châu Âu/Ljubljana"
+
+#: ../calendar/zones.h:326
+msgid "Europe/London"
+msgstr "Châu Âu/London"
+
+#: ../calendar/zones.h:327
+msgid "Europe/Luxembourg"
+msgstr "Châu Âu/Luxembourg"
+
+#: ../calendar/zones.h:328
+msgid "Europe/Madrid"
+msgstr "Châu Âu/Madrid"
+
+#: ../calendar/zones.h:329
+msgid "Europe/Malta"
+msgstr "Châu Âu/Moa-ta"
+
+#: ../calendar/zones.h:330
+msgid "Europe/Minsk"
+msgstr "Châu Âu/Minsk"
+
+#: ../calendar/zones.h:331
+msgid "Europe/Monaco"
+msgstr "Châu Âu/Monaco"
+
+#: ../calendar/zones.h:332
+msgid "Europe/Moscow"
+msgstr "Châu Âu/Moscow"
+
+#: ../calendar/zones.h:333
+msgid "Europe/Nicosia"
+msgstr "Châu Âu/Nicosia"
+
+#: ../calendar/zones.h:334
+msgid "Europe/Oslo"
+msgstr "Châu Âu/Oslo"
+
+#: ../calendar/zones.h:335
+msgid "Europe/Paris"
+msgstr "Châu Âu/Paris"
+
+#: ../calendar/zones.h:336
+msgid "Europe/Prague"
+msgstr "Châu Âu/Prague"
+
+#: ../calendar/zones.h:337
+msgid "Europe/Riga"
+msgstr "Châu Âu/Riga"
+
+#: ../calendar/zones.h:338
+msgid "Europe/Rome"
+msgstr "Châu Âu/Rome"
+
+#: ../calendar/zones.h:339
+msgid "Europe/Samara"
+msgstr "Châu Âu/Samara"
+
+#: ../calendar/zones.h:340
+msgid "Europe/San_Marino"
+msgstr "Châu Âu/San_Marino"
+
+#: ../calendar/zones.h:341
+msgid "Europe/Sarajevo"
+msgstr "Châu Âu/Sarajevo"
+
+#: ../calendar/zones.h:342
+msgid "Europe/Simferopol"
+msgstr "Châu Âu/Simferopol"
+
+#: ../calendar/zones.h:343
+msgid "Europe/Skopje"
+msgstr "Châu Âu/Skopje"
+
+#: ../calendar/zones.h:344
+msgid "Europe/Sofia"
+msgstr "Châu Âu/Sofia"
+
+#: ../calendar/zones.h:345
+msgid "Europe/Stockholm"
+msgstr "Châu Âu/Stockholm"
+
+#: ../calendar/zones.h:346
+msgid "Europe/Tallinn"
+msgstr "Châu Âu/Tallinn"
+
+#: ../calendar/zones.h:347
+msgid "Europe/Tirane"
+msgstr "Châu Âu/Tirane"
+
+#: ../calendar/zones.h:348
+msgid "Europe/Uzhgorod"
+msgstr "Châu Âu/Uzhgorod"
+
+#: ../calendar/zones.h:349
+msgid "Europe/Vaduz"
+msgstr "Châu Âu/Vaduz"
+
+#: ../calendar/zones.h:350
+msgid "Europe/Vatican"
+msgstr "Châu Âu/Vatican"
+
+#: ../calendar/zones.h:351
+msgid "Europe/Vienna"
+msgstr "Châu Âu/Vienna"
+
+#: ../calendar/zones.h:352
+msgid "Europe/Vilnius"
+msgstr "Châu Âu/Vilnius"
+
+#: ../calendar/zones.h:353
+msgid "Europe/Warsaw"
+msgstr "Châu Âu/Warsaw"
+
+#: ../calendar/zones.h:354
+msgid "Europe/Zagreb"
+msgstr "Châu Âu/Zagreb"
+
+#: ../calendar/zones.h:355
+msgid "Europe/Zaporozhye"
+msgstr "Châu Âu/Zaporozhye"
+
+#: ../calendar/zones.h:356
+msgid "Europe/Zurich"
+msgstr "Châu Âu/Zurich"
+
+#: ../calendar/zones.h:357
+msgid "Indian/Antananarivo"
+msgstr "Indian/Antananarivo"
+
+#: ../calendar/zones.h:358
+msgid "Indian/Chagos"
+msgstr "Ấn �ộ Dương/Chagos"
+
+#: ../calendar/zones.h:359
+msgid "Indian/Christmas"
+msgstr "Ấn �ộ Dương/Christmas"
+
+#: ../calendar/zones.h:360
+msgid "Indian/Cocos"
+msgstr "Ấn �ộ Dương/Cocos"
+
+#: ../calendar/zones.h:361
+msgid "Indian/Comoro"
+msgstr "Ấn �ộ Dương/Comoro"
+
+#: ../calendar/zones.h:362
+msgid "Indian/Kerguelen"
+msgstr "Ấn �ộ Dương/Kerguelen"
+
+#: ../calendar/zones.h:363
+msgid "Indian/Mahe"
+msgstr "Ấn �ộ Dương/Mahe"
+
+#: ../calendar/zones.h:364
+msgid "Indian/Maldives"
+msgstr "Ấn �ộ Dương/Maldives"
+
+#: ../calendar/zones.h:365
+msgid "Indian/Mauritius"
+msgstr "Ấn �ộ Dương/Mauritius"
+
+#: ../calendar/zones.h:366
+msgid "Indian/Mayotte"
+msgstr "Ấn �ộ Dương/Mayotte"
+
+#: ../calendar/zones.h:367
+msgid "Indian/Reunion"
+msgstr "Ấn �ộ Dương/Reunion"
+
+#: ../calendar/zones.h:368
+msgid "Pacific/Apia"
+msgstr "Thái Bình Dương/Apia"
+
+#: ../calendar/zones.h:369
+msgid "Pacific/Auckland"
+msgstr "Thái Bình Dương/Auckland"
+
+#: ../calendar/zones.h:370
+msgid "Pacific/Chatham"
+msgstr "Thái Bình Dương/Chatham"
+
+#: ../calendar/zones.h:371
+msgid "Pacific/Easter"
+msgstr "Thái Bình Dương/Easter"
+
+#: ../calendar/zones.h:372
+msgid "Pacific/Efate"
+msgstr "Thái Bình Dương/Efate"
+
+#: ../calendar/zones.h:373
+msgid "Pacific/Enderbury"
+msgstr "Thái Bình Dương/Enderbury"
+
+#: ../calendar/zones.h:374
+msgid "Pacific/Fakaofo"
+msgstr "Thái Bình Dương/Fakaofo"
+
+#: ../calendar/zones.h:375
+msgid "Pacific/Fiji"
+msgstr "Thái Bình Dương/Phi-gi"
+
+#: ../calendar/zones.h:376
+msgid "Pacific/Funafuti"
+msgstr "Thái Bình Dương/Funafuti"
+
+#: ../calendar/zones.h:377
+msgid "Pacific/Galapagos"
+msgstr "Thái Bình Dương/Ga-la-pa-gos"
+
+#: ../calendar/zones.h:378
+msgid "Pacific/Gambier"
+msgstr "Thái Bình Dương/Gambier"
+
+#: ../calendar/zones.h:379
+msgid "Pacific/Guadalcanal"
+msgstr "Thái Bình Dương/Guadalcanal"
+
+#: ../calendar/zones.h:380
+msgid "Pacific/Guam"
+msgstr "Thái Bình Dương/Guam"
+
+#: ../calendar/zones.h:381
+msgid "Pacific/Honolulu"
+msgstr "Thái Bình Dương/Honolulu"
+
+#: ../calendar/zones.h:382
+msgid "Pacific/Johnston"
+msgstr "Thái Bình Dương/Johnston"
+
+#: ../calendar/zones.h:383
+msgid "Pacific/Kiritimati"
+msgstr "Thái Bình Dương/Kiritimati"
+
+#: ../calendar/zones.h:384
+msgid "Pacific/Kosrae"
+msgstr "Thái Bình Dương/Kosrae"
+
+#: ../calendar/zones.h:385
+msgid "Pacific/Kwajalein"
+msgstr "Thái Bình Dương/Kwajalein"
+
+#: ../calendar/zones.h:386
+msgid "Pacific/Majuro"
+msgstr "Thái Bình Dương/Majuro"
+
+#: ../calendar/zones.h:387
+msgid "Pacific/Marquesas"
+msgstr "Thái Bình Dương/Marquesas"
+
+#: ../calendar/zones.h:388
+msgid "Pacific/Midway"
+msgstr "Thái Bình Dương/Midway"
+
+#: ../calendar/zones.h:389
+msgid "Pacific/Nauru"
+msgstr "Thái Bình Dương/Nauru"
+
+#: ../calendar/zones.h:390
+msgid "Pacific/Niue"
+msgstr "Thái Bình Dương/Niue"
+
+#: ../calendar/zones.h:391
+msgid "Pacific/Norfolk"
+msgstr "Thái Bình Dương/Norfolk"
+
+#: ../calendar/zones.h:392
+msgid "Pacific/Noumea"
+msgstr "Thái Bình Dương/Noumea"
+
+#: ../calendar/zones.h:393
+msgid "Pacific/Pago_Pago"
+msgstr "Thái Bình Dương/Pago_Pago"
+
+#: ../calendar/zones.h:394
+msgid "Pacific/Palau"
+msgstr "Thái Bình Dương/Palau"
+
+#: ../calendar/zones.h:395
+msgid "Pacific/Pitcairn"
+msgstr "Thái Bình Dương/Pitcairn"
+
+#: ../calendar/zones.h:396
+msgid "Pacific/Ponape"
+msgstr "Thái Bình Dương/Ponape"
+
+#: ../calendar/zones.h:397
+msgid "Pacific/Port_Moresby"
+msgstr "Thái Bình Dương/Port_Moresby"
+
+#: ../calendar/zones.h:398
+msgid "Pacific/Rarotonga"
+msgstr "Thái Bình Dương/Rarotonga"
+
+#: ../calendar/zones.h:399
+msgid "Pacific/Saipan"
+msgstr "Thái Bình Dương/Sai-pan"
+
+#: ../calendar/zones.h:400
+msgid "Pacific/Tahiti"
+msgstr "Thái Bình Dương/Ta-hi-ti"
+
+#: ../calendar/zones.h:401
+msgid "Pacific/Tarawa"
+msgstr "Thái Bình Dương/Tarawa"
+
+#: ../calendar/zones.h:402
+msgid "Pacific/Tongatapu"
+msgstr "Thái Bình Dương/Tongatapu"
+
+#: ../calendar/zones.h:403
+msgid "Pacific/Truk"
+msgstr "Thái Bình Dương/Truk"
+
+#: ../calendar/zones.h:404
+msgid "Pacific/Wake"
+msgstr "Thái Bình Dương/Wake"
+
+#: ../calendar/zones.h:405
+msgid "Pacific/Wallis"
+msgstr "Thái Bình Dương/Wallis"
+
+#: ../calendar/zones.h:406
+msgid "Pacific/Yap"
+msgstr "Thái Bình Dương/Yap"
+
+#: ../composer/e-composer-actions.c:208
+msgid "Save as..."
+msgstr "Lưu dạng..."
+
+#: ../composer/e-composer-actions.c:296
+#: ../widgets/misc/e-signature-editor.c:207
+msgid "_Close"
+msgstr "�ón_g"
+
+#: ../composer/e-composer-actions.c:298
+msgid "Close the current file"
+msgstr "�óng tập tin hiện th�i"
+
+#: ../composer/e-composer-actions.c:303
+msgid "New _Message"
+msgstr "ThÆ° _má»›i"
+
+#: ../composer/e-composer-actions.c:305
+msgid "Open New Message window"
+msgstr "Mở cửa sổ Thư Mới"
+
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
+msgid "Configure Evolution"
+msgstr "Cấu hình Evolution"
+
+#: ../composer/e-composer-actions.c:319
+msgid "Save the current file"
+msgstr "Lưu tập tin hiện th�i"
+
+#: ../composer/e-composer-actions.c:324
+msgid "Save _As..."
+msgstr "Lư_u dạng..."
+
+#: ../composer/e-composer-actions.c:326
+msgid "Save the current file with a different name"
+msgstr "Lưu tập tin hiện th�i với tên khác"
+
+#: ../composer/e-composer-actions.c:333
+msgid "Character _Encoding"
+msgstr "Bảng mã _Ký tự"
+
+#: ../composer/e-composer-actions.c:350
+msgid "_Print..."
+msgstr "_In..."
+
+#: ../composer/e-composer-actions.c:357
+msgid "Print Pre_view"
+msgstr "_Xem thử bản in"
+
+#: ../composer/e-composer-actions.c:364
+msgid "Save as _Draft"
+msgstr "Lưu _bản nháp"
+
+#: ../composer/e-composer-actions.c:366
+msgid "Save as draft"
+msgstr "Lưu dạng nháp"
+
+#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
+msgid "S_end"
+msgstr "_Gá»­i"
+
+#: ../composer/e-composer-actions.c:373
+msgid "Send this message"
+msgstr "Gửi thư này"
+
+#: ../composer/e-composer-actions.c:381
+msgid "PGP _Encrypt"
+msgstr "_Mật mã PGP"
+
+#: ../composer/e-composer-actions.c:383
+msgid "Encrypt this message with PGP"
+msgstr "Mật mã hoá thư này bằng PGP"
+
+#: ../composer/e-composer-actions.c:389
+msgid "PGP _Sign"
+msgstr "_Ký PGP"
+
+#: ../composer/e-composer-actions.c:391
+msgid "Sign this message with your PGP key"
+msgstr "Ký tên vào thư này bằng khoá PGP của bạn"
+
+#: ../composer/e-composer-actions.c:397
+msgid "_Picture Gallery"
+msgstr "Phòng trưng bày ả_nh"
+
+#: ../composer/e-composer-actions.c:399
+msgid "Show a collection of pictures that you can drag to your message"
+msgstr "Hiện bộ sưu tập ảnh bạn có thể kéo thả vào thư của mình"
+
+#: ../composer/e-composer-actions.c:405
+msgid "_Prioritize Message"
+msgstr "Ư_u tiên hoá thư"
+
+#: ../composer/e-composer-actions.c:407
+msgid "Set the message priority to high"
+msgstr "�ặt ưu tiên thư là cao"
+
+#: ../composer/e-composer-actions.c:413
+msgid "Re_quest Read Receipt"
+msgstr "Yêu cầu thông _báo đã đ�c"
+
+#: ../composer/e-composer-actions.c:415
+msgid "Get delivery notification when your message is read"
+msgstr "Ch�n để nhận thông báo khi ngư�i nhận đã đ�c thư bạn"
+
+#: ../composer/e-composer-actions.c:421
+msgid "S/MIME En_crypt"
+msgstr "Mật mã _S/MIME"
+
+#: ../composer/e-composer-actions.c:423
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "Mật mã hoá thư này bằng Chứng nhận Mật mã hoá S/MIME của bạn"
+
+#: ../composer/e-composer-actions.c:429
+msgid "S/MIME Sig_n"
+msgstr "Ký S/MIM_E"
+
+#: ../composer/e-composer-actions.c:431
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Ký tên vào thư này bằng Chứng nhận Chữ ký S/MIME của bạn"
+
+#: ../composer/e-composer-actions.c:437
+msgid "_Bcc Field"
+msgstr "Trư�ng _BCC"
+
+#: ../composer/e-composer-actions.c:439
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Bật tắt hiển thị trư�ng Bí mật Chép Cho (BCC)"
+
+#: ../composer/e-composer-actions.c:445
+msgid "_Cc Field"
+msgstr "Trư�ng _CC"
+
+#: ../composer/e-composer-actions.c:447
+msgid "Toggles whether the CC field is displayed"
+msgstr "Bật tắt hiển thị trư�ng Chép Cho (CC)"
+
+#: ../composer/e-composer-actions.c:453
+msgid "_Reply-To Field"
+msgstr "Trư�ng _Reply-To (Trả l�i)"
+
+#: ../composer/e-composer-actions.c:455
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Bật tắt hiển thị trư�ng Reply-To (Trả l�i)"
+
+#: ../composer/e-composer-actions.c:514
+msgid "Save Draft"
+msgstr "Lưu bản nháp"
+
+#: ../composer/e-composer-header-table.c:40
+msgid "Enter the recipients of the message"
+msgstr "Hãy gõ ngư�i nhận thư"
+
+#: ../composer/e-composer-header-table.c:42
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Chép cho: hãy gõ các địa chỉ sẽ nhận một bản sao của thư ấy."
+
+#: ../composer/e-composer-header-table.c:45
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message"
+msgstr ""
+"Hãy gõ các địa chỉ sẽ nhận một bản sao của thư mà không xuất hiện trên danh "
+"sách ngư�i nhận thư này"
+
+#: ../composer/e-composer-header-table.c:1021
+msgid "Fr_om:"
+msgstr "_Từ:"
+
+#: ../composer/e-composer-header-table.c:1030
+msgid "_Reply-To:"
+msgstr "T_rả l�i cho:"
+
+#: ../composer/e-composer-header-table.c:1034
+msgid "_To:"
+msgstr "�ế_n:"
+
+#: ../composer/e-composer-header-table.c:1039
+msgid "_Cc:"
+msgstr "_Cc:"
+
+#: ../composer/e-composer-header-table.c:1044
+msgid "_Bcc:"
+msgstr "_Bcc:"
+
+#: ../composer/e-composer-header-table.c:1049
+msgid "_Post To:"
+msgstr "_Gá»­i tá»›i:"
+
+#: ../composer/e-composer-header-table.c:1053
+msgid "S_ubject:"
+msgstr "C_hủ đ�:"
+
+#: ../composer/e-composer-header-table.c:1062
+msgid "Si_gnature:"
+msgstr "Chữ _ký:"
+
+#: ../composer/e-composer-name-header.c:141
+msgid "Click here for the address book"
+msgstr "Nhấn đây để xem Sổ địa chỉ"
+
+#: ../composer/e-composer-post-header.c:131
+msgid "Click here to select folders to post to"
+msgstr "Nhấn vào đây để ch�n thư mục nơi cần gửi"
+
+#: ../composer/e-composer-private.c:249
+msgid "Undo the last action"
+msgstr "Hồi lại hành động cuối cùng"
+
+#: ../composer/e-composer-private.c:253
+msgid "Redo the last undone action"
+msgstr "Thực hiện lại hành động vừa được hồi lại"
+
+#: ../composer/e-composer-private.c:257
+msgid "Search for text"
+msgstr "Tìm chuỗi"
+
+#: ../composer/e-composer-private.c:261
+msgid "Search for and replace text"
+msgstr "Tìm và thay thế văn bản"
+
+#: ../composer/e-composer-private.c:372
+msgid "Save draft"
+msgstr "Lưu bản nháp"
+
+#: ../composer/e-msg-composer.c:812
+#, c-format
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Không thể ký tên thư gửi đi: chưa lập chứng nhận chữ ký cho tài khoản này."
+
+#: ../composer/e-msg-composer.c:821
+#, c-format
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Không thể mã hoá thư gửi đi: chưa lập chứng nhận mã hoá cho tài khoản này."
+
+#: ../composer/e-msg-composer.c:1699 ../composer/e-msg-composer.c:2083
+msgid "Compose Message"
+msgstr "Viết thư"
+
+#: ../composer/e-msg-composer.c:4228
+msgid "The composer contains a non-text message body, which cannot be edited."
+msgstr ""
+"Bộ soạn thảo chứa phần nội dung thư phi văn bản nên không thể sửa đổi được."
+
+#: ../composer/e-msg-composer.c:4933
+msgid "Untitled Message"
+msgstr "Thư không tên"
+
+#: ../composer/mail-composer.error.xml.h:1
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr ""
+"Hiện th�i đang tải một số đính kèm v�. Gửi thư này sẽ gửi nó không có những "
+"đính kèm treo."
+
+#: ../composer/mail-composer.error.xml.h:2
+msgid "All accounts have been removed."
+msgstr "M�i tài khoản đã được gỡ b�."
+
+#: ../composer/mail-composer.error.xml.h:3
+msgid "An error occurred while saving to your Drafts folder."
+msgstr "Gặp lỗi trong khi lưu vào thư mục nháp."
+
+#: ../composer/mail-composer.error.xml.h:4
+msgid "An error occurred while saving to your Outbox folder."
+msgstr "Gặp lỗi trong khi lưu vào thư mục gửi đi."
+
+#: ../composer/mail-composer.error.xml.h:5
+msgid "An error occurred while sending. How do you want to proceed?"
+msgstr "Gặp lỗi trong khi gửi. Bạn muốn tiếp tục thế nào?"
+
+#: ../composer/mail-composer.error.xml.h:6
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Bạn có chắc muốn xoá thư tên « {0} » mà bạn đang soạn không?"
+
+#: ../composer/mail-composer.error.xml.h:7
+msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+msgstr "Vì « {0} », có lẽ bạn cần ch�n một số tùy ch�n thư khác."
+
+#: ../composer/mail-composer.error.xml.h:8
+msgid "Because &quot;{1}&quot;."
+msgstr "Vì « {1} »."
+
+#: ../composer/mail-composer.error.xml.h:9
+msgid ""
+"Because you are working offline, the message will be saved to your local "
+"Outbox folder. When you are back online you can send the message by clicking "
+"the Send/Receive button in Evolution's toolbar."
+msgstr ""
+"Vì bạn đang hoạt động ngoại tuyến, thư sẽ được lưu trong thư mục Hộp thư gửi "
+"đi cục bộ. Khi bạn trực tuyến, bạn có thể gửi thư bằng cách nhấn nút Gửi/"
+"Nhận trên thanh công cụ Evolution."
+
+#: ../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 "
+"continue the message at a later date."
+msgstr ""
+"�óng cửa sổ soạn này thì sẽ xoá thư ấy hoàn toàn, trừ khi bạn ch�n lưu thư "
+"ấy vào thư mục Nháp. Làm như thế sẽ cho phép bạn tiếp tục thư ấy lần sau."
+
+#: ../composer/mail-composer.error.xml.h:11
+msgid "Could not create message."
+msgstr "Không thể tạo thư."
+
+#: ../composer/mail-composer.error.xml.h:12
+msgid "Could not read signature file &quot;{0}&quot;."
+msgstr "Không thể đ�c tập tin chữ ký « {0} »."
+
+#: ../composer/mail-composer.error.xml.h:13
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Không thể lấy thư để đính kèm từ {0}."
+
+#: ../composer/mail-composer.error.xml.h:14
+msgid "Could not save to autosave file &quot;{0}&quot;."
+msgstr "Không thể lưu vào tập tin lưu tự động « {0} »."
+
+#: ../composer/mail-composer.error.xml.h:15
+msgid "Do you want to recover unfinished messages?"
+msgstr "Bạn có muốn phục hồi các thư chưa hoàn tất không?"
+
+#: ../composer/mail-composer.error.xml.h:16
+msgid "Download in progress. Do you want to send the mail?"
+msgstr "�ang tải v�. Bạn còn muốn gửi thư sao?"
+
+#: ../composer/mail-composer.error.xml.h:17
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr "Gặp lỗi khi lưu vào tập tin lưu tự động vì « {1} »."
+
+#: ../composer/mail-composer.error.xml.h:18
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+"Trình Evolution đã thoát bất ng� trong khi bạn soạn một thư mới. Phục hồi "
+"thư ấy thì sẽ cho phép bạn tiếp tục từ chỗ ấy."
+
+#: ../composer/mail-composer.error.xml.h:19
+msgid "Saving message to Outbox."
+msgstr "�ang lưu thư vào hộp thư gửi."
+
+#: ../composer/mail-composer.error.xml.h:20
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr ""
+"Tập tin '{0}' không phải là tập tin bình thư�ng nên không thể được gửi đi."
+
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
+msgid "The reported error was &quot;{0}&quot;."
+msgstr "Lỗi được thông báo là &quot;{0}&quot;."
+
+#: ../composer/mail-composer.error.xml.h:22
+msgid ""
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
+msgstr "Lỗi được báo cáo là &quot;{0}&quot;. Nhi�u khả năng thư chưa được lưu."
+
+#: ../composer/mail-composer.error.xml.h:23
+msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
+msgstr "Lỗi được báo cáo là &quot;{0}&quot;. Thư chưa được gửi đi."
+
+#: ../composer/mail-composer.error.xml.h:24
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "Không thể đính kèm tập tin &quot;{0}&quot; vào thư này."
+
+#: ../composer/mail-composer.error.xml.h:25
+msgid "You need to configure an account before you can compose mail."
+msgstr "Bạn cần cấu hình một tài khoản nào đó trước khi có thể biên soạn thư."
+
+#: ../composer/mail-composer.error.xml.h:26
+#| msgid "An error occurred while printing"
+msgid "Your message was sent, but an error occurred during post-processing."
+msgstr "Thư đã được gửi nhưng xảy ra lỗi hậu xử lý."
+
+#. Response codes were chosen somewhat arbitrarily.
+#: ../composer/mail-composer.error.xml.h:28
+msgid "_Continue Editing"
+msgstr "_Cứ soạn thảo"
+
+#: ../composer/mail-composer.error.xml.h:30
+msgid "_Do not Recover"
+msgstr "�ừ_ng phục hồi"
+
+#: ../composer/mail-composer.error.xml.h:31
+msgid "_Recover"
+msgstr "_Phục hồi"
+
+#: ../composer/mail-composer.error.xml.h:32
+msgid "_Save Draft"
+msgstr "_Lưu bản nháp"
+
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save to Outbox"
+msgstr "_Lưu vào hộp thư gửi"
+
+#: ../composer/mail-composer.error.xml.h:35
+msgid "_Try Again"
+msgstr "_Thử lại"
+
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplet/anjal-settings-main.c:154
+msgid "ID of the socket to embed in"
+msgstr "ID của socket cần nhúng vào"
+
+#: ../capplet/anjal-settings-main.c:155
+msgid "socket"
+msgstr "socket"
+
+#: ../capplet/settings/mail-account-view.c:77
+msgid "Please enter your full name."
+msgstr "Hãy nhập h� tên."
+
+#: ../capplet/settings/mail-account-view.c:78
+msgid "Please enter your email address."
+msgstr "Hãy nhập địa chỉ thư."
+
+#: ../capplet/settings/mail-account-view.c:79
+msgid "The email address you have entered is invalid."
+msgstr "�ịa chỉ mail bạn nhập không hợp lệ."
+
+#: ../capplet/settings/mail-account-view.c:80
+msgid "Please enter your password."
+msgstr "Hãy nhập mật khẩu của bạn."
+
+# Name: don't translate / Tên: đừng dịch
+#: ../capplet/settings/mail-account-view.c:259
+#: ../plugins/caldav/caldav-source.c:67
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:413
+#: ../modules/online-accounts/e-online-accounts-google.c:287
+#: ../modules/online-accounts/e-online-accounts-google.c:359
+#: ../plugins/google-account-setup/google-contacts-source.c:55
+#: ../plugins/google-account-setup/google-source.c:87
+msgid "Google"
+msgstr "Google"
+
+#: ../capplet/settings/mail-account-view.c:480
+msgid "Personal details:"
+msgstr "Chi tiết cá nhân:"
+
+#: ../capplet/settings/mail-account-view.c:487
+msgid "Name:"
+msgstr "Tên:"
+
+#: ../capplet/settings/mail-account-view.c:496
+msgid "Email address:"
+msgstr "�ịa chỉ thư:"
+
+#: ../capplet/settings/mail-account-view.c:506
+msgid "Details:"
+msgstr "Chi tiết:"
+
+#: ../capplet/settings/mail-account-view.c:514
+msgid "Receiving"
+msgstr "Nhận Thư"
+
+#: ../capplet/settings/mail-account-view.c:521
+msgid "Server type:"
+msgstr "Kiểu máy chủ:"
+
+#: ../capplet/settings/mail-account-view.c:530
+msgid "Server address:"
+msgstr "�ịa chỉ máy chủ:"
+
+#: ../capplet/settings/mail-account-view.c:539
+msgid "Username:"
+msgstr "Tên ngư�i dùng:"
+
+#: ../capplet/settings/mail-account-view.c:548
+msgid "Use encryption:"
+msgstr "Không mã hoá"
+
+#: ../capplet/settings/mail-account-view.c:553
+#: ../capplet/settings/mail-account-view.c:588
+msgid "never"
+msgstr "không bao gi�"
+
+#: ../capplet/settings/mail-account-view.c:565
+msgid "Sending"
+msgstr "Gá»­i thÆ°"
+
+#: ../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."
+msgstr ""
+"�ể dùng ứng dụng thư tín này, bạn cần thiết lập tài khoản thư. Cho địa chỉ "
+"thư và mật khẩu của bạn vào bên dưới và chương trình sẽ thử dò các thiết lập "
+"còn lại. Nếu không thành công, bạn sẽ cần đi�n các thông tin chi tiết v� máy "
+"chủ."
+
+#: ../capplet/settings/mail-account-view.c:609
+msgid ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
+msgstr ""
+"Rất tiếc, không thể tự động dò ra các thiết lập thư tín cho bạn. Vui lòng "
+"nhập bên dưới. Một số thông tin đã được đi�n sẵn do bạn đã nhập trước đâu, "
+"nhưng bạn có thể cần đi�u chỉnh lại."
+
+#: ../capplet/settings/mail-account-view.c:611
+msgid "You can specify more options to configure the account."
+msgstr "Bạn có thể xác định nhi�u tùy ch�n để cấu hình tài khoản."
+
+#: ../capplet/settings/mail-account-view.c:613
+msgid ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
+msgstr ""
+"Bây gi� đến thiết lập gửi thư. Một vài thiết lập đã được dò thử tự động. "
+"Nhưng bạn nên kiểm tra lại cho chắc chắn."
+
+#: ../capplet/settings/mail-account-view.c:614
+msgid "You can specify your default settings for your account."
+msgstr "Bạn có thể xác định các thiết lập mặc định cho tài khoản của bạn."
+
+#: ../capplet/settings/mail-account-view.c:615
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
+msgstr ""
+"�ến lúc kiểm tra lại m�i thứ trước khi thử liên lạc với máy chủ và lấy thư "
+"mới v�."
+
+#: ../capplet/settings/mail-account-view.c:630
+#: ../mail/em-account-editor.c:2289 ../mail/em-account-editor.c:2425
+msgid "Identity"
+msgstr "Nhân dạng"
+
+#: ../capplet/settings/mail-account-view.c:630
+msgid "Next - Receiving mail"
+msgstr "Kế tiếp - Nhận thư"
+
+#: ../capplet/settings/mail-account-view.c:631
+msgid "Receiving mail"
+msgstr "Nhận thư"
+
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:632
+msgid "Next - Sending mail"
+msgstr "Kế tiếp - Gửi thư"
+
+#: ../capplet/settings/mail-account-view.c:631
+msgid "Back - Identity"
+msgstr "Quay lại - �ịnh danh"
+
+#: ../capplet/settings/mail-account-view.c:631
+msgid "Next - Receiving options"
+msgstr "Kế tiếp - Tùy ch�n nhận"
+
+#: ../capplet/settings/mail-account-view.c:632
+msgid "Receiving options"
+msgstr "Tùy ch�n nhận"
+
+#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:634
+msgid "Back - Receiving mail"
+msgstr "Quay lại - Nhận thư"
+
+#: ../capplet/settings/mail-account-view.c:634
+msgid "Sending mail"
+msgstr "Gá»­i thÆ°"
+
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
+msgid "Next - Review account"
+msgstr "Kế tiếp - Kiểm lại tài khoản"
+
+#: ../capplet/settings/mail-account-view.c:634
+msgid "Next - Defaults"
+msgstr "Kế tiếp - Mặc định"
+
+#: ../capplet/settings/mail-account-view.c:634
+msgid "Back - Receiving options"
+msgstr "Quay lại - Tuỳ ch�n nhận"
+
+#: ../capplet/settings/mail-account-view.c:635
+#: ../mail/em-account-editor.c:3377
+msgid "Defaults"
+msgstr "Mặc định"
+
+#: ../capplet/settings/mail-account-view.c:635
+msgid "Back - Sending mail"
+msgstr "Quay lại - Gửi thư"
+
+#: ../capplet/settings/mail-account-view.c:637
+msgid "Review account"
+msgstr "Kiểm lại tài khoản"
+
+#: ../capplet/settings/mail-account-view.c:637
+msgid "Finish"
+msgstr "Hoàn tất"
+
+#: ../capplet/settings/mail-account-view.c:637
+msgid "Back - Sending"
+msgstr "Quay lại - Gửi thư"
+
+#: ../capplet/settings/mail-account-view.c:760
+msgid "Setup Google contacts with Evolution"
+msgstr "Thiết lập liên lạc Google với Evolution"
+
+#: ../capplet/settings/mail-account-view.c:761
+msgid "Setup Google calendar with Evolution"
+msgstr "Thiết lập lịch Google với Evolution"
+
+#: ../capplet/settings/mail-account-view.c:766
+msgid "You may need to enable IMAP access."
+msgstr "Bạn cần bật truy cập IMAP."
+
+#: ../capplet/settings/mail-account-view.c:774
+msgid "Google account settings:"
+msgstr "Thiết lập tài khoản Google:"
+
+#: ../capplet/settings/mail-account-view.c:800
+msgid "Setup Yahoo calendar with Evolution"
+msgstr "Thiết lập lịch Yahoo với Evolution"
+
+#: ../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 ""
+"Lịch Yahoo được đặt tên dạng tên_h�. �ã thử tên lịch của bạn theo quy tắc "
+"này. Vui lòng xác nhận hoặc nhập tên lịch đúng."
+
+#: ../capplet/settings/mail-account-view.c:813
+msgid "Yahoo account settings:"
+msgstr "Thiết lập tài khoản Yahoo:"
+
+#: ../capplet/settings/mail-account-view.c:827
+msgid "Yahoo Calendar name:"
+msgstr "Tên lịch Yahoo:"
+
+#: ../capplet/settings/mail-account-view.c:1098
+msgid "Password:"
+msgstr "Mật khẩu:"
+
+#: ../capplet/settings/mail-account-view.c:1150
+#: ../capplet/settings/mail-settings-view.c:254
+msgid "Close Tab"
+msgstr "�óng thẻ"
+
+#: ../capplet/settings/mail-account-view.c:1160
+msgid "Account Wizard"
+msgstr "Hỗ trợ thiết lập tài khoản"
+
+#: ../capplet/settings/mail-capplet-shell.c:215
+msgid "Evolution account assistant"
+msgstr "Phụ tá tài khoản Evolution"
+
+#. 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
+#: ../modules/addressbook/e-book-shell-backend.c:100
+#: ../modules/addressbook/e-book-shell-migrate.c:136
+#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-migrate.c:154
+#: ../modules/calendar/e-memo-shell-backend.c:102
+#: ../modules/calendar/e-memo-shell-migrate.c:109
+#: ../modules/calendar/e-task-shell-backend.c:102
+#: ../modules/calendar/e-task-shell-migrate.c:121
+msgid "On This Computer"
+msgstr "Trên máy này"
+
+#: ../capplet/settings/mail-settings-view.c:150
+#, c-format
+msgid "Modify %s..."
+msgstr "�ang sửa %s..."
+
+#: ../capplet/settings/mail-settings-view.c:152
+msgid "Add a new account"
+msgstr "Thêm tài khoản mới"
+
+#: ../capplet/settings/mail-settings-view.c:188
+msgid "Account management"
+msgstr "Quản lý tài khoản"
+
+#: ../capplet/settings/mail-settings-view.c:264
+msgid "Settings"
+msgstr "Thiết lập"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+msgid "Calendar event notifications"
+msgstr "Thông tin lịch"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Evolution Alarm Notify"
+msgstr "Bộ nhập Elm vào Evolution"
+
+# Name: do not translate/ tên: đừng dịch
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:999
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../shell/e-shell-window-private.c:257
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/evolution.desktop.in.in.h:2
+msgid "Evolution Mail and Calendar"
+msgstr "Thư tín và Lịch Evolution"
+
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
+msgid "Groupware Suite"
+msgstr "Bộ phần m�m nhóm (Groupware)"
+
+#: ../data/evolution.desktop.in.in.h:4
+msgid "Manage your email, contacts and schedule"
+msgstr "Quản lý thư tín, lịch biểu và các liên lạc"
+
+#: ../data/evolution-settings.desktop.in.in.h:1
+msgid "Configure email accounts"
+msgstr "Cấu hình tài khoản thư"
+
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "Thiết lập thư"
+
+#. Translators: This is a cancelled activity.
+#: ../e-util/e-activity.c:227
+#, c-format
+msgid "%s (cancelled)"
+msgstr "%s (bị huỷ)"
+
+#. Translators: This is a completed activity.
+#: ../e-util/e-activity.c:230
+#, c-format
+msgid "%s (completed)"
+msgstr "%s (hoàn tất)"
+
+#. Translators: This is an activity waiting to run.
+#: ../e-util/e-activity.c:233
+#, c-format
+msgid "%s (waiting)"
+msgstr "%s (đang ch�)"
+
+#. Translators: This is a running activity which
+#. *              the user has requested to cancel.
+#: ../e-util/e-activity.c:237
+#, c-format
+msgid "%s (cancelling)"
+msgstr "%s (Ä‘ang huá»·)"
+
+#: ../e-util/e-activity.c:239
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../e-util/e-activity.c:244
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% hoàn tất)"
+
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
+msgstr "A Rập"
+
+#: ../e-util/e-charset.c:54
+msgid "Baltic"
+msgstr "Ban-tích"
+
+#: ../e-util/e-charset.c:55
+msgid "Central European"
+msgstr "Trung Âu"
+
+#: ../e-util/e-charset.c:56
+msgid "Chinese"
+msgstr "Trung Quốc"
+
+#: ../e-util/e-charset.c:57
+msgid "Cyrillic"
+msgstr "Ki-rin"
+
+#: ../e-util/e-charset.c:58
+msgid "Greek"
+msgstr "Hy-lạp"
+
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "Do Thái"
+
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "Nhật Bản"
+
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "Hàn Quốc"
+
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "Thái"
+
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "Thổ-nhĩ-kỳ"
+
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../e-util/e-charset.c:65
+msgid "Western European"
+msgstr "Tây Âu"
+
+#: ../e-util/e-charset.c:66
+msgid "Western European, New"
+msgstr "Tây Âu, Mới"
+
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
+msgid "Traditional"
+msgstr "Truy�n thống"
+
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
+msgid "Simplified"
+msgstr "�ơn giản"
+
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
+msgid "Ukrainian"
+msgstr "U-cợ-rainh"
+
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
+msgid "Visual"
+msgstr "Trá»±c quan"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:206
+#: ../modules/calendar/e-cal-shell-view-actions.c:1856
+#: ../plugins/itip-formatter/itip-view.c:191
+#: ../widgets/table/e-cell-date-edit.c:307
+msgid "Today"
+msgstr "Hôm nay"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:219
+msgid "Tomorrow"
+msgstr "Ngày mai"
+
+#: ../e-util/e-datetime-format.c:219
+msgid "Yesterday"
+msgstr "Hôm qua"
+
+#. 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:227
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Mon"
+msgstr "Thứ hai tới"
+
+#. 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:233
+#| msgid "Next _Thread"
+msgctxt "DateFmt"
+msgid "Next Tue"
+msgstr "Thứ ba tới"
+
+#. 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:239
+#| msgid "Next _Thread"
+msgctxt "DateFmt"
+msgid "Next Wed"
+msgstr "Thứ tư tới"
+
+#. 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:245
+#| msgid "Next _Thread"
+msgctxt "DateFmt"
+msgid "Next Thu"
+msgstr "Thứ năm tới"
+
+#. 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:251
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Fri"
+msgstr "Thứ sáu tới"
+
+#. 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:257
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Sat"
+msgstr "Thứ bảy tới"
+
+#. 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:263
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Sun"
+msgstr "Chủ nhật tới"
+
+#: ../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 "Dùng thiết lập ngôn ngữ mặc định"
+
+#: ../e-util/e-datetime-format.c:574
+msgid "Format:"
+msgstr "�ịnh dạng:"
+
+#: ../e-util/e-file-utils.c:151
+msgid "(Unknown Filename)"
+msgstr "(Tên tập tin không biết)"
+
+#. Translators: The string value is the basename of a file.
+#: ../e-util/e-file-utils.c:155
+#, c-format
+msgid "Writing \"%s\""
+msgstr "�ang ghi \"%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
+#, c-format
+msgid "Writing \"%s\" to %s"
+msgstr "�ang ghi \"%s\" vào %s"
+
+#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:388
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "tuần"
+
+#: ../e-util/e-print.c:161
+msgid "An error occurred while printing"
+msgstr "Gặp lỗi trong khi in."
+
+#: ../e-util/e-print.c:168
+msgid "The printing system reported the following details about the error:"
+msgstr "Hệ thống in đã thông báo những chi tiết này v� lỗi đó:"
+
+#: ../e-util/e-print.c:174
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr "Hệ thống in không thông báo chi tiết thêm v� lỗi đó."
+
+#: ../e-util/e-signature.c:708
+msgid "Autogenerated"
+msgstr "Tự động phát sinh"
+
+#: ../e-util/e-system.error.xml.h:1
+msgid "Because \"{1}\"."
+msgstr "Vì « {1} »."
+
+#: ../e-util/e-system.error.xml.h:2
+msgid "Cannot open file \"{0}\"."
+msgstr "Không thể mở tập tin « {0} »."
+
+#: ../e-util/e-system.error.xml.h:3
+msgid "Cannot save file \"{0}\"."
+msgstr "Không thể lưu tập tin « {0} »."
+
+#: ../e-util/e-system.error.xml.h:4
+msgid "Do you wish to overwrite it?"
+msgstr "Bạn có muốn ghi đè lên nó không?"
+
+#: ../e-util/e-system.error.xml.h:5
+msgid "File exists \"{0}\"."
+msgstr "Tập tin « {0} » đã có."
+
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
+msgid "_Overwrite"
+msgstr "_Ghi đè"
+
+#: ../e-util/e-util.c:117
+msgid "Could not open the link."
+msgstr "Không thể mở liên kết."
+
+#: ../e-util/e-util.c:164
+msgid "Could not display help for Evolution."
+msgstr "Không thể hiển thị trợ giúp v� Evolution."
+
+#: ../e-util/gconf-bridge.c:1332
+#, c-format
+msgid "GConf error: %s"
+msgstr "Lá»—i GConf: %s"
+
+#: ../e-util/gconf-bridge.c:1343
+msgid "All further errors shown only on terminal."
+msgstr "Lỗi bổ sung chỉ hiển thị trên thiết bị cuối."
+
+#: ../em-format/em-format-quote.c:319 ../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
+msgid "From"
+msgstr "Từ"
+
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1061
+#: ../modules/mail/em-mailer-prefs.c:73
+msgid "Reply-To"
+msgstr "Trả l�i cho"
+
+#: ../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
+msgid "Cc"
+msgstr "Cc"
+
+#: ../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
+msgid "Bcc"
+msgstr "Bcc"
+
+#: ../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
+msgid "Subject"
+msgstr "Chủ đ�"
+
+#. pseudo-header
+#: ../em-format/em-format-quote.c:475 ../mail/em-format-html.c:2786
+#: ../modules/mail/em-mailer-prefs.c:1028
+msgid "Mailer"
+msgstr "Trình thư"
+
+#: ../em-format/em-format-quote.c:565 ../mail/em-composer-utils.c:1203
+msgid "-------- Forwarded Message --------"
+msgstr "���Thư đã chuyển tiếp���"
+
+#: ../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
+#: ../widgets/misc/e-dateedit.c:545
+msgid "Date"
+msgstr "Ngày"
+
+#: ../em-format/em-format.c:1067 ../modules/mail/em-mailer-prefs.c:79
+msgid "Newsgroups"
+msgstr "Nhóm tin"
+
+#: ../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 "Ảnh chân dung"
+
+#: ../em-format/em-format.c:1472
+#, c-format
+msgid "%s attachment"
+msgstr "%s đính kèm"
+
+#: ../em-format/em-format.c:1583
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Không thể phân tích thư S/MIME. Không biết sao."
+
+#: ../em-format/em-format.c:1777 ../em-format/em-format.c:2005
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Không thể phân tích thư MIME nên hiện thị dạng mã nguồn."
+
+#: ../em-format/em-format.c:1788
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Kiểu mã hoá không được hỗ trợ cho: multipart/encrypted"
+
+#: ../em-format/em-format.c:1808
+msgid "Could not parse PGP/MIME message"
+msgstr "Không thể phân tích thư PGP/MIME"
+
+#: ../em-format/em-format.c:1809
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "Không thể phân tích thư PGP/MIME: lỗi không rõ"
+
+#: ../em-format/em-format.c:2030
+msgid "Unsupported signature format"
+msgstr "�ịnh dạng chữ ký không hỗ trợ"
+
+#: ../em-format/em-format.c:2043 ../em-format/em-format.c:2225
+msgid "Error verifying signature"
+msgstr "Gặp lỗi khi xác minh chữ ký"
+
+#: ../em-format/em-format.c:2044 ../em-format/em-format.c:2210
+#: ../em-format/em-format.c:2226
+msgid "Unknown error verifying signature"
+msgstr "Gặp lỗi lạ khi xác minh chữ ký."
+
+#: ../em-format/em-format.c:2318
+msgid "Could not parse PGP message: "
+msgstr "Không thể phân tích thư PGP:"
+
+#. Don't delete this code, since it is needed so that xgettext can extract the translations.
+#. * Please, keep these strings in sync with the strings in the timespans array
+#: ../filter/e-filter-datespec.c:66
+#, c-format
+msgid "1 second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d giây trước"
+
+#: ../filter/e-filter-datespec.c:67
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] "%d giây sau"
+
+#: ../filter/e-filter-datespec.c:68
+#, c-format
+msgid "1 minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d phút trước"
+
+#: ../filter/e-filter-datespec.c:69
+#, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] "%d phút sau"
+
+#: ../filter/e-filter-datespec.c:70
+#, c-format
+msgid "1 hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d gi� trước"
+
+#: ../filter/e-filter-datespec.c:71
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] "%d gi� sau"
+
+#: ../filter/e-filter-datespec.c:72
+#, c-format
+msgid "1 day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d ngày trước"
+
+#: ../filter/e-filter-datespec.c:73
+#, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] "%d ngày sau"
+
+#: ../filter/e-filter-datespec.c:74
+#, c-format
+msgid "1 week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d tuần trước"
+
+#: ../filter/e-filter-datespec.c:75
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] "%d tuần sau"
+
+#: ../filter/e-filter-datespec.c:76
+#, c-format
+msgid "1 month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d tháng trước"
+
+#: ../filter/e-filter-datespec.c:77
+#, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] "%d tháng sau"
+
+#: ../filter/e-filter-datespec.c:78
+#, c-format
+msgid "1 year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d năm trước"
+
+#: ../filter/e-filter-datespec.c:79
+#, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] "%d năm sau"
+
+#: ../filter/e-filter-datespec.c:129
+msgid "<click here to select a date>"
+msgstr "<nhấn đây để ch�n ngày>"
+
+#: ../filter/e-filter-datespec.c:132 ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:154
+msgid "now"
+msgstr "bây gi�"
+
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: ../filter/e-filter-datespec.c:139
+msgid "%d-%b-%Y"
+msgstr "%d-%b-%Y"
+
+#: ../filter/e-filter-datespec.c:286
+msgid "Select a time to compare against"
+msgstr "Ch�n th�i điểm để đối chiếu"
+
+#: ../filter/e-filter-file.c:190
+msgid "Choose a File"
+msgstr "Ch�n tập tin"
+
+#: ../filter/e-filter-rule.c:666
+msgid "R_ule name:"
+msgstr "Tên q_uy tắc:"
+
+#: ../filter/e-filter-rule.c:696
+msgid "Find items that meet the following conditions"
+msgstr "Tìm mục tương ứng với những đi�u khiển sau"
+
+#: ../filter/e-filter-rule.c:721
+msgid "If all conditions are met"
+msgstr "Nếu m�i tiêu chuẩn đ�u thoả"
+
+#: ../filter/e-filter-rule.c:722
+msgid "If any conditions are met"
+msgstr "Nếu tiêu chuẩn nào thoả"
+
+#: ../filter/e-filter-rule.c:725
+msgid "_Find items:"
+msgstr "_Tìm mục:"
+
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#: ../filter/e-filter-rule.c:754
+msgid "None"
+msgstr "Không"
+
+#: ../filter/e-filter-rule.c:755
+msgid "All related"
+msgstr "M�i thứ liên quan"
+
+#: ../filter/e-filter-rule.c:756 ../widgets/misc/e-send-options.ui.h:19
+msgid "Replies"
+msgstr "Trả l�i"
+
+#: ../filter/e-filter-rule.c:757
+msgid "Replies and parents"
+msgstr "Trả l�i và mẹ"
+
+#: ../filter/e-filter-rule.c:758
+msgid "No reply or parent"
+msgstr "Không có trả l�i hay đi�u mẹ"
+
+#: ../filter/e-filter-rule.c:761
+#| msgid "I_nclude threads"
+msgid "I_nclude threads:"
+msgstr "Gồm các _nhánh:"
+
+#: ../filter/e-filter-rule.c:786
+msgid "A_dd Condition"
+msgstr "Thêm đi�_u kiện"
+
+#: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:321
+msgid "Incoming"
+msgstr "Gửi đến"
+
+#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:322
+msgid "Outgoing"
+msgstr "Gá»­i Ä‘i"
+
+#: ../filter/e-rule-editor.c:270
+msgid "Add Rule"
+msgstr "Thêm quy tắc"
+
+#: ../filter/e-rule-editor.c:359
+msgid "Edit Rule"
+msgstr "Sửa quy tắc"
+
+#: ../filter/filter.error.xml.h:1
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr "Biểu thức chính quy sai « {0} »."
+
+#: ../filter/filter.error.xml.h:2
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr "Không thể biên dịch biểu thức chính quy « {1} »."
+
+#: ../filter/filter.error.xml.h:3
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr ""
+"Tập tin « {0} » không tồn tại hoặc không phải là một tập tin bình thư�ng."
+
+#: ../filter/filter.error.xml.h:4
+msgid "Missing date."
+msgstr "Thiếu ngày."
+
+#: ../filter/filter.error.xml.h:5
+msgid "Missing file name."
+msgstr "Thiếu tên tập tin."
+
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
+msgid "Missing name."
+msgstr "Thiếu tên."
+
+#: ../filter/filter.error.xml.h:7
+msgid "Name &quot;{0}&quot; already used."
+msgstr "Tên « {0} » đã được dùng."
+
+#: ../filter/filter.error.xml.h:8
+msgid "Please choose another name."
+msgstr "Hãy ch�n tên khác."
+
+#: ../filter/filter.error.xml.h:9
+msgid "You must choose a date."
+msgstr "Bạn phải ch�n ngày."
+
+#: ../filter/filter.error.xml.h:10
+msgid "You must name this filter."
+msgstr "Bạn phải đặt tên cho bộ l�c này."
+
+#: ../filter/filter.error.xml.h:11
+msgid "You must specify a file name."
+msgstr "Bạn phải xác định tên tập tin."
+
+#: ../filter/filter.ui.h:1
+msgid "Compare against"
+msgstr "So sánh với"
+
+#: ../filter/filter.ui.h:3
+msgid "Show filters for mail:"
+msgstr "Hiển thị bộ l�c cho thư:"
+
+#: ../filter/filter.ui.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Ngày gửi thư sẽ được đối chiếu với th�i\n"
+" điểm 12:00am tại ngày xác định."
+
+#: ../filter/filter.ui.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Ngày gửi thư sẽ được đối chiếu\n"
+"với th�i điểm liên quan lúc l�c."
+
+#: ../filter/filter.ui.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Ngày gửi thư sẽ được đối chiếu\n"
+"với th�i điểm hiện th�i, khi l�c."
+
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:194
+msgid "_Filter Rules"
+msgstr "_Quy tắc L�c"
+
+#: ../filter/filter.ui.h:12
+msgid "a time relative to the current time"
+msgstr "th�i điểm so với hiện th�i"
+
+#: ../filter/filter.ui.h:13
+msgid "ago"
+msgstr "trÆ°á»›c"
+
+#: ../filter/filter.ui.h:16
+msgid "in the future"
+msgstr "sau"
+
+#: ../filter/filter.ui.h:18
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+msgid "months"
+msgstr "tháng"
+
+#: ../filter/filter.ui.h:19
+msgid "seconds"
+msgstr "giây"
+
+#: ../filter/filter.ui.h:20
+msgid "the current time"
+msgstr "th�i điểm hiện th�i"
+
+#: ../filter/filter.ui.h:21
+msgid "the time you specify"
+msgstr "th�i điểm bạn ch�n"
+
+#: ../filter/filter.ui.h:23
+msgid "years"
+msgstr "năm"
+
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:863 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "Không"
+
+#: ../mail/em-account-editor.c:946
+msgid "Never"
+msgstr "Không bao gi�"
+
+#: ../mail/em-account-editor.c:947
+msgid "Always"
+msgstr "Luôn luôn"
+
+#: ../mail/em-account-editor.c:948
+msgid "Ask for each message"
+msgstr "H�i cho mỗi thư"
+
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1833 ../widgets/misc/e-account-tree-view.c:131
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "Không"
+
+#: ../mail/em-account-editor.c:2237
+#| msgid "_File:"
+msgid "Fil_e:"
+msgstr "_Tập tin:"
+
+#: ../mail/em-account-editor.c:2237 ../mail/mail-config.ui.h:157
+msgid "_Path:"
+msgstr "�ư�ng _dẫn:"
+
+#: ../mail/em-account-editor.c:2286
+msgid "Mail Configuration"
+msgstr "Cấu hình Thư"
+
+#: ../mail/em-account-editor.c:2287
+#| msgid ""
+#| "Welcome to the Evolution Mail Configuration Assistant.\n"
+#| "\n"
+#| "Click \"Forward\" to begin."
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"Chào mừng dùng Phụ tá cấu hình thư Evolution.\n"
+"\n"
+"Hãy nhấn \"Tiếp tục\" để bắt đầu."
+
+#: ../mail/em-account-editor.c:2290
+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 ""
+"Vui lòng nhập tên và địa chỉ thư điện từ vào bên dưới. Trư�ng « tùy ch�n » "
+"bên dưới không cần phải đã ch�n, trừ khi bạn muốn gồm thông tin ấy vào thư "
+"bạn cần gửi."
+
+#: ../mail/em-account-editor.c:2292 ../mail/em-account-editor.c:2484
+msgid "Receiving Email"
+msgstr "Nhận Thư"
+
+#: ../mail/em-account-editor.c:2293
+msgid "Please configure the following account settings."
+msgstr "Hãy cấu hình các thiết lập tài khoản sau."
+
+#: ../mail/em-account-editor.c:2295 ../mail/em-account-editor.c:3081
+msgid "Sending Email"
+msgstr "Gá»­i ThÆ°"
+
+#: ../mail/em-account-editor.c:2296
+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 ""
+"Hãy nhập thông tin v� cách bạn sẽ gửi thư. Nếu bạn không chắc, hãy h�i quản "
+"trị hệ thống hoặc ISP (nhà cung cấp dịch vụ Internet) của bạn."
+
+#: ../mail/em-account-editor.c:2298 ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "Thông tin tài khoản"
+
+#: ../mail/em-account-editor.c:2299
+#| msgid ""
+#| "Please enter a descriptive name for this account in the space below.\n"
+#| "This name will be used for display purposes only."
+msgid ""
+"Please enter a descriptive name for this account below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"Hãy nhập một tên mô tả tài khoản này vào trư�ng bên dưới.\n"
+"Tên này chỉ được dùng để hiển thị thôi."
+
+#: ../mail/em-account-editor.c:2303
+msgid "Done"
+msgstr "Hoàn tất"
+
+#: ../mail/em-account-editor.c:2304
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"Xin chúc mừng, bạn đã hoàn tất quá trình cấu hình thư.\n"
+"\n"
+"Từ bây gi� bạn có thể gửi và nhận thư bằng Evolution.\n"
+"\n"
+"Hãy nhấn \"�p dụng\" để lưu các thiết lập."
+
+#: ../mail/em-account-editor.c:2843
+msgid "Check for _new messages every"
+msgstr "_Kiểm tra có thư mới mỗi"
+
+#: ../mail/em-account-editor.c:2851
+msgid "minu_tes"
+msgstr "phú_t"
+
+#: ../mail/em-account-editor.c:3520 ../mail/mail-config.ui.h:101
+msgid "Security"
+msgstr "Bảo mật"
+
+#. 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
+msgid "Receiving Options"
+msgstr "Tùy ch�n Nhận"
+
+#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
+msgid "Checking for New Messages"
+msgstr "Kiểm tra có Thư Mới"
+
+#: ../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
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "�ính kèm"
+
+#: ../mail/e-mail-attachment-bar.c:608
+#: ../widgets/misc/e-attachment-paned.c:623
+msgid "Icon View"
+msgstr "Khung xem biểu tượng"
+
+#: ../mail/e-mail-attachment-bar.c:610
+#: ../widgets/misc/e-attachment-paned.c:625
+msgid "List View"
+msgstr "Khung Xem danh sách"
+
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1441
+msgid "Close this window"
+msgstr "�óng cửa sổ này"
+
+#: ../mail/e-mail-browser.c:293
+msgid "(No Subject)"
+msgstr "(Không chủ đ�)"
+
+#: ../mail/e-mail-display.c:66
+msgid "_Add to Address Book..."
+msgstr "Thêm vào Sổ đị_a chỉ..."
+
+#: ../mail/e-mail-display.c:73
+msgid "_To This Address"
+msgstr "_Cho địa chỉ này"
+
+#: ../mail/e-mail-display.c:80
+msgid "_From This Address"
+msgstr "_Từ địa chỉ này"
+
+#: ../mail/e-mail-display.c:87
+#| msgid "_Send To..."
+msgid "Send _Reply To..."
+msgstr "Gửi _trả l�i cho..."
+
+#: ../mail/e-mail-display.c:89
+#| msgid "Send a mail message to this address"
+msgid "Send a reply message to this address"
+msgstr "Gửi thư trả l�i đến địa chỉ này"
+
+#: ../mail/e-mail-display.c:96
+msgid "Create Search _Folder"
+msgstr "Tạo thư mục tìm _kiếm"
+
+#: ../mail/e-mail-folder-utils.c:111
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr "�ang lưu thư vào thư mục '%s'"
+
+#: ../mail/e-mail-folder-utils.c:274
+msgid "Forwarded messages"
+msgstr "Thư đã chuyển tiếp"
+
+#: ../mail/e-mail-folder-utils.c:391
+#| msgid "Checks selected messages for duplicates"
+msgid "Scanning messages for duplicates"
+msgstr "Quét thư tìm trùng lắp"
+
+#: ../mail/e-mail-folder-utils.c:584
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "�ang lấy %d thư..."
+
+#: ../mail/e-mail-folder-utils.c:834
+#, c-format
+msgid "Removing folder '%s'"
+msgstr "�ang gở b� thư mục '%s'"
+
+#: ../mail/e-mail-folder-utils.c:968
+#, c-format
+msgid "File \"%s\" has been removed."
+msgstr "Tập tin \"%s\" đã được gỡ b�."
+
+#: ../mail/e-mail-folder-utils.c:972
+#| msgid "File \"%s\" has been removed."
+msgid "File has been removed."
+msgstr "Tập tin đã được gỡ b�."
+
+#: ../mail/e-mail-folder-utils.c:1031
+msgid "Removing attachments"
+msgstr "�ang xoá đính kèm"
+
+#: ../mail/e-mail-folder-utils.c:1195
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messages"
+msgstr[0] "�ang lưu %d thư"
+
+#: ../mail/e-mail-folder-utils.c:1539 ../mail/em-folder-utils.c:613
+#, c-format
+#| msgid "Invalid folder: %s"
+msgid "Invalid folder URI '%s'"
+msgstr "URI Thư mục không hợp lệ '%s'"
+
+#. Label + combo box has a 12px left margin so it's
+#. * aligned with the junk mail options above it.
+#: ../mail/e-mail-junk-options.c:252
+msgid "Junk filtering software:"
+msgstr "Phần m�m l�c thư rác:"
+
+#: ../mail/e-mail-label-dialog.c:223
+msgid "_Label name:"
+msgstr "Tê_n nhãn:"
+
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "_Quan tr�ng"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:42
+msgid "_Work"
+msgstr "Chỗ _làm"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:43
+msgid "_Personal"
+msgstr "_Riêng"
+
+#. green
+#: ../mail/e-mail-label-list-store.c:44
+msgid "_To Do"
+msgstr "_Cần làm"
+
+#. blue
+#: ../mail/e-mail-label-list-store.c:45
+msgid "_Later"
+msgstr "_Sau này"
+
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:684
+msgid "Add Label"
+msgstr "Thêm nhãn"
+
+#: ../mail/e-mail-label-manager.c:216
+msgid "Edit Label"
+msgstr "Sửa nhãn"
+
+#: ../mail/e-mail-label-manager.c:350
+msgid ""
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
+msgstr "Ghi chú: gạch dưới tên nhãn là phím tắt trong trình đơn."
+
+#: ../mail/e-mail-label-tree-view.c:88
+msgid "Color"
+msgstr "Màu"
+
+#: ../mail/e-mail-label-tree-view.c:98
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../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 "Tên"
+
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:312
+#: ../mail/em-folder-tree-model.c:720
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
+msgid "Inbox"
+msgstr "Hộp thư nhận"
+
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:713
+#: ../modules/mail/e-mail-shell-view-private.c:1064
+msgid "Drafts"
+msgstr "Nháp"
+
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:724
+#: ../modules/mail/e-mail-shell-view-private.c:1068
+msgid "Outbox"
+msgstr "Há»™p thÆ° gá»­i"
+
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:728
+#: ../modules/mail/e-mail-shell-view-private.c:1070
+msgid "Sent"
+msgstr "�ã gửi"
+
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:716
+#: ../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
+#: ../plugins/templates/templates.c:1322
+msgid "Templates"
+msgstr "Mẫu"
+
+#: ../mail/e-mail-migrate.c:134
+msgid "Migrating..."
+msgstr "�ang nâng cấp..."
+
+#: ../mail/e-mail-migrate.c:169
+msgid "Migration"
+msgstr "Nâng cấp"
+
+#: ../mail/e-mail-migrate.c:210
+#, c-format
+msgid "Migrating '%s':"
+msgstr "�ang nâng cấp « %s »:"
+
+#: ../mail/e-mail-migrate.c:728
+msgid "Migrating Folders"
+msgstr "Nâng cấp Thư mục"
+
+#: ../mail/e-mail-migrate.c:729
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"�ịnh dạng tóm tắt của hộp thư Evolution đã được nâng cấp lên SQLite kể từ "
+"Evolution 2.24.\n"
+"\n"
+"Hãy kiên nhẫn trong khi Evolution nâng cấp các thư mục của bạn..."
+
+#: ../mail/e-mail-migrate.c:1527
+#, c-format
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "Không thể tạo những thư mục thư cục bộ tại '%s': %s"
+
+#: ../mail/e-mail-notebook-view.c:621
+msgid "Please select a folder"
+msgstr "Hãy ch�n một thư mục."
+
+#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "Chép vào thư mục"
+
+#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:487
+msgid "C_opy"
+msgstr "Ché_p"
+
+#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
+msgid "Move to Folder"
+msgstr "Chuyển vào thư mục"
+
+#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:487
+msgid "_Move"
+msgstr "Chu_yển"
+
+#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1403
+msgid "_Do not ask me again."
+msgstr "�ừng _h�i nữa."
+
+#: ../mail/e-mail-reader.c:1409
+msgid "_Always ignore Reply-To: for mailing lists."
+msgstr "_Luôn b� qua Reply-To: đối với hộp thư chung."
+
+#: ../mail/e-mail-reader.c:1775
+msgid "A_dd Sender to Address Book"
+msgstr "_Thêm ngư�i gửi vào Sổ địa chỉ"
+
+#: ../mail/e-mail-reader.c:1777
+msgid "Add sender to address book"
+msgstr "Thêm ngư�i gửi vào sổ địa chỉ"
+
+#: ../mail/e-mail-reader.c:1782
+msgid "Check for _Junk"
+msgstr "Kiểm tra tìm thư _rác"
+
+#: ../mail/e-mail-reader.c:1784
+msgid "Filter the selected messages for junk status"
+msgstr "L�c các thư đã ch�n để quyết định trạng thái thư rác"
+
+#: ../mail/e-mail-reader.c:1789
+msgid "_Copy to Folder..."
+msgstr "_Chép vào thư mục..."
+
+#: ../mail/e-mail-reader.c:1791
+msgid "Copy selected messages to another folder"
+msgstr "Chép các thư đã ch�n sang thư mục khác"
+
+#: ../mail/e-mail-reader.c:1796
+msgid "_Delete Message"
+msgstr "_Xoá thư"
+
+#: ../mail/e-mail-reader.c:1798
+msgid "Mark the selected messages for deletion"
+msgstr "�ánh dấu các thư đã ch�n cần xoá"
+
+#: ../mail/e-mail-reader.c:1803
+msgid "Filter on Mailing _List..."
+msgstr "_L�c theo hộp thư chung..."
+
+#: ../mail/e-mail-reader.c:1805
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Tạo quy tắc để l�c m�i thư được gửi cho hộp thư chung này"
+
+#: ../mail/e-mail-reader.c:1810
+msgid "Filter on _Recipients..."
+msgstr "L�c theo Ngư�i _nhận..."
+
+#: ../mail/e-mail-reader.c:1812
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Tạo quy tắc để l�c m�i thư được gửi cho những ngư�i nhận này"
+
+#: ../mail/e-mail-reader.c:1817
+msgid "Filter on Se_nder..."
+msgstr "L�c theo Ngư�i _gửi..."
+
+#: ../mail/e-mail-reader.c:1819
+msgid "Create a rule to filter messages from this sender"
+msgstr "Tạo quy tắc để l�c m�i thư từ ngư�i gửi này"
+
+#: ../mail/e-mail-reader.c:1824
+msgid "Filter on _Subject..."
+msgstr "L�c theo _Chủ đ�..."
+
+#: ../mail/e-mail-reader.c:1826
+msgid "Create a rule to filter messages with this subject"
+msgstr "Tạo quy tắc để l�c m�i thư có chủ đ� này"
+
+#: ../mail/e-mail-reader.c:1831
+msgid "A_pply Filters"
+msgstr "�_p dụng bộ l�c"
+
+#: ../mail/e-mail-reader.c:1833
+msgid "Apply filter rules to the selected messages"
+msgstr "�p dụng bộ l�c vào các thư đã ch�n"
+
+#: ../mail/e-mail-reader.c:1838
+msgid "_Find in Message..."
+msgstr "_Tìm trong thư"
+
+#: ../mail/e-mail-reader.c:1840
+msgid "Search for text in the body of the displayed message"
+msgstr "Tìm đoạn trong nội dung thư đã hiển thị"
+
+#: ../mail/e-mail-reader.c:1845
+msgid "_Clear Flag"
+msgstr "Xó_a c�"
+
+#: ../mail/e-mail-reader.c:1847
+msgid "Remove the follow-up flag from the selected messages"
+msgstr "B� c� Tiếp-theo kh�i thư được ch�n"
+
+#: ../mail/e-mail-reader.c:1852
+msgid "_Flag Completed"
+msgstr "C� _hoàn tất"
+
+#: ../mail/e-mail-reader.c:1854
+msgid "Set the follow-up flag to completed on the selected messages"
+msgstr "�ặt c� tiếp-theo sang hoàn tất cho thư được ch�n"
+
+#: ../mail/e-mail-reader.c:1859
+msgid "Follow _Up..."
+msgstr "_Tiếp theo..."
+
+#: ../mail/e-mail-reader.c:1861
+msgid "Flag the selected messages for follow-up"
+msgstr "�ặt c� tiếp-theo cho thư được ch�n"
+
+#: ../mail/e-mail-reader.c:1866
+msgid "_Attached"
+msgstr "Gửi _kèm"
+
+#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Chuyển tiếp thư đã ch�n tới ngư�i khác như là đính kèm"
+
+#: ../mail/e-mail-reader.c:1873
+msgid "Forward As _Attached"
+msgstr "Chuyển dạng đính _kèm"
+
+#: ../mail/e-mail-reader.c:1880
+msgid "_Inline"
+msgstr "Trực t_iếp"
+
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
+msgid "Forward the selected message in the body of a new message"
+msgstr "Chuyển tiếp thư đã ch�n trong nội dung thư mới"
+
+#: ../mail/e-mail-reader.c:1887
+msgid "Forward As _Inline"
+msgstr "Chuyển dạng _inline"
+
+#: ../mail/e-mail-reader.c:1894
+msgid "_Quoted"
+msgstr "Trích _dẫn"
+
+#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
+msgid "Forward the selected message quoted like a reply"
+msgstr "Chuyển tiếp thư đã ch�n được trích dẫn dạng trả l�i"
+
+#: ../mail/e-mail-reader.c:1901
+msgid "Forward As _Quoted"
+msgstr "Chuyển dạng _trích dẫn"
+
+#: ../mail/e-mail-reader.c:1908
+msgid "_Load Images"
+msgstr "Tải ả_nh"
+
+#: ../mail/e-mail-reader.c:1910
+msgid "Force images in HTML mail to be loaded"
+msgstr "Buộc tải ảnh trong thư HTML"
+
+#: ../mail/e-mail-reader.c:1915
+msgid "_Important"
+msgstr "_Quan tr�ng"
+
+#: ../mail/e-mail-reader.c:1917
+msgid "Mark the selected messages as important"
+msgstr "�ánh dấu Quan Tr�ng các thư đã ch�n"
+
+#: ../mail/e-mail-reader.c:1922
+msgid "_Junk"
+msgstr "_Thư rác"
+
+#: ../mail/e-mail-reader.c:1924
+msgid "Mark the selected messages as junk"
+msgstr "�ánh dấu thư rác các thư đã ch�n"
+
+#: ../mail/e-mail-reader.c:1929
+msgid "_Not Junk"
+msgstr "Khô_ng phải rác"
+
+#: ../mail/e-mail-reader.c:1931
+msgid "Mark the selected messages as not being junk"
+msgstr "�ánh dấu Không phải thư rác các thư đã ch�n"
+
+#: ../mail/e-mail-reader.c:1936
+msgid "_Read"
+msgstr "��_c"
+
+#: ../mail/e-mail-reader.c:1938
+msgid "Mark the selected messages as having been read"
+msgstr "�ánh dấu �ã ��c các thư đã ch�n"
+
+#: ../mail/e-mail-reader.c:1943
+msgid "Uni_mportant"
+msgstr "_Không quan tr�ng"
+
+#: ../mail/e-mail-reader.c:1945
+msgid "Mark the selected messages as unimportant"
+msgstr "�ánh dấu Không Quan Tr�ng các thư đã ch�n"
+
+#: ../mail/e-mail-reader.c:1950
+msgid "_Unread"
+msgstr "_Chưa đ�c"
+
+#: ../mail/e-mail-reader.c:1952
+msgid "Mark the selected messages as not having been read"
+msgstr "�ánh dấu Chưa ��c các thư đã ch�n"
+
+#: ../mail/e-mail-reader.c:1957
+msgid "_Edit as New Message..."
+msgstr "_Sửa dạng thư mới..."
+
+#: ../mail/e-mail-reader.c:1959
+msgid "Open the selected messages in the composer for editing"
+msgstr "Mở các thư đã ch�n trong bộ soạn thảo để hiệu chỉnh"
+
+#: ../mail/e-mail-reader.c:1964
+msgid "Compose _New Message"
+msgstr "Viết thư _mới"
+
+#: ../mail/e-mail-reader.c:1966
+msgid "Open a window for composing a mail message"
+msgstr "Mở cửa sổ viết thư"
+
+#: ../mail/e-mail-reader.c:1971
+msgid "_Open in New Window"
+msgstr "Mở tr_ong cửa sổ mới"
+
+#: ../mail/e-mail-reader.c:1973
+msgid "Open the selected messages in a new window"
+msgstr "Mở các thư đã ch�n trong cửa sổ mới"
+
+#: ../mail/e-mail-reader.c:1978
+msgid "_Move to Folder..."
+msgstr "Ch_uyển sang thư mục..."
+
+#: ../mail/e-mail-reader.c:1980
+msgid "Move selected messages to another folder"
+msgstr "Di chuyển các thư đã ch�n sang thư mục khác"
+
+#: ../mail/e-mail-reader.c:1985
+msgid "_Switch to Folder"
+msgstr "_Chuyển sang thư mục"
+
+#: ../mail/e-mail-reader.c:1987
+msgid "Display the parent folder"
+msgstr "Hiện thư mục cha"
+
+#: ../mail/e-mail-reader.c:1992
+msgid "Switch to _next tab"
+msgstr "Chuyển sang thẻ _kế"
+
+#: ../mail/e-mail-reader.c:1994
+msgid "Switch to the next tab"
+msgstr "Chuyển sang thẻ kế tiếp"
+
+#: ../mail/e-mail-reader.c:1999
+msgid "Switch to _previous tab"
+msgstr "Chuyển sang thẻ _trước"
+
+#: ../mail/e-mail-reader.c:2001
+msgid "Switch to the previous tab"
+msgstr "Chuyển sang thẻ trước đó"
+
+#: ../mail/e-mail-reader.c:2006
+msgid "Cl_ose current tab"
+msgstr "�óng tập tin hiện th�i"
+
+#: ../mail/e-mail-reader.c:2008
+msgid "Close current tab"
+msgstr "�óng thẻ hiện th�i"
+
+#: ../mail/e-mail-reader.c:2013
+msgid "_Next Message"
+msgstr "Thư _kế"
+
+#: ../mail/e-mail-reader.c:2015
+msgid "Display the next message"
+msgstr "Hiển thị thư kế tiếp"
+
+#: ../mail/e-mail-reader.c:2020
+msgid "Next _Important Message"
+msgstr "Thư _quan tr�ng kế"
+
+#: ../mail/e-mail-reader.c:2022
+msgid "Display the next important message"
+msgstr "Hiển thị thư quan tr�ng kế tiếp"
+
+#: ../mail/e-mail-reader.c:2027
+msgid "Next _Thread"
+msgstr "_Nhánh kế"
+
+#: ../mail/e-mail-reader.c:2029
+msgid "Display the next thread"
+msgstr "Hiển thị nhánh đ�c kế tiếp"
+
+#: ../mail/e-mail-reader.c:2034
+msgid "Next _Unread Message"
+msgstr "Thư _chưa đ�c kế"
+
+#: ../mail/e-mail-reader.c:2036
+msgid "Display the next unread message"
+msgstr "Hiển thị thư chưa đ�c kế tiếp"
+
+#: ../mail/e-mail-reader.c:2041
+msgid "_Previous Message"
+msgstr "ThÆ° t_rÆ°á»›c"
+
+#: ../mail/e-mail-reader.c:2043
+msgid "Display the previous message"
+msgstr "Hiển thị thư trước đó"
+
+#: ../mail/e-mail-reader.c:2048
+msgid "Pr_evious Important Message"
+msgstr "Thư quan tr�ng t_rước"
+
+#: ../mail/e-mail-reader.c:2050
+msgid "Display the previous important message"
+msgstr "Hiển thị thư quan tr�ng trước đó"
+
+#: ../mail/e-mail-reader.c:2055
+msgid "Previous T_hread"
+msgstr "Mạch thư _trước"
+
+#: ../mail/e-mail-reader.c:2057
+msgid "Display the previous thread"
+msgstr "Hiển thị mạch thư trước đó"
+
+#: ../mail/e-mail-reader.c:2062
+msgid "P_revious Unread Message"
+msgstr "Thư chưa đ�c t_rước"
+
+#: ../mail/e-mail-reader.c:2064
+msgid "Display the previous unread message"
+msgstr "Hiển thị thư chưa đ�c trước đó"
+
+#: ../mail/e-mail-reader.c:2071
+msgid "Print this message"
+msgstr "In thư này"
+
+#: ../mail/e-mail-reader.c:2078
+msgid "Preview the message to be printed"
+msgstr "Xem thử thư cần in"
+
+#: ../mail/e-mail-reader.c:2083
+msgid "Re_direct"
+msgstr "Chuyển _hướng"
+
+#: ../mail/e-mail-reader.c:2085
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Chuyển hướng (bounce: nảy lên) thư đã ch�n tới ngư�i khác"
+
+#: ../mail/e-mail-reader.c:2090
+msgid "Remo_ve Attachments"
+msgstr "_B� đính kèm"
+
+#: ../mail/e-mail-reader.c:2092
+msgid "Remove attachments"
+msgstr "Lưu đính kèm"
+
+#: ../mail/e-mail-reader.c:2097
+msgid "Remove Du_plicate Messages"
+msgstr "Xoá các thư trùng lắp"
+
+#: ../mail/e-mail-reader.c:2099
+msgid "Checks selected messages for duplicates"
+msgstr "�ánh dấu các thư đã ch�n là trùng lắp"
+
+#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+#: ../modules/mail/e-mail-attachment-handler.c:177
+msgid "Reply to _All"
+msgstr "Trả l�i _m�i ngư�i"
+
+#: ../mail/e-mail-reader.c:2106
+msgid "Compose a reply to all the recipients of the selected message"
+msgstr "Soạn thư trả l�i cho m�i ngư�i nhận thư đã ch�n"
+
+#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
+msgid "Reply to _List"
+msgstr "Trả l�i _Hộp thư chung"
+
+#: ../mail/e-mail-reader.c:2113
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "Viết thư trả l�i cho hộp thư chung của thư đã ch�n"
+
+#: ../mail/e-mail-reader.c:2118
+#: ../modules/mail/e-mail-attachment-handler.c:184
+msgid "_Reply to Sender"
+msgstr "T_rả l�i ngư�i gửi"
+
+#: ../mail/e-mail-reader.c:2120
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Viết thư trả l�i cho ngư�i gửi thư đã ch�n"
+
+#: ../mail/e-mail-reader.c:2125
+msgid "_Save as mbox..."
+msgstr "Lưu dạng _mbox..."
+
+#: ../mail/e-mail-reader.c:2127
+msgid "Save selected messages as an mbox file"
+msgstr "Lưu các thư được ch�n vào tập tin dạng mbox"
+
+#: ../mail/e-mail-reader.c:2132
+msgid "_Message Source"
+msgstr "_Mã nguồn thư"
+
+#: ../mail/e-mail-reader.c:2134
+msgid "Show the raw email source of the message"
+msgstr "Hiện thư thô, mã nguồn"
+
+#: ../mail/e-mail-reader.c:2146
+msgid "_Undelete Message"
+msgstr "_Hủy xoá thư"
+
+#: ../mail/e-mail-reader.c:2148
+msgid "Undelete the selected messages"
+msgstr "Hủy xoá những thư đã ch�n"
+
+#: ../mail/e-mail-reader.c:2153
+msgid "_Normal Size"
+msgstr "Cỡ chuẩ_n"
+
+#: ../mail/e-mail-reader.c:2155
+msgid "Reset the text to its original size"
+msgstr "Phục hồi kích cỡ chữ gốc"
+
+#: ../mail/e-mail-reader.c:2160
+msgid "_Zoom In"
+msgstr "_Phóng to"
+
+#: ../mail/e-mail-reader.c:2162
+msgid "Increase the text size"
+msgstr "Tăng kích cỡ chữ"
+
+#: ../mail/e-mail-reader.c:2167
+msgid "Zoom _Out"
+msgstr "Thu _nh�"
+
+#: ../mail/e-mail-reader.c:2169
+msgid "Decrease the text size"
+msgstr "Giảm kích cỡ chữ"
+
+#: ../mail/e-mail-reader.c:2176
+msgid "Create R_ule"
+msgstr "Tạo q_uy tắc"
+
+#: ../mail/e-mail-reader.c:2183
+msgid "Ch_aracter Encoding"
+msgstr "Bộ _ký tự"
+
+#: ../mail/e-mail-reader.c:2190
+msgid "F_orward As"
+msgstr "Chuyển tiếp _dạng"
+
+#: ../mail/e-mail-reader.c:2197
+msgid "_Group Reply"
+msgstr "T_rả l�i nhóm"
+
+#: ../mail/e-mail-reader.c:2204
+msgid "_Go To"
+msgstr "�_i tới"
+
+#: ../mail/e-mail-reader.c:2211
+msgid "Mar_k As"
+msgstr "�ánh _dấu là"
+
+#: ../mail/e-mail-reader.c:2218
+msgid "_Message"
+msgstr "_ThÆ°"
+
+#: ../mail/e-mail-reader.c:2225
+msgid "_Zoom"
+msgstr "Thu _phóng"
+
+#: ../mail/e-mail-reader.c:2235
+msgid "Search Folder from Mailing _List..."
+msgstr "Thư mục tìm kiếm trên _Hộp thư chung..."
+
+#: ../mail/e-mail-reader.c:2237
+msgid "Create a search folder for this mailing list"
+msgstr "Tạo thư mục tìm kiếm cho hộp thư chung này"
+
+#: ../mail/e-mail-reader.c:2242
+msgid "Search Folder from Recipien_ts..."
+msgstr "_Thư mục tìm kiếm từ Ngư�i nhận..."
+
+#: ../mail/e-mail-reader.c:2244
+msgid "Create a search folder for these recipients"
+msgstr "Tạo thư mục tìm kiếm cho những ngư�i nhận này"
+
+#: ../mail/e-mail-reader.c:2249
+msgid "Search Folder from Sen_der..."
+msgstr "Thư mục tìm kiếm trên Ngư�i _gửi..."
+
+#: ../mail/e-mail-reader.c:2251
+msgid "Create a search folder for this sender"
+msgstr "Tạo thư mục tìm kiếm cho ngư�i gửi này"
+
+#: ../mail/e-mail-reader.c:2256
+msgid "Search Folder from S_ubject..."
+msgstr "Thư mục tìm kiếm trên _Chủ đ�..."
+
+#: ../mail/e-mail-reader.c:2258
+msgid "Create a search folder for this subject"
+msgstr "Tạo thư mục tìm kiếm cho chủ đ� này"
+
+#: ../mail/e-mail-reader.c:2281
+msgid "Mark for Follo_w Up..."
+msgstr "�ánh dấu Cần th_eo dõi tiếp..."
+
+#: ../mail/e-mail-reader.c:2289
+msgid "Mark as _Important"
+msgstr "�ánh dấu _Quan tr�ng"
+
+#: ../mail/e-mail-reader.c:2293
+msgid "Mark as _Junk"
+msgstr "�ánh dấu _Thư rác"
+
+#: ../mail/e-mail-reader.c:2297
+msgid "Mark as _Not Junk"
+msgstr "�á_nh dấu Khác rác"
+
+#: ../mail/e-mail-reader.c:2301
+msgid "Mar_k as Read"
+msgstr "�ánh dấu �ã đ�_c"
+
+#: ../mail/e-mail-reader.c:2305
+msgid "Mark as Uni_mportant"
+msgstr "�ánh dấu _Không quan tr�ng"
+
+#: ../mail/e-mail-reader.c:2309
+msgid "Mark as _Unread"
+msgstr "�ánh dấ_u Chưa đ�c"
+
+#: ../mail/e-mail-reader.c:2353
+msgid "_Caret Mode"
+msgstr "_Chế độ con nháy"
+
+#: ../mail/e-mail-reader.c:2355
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Hiển thị con chạy nháy trong phần nội dung các thư đã hiển thị"
+
+#: ../mail/e-mail-reader.c:2361
+msgid "All Message _Headers"
+msgstr "Các dòng đầu t_hư"
+
+#: ../mail/e-mail-reader.c:2363
+msgid "Show messages with all email headers"
+msgstr "Hiển thị thư với m�i dòng đầu thư"
+
+#: ../mail/e-mail-reader.c:2659
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "�ang lấy thư '%s'"
+
+#. 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
+#: ../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
+msgid "Default"
+msgstr "Mặc định"
+
+#: ../mail/e-mail-reader.c:3415
+#: ../modules/mail/e-mail-attachment-handler.c:170
+msgid "_Forward"
+msgstr "Chuyển t_iếp"
+
+#: ../mail/e-mail-reader.c:3416
+msgid "Forward the selected message to someone"
+msgstr "Chuyển tiếp thư đã ch�n tới ngư�i khác"
+
+#: ../mail/e-mail-reader.c:3435
+msgid "Group Reply"
+msgstr "Trả l�i nhóm"
+
+#: ../mail/e-mail-reader.c:3436
+msgid "Reply to the mailing list, or to all recipients"
+msgstr "Viết thư trả l�i cho hộp thư chung, hoặc cho tất cả m�i ngư�i"
+
+#: ../mail/e-mail-reader.c:3489 ../mail/em-filter-i18n.h:14
+msgid "Delete"
+msgstr "Xoá"
+
+#: ../mail/e-mail-reader.c:3522
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../widgets/misc/e-calendar.c:202
+msgid "Next"
+msgstr "Kế"
+
+#: ../mail/e-mail-reader.c:3526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../widgets/misc/e-calendar.c:178
+msgid "Previous"
+msgstr "Lùi"
+
+#: ../mail/e-mail-reader.c:3535 ../mail/mail-dialogs.ui.h:17
+msgid "Reply"
+msgstr "Trả l�i"
+
+#: ../mail/e-mail-reader.c:4205
+#, c-format
+msgid "Folder '%s'"
+msgstr "Thư mục '%s'"
+
+#: ../mail/e-mail-reader-utils.c:145
+#| msgid "Do not ask me again"
+msgid "Do not warn me again"
+msgstr "�ừng cảnh báo nữa"
+
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:670
+#, c-format
+#| msgid ""
+#| "Folder '%s' contains %d duplicate message. Are you sure you want to "
+#| "delete it?"
+#| msgid_plural ""
+#| "Folder '%s' contains %d duplicate messages. Are you sure you want to "
+#| "delete them?"
+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?"
+msgstr[0] ""
+"Thư mục '%s' chứ %u thư trùng lắp. Bạn có chắc muốn xoá chúng không?"
+
+#: ../mail/e-mail-reader-utils.c:1047
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "LÆ°u thÆ°"
+
+#. Translators: This is part of a suggested file name
+#. * used when saving a message or multiple messages to
+#. * 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
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "ThÆ°"
+
+#: ../mail/e-mail-session.c:870
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "Hãy gõ cụm từ mật khẩu cho %s"
+
+#: ../mail/e-mail-session.c:874
+msgid "Enter Passphrase"
+msgstr "Gõ cụm từ mật khẩu"
+
+#: ../mail/e-mail-session.c:878
+#, c-format
+msgid "Enter Password for %s"
+msgstr "Hãy gõ mật khẩu cho %s"
+
+#: ../mail/e-mail-session.c:882
+msgid "Enter Password"
+msgstr "Gõ mật khẩu"
+
+#: ../mail/e-mail-session.c:933
+#, c-format
+msgid "User canceled operation."
+msgstr "Ngư�i dùng đã thôi thao tác này."
+
+#: ../mail/e-mail-session.c:1046
+#, c-format
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+"Chưa cung cấp địa chỉ đích thì tiến trình chuyển tiếp thư này đã bị thôi."
+
+#: ../mail/e-mail-session.c:1055
+#, c-format
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
+"Không tìm thấy tài khoản có thể sử dụng thì tiến trình chuyển tiếp thư này "
+"đã bị thôi."
+
+#: ../mail/e-mail-session-utils.c:419
+#, c-format
+#| msgid "Expunging and storing account '%s'"
+msgid "Cannot get transport for account '%s'"
+msgstr "Không thể lấy phương tiện vận chuyển cho tài khoản '%s'"
+
+#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:634
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Việc áp dụng bộ l�c gửi đi bị lỗi: %s"
+
+#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
+#: ../mail/mail-ops.c:653 ../mail/mail-ops.c:687
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+"Lỗi nối thêm vào %s: %s\n"
+"Cho nên nối thêm vào thư mục '�ã gửi'."
+
+#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:707
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "Lỗi nối thêm vào thư mục cục bộ '�ã gửi' cục bộ: %s"
+
+#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:810
+#: ../mail/mail-ops.c:906
+msgid "Sending message"
+msgstr "�ang gửi thư"
+
+#: ../mail/e-mail-session-utils.c:873
+#, c-format
+msgid "Unsubscribing from folder '%s'"
+msgstr "�ang b� đăng ký thư mục '%s'"
+
+#: ../mail/e-mail-store-utils.c:168
+#, c-format
+msgid "Disconnecting from '%s'"
+msgstr "�ang ngắt kết nối từ '%s'"
+
+#: ../mail/e-mail-store-utils.c:259
+#, c-format
+msgid "Reconnecting to '%s'"
+msgstr "�ang tái kết nối tới '%s'"
+
+#: ../mail/e-mail-store-utils.c:334
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "�ang chuẩn bị tài khoản « %s » để ra ngoại tuyến"
+
+#: ../mail/e-mail-tag-editor.c:291
+msgid "Flag to Follow Up"
+msgstr "�ặt c� để theo dõi tiếp"
+
+#. Note to translators: this is the attribution string used
+#. * when quoting messages.  Each ${Variable} gets replaced
+#. * with a value.  To see a full list of available variables,
+#. * see mail/em-composer-utils.c:attribvars array.
+#: ../mail/em-composer-utils.c:1197
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"Vào ${AbbrevWeekdayName}, ngày ${Day}, ${Month} năm ${Year} lúc ${24Hour}:"
+"${Minute} ${TimeZone}, ${Sender} viết:"
+
+#: ../mail/em-composer-utils.c:1208
+msgid "-----Original Message-----"
+msgstr "���Thư gốc���"
+
+#. 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
+#, c-format
+msgid "Your message to %s about \"%s\" on %s has been read."
+msgstr "Thư gửi cho %s v� \"%s\" vào %s đã được đ�c."
+
+#: ../mail/em-composer-utils.c:2052
+#, c-format
+msgid "Delivery Notification for: \"%s\""
+msgstr "Xác nhận gửi/nhận thư cho: \"%s\""
+
+#: ../mail/em-composer-utils.c:2592
+msgid "an unknown sender"
+msgstr "ngư�i gửi lạ"
+
+#: ../mail/em-composer-utils.c:2998
+msgid "Posting destination"
+msgstr "�ích gửi đến"
+
+#: ../mail/em-composer-utils.c:2999
+msgid "Choose folders to post the message to."
+msgstr "Hãy ch�n các thư mục nơi cần gửi thư."
+
+#: ../mail/em-filter-folder-element.c:241
+msgid "Select Folder"
+msgstr "Ch�n thư mục"
+
+#. Automatically generated. Do not edit.
+#: ../mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Chỉnh điểm"
+
+#: ../mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Gán màu"
+
+#: ../mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Gán điểm"
+
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
+#: ../mail/em-filter-i18n.h:7
+msgid "Beep"
+msgstr "Bíp"
+
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
+#: ../mail/em-filter-i18n.h:9
+msgid "Completed On"
+msgstr "Hoàn tất vào"
+
+#: ../mail/em-filter-i18n.h:12
+msgid "Date received"
+msgstr "Ngày nhận"
+
+#: ../mail/em-filter-i18n.h:13
+msgid "Date sent"
+msgstr "Ngày gửi"
+
+#: ../mail/em-filter-i18n.h:15
+msgid "Deleted"
+msgstr "�ã xoá"
+
+#: ../mail/em-filter-i18n.h:17
+msgid "does not end with"
+msgstr "không kết thúc bằng"
+
+#: ../mail/em-filter-i18n.h:18
+msgid "does not exist"
+msgstr "không tồn tại"
+
+#: ../mail/em-filter-i18n.h:19
+msgid "does not return"
+msgstr "không trả gửi"
+
+#: ../mail/em-filter-i18n.h:20
+msgid "does not sound like"
+msgstr "không giống với"
+
+#: ../mail/em-filter-i18n.h:21
+msgid "does not start with"
+msgstr "không bắt đầu bằng"
+
+#: ../mail/em-filter-i18n.h:23
+msgid "Draft"
+msgstr "Nháp"
+
+#: ../mail/em-filter-i18n.h:24
+msgid "ends with"
+msgstr "kết thúc bằng"
+
+#: ../mail/em-filter-i18n.h:26
+msgid "exists"
+msgstr "tồn tại"
+
+#: ../mail/em-filter-i18n.h:27
+msgid "Expression"
+msgstr "Biểu thức"
+
+#: ../mail/em-filter-i18n.h:28
+msgid "Follow Up"
+msgstr "Theo dõi tiếp"
+
+#: ../mail/em-filter-i18n.h:29
+msgid "Forward to"
+msgstr "Chuyển đến"
+
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Quan tr�ng"
+
+#: ../mail/em-filter-i18n.h:32
+msgid "is after"
+msgstr "có sau"
+
+#: ../mail/em-filter-i18n.h:33
+msgid "is before"
+msgstr "có trước"
+
+#: ../mail/em-filter-i18n.h:34
+msgid "is Flagged"
+msgstr "được đặt c�"
+
+#: ../mail/em-filter-i18n.h:38
+msgid "is not Flagged"
+msgstr "không được đặt c�"
+
+#: ../mail/em-filter-i18n.h:39
+msgid "is not set"
+msgstr "chưa đặt"
+
+#: ../mail/em-filter-i18n.h:40
+msgid "is set"
+msgstr "đã đặt"
+
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
+msgid "Junk"
+msgstr "Thư rác"
+
+#: ../mail/em-filter-i18n.h:42
+msgid "Junk Test"
+msgstr "Kiểm thử Thư rác"
+
+#: ../mail/em-filter-i18n.h:43
+msgid "Label"
+msgstr "Nhãn"
+
+#: ../mail/em-filter-i18n.h:44
+msgid "Mailing list"
+msgstr "Há»™p thÆ° chung"
+
+#: ../mail/em-filter-i18n.h:45
+msgid "Match All"
+msgstr "Khớp tất cả"
+
+#: ../mail/em-filter-i18n.h:46
+msgid "Message Body"
+msgstr "Ná»™i dung"
+
+#: ../mail/em-filter-i18n.h:47
+msgid "Message Header"
+msgstr "Dòng đầu Thư"
+
+#: ../mail/em-filter-i18n.h:48
+msgid "Message is Junk"
+msgstr "Thư là rác"
+
+#: ../mail/em-filter-i18n.h:49
+msgid "Message is not Junk"
+msgstr "Thư không phải rác"
+
+#: ../mail/em-filter-i18n.h:50
+msgid "Message Location"
+msgstr "Vị trí thư"
+
+#: ../mail/em-filter-i18n.h:52
+msgid "Pipe to Program"
+msgstr "Gửi qua ống dẫn đến chương trình"
+
+#: ../mail/em-filter-i18n.h:53
+msgid "Play Sound"
+msgstr "Phát âm thanh"
+
+#. Past tense, as in "has been read".
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
+msgid "Read"
+msgstr "��c"
+
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+msgid "Recipients"
+msgstr "Ngư�i nhận"
+
+#: ../mail/em-filter-i18n.h:56
+msgid "Regex Match"
+msgstr "Khớp biểu thức chính quy"
+
+#: ../mail/em-filter-i18n.h:57
+msgid "Replied to"
+msgstr "�ã trả l�i cho"
+
+#: ../mail/em-filter-i18n.h:58
+msgid "returns"
+msgstr "trả gửi"
+
+#: ../mail/em-filter-i18n.h:59
+msgid "returns greater than"
+msgstr "trả gửi trên"
+
+#: ../mail/em-filter-i18n.h:60
+msgid "returns less than"
+msgstr "trả gửi dưới"
+
+#: ../mail/em-filter-i18n.h:61
+msgid "Run Program"
+msgstr "Chạy chương trình"
+
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
+msgid "Score"
+msgstr "�iểm"
+
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
+msgid "Sender"
+msgstr "Ngư�i gửi"
+
+#: ../mail/em-filter-i18n.h:64
+msgid "Sender or Recipients"
+msgstr "Ngư�i gửi hay Ngư�i nhận"
+
+#: ../mail/em-filter-i18n.h:65
+msgid "Set Label"
+msgstr "�ặt nhãn"
+
+#: ../mail/em-filter-i18n.h:66
+msgid "Set Status"
+msgstr "�ặt trạng thái"
+
+#: ../mail/em-filter-i18n.h:67
+msgid "Size (kB)"
+msgstr "Cỡ (kB)"
+
+#: ../mail/em-filter-i18n.h:68
+msgid "sounds like"
+msgstr "giống như"
+
+#: ../mail/em-filter-i18n.h:69
+msgid "Source Account"
+msgstr "Tài khoản nguồn"
+
+#: ../mail/em-filter-i18n.h:70
+msgid "Specific header"
+msgstr "Dòng đầu riêng"
+
+#: ../mail/em-filter-i18n.h:71
+msgid "starts with"
+msgstr "bắt đầu bằng"
+
+#: ../mail/em-filter-i18n.h:73
+msgid "Stop Processing"
+msgstr "Dừng xử lý"
+
+#: ../mail/em-filter-i18n.h:75
+msgid "Unset Status"
+msgstr "B� đặt trạng thái"
+
+#. and now for the action area
+#: ../mail/em-filter-rule.c:561
+msgid "Then"
+msgstr "Rồi"
+
+#: ../mail/em-filter-rule.c:592
+msgid "Add Ac_tion"
+msgstr "Thêm _hành động"
+
+#: ../mail/em-folder-properties.c:145
+msgid "Unread messages:"
+msgid_plural "Unread messages:"
+msgstr[0] "Thư chưa đ�c:"
+
+#: ../mail/em-folder-properties.c:156
+msgid "Total messages:"
+msgid_plural "Total messages:"
+msgstr[0] "Tổng số thư:"
+
+#: ../mail/em-folder-properties.c:177
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "Sử dụng hạn ngạch (%s):"
+
+#: ../mail/em-folder-properties.c:179
+#, c-format
+msgid "Quota usage"
+msgstr "Sử dụng hạn ngạch"
+
+#: ../mail/em-folder-properties.c:317
+msgid "Folder Properties"
+msgstr "Thuộc tính thư mục"
+
+#: ../mail/em-folder-selection-button.c:79
+msgid "<click here to select a folder>"
+msgstr "<nhấn đây để ch�n thư mục>"
+
+#: ../mail/em-folder-selector.c:436
+msgid "C_reate"
+msgstr "Tạ_o"
+
+#: ../mail/em-folder-selector.c:442
+msgid "Folder _name:"
+msgstr "Tê_n thư mục:"
+
+#: ../mail/em-folder-tree.c:647
+msgid "Folder names cannot contain '/'"
+msgstr "Tên thư mục không thể chứa ký tự sổ chéo."
+
+# Variable: do not translate/ biến: đừng dịch
+#: ../mail/em-folder-tree.c:768
+#, c-format
+msgctxt "folder-display"
+msgid "%s (%u%s)"
+msgstr "%s (%u%s)"
+
+#: ../mail/em-folder-tree.c:1590
+msgid "Mail Folder Tree"
+msgstr "Cây thư mục thư"
+
+#: ../mail/em-folder-tree.c:2069 ../mail/em-folder-utils.c:115
+#, c-format
+msgid "Moving folder %s"
+msgstr "�ang chuyển thư mục %s..."
+
+#: ../mail/em-folder-tree.c:2072 ../mail/em-folder-utils.c:117
+#, c-format
+msgid "Copying folder %s"
+msgstr "�ang sao chép thư mục %s..."
+
+#: ../mail/em-folder-tree.c:2079 ../mail/message-list.c:2303
+#, c-format
+msgid "Moving messages into folder %s"
+msgstr "�ang chuyển thư vào thư mục %s..."
+
+#: ../mail/em-folder-tree.c:2083 ../mail/message-list.c:2305
+#, c-format
+msgid "Copying messages into folder %s"
+msgstr "�ang sao chép thư vào thư mục %s..."
+
+#: ../mail/em-folder-tree.c:2102
+#, c-format
+msgid "Cannot drop message(s) into toplevel store"
+msgstr "Không thể thả thư vào kho mức độ đỉnh"
+
+#: ../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
+msgid "Search Folders"
+msgstr "Thư mục tìm kiếm"
+
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:179 ../mail/em-folder-tree-model.c:181
+msgid "UNMATCHED"
+msgstr "KHÔNG KHỚP"
+
+#: ../mail/em-folder-tree-model.c:790 ../mail/em-folder-tree-model.c:1075
+msgid "Loading..."
+msgstr "�ang nạp..."
+
+#: ../mail/em-folder-utils.c:488
+msgid "Move Folder To"
+msgstr "Chuyển thư mục đến"
+
+#: ../mail/em-folder-utils.c:488
+msgid "Copy Folder To"
+msgstr "Chép thư mục vào"
+
+#: ../mail/em-folder-utils.c:590
+msgid "Create Folder"
+msgstr "Tạo thư mục"
+
+#: ../mail/em-folder-utils.c:591
+msgid "Specify where to create the folder:"
+msgstr "Xác định nơi tạo thư mục:"
+
+#: ../mail/em-format-html.c:166
+msgid "Formatting message"
+msgstr "�ang định dạng thư..."
+
+#: ../mail/em-format-html.c:378
+msgid "Formatting Message..."
+msgstr "�ang định dạng thư..."
+
+#: ../mail/em-format-html.c:1562 ../mail/em-format-html.c:1572
+#, c-format
+msgid "Retrieving '%s'"
+msgstr "�ang nhận '%s'"
+
+#: ../mail/em-format-html.c:1723 ../mail/em-format-html-display.c:89
+msgid "Unsigned"
+msgstr "Chưa ký"
+
+#: ../mail/em-format-html.c:1724 ../mail/em-format-html-display.c:90
+msgid "Valid signature"
+msgstr "Chữ ký hợp lệ"
+
+#: ../mail/em-format-html.c:1725 ../mail/em-format-html-display.c:91
+msgid "Invalid signature"
+msgstr "Chữ ký không hợp lệ"
+
+#: ../mail/em-format-html.c:1726 ../mail/em-format-html-display.c:92
+msgid "Valid signature, but cannot verify sender"
+msgstr "Chữ ký hợp lệ nhưng mà không thể xác minh ngư�i gửi"
+
+#: ../mail/em-format-html.c:1727 ../mail/em-format-html-display.c:93
+msgid "Signature exists, but need public key"
+msgstr "Chữ ký tồn tại, nhưng cần khoá công"
+
+#: ../mail/em-format-html.c:1733 ../mail/em-format-html-display.c:100
+msgid "Unencrypted"
+msgstr "Không mã hoá"
+
+#: ../mail/em-format-html.c:1734 ../mail/em-format-html-display.c:101
+msgid "Encrypted, weak"
+msgstr "Mật mã yếu"
+
+#: ../mail/em-format-html.c:1735 ../mail/em-format-html-display.c:102
+msgid "Encrypted"
+msgstr "Mật mã"
+
+#: ../mail/em-format-html.c:1736 ../mail/em-format-html-display.c:103
+msgid "Encrypted, strong"
+msgstr "Mật mã mạnh"
+
+#: ../mail/em-format-html.c:2136
+msgid "Unknown external-body part."
+msgstr "Phần external-body lạ."
+
+#: ../mail/em-format-html.c:2146
+msgid "Malformed external-body part."
+msgstr "Phần external-body hư."
+
+#: ../mail/em-format-html.c:2177
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Tr� tới địa chỉ FTP (%s)"
+
+#: ../mail/em-format-html.c:2188
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Tr� tới tập tin cục bộ (%s) hợp lệ tại địa chỉ « %s »"
+
+#: ../mail/em-format-html.c:2190
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Tr� tới tập tin cục bộ (%s)"
+
+#: ../mail/em-format-html.c:2211
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Tr� tới dữ liệu ở xa (%s)"
+
+#: ../mail/em-format-html.c:2226
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Tr� tới dữ liệu lạ bên ngoài (kiểu « %s »)"
+
+#. 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
+#, c-format
+#| msgid "From %s:"
+msgid "From: %s"
+msgstr "Từ: %s"
+
+#: ../mail/em-format-html.c:2956
+#| msgid "(No Subject)"
+msgid "(no subject)"
+msgstr "(không chủ đ�)"
+
+#: ../mail/em-format-html.c:3032
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "Thư này đã được gửi bởi %s thay mặt cho %s"
+
+#: ../mail/em-format-html-display.c:89
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "Thư này không có chữ ký nên không thể đảm bảo thư này do ngư�i ấy gửi."
+
+#: ../mail/em-format-html-display.c:90
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr "Thư này có chữ ký và hợp lệ nên rất có thể là thư ấy do ngư�i ấy gửi."
+
+#: ../mail/em-format-html-display.c:91
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+"Không thể xác minh chữ ký của thư này: có lẽ nó bị giả trong khi truy�n."
+
+#: ../mail/em-format-html-display.c:92
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr "Thư này có chữ ký hợp lệ, nhưng mà không thể xác minh ngư�i gửi thư."
+
+#: ../mail/em-format-html-display.c:93
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr "Thư này được ký bằng chữ ký, nhưng không có khoá công tương ứng."
+
+#: ../mail/em-format-html-display.c:100
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+"Thư này không được mã hoá nên bất cứ ngư�i nào có xem được nội dung nó trong "
+"khi truy�n qua Internet."
+
+#: ../mail/em-format-html-display.c:101
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+"Thư này được mã hoá, nhưng mà dùng thuật toán mã hoá yếu. Ngư�i khác sẽ gặp "
+"khó khăn khi đ�c thư này được một th�i gian hữu ích, nhưng mà có thể làm như "
+"thế."
+
+#: ../mail/em-format-html-display.c:102
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+"Thư này được mã hoá. Ngư�i khác sẽ gặp khó khăn nhi�u khi đ�c nội dung thư."
+
+#: ../mail/em-format-html-display.c:103
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+"Thư này được mã hoá bằng thuật toán mật mã mạnh. Ngư�i khác sẽ gặp khó khăn "
+"rất nhi�u khi đ�c nội dung thư được th�i gian hữu ích. "
+
+#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
+msgid "_View Certificate"
+msgstr "_Xem chứng nhận"
+
+#: ../mail/em-format-html-display.c:254
+msgid "This certificate is not viewable"
+msgstr "Chứng nhận này không có khả năng xem"
+
+#: ../mail/em-format-html-display.c:566
+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 không thể hiện thư này vì nó quá lớn không xử lý được. Bạn vẫn còn "
+"có khả năng xem nó không có định dạng, hoặc trong trình soạn thảo văn bản "
+"bên ngoài."
+
+#: ../mail/em-format-html-display.c:756
+#| msgid "Save Message"
+#| msgid_plural "Save Messages"
+msgid "Save Image"
+msgstr "Lưu ảnh"
+
+#: ../mail/em-format-html-display.c:804
+#| msgid "Save Message..."
+msgid "Save _Image..."
+msgstr "Lưu ả_nh..."
+
+#: ../mail/em-format-html-display.c:806
+#| msgid "Save the current file"
+msgid "Save the image to a file"
+msgstr "Lưu ảnh vào tập tin"
+
+#: ../mail/em-format-html-display.c:1034
+msgid "Completed on"
+msgstr "Hoàn tất vào"
+
+#: ../mail/em-format-html-display.c:1046
+msgid "Overdue:"
+msgstr "Quá hạn:"
+
+#: ../mail/em-format-html-display.c:1054
+msgid "by"
+msgstr "vào"
+
+#: ../mail/em-format-html-display.c:1335 ../mail/em-format-html-display.c:1386
+msgid "View _Unformatted"
+msgstr "Xem _không định dạng"
+
+#: ../mail/em-format-html-display.c:1337
+msgid "Hide _Unformatted"
+msgstr "Ẩn _không định dạng"
+
+#: ../mail/em-format-html-display.c:1408
+msgid "O_pen With"
+msgstr "Mở _bằng"
+
+#: ../mail/em-format-html-print.c:176
+#, c-format
+msgid "Page %d of %d"
+msgstr "Trang %d trên %d"
+
+#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:122
+#, c-format
+msgid "No HTML stream available"
+msgstr "Không có luồng HTML"
+
+#: ../mail/em-subscription-editor.c:1162
+msgid "Folder Subscriptions"
+msgstr "�ăng ký thư mục"
+
+#: ../mail/em-subscription-editor.c:1201
+msgid "_Account:"
+msgstr "Tài _khoản:"
+
+#: ../mail/em-subscription-editor.c:1216
+msgid "Clear Search"
+msgstr "Xoá tìm kiếm"
+
+#: ../mail/em-subscription-editor.c:1234
+msgid "Sho_w items that contain:"
+msgstr "_Hiện mục chứa:"
+
+#: ../mail/em-subscription-editor.c:1273
+msgid "Subscribe to the selected folder"
+msgstr "�ăng ký thư mục được ch�n"
+
+#: ../mail/em-subscription-editor.c:1274
+msgid "Su_bscribe"
+msgstr "�ăng _ký"
+
+#: ../mail/em-subscription-editor.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
+msgid "Unsubscribe from the selected folder"
+msgstr "B� đăng ký thư mục được ch�n"
+
+#: ../mail/em-subscription-editor.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
+msgid "_Unsubscribe"
+msgstr "Hủ_y đăng ký"
+
+#: ../mail/em-subscription-editor.c:1297
+msgid "Collapse all folders"
+msgstr "Thu g�n m�i thư mục"
+
+#: ../mail/em-subscription-editor.c:1298
+msgid "C_ollapse All"
+msgstr "_Thu g�n hết"
+
+#: ../mail/em-subscription-editor.c:1308
+msgid "Expand all folders"
+msgstr "_Mở m�i thư mục"
+
+#: ../mail/em-subscription-editor.c:1309
+msgid "E_xpand All"
+msgstr "_Mở bung hết"
+
+#: ../mail/em-subscription-editor.c:1319
+msgid "Refresh the folder list"
+msgstr "Cập nhật danh sách thư mục"
+
+#: ../mail/em-subscription-editor.c:1331
+msgid "Stop the current operation"
+msgstr "Hủy thao tác hiện th�i"
+
+#. Translators: This message is shown only for ten or more
+#. * 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
+#, 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] "Bạn có chắc muốn mở cả %d thư cùng lúc không?"
+
+#: ../mail/em-utils.c:158
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
+msgid "_Do not show this message again"
+msgstr "�ừng hiện thông điệp nà_y lần nữa."
+
+#: ../mail/em-utils.c:333
+msgid "Message Filters"
+msgstr "Bộ l�c thư"
+
+#: ../mail/em-utils.c:918
+#, c-format
+msgid "Messages from %s"
+msgstr "Thừ từ %s"
+
+#: ../mail/em-vfolder-editor.c:108
+msgid "Search _Folders"
+msgstr "_Thư mục tìm kiếm"
+
+#: ../mail/em-vfolder-rule.c:618
+msgid "Add Folder"
+msgstr "Thêm thư mục"
+
+#: ../mail/evolution-mail.schemas.in.h:1
+#| msgid "Default window height"
+msgid "\"Filter Editor\" window height"
+msgstr "�ộ cao cửa sổ \"Filter Editor\""
+
+#: ../mail/evolution-mail.schemas.in.h:2
+#| msgid "\"Send and Receive Mail\" window maximize state"
+msgid "\"Filter Editor\" window maximize state"
+msgstr "Tình trạng phóng to cửa sổ \"Filter Editor\""
+
+#: ../mail/evolution-mail.schemas.in.h:3
+#| msgid "Default window width"
+msgid "\"Filter Editor\" window width"
+msgstr "�ộ rộng cửa sổ \"Filter Editor\""
+
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "\"Folder Subscriptions\" window height"
+msgstr "Chi�u cao cửa sổ \"�ăng ký thư mục\""
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "\"Folder Subscriptions\" window maximize state"
+msgstr "Trạng thái mở tối đa của cửa sổ \"�ăng ký thư mục\""
+
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "\"Folder Subscriptions\" window width"
+msgstr "Chi�u rộng cửa sổ \"�ăng ký thư mục\""
+
+#: ../mail/evolution-mail.schemas.in.h:7
+#| msgid "Default window height"
+msgid "\"Search Folder Editor\" window height"
+msgstr "�ộ cao cửa sổ \"Search Folder Editor\""
+
+#: ../mail/evolution-mail.schemas.in.h:8
+#| msgid "\"Send and Receive Mail\" window maximize state"
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "Tình trạng phóng to cửa sổ \"Search Folder Editor\""
+
+#: ../mail/evolution-mail.schemas.in.h:9
+#| msgid "Search Folder based on Mailing _List"
+msgid "\"Search Folder Editor\" window width"
+msgstr "�ộ rộng cửa sổ \"Search Folder Editor\""
+
+#: ../mail/evolution-mail.schemas.in.h:10
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Chi�u cao của cửa sổ « Gửi và Nhận Thư »"
+
+#: ../mail/evolution-mail.schemas.in.h:11
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "Tình trạng phóng to cửa sổ « Gửi và Nhận Thư »"
+
+#: ../mail/evolution-mail.schemas.in.h:12
+msgid "\"Send and Receive Mail\" window width"
+msgstr "Chi�u rộng của cửa sổ « Gửi và Nhận Thư »"
+
+#: ../mail/evolution-mail.schemas.in.h:13
+msgid "Always request read receipt"
+msgstr "Luôn luôn yêu cầu thông báo đã đ�c"
+
+#: ../mail/evolution-mail.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "Th�i lượng theo giây trong đó cần hiển thị lỗi trên thanh trạng thái."
+
+#: ../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"
+msgstr ""
+"H�i có đóng cửa sổ thư khi ngư�i dùng chuyển thư hoặc trả l�i thư của thư "
+"trong cửa sổ đang xem không."
+
+#: ../mail/evolution-mail.schemas.in.h:16
+msgid "Attribute message."
+msgstr "Thông điệp thuộc tính."
+
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid "Automatic emoticon recognition"
+msgstr "Tự động nhận dạng biểu tượng xúc cảm"
+
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid "Automatic link recognition"
+msgstr "Tự động nhận dạng liên kết"
+
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Check for new messages in all active accounts"
+msgstr "Kiểm tra thư mới cho m�i tài khoản hoạt động"
+
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Check for new messages on start"
+msgstr "Kiểm tra thư mới lúc khởi động"
+
+#: ../mail/evolution-mail.schemas.in.h:21
+msgid "Check incoming mail being junk"
+msgstr "Kiểm thư mới nhận là thư rác"
+
+#: ../mail/evolution-mail.schemas.in.h:22
+msgid "Citation highlight color"
+msgstr "Màu tô sáng trích dẫn"
+
+#: ../mail/evolution-mail.schemas.in.h:23
+msgid "Citation highlight color."
+msgstr "Màu tô sáng trích dẫn."
+
+#: ../mail/evolution-mail.schemas.in.h:24
+msgid "Composer Window default height"
+msgstr "�ộ cao mặc định cửa sổ soạn"
+
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Composer Window default width"
+msgstr "�ộ rộng mặc định cửa sổ soạn"
+
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid "Composer load/attach directory"
+msgstr "Thư mục nạp/đính của bộ cấu tạo"
+
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Compress display of addresses in TO/CC/BCC"
+msgstr "Thu g�n ô hiển thị các địa chỉ trong Cho/CC/BCC"
+
+#: ../mail/evolution-mail.schemas.in.h:28
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+"Thu g�n ô hiển thị các địa chỉ trong trư�ng Cho/CC/BCC thành số được xác "
+"định trong giá trị « address_count » (số đếm địa chỉ)"
+
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+"�i�u khiển khoảng đợi giữa hai lần đồng bộ các thay đổi cục bộ với máy phục "
+"vụ từ xa. Khoảng th�i gian tối thiểu là 30 giây."
+
+#: ../mail/evolution-mail.schemas.in.h:30
+msgid "Custom headers to use while checking for junk."
+msgstr "Các dòng đầu tự ch�n cần sử dụng trong khi kiểm tra có thư rác không."
+
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"Các dòng đầu tự ch�n cần sử dụng trong khi kiểm tra có thư rác không. Những "
+"mục danh sách là chuỗi theo định dạng « tên_dòng_đầu=giá_trị »."
+
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid "Default charset in which to compose messages"
+msgstr "Bộ ký tự mặc định để soạn thảo thư."
+
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid "Default charset in which to compose messages."
+msgstr "Bộ ký tự mặc định để soạn thảo thư."
+
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Default charset in which to display messages"
+msgstr "Bộ ký tự mặc định để hiển thị thư."
+
+#: ../mail/evolution-mail.schemas.in.h:35
+msgid "Default charset in which to display messages."
+msgstr "Bộ ký tự mặc định để hiển thị thư."
+
+#: ../mail/evolution-mail.schemas.in.h:36
+msgid "Default forward style"
+msgstr "Kiểu chuyển tiếp mặc định"
+
+#: ../mail/evolution-mail.schemas.in.h:37
+msgid "Default height of the Composer Window."
+msgstr "�ộ cao mặc định cửa Cửa sổ Soạn."
+
+#: ../mail/evolution-mail.schemas.in.h:38
+#| msgid "Default height of the Composer Window."
+msgid "Default height of the mail browser window."
+msgstr "�ộ cao mặc định của cửa sổ xem thư."
+
+#: ../mail/evolution-mail.schemas.in.h:39
+#| msgid "Default width of the Composer Window."
+msgid "Default maximized state of the mail browser window."
+msgstr "Tình trạng phóng to mặc định của cửa sổ xem thư."
+
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Default reply style"
+msgstr "Kiểu trả l�i mặc định"
+
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid "Default value for thread expand state"
+msgstr "Giá trị mặc định cho tình trạng dãn ra nhánh"
+
+#: ../mail/evolution-mail.schemas.in.h:42
+msgid "Default width of the Composer Window."
+msgstr "�ộ rộng mặc định cửa Cửa sổ Soạn,"
+
+#: ../mail/evolution-mail.schemas.in.h:43
+#| msgid "Default width of the Composer Window."
+msgid "Default width of the mail browser window."
+msgstr "�ộ rộng mặc định của cửa sổ soạn thư."
+
+#: ../mail/evolution-mail.schemas.in.h:44
+msgid ""
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded \"1\" = collapsed"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+"Quyết định có nên tra tìm địa chỉ để l�c ra thư rác chỉ trong sổ địa chỉ cục "
+"bộ hay không"
+
+#: ../mail/evolution-mail.schemas.in.h:46
+msgid "Determines whether to lookup in address book for sender email"
+msgstr ""
+"Quyết định có nên tra tìm trong sổ địa chỉ tìm địa chỉ thư của ngư�i gửi, "
+"hay không"
+
+#: ../mail/evolution-mail.schemas.in.h:47
+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 ""
+"Quyết định có nên tra tìm địa chỉ thư của ngư�i gửi trong sổ địa chỉ hay "
+"không. Tìm thấy thì nó không nên là thư rác. Chức năng này tra tìm trong "
+"những sổ được đánh dấu cho chức năng tự động đi�n nốt. Tiến trình này có thể "
+"chạy chậm nếu bạn đã đánh dấu sổ địa chỉ ở xa (v.d. LDAP) để tự động đi�n "
+"nốt."
+
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
+"Xác định có nên sử dụng các dòng đầu tự ch�n để kiểm tra có thư rác, hay "
+"không."
+
+#: ../mail/evolution-mail.schemas.in.h:49
+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 ""
+"Xác định có nên sử dụng các dòng đầu tự ch�n để kiểm tra có thư rác, hay "
+"không. Bật tùy ch�n này và ghi rõ những dòng đầu hữu ích, thì tăng tốc độ "
+"kiểm tra có thư rác."
+
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+msgstr ""
+"Xác định có nên sử dụng cùng một phông chữ trên cả hai dòng đầu « Từ » và « "
+"Chủ đ� » trong cột « Thư » khi xem theo chi�u d�c."
+
+#: ../mail/evolution-mail.schemas.in.h:51
+msgid "Directory for loading/attaching files to composer."
+msgstr "Thư mục từ đó cần nạp/đính tập tin vào bộ cấu tạo."
+
+#: ../mail/evolution-mail.schemas.in.h:52
+msgid "Directory for saving mail component files."
+msgstr "Thư mục vào đó cần lưu các tập tin thành phần thư."
+
+#: ../mail/evolution-mail.schemas.in.h:53
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr ""
+"Bật hay tắt thay thế phần tên thư mục bị cắt ngắn trong khung l� bằng dấu "
+"chấm lửng"
+
+#: ../mail/evolution-mail.schemas.in.h:54
+msgid "Display only message texts not exceeding certain size"
+msgstr "Chỉ hiện thư không vượt quá kích thước nhất định"
+
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid "Do not add signature delimiter"
+msgstr "Không thêm phân cách chữ ký"
+
+#: ../mail/evolution-mail.schemas.in.h:56
+msgid "Draw spelling error indicators on words as you type."
+msgstr "Vẽ chỉ báo lỗi chính tả trên từ khi gõ."
+
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid "Empty Junk folders on exit"
+msgstr "Làm sạch thư mục Thư rác khi thoát"
+
+#: ../mail/evolution-mail.schemas.in.h:58
+msgid "Empty Trash folders on exit"
+msgstr "Làm sạch thư mục Rác khi thoát"
+
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "Làm sạch thư mục Thư rác khi thoát kh�i trình Evolution."
+
+#: ../mail/evolution-mail.schemas.in.h:60
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Làm sạch thư mục Rác khi thoát trình Evolution."
+
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr "Bật chế độ con nháy, để bạn xem con chạy khi đ�c thư."
+
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid "Enable or disable magic space bar"
+msgstr "Bật/tắt phím dài ma thuật"
+
+#: ../mail/evolution-mail.schemas.in.h:64
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "Bật/tắt dấu nhắc trong khi đánh dấu nhi�u thư."
+
+#: ../mail/evolution-mail.schemas.in.h:65
+msgid "Enable or disable type ahead search feature"
+msgstr "Bật/tắt tính năng tìm kiếm gõ trước"
+
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid "Enable search folders"
+msgstr "Bật thư mục tìm kiếm"
+
+#: ../mail/evolution-mail.schemas.in.h:67
+msgid "Enable search folders on startup."
+msgstr "Bật thư mục tìm kiếm vào lúc khởi chạy."
+
+#: ../mail/evolution-mail.schemas.in.h:68
+msgid ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:69
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
+"Bật tùy ch�n này để sử dụng phím dài để cuộn qua ô xem thử thư, danh sách "
+"thư và các thư mục."
+
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:72
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:73
+msgid "Enable/disable caret mode"
+msgstr "Bật/tắt chế độ con nháy"
+
+#: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
+msgid "Encode file names in an Outlook/GMail way"
+msgstr "Mã hoá các tên tập tin theo kiểu dáng Outlook/GMail"
+
+#: ../mail/evolution-mail.schemas.in.h:75
+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 ""
+"Mã hoá các tên tập tin trên dòng đầu của thư bằng cùng một cách với Outlook "
+"hay GMail, để ứng dụng khách đó đ�c được tên tập tin địa hoá được Evolution "
+"gửi, vì tập tin như vậy không tùy theo RFC 2231, chỉ dùng tiêu chuẩn RFC "
+"2047 không đúng."
+
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "Flush Outbox after filtering"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "Forward message."
+msgstr "Chuyển thư."
+
+#: ../mail/evolution-mail.schemas.in.h:78
+msgid "Group Reply replies to list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:79
+msgid "Height of the message-list pane"
+msgstr "�ộ cao ô cửa sổ danh sách thư"
+
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid "Height of the message-list pane."
+msgstr "�ộ cao ô cửa sổ danh sách thư."
+
+#: ../mail/evolution-mail.schemas.in.h:81
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "Ẩn ô xem thử từng thư mục và gỡ b� vùng ch�n"
+
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
+msgstr ""
+"Nếu ngư�i dùng cố mở hơn 9 thư cùng lúc thì h�i nếu h� thật muốn làm như thế."
+
+#: ../mail/evolution-mail.schemas.in.h:83
+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 ""
+"Nếu Evolution không có bộ xem có sẵn cho một dạng MIME nào đó thì bất cứ "
+"dạng MIME nào xuất hiện trong danh sách này mà ánh xạ tới một bộ xem thành "
+"phần Bonobo trong cơ sở dữ liệu dạng MIME của GNOME thì có thể được sử dụng "
+"để hiển thị nội dung."
+
+#: ../mail/evolution-mail.schemas.in.h:84
+msgid "Ignore list Reply-To:"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr ""
+"Chi�u cao đầu tiên của cửa sổ \"Bộ đi�u chỉnh bộ l�c\". Giá trị này cứ cập "
+"nhật khi ngư�i dùng co giãn cửa sổ theo chi�u d�c."
+
+#: ../mail/evolution-mail.schemas.in.h:86
+#| msgid ""
+#| "Initial height of the \"Send and Receive Mail\" window. The value updates "
+#| "as the user resizes the window vertically."
+msgid ""
+"Initial height of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Chi�u cao ban đầu của cửa \"Folder Subscriptions\". Giá trị này cứ cập nhật "
+"khi ngư�i dùng co giãn cửa sổ theo chi�u d�c."
+
+#: ../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."
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Chi�u cao ban đầu của cửa \"Search Folder Editor\". Giá trị này cứ cập nhật "
+"khi ngư�i dùng co giãn cửa sổ theo chi�u d�c."
+
+#: ../mail/evolution-mail.schemas.in.h:88
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Chi�u cao đầu tiên của cửa sổ « Gửi và Nhận Thư ». Giá trị này cứ cập nhật "
+"khi ngư�i dùng co giãn cửa sổ theo chi�u d�c."
+
+#: ../mail/evolution-mail.schemas.in.h:89
+#| 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."
+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 ""
+"Tình trạng phóng to đầu tiên của cửa sổ \"Filter Editor\".  Giá trị này cứ "
+"cập nhật khi ngư�i dùng phóng to hay thu nh� cửa sổ. Ghi chú rằng giá trị cụ "
+"thể này không phải được Evolution dùng vì cửa sổ « Gửi và Nhận Thư » không "
+"phóng to được. Do đó khoá này chỉ tồn tại làm chi tiết thực hiện."
+
+#: ../mail/evolution-mail.schemas.in.h:90
+#| 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."
+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 ""
+"Tình trạng phóng to đầu tiên của cửa sổ \"Folder Subscriptions\".  Giá trị "
+"này cứ cập nhật khi ngư�i dùng phóng to hay thu nh� cửa sổ. Ghi chú rằng giá "
+"trị cụ thể này không phải được Evolution dùng vì cửa sổ « Gửi và Nhận Thư » "
+"không phóng to được. Do đó khoá này chỉ tồn tại làm chi tiết thực hiện."
+
+#: ../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."
+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 ""
+"Tình trạng phóng to đầu tiên của cửa sổ \"Search Folder Editor\".  Giá trị "
+"này cứ cập nhật khi ngư�i dùng phóng to hay thu nh� cửa sổ. Ghi chú rằng giá "
+"trị cụ thể này không phải được Evolution dùng vì cửa sổ « Gửi và Nhận Thư » "
+"không phóng to được. Do đó khoá này chỉ tồn tại làm chi tiết thực hiện."
+
+#: ../mail/evolution-mail.schemas.in.h:92
+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 ""
+"Tình trạng phóng to đầu tiên của cửa sổ « Gửi và Nhận Thư ».  Giá trị này cứ "
+"cập nhật khi ngư�i dùng phóng to hay thu nh� cửa sổ. Ghi chú rằng giá trị cụ "
+"thể này không phải được Evolution dùng vì cửa sổ « Gửi và Nhận Thư » không "
+"phóng to được. Do đó khoá này chỉ tồn tại làm chi tiết thực hiện."
+
+#: ../mail/evolution-mail.schemas.in.h:93
+#| msgid ""
+#| "Initial width of the \"Send and Receive Mail\" window. The value updates "
+#| "as the user resizes the window horizontally."
+msgid ""
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+msgstr ""
+"Chi�u rộng đầu tiên của cửa sổ \"Filter Editor\". Giá trị này cứ cập nhật "
+"khi ngư�i dùng co giãn cửa sổ theo chi�u ngang."
+
+#: ../mail/evolution-mail.schemas.in.h:94
+#| msgid ""
+#| "Initial width of the \"Send and Receive Mail\" window. The value updates "
+#| "as the user resizes the window horizontally."
+msgid ""
+"Initial width of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Chi�u rộng đầu tiên của cửa sổ \"Folder Subscriptions\". Giá trị này cứ cập "
+"nhật khi ngư�i dùng co giãn cửa sổ theo chi�u ngang."
+
+#: ../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."
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Chi�u rộng đầu tiên của cửa sổ \"Search Folder Editor\". Giá trị này cứ cập "
+"nhật khi ngư�i dùng co giãn cửa sổ theo chi�u ngang."
+
+#: ../mail/evolution-mail.schemas.in.h:96
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Chi�u rộng đầu tiên của cửa sổ « Gửi và Nhận Thư ». Giá trị này cứ cập nhật "
+"khi ngư�i dùng co giãn cửa sổ theo chi�u ngang."
+
+#: ../mail/evolution-mail.schemas.in.h:97
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:98
+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 ""
+"Nó bật/tắt tính năng cứ nhắc cảnh báo rằng việc xoá thư kh�i một thư mục tìm "
+"kiếm sẽ xoá hoàn toàn thư đó, không phải đơn giản gỡ b� nó kh�i kết quả tìm "
+"kiếm."
+
+#: ../mail/evolution-mail.schemas.in.h:99
+#| 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."
+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 ""
+"Nó bật/tắt tính năng cứ nhắc cảnh báo rằng việc gửi thư trả l�i riêng tư cho "
+"một thông điệp đến từ hộp thư chung."
+
+#: ../mail/evolution-mail.schemas.in.h:100
+#| msgid ""
+#| "It disables/enables the repeated prompts to ask if offline sync is "
+#| "required before going into offline mode."
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr ""
+"Nó bật/tắt tính năng cứ nhắc cảnh báo rằng việc gửi thư trả l�i cho nhi�u "
+"ngư�i/"
+
+#: ../mail/evolution-mail.schemas.in.h:101
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:102
+#| 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."
+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 ""
+"Nó bật/tắt tính năng cứ nhắc cảnh báo rằng việc gửi thư trả l�i cho ngư�i "
+"nhận không phải địa chỉ thư."
+
+#: ../mail/evolution-mail.schemas.in.h:103
+#| msgid "Last time empty junk was run"
+msgid "Last time Empty Junk was run"
+msgstr "Lần cuối cùng đổ thư mục thư rác"
+
+#: ../mail/evolution-mail.schemas.in.h:104
+#| msgid "Last time empty trash was run"
+msgid "Last time Empty Trash was run"
+msgstr "Lần cuối cùng đổ rác"
+
+#: ../mail/evolution-mail.schemas.in.h:105
+msgid "Layout style"
+msgstr "Kiểu bố cục"
+
+#: ../mail/evolution-mail.schemas.in.h:106
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
+msgid "Level beyond which the message should be logged."
+msgstr "Mức quá đó thư nên được ghi lưu."
+
+#: ../mail/evolution-mail.schemas.in.h:107
+msgid "List of Labels and their associated colors"
+msgstr "Danh sách Nhãn và màu sắc liên quan"
+
+#: ../mail/evolution-mail.schemas.in.h:108
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr "Danh sách các dạng MIME cần kiểm tra đối với bộ xem thành phần Bonobo"
+
+#: ../mail/evolution-mail.schemas.in.h:109
+msgid "List of accepted licenses"
+msgstr "Danh sách các quy�n phép đã chấp nhận"
+
+#: ../mail/evolution-mail.schemas.in.h:110
+msgid "List of accounts"
+msgstr "Danh sách các tài khoản"
+
+#: ../mail/evolution-mail.schemas.in.h:111
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+"Danh sách các tài khoản mà thành phần thư của Evolution biết được. Danh sách "
+"ấy chứa chuỗi lập tên của các thư mục con liên quan với /apps/evolution/mail/"
+"accounts."
+
+#: ../mail/evolution-mail.schemas.in.h:112
+msgid "List of custom headers and whether they are enabled."
+msgstr "Danh sách các dòng đầu tự ch�n và nếu bật chưa."
+
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "List of dictionary language codes used for spell checking."
+msgstr "Danh sách các mã ngôn ngữ từ điển được dùng để kiểm tra chính tả."
+
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
+msgstr ""
+"Danh sách các nhãn mà thành phần thư của Evolution biết được. Danh sách ấy "
+"chứa chuỗi name:color (tên:màu) mà màu ấy dạng hệ thập lục phân HTML."
+
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid "List of protocol names whose license has been accepted."
+msgstr "Danh sách các tên giao thức có quy�n đã chấp nhận."
+
+#: ../mail/evolution-mail.schemas.in.h:116
+msgid "Load images for HTML messages over HTTP"
+msgstr "Nạp qua HTTP các ảnh cho thư HTML"
+
+#: ../mail/evolution-mail.schemas.in.h:117
+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 ""
+"Tải qua HTTP(S) các ảnh cho thư HTML. Giá trị có thể:\n"
+"0 - không bao gi� tải ảnh từ Internet\n"
+"1 - tải ảnh trong thư đến tử liên lạc\n"
+"2 - lúc nào cũng tải ảnh từ Internet (không an toàn)"
+
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Log filter actions"
+msgstr "Ghi lưu các hành động l�c"
+
+#: ../mail/evolution-mail.schemas.in.h:119
+msgid "Log filter actions to the specified log file."
+msgstr "Ghi lưu các hành động l�c vào tập tin bản ghi đã ghi rõ."
+
+#: ../mail/evolution-mail.schemas.in.h:120
+msgid "Logfile to log filter actions"
+msgstr "Tập tin bản ghi nơi cần ghi lưu các hành động l�c."
+
+#: ../mail/evolution-mail.schemas.in.h:121
+msgid "Logfile to log filter actions."
+msgstr "Tập tin bản ghi nơi cần ghi lưu các hành động l�c."
+
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid "Mail browser height"
+msgstr "Chi�u cao trình duyệt thư"
+
+#: ../mail/evolution-mail.schemas.in.h:123
+msgid "Mail browser maximized"
+msgstr "Trình duyệt thư to tối đa"
+
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Mail browser width"
+msgstr "�ộ rộng trình duyệt thư"
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Mark as Seen after specified timeout"
+msgstr "�ánh dấu là �ã xem, sau th�i hạn đã ghi rõ."
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Mark as Seen after specified timeout."
+msgstr "�ánh dấu là �ã xem, sau th�i hạn đã ghi rõ."
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Mark citations in the message \"Preview\""
+msgstr "�ánh các trích dẫn trong thư « Xem thử »."
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Mark citations in the message \"Preview\"."
+msgstr "�ánh các trích dẫn trong thư « Xem thử »."
+
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Message text limit for display"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr ""
+"Kiểu dáng hiển thị thư (\"normal\" - chuẩn, \"full headers\" - dòng đầu đây "
+"đủ, \"source\" - mã nguồn)"
+
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "Minimum days between emptying the junk on exit"
+msgstr "Số ngày tối thiểu giữa hai lần xoá thư rác khi thoát."
+
+#: ../mail/evolution-mail.schemas.in.h:132
+msgid "Minimum days between emptying the trash on exit"
+msgstr "Số ngày tối thiểu giữa hai lần đổ rác khi thoát."
+
+#: ../mail/evolution-mail.schemas.in.h:133
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr "Th�i gian tối thiểu giữa hai lần xoá thư rác khi thoát, theo ngày."
+
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr "Th�i gian tối thiểu giữa hai lần sổ rác khi thoát, theo ngày."
+
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr "Số địa chỉ cần hiển thị trong Cho/CC/BCC"
+
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid "Original message."
+msgstr "Thư gốc."
+
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid "Path where picture gallery should search for its content"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:138
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:139
+#| msgid ""
+#| "The following recipients were not recognized as valid mail addresses:\n"
+#| "{0}"
+msgid "Prompt before sending to recipients not entered as mail addresses"
+msgstr "H�i trước khi gửi đến ngư�i nhận không được nhập vào như địa chỉ thư"
+
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid "Prompt on empty subject"
+msgstr "Nhắc khi có chủ đ� rỗng"
+
+#: ../mail/evolution-mail.schemas.in.h:141
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr "Nhắc ngư�i dùng khi h� cố xoá hẳn thư mục."
+
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr "Nhắc ngư�i dùng khi h� cố gửi thư chưa có Chủ đ�."
+
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid "Prompt when deleting messages in search folder"
+msgstr "Nhắc khi xoá thư kh�i thư mục tìm kiếm"
+
+#: ../mail/evolution-mail.schemas.in.h:144
+#| msgid "Prompt while marking multiple messages"
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "H�i khi có trả l�i riêng trong hộp thư chung"
+
+#: ../mail/evolution-mail.schemas.in.h:145
+#| msgid "Prompt while marking multiple messages"
+msgid "Prompt when replying privately to list messages"
+msgstr "H�i khi trả l�i riêng cho hộp thư chung"
+
+#: ../mail/evolution-mail.schemas.in.h:146
+#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgid "Prompt when replying to many recipients"
+msgstr "H�i khi trả l�i cho nhi�u ngư�i"
+
+#: ../mail/evolution-mail.schemas.in.h:147
+msgid "Prompt when user expunges"
+msgstr "Nhắc khi ngư�i dùng xoá hẳn"
+
+#: ../mail/evolution-mail.schemas.in.h:148
+msgid "Prompt when user only fills Bcc"
+msgstr "Nhắc khi ngư�i dùng chỉ nhập Bcc"
+
+#: ../mail/evolution-mail.schemas.in.h:149
+msgid "Prompt when user tries to open 10 or more messages at once"
+msgstr "Nhắc khi ngư�i dùng cố mở hơn 9 thư cùng lúc"
+
+#: ../mail/evolution-mail.schemas.in.h:150
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "Nhắc khi ngư�i dùng cố gửi thư HTML cho liên lạc không muốn nhận HTML."
+
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+"Nhắc khi ngư�i dùng cố gửi thư mà không có ngư�i nhận Cho (To) hay Chép Cho "
+"(CC)."
+
+#: ../mail/evolution-mail.schemas.in.h:152
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr "Nhắc khi ngư�i dùng cố gửi thư dạng HTML không phải được muốn"
+
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid "Prompt while marking multiple messages"
+msgstr "Nhắc khi đánh dấu nhi�u thư"
+
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid "Put personalized signatures at the top of replies"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:155
+#| msgid "Start _typing at the bottom on replying"
+msgid "Put the cursor at the bottom of replies"
+msgstr "�ặt con tr� ở phần cuối của trả l�i"
+
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Recognize emoticons in text and replace them with images."
+msgstr "Nhận dạng hình cư�i trong văn bản và thay thế bằng ảnh."
+
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "Recognize links in text and replace them."
+msgstr "Nhận ra m�i liên kết trong văn bản và thay thế chúng."
+
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid "Run junk test on incoming mail."
+msgstr "Chạy phép thử thư rác khi thư gửi đến"
+
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid "Save directory"
+msgstr "Thư mục lưu"
+
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid "Search for the sender photo in local address books"
+msgstr "Tìm kiếm ảnh chụp ngư�i gửi trong các sổ địa chỉ cục bộ"
+
+#: ../mail/evolution-mail.schemas.in.h:161
+msgid "Send HTML mail by default"
+msgstr "Gửi thư dạng HTML theo mặc định"
+
+#: ../mail/evolution-mail.schemas.in.h:162
+msgid "Send HTML mail by default."
+msgstr "Gửi thư dạng HTML theo mặc định"
+
+#: ../mail/evolution-mail.schemas.in.h:163
+msgid "Sender email-address column in the message list"
+msgstr "Cột địa chỉ thư cua ngư�i gửi trong danh sách thư"
+
+#: ../mail/evolution-mail.schemas.in.h:164
+msgid "Server synchronization interval"
+msgstr "Khoảng đợi đồng bộ máy chủ"
+
+#: ../mail/evolution-mail.schemas.in.h:165
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:166
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:167
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:168
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:169
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:170
+#| msgid "Also encrypt to sel_f when sending encrypted messages"
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "Hiện trư�ng \"Reply To\" khi gửi thư"
+
+#: ../mail/evolution-mail.schemas.in.h:171
+msgid "Show Animations"
+msgstr "Hiện hoạt cảnh"
+
+#: ../mail/evolution-mail.schemas.in.h:172
+msgid "Show all message headers"
+msgstr "Hiện hết dòng đầu thư"
+
+#: ../mail/evolution-mail.schemas.in.h:173
+msgid "Show all the headers when viewing a messages."
+msgstr "Hiện hết tất cả dòng đầu khi xem thư."
+
+#: ../mail/evolution-mail.schemas.in.h:174
+msgid "Show animated images as animations."
+msgstr "Hiện ảnh đã hoạt cảnh kiểu hoạt cảnh."
+
+#: ../mail/evolution-mail.schemas.in.h:175
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr "Hiển thị m�i thư bị xoá (kiểu gạch đè) trong danh sách các thư."
+
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Show deleted messages in the message-list"
+msgstr "Hiển thị thư bị xoá trong danh sách các thư."
+
+#: ../mail/evolution-mail.schemas.in.h:177
+msgid "Show image animations"
+msgstr "Hiện hoạt cảnh ảnh"
+
+#: ../mail/evolution-mail.schemas.in.h:178
+msgid "Show original \"Date\" header value."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:179
+msgid "Show photo of the sender"
+msgstr "Hiện ảnh chụp của ngư�i gửi"
+
+#: ../mail/evolution-mail.schemas.in.h:180
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:181
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:185
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr ""
+"Hiển thị địa chỉ thư của ngư�i gửi trong một cột riêng trong danh sách thư."
+
+#: ../mail/evolution-mail.schemas.in.h:186
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:187
+msgid "Show the photo of the sender in the message reading pane."
+msgstr "Hiển thị ảnh chụp của ngư�i gửi trong ô cửa sổ đ�c thư."
+
+#: ../mail/evolution-mail.schemas.in.h:188
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:189
+msgid "Spell check inline"
+msgstr "Kiểm tra trực tiếp chính tả"
+
+#: ../mail/evolution-mail.schemas.in.h:190
+msgid "Spell checking color"
+msgstr "Màu kiểm tra chính tả"
+
+#: ../mail/evolution-mail.schemas.in.h:191
+msgid "Spell checking languages"
+msgstr "Ngôn ngữ kiểm tra chính tả"
+
+#: ../mail/evolution-mail.schemas.in.h:192
+msgid "State of message headers in paned view"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:193
+msgid "Terminal font"
+msgstr "Phông chữ thiết bị cuối"
+
+#: ../mail/evolution-mail.schemas.in.h:194
+msgid "The default plugin for Junk hook"
+msgstr "Phần bổ sung mặc định cho móc Thư rác"
+
+#: ../mail/evolution-mail.schemas.in.h:195
+#| msgid "The last time empty junk was run, in days since the epoch."
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr "Lần cuối cùng xoá thư rác, theo ngày từ 01/01/1970 (Epoch)."
+
+#: ../mail/evolution-mail.schemas.in.h:196
+#| msgid "The last time empty trash was run, in days since the epoch."
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr "Lần cuối cùng đã chạy đổ rác, theo ngày từ 01/01/1970 (Epoch)."
+
+#: ../mail/evolution-mail.schemas.in.h:197
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:198
+msgid "The terminal font for mail display."
+msgstr "Phông chữ thiết bị cuối để hiển thị thư."
+
+#: ../mail/evolution-mail.schemas.in.h:199
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:200
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:201
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:202
+msgid "The variable width font for mail display."
+msgstr "Phông chữ độ rộng biến đổi để hiển thị thư."
+
+#: ../mail/evolution-mail.schemas.in.h:203
+msgid ""
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+msgstr ""
+"Có ba giá trị có thể:\n"
+" • 0\t\tlỗi\n"
+" • 1\t\tcảnh báo\n"
+" • 2\t\tthông điệp gỡ lỗi."
+
+#: ../mail/evolution-mail.schemas.in.h:204
+#| msgid ""
+#| "This decides the max size of the text part that can be formatted under "
+#| "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+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 ""
+"Xác định kích thước tối đa của thư có thể hiển thị trong Evolution, theo KB. "
+"Giá trị mặc định là 4096 (4MB). Giá trị này chỉ được dùng khi khoá "
+"'force_message_limit' được bật."
+
+#: ../mail/evolution-mail.schemas.in.h:205
+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 ""
+"�ây là phần bổ sung Thư rác mặc định, mặc dù có nhi�u phần bổ sung được hiệu "
+"lực. Vậy nếu phần bổ sung đã liệt kê mặc định bị tắt, nó không bị thay thế "
+"bằng phần bổ sung sẵn sàng khác."
+
+#: ../mail/evolution-mail.schemas.in.h:206
+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 ""
+"Khoá này được đ�c chỉ một lần, và đặt lại thành \"false\" (sai) sau khi đ�c. "
+"Hành vi này thì b� ch�n thư trong danh sách, và gỡ bo ô xem thử đối với thư "
+"mục đó."
+
+#: ../mail/evolution-mail.schemas.in.h:207
+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 ""
+"Khoá này nên chứa danh sách các cấu trúc XML ghi rõ dòng đầu tự ch�n, và nếu "
+"sẽ hiển thị chúng. Dạng thức của cấu trúc XML là:\n"
+"&lt;header enabled&gt;\n"
+"(lập đã bật dòng đầu, nếu sẽ hiển thị dòng đầu ấy trong ô xem thư)."
+
+#: ../mail/evolution-mail.schemas.in.h:208
+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 ""
+"Tùy ch�n này liên quan đến khoá lookup_addressbook (tra tìm trong sổ địa "
+"chỉ) và được dùng để quyết định có nên tra tìm địa chỉ chỉ trong sổ địa chỉ "
+"cục bộ, để loại trừ kh�i tiến trình l�c ra thư rác các thư được gửi bởi liên "
+"lạc đã biết."
+
+#: ../mail/evolution-mail.schemas.in.h:209
+msgid "This option would help in improving the speed of fetching."
+msgstr "Tùy ch�n này sẽ tăng tốc độ lấy thư."
+
+#: ../mail/evolution-mail.schemas.in.h:210
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr ""
+"Tùy ch�n này đặt số địa chỉ cần hiển thị trong ô xem danh sách thư mặc định, "
+"ở ngoại đó hiển thị dấu chấm lửng (…)."
+
+#: ../mail/evolution-mail.schemas.in.h:211
+#| msgid ""
+#| "This setting specifies whether the threads should be in expanded or "
+#| "collapsed state by default. Evolution requires a restart."
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Requires a restart to apply."
+msgstr ""
+"Thiết lập này xác định các nhánh nên được giãn ra hay co lại theo mặc định. "
+"Evolution cần thiết khởi chạy lại."
+
+#: ../mail/evolution-mail.schemas.in.h:212
+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 ""
+"Thiết lập này xác định các nhánh nên được sắp xếp dựa vào thư mới nhất trong "
+"mỗi nhánh, hơn là theo ngày tháng nhận thư. Cần phải khởi chạy lại Evolution."
+
+#: ../mail/evolution-mail.schemas.in.h:213
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:214
+msgid "Thread the message-list based on Subject"
+msgstr "Hiển thị nhánh trong danh sách thư, theo Chủ đ�"
+
+#: ../mail/evolution-mail.schemas.in.h:215
+msgid "Timeout for marking message as seen"
+msgstr "Th�i hạn đánh dấu thư �ã xem"
+
+#: ../mail/evolution-mail.schemas.in.h:216
+msgid "Timeout for marking message as seen."
+msgstr "Th�i hạn đánh dấu thư �ã xem."
+
+#: ../mail/evolution-mail.schemas.in.h:217
+msgid "UID string of the default account."
+msgstr "Chuỗi UID của tài khoản mặc định."
+
+#: ../mail/evolution-mail.schemas.in.h:218
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
+"Màu gạch dưới cho từ sai chính tả khi dùng chức năng chính tả trực tiếp."
+
+#: ../mail/evolution-mail.schemas.in.h:219
+msgid "Use custom fonts"
+msgstr "Dùng phông chữ tự ch�n"
+
+#: ../mail/evolution-mail.schemas.in.h:220
+msgid "Use custom fonts for displaying mail."
+msgstr "Dùng phông chữ tự ch�n để hiển thị thư."
+
+#: ../mail/evolution-mail.schemas.in.h:221
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:222
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:223
+msgid "Variable width font"
+msgstr "Phông chữ rộng biến"
+
+#: ../mail/evolution-mail.schemas.in.h:224
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr ""
+"Mặc định là có nên thêm vào mỗi thư một yêu cầu thông báo đã đ�c, hay không."
+
+#: ../mail/evolution-mail.schemas.in.h:225
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:226
+msgid ""
+"Whether check for new messages when Evolution is started. This includes also "
+"sending messages from Outbox."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:227
+msgid "Whether disable ellipsizing feature of folder names in side bar."
+msgstr ""
+"Có nên tắt tính năng thay thế phần còn lại của tên thư mục bị cắt ngắn trong "
+"khung l� bằng dấu chấm lửng, hay không."
+
+#: ../mail/evolution-mail.schemas.in.h:228
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+"Có nên trở v� tạo nhánh thư theo chủ đ� khi thư không chứa dòng đầu In-Reply-"
+"To (trả l�i theo thư trước) hay References (tham chiếu)."
+
+#: ../mail/evolution-mail.schemas.in.h:229
+msgid "Whether sort threads based on latest message in that thread"
+msgstr "Có nên sắp xếp nhánh dựa vào thư mới nhất trong nhánh, hay không"
+
+#: ../mail/evolution-mail.schemas.in.h:230
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:231
+msgid "Width of the message-list pane"
+msgstr "�ộ rộng ô cửa sổ danh sách thư"
+
+#: ../mail/evolution-mail.schemas.in.h:232
+msgid "Width of the message-list pane."
+msgstr "�ộ rộng của ô cửa sổ danh sách thư."
+
+#: ../mail/importers/elm-importer.c:181
+msgid "Importing Elm data"
+msgstr "�ang nhập dữ liệu Elm..."
+
+#: ../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:520
+msgid "Mail"
+msgstr "Thư tín"
+
+#: ../mail/importers/elm-importer.c:396
+msgid "Evolution Elm importer"
+msgstr "Bộ nhập Elm vào Evolution"
+
+#: ../mail/importers/elm-importer.c:397
+msgid "Import mail from Elm."
+msgstr "�ang nhập thư từ Elm"
+
+#: ../mail/importers/evolution-mbox-importer.c:138
+#: ../plugins/dbx-import/dbx-importer.c:250
+msgid "_Destination folder:"
+msgstr "_Thư mục đích:"
+
+#: ../mail/importers/evolution-mbox-importer.c:145
+#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../plugins/pst-import/pst-importer.c:460
+msgid "Select folder"
+msgstr "Ch�n thư mục"
+
+#: ../mail/importers/evolution-mbox-importer.c:146
+#: ../plugins/dbx-import/dbx-importer.c:261
+#: ../plugins/pst-import/pst-importer.c:461
+msgid "Select folder to import into"
+msgstr "Ch�n thư mục để nhập vào"
+
+#: ../mail/importers/evolution-mbox-importer.c:433
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "Chủ đ�"
+
+#: ../mail/importers/evolution-mbox-importer.c:438
+msgctxt "mboxImp"
+msgid "From"
+msgstr "Từ"
+
+#: ../mail/importers/evolution-mbox-importer.c:482
+#: ../shell/e-shell-utils.c:221
+msgid "Berkeley Mailbox (mbox)"
+msgstr "Berkeley Mailbox (mbox)"
+
+#: ../mail/importers/evolution-mbox-importer.c:483
+msgid "Importer Berkeley Mailbox format folders"
+msgstr "Bộ nhập thư mục dạng Berkeley Mailbox"
+
+#: ../mail/importers/mail-importer.c:64
+msgid "Importing mailbox"
+msgstr "�ang nhập hộp thư..."
+
+#. 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
+#, c-format
+msgid "Importing '%s'"
+msgstr "�ang nhập '%s'"
+
+#: ../mail/importers/mail-importer.c:316
+#, c-format
+msgid "Scanning %s"
+msgstr "�ang quét %s..."
+
+#: ../mail/importers/pine-importer.c:260
+msgid "Importing Pine data"
+msgstr "�ang nhập dữ liệu Pine..."
+
+#: ../mail/importers/pine-importer.c:463
+#: ../modules/addressbook/addressbook-config.c:1081
+msgid "Address Book"
+msgstr "Sổ địa chỉ"
+
+#: ../mail/importers/pine-importer.c:509
+msgid "Evolution Pine importer"
+msgstr "Bộ nhập Pine vào Evolution"
+
+#: ../mail/importers/pine-importer.c:510
+msgid "Import mail from Pine."
+msgstr "Nhập thư từ Pine"
+
+#: ../mail/mail-autofilter.c:72
+#, c-format
+msgid "Mail to %s"
+msgstr "Gửi thư chơ %s"
+
+#: ../mail/mail-autofilter.c:228 ../mail/mail-autofilter.c:271
+#, c-format
+msgid "Mail from %s"
+msgstr "Thừ từ %s"
+
+#: ../mail/mail-autofilter.c:254
+#, c-format
+msgid "Subject is %s"
+msgstr "Chủ để là %s"
+
+#: ../mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "Há»™p thÆ° chung %s"
+
+#: ../mail/mail-autofilter.c:404
+msgid "Add Filter Rule"
+msgstr "Thêm quy tắc l�c"
+
+#. Translators: The first %s is name of the affected
+#. * filter rule(s), the second %s is URI of the removed
+#. * 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:507
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been modified to account for the deleted folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"Quy tắc l�c sau\n"
+"%s đã bị thay đổi vì thư mục bị xoá\n"
+"\"%s\"."
+
+#: ../mail/mail-config.ui.h:2
+msgid "Add Ne_w Signature..."
+msgstr "Thêm chữ _ký mới..."
+
+#: ../mail/mail-config.ui.h:3
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "_Luôn ký tên lên các thư cần gửi đi khi dùng tài khoản này"
+
+#: ../mail/mail-config.ui.h:4
+msgid ""
+"All new emails with header that matches given content will be automatically "
+"filtered as junk"
+msgstr ""
+"M�i thư dòng đầu trùng khớp nội dung cho trước sẽ tự động được đánh dấu là "
+"thư rác"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:6
+msgid "Allowing a _mailing list to redirect a private reply to the list"
+msgstr "Cho phép _hộp thư chung chuyển hướng trả l�i riêng sang hộp thư"
+
+#: ../mail/mail-config.ui.h:7
+msgid "Also encrypt to sel_f when sending encrypted messages"
+msgstr "Cũng mật mã hoá ch_o chính bạn khi gửi thư đã mật mã"
+
+#: ../mail/mail-config.ui.h:8
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Luôn _Chép Cho (Cc) tới:"
+
+#: ../mail/mail-config.ui.h:9
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Luôn _Bí mật Chép Cho (Bcc) tới:"
+
+#: ../mail/mail-config.ui.h:10
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr "Luôn _tin khoá trong dây khoá tôi khi mã hoá"
+
+#: ../mail/mail-config.ui.h:11
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr "Luôn luôn mật _mã hoá cho chính bạn khi gửi thư đã mật mã"
+
+#: ../mail/mail-config.ui.h:12
+msgid "Always request rea_d receipt"
+msgstr "Luôn luôn _yêu cầu thông báo đã đ�c"
+
+#: ../mail/mail-config.ui.h:13
+msgid "Apply the same _view settings to all folders"
+msgstr "Dùng _cùng thiết lập cho m�i thư mục"
+
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1088
+msgid "Authentication"
+msgstr "Xác thực"
+
+#: ../mail/mail-config.ui.h:16
+msgid "Automatically insert _emoticon images"
+msgstr "Tự động chèn biểu tượng _xúc cảm"
+
+#: ../mail/mail-config.ui.h:17
+msgid "C_haracter set:"
+msgstr "Bộ _ký tự:"
+
+#: ../mail/mail-config.ui.h:18
+msgid "Ch_eck for Supported Types"
+msgstr "_Kiểm tra có kiểu được hỗ trợ"
+
+#: ../mail/mail-config.ui.h:19
+msgid "Check cu_stom headers for junk"
+msgstr "Kiểm tra dòng đầ_u tự ch�n tìm thư rác"
+
+#: ../mail/mail-config.ui.h:20
+msgid "Check for new _messages on start"
+msgstr "_Kiểm tra có thư mới lúc khởi động"
+
+#: ../mail/mail-config.ui.h:21
+msgid "Check for new messa_ges in all active accounts"
+msgstr "_Kiểm tra có thư mới trong tất cả tài khoản hoạt động"
+
+#: ../mail/mail-config.ui.h:22
+msgid "Check incoming _messages for junk"
+msgstr "Kiểm tra thư gửi đến là thư _rác"
+
+#: ../mail/mail-config.ui.h:23
+msgid "Check spelling while I _type"
+msgstr "Kiểm tra chính _tả khi đang gõ"
+
+#: ../mail/mail-config.ui.h:24
+msgid "Cle_ar"
+msgstr "Xó_a"
+
+#: ../mail/mail-config.ui.h:25
+msgid "Clea_r"
+msgstr "X_oá"
+
+#: ../mail/mail-config.ui.h:26
+msgid "Color for _misspelled words:"
+msgstr "_Màu từ gõ sai:"
+
+#: ../mail/mail-config.ui.h:27
+msgid "Composing Messages"
+msgstr "Viết thư"
+
+#: ../mail/mail-config.ui.h:28
+#: ../modules/plugin-manager/evolution-plugin-manager.c:161
+msgid "Configuration"
+msgstr "Cấu hình"
+
+#: ../mail/mail-config.ui.h:29
+msgid "Confirm _when expunging a folder"
+msgstr "_Xác nhận khi xoá hẳn thư mục"
+
+#: ../mail/mail-config.ui.h:30
+msgid "Confirmations"
+msgstr "Xác nhận"
+
+#: ../mail/mail-config.ui.h:31
+#: ../modules/addressbook/autocompletion-config.c:188
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
+msgid "Date/Time Format"
+msgstr "�ịnh dạng th�i gian"
+
+#: ../mail/mail-config.ui.h:33
+msgid "Default Behavior"
+msgstr "Hành vi mặc định"
+
+#: ../mail/mail-config.ui.h:34
+msgid "Default character e_ncoding:"
+msgstr "Bộ ký tự mặc đị_nh:"
+
+#: ../mail/mail-config.ui.h:35
+msgid "Delete Mail"
+msgstr "Xoá thư"
+
+#: ../mail/mail-config.ui.h:36
+msgid "Delete junk messages on e_xit"
+msgstr "_Xoá thư rác khi thoát"
+
+#: ../mail/mail-config.ui.h:38
+msgid "Digitally sign o_utgoing messages (by default)"
+msgstr "Ký _số lên các thư gửi đi (theo mặc định)"
+
+#: ../mail/mail-config.ui.h:39
+msgid "Displayed Message Headers"
+msgstr "Dòng đầu thư được hiện"
+
+#: ../mail/mail-config.ui.h:40
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr ""
+"�ừng đánh dấu thư là thư rác nếu ngư�i gửi nằm trong _sổ địa chỉ của tôi"
+
+#: ../mail/mail-config.ui.h:41
+msgid "Do not quote"
+msgstr "�ừng trích dẫn"
+
+#: ../mail/mail-config.ui.h:42
+msgid "Drafts _Folder:"
+msgstr "Hộp _Nháp:"
+
+#: ../mail/mail-config.ui.h:43
+msgid "Email _Address:"
+msgstr "�ị_a chỉ thư:"
+
+#: ../mail/mail-config.ui.h:44
+msgid "Empty trash folders on e_xit"
+msgstr "Làm sạch thư mục _rác khi thoát"
+
+#: ../mail/mail-config.ui.h:46
+msgid "Encry_ption certificate:"
+msgstr "Chứng nhận _mã hoá:"
+
+#: ../mail/mail-config.ui.h:47
+msgid "Encrypt out_going messages (by default)"
+msgstr "Mật mã m�i thư cần _gửi đi (theo mặc định)"
+
+#: ../mail/mail-config.ui.h:48
+msgid "F_all back to threading messages by subject"
+msgstr "Trở _v� tạo nhánh thư theo chủ đ�"
+
+#: ../mail/mail-config.ui.h:49
+msgid "Fix_ed Width Font:"
+msgstr "Phông độ rộng cố định:"
+
+#: ../mail/mail-config.ui.h:50
+msgid "Format messages in _HTML"
+msgstr "�ịnh dạng thư bằng _HTML"
+
+#: ../mail/mail-config.ui.h:51
+msgid "Full Nam_e:"
+msgstr "_H� tên:"
+
+#: ../mail/mail-config.ui.h:53
+msgid "Group Reply goes only to mailing list, if possible"
+msgstr "Trả l�i nhóm đến hộp thư chung thôi, nếu có thể"
+
+#: ../mail/mail-config.ui.h:54
+msgid "HTML Messages"
+msgstr "ThÆ° HTML"
+
+#: ../mail/mail-config.ui.h:55
+msgid "H_TTP Proxy:"
+msgstr "Ủy nhiệm H_TTP:"
+
+#: ../mail/mail-config.ui.h:56
+#| msgid "Sender contains"
+msgid "Header content"
+msgstr "Nội dung dòng đầu"
+
+#: ../mail/mail-config.ui.h:57
+#| msgid "Header Name:"
+msgid "Header name"
+msgstr "Tên dòng đầu"
+
+#: ../mail/mail-config.ui.h:58
+msgid "Headers"
+msgstr "Dòng đầu"
+
+#: ../mail/mail-config.ui.h:59
+msgid "Highlight _quotations with"
+msgstr "Tô _sang trích dẫn bằng"
+
+#: ../mail/mail-config.ui.h:60
+msgid "Ignore Reply-To: for mailing lists"
+msgstr "B� qua Reply-To: đối với hộp thư chung"
+
+#: ../mail/mail-config.ui.h:61
+msgid "Inline"
+msgstr "Trực tiếp"
+
+#: ../mail/mail-config.ui.h:62
+msgid "Inline (Outlook style)"
+msgstr "Trực tiếp (kiểu Outlook)"
+
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
+msgid "Labels"
+msgstr "Nhãn"
+
+#: ../mail/mail-config.ui.h:65
+msgid "Languages Table"
+msgstr "Bảng Ngôn ngữ"
+
+#: ../mail/mail-config.ui.h:66
+msgid "Loading Images"
+msgstr "�ang nạp ảnh"
+
+#: ../mail/mail-config.ui.h:67
+msgid "Mail Headers Table"
+msgstr "Bảng dòng đầu thư"
+
+#: ../mail/mail-config.ui.h:68
+msgid "Mailbox location"
+msgstr "�ịa điểm hộp thư"
+
+#: ../mail/mail-config.ui.h:69
+msgid "Message Display"
+msgstr "Hiển thị thư"
+
+#: ../mail/mail-config.ui.h:70
+msgid "Message Receipts"
+msgstr "Ngư�i nhận thư"
+
+#: ../mail/mail-config.ui.h:71
+msgid "No _Proxy for:"
+msgstr "Không đặt ủ_y nhiệm cho:"
+
+#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr "Không mã hoá"
+
+#: ../mail/mail-config.ui.h:73
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr "Tùy ch�n này bị b� qua nếu tìm thấy dòng đầu thư rác riêng."
+
+#: ../mail/mail-config.ui.h:74
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+msgid "Optional Information"
+msgstr "Thông tin tuỳ ch�n"
+
+#: ../mail/mail-config.ui.h:76
+msgid "Or_ganization:"
+msgstr "Tổ _chức:"
+
+#: ../mail/mail-config.ui.h:77
+msgid "PGP/GPG _Key ID:"
+msgstr "Mã số _khoá PGP/GPG:"
+
+#: ../mail/mail-config.ui.h:78
+msgid "Pass_word:"
+msgstr "Mật k_hẩu:"
+
+#: ../mail/mail-config.ui.h:79
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
+msgid "Pick a color"
+msgstr "Ch�n màu"
+
+#: ../mail/mail-config.ui.h:80
+msgid "Port:"
+msgstr "Cổng:"
+
+#: ../mail/mail-config.ui.h:81
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "Pretty Good Privacy (PGP/GPG)"
+
+#: ../mail/mail-config.ui.h:83
+msgid "Proxy Settings"
+msgstr "Thiết lập uỷ nhiệm"
+
+#: ../mail/mail-config.ui.h:84
+msgid "Quoted"
+msgstr "Trích dẫn"
+
+#: ../mail/mail-config.ui.h:85
+msgid "Re_member password"
+msgstr "Nhớ _mật khẩu"
+
+#: ../mail/mail-config.ui.h:86
+msgid "Re_ply-To:"
+msgstr "T_rả l�i cho:"
+
+#: ../mail/mail-config.ui.h:87
+msgid "Remember _password"
+msgstr "Nhớ _mật khẩu"
+
+#: ../mail/mail-config.ui.h:88
+msgid "Replies and Forwards"
+msgstr "Trả l�i và chuyển tiếp"
+
+#: ../mail/mail-config.ui.h:89
+msgid "Required Information"
+msgstr "Thông tin bắt buộc"
+
+#: ../mail/mail-config.ui.h:90
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/mail-config.ui.h:91
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/mail-config.ui.h:92
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/mail-config.ui.h:93
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "Mật mã SSL"
+
+#: ../mail/mail-config.ui.h:95
+msgid "SSL is not supported in this build of Evolution"
+msgstr "Bản Evolution này không hỗ trợ SSL"
+
+#: ../mail/mail-config.ui.h:96
+msgid "S_earch for sender photograph only in local address books"
+msgstr "Tìm kiếm ảnh chụ_p ngư�i gửi chỉ trong các sổ địa chỉ cục bộ"
+
+#: ../mail/mail-config.ui.h:97
+msgid "S_elect..."
+msgstr "_Ch�n..."
+
+#: ../mail/mail-config.ui.h:98
+msgid "S_end message receipts:"
+msgstr "_Gửi thông báo đã đ�c thư:"
+
+#: ../mail/mail-config.ui.h:99
+msgid "S_tandard Font:"
+msgstr "Phông chữ _chuẩn:"
+
+#: ../mail/mail-config.ui.h:100
+msgid "Secure MIME (S/MIME)"
+msgstr "Secure MIME (S/MIME)"
+
+#: ../mail/mail-config.ui.h:102
+msgid "Select HTML fixed width font"
+msgstr "Ch�n phông chữ HTML độ rộng cứng"
+
+#: ../mail/mail-config.ui.h:103
+msgid "Select HTML variable width font"
+msgstr "Ch�n phông chữ độ rộng biến HTML"
+
+#: ../mail/mail-config.ui.h:104
+msgid "Sender Photograph"
+msgstr "Ảnh ngư�i gửi"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:106
+msgid "Sending a _private reply to a mailing list message"
+msgstr "Gửi trả l�i _riêng cho một thư từ hộp thư chung"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:108
+#| msgid "Sending a message with only _Bcc recipients defined"
+msgid "Sending a message with _recipients not entered as mail addresses"
+msgstr "Gửi thư đến ngư�i nhận không xác định trong phần địa chỉ thư"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:110
+msgid "Sending a message with an _empty subject line"
+msgstr "Gửi thư với dòng chủ đ� để _trống"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:112
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "Gửi thư chỉ đến địa chỉ trong _Bcc"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:114
+msgid "Sending a reply to a large _number of recipients"
+msgstr "Gửi thư đến rất _nhi�u ngư�i nhận"
+
+#: ../mail/mail-config.ui.h:115
+msgid "Sent _Messages Folder:"
+msgstr "Thư _mục thư �ã gửi:"
+
+#: ../mail/mail-config.ui.h:116
+msgid "Ser_ver requires authentication"
+msgstr "Máy phục _vụ cần thiết xác thực"
+
+#: ../mail/mail-config.ui.h:117
+msgid "Server Configuration"
+msgstr "Cấu hình máy chủ"
+
+#: ../mail/mail-config.ui.h:118
+msgid "Server _Type:"
+msgstr "_Kiểu máy chủ:"
+
+#: ../mail/mail-config.ui.h:119
+#| msgid "Add Custom Junk Header"
+msgid "Set custom junk header"
+msgstr "�ặt dòng đầu thư rác tự ch�n"
+
+#: ../mail/mail-config.ui.h:120
+msgid "Si_gning algorithm:"
+msgstr "_Thuật toán ký tên:"
+
+#: ../mail/mail-config.ui.h:121
+msgid "Sig_natures"
+msgstr "Chữ _ký"
+
+#: ../mail/mail-config.ui.h:122
+msgid "Sig_ning certificate:"
+msgstr "Chứ_ng nhận ký tên:"
+
+#: ../mail/mail-config.ui.h:123
+msgid "Signat_ure:"
+msgstr "Chữ _ký:"
+
+#: ../mail/mail-config.ui.h:124
+msgid "Signatures"
+msgstr "Chữ ký"
+
+#: ../mail/mail-config.ui.h:125
+msgid "Signing _algorithm:"
+msgstr "_Thuật toán ký tên:"
+
+#: ../mail/mail-config.ui.h:126
+msgid "Special Folders"
+msgstr "Thư mục đặc biệt"
+
+#: ../mail/mail-config.ui.h:127
+msgid "Spell Checking"
+msgstr "Kiểm tra chính tả"
+
+#: ../mail/mail-config.ui.h:128
+msgid "Start _typing at the bottom on replying"
+msgstr "Khi đáp ứng, bắt đầu gõ bên _dưới (khuyến khích)"
+
+#: ../mail/mail-config.ui.h:129
+msgid "Start up"
+msgstr "Khởi động"
+
+#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "Mật mã TLS"
+
+#: ../mail/mail-config.ui.h:131
+msgid "T_ype:"
+msgstr "Kiể_u:"
+
+#: ../mail/mail-config.ui.h:132
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Danh sách ngôn ngữ này phản ánh chỉ những ngôn ngữ cho mà bạn đã cài đặt từ "
+"điển."
+
+#: ../mail/mail-config.ui.h:133
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+"�ầu ra của tập lệnh này sẽ được dùng\n"
+"như là chữ ký bạn.\n"
+"Tên bạn xác định sẽ chỉ được dùng\n"
+"chỉ cho mục đích hiển thị."
+
+#: ../mail/mail-config.ui.h:136
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
+msgstr ""
+"�ể tránh sự cố thư tín dễ xấu hổ, h�i xác nhận trước khi thực hiện những "
+"hành động được đánh dấu sau:"
+
+#: ../mail/mail-config.ui.h:137
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+"Hãy gõ tên mà bạn muốn dùng cho tài khoản này.\n"
+"Ví dụ: « Chỗ làm » hoặc « Cá nhân »."
+
+#: ../mail/mail-config.ui.h:139
+msgid "Us_ername:"
+msgstr "Tên n_gư�i dùng:"
+
+#: ../mail/mail-config.ui.h:140
+msgid "Use Authe_ntication"
+msgstr "_Xác thực"
+
+#: ../mail/mail-config.ui.h:141
+msgid "User _Name:"
+msgstr "Tê_n ngư�i dùng:"
+
+#: ../mail/mail-config.ui.h:142
+msgid "_Add Signature"
+msgstr "_Thêm chữ ký"
+
+#: ../mail/mail-config.ui.h:143
+msgid "_Always load images from the Internet"
+msgstr "_Luôn tải ảnh xuống Internet"
+
+#: ../mail/mail-config.ui.h:144
+msgid "_Authentication Type"
+msgstr "Kiểu _xác thực"
+
+#: ../mail/mail-config.ui.h:145
+msgid "_Direct connection to the Internet"
+msgstr "Kết nối trực tiếp tới Int_ernet"
+
+#: ../mail/mail-config.ui.h:146
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr "�ừ_ng ký tên yêu cầu h�p (để tương thích với trình Outlook)"
+
+#: ../mail/mail-config.ui.h:147
+msgid "_Forward style:"
+msgstr "Kiểu dáng chuyển t_iếp:"
+
+#: ../mail/mail-config.ui.h:148
+msgid "_Junk Folder:"
+msgstr "Thư mục thư _rác:"
+
+#: ../mail/mail-config.ui.h:149
+msgid "_Keep signature above the original message on replying"
+msgstr "Hiện chữ _ký bên trên thư gốc khi trả l�i"
+
+#: ../mail/mail-config.ui.h:150
+msgid "_Languages"
+msgstr "_Ngôn ngữ"
+
+#: ../mail/mail-config.ui.h:151
+msgid "_Load images only in messages from contacts"
+msgstr "Chỉ tải ảnh trong thư gửi từ _liên lạc đã biết"
+
+#: ../mail/mail-config.ui.h:152
+msgid "_Lookup in local address book only"
+msgstr "Tr_a tìm chỉ trong sổ địa chỉ cục bộ"
+
+#: ../mail/mail-config.ui.h:153
+msgid "_Make this my default account"
+msgstr "�ặt tài khoản này _mặc định"
+
+#: ../mail/mail-config.ui.h:154
+msgid "_Manual proxy configuration:"
+msgstr "Cấu hình ủy nhiệ_m thủ công:"
+
+#: ../mail/mail-config.ui.h:156
+msgid "_Never load images from the Internet"
+msgstr "Khô_ng bao gi� tải ảnh từ Internet"
+
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
+msgid "_Port:"
+msgstr "_Cổng:"
+
+#: ../mail/mail-config.ui.h:159
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "Nhắc khi gửi thư dạng _HTML cho liên lạc nào không muốn nhận thư HTML"
+
+#: ../mail/mail-config.ui.h:160
+msgid "_Reply style:"
+msgstr "Kiểu dáng t_rả l�i:"
+
+#: ../mail/mail-config.ui.h:161
+msgid "_Script:"
+msgstr "Tập _lệnh:"
+
+#: ../mail/mail-config.ui.h:162
+msgid "_Secure HTTP Proxy:"
+msgstr "Ủy nhiệm HTTP _bảo mật:"
+
+#: ../mail/mail-config.ui.h:164 ../modules/addressbook/ldap-config.ui.h:29
+#: ../plugins/publish-calendar/publish-calendar.ui.h:28
+msgid "_Server:"
+msgstr "_Máy chủ:"
+
+#. If enabled, show animation; if disabled, only display a static image without any animation
+#: ../mail/mail-config.ui.h:166
+msgid "_Show animated images"
+msgstr "_Hiện ảnh hoạt cảnh"
+
+#: ../mail/mail-config.ui.h:167
+msgid "_Show the photograph of sender in the message preview"
+msgstr "_Hiện ảnh chụp ngư�i gửi trong ô xem thử thư"
+
+#: ../mail/mail-config.ui.h:168
+msgid "_Trash Folder:"
+msgstr "Thư mục _rác:"
+
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
+msgstr "Dùng kết nối _bảo mật:"
+
+#: ../mail/mail-config.ui.h:170
+msgid "_Use system defaults"
+msgstr "_Dùng giá trị mặc định của hệ thống"
+
+#: ../mail/mail-config.ui.h:171
+msgid "_Use the same fonts as other applications"
+msgstr "_Dùng cùng những phông chữ với các ứng dụng khác"
+
+#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
+msgid "a"
+msgstr "a"
+
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
+msgid "b"
+msgstr "b"
+
+#: ../mail/mail-config.ui.h:174
+msgid "color"
+msgstr "màu"
+
+#: ../mail/mail-config.ui.h:175
+msgid "description"
+msgstr "mô tả"
+
+#: ../mail/mail-dialogs.ui.h:1
+msgid "All active remote folders"
+msgstr "M�i thư mục hoạt động từ xa"
+
+#: ../mail/mail-dialogs.ui.h:2
+msgid "All local and active remote folders"
+msgstr "M�i thư mục hoạt động từ xa và cục bộ"
+
+#: ../mail/mail-dialogs.ui.h:3
+msgid "All local folders"
+msgstr "M�i thư mục cục bộ"
+
+#: ../mail/mail-dialogs.ui.h:4
+msgid "Call"
+msgstr "G�i"
+
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
+msgid "Co_mpleted"
+msgstr "_Hoàn tất"
+
+#: ../mail/mail-dialogs.ui.h:7
+msgid "Digital Signature"
+msgstr "Chữ ký điện tử"
+
+#: ../mail/mail-dialogs.ui.h:8
+msgid "Do Not Forward"
+msgstr "�ừng chuyển tiếp"
+
+#: ../mail/mail-dialogs.ui.h:9
+msgid "Encryption"
+msgstr "Mật mã hoá"
+
+#: ../mail/mail-dialogs.ui.h:10
+msgid "Follow-Up"
+msgstr "Theo dõi tiếp"
+
+#: ../mail/mail-dialogs.ui.h:11
+msgid "For Your Information"
+msgstr "Cho bạn biết tin tức này"
+
+#: ../mail/mail-dialogs.ui.h:12
+msgid "Forward"
+msgstr "Chuyển tiếp"
+
+#: ../mail/mail-dialogs.ui.h:13
+msgid "License Agreement"
+msgstr "�i�u kiện Quy�n phép"
+
+#: ../mail/mail-dialogs.ui.h:14
+msgid "No Response Necessary"
+msgstr "Không cần thiết trả l�i"
+
+#: ../mail/mail-dialogs.ui.h:18
+msgid "Reply to All"
+msgstr "Trả l�i tất cả"
+
+#: ../mail/mail-dialogs.ui.h:19
+msgid "Review"
+msgstr "Xem lại"
+
+#: ../mail/mail-dialogs.ui.h:20
+msgid "Search Folder Sources"
+msgstr "Nguồn thư mục tìm kiếm"
+
+#: ../mail/mail-dialogs.ui.h:21
+msgid "Security Information"
+msgstr "Thông tin Bảo mật"
+
+#: ../mail/mail-dialogs.ui.h:22
+msgid "Specific folders"
+msgstr "Thư mục riêng"
+
+#: ../mail/mail-dialogs.ui.h:23
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Các thư mà bạn đã ch�n để theo dõi tiếp thì được liệt kê bên dưới.\n"
+"Hãy ch�n một hành động theo dõi tiếp từ trình đơn « C� »."
+
+#: ../mail/mail-dialogs.ui.h:25
+msgid "_Accept License"
+msgstr "_Chấp nhận Bản quy�n"
+
+#: ../mail/mail-dialogs.ui.h:26
+msgid "_Due By:"
+msgstr "�ến _hạn:"
+
+#: ../mail/mail-dialogs.ui.h:27
+msgid "_Flag:"
+msgstr "_C�:"
+
+#: ../mail/mail-dialogs.ui.h:28
+msgid "_Tick this to accept the license agreement"
+msgstr ""
+"Hãy đánh dấu _trong hộp ch�n này để chấp nhận các đi�u kiện của bản quy�n "
+"này."
+
+#: ../mail/mail-folder-cache.c:779
+#, c-format
+msgid "Pinging %s"
+msgstr "�ang « ping » %s..."
+
+#: ../mail/mail-ops.c:85
+msgid "Filtering Selected Messages"
+msgstr "�ang l�c các thư đã ch�n"
+
+#: ../mail/mail-ops.c:205
+msgid "Fetching Mail"
+msgstr "�ang lấy thư..."
+
+#: ../mail/mail-ops.c:821
+#, c-format
+msgid "Sending message %d of %d"
+msgstr "�ang gửi thư %d trên %d..."
+
+#: ../mail/mail-ops.c:869
+#, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "Việc gửi %d trên %d thư bị lỗi."
+
+#: ../mail/mail-ops.c:873 ../mail/mail-send-recv.c:837
+msgid "Canceled."
+msgstr "Bị thôi."
+
+#: ../mail/mail-ops.c:875 ../mail/mail-send-recv.c:839
+msgid "Complete."
+msgstr "Hoàn tất."
+
+#: ../mail/mail-ops.c:985
+#, c-format
+msgid "Moving messages to '%s'"
+msgstr "�ang chuyển thư tới '%s'"
+
+#: ../mail/mail-ops.c:986
+#, c-format
+msgid "Copying messages to '%s'"
+msgstr "�ang chép thư vào '%s'"
+
+#: ../mail/mail-ops.c:1104
+#, c-format
+msgid "Storing folder '%s'"
+msgstr "�ang cất giữ thư mục %s..."
+
+#: ../mail/mail-ops.c:1179
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr "�ang xoá hẳn và cất giữ tài khoản %s..."
+
+#: ../mail/mail-ops.c:1180
+#, c-format
+msgid "Storing account '%s'"
+msgstr "�ang cất giữ tài khoản %s..."
+
+#: ../mail/mail-ops.c:1242
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr "�ang cập nhật thư mục '%s'"
+
+#: ../mail/mail-ops.c:1432
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr "�ang xoá d�n thư mục '%s'"
+
+#: ../mail/mail-ops.c:1517
+#, c-format
+msgid "Emptying trash in '%s'"
+msgstr "�ang đổ rác trong « %s »..."
+
+#: ../mail/mail-ops.c:1619
+#, c-format
+msgid "Disconnecting %s"
+msgstr "�ang ngắt kết nối từ %s"
+
+#: ../mail/mail-send-recv.c:198
+msgid "Canceling..."
+msgstr "�ang thôi..."
+
+#: ../mail/mail-send-recv.c:454
+msgid "Send & Receive Mail"
+msgstr "Gửi và Nhận Thư"
+
+#: ../mail/mail-send-recv.c:470
+msgid "Cancel _All"
+msgstr "Thôi _tất cả"
+
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:979
+msgid "Updating..."
+msgstr "�ang cập nhật..."
+
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:691
+msgid "Waiting..."
+msgstr "�ang ch�..."
+
+#: ../mail/mail-send-recv.c:959
+#, c-format
+msgid "Checking for new mail"
+msgstr "�ang kiểm tra tìm thư mới..."
+
+#: ../mail/mail-tools.c:72
+#, c-format
+#| msgid "Could not create spool directory `%s': %s"
+msgid "Could not create spool directory '%s': %s"
+msgstr "Không thể tạo thư mục lưu (spool) '%s': %s"
+
+#: ../mail/mail-tools.c:106
+#, c-format
+#| msgid "Trying to movemail a non-mbox source `%s'"
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr "�ang cố movemail (di chuyển thư) một nguồn không dạng mbox '%s'"
+
+#: ../mail/mail-tools.c:215
+#, c-format
+msgid "Forwarded message - %s"
+msgstr "Thư đã chuyển tiếp - %s"
+
+#: ../mail/mail-tools.c:217
+msgid "Forwarded message"
+msgstr "Thư đã chuyển tiếp"
+
+#: ../mail/mail-vfolder.c:92
+#, c-format
+msgid "Setting up Search Folder: %s"
+msgstr "�ang thiết lập thư mục tìm kiếm: %s"
+
+#: ../mail/mail-vfolder.c:232
+#, c-format
+#| msgid "Updating Search Folders for '%s:%s'"
+msgid "Updating Search Folders for '%s' : %s"
+msgstr "�ang cập nhật các thư mục tìm kiếm cho '%s': %s"
+
+#. Translators: The first %s is name of the affected
+#. * search folder(s), the second %s is the URI of the
+#. * 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:678
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been modified to account for the deleted "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"Thư mục tìm \"%s\" đã thay đổi vì thư mục bị xoá\n"
+"\"%s\""
+
+#: ../mail/mail-vfolder.c:1314
+msgid "Edit Search Folder"
+msgstr "Sửa thư mục tìm kiếm"
+
+#: ../mail/mail-vfolder.c:1423
+msgid "New Search Folder"
+msgstr "Thư mục tìm kiếm mới"
+
+#: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "Lỗi kiểm tra thư rác"
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "Lỗi thông báo thư rác"
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "Lỗi thông báo không phải thư rác"
+
+#: ../mail/mail.error.xml.h:4
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "Một thư mục tên « {0} » đã có. Hãy sử dụng tên khác."
+
+#: ../mail/mail.error.xml.h:5
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "Một thư mục tên « {1} » đã có. Hãy sử dụng tên khác."
+
+#: ../mail/mail.error.xml.h:6
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
+msgstr ""
+"Một thư mục không trống đã có tại « {1} ».\n"
+"\n"
+"Bạn có thể ch�n b� qua thư mục này, ghi đè lên nó, phụ thêm nội dung cả nó, "
+"hoặc thoát."
+
+#: ../mail/mail.error.xml.h:9
+msgid ""
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
+msgstr ""
+"Một thông báo đã đ�c đã được yêu cầu cho « {1} ». Gửi thông báo nhận đó cho "
+"{0} chứ?"
+
+#: ../mail/mail.error.xml.h:10
+msgid ""
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr "Một chữ ký tên « {0} » đã có. Hãy gõ tên khác."
+
+#: ../mail/mail.error.xml.h:11
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+"Thêm một Chủ đ� có nghĩa vào thư bạn sẽ cho ngư�i nhận ý kiến v� nội dung."
+
+#: ../mail/mail.error.xml.h:12
+msgid "Are you sure you want to delete this account and all its proxies?"
+msgstr "Bạn có chắc muốn xoá tài khoản này và các ủy nhiệm của nó không?"
+
+#: ../mail/mail.error.xml.h:13
+msgid "Are you sure you want to delete this account?"
+msgstr "Bạn có muốn xoá tài khoản này không?"
+
+#: ../mail/mail.error.xml.h:14
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr "Bạn có chắc muốn tắt tài khoản này và xoá các ủy nhiệm của nó không?"
+
+#: ../mail/mail.error.xml.h:15
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+"Bạn có chắc muốn gỡ b� hoàn toàn m�i thư đã xoá trong m�i thư mục không?"
+
+#: ../mail/mail.error.xml.h:16
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
+msgstr ""
+"Bạn có chắc muốn gỡ b� hoàn toàn m�i thư đã xoá kh�i thư mục « {0} » không?"
+
+#: ../mail/mail.error.xml.h:17
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Bạn có chắc muốn gửi thư dạng HTML không?"
+
+#: ../mail/mail.error.xml.h:18
+#| msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message with invalid address?"
+msgstr "Bạn có chắc muốn gửi thư đến địa chỉ không hợp lệ chứ?"
+
+#: ../mail/mail.error.xml.h:19
+#| msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message with invalid addresses?"
+msgstr "Bạn có chắc muốn gửi thư đến địa chỉ không hợp lệ chứ?"
+
+#: ../mail/mail.error.xml.h:20
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr ""
+"Bạn có chắc muốn gửi thư chỉ có ngư�i nhận Bí mật Chép Cho (BCC) không?"
+
+#: ../mail/mail.error.xml.h:21
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "Bạn có chắc muốn gửi thư không có chủ đ� không?"
+
+#: ../mail/mail.error.xml.h:22
+msgid "Blank Signature"
+msgstr "Chữ ký trống"
+
+#: ../mail/mail.error.xml.h:23
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "Không thể thêm thư mục tìm kiếm « {0} »."
+
+#: ../mail/mail.error.xml.h:24
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Không thể sao chép thư mục « {0} » sang « {1} »."
+
+#: ../mail/mail.error.xml.h:25
+msgid "Cannot create folder \"{0}\"."
+msgstr "Không thể tạo thư mục « {0} »."
+
+#: ../mail/mail.error.xml.h:26
+msgid "Cannot create temporary save directory."
+msgstr "Không thể tạo thư mục lưu tạm."
+
+#: ../mail/mail.error.xml.h:27
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Không thể tạo thư mục lưu, vì « {1} »."
+
+#: ../mail/mail.error.xml.h:28
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Không thể xoá thư mục « {0} »."
+
+#: ../mail/mail.error.xml.h:29
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Không thể xoá thư mục hệ thống « {0} »."
+
+#: ../mail/mail.error.xml.h:30
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "Không thể chỉnh sửa thư mục tìm kiếm « {0} » vì nó không tồn tại."
+
+#: ../mail/mail.error.xml.h:31
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Không thể di chuyển thư mục « {0} » sang « {1} »."
+
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{1}\"."
+msgstr "Không thể mở nguồn \"{1}\"."
+
+#: ../mail/mail.error.xml.h:33
+msgid "Cannot open source \"{2}\"."
+msgstr "Không thể mở nguồn « {2} »."
+
+#: ../mail/mail.error.xml.h:34
+msgid "Cannot open target \"{2}\"."
+msgstr "Không thể mở đích đến « {2} »."
+
+#: ../mail/mail.error.xml.h:35
+msgid ""
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
+msgstr ""
+"Không thể đ�c tập tin giấy phép « {0} » do một vấn đ� cài đặt. Bạn sẽ không "
+"thể sử dụng nhà cung cấp này cho đến khi bạn chấp nhận giấy phép của nó."
+
+#: ../mail/mail.error.xml.h:36
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "Không thay đổi được tên thư mục « {0} » sang « {1} »."
+
+#: ../mail/mail.error.xml.h:37
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Không thể thay đổi tên hoặc di chuyển thư mục hệ thống « {0} »."
+
+#: ../mail/mail.error.xml.h:38
+msgid "Cannot save changes to account."
+msgstr "Không thể lưu các thay đổi trong tài khoản."
+
+#: ../mail/mail.error.xml.h:39
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Không thể lưu vào thư mục « {0} »."
+
+#: ../mail/mail.error.xml.h:40
+msgid "Cannot save to file \"{0}\"."
+msgstr "Không thể lưu vào tập tin « {0} »."
+
+#: ../mail/mail.error.xml.h:41
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Không thể đặt văn lệnh chữ ký « {0} »."
+
+#: ../mail/mail.error.xml.h:42
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"Hãy kiểm tra xem đã gõ mật khẩu cho đúng. Nhi�u mật khẩu phân biệt chữ hoa, "
+"chữ thư�ng; phím CapsLock (chữ hoa luôn) phải tắt."
+
+#: ../mail/mail.error.xml.h:43
+msgid "Close message window."
+msgstr "�óng cửa sổ."
+
+#: ../mail/mail.error.xml.h:44
+msgid "Could not save signature file."
+msgstr "Không thể lưu tập tin chữ ký."
+
+#: ../mail/mail.error.xml.h:46
+msgid "Do _Not Disable"
+msgstr "�ừng _tắt"
+
+#: ../mail/mail.error.xml.h:47
+msgid "Do _Not Send"
+msgstr "�ừ_ng gửi"
+
+#: ../mail/mail.error.xml.h:48
+msgid "Do _Not Synchronize"
+msgstr "�ừ_ng đồng bộ"
+
+#: ../mail/mail.error.xml.h:49
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
+"Bạn có muốn đồng bộ cục bộ những thư mục có nhãn cần sử dụng ngoại tuyến "
+"không?"
+
+#: ../mail/mail.error.xml.h:50
+msgid "Do you want to mark all messages as read?"
+msgstr "Bạn có muốn đánh dấu m�i thư �ã ��c không?"
+
+#: ../mail/mail.error.xml.h:51
+msgid "Do you wish to save your changes?"
+msgstr "Bạn có muốn lưu các thay đổi không?"
+
+#: ../mail/mail.error.xml.h:52
+msgid "Enter password."
+msgstr "Hãy gõ mật khẩu."
+
+#: ../mail/mail.error.xml.h:53
+msgid "Error loading filter definitions."
+msgstr "Gặp lỗi khi nạp l�i định nghĩa bộ l�c."
+
+#: ../mail/mail.error.xml.h:54
+msgid "Error while performing operation."
+msgstr "Gặp lỗi khi thực hiện thao tác."
+
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:58
+msgid "Error while {0}."
+msgstr "Gặp lỗi khi « {0} »."
+
+#: ../mail/mail.error.xml.h:59
+#| msgid ""
+#| "Default local store has been changed from mbox to maildir format. Do you "
+#| "want to migrate now ?\n"
+#| "\n"
+#| "A mbox account will be created to preserve the old mbox folders. You can "
+#| "delete it after ensuring the data is safely migrated. Please make sure "
+#| "there is enough space if you choose to migrate."
+msgid ""
+"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"mail must be migrated to the new format before Evolution can proceed. Do you "
+"want to migrate now?\n"
+"\n"
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
+msgstr ""
+"�ịnh dạng thư cục bộ của Evolution đã thay đổi từ mbox sang maildir. Thư cục "
+"bộ của bạn phải được chuyển đổi để có thể dùng với Evolution. Bạn có muốn "
+"chuyển đổi không?\n"
+"\n"
+"Tài khoản mbox sẽ được tạo để bảo lưu các thư mục dạng mbox cũ. Bạn có thể "
+"xoá đi sau khi bảo đảm việc chuyển đổi thành công tốt đẹp. Hãy bảo đảm có đủ "
+"vùng đĩa trống trước khi chuyển đổi."
+
+#: ../mail/mail.error.xml.h:62
+msgid "Evolution's local mail format has changed."
+msgstr "�ịnh dạng thư cục bộ của Evolution đã thay đổi."
+
+#: ../mail/mail.error.xml.h:63
+#| msgid "_Download Messages for Offline Usage"
+msgid "Failed to download messages for offline viewing."
+msgstr "Lỗi tải thư v� để đ�c ngoại tuyến."
+
+#: ../mail/mail.error.xml.h:64
+#| msgid "Remove duplicate messages?"
+msgid "Failed to find duplicate messages."
+msgstr "Lỗi tìm thư trùng lắp."
+
+#: ../mail/mail.error.xml.h:65
+#| msgid "failed to open book"
+msgid "Failed to open folder."
+msgstr "Lỗi mở thư mục."
+
+#: ../mail/mail.error.xml.h:66
+#| msgid "Querying server for a list of supported authentication mechanisms."
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr "Lỗi truy vấn máy chủ v� danh sách các cơ chế xác thực được hỗ trợ."
+
+#: ../mail/mail.error.xml.h:67
+#| msgid "View image attachments directly in mail messages."
+msgid "Failed to remove attachments from messages."
+msgstr "Lỗi b� đính kèm kh�i thư."
+
+#: ../mail/mail.error.xml.h:68
+#| msgid "Unable to retrieve message"
+msgid "Failed to retrieve messages."
+msgstr "Lỗi nhận thư."
+
+#: ../mail/mail.error.xml.h:69
+#| msgid "Failed to send %d of %d messages"
+msgid "Failed to save messages to disk."
+msgstr "Lỗi lưu thư vào đĩa."
+
+#: ../mail/mail.error.xml.h:70
+msgid "Failed to unsubscribe from folder."
+msgstr "Lỗi b� đăng ký thư mục."
+
+#: ../mail/mail.error.xml.h:71
+msgid "File exists but cannot overwrite it."
+msgstr "Tập tin đã tồn tại nhưng không thể ghi đè lên nó."
+
+#: ../mail/mail.error.xml.h:72
+msgid "File exists but is not a regular file."
+msgstr "Tập tin tồn tại nhưng không phải là tập tin chuẩn."
+
+#. Translators: {0} is replaced with a folder name
+#: ../mail/mail.error.xml.h:74
+msgid "Folder '{0}' doesn't contain any duplicate message."
+msgstr "Thư mục '{0}' không chứa thư trùng lắp."
+
+#: ../mail/mail.error.xml.h:75
+msgid "If you continue, you will not be able to recover these messages."
+msgstr "Nếu bạn tiếp tục, bạn sẽ không thể phục hồi những thư này."
+
+#: ../mail/mail.error.xml.h:76
+msgid ""
+"If you delete the folder, all of its contents and its subfolders' contents "
+"will be deleted permanently."
+msgstr ""
+"Nếu bạn xoá thư mục này, m�i nội dung của nó và thư mục con sẽ bị xoá vĩnh "
+"viá»…n."
+
+#: ../mail/mail.error.xml.h:77
+msgid ""
+"If you delete the folder, all of its contents will be deleted permanently."
+msgstr "Nếu bạn xoá thư mục này, m�i nội dung của nó sẽ bị xoá vĩnh viễn."
+
+#: ../mail/mail.error.xml.h:78
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr "Nếu bạn tiếp tục, m�i tài khoản ủy nhiệm sẽ bị xoá hoàn toàn."
+
+#: ../mail/mail.error.xml.h:79
+msgid ""
+"If you proceed, the account information and\n"
+"all proxy information will be deleted permanently."
+msgstr ""
+"Nếu bạn tiếp tục, thông tin tài khoản và các thông tin ủy nhiệm sẽ bị xoá "
+"hoàn toàn."
+
+#: ../mail/mail.error.xml.h:81
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr "Nếu bạn tiếp tục, thông tin tài khoản sẽ bị xoá hoàn toàn."
+
+#: ../mail/mail.error.xml.h:82
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+"Nếu bạn thoát thì những thư này sẽ không được gửi tới khi khởi chạy lại "
+"trình Evolution."
+
+#: ../mail/mail.error.xml.h:83
+msgid "Ignore"
+msgstr "B� qua"
+
+#: ../mail/mail.error.xml.h:84
+msgid "Invalid authentication"
+msgstr "Xác thực không hợp lệ"
+
+#: ../mail/mail.error.xml.h:85
+msgid "Mail Deletion Failed"
+msgstr "Lỗi xoá thư"
+
+#: ../mail/mail.error.xml.h:86
+msgid "Mail filters automatically updated."
+msgstr "Các bộ l�c thư đã được cập nhật tự động."
+
+#: ../mail/mail.error.xml.h:87
+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 ""
+"Nhi�u hệ thống thư điện tử thêm một dòng đầu « Có vẻ là Cho » (Apparently-"
+"To) vào m�i thư chỉ có ngư�i nhận BCC (Bí mật Chép Cho). Nếu thêm dòng đầu "
+"ấy, nó sẽ liệt kê m�i ngư�i nhận trong thư của bạn. �ể tránh ngư�i gửi thư "
+"rác ăn cắp các địa chỉ trong danh sách ấy, bạn hãy thêm ít nhất một ngư�i "
+"nhận Cho (To) hay Chép Cho (Cc), v.d. địa chỉ mình."
+
+#: ../mail/mail.error.xml.h:88
+#| msgid ""
+#| "Warning: Deleting messages from a Search Folder will delete the actual "
+#| "message from one of your local or remote folders.\n"
+#| "Do you really want to do this?"
+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 ""
+"Thư hiện trong \"Thư mục tìm kiếm\" không phải là bản sao. Xoá chúng kh�i "
+"thư mục tìm kiếm nghĩa là xoá thư gốc. Bạn có thật sự muốn xoá những thư này "
+"không?"
+
+#: ../mail/mail.error.xml.h:89
+msgid "Missing folder."
+msgstr "Thiếu thư mục."
+
+#: ../mail/mail.error.xml.h:91
+msgid "N_ever"
+msgstr "_Không bao gi�"
+
+#: ../mail/mail.error.xml.h:92
+msgid "No duplicate messages found."
+msgstr "Không thấy thư trùng lắp."
+
+#: ../mail/mail.error.xml.h:93
+msgid "No sources selected."
+msgstr "Chưa ch�n nguồn."
+
+#: ../mail/mail.error.xml.h:94
+msgid "Opening too many messages at once may take a long time."
+msgstr "Việc mở quá nhi�u thư cùng lúc có lẽ sẽ mất lâu."
+
+#: ../mail/mail.error.xml.h:95
+msgid "Please check your account settings and try again."
+msgstr "Hãy kiểm tra xem thiết lập tài khoản rồi thử lại."
+
+#: ../mail/mail.error.xml.h:96
+msgid "Please enable the account or send using another account."
+msgstr "Hãy bật tài khoản này hoặc gửi bằng tài khoản khác."
+
+#: ../mail/mail.error.xml.h:97
+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 ""
+"Hãy nhập một địa chỉ thư điện tử hợp lệ vào trư�ng Cho: (To). Có thể tìm "
+"kiếm địa chỉ thư bằng cách nhắp vào nút Cho: (To) ở cạnh hộp nhập."
+
+#: ../mail/mail.error.xml.h:98
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}"
+msgstr ""
+"Hãy đảm bảo rằng những ngư�i nhận sau có thể và cũng muốn nhận thư dạng "
+"HTML:\n"
+"{0}"
+
+#: ../mail/mail.error.xml.h:100
+msgid "Please provide an unique name to identify this signature."
+msgstr "Hãy cung cấp tên duy nhất để nhận diện chữ ký này."
+
+#: ../mail/mail.error.xml.h:101
+msgid "Please wait."
+msgstr "Vui lòng ch�..."
+
+#: ../mail/mail.error.xml.h:102
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "Gặp lỗi khi nâng cấp thư mục thư cũ « {0} »."
+
+#: ../mail/mail.error.xml.h:103
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr "�ang truy vấn máy chủ v� danh sách các cơ chế xác thực được hỗ trợ."
+
+#: ../mail/mail.error.xml.h:104
+msgid "Read receipt requested."
+msgstr "Thông báo đã đ�c được yêu cầu."
+
+#: ../mail/mail.error.xml.h:105
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Thực sự xoá thư mục « {0} » và m�i thư mục con của nó không?"
+
+#: ../mail/mail.error.xml.h:106
+msgid "Really delete folder \"{0}\"?"
+msgstr "Thật sự xoá thư mục \"{0}\" chứ?"
+
+#: ../mail/mail.error.xml.h:107
+msgid "Remove duplicate messages?"
+msgstr "Xoá thư trùng lắp chứ?"
+
+#: ../mail/mail.error.xml.h:108
+msgid "Reply _Privately"
+msgstr "Trả l�i _riêng"
+
+#: ../mail/mail.error.xml.h:111
+msgid "Search Folders automatically updated."
+msgstr "Các thư mục tìm kiếm đã được cập nhật tự động."
+
+#: ../mail/mail.error.xml.h:112
+msgid "Send private reply?"
+msgstr "Gửi riêng chứ?"
+
+#: ../mail/mail.error.xml.h:113
+msgid "Send reply to all recipients?"
+msgstr "Gửi trả l�i tất cả ngư�i nhận chứ?"
+
+#: ../mail/mail.error.xml.h:114
+msgid "Signature Already Exists"
+msgstr "Chữ ký đã có"
+
+#: ../mail/mail.error.xml.h:115
+msgid "Synchronize folders locally for offline usage?"
+msgstr "�ồng bộ cục bộ các thư mục để sử dụng khi ngoại tuyến không?"
+
+#: ../mail/mail.error.xml.h:116
+msgid ""
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
+msgstr ""
+"Không cho phép thay đổi tên của thư mục hệ thống, di chuyển hay xoá chúng vì "
+"trình Evolution cần thiết thư mục hệ thống để hoạt động được."
+
+#: ../mail/mail.error.xml.h:117
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
+msgstr ""
+"Bạn đang gửi cho một danh sách liên lạc có cấu hình ẩn m�i ngư�i nhận có "
+"trong danh sách ấy.\n"
+"\n"
+"Nhi�u hệ thống thư điện tử thêm một dòng đầu «Hình như Cho» (Apparently-To) "
+"vào m�i thư chỉ có ngư�i nhận BCC (Bí mật Chép Cho). Nếu thêm dòng đầu ấy, "
+"nó sẽ liệt kê m�i ngư�i nhận trong thư của bạn. �ể tránh ngư�i gửi thư rác "
+"ăn cắp các địa chỉ trong danh sách ấy, bạn hãy thêm ít nhất một ngư�i nhận "
+"Cho (To) hay Chép Cho (Cc), v.d. địa chỉ mình."
+
+#: ../mail/mail.error.xml.h:120
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
+msgstr ""
+"Ngư�i nhận sau không có địa chỉ thư hợp lệ:\n"
+"{0}"
+
+#: ../mail/mail.error.xml.h:122
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
+msgstr ""
+"Những ngư�i nhận sau không có địa chỉ thư hợp lệ:\n"
+"{0}"
+
+#: ../mail/mail.error.xml.h:125
+msgid "The script file must exist and be executable."
+msgstr "Tập tin văn lệnh phải tồn tại và có chạy được."
+
+#: ../mail/mail.error.xml.h:126
+#| msgid "Text message part limit"
+msgid "These messages are not copies."
+msgstr "Nhưng thư này không phải bản sao."
+
+#: ../mail/mail.error.xml.h:127
+msgid ""
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
+msgstr ""
+"Có lẽ đã thêm thư mục này một cách ngầm; hãy dùng bộ sửa thư mục tìm kiếm để "
+"thêm nó một cách dứt khoát, nếu cần thiết."
+
+#: ../mail/mail.error.xml.h:129
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr ""
+"Không thể gửi thư này vì bạn đang gửi nó bằng một tài khoản chưa được bật"
+
+#: ../mail/mail.error.xml.h:130
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr "Không thể gửi thư này vì bạn chưa ghi rõ ngư�i nhận nào."
+
+#: ../mail/mail.error.xml.h:131
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+"Máy chủ này không hỗ trợ loại xác thực này và có lẽ hoàn toàn không hỗ trợ "
+"xác thực nào."
+
+#: ../mail/mail.error.xml.h:132
+msgid "This signature has been changed, but has not been saved."
+msgstr "Chữ ký này đã thay đổi, nhưng vẫn chưa được lưu."
+
+#: ../mail/mail.error.xml.h:133
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr ""
+"Hành động này sẽ đánh dấu m�i thư �ã ��c trong thư mục đã ch�n, cũng trong "
+"m�i thư mục con của nó."
+
+#: ../mail/mail.error.xml.h:134
+msgid "This will mark all messages as read in the selected folder."
+msgstr "Hành động này sẽ đánh dấu m�i thư 'đã đ�c' trong thư mục đã ch�n."
+
+#: ../mail/mail.error.xml.h:135
+msgid "Unable to connect to the GroupWise server."
+msgstr "Không kết nối tới máy chủ Groupwise được."
+
+#: ../mail/mail.error.xml.h:136
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
+"Không thể mở thư mục Nháp (Drafts) cho tài khoản này. Dùng thư mục Nháp của "
+"hệ thống thay thế chứ?"
+
+#: ../mail/mail.error.xml.h:137
+msgid "Unable to read license file."
+msgstr "Không thể đ�c tập tin quy�n phép."
+
+#: ../mail/mail.error.xml.h:138
+#| msgid "Unable to retrieve message"
+msgid "Unable to retrieve message."
+msgstr "Không thể nhận thư."
+
+#: ../mail/mail.error.xml.h:139
+msgid "Use _Default"
+msgstr "_Dùng mặc định"
+
+#: ../mail/mail.error.xml.h:140
+msgid "Use default drafts folder?"
+msgstr "Dùng thư mục nháp mặc định chứ?"
+
+#: ../mail/mail.error.xml.h:141
+msgid "Would you like to close the message window?"
+msgstr "Bạn có muốn đóng cửa sổ thư không?"
+
+#: ../mail/mail.error.xml.h:142
+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 ""
+"Bạn đang trả l�i riêng cho một thư gửi đến hộp thư chung, nhưng hộp thư muốn "
+"chuyển hướng trả l�i riêng này v� hộp thư chung. Bạn có chắc muốn tiếp tục "
+"không?"
+
+#: ../mail/mail.error.xml.h:143
+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 ""
+"Bạn đang trả l�i cho một thư gửi đến hộp thư chung, nhưng bạn đang chỉ trả "
+"l�i riêng cho ngư�i gửi. Bạn có chắc muốn tiếp tục không?"
+
+#: ../mail/mail.error.xml.h:144
+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 ""
+"Bạn chuẩn bị trả l�i cho rất nhi�u ngư�i nhận. Bạn có chắc muốn trả l�i cho "
+"TẤT CẢ h� chứ?"
+
+#: ../mail/mail.error.xml.h:145
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "Bạn không có quy�n xoá thư này."
+
+#: ../mail/mail.error.xml.h:146
+msgid "You have not filled in all of the required information."
+msgstr "Bạn chưa đi�n đủ các thông tin yêu cầu."
+
+#: ../mail/mail.error.xml.h:147
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Bạn có vài thư chưa gửi, bạn vẫn muốn thoát chứ?"
+
+#: ../mail/mail.error.xml.h:148
+msgid "You may not create two accounts with the same name."
+msgstr "Không cho phép bạn tạo hai tài khoản trùng tên."
+
+#: ../mail/mail.error.xml.h:149
+msgid "You must name this Search Folder."
+msgstr "Bạn phải đặt tên cho thư mục Tìm kiếm này."
+
+#: ../mail/mail.error.xml.h:150
+msgid "You must specify a folder."
+msgstr "Bạn phải xác định thư mục."
+
+#: ../mail/mail.error.xml.h:151
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
+msgstr ""
+"Bạn phải ghi rõ ít nhất một thư mục là nguồn,\n"
+"hoặc bằng cách ch�n mỗi thư mục từng một cái,\n"
+"hoặc/và bằng cách ch�n m�i thư mục địa phương,\n"
+"m�i thư mục ở xa, hoặc cả hai."
+
+#: ../mail/mail.error.xml.h:153
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "Bạn đã không đăng nhập được vào máy chủ « {0} » với tư cách « {0} »."
+
+#: ../mail/mail.error.xml.h:154
+msgid "_Always"
+msgstr "_Luôn luôn"
+
+#: ../mail/mail.error.xml.h:155
+msgid "_Append"
+msgstr "_Nối thêm"
+
+#: ../mail/mail.error.xml.h:156
+#: ../plugins/publish-calendar/publish-calendar.c:619
+msgid "_Disable"
+msgstr "_Tắt"
+
+#: ../mail/mail.error.xml.h:157
+msgid "_Discard changes"
+msgstr "_Hủy các thay đổi"
+
+#: ../mail/mail.error.xml.h:158
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
+msgid "_Empty Trash"
+msgstr "�ổ _rác"
+
+# Name: do not translate/ tên: đừng dịch
+#: ../mail/mail.error.xml.h:159
+#| msgid "Evolution"
+msgid "_Exit Evolution"
+msgstr "_Thoát Evolution"
+
+#: ../mail/mail.error.xml.h:160
+msgid "_Expunge"
+msgstr "_Xoá hẳn"
+
+#: ../mail/mail.error.xml.h:161
+#| msgid "Migration"
+msgid "_Migrate Now"
+msgstr "_Chuyển đổi bây gi�"
+
+#: ../mail/mail.error.xml.h:162
+msgid "_No"
+msgstr "_Không"
+
+#: ../mail/mail.error.xml.h:163
+msgid "_Open Messages"
+msgstr "_Mở các thư"
+
+#: ../mail/mail.error.xml.h:166
+msgid "_Send Receipt"
+msgstr "_Gửi biên nhận"
+
+#: ../mail/mail.error.xml.h:167
+msgid "_Synchronize"
+msgstr "�ồng _bộ"
+
+#: ../mail/mail.error.xml.h:168
+msgid "_Yes"
+msgstr "_Có"
+
+#: ../mail/mail.error.xml.h:169
+msgid "{0}"
+msgstr "{0}"
+
+#: ../mail/message-list.c:1261
+msgid "Unseen"
+msgstr "ChÆ°a xem"
+
+#: ../mail/message-list.c:1262
+msgid "Seen"
+msgstr "�ã xem"
+
+#: ../mail/message-list.c:1263
+msgid "Answered"
+msgstr "�ã trả l�i"
+
+#: ../mail/message-list.c:1264
+msgid "Forwarded"
+msgstr "�ã chuyển tiếp"
+
+#: ../mail/message-list.c:1265
+msgid "Multiple Unseen Messages"
+msgstr "Nhi�u thư chưa xem"
+
+#: ../mail/message-list.c:1266
+msgid "Multiple Messages"
+msgstr "Nhi�u thư"
+
+#: ../mail/message-list.c:1270
+msgid "Lowest"
+msgstr "Thấp nhất"
+
+#: ../mail/message-list.c:1271
+msgid "Lower"
+msgstr "Thấp hơn"
+
+#: ../mail/message-list.c:1275
+msgid "Higher"
+msgstr "Cao hơn"
+
+#: ../mail/message-list.c:1276
+msgid "Highest"
+msgstr "Cao nhất"
+
+#: ../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:1916 ../plugins/itip-formatter/itip-view.c:205
+msgid "Today %l:%M %p"
+msgstr "Hôm nay %l:%M %p"
+
+#: ../mail/message-list.c:1925
+msgid "Yesterday %l:%M %p"
+msgstr "Hôm qua %l:%M %p"
+
+#: ../mail/message-list.c:1937
+msgid "%a %l:%M %p"
+msgstr "%a %l:%M %p"
+
+#: ../mail/message-list.c:1945
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %l:%M %p"
+
+#: ../mail/message-list.c:1947
+msgid "%b %d %Y"
+msgstr "%d %b %Y"
+
+#: ../mail/message-list.c:2752
+msgid "Select all visible messages"
+msgstr "Ch�n m�i thư hiện rõ"
+
+#: ../mail/message-list.c:2912 ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "ThÆ°"
+
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:4160
+#| msgid "Follow-Up"
+msgid "Follow-up"
+msgstr "Tiếp-theo"
+
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:4675 ../mail/message-list.c:5098
+msgid "Generating message list"
+msgstr "�ang tạo danh sách thư..."
+
+#: ../mail/message-list.c:4912
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"Không có thư nào tương ứng với tiêu chuẩn tìm kiếm của bạn. Hoặc xoá sạch "
+"trư�ng tìm kiếm dùng mục trình đơn « Tìm kiếm > D�n », hoặc sửa đổi chuỗi đó."
+
+#: ../mail/message-list.c:4914
+msgid "There are no messages in this folder."
+msgstr "Không có thư trong thư mục này."
+
+#: ../mail/message-list.etspec.h:3
+msgid "Due By"
+msgstr "�ến hạn"
+
+#: ../mail/message-list.etspec.h:4
+msgid "Flag Status"
+msgstr "Trạng thái c�"
+
+#: ../mail/message-list.etspec.h:5
+msgid "Flagged"
+msgstr "�ã đặt c�"
+
+#: ../mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr "C� theo dõi tiếp"
+
+#: ../mail/message-list.etspec.h:11
+msgid "Received"
+msgstr "�ã nhận"
+
+#: ../mail/message-list.etspec.h:15
+msgid "Sent Messages"
+msgstr "Thư đã gửi"
+
+#: ../mail/message-list.etspec.h:16
+#: ../widgets/misc/e-attachment-tree-view.c:572
+msgid "Size"
+msgstr "Cỡ"
+
+#: ../mail/message-list.etspec.h:19
+msgid "Subject - Trimmed"
+msgstr "Chủ đ� — G�n"
+
+#: ../mail/searchtypes.xml.h:1
+#: ../modules/mail/e-mail-shell-view-actions.c:1562
+msgid "Body contains"
+msgstr "Nội dung chứa"
+
+#: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1569
+msgid "Message contains"
+msgstr "Thư chứa"
+
+#: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1576
+msgid "Recipients contain"
+msgstr "Ngư�i nhận chứa"
+
+#: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
+msgid "Sender contains"
+msgstr "Ngư�i gửi chứa"
+
+#: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1590
+msgid "Subject contains"
+msgstr "Chủ đ� chứa"
+
+#: ../mail/searchtypes.xml.h:6
+msgid "Subject or Addresses contains"
+msgstr "Chủ đ� hay địa chỉ chứa"
+
+#: ../modules/addressbook/addressbook-config.c:207
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"Ch�n tùy ch�n này nghĩa là Evolution sẽ chỉ kết nối tới máy chủ LDAP của bạn "
+"nếu máy chủ LDAP ấy hỗ trợ SSL."
+
+#: ../modules/addressbook/addressbook-config.c:209
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"Ch�n tùy ch�n này nghĩa là Evolution sẽ chỉ kết nối tới máy chủ LDAP của bạn "
+"nếu máy chủ LDAP ấy hỗ trợ TLS."
+
+#: ../modules/addressbook/addressbook-config.c:211
+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 ""
+"Ch�n tùy ch�n này nghĩa là máy chủ của bạn không hỗ trợ SSL, cũng không hỗ "
+"trợ TLS. Như thế thì kết nối của bạn không an toàn, có thể bị lỗ hổng bảo "
+"mật."
+
+#: ../modules/addressbook/addressbook-config.c:641
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "Dùng _lịch Sinh nhật và Kỷ niệm"
+
+#: ../modules/addressbook/addressbook-config.c:683
+msgid "Copy _book content locally for offline operation"
+msgstr "Sao chép cục bộ nội dung sổ để thao tác ngoại tuyến"
+
+#: ../modules/addressbook/addressbook-config.c:798
+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 ""
+"�ây là số hiệu cổng của máy chủ LDAP mà Evolution sẽ cố kết nối đến nó. Một "
+"danh sách các cổng chuẩn đã được cung cấp. Hãy h�i quản trị hệ thống của bạn "
+"để biết dùng cổng nào."
+
+#: ../modules/addressbook/addressbook-config.c:879
+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 ""
+"�ây là phương pháp Evolution sẽ dùng để xác thực bạn. Chú ý rằng đặt phương "
+"pháp này thành « �ịa chỉ thư » cũng yêu cầu truy cập nặc danh đến máy chủ "
+"LDAP. "
+
+#: ../modules/addressbook/addressbook-config.c:962
+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 ""
+"Phạm vi tìm cho biết độ sâu tìm kiếm đi xuống trong cây thư mục. Phạm vi tìm "
+"kiếm «con» sẽ bao gồm m�i mục dưới cơ sở tìm. Phạm vi tìm kiếm «một» sẽ chỉ "
+"tìm những mục nằm một mức độ dưới trong cơ sở tìm thôi."
+
+#: ../modules/addressbook/addressbook-config.c:1086
+msgid "Server Information"
+msgstr "Thông tin máy chủ"
+
+#: ../modules/addressbook/addressbook-config.c:1091
+#: ../smime/gui/smime-ui.ui.h:13
+msgid "Details"
+msgstr "Chi tiết"
+
+#: ../modules/addressbook/addressbook-config.c:1092
+#: ../modules/mail/e-mail-shell-view.c:58
+msgid "Searching"
+msgstr "Tìm kiếm"
+
+#: ../modules/addressbook/addressbook-config.c:1094
+msgid "Downloading"
+msgstr "Tải v�"
+
+#: ../modules/addressbook/addressbook-config.c:1309
+msgid "Address Book Properties"
+msgstr "Thuộc tính Sổ địa chỉ"
+
+#: ../modules/addressbook/addressbook-config.c:1311
+msgid "New Address Book"
+msgstr "Sổ địa chỉ mới"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr "�ộ dài tự động gõ xong"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
+msgid "Contact layout style"
+msgstr "Kiểu bố cục liên lạc"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
+msgid "Contact preview pane position (horizontal)"
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
+msgid "Contact preview pane position (vertical)"
+msgstr "Vị trí (d�c) khung xem trước liên lạc"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "EFolderList XML for the list of completion URIs"
+msgstr ""
+"XML EFolderList (danh sách thư mục điện) cho danh sách các địa chỉ URI sẽ gõ "
+"xong."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid "EFolderList XML for the list of completion URIs."
+msgstr ""
+"XML EFolderList (danh sách thư mục điện) cho danh sách các địa chỉ URI sẽ gõ "
+"xong."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Primary address book"
+msgstr "Sổ địa chỉ chính"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+msgid "Show autocompleted name with an address"
+msgstr "Hiện tên tự động đi�n nốt cùng với địa chỉ"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+#| msgid "Show Animations"
+msgid "Show maps"
+msgstr "Hiện bản đồ"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid "Show preview pane"
+msgstr "Hiện ô Xem thử"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid ""
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+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 ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr "Số ký tự cần gõ trước khi trình Evolution sẽ cố tự động hoàn tất."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+msgid "URI for the folder last used in the select names dialog"
+msgstr "�ịa chỉ URI cho thư mục đã dùng cuối cùng trong hộp thoại ch�n tên."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
+msgid "URI for the folder last used in the select names dialog."
+msgstr "�ịa chỉ URI cho thư mục đã dùng cuối cùng trong hộp thoại ch�n tên."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+"Có nê ép buộc hiển thị trong mục nhập địa chỉ thư cùng với tên của liên lạc "
+"tự động đi�n nốt, hay không."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+#| msgid "Whether to show the preview pane."
+msgid "Whether to show maps in preview pane."
+msgstr "Có nên hiển thị bản đồ trong cửa sổ xem thử hay không."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
+msgid "Whether to show the preview pane."
+msgstr "Có nên hiển thị ô cửa sổ xem thử hay không."
+
+#. 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:194
+#: ../modules/mail/em-mailer-prefs.c:1049
+msgid "_Table column:"
+msgstr "_Cột bảng:"
+
+#: ../modules/addressbook/autocompletion-config.c:197
+msgid "Autocompletion"
+msgstr "Tự động gõ xong"
+
+#: ../modules/addressbook/autocompletion-config.c:200
+msgid "Always _show address of the autocompleted contact"
+msgstr "Lúc nà_o cũng hiện địa chỉ của liên lạc tự động đi�n nốt"
+
+#. Create the LDAP source group
+#: ../modules/addressbook/e-book-shell-backend.c:102
+#: ../modules/addressbook/e-book-shell-migrate.c:154
+msgid "On LDAP Servers"
+msgstr "Trên máy chủ LDAP"
+
+#: ../modules/addressbook/e-book-shell-backend.c:302
+msgctxt "New"
+msgid "_Contact"
+msgstr "Liên lạ_c"
+
+#: ../modules/addressbook/e-book-shell-backend.c:304
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
+msgid "Create a new contact"
+msgstr "Tạo liên lạc mới"
+
+#: ../modules/addressbook/e-book-shell-backend.c:309
+msgctxt "New"
+msgid "Contact _List"
+msgstr "Danh sách _liên lạc"
+
+#: ../modules/addressbook/e-book-shell-backend.c:311
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
+msgid "Create a new contact list"
+msgstr "Tạo một danh sách liên lạc mới"
+
+#: ../modules/addressbook/e-book-shell-backend.c:319
+msgctxt "New"
+msgid "Address _Book"
+msgstr "_Sổ địa chỉ"
+
+#: ../modules/addressbook/e-book-shell-backend.c:321
+#: ../modules/addressbook/e-book-shell-view-actions.c:835
+msgid "Create a new address book"
+msgstr "Tạo một sổ địa chỉ mới"
+
+#. Create the contacts group
+#: ../modules/addressbook/e-book-shell-backend.c:338
+#: ../modules/addressbook/e-book-shell-view.c:405
+#: ../modules/calendar/e-cal-shell-backend.c:115
+#: ../modules/calendar/e-cal-shell-migrate.c:63
+#: ../modules/online-accounts/e-online-accounts-google.c:366
+msgid "Contacts"
+msgstr "Liên lạc"
+
+#: ../modules/addressbook/e-book-shell-backend.c:348
+msgid "Certificates"
+msgstr "Chứng nhận"
+
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:387
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
+msgid "Save as vCard"
+msgstr "Lưu dạng vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
+msgid "Co_py All Contacts To..."
+msgstr "Ché_p các liên lạc sang..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+msgid "Copy the contacts of the selected address book to another"
+msgstr "Chép các liên lạc của sổ địa chỉ được ch�n qua chỗ khác"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
+msgid "D_elete Address Book"
+msgstr "_Xoá sổ địa chỉ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
+msgid "Delete the selected address book"
+msgstr "Xoá sổ địa chỉ đã ch�n"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
+msgid "Mo_ve All Contacts To..."
+msgstr "Chu_yển các liên lạc sang..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
+msgid "Move the contacts of the selected address book to another"
+msgstr "Chuyển các liên lạc của sổ địa chỉ được ch�n qua chỗ khác"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:833
+msgid "_New Address Book"
+msgstr "Sổ địa chỉ _mới"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
+msgid "Address _Book Properties"
+msgstr "Thuộc tính _Sổ địa chỉ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
+msgid "Show properties of the selected address book"
+msgstr "Thay đổi thuộc tính của sổ địa chỉ đã ch�n"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
+#| msgid "Address Book"
+msgid "Address Book _Map"
+msgstr "_Bản đồ sổ địa chỉ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#| msgid "Copy the contacts of the selected address book to another"
+msgid "Show map with all contacts from selected address book"
+msgstr "Hiện bản đồ với m�i liên lạc từ sổ địa chỉ được ch�n"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:854
+#: ../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
+msgid "_Rename..."
+msgstr "�ổ_i tên..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
+msgid "Rename the selected address book"
+msgstr "�ổi tên sổ địa chỉ đã ch�n"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
+msgid "Stop loading"
+msgstr "Ngưng nạp"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
+msgid "_Copy Contact To..."
+msgstr "_Chép liên lạc sang..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+msgid "Copy selected contacts to another address book"
+msgstr "Chép các liên lạc đã ch�n sang sổ địa chỉ khác"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
+msgid "_Delete Contact"
+msgstr "_Xoá Liên lạc"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:882
+msgid "_Find in Contact..."
+msgstr "_Tìm liên lạc..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
+msgid "Search for text in the displayed contact"
+msgstr "Tìm nội dung trong liên lạc đang xem"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:889
+msgid "_Forward Contact..."
+msgstr "Ch_uyển tiếp liên lạc..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
+msgid "Send selected contacts to another person"
+msgstr "Gửi các liên lạc đã ch�n cho một ngư�i khác"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
+msgid "_Move Contact To..."
+msgstr "Chu_yển liên lạc sang..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
+msgid "Move selected contacts to another address book"
+msgstr "Chuyển các liên lạc đã ch�n sang sổ địa chỉ khác"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
+msgid "_New Contact..."
+msgstr "Liê_n lạc mới..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:910
+msgid "New Contact _List..."
+msgstr "Danh sách _liên lạc mới..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:917
+msgid "_Open Contact"
+msgstr "Mở liên lạ_c"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
+msgid "View the current contact"
+msgstr "Xem liên lạc hiện th�i"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:924
+msgid "_Send Message to Contact..."
+msgstr "_Gửi thư tới liên lạc..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
+msgid "Send a message to the selected contacts"
+msgstr "Gửi thư cho các liên lạc đã ch�n"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:933
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-task-shell-view-actions.c:822
+msgid "_Actions"
+msgstr "_Hành động"
+
+#: ../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
+msgid "_Preview"
+msgstr "_Xem thá»­"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../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 "_Xoá"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
+msgid "_Properties"
+msgstr "_Thuộc tính"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#| msgid "Address Book"
+msgid "Address Book Map"
+msgstr "Bản đồ sổ địa chỉ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
+msgid "Contact _Preview"
+msgstr "_Xem thử liên lạc"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:991
+msgid "Show contact preview window"
+msgstr "Hiện ô xem thử liên lạc"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#| msgid "Show as list"
+msgid "Show _Maps"
+msgstr "Hiện _bản đồ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:999
+#| msgid "Show contact preview window"
+msgid "Show maps in contact preview window"
+msgstr "Hiện bản đồ trong ô xem thử liên lạc"
+
+#: ../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
+msgid "_Classic View"
+msgstr "Trình bày _cổ điển"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1020
+msgid "Show contact preview below the contact list"
+msgstr "Hiện khung xem liên lạc bên dưới danh sách liên lạc"
+
+#: ../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
+msgid "_Vertical View"
+msgstr "Trình bày theo chi�u _d�c"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1027
+msgid "Show contact preview alongside the contact list"
+msgstr "Hiện khung xem liên lạc bên cạnh danh sách liên lạc"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../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 "Loại nào"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:970
+msgid "Unmatched"
+msgstr "Không khớp"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../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
+msgid "Advanced Search"
+msgstr "Tìm kiếm cấp cao"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1085
+msgid "Print all shown contacts"
+msgstr "In m�i liên lạc đang xem"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1092
+msgid "Preview the contacts to be printed"
+msgstr "Xem thử trước khi in liên lạc"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1099
+msgid "Print selected contacts"
+msgstr "In các liên lạc đã ch�n"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1114
+msgid "S_ave Address Book as vCard"
+msgstr "Lưu sổ đị_a chỉ dạng vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "Lưu các liên lạc của sổ địa chỉ đã ch�n dạng vCard"
+
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:1122
+#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+msgid "_Save as vCard..."
+msgstr "Lưu dạng _vCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1124
+msgid "Save selected contacts as a vCard"
+msgstr "Lưu các liên lạc đã ch�n theo dạng vCard"
+
+#: ../modules/addressbook/e-book-shell-view.c:349
+msgid "_Forward Contacts"
+msgstr "_Chuyển tiếp các liên lạc"
+
+#: ../modules/addressbook/e-book-shell-view.c:351
+msgid "_Forward Contact"
+msgstr "_Chuyển tiếp liên lạc"
+
+#: ../modules/addressbook/e-book-shell-view.c:382
+msgid "_Send Message to Contacts"
+msgstr "_Gửi thư cho các liên lạc"
+
+#: ../modules/addressbook/e-book-shell-view.c:384
+msgid "_Send Message to List"
+msgstr "_Gửi thư cho danh sách"
+
+#: ../modules/addressbook/e-book-shell-view.c:386
+msgid "_Send Message to Contact"
+msgstr "_Gửi thư cho liên lạc"
+
+#: ../modules/addressbook/eab-composer-util.c:149
+msgid "Multiple vCards"
+msgstr "Nhi�u vCard"
+
+#: ../modules/addressbook/eab-composer-util.c:157
+#, c-format
+msgid "vCard for %s"
+msgstr "vCard cho %s"
+
+#: ../modules/addressbook/eab-composer-util.c:169
+#: ../modules/addressbook/eab-composer-util.c:196
+#, c-format
+msgid "Contact information"
+msgstr "Thông tin liên lạc"
+
+#: ../modules/addressbook/eab-composer-util.c:198
+#, c-format
+msgid "Contact information for %s"
+msgstr "Thông tin liên lạc cho %s"
+
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
+msgid "1"
+msgstr "1"
+
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:4
+msgid "5"
+msgstr "5"
+
+#: ../modules/addressbook/ldap-config.ui.h:5
+msgid "Anonymously"
+msgstr "Nặc danh"
+
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../modules/addressbook/ldap-config.ui.h:7
+msgid "B_rowse this book until limit reached"
+msgstr "Du_yệt qua quyển này đến khi tới giới hạn"
+
+#: ../modules/addressbook/ldap-config.ui.h:8
+msgid "Lo_gin:"
+msgstr "�ăn_g nhập:"
+
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:11
+msgid "One"
+msgstr "Má»™t"
+
+#: ../modules/addressbook/ldap-config.ui.h:13
+msgid "Search Filter"
+msgstr "Bộ l�c tìm kiếm"
+
+#: ../modules/addressbook/ldap-config.ui.h:14
+msgid "Search _base:"
+msgstr "Cơ _sở tìm:"
+
+#: ../modules/addressbook/ldap-config.ui.h:15
+msgid "Search _filter:"
+msgstr "Bộ _l�c tìm:"
+
+#: ../modules/addressbook/ldap-config.ui.h:16
+#| msgid ""
+#| "Search filter is the type of the objects searched for, while performing "
+#| "the search. If this is not modified, by  default search will be performed "
+#| "on objectclass of the type \"person\"."
+msgid ""
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
+msgstr ""
+"Bộ l�c tìm kiếm là kiểu đối tượng cần tìm kiếm. Nếu nó chưa được sửa đổi, "
+"mặc định là hạng đối tượng kiểu \"person\" (ngư�i) sẽ được tìm kiếm."
+
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:18
+msgid "Sub"
+msgstr "Phụ"
+
+#: ../modules/addressbook/ldap-config.ui.h:19
+msgid "Supported Search Bases"
+msgstr "Cơ sở tìm được hỗ trợ"
+
+#: ../modules/addressbook/ldap-config.ui.h:21
+msgid "Using distinguished name (DN)"
+msgstr "Dùng tên phân biệt (TP)"
+
+#: ../modules/addressbook/ldap-config.ui.h:22
+msgid "Using email address"
+msgstr "Dùng địa chỉ thư"
+
+#: ../modules/addressbook/ldap-config.ui.h:23
+msgid "_Download limit:"
+msgstr "Ngưỡng tải _v�:"
+
+#: ../modules/addressbook/ldap-config.ui.h:24
+msgid "_Find Possible Search Bases"
+msgstr "_Tìm m�i cơ sở tìm có thể"
+
+#: ../modules/addressbook/ldap-config.ui.h:25
+msgid "_Login method:"
+msgstr "Cách đăn_g nhập:"
+
+#: ../modules/addressbook/ldap-config.ui.h:28
+msgid "_Search scope:"
+msgstr "_Phạm vi tìm:"
+
+#: ../modules/addressbook/ldap-config.ui.h:30
+msgid "_Timeout:"
+msgstr "_Th�i hạn:"
+
+#: ../modules/addressbook/ldap-config.ui.h:32
+msgid "cards"
+msgstr "thẻ"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:146
+#, c-format
+#| msgid "Failed to apply outgoing filters: %s"
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "Lỗi chạy Bogofilter (%s): "
+
+#: ../modules/bogofilter/evolution-bogofilter.c:164
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr ""
+
+#: ../modules/bogofilter/evolution-bogofilter.c:213
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr ""
+
+#: ../modules/bogofilter/evolution-bogofilter.c:312
+msgid "Bogofilter Options"
+msgstr "Tùy ch�n Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:321
+msgid "Convert message text to _Unicode"
+msgstr "Chuyển đổi văn bản thư sang _Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:477
+#| msgid "Bogofilter Options"
+msgid "Bogofilter"
+msgstr "Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "Chuyển đổi thư sang Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"Chuyển đổi văn bản của thư sang UTF-8 Unicode, để hợp nhất các hiệu bài rác "
+"đến từ các bộ ký tự khác nhau."
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr ""
+"%u và %d sẽ được thay thế bằng ngư�i dùng và tên mi�n từng từ địa chỉ thư."
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
+msgid "(Shown in a Day View)"
+msgstr "(Hiện trong một ô Xem Ngày)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
+msgid "05 minutes"
+msgstr "05 phút"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
+msgid "10 minutes"
+msgstr "10 phút"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
+msgid "15 minutes"
+msgstr "15 phút"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
+msgid "30 minutes"
+msgstr "30 phút"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
+msgid "60 minutes"
+msgstr "60 phút"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
+msgid "Alerts"
+msgstr "Báo động"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
+msgid "Day _ends:"
+msgstr "Ngày _kết thúc:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
+msgid "Days"
+msgstr "Ngày"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Default Free/Busy Server"
+msgstr "Máy chủ Rảnh/Bận Mặc định"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
+msgid "Display"
+msgstr "Hiển thị"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#| msgid "Display alarms in _notification area only"
+msgid "Display reminders in _notification area only"
+msgstr "Hiển thị nhắc nhở chỉ trong _khay thông báo"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+msgid "Hours"
+msgstr "Gi�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
+msgid "Minutes"
+msgstr "Phút"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#| msgid "Publishing Location"
+msgid "Publishing Information"
+msgstr "Thông tin công bố"
+
+#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+msgid "S_un"
+msgstr "_CN"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
+msgid "Sc_roll Month View by a week"
+msgstr "_Cuộn khung xem tháng theo tuần"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Se_cond zone:"
+msgstr "Múi thứ _hai:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
+#| msgid "Select the calendars for alarm notification"
+msgid "Select the calendars for reminder notification"
+msgstr "Ch�n lịch cho thông báo nhắc nhở"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Sh_ow a reminder"
+msgstr "_Hiện nhắc nhở"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
+msgid "Show a _reminder"
+msgstr "Hiện _nhắc nhở"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
+msgid "Show r_ecurring events in italic in bottom left calendar"
+msgstr "_Hiện sự kiện lặp lại bằng chữ nghiêng ở đáy trái lịch"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
+msgid "Show week _numbers"
+msgstr "Hiệ_n số thứ tự tuần"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "T_asks due today:"
+msgstr "Tác vụ hết hạn vào hôm n_ay:"
+
+#. Thursday
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
+msgid "T_hu"
+msgstr "T_5"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
+msgid "Template:"
+msgstr "Mẫu:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../widgets/misc/e-dateedit.c:592
+msgid "Time"
+msgstr "Gi�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
+msgid "Time format:"
+msgstr "�ịnh dạng gi�:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
+msgid "Use s_ystem time zone"
+msgstr "Dùng _múi gi� hệ thống"
+
+#. A weekday like "Monday" follows
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
+msgid "Wee_k starts on:"
+msgstr "Tuần _bắt đầu:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+msgid "Work Week"
+msgstr "Tuần làm việc"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
+msgid "Work days:"
+msgstr "Ngày làm việc:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "_12 hour (AM/PM)"
+msgstr "_12 gi� (AM/PM: sáng/chi�u)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_24 hour"
+msgstr "_24 gi�"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "_Ask for confirmation when deleting items"
+msgstr "H�i xác thực khi xó_a b� mục"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
+msgid "_Compress weekends in month view"
+msgstr "Nén các ngày _cuối tuần trong ô xem tháng"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
+msgid "_Day begins:"
+msgstr "_Ngày bắt đầu:"
+
+#. Friday
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
+msgid "_Fri"
+msgstr "T_6"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
+msgid "_Hide completed tasks after"
+msgstr "Ẩn tác vụ _hoàn thành sau (khi)"
+
+#. Monday
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+msgid "_Mon"
+msgstr "T_2"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
+msgid "_Overdue tasks:"
+msgstr "Tác vụ _quá hạn:"
+
+#. Saturday
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
+msgid "_Sat"
+msgstr "T_7"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
+msgid "_Show appointment end times in week and month view"
+msgstr "_Hiện th�i điểm kết thúc cuộc hẹn trong ô xem tuần và tháng đ�u"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
+msgid "_Time divisions:"
+msgstr "_Chia th�i gian:"
+
+#. Tuesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
+msgid "_Tue"
+msgstr "T_3"
+
+#. Wednesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
+msgid "_Wed"
+msgstr "T_4"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
+msgid "before every anniversary/birthday"
+msgstr "trước mỗi ngày kỷ niệm/ngày sinh"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
+msgid "before every appointment"
+msgstr "trước mỗi cuộc hẹn"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+msgid "Ask for confirmation when deleting items"
+msgstr "H�i xác nhận trước khi xoá mục"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr "Màu n�n của m�i tác vụ hết hạn hôm nay, có dạng « #rrggbb »"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr "Màu n�n của m�i tác vụ quá hạn, có dạng « #rrggbb »"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+msgid "Birthday and anniversary reminder"
+msgstr "Nhắc nhở sinh nhật và kỷ niệm"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+msgid "Birthday and anniversary reminder units"
+msgstr "�ơn vị nhắc nhở sinh nhật và kỷ niệm"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+msgid "Birthday and anniversary reminder value"
+msgstr "Giá trị nhắc nhở sinh nhật và kỷ niệm"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#| msgid "Calendars to run alarms for"
+msgid "Calendars to run reminders for"
+msgstr "Lịch cần được nhắc nhở"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr ""
+"Màu cần vẽ Dòng Marcus Bains trong thanh Th�i gian (b� rỗng để ch�n mặc định)"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr "Màu cần vẽ Dòng Marcus Bains trong ô xem Ngày"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+msgid "Compress weekends in month view"
+msgstr "Nén các ngày cuối tuần trong ô xem tháng"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+msgid "Confirm expunge"
+msgstr "Xác nhận khi xoá hẳn"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr "Ngày cần ngụ ý gi� bắt đầu và kết thúc đ�u làm việc."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+msgid "Default appointment reminder"
+msgstr "Bộ nhắc nhở cuộc hẹn mặc định"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+msgid "Default reminder units"
+msgstr "�ơn vị nhắc nhở mặc định"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+msgid "Default reminder value"
+msgstr "Giá trị nhắc nhở mặc định"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#| msgid "Directory for saving alarm audio files"
+msgid "Directory for saving reminder audio files"
+msgstr "Thư mục lưu các tập tin âm thanh nhắc nhở"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
+msgid "Free/busy server URLs"
+msgstr "�ịa chỉ mạng của máy chủ Rảnh/Bận"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+msgid "Free/busy template URL"
+msgstr "�ịa chỉ mạng mẫu Rảnh/Bận"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+msgid "Hide completed tasks"
+msgstr "Ẩn m�i tác vụ hoàn tất"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+msgid "Hide task units"
+msgstr "Ẩn đơn vị tác vụ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+msgid "Hide task value"
+msgstr "Ẩn giá trị tác vụ"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+msgid "Horizontal pane position"
+msgstr "Ví trị ô cửa sổ ngang"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr "Gi� kết thúc ngày làm việc, có dạng 24 gi� (0-23)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr "Gi� bắt đầu ngày làm việc, có dạng 24 gi� (0-23)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr "Hộp th�i gian được hiển thị trong ô xem Ngày/Tuần làm việc, theo phút"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#| msgid "Last alarm time"
+msgid "Last reminder time"
+msgstr "Lần nhắc cuối"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+msgid "List of recently used second time zones in a Day View."
+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."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+msgid "Marcus Bains Line"
+msgstr "Dòng Marcus Bains"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+msgid "Marcus Bains Line Color - Day View"
+msgstr "Màu Dòng Marcus Bains — Xem ngày"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+msgid "Marcus Bains Line Color - Time bar"
+msgstr "Màu Dòng Marcus Bains — Thanh th�i gian"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr ""
+"Số tối đa các múi gi� vừa dùng cần giữ lại trong một danh sách « "
+"day_second_zones »."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+msgid "Maximum number of recently used timezones to remember."
+msgstr "Số tối đa các múi gi� vừa dùng cần nhớ."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+msgid "Memo layout style"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+msgid "Memo preview pane position (horizontal)"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+msgid "Memo preview pane position (vertical)"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "Phút kết thúc ngày làm việc, 0-59."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "Phút bắt đầu ngày làm việc, 0-59."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+msgid "Month view horizontal pane position"
+msgstr "Vị trí của ô cửa sổ ngang trong ô xem tháng"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+msgid "Month view vertical pane position"
+msgstr "Vị trí của ô cửa sổ d�c trong ô xem tháng"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+#| msgid "Number of units for determining a default reminder."
+msgid "Number of units for determining a birthday or anniversary reminder."
+msgstr ""
+"Tổng số đơn vị để quyết địnhk nhắc nhở ngày sinh hoặc kỷ niệm ngày cưới."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+msgid "Number of units for determining a default reminder."
+msgstr "Tổng số đơn vị để quyết định lúc nào nhắc nhở mặc định."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+msgid "Number of units for determining when to hide tasks."
+msgstr "Tổng số đơn vị để quyết định lúc nào nên ẩn cộng việc."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+msgid "Overdue tasks color"
+msgstr "Màu của tác vụ quá hạn"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+msgstr ""
+"Ví trị của ô cửa sổ ngang, giữa lịch duyệt ngày và danh sách tác vụ khi "
+"không phải trong ô xem tháng, theo điểm ảnh."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"Ví trị của ô cửa sổ ngang, giữa ô xem và lịch duyệt ngày và danh sách tác vụ "
+"khi trong ô xem tháng, theo điểm ảnh."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+msgid "Position of the task preview pane when oriented vertically."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr "Vị trí của ô cửa sổ d�c, giữa các danh sách lịch và lịch duyệt ngày."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"Ví trị của ô cửa sổ d�c, giữa ô xem và lịch duyệt ngày và danh sách công "
+"việc khi trong ô xem tháng, theo điểm ảnh."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+"Ví trị của ô cửa sổ ngang, giữa lịch duyệt ngày và danh sách tác vụ khi "
+"không phải trong ô xem tháng, theo điểm ảnh."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+msgid "Primary calendar"
+msgstr "Lịch chính"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+msgid "Primary memo list"
+msgstr "Danh sách ghi nhớ chính"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+msgid "Primary task list"
+msgstr "Danh sách tác vụ chính"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#| msgid "Programs that are allowed to be run by alarms."
+msgid "Programs that are allowed to be run by reminders."
+msgstr "Chương trình được phép chạy để nhắc nhở."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+msgid "Recently used second time zones in a Day View"
+msgstr "Múi gi� thứ hai vừa dùng trong một ô Xem Ngày"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+msgid "Recurrent Events in Italic"
+msgstr "Sự kiện lặp lại chữ nghiêng"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#| msgid "Reminder Notes"
+msgid "Reminder programs"
+msgstr "Chương trình nhắc nhở"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
+#| msgid "Save directory for alarm audio"
+msgid "Save directory for reminder audio"
+msgstr "Thư mục lưu âm thanh nhắc nhở"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
+msgid "Scroll Month View by a week"
+msgstr "Cuộn trình bày tháng theo tuần"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr ""
+"Hiện trư�ng RSVP (Vui lòng hồi âm) trong bộ sửa cuộc h�p/tác vụ/sự kiện"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "Hiện trư�ng Vai trò trong bộ sửa cuộc h�p/tác vụ/sự kiện"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
+msgid "Show appointment end times in week and month views"
+msgstr "Hiện th�i điểm kết thúc cuộc hẹn trong ô xem tuần và tháng đ�u"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
+msgid "Show categories field in the event/meeting/task editor"
+msgstr "Hiện trư�ng Hạng trong bộ sửa cuộc h�p/tác vụ/sự kiện"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
+msgid "Show days with recurrent events in italic font in bottom left calendar."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
+#| msgid "Show display alarms in notification tray"
+msgid "Show display reminders in notification tray"
+msgstr "Hiển thị nhắc nhở trong khay thông báo"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
+msgid "Show status field in the event/task/meeting editor"
+msgstr "Hiện trư�ng Trạng thái trong bộ sửa cuộc h�p/tác vụ/sự kiện"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
+msgid "Show the memo preview pane"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
+msgid "Show the task preview pane"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
+msgid "Show timezone field in the event/meeting editor"
+msgstr "Hiện trư�ng Múi gi� trong bộ sửa cuộc h�p/tác vụ/sự kiện"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
+msgid "Show type field in the event/task/meeting editor"
+msgstr "Hiện trư�ng Kiểu trong bộ sửa cuộc h�p/tác vụ/sự kiện"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
+#| msgid "Show week number in Day and Work Week View"
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr "Hiện số thứ tự tuần trong ô xem ngày, tuần làm việc và duyệt ngày"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+"Bật tùy ch�n này thì hiển thị múi gi� thứ hai trong một ô Xem Ngày. Giá trị "
+"này tương tự với giá trị dùng trong một khoá « timezone » (múi gi�)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
+msgid "Task layout style"
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
+#| msgid "Tasks vertical pane position"
+msgid "Task preview pane position (horizontal)"
+msgstr "Vị trí ô xem trước công việc (ngang)"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
+#| msgid "Tasks vertical pane position"
+msgid "Task preview pane position (vertical)"
+msgstr "Vị trí ô xem trước công việc (d�c)"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
+msgid "Tasks due today color"
+msgstr "Màu của tác vụ hết hạn vào hôm nay"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
+msgid ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
+msgid ""
+"The UID of the selected (or \"primary\") memo list in the sidebar of the "
+"\"Memos\" view."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+msgid ""
+"The UID of the selected (or \"primary\") task list in the sidebar of the "
+"\"Tasks\" view."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+"Mẫu địa chỉ mạng cần dùng là dữ liệu Rảnh/Bận phục hồi: « %u » được thay thế "
+"bằng phần ngư�i dùng của địa chỉ thư, và « %d » được thay thế bằng mi�n của "
+"địa chỉ."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"Múi gi� mặc định cần dùng cho ngày và gi� trong lịch, là ví trị cơ sở dữ "
+"liệu kiểu Olsen chưa dịch như « Asia/Hanoi » (Châu �/Hà nội)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"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 ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
+msgid "The second timezone for a Day View"
+msgstr "Múi gi� thứ hai cho một ô Xem Ngày"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+"Có ba giá trị có thể:\n"
+" • 0\t\tlỗi\n"
+" • 1\t\tcảnh báo\n"
+" • 2\t\tthông điệp gỡ lỗi."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
+msgid "Time divisions"
+msgstr "Chia th�i gian"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
+#| msgid "Time the last alarm ran, in time_t."
+msgid "Time the last reminder ran, in time_t."
+msgstr "Th�i điểm nhắc nhở cuối cùng, theo time_t."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+msgid "Timezone"
+msgstr "Múi gi�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
+msgid "Twenty four hour time format"
+msgstr "�ịnh dạng th�i gian 24 gi�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
+#| msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\"."
+msgstr ""
+"�ơn vị cho nhắc nhở ngày sinh và kỉ niệm ngày cưới, \"minutes\" (phút), "
+"\"hours\" (gi�) hoặc \"days\" (ngày)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"�ơn vị cho bộ nhắc nhở mặc định, \"minutes\" (phút), \"hours\" (gi�) hoặc "
+"\"days\" (ngày)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"�ơn vị để quyết định lúc nào ẩn cộng việc, \"minutes\" (phút), \"hours"
+"\" (gi�) hoặc \"days\" (ngày)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
+#| msgid "_Use system defaults"
+msgid "Use system timezone"
+msgstr "Dùng múi gi� hệ thống"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
+msgid "Vertical pane position"
+msgstr "Vị trí ô cửa sổ d�c"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
+msgid "Week start"
+msgstr "Tuần bắt đầu"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgstr "Hôm bắt đầu tuần, từ Chủ Nhật (0) đến Thứ Bảy (6)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
+#| msgid "Whether or not to use the notification tray for display alarms."
+msgid "Whether or not to use the notification tray for display reminders."
+msgstr "Có nên dùng khay thông báo để hiển thị nhắc nhở hay không."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr "Có nên h�i xác nhận khi xoá cuộc hẹn hay tác vụ hay không."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr "Có nên h�i xác nhận khi xoá hắn cuộc hẹn và tác vụ hay không."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+"Có nên nén những ngày cuối tuần trong ô xem tháng, mà hiển thị hai ngày Thứ "
+"Bảy và Chủ Nhật đ�u là cùng cách của một ngày tuần."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
+msgid "Whether to display the end time of events in the week and month views."
+msgstr ""
+"Có nên hiển thị th�i điểm kết thúc sự kiện trong ô xem tuần và tháng đ�u hay "
+"không."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr ""
+"Có nên vẽ Dòng Marcus Bains (dòng tại gi� hiện có) trong lịch hay không."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr "Có nên ẩn m�i tác vụ đã hoàn tất trong ô xem tác vụ hay không."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
+msgid "Whether to set a default reminder for appointments."
+msgstr "Có nên lập bộ nhắc nhở mặc định cho m�i cuộc hẹn hay không."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
+#| msgid "Whether to set a default reminder for appointments."
+msgid "Whether to set a reminder for birthdays and anniversaries."
+msgstr "Có nên đặt nhắc nhở cho ngày sinh và kỷ niệm ngày cưới không."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr ""
+"Có nên hiển thị trư�ng RSVP (Vui lòng hồi âm) trong bộ sửa cuộc h�p/tác vụ/"
+"sự kiện hay không"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "Có nên hiển thị trư�ng loại trong bộ sửa cuộc h�p/sự kiện hay không"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr ""
+"Có nên hiển thị trư�ng Vai trò trong bộ sửa cuộc h�p/tác vụ/sự kiện hay không"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr ""
+"Có nên hiển thị trư�ng trạng thái trong bộ sửa cuộc h�p/tác vụ/dữ kiện hay "
+"không"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
+msgstr ""
+"Có nên hiển thị gi� dạng 24-gi� thay vào dùng am/pm (buổi sáng/buổi chi�u-"
+"tối) hay không."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "Có nên hiển thị trư�ng múi gi� trong bộ sửa cuộc h�p/sự kiện hay không"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr ""
+"Có nên hiển thị trư�ng kiểu trong bộ sửa cuộc h�p/tác vụ/sự kiện hay không"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
+#| msgid "Whether to show week numbers in the date navigator."
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr "Có nên hiển thị số thứ tự tuần ở một số nơi trong lịch hay không."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
+msgid "Work days"
+msgstr "Ngày làm việc"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
+msgid "Workday end hour"
+msgstr "Gi� kết thúc ngày làm việc"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+msgid "Workday end minute"
+msgstr "Phút kết thúc ngày làm việc"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+msgid "Workday start hour"
+msgstr "Gi� bắt đầu ngày làm việc"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
+msgid "Workday start minute"
+msgstr "Phút bắt đầu ngày làm việc"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:312
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "I_mport"
+msgstr "_Nhập"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:393
+msgid "Select a Calendar"
+msgstr "Ch�n Lịch"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:420
+msgid "Select a Task List"
+msgstr "Ch�n Danh sách tác vụ"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:430
+msgid "I_mport to Calendar"
+msgstr "_Nhập vào Lịch"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:437
+msgid "I_mport to Tasks"
+msgstr "_Nhập vào Tác vụ"
+
+#: ../modules/calendar/e-calendar-preferences.c:461
+#| msgid "Selected Calendars for Alarms"
+msgid "Selected Calendars for Reminders"
+msgstr "Lịch được ch�n cho nhắc nhở"
+
+#: ../modules/calendar/e-calendar-preferences.c:863
+msgid "Ti_me and date:"
+msgstr "N_gày gi�:"
+
+#: ../modules/calendar/e-calendar-preferences.c:864
+msgid "_Date only:"
+msgstr "Chỉ _ngày:"
+
+#. Create the Webcal source group
+#: ../modules/calendar/e-cal-shell-backend.c:117
+#: ../modules/calendar/e-cal-shell-migrate.c:198
+#: ../modules/calendar/e-memo-shell-backend.c:104
+#: ../modules/calendar/e-memo-shell-migrate.c:152
+#: ../modules/calendar/e-task-shell-backend.c:104
+#: ../modules/calendar/e-task-shell-migrate.c:164
+msgid "On The Web"
+msgstr "Trên Web"
+
+#: ../modules/calendar/e-cal-shell-backend.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:127
+msgid "Weather"
+msgstr "Th�i tiết"
+
+#: ../modules/calendar/e-cal-shell-backend.c:206
+#: ../modules/calendar/e-cal-shell-migrate.c:66
+msgid "Birthdays & Anniversaries"
+msgstr "Sinh nhật và Kỷ niệm"
+
+#: ../modules/calendar/e-cal-shell-backend.c:439
+msgctxt "New"
+msgid "_Appointment"
+msgstr "Cuộc _hẹn"
+
+#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+msgid "Create a new appointment"
+msgstr "Tạo cuộc hẹn mới"
+
+#: ../modules/calendar/e-cal-shell-backend.c:446
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "Cuộc hẹn ngu_yên ngày"
+
+#: ../modules/calendar/e-cal-shell-backend.c:448
+msgid "Create a new all-day appointment"
+msgstr "Tạo cuộc hẹn nguyên ngày mới"
+
+#: ../modules/calendar/e-cal-shell-backend.c:453
+msgctxt "New"
+msgid "M_eeting"
+msgstr "Cuộc h�_p"
+
+#: ../modules/calendar/e-cal-shell-backend.c:455
+msgid "Create a new meeting request"
+msgstr "Tạo yêu cầu cuộc h�p mới"
+
+#: ../modules/calendar/e-cal-shell-backend.c:463
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "Lịc_h"
+
+#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+msgid "Create a new calendar"
+msgstr "Tạo lịch mới"
+
+#: ../modules/calendar/e-cal-shell-backend.c:788
+msgid "Calendar and Tasks"
+msgstr "Tác vụ và Lịch"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:184
+msgid "Loading calendars"
+msgstr "�ang nạp lịch"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:755
+msgid "_New Calendar..."
+msgstr "Lịch _mới<..."
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:772
+msgid "Calendar Selector"
+msgstr "Bộ ch�n lịch"
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-cal-shell-sidebar.c:1123
+#, c-format
+msgid "Opening calendar at %s"
+msgstr "�ang mở lịch tại %s"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
+msgid "Print"
+msgstr "In"
+
+#: ../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."
+msgstr ""
+"Thao tác này sẽ xoá hoàn toàn m�i sự kiện trước khoảng th�i gian được ch�n. "
+"Nếu bạn tiếp tục thì sẽ không thể phục hồi những tác vụ này."
+
+#. Translators: This is the first part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:337
+msgid "Purge events older than"
+msgstr "Tẩy m�i sự kiện trước"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:564
+msgid "Copying Items"
+msgstr "�ang chép"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:848
+msgid "Moving Items"
+msgstr "�ang di chuyển"
+
+#. Translators: Default filename part saving an event to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-actions.c:1175
+msgid "event"
+msgstr "sự kiện"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1177
+#: ../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 "_Lưu dạng iCalendar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
+msgid "_Copy..."
+msgstr "_Chép..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+msgid "D_elete Calendar"
+msgstr "_Xoá Lịch"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+msgid "Delete the selected calendar"
+msgstr "Xoá lịch đã ch�n"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+msgid "Go Back"
+msgstr "Quay lại"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+msgid "Go Forward"
+msgstr "�i tiếp"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+msgid "Select today"
+msgstr "Ch�n hôm nay"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+msgid "Select _Date"
+msgstr "Ch�n _ngày"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+msgid "Select a specific date"
+msgstr "Ch�n ngày xác định"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+msgid "_New Calendar"
+msgstr "Lịch _mới"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-task-shell-view-actions.c:813
+msgid "Purg_e"
+msgstr "_Tẩy"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+msgid "Purge old appointments and meetings"
+msgstr "Tẩy các cuộc hẹn và cuộc h�p cũ"
+
+#: ../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 "Cậ_p nhật"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+msgid "Refresh the selected calendar"
+msgstr "Cập nhật lịch được ch�n"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+msgid "Rename the selected calendar"
+msgstr "�ổi tên lịch được ch�n"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+msgid "Show _Only This Calendar"
+msgstr "Chỉ hiện lịch _này"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+msgid "Cop_y to Calendar..."
+msgstr "_Chép vào Lịch..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+msgid "_Delegate Meeting..."
+msgstr "Ủ_y nhiệm cuộc h�p..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+msgid "_Delete Appointment"
+msgstr "_Xoá cuộc hẹn"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+msgid "Delete selected appointments"
+msgstr "Xoá cuộc hẹn được ch�n"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+msgid "Delete This _Occurrence"
+msgstr "_Xoá lần này"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+msgid "Delete this occurrence"
+msgstr "Xoá lần này"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+msgid "Delete All Occ_urrences"
+msgstr "Xó_a m�i lần"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+msgid "Delete all occurrences"
+msgstr "Xoá m�i lần"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+msgid "New All Day _Event..."
+msgstr "Sự _kiện tr�n ngày mới..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+msgid "Create a new all day event"
+msgstr "Tạo cuộc hẹn tr�n ngày mới"
+
+#: ../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 "Chuyển dạng _iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+msgid "New _Meeting..."
+msgstr "Cuộc _h�p mới..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+msgid "Create a new meeting"
+msgstr "Tạo cuộc h�p mới"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+msgid "Mo_ve to Calendar..."
+msgstr "Chuyển _vào Lịch..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+msgid "New _Appointment..."
+msgstr "Cuộc hẹ_n mới..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1489
+msgid "Make this Occurrence _Movable"
+msgstr "Cho phép di chuyển _lần này"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+msgid "_Open Appointment"
+msgstr "_Mở Cuộc hẹn"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+msgid "View the current appointment"
+msgstr "Xem cuộc hẹn hiện th�i"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+msgid "_Reply"
+msgstr "T_rả l�i"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+msgid "_Schedule Meeting..."
+msgstr "Lập lịch c_uộc h�p..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+msgid "Converts an appointment to a meeting"
+msgstr "Chuyển các cuộc hẹn thành h�p"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+msgid "Conv_ert to Appointment..."
+msgstr "Chuyển sang cuộc hẹ_n..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+msgid "Converts a meeting to an appointment"
+msgstr "Chuyển cuộc h�p thành cuộc hẹn"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+msgid "Quit"
+msgstr "Thoát"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1651
+msgid "Day"
+msgstr "Ngày"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+msgid "Show one day"
+msgstr "Xem một ngày"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
+msgid "List"
+msgstr "Danh sách"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+msgid "Show as list"
+msgstr "Xem dạng danh sách"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1665
+msgid "Month"
+msgstr "Tháng"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+msgid "Show one month"
+msgstr "Xem một tháng"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1672
+msgid "Week"
+msgstr "Tuần"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+msgid "Show one week"
+msgstr "Xem một tuần"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1681
+msgid "Show one work week"
+msgstr "Xem một tuần làm việc"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+msgid "Active Appointments"
+msgstr "Cuộc hẹn hoạt động"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+msgid "Next 7 Days' Appointments"
+msgstr "Cuộc hẹn 7 ngày kế"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-memo-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:994
+msgid "Description contains"
+msgstr "Mô tả chứa"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-memo-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:1001
+msgid "Summary contains"
+msgstr "Tóm tắt chứa"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1753
+msgid "Print this calendar"
+msgstr "In lịch này"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+msgid "Preview the calendar to be printed"
+msgstr "Xem thử lịch trước khi in"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1782
+#: ../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 "Lưu dạng _iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1859
+msgid "Go To"
+msgstr "�i tới"
+
+#. 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:217
+#: ../modules/calendar/e-memo-shell-view-actions.c:522
+msgid "memo"
+msgstr "ghi nhá»›"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
+msgid "New _Memo"
+msgstr "_Ghi nhá»› má»›i"
+
+#: ../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:656
+msgid "Create a new memo"
+msgstr "Tạo ghi nhớ mới"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:661
+msgid "_Open Memo"
+msgstr "_Mở ghi nhớ"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:269
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
+msgid "View the selected memo"
+msgstr "Xem ghi nhớ đã ch�n"
+
+#: ../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 "Mở trang _Web"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:286
+#: ../modules/calendar/e-memo-shell-view-actions.c:828
+msgid "Print the selected memo"
+msgstr "In ghi nhớ đã ch�n"
+
+#. Translators: Default filename part saving a task to a file when
+#. * 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:284
+#: ../modules/calendar/e-task-shell-view-actions.c:639
+msgid "task"
+msgstr "tác vụ"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
+#: ../modules/calendar/e-task-shell-view-actions.c:701
+msgid "_Assign Task"
+msgstr "_Gán Tác vụ"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:778
+msgid "_Mark as Complete"
+msgstr "�ánh dấu _hoàn tất"
+
+#: ../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 "�ánh dấu các tác vụ đã ch�n là hoàn tất"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+msgid "_Mark as Incomplete"
+msgstr "�ánh dấu chưa h_oàn tất"
+
+#: ../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 "�ánh dấu các tác vụ đã ch�n là chưa hoàn tất"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:792
+msgid "New _Task"
+msgstr "_Tác vụ mới"
+
+#: ../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:794
+msgid "Create a new task"
+msgstr "Tạo tác vụ mới"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
+#: ../modules/calendar/e-task-shell-view-actions.c:799
+msgid "_Open Task"
+msgstr "_Mở tác vụ"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
+#: ../modules/calendar/e-task-shell-view-actions.c:801
+msgid "View the selected task"
+msgstr "Xem tác vụ đã ch�n"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-task-shell-view-actions.c:1027
+msgid "Print the selected task"
+msgstr "In tác vụ đã ch�n"
+
+#: ../modules/calendar/e-memo-shell-backend.c:298
+msgctxt "New"
+msgid "Mem_o"
+msgstr "_Ghi nhá»›"
+
+#: ../modules/calendar/e-memo-shell-backend.c:305
+msgctxt "New"
+msgid "_Shared Memo"
+msgstr "Ghi nhá»› ch_ung"
+
+#: ../modules/calendar/e-memo-shell-backend.c:307
+msgid "Create a new shared memo"
+msgstr "Tạo ghi nhớ chung mới"
+
+#: ../modules/calendar/e-memo-shell-backend.c:315
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "Danh sách ghi nhớ"
+
+#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
+msgid "Create a new memo list"
+msgstr "Tạo danh sách ghi nhớ mới"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:179
+msgid "Loading memos"
+msgstr "�ang nạp ghi nhớ..."
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:696
+msgid "Memo List Selector"
+msgstr "Bộ ch�n danh sách ghi nhớ"
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-memo-shell-sidebar.c:1009
+#, c-format
+msgid "Opening memos at %s"
+msgstr "�ang mở ghi nhớ tại %s..."
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
+msgid "Print Memos"
+msgstr "In ghi nhá»›"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+msgid "_Delete Memo"
+msgstr "_Xoá ghi nhớ"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
+msgid "_Find in Memo..."
+msgstr "_Tìm bản ghi nhớ..."
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
+msgid "Search for text in the displayed memo"
+msgstr "Tìm nội dung trong bản ghi nhớ đang xem"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
+msgid "D_elete Memo List"
+msgstr "_Xoá danh sách ghi nhớ"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
+msgid "Delete the selected memo list"
+msgstr "Xoá danh sách ghi nhớ đã ch�n"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
+msgid "_New Memo List"
+msgstr "Danh sách ghi _nhớ mới"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+msgid "Refresh the selected memo list"
+msgstr "Cập nhật danh sách ghi nhớ đã ch�n"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
+msgid "Rename the selected memo list"
+msgstr "�ổi tên danh sách ghi nhớ đã ch�n"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+msgid "Show _Only This Memo List"
+msgstr "Chỉ hiện danh sách ghi nhớ _này"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
+msgid "Memo _Preview"
+msgstr "_Xem trước bản ghi nhớ"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
+msgid "Show memo preview pane"
+msgstr "Khung xem thá»­"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:749
+msgid "Show memo preview below the memo list"
+msgstr "Hiển thị khung xem ghi nhớ bên dưới danh sách ghi nhớ"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:756
+msgid "Show memo preview alongside the memo list"
+msgstr "Hiện khung xem ghi nhớ bên cạnh danh sách ghi nhớ"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
+msgid "Print the list of memos"
+msgstr "In danh sách các ghi nhớ"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:821
+msgid "Preview the list of memos to be printed"
+msgstr "Xem thử danh sách ghi nhớ trước khi in"
+
+#: ../modules/calendar/e-memo-shell-view.c:227
+msgid "Delete Memos"
+msgstr "Xoá ghi nhớ"
+
+#: ../modules/calendar/e-memo-shell-view.c:229
+msgid "Delete Memo"
+msgstr "Xoá ghi nhớ"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:424
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d ghi nhá»›"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:428
+#: ../modules/calendar/e-task-shell-view-private.c:585
+#, c-format
+msgid "%d selected"
+msgstr "%d đã ch�n"
+
+#: ../modules/calendar/e-task-shell-backend.c:297
+msgctxt "New"
+msgid "_Task"
+msgstr "_Tác vụ"
+
+#: ../modules/calendar/e-task-shell-backend.c:304
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "Tác vụ đã _gán"
+
+#: ../modules/calendar/e-task-shell-backend.c:306
+msgid "Create a new assigned task"
+msgstr "Tạo tác vụ đã gán mới"
+
+#: ../modules/calendar/e-task-shell-backend.c:314
+msgctxt "New"
+msgid "Tas_k List"
+msgstr "Danh sách _tác vụ"
+
+#: ../modules/calendar/e-task-shell-backend.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:745
+msgid "Create a new task list"
+msgstr "Tạo danh sách tác vụ mới"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:179
+msgid "Loading tasks"
+msgstr "�ang nạp tác vụ..."
+
+#: ../modules/calendar/e-task-shell-sidebar.c:696
+msgid "Task List Selector"
+msgstr "Bộ ch�n danh sách tác vụ"
+
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-task-shell-sidebar.c:1010
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "�ang mở tác vụ tại %s..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
+msgid "Print Tasks"
+msgstr "In tác vụ"
+
+#: ../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"
+"Really erase these tasks?"
+msgstr ""
+"Thao tác này sẽ xoá hoàn toàn m�i tác vụ được đánh dấu đã hoàn tất. Nếu bạn "
+"tiếp tục, bạn sẽ không thể phục hồi những tác vụ này.\n"
+"\n"
+"Bạn có thật sự muốn xoá những tác vụ này sao?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:590
+msgid "Do not ask me again"
+msgstr "�ừng h�i nữa."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:708
+msgid "_Delete Task"
+msgstr "_Xoá tác vụ"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:715
+msgid "_Find in Task..."
+msgstr "_Tìm tác vụ..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:717
+msgid "Search for text in the displayed task"
+msgstr "Tìm nội dung trong tác vụ đang xem"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:729
+msgid "Copy..."
+msgstr "Chép..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:736
+msgid "D_elete Task List"
+msgstr "_Xoá danh sách tác vụ"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:738
+msgid "Delete the selected task list"
+msgstr "Xoá danh sách tác vụ đã ch�n"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:743
+msgid "_New Task List"
+msgstr "Da_nh sách Tác vụ mới"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:759
+msgid "Refresh the selected task list"
+msgstr "Cập nhật danh sách tác vụ đã ch�n"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:766
+msgid "Rename the selected task list"
+msgstr "�ổi tên danh sách tác vụ đã ch�n"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:771
+msgid "Show _Only This Task List"
+msgstr "Chỉ hiện danh sách tác vụ _này"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:785
+msgid "Mar_k as Incomplete"
+msgstr "�ánh dấu chưa h_oàn tất"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:815
+msgid "Delete completed tasks"
+msgstr "Xoá các tác vụ hoàn tất"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:890
+msgid "Task _Preview"
+msgstr "_Xem thử tác vụ"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:892
+msgid "Show task preview pane"
+msgstr "Hiện khung xem trước"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:913
+#| msgid "Show message preview below the message list"
+msgid "Show task preview below the task list"
+msgstr "Hiển thị ô xem thử công việc bên dưới danh sách công việc"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:920
+#| msgid "Show message preview below the message list"
+msgid "Show task preview alongside the task list"
+msgstr "Hiển thị ô xem thử công việc bên cạnh danh sách công việc"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:928
+msgid "Active Tasks"
+msgstr "Tác vụ hoạt động"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:942
+msgid "Completed Tasks"
+msgstr "Tác vụ hoàn tất"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:949
+msgid "Next 7 Days' Tasks"
+msgstr "Tác vụ 7 ngày kế"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:956
+msgid "Overdue Tasks"
+msgstr "Tác vụ quá hạn"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:963
+msgid "Tasks with Attachments"
+msgstr "Tác vụ có đồ đính kèm"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
+msgid "Print the list of tasks"
+msgstr "In danh sách các tác vụ"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1020
+#| msgid "Previews the list of tasks to be printed"
+msgid "Preview the list of tasks to be printed"
+msgstr "Xem thử danh sách các tác vụ cần in"
+
+#: ../modules/calendar/e-task-shell-view.c:362
+msgid "Delete Tasks"
+msgstr "Xoá tác vụ"
+
+#: ../modules/calendar/e-task-shell-view.c:364
+msgid "Delete Task"
+msgstr "Xoá tác vụ"
+
+#: ../modules/calendar/e-task-shell-view-private.c:472
+msgid "Expunging"
+msgstr "�ang xoá hẳn..."
+
+#: ../modules/calendar/e-task-shell-view-private.c:581
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d tác vụ"
+
+#: ../modules/mail/em-account-prefs.c:219
+msgid "Evolution Account Assistant"
+msgstr "Phụ tá tài khoản Evolution"
+
+#: ../modules/mail/em-account-prefs.c:268
+msgid "Account Editor"
+msgstr "Bộ sửa tài khoản"
+
+#. Translators: This is only for multiple messages.
+#: ../modules/mail/e-mail-attachment-handler.c:384
+#, c-format
+msgid "%d attached messages"
+msgstr "%d thư đính kèm"
+
+#: ../modules/mail/e-mail-shell-backend.c:195
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "Bài _thư"
+
+#: ../modules/mail/e-mail-shell-backend.c:197
+msgid "Compose a new mail message"
+msgstr "Viết thư mới"
+
+#: ../modules/mail/e-mail-shell-backend.c:205
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "Thư _mục thư"
+
+#: ../modules/mail/e-mail-shell-backend.c:207
+msgid "Create a new mail folder"
+msgstr "Tạo hộp thư mới"
+
+#: ../modules/mail/e-mail-shell-backend.c:412
+msgid "Mail Accounts"
+msgstr "Tài khoản thư"
+
+#: ../modules/mail/e-mail-shell-backend.c:420
+msgid "Mail Preferences"
+msgstr "Tùy thích thư"
+
+#: ../modules/mail/e-mail-shell-backend.c:428
+msgid "Composer Preferences"
+msgstr "Tùy thích bộ soạn thảo"
+
+#: ../modules/mail/e-mail-shell-backend.c:436
+msgid "Network Preferences"
+msgstr "Tùy thích Mạng"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view.c:960
+msgid "_Disable Account"
+msgstr "_Tắt tài khoản"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
+msgid "Disable this account"
+msgstr "Tắt tài khoản này"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "Gỡ b� hoàn toàn m�i thư đã xoá ra kh�i m�i thư mục"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
+msgid "_Download Messages for Offline Usage"
+msgstr "Tải _v� thư để đ�c ngoại tuyến"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
+msgid "Download messages of accounts and folders marked for offline usage"
+msgstr "Tải v� các thư của tài khoản và thư mục có đánh dấu ngoại tuyến"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
+msgid "Fl_ush Outbox"
+msgstr "Xoá _sạch hộp thư gửi"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
+msgid "_Copy Folder To..."
+msgstr "_Chép thư mục vào..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
+msgid "Copy the selected folder into another folder"
+msgstr "Sao chép thư mục đã ch�n sang thư mục khác"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
+msgid "Permanently remove this folder"
+msgstr "Gỡ b� hoàn toàn thư mục này"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
+msgid "E_xpunge"
+msgstr "_Xoá hẳn"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Gỡ b� hoàn toàn m�i thư đã xoá trong thư mục này"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
+msgid "Mar_k All Messages as Read"
+msgstr "�ánh dấu m�i thư �ã đ�_c"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
+msgid "Mark all messages in the folder as read"
+msgstr "�ánh dấu « �ã đ�c » m�i thư nằm trong thư mục này"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
+msgid "_Move Folder To..."
+msgstr "Chu_yển thư mục sang..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
+msgid "Move the selected folder into another folder"
+msgstr "Chuyển thư mục đã ch�n vào thư mục khác"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
+msgid "_New..."
+msgstr "_Má»›i..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
+msgid "Create a new folder for storing mail"
+msgstr "Tạo thư mục mới để lưu thư"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
+msgid "Change the properties of this folder"
+msgstr "Thay đổi thuộc tính của thư mục này"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
+msgid "Refresh the folder"
+msgstr "Cập nhật thư mục"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
+msgid "Change the name of this folder"
+msgstr "Thay đổi tên thư mục này"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
+msgid "Select Message _Thread"
+msgstr "Ch�n nhánh _thư"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
+msgid "Select all messages in the same thread as the selected message"
+msgstr "Ch�n tất cả nhưng thư trong cùng nhánh với thư đã ch�n"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
+msgid "Select Message S_ubthread"
+msgstr "Ch�n nhánh _phụ thư"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
+msgid "Select all replies to the currently selected message"
+msgstr "Ch�n m�i trả l�i thư được ch�n hiện th�i"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
+msgid "Empty _Trash"
+msgstr "�ổ _rác"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#| msgid "Permanently remove all deleted messages from all folders"
+msgid "Permanently remove all the deleted messages from all accounts"
+msgstr "Gỡ b� vĩnh viễn m�i thư đã xoá ở m�i tài khoản"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
+msgid "_New Label"
+msgstr "_Nhãn mới"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
+msgid "N_one"
+msgstr "_Không"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
+msgid "_Manage Subscriptions"
+msgstr "_Quản lý đăng ký"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "�ăng ký hoặc hủy đăng ký thư mục trên máy chủ từ xa"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
+msgid "Send / _Receive"
+msgstr "Gửi / _Nhận"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
+msgid "Send queued items and retrieve new items"
+msgstr "Gửi các mục đang đợi gửi và nhận các mục mới"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#| msgid "R_eceive all"
+msgid "R_eceive All"
+msgstr "_Nhận hết"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
+msgid "Receive new items from all accounts"
+msgstr "Nhận mục mới từ m�i tài khoản"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#| msgid "_Send all"
+msgid "_Send All"
+msgstr "_Gửi hết"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#| msgid "Send queued items and retrieve new items"
+msgid "Send queued items in all accounts"
+msgstr "Gửi thư trong hàng đợi gửi ở m�i tài khoản"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../widgets/misc/e-activity-proxy.c:310
+msgid "Cancel"
+msgstr "Hủy b�"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
+msgid "Cancel the current mail operation"
+msgstr "Hủy thao tác thư tín hiện th�i"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
+msgid "Collapse All _Threads"
+msgstr "_Thu g�n m�i nhánh"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
+msgid "Collapse all message threads"
+msgstr "Thu g�n m�i nhánh thư"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
+msgid "E_xpand All Threads"
+msgstr "_Dãn ra m�i nhánh"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
+msgid "Expand all message threads"
+msgstr "Dãn ra m�i nhánh thư"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
+msgid "_Message Filters"
+msgstr "Bộ _l�c thư"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
+msgid "Create or edit rules for filtering new mail"
+msgstr "Tạo hoặc sửa đổi quy tắc l�c thư mới"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
+msgid "_Subscriptions..."
+msgstr "_Sự đăng ký..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
+msgid "F_older"
+msgstr "Thư _mục"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
+msgid "_Label"
+msgstr "_Nhãn"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1367
+msgid "C_reate Search Folder From Search..."
+msgstr "Tạ_o thư mục tìm kiếm từ kết quả tìm kiếm..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1374
+msgid "Search F_olders"
+msgstr "Tìm kiếm tr_ong thư mục"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#| msgid "Create or edit Search Folder definitions"
+msgid "Create or edit search folder definitions"
+msgstr "Tạo hoặc sửa đổi l�i định nghĩa thư mục tìm kiếm"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1407
+msgid "_New Folder..."
+msgstr "Thư mục _mới..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
+msgid "Show Message _Preview"
+msgstr "Hiện ô _xem thử thư"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1437
+msgid "Show message preview pane"
+msgstr "Hiện khung xem thư"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
+msgid "Show _Deleted Messages"
+msgstr "Hiện các thư đã _xoá"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
+#| msgid "Show deleted messages (with a strike-through) in the message-list."
+msgid "Show deleted messages with a line through them"
+msgstr "Hiển thị thư bị xoá (kiểu gạch đè) trong danh sách các thư."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1451
+msgid "_Group By Threads"
+msgstr "Nhóm lại theo _nhánh"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#| msgid "Threaded Message list"
+msgid "Threaded message list"
+msgstr "Danh sách thư theo nhánh"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
+msgid "Show message preview below the message list"
+msgstr "Hiển thị ô xem thử thư bên dưới danh sách thư"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1481
+#| msgid "Show message preview below the message list"
+msgid "Show message preview alongside the message list"
+msgstr "Hiển thị ô xem thử thư bên cạnh danh sách thư"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1489
+msgid "All Messages"
+msgstr "M�i thư"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1496
+msgid "Important Messages"
+msgstr "Thư quan tr�ng"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1503
+msgid "Last 5 Days' Messages"
+msgstr "Thư trong 5 ngày trước"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1510
+msgid "Messages Not Junk"
+msgstr "Thư không phải rác"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1517
+msgid "Messages with Attachments"
+msgstr "Thư có đồ đính kèm"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1524
+msgid "No Label"
+msgstr "Không có nhãn"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1531
+msgid "Read Messages"
+msgstr "Thư đã đ�c"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1538
+msgid "Recent Messages"
+msgstr "Thư gần đây"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
+msgid "Unread Messages"
+msgstr "Thư chưa đ�c"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1597
+#| msgid "Subject or Sender contains"
+msgid "Subject or Addresses contain"
+msgstr "Chủ đ� hoặc địa chỉ chứa"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
+msgid "All Accounts"
+msgstr "M�i tài khoản"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
+msgid "Current Account"
+msgstr "Tài khoản hiện th�i"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
+msgid "Current Folder"
+msgstr "Thư mục hiện th�i"
+
+#: ../modules/mail/e-mail-shell-view.c:563
+msgid "All Account Search"
+msgstr "Tìm trong m�i tài khoản"
+
+#: ../modules/mail/e-mail-shell-view.c:736
+msgid "Account Search"
+msgstr "Tìm trong tài khoản"
+
+#: ../modules/mail/e-mail-shell-view.c:958
+msgid "Proxy _Logout"
+msgstr "�ăng _xuất ủy nhiệm"
+
+#: ../modules/mail/e-mail-shell-view-private.c:997
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "%d đã ch�n, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:1008
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d bị xoá"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d thư rác"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1027
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d nháp"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1033
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d chÆ°a gá»­i"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1039
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d đã gửi"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1051
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d chưa đ�c, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:1054
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d tổng cộng"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1074
+#| msgid "Task"
+msgid "Trash"
+msgstr "S�t rác"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1542
+msgid "Send / Receive"
+msgstr "Gửi / Nhận"
+
+#: ../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
+msgid "Enabled"
+msgstr "Bật"
+
+#: ../modules/mail/em-composer-prefs.c:499
+msgid "Language(s)"
+msgstr "Ngôn ngữ"
+
+#: ../modules/mail/em-mailer-prefs.c:91
+msgid "Every time"
+msgstr "M�i lần"
+
+#: ../modules/mail/em-mailer-prefs.c:92
+msgid "Once per day"
+msgstr "Một lần mỗi ngày"
+
+#: ../modules/mail/em-mailer-prefs.c:93
+msgid "Once per week"
+msgstr "Một lần mỗi tuần"
+
+#: ../modules/mail/em-mailer-prefs.c:94
+msgid "Once per month"
+msgstr "Một lần mỗi tháng"
+
+#: ../modules/mail/em-mailer-prefs.c:293
+msgid "Header"
+msgstr "�ầu trang"
+
+#: ../modules/mail/em-mailer-prefs.c:297
+msgid "Contains Value"
+msgstr "Chứa giá trị"
+
+#. 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:1051
+#| msgid "Table header"
+msgid "_Date header:"
+msgstr "Dòng dầu _Date:"
+
+#: ../modules/mail/em-mailer-prefs.c:1052
+#| msgid "Show _Original Size"
+msgid "Show _original header value"
+msgstr "Hiện giá trị dòng đầu _gốc"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Kiểm tra nếu Evolution là trình thư mặc định."
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+"Mỗi lần khởi chạy Evolution, kiểm tra nếu nó là trình thư mặc định hay không."
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+msgid "Do you want to make Evolution your default email client?"
+msgstr ""
+"Bạn có muốn đặt Evolution là ứng dụng khách thư điện tử mặc định của bạn "
+"không?"
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+msgid "Click 'Work Online' to return to online mode."
+msgstr "Nhấn Trực tuyến' để trở v� trực tuyến."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
+msgid "Evolution is currently offline due to a network outage."
+msgstr "Evolution hiện th�i đang ngoại tuyến vì đứt mạng."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
+msgid "Evolution is currently offline."
+msgstr "Evolution hiện đang ngoại tuyến."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
+msgid ""
+"Evolution will return to online mode once a network connection is "
+"established."
+msgstr "Evolution sẽ quay lại trực tuyến ngay khi có kết nối mạng."
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an authentication token."
+msgstr ""
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+#| msgid "Other"
+msgid "OAuth"
+msgstr "OAuth"
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+msgid ""
+"This option will connect to the server by way of the GNOME Online Accounts "
+"service"
+msgstr ""
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:70
+msgid "Author(s)"
+msgstr "Tác giả"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:256
+msgid "Plugin Manager"
+msgstr "Bộ quản lý phần bổ sung"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:271
+msgid "Note: Some changes will not take effect until restart"
+msgstr ""
+"Ghi chú: một số thay đổi sẽ không hoạt động cho đến khi đã khởi động lại"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:300
+msgid "Overview"
+msgstr "Toàn cảnh"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:369
+#: ../modules/plugin-manager/evolution-plugin-manager.c:452
+msgid "Plugin"
+msgstr "Phần bổ sung"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:490
+msgid "_Plugins"
+msgstr "_Phần bổ sung"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:491
+msgid "Enable and disable plugins"
+msgstr "Bật và tắt phần bổ sung"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Phần bổ sung Thử Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Phần bổ sung Thử cho bộ nạp Python EPlugin."
+
+# Name? Tên?
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hello Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+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 ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:214
+#| msgid "Filter junk messages using SpamAssassin."
+msgid "Failed to stream mail message content to SpamAssassin: "
+msgstr "Lỗi chuyển nội dung thư (dạng luồng) qua SpamAssassin: "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:233
+#, c-format
+#| msgid "Failed to send %d of %d messages"
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "Lỗi ghi '%s' vào SpamAssassin: "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:261
+msgid "Failed to read output from SpamAssassin: "
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:316
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:835
+msgid "SpamAssassin Options"
+msgstr "Tùy ch�n SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:850
+msgid "I_nclude remote tests"
+msgstr "_Bao gồm các phép thử từ xa"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:864
+#| msgid "This will make SpamAssassin more reliable, but slower"
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr "Việc này làm SpamAssasin đáng tin hơn, nhưng chậm hơn."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:1073
+#| msgid "SpamAssassin Options"
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use SpamAssassin daemon and client"
+msgstr "Dùng trình n�n và ứng dụng khách SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "Dùng trình n�n và ứng dụng khách SpamAssassin (spamc/spamd)."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
+msgid "Use only local spam tests."
+msgstr "Dùng chỉ sự kiểm tra thư rác kiểu cục bộ."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
+msgid "Use only the local spam tests (no DNS)."
+msgstr "Dùng chỉ sự kiểm tra thư rác kiểu cục bộ (không có DNS)."
+
+#: ../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 "Hãy ch�n thông tin bạn muốn nhập:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:312
+#: ../widgets/misc/e-import-assistant.c:552
+#, c-format
+msgid "From %s:"
+msgstr "Từ %s:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:323
+#: ../modules/startup-wizard/evolution-startup-wizard.c:421
+msgid "Importing Files"
+msgstr "Nhập tập tin"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:399
+msgid "Import cancelled. Click \"Forward\" to continue."
+msgstr "Nhập bị huỷ. Nhấn \"Tiếp\" để tiếp tục."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:417
+msgid "Import complete. Click \"Forward\" to continue."
+msgstr "Nhập hoàn tất. Nhấn \"Tiếp\" để tiếp tục."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:497
+msgid "Evolution Setup Assistant"
+msgstr "Trợ tá thiết lập Evolution"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:503
+msgid "Welcome"
+msgstr "Chào mừng"
+
+#: ../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"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"Chào mừng dùng Evolution. Những màn hình kế tiếp\n"
+"sẽ cho phép Evolution kết nối với các tài khoản thư của bạn,\n"
+"và để nhập các tập tin từ các ứng dụng khác.\n"
+"\n"
+"Vui lòng nhấn nút « Tiếp » để tiếp tục."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:613
+#| msgid "Loading..."
+msgid "Loading accounts..."
+msgstr "�ang nạp tài khoản..."
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+#| msgid "List local address book folders"
+msgid "Add local address books to Evolution."
+msgstr "Thêm sổ địa chỉ cục bộ vào Evolution."
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Local Address Books"
+msgstr "Các Sổ địa chỉ cục bộ"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
+"Danh sách các đầu mối cho phần bổ sung nhắc nhở đồ đính kèm lần trong nội "
+"dung thÆ°"
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
+msgid "_Do not show this message again."
+msgstr "�ừng hiện thông điệp nà_y lần nữa."
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:464
+#: ../plugins/templates/templates.c:462
+msgid "Keywords"
+msgstr "Từ khoá"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr ""
+"Trình Evolution tìm thấy từ khoá ngụ ý thư này nên chứa đồ đính kèm, nhưng "
+"chưa có."
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+msgid "Message has no attachments"
+msgstr "Thư không có đồ đính kèm"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#| msgid "_Add attachment..."
+msgid "_Add Attachment..."
+msgstr "�ính kèm trong thư..."
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Edit Message"
+msgstr "_Sá»­a thÆ°"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+msgid "Attachment Reminder"
+msgstr "Nhắc nhở đính kèm"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "Nhắc bạn nếu bạn quên đính kèm vào thư."
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+msgid "Inline Audio"
+msgstr "Tiếng trực tiếp"
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+msgid "Play audio attachments directly in mail messages."
+msgstr "Phát đính kèm âm thanh trực tiếp khi xem thư."
+
+#: ../plugins/backup-restore/backup-restore.c:192
+#| msgid "Select name of the Evolution backup file"
+msgid "Select name of the Evolution backup file"
+msgstr "Ch�n tên của tập tin sao lưu Evolution"
+
+#: ../plugins/backup-restore/backup-restore.c:225
+#| msgid "_Restart Evolution after backup"
+msgid "_Restart Evolution after backup"
+msgstr "_Khởi chạy lại Evolution sau khi sao lưu"
+
+#: ../plugins/backup-restore/backup-restore.c:251
+#| msgid "Select name of the Evolution backup file to restore"
+msgid "Select name of the Evolution backup file to restore"
+msgstr "Ch�n tên của tập tin sao lưu Evolution cần phục hồi"
+
+#: ../plugins/backup-restore/backup-restore.c:264
+msgid "_Restart Evolution after restore"
+msgstr "_Khởi chạy lại Evolution sau khi phục hồi"
+
+#: ../plugins/backup-restore/backup-restore.c:337
+#| msgid ""
+#| "You can restore Evolution from your backup. It can restore all the Mails, "
+#| "Calendars, Tasks, Memos, Contacts. \n"
+#| "It also restores all your personal settings, mail filters etc."
+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 ""
+"Bạn có khả năng phục hồi Evolution từ tập tin sao lưu. Nó có thể phục hồi "
+"tất cả các Thư, Lịch, Tác vụ, Ghi nhớ và Liên lạc. Cũng phục hồi các thiết "
+"lập cá nhân, bộ l�c thư v.v."
+
+#: ../plugins/backup-restore/backup-restore.c:344
+#| msgid "_Restore Evolution from the backup file"
+msgid "_Restore Evolution from the backup file"
+msgstr "_Phục hồi Evolution từ tập tin sao lưu"
+
+#: ../plugins/backup-restore/backup-restore.c:351
+msgid "Please select an Evolution Archive to restore:"
+msgstr "Ch�n kho lưu Evolution cần phục hồi:"
+
+#: ../plugins/backup-restore/backup-restore.c:354
+msgid "Choose a file to restore"
+msgstr "Ch�n tập tin cần phục hồi"
+
+#: ../plugins/backup-restore/backup-restore.c:362
+#| msgid "Restore from backup"
+msgid "Restore from backup"
+msgstr "Phục hồi từ bản sao lưu"
+
+#: ../plugins/backup-restore/backup-restore.c:402
+#| msgid "Backing up Evolution Data"
+msgid "_Back up Evolution Data..."
+msgstr "_Sao lưu Dữ liệu Evolution..."
+
+#: ../plugins/backup-restore/backup-restore.c:404
+#| msgid "Backup and restore Evolution data and settings"
+msgid "Back up Evolution data and settings to an archive file"
+msgstr "Sao lưu dữ liệu và thiết lập Evolution vào tập tin"
+
+#: ../plugins/backup-restore/backup-restore.c:409
+#| msgid "Restoring Evolution Data"
+msgid "R_estore Evolution Data..."
+msgstr "_Phục hồi Dữ liệu Evolution..."
+
+#: ../plugins/backup-restore/backup-restore.c:411
+#| msgid "Backup and restore Evolution data and settings"
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "Phục hồi dữ liệu và thiết lập Evolution từ tập tin"
+
+#: ../plugins/backup-restore/backup.c:77
+#| msgid "Backup Evolution directory"
+msgid "Back up Evolution directory"
+msgstr "Thư mục sao lưu Evolution"
+
+#: ../plugins/backup-restore/backup.c:79
+msgid "Restore Evolution directory"
+msgstr "Thư mục phục hồi Evolution"
+
+#: ../plugins/backup-restore/backup.c:81
+#| msgid "Check Evolution Backup"
+msgid "Check Evolution Back up"
+msgstr "Kiểm tra bản sao Evolution"
+
+#: ../plugins/backup-restore/backup.c:83
+msgid "Restart Evolution"
+msgstr "Khởi chạy lại Evolution"
+
+#: ../plugins/backup-restore/backup.c:85
+msgid "With Graphical User Interface"
+msgstr "Bằng giao diện ngư�i dùng đồ h�a"
+
+#. FIXME Will the versioned setting always work?
+#: ../plugins/backup-restore/backup.c:299
+#: ../plugins/backup-restore/backup.c:418
+msgid "Shutting down Evolution"
+msgstr "�ang tắt trình Evolution"
+
+#: ../plugins/backup-restore/backup.c:308
+msgid "Backing Evolution accounts and settings"
+msgstr "�ang sao lưu các tài khoản và thiết lập đ�u của trình Evolution"
+
+#: ../plugins/backup-restore/backup.c:318
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr "�ang sao lưu dữ liệu Evolution (Thư, Liên lạc, Lịch, Tác vụ, Ghi nhớ)"
+
+#: ../plugins/backup-restore/backup.c:331
+#| msgid "Backup complete"
+msgid "Back up complete"
+msgstr "Sao lưu hoàn tất"
+
+#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:527
+msgid "Restarting Evolution"
+msgstr "�ang khởi chạy lại Evolution"
+
+#: ../plugins/backup-restore/backup.c:424
+#| msgid "Backup current Evolution data"
+msgid "Back up current Evolution data"
+msgstr "Sao lưu dữ liệu Evolution hiện th�i"
+
+#: ../plugins/backup-restore/backup.c:432
+#| msgid "Extracting files from backup"
+msgid "Extracting files from back up"
+msgstr "�ang trích các tập tin từ kho sao lưu"
+
+#: ../plugins/backup-restore/backup.c:491
+msgid "Loading Evolution settings"
+msgstr "�ang nạp thiết lập Evolution"
+
+#: ../plugins/backup-restore/backup.c:508
+#| msgid "Removing temporary backup files"
+msgid "Removing temporary back up files"
+msgstr "�ang gỡ b� các tập tin sao lưu tạm th�i"
+
+#: ../plugins/backup-restore/backup.c:520
+msgid "Ensuring local sources"
+msgstr "�ang đảm bảo có các nguồn cục bộ"
+
+#: ../plugins/backup-restore/backup.c:707
+#, c-format
+msgid "Backing up to the folder %s"
+msgstr "�ang sao lưu vào thư mục %s"
+
+#: ../plugins/backup-restore/backup.c:712
+#, c-format
+msgid "Restoring from the folder %s"
+msgstr "�ang phục hồi từ thư mục %s"
+
+#. Backup / Restore only can have GUI. We should restrict the rest
+#: ../plugins/backup-restore/backup.c:736
+#| msgid "Evolution Backup"
+msgid "Evolution Back up"
+msgstr "Sao lÆ°u Evolution"
+
+#: ../plugins/backup-restore/backup.c:736
+msgid "Evolution Restore"
+msgstr "Phục hồi Evolution"
+
+#: ../plugins/backup-restore/backup.c:774
+msgid "Backing up Evolution Data"
+msgstr "Sao lưu Dữ liệu Evolution"
+
+#: ../plugins/backup-restore/backup.c:775
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Hãy đợi trong khi Evolution sao lưu dữ liệu của bạn."
+
+#: ../plugins/backup-restore/backup.c:777
+msgid "Restoring Evolution Data"
+msgstr "Phục hồi Dữ liệu Evolution"
+
+#: ../plugins/backup-restore/backup.c:778
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Hãy đợi trong khi Evolution phục hồi dữ liệu của bạn."
+
+#: ../plugins/backup-restore/backup.c:796
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
+"Tiến trình này có thể kéo dài một lát, phụ thuộc vào số lượng dữ liệu trong "
+"tài khoản của bạn."
+
+#. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#| msgid "Backup and restore plugin"
+msgid "Back up and Restore"
+msgstr "Sao lưu và phục hồi"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+#| msgid "Backup and restore Evolution data and settings"
+msgid "Back up and restore your Evolution data and settings."
+msgstr "Lưu trữ và phục hồi các dữ liệu và thiết lập Evolution."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Are you sure you want to close Evolution?"
+msgstr "Bạn có chắc muốn đóng Evolution không?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+#| msgid ""
+#| "Are you sure you want to restore Evolution from the selected backup file?"
+msgid ""
+"Are you sure you want to restore Evolution from the selected back up file?"
+msgstr "Bạn có chắc muốn phục hồi Evolution từ tập tin sao lưu đã ch�n không?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+#| msgid "Backing up Evolution Data"
+msgid "Close and Back up Evolution"
+msgstr "�óng và sao lưu Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#| msgid "Cannot start Evolution"
+msgid "Close and Restore Evolution"
+msgstr "�óng và phục hồi Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Insufficient Permissions"
+msgstr "Không đủ quy�n"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#| msgid "Invalid Evolution backup file"
+msgid "Invalid Evolution back up file"
+msgstr "Tập tin sao lưu Evolution không hợp lệ"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#| msgid "Please select a valid backup file to restore."
+msgid "Please select a valid back up file to restore."
+msgstr "Hãy ch�n một tập tin sao lưu Evolution hợp lệ cần phục hồi."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid "The selected folder is not writable."
+msgstr "Bạn đã ch�n một thư mục không cho phép ghi vào."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid ""
+"To back up your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
+msgstr ""
+"�ể sao lưu dữ liệu và các thiết lập, bạn phải đóng Evolution. Nhớ lưu dữ "
+"liệu trước khi tiếp tục."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+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 ""
+"�ể phục hồi dữ liệu và các thiết lập, bạn phải đóng Evolution. Nhớ lưu dữ "
+"liệu trước khi tiếp tục. Hành động này sẽ xoá tất cả dữ liệu và thiết lập "
+"hiện tại và phục hồi từ bản sao lưu."
+
+#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+msgid "Automatic Contacts"
+msgstr "Liên lạc Tự động"
+
+#. Enable BBDB checkbox
+#: ../plugins/bbdb/bbdb.c:710
+#| msgid "_Auto-create address book entries when replying to messages"
+msgid "Create _address book entries when sending mails"
+msgstr "Tạo mục mới trong _sổ địa chỉ khi gửi thư"
+
+#: ../plugins/bbdb/bbdb.c:716
+msgid "Select Address book for Automatic Contacts"
+msgstr "Ch�n Sổ địa chỉ cho Liên Lạc Tự �ộng"
+
+#: ../plugins/bbdb/bbdb.c:731
+msgid "Instant Messaging Contacts"
+msgstr "Liên lạc Tin nhắn tức khắc"
+
+#. Enable Gaim Checkbox
+#: ../plugins/bbdb/bbdb.c:746
+#| msgid "Synchronize contact info and images from Pidgin buddy list"
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr "�ồ_ng bộ hoá thông tin liên lạc và ảnh từ danh sách bạn bè Pidgin"
+
+#: ../plugins/bbdb/bbdb.c:752
+msgid "Select Address book for Pidgin buddy list"
+msgstr "Ch�n Sổ địa chỉ cho danh sách bạn bè Pidgin"
+
+#. Synchronize now button.
+#: ../plugins/bbdb/bbdb.c:763
+msgid "Synchronize with _buddy list now"
+msgstr "�ồng bộ hoá với danh sách ngư�i _bạn ngay bây gi�"
+
+# Name: don't translate / Tên: đừng dịch
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+#| msgid ""
+#| "Automatically fills your address book with names and email addresses as "
+#| "you reply to messages. Also fills in IM contact information from your "
+#| "buddy lists."
+msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
+"lists."
+msgstr ""
+"Làm giúp bạn công việc quản lý sổ địa chỉ tẻ nhạt.\n"
+"\n"
+"Tự động đi�n vào sổ địa chỉ các tên và địa chỉ thư khi bạn hồi âm thư. Cũng "
+"đi�n thông tin liên lặc IM từ các danh sách bạn bè của bạn."
+
+#: ../plugins/caldav/caldav-browse-server.c:214
+msgid "Authentication failed. Server requires correct login."
+msgstr "Xác thực thất bại. Máy chủ đòi đăng nhập đúng."
+
+#: ../plugins/caldav/caldav-browse-server.c:216
+msgid "Given URL cannot be found."
+msgstr "Không tìm thấy URL đã cho."
+
+#: ../plugins/caldav/caldav-browse-server.c:220
+#, c-format
+msgid ""
+"Server returned unexpected data.\n"
+"%d - %s"
+msgstr ""
+"Máy chủ trả v� dữ liệu bất thư�ng.\n"
+"%d - %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:360
+#: ../plugins/caldav/caldav-browse-server.c:694
+#| msgid "Failed to update delegates:"
+msgid "Failed to parse server response."
+msgstr "Lỗi phân tích phản hồi từ máy chủ."
+
+#: ../plugins/caldav/caldav-browse-server.c:454
+msgid "Events"
+msgstr "Sự kiện"
+
+#: ../plugins/caldav/caldav-browse-server.c:476
+msgid "User's calendars"
+msgstr "Lịch ngư�i dùng"
+
+#: ../plugins/caldav/caldav-browse-server.c:588
+#: ../plugins/caldav/caldav-browse-server.c:763
+#| msgid "Failed to authenticate with LDAP server."
+msgid "Failed to get server URL."
+msgstr "Lỗi lấy URL máy chủ."
+
+#: ../plugins/caldav/caldav-browse-server.c:761
+#: ../plugins/caldav/caldav-browse-server.c:802
+#: ../plugins/caldav/caldav-browse-server.c:1493
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "Searching for the Contacts..."
+msgid "Searching for user's calendars..."
+msgstr "�ang tìm kiếm lịc của ngư�i dùng..."
+
+#: ../plugins/caldav/caldav-browse-server.c:800
+#| msgid "Unable to find any calendars"
+msgid "Could not find any user calendar."
+msgstr "Không tìm thấy lịch ngư�i dùng."
+
+#: ../plugins/caldav/caldav-browse-server.c:938
+#, c-format
+msgid "Previous attempt failed: %s"
+msgstr "Lần thử trước thất bại: %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:940
+#, c-format
+msgid "Previous attempt failed with code %d"
+msgstr "Lần thử trước thất bại với mã lỗi %d"
+
+#: ../plugins/caldav/caldav-browse-server.c:945
+#, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for user %s on server %s"
+msgstr "Hãy gõ mật khẩu cho ngư�i dùng %s (trên máy chủ %s)"
+
+#: ../plugins/caldav/caldav-browse-server.c:1008
+#, c-format
+#| msgid ""
+#| "Cannot create output file: %s:\n"
+#| " %s"
+msgid "Cannot create soup message for URL '%s'"
+msgstr "Không thể tạo thông điệp soup cho URL '%s'"
+
+#. fetch content
+#: ../plugins/caldav/caldav-browse-server.c:1266
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "Searching for the Contacts..."
+msgid "Searching folder content..."
+msgstr "�ang tìm kiếm nội dung thư mục..."
+
+#: ../plugins/caldav/caldav-browse-server.c:1325
+#: ../plugins/caldav/caldav-source.c:261
+msgid "Server _handles meeting invitations"
+msgstr "Máy chủ _xử lý thư m�i h�p"
+
+#: ../plugins/caldav/caldav-browse-server.c:1332
+#| msgid "Local Calendars"
+msgid "List of available calendars:"
+msgstr "Danh sách lịch có thể dùng:"
+
+#: ../plugins/caldav/caldav-browse-server.c:1370
+#| msgid "Sort"
+msgid "Supports"
+msgstr "Hỗ trợ"
+
+#: ../plugins/caldav/caldav-browse-server.c:1397
+#: ../plugins/caldav/caldav-source.c:259
+#| msgid "New email"
+msgid "User e_mail:"
+msgstr "E_mail ngư�i dùng:"
+
+#: ../plugins/caldav/caldav-browse-server.c:1469
+#, c-format
+#| msgid "Failed to create pipe: %s"
+msgid "Failed to create thread: %s"
+msgstr "Lỗi tạo nhánh: %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:1585
+#, c-format
+msgid "Server URL '%s' is not a valid URL"
+msgstr "URL của máy chủ '%s' không hợp lệ"
+
+#: ../plugins/caldav/caldav-browse-server.c:1591
+msgid "Browse for a CalDAV calendar"
+msgstr "Duyệt tìm lịch CalDAV"
+
+#: ../plugins/caldav/caldav-source.c:240
+#: ../plugins/calendar-http/calendar-http.c:107
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../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:"
+msgid "Use _secure connection"
+msgstr "Dùng kết nối _bảo mật"
+
+#: ../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 "Tê_n ngư�i dùng:"
+
+#: ../plugins/caldav/caldav-source.c:264
+msgid "Brows_e server for a calendar"
+msgstr "_Duyệt tìm lịch trên máy chủ"
+
+#: ../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 "Cậ_p nhật:"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+msgid "Add CalDAV support to Evolution."
+msgstr "Thêm hỗ trợ CalDAV vào Evolution."
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "CalDAV Support"
+msgstr "Nguồn CalDAV"
+
+#: ../plugins/calendar-file/calendar-file.c:134
+#| msgid "Custom Header Options"
+msgid "_Customize options"
+msgstr "Tuỳ ch�n _riêng"
+
+#: ../plugins/calendar-file/calendar-file.c:153
+msgid "File _name:"
+msgstr "_Tên tập tin:"
+
+#: ../plugins/calendar-file/calendar-file.c:157
+msgid "Choose calendar file"
+msgstr "Ch�n tập tin lịch"
+
+#: ../plugins/calendar-file/calendar-file.c:209
+msgid "On open"
+msgstr "Lúc mở"
+
+#: ../plugins/calendar-file/calendar-file.c:210
+msgid "On file change"
+msgstr "Lúc tập tin thay đổi"
+
+#: ../plugins/calendar-file/calendar-file.c:211
+msgid "Periodically"
+msgstr "�ịnh kỳ"
+
+#: ../plugins/calendar-file/calendar-file.c:228
+msgid "Force read _only"
+msgstr "Buộc là _chỉ đ�c"
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
+msgid "Add local calendars to Evolution."
+msgstr "Thêm lịch cục bộ vào Evolution."
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+msgid "Local Calendars"
+msgstr "Lịch cục bộ"
+
+#: ../plugins/calendar-http/calendar-http.c:207
+msgid "Userna_me:"
+msgstr "Tê_n ngư�i dùng:"
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
+msgid "Add web calendars to Evolution."
+msgstr "Thêm lịch web vào Evolution."
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+#| msgid "Calendars"
+msgid "Web Calendars"
+msgstr "Lịch Web"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Fog"
+msgstr "Th�i tiết: sương mù"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
+msgid "Weather: Cloudy"
+msgstr "Th�i tiết: nhi�u mây"
+
+#: ../plugins/calendar-weather/calendar-weather.c:67
+msgid "Weather: Cloudy Night"
+msgstr "Th�i tiết: đêm đầy mây"
+
+#: ../plugins/calendar-weather/calendar-weather.c:68
+msgid "Weather: Overcast"
+msgstr "Th�i tiết: u ám"
+
+#: ../plugins/calendar-weather/calendar-weather.c:69
+msgid "Weather: Showers"
+msgstr "Th�i tiết: mưa rào"
+
+#: ../plugins/calendar-weather/calendar-weather.c:70
+msgid "Weather: Snow"
+msgstr "Th�i tiết: tuyết"
+
+#: ../plugins/calendar-weather/calendar-weather.c:71
+msgid "Weather: Sunny"
+msgstr "Th�i tiết: trời có nă�ng"
+
+#: ../plugins/calendar-weather/calendar-weather.c:72
+msgid "Weather: Clear Night"
+msgstr "Th�i tiết: đêm rõ"
+
+#: ../plugins/calendar-weather/calendar-weather.c:73
+msgid "Weather: Thunderstorms"
+msgstr "Th�i tiết: bão kèm sấm"
+
+#: ../plugins/calendar-weather/calendar-weather.c:239
+msgid "Select a location"
+msgstr "Ch�n địa điểm"
+
+#. Translators: "None" location for a weather calendar
+#: ../plugins/calendar-weather/calendar-weather.c:350
+#: ../plugins/calendar-weather/calendar-weather.c:398
+msgctxt "weather-cal-location"
+msgid "None"
+msgstr "Không"
+
+#: ../plugins/calendar-weather/calendar-weather.c:477
+msgid "_Units:"
+msgstr "�ơn _vị"
+
+#: ../plugins/calendar-weather/calendar-weather.c:486
+msgid "Metric (Celsius, cm, etc)"
+msgstr "Mét (Celsius, cm v.v.)"
+
+#: ../plugins/calendar-weather/calendar-weather.c:489
+msgid "Imperial (Fahrenheit, inches, etc)"
+msgstr "Mỹ (Fahrenheit, inch v.v.)"
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
+msgid "Add weather calendars to Evolution."
+msgstr "Thêm lịch th�i tiết vào Evolution."
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
+msgid "Weather Calendars"
+msgstr "Lịch Th�i tiết"
+
+#: ../plugins/dbx-import/dbx-importer.c:284
+#| msgid "Importing Outlook data"
+msgid "Importing Outlook Express data"
+msgstr "�ang nhập dữ liệu Outlook Express"
+
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+#| msgid "Import Outlook messages from PST file"
+msgid "Import Outlook Express messages from DBX file"
+msgstr "Nhập thư Outlook Express từ tập tin DBX"
+
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+#| msgid "Outlook PST import"
+msgid "Outlook DBX import"
+msgstr "Nhập Outlook DBX"
+
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+#| msgid "Outlook personal folders (.pst)"
+msgid "Outlook Express 5/6 personal folders (.dbx)"
+msgstr "Các thư mục cá nhân Outlook Express 5/6 (.dbx)"
+
+#: ../plugins/default-source/default-source.c:168
+msgid "Mark as _default address book"
+msgstr "�ánh _dấu là sổ địa chỉ mặc định"
+
+#: ../plugins/default-source/default-source.c:182
+#| msgid "Show autocompleted name with an address"
+msgid "A_utocomplete with this address book"
+msgstr "_Tự động đi�n sổ địa chỉ"
+
+#: ../plugins/default-source/default-source.c:191
+msgid "Mark as _default calendar"
+msgstr "�ánh _dấu là lịch mặc định"
+
+#: ../plugins/default-source/default-source.c:192
+msgid "Mark as _default task list"
+msgstr "�ánh _dấu là danh sách tác vụ mặc định"
+
+#: ../plugins/default-source/default-source.c:193
+msgid "Mark as _default memo list"
+msgstr "�ánh _dấu là danh sách ghi nhớ mặc định"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+msgid "Default Sources"
+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 ""
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "Danh sách Dòng đầu Riêng"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"Khoá này ghi rõ danh sách các dòng đầu tự ch�n mà bạn có thể thêm vào một "
+"thư được gửi đi. �ịnh dạng ghi rõ một dòng đầu và giá trị dòng đầu là tên "
+"của dòng đầu tự ch�n với một dấu bằng « = » theo sau, và các giá trị định "
+"giới bằng dấu chấm phẩy « ; »."
+
+#: ../plugins/email-custom-header/email-custom-header.c:322
+#| msgid "Security:"
+msgctxt "email-custom-header-Security"
+msgid "Security:"
+msgstr "Bảo mật:"
+
+#: ../plugins/email-custom-header/email-custom-header.c:326
+#| msgid "Personal"
+msgctxt "email-custom-header-Security"
+msgid "Personal"
+msgstr "Cá nhân"
+
+#: ../plugins/email-custom-header/email-custom-header.c:327
+#| msgid "Unclassified"
+msgctxt "email-custom-header-Security"
+msgid "Unclassified"
+msgstr "Chưa phân loại"
+
+#: ../plugins/email-custom-header/email-custom-header.c:328
+#| msgid "Protected"
+msgctxt "email-custom-header-Security"
+msgid "Protected"
+msgstr "�ược bảo vệ"
+
+#: ../plugins/email-custom-header/email-custom-header.c:329
+msgctxt "email-custom-header-Security"
+msgid "Confidential"
+msgstr "Mật"
+
+#: ../plugins/email-custom-header/email-custom-header.c:330
+#| msgid "Secret"
+msgctxt "email-custom-header-Security"
+msgid "Secret"
+msgstr "Mật"
+
+#: ../plugins/email-custom-header/email-custom-header.c:331
+#| msgid "Top secret"
+msgctxt "email-custom-header-Security"
+msgid "Top secret"
+msgstr "Tối mật"
+
+#: ../plugins/email-custom-header/email-custom-header.c:388
+msgctxt "email-custom-header"
+msgid "None"
+msgstr "Không"
+
+#: ../plugins/email-custom-header/email-custom-header.c:584
+msgid "_Custom Header"
+msgstr "Dòng đầu tự _ch�n"
+
+#. 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:847
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+"�ịnh dạng xác định một giá trị khoá Phần �ầu Riêng\n"
+"(Custom Header) là danh sách các tên giá trị khoá\n"
+"Phần �ầu Riêng định giới bằng dấu chấm phẩy « ; »."
+
+#: ../plugins/email-custom-header/email-custom-header.c:901
+msgid "Key"
+msgstr "Khoá"
+
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:468
+msgid "Values"
+msgstr "Giá trị"
+
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+#| msgid "Adds custom header to outgoing messages."
+msgid "Add custom headers to outgoing mail messages."
+msgstr "Thêm dòng đầu tự ch�n vào thư gửi đi."
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "Dòng đầu tự ch�n"
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
+msgid "Email Custom Header"
+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 ""
+
+#: ../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 ""
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
+msgid "Default External Editor"
+msgstr "Trình soạn thảo bên ngoài mặc định"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
+msgid "The default command that must be used as the editor."
+msgstr "Câu lệnh mặc định cần dùng làm trình soạn thảo."
+
+#: ../plugins/external-editor/external-editor.c:121
+msgid "Command to be executed to launch the editor: "
+msgstr "Câu lệnh cần chạy để khởi chạy trình soạn thảo:"
+
+#: ../plugins/external-editor/external-editor.c:122
+#| msgid ""
+#| "For Emacs use \"xemacs\"\n"
+#| "For VI use \"gvim\""
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
+msgstr ""
+"�ối với Emacs, dùng \"xemacs\"\n"
+"�ối với VI, dùng \"gvim -f\"."
+
+#: ../plugins/external-editor/external-editor.c:402
+#: ../plugins/external-editor/external-editor.c:404
+#| msgid "Compose in _External Editor"
+msgid "Compose in External Editor"
+msgstr "Soạn thảo bằng trình biên tập bên ngoài"
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+msgid "External Editor"
+msgstr "Trình soạn thảo bên ngoài"
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+#| msgid ""
+#| "A plugin for using an external editor as the composer. You can send only "
+#| "plain-text messages."
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr "Dùng trình soạn thảo bên ngoài để soạn thư văn bản thuần tuý."
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr "Không thể tạo tập tin tạm th�i"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
+msgid "Editor not launchable"
+msgstr "Không thể khởi chạy trình soạn thảo"
+
+#: ../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."
+msgstr ""
+"Trình Evolution không thể tạo một tập tin tạm th�i vào đó cần lưu thư tín "
+"của bạn. Hãy thử lại sau."
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+msgid "External editor still running"
+msgstr "Trình soạn thảo bên ngoài vẫn đang chạy"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"Không thể khởi chạy trình soạn thảo bên ngoài được đặt trong tùy thích phần "
+"mở rộng của bạn. Hãy thử đặt một trình soạn thảo khác."
+
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
+msgid "Insert Face picture by default"
+msgstr ""
+
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
+msgid ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+msgstr ""
+
+#: ../plugins/face/face.c:292
+#| msgid "Select a File"
+msgid "Select a Face Picture"
+msgstr "Ch�n ảnh chân dung"
+
+#: ../plugins/face/face.c:302
+#| msgid "Importing files"
+msgid "Image files"
+msgstr "Tập tin ảnh"
+
+#: ../plugins/face/face.c:359
+msgid "_Insert Face picture by default"
+msgstr "Mặc định _chèn ảnh chân dung"
+
+#: ../plugins/face/face.c:370
+msgid "Load new _Face picture"
+msgstr "_Nạp ảnh chân dung"
+
+#: ../plugins/face/face.c:429
+msgid "Include _Face"
+msgstr "_Gồm ảnh chân dung"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#| msgid "Adds custom header to outgoing messages."
+msgid "Attach a small picture of your face to outgoing messages."
+msgstr "Thêm ảnh chân dung nh� của bạn vào thư gửi đi."
+
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+#| msgid "Table header"
+msgid "Failed Read"
+msgstr "Lỗi đ�c"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+#| msgid "Invalid Date Value"
+msgid "Invalid Image Size"
+msgstr "Kích thước ảnh không hợp lệ"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:3
+#| msgid "_No image"
+msgid "Not an image"
+msgstr "Không có ảnh"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:4
+#| msgid "Please select an image for this contact"
+msgid "Please select an image of size 48 * 48"
+msgstr "Hãy ch�n ảnh cho liên lạc này"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+#| msgid "The item could not be sent!\n"
+msgid "The file cannot be read"
+msgstr "Không thể đ�c tập tin này"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid "The file you selected does not look like a valid .png image. Error: {0}"
+msgstr "Tập tin bạn ch�n không giống như ảnh .png hợp lệ. Lỗi: {0}"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:325
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+msgid "Server"
+msgstr "Máy chủ"
+
+#: ../plugins/google-account-setup/google-source.c:459
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr ""
+"Nhập mật khẩu cho ngư�i dùng %s truy cập đến danh sách các lịch đã đăng ký."
+
+#: ../plugins/google-account-setup/google-source.c:576
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"Không thể đ�c dữ liệu từ máy chủ Google.\n"
+"%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
+msgid "Unknown error."
+msgstr "Lỗi lạ."
+
+#: ../plugins/google-account-setup/google-source.c:679
+msgid "Cal_endar:"
+msgstr "_Lịch:"
+
+#: ../plugins/google-account-setup/google-source.c:714
+#| msgid "Retrieve _list"
+msgid "Retrieve _List"
+msgstr "_Lấy danh sách"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+msgid "Add Google Calendars to Evolution."
+msgstr "Thêm lịch Google vào Evolution."
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Google Calendars"
+msgstr "Lịch Google"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+msgid "Inline Image"
+msgstr "Ảnh trực tiếp"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+msgid "View image attachments directly in mail messages."
+msgstr "Xem ảnh đính kèm trực tiếp trong thư."
+
+#: ../plugins/imap-features/imap-headers.c:337
+#: ../plugins/imap-features/imap-headers.ui.h:2
+msgid "Custom Headers"
+msgstr "Dòng đầu tự ch�n"
+
+#: ../plugins/imap-features/imap-headers.c:349
+#: ../plugins/imap-features/imap-headers.ui.h:5
+msgid "IMAP Headers"
+msgstr "Dòng đầu IMAP"
+
+#: ../plugins/imap-features/imap-headers.ui.h:1
+msgid "Basic and _Mailing List Headers (Default)"
+msgstr "Dòng đầu cơ bản và _hộp thư chung (Mặc định)"
+
+#: ../plugins/imap-features/imap-headers.ui.h:3
+msgid ""
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
+"You can ignore this if you choose \"All Headers\"."
+msgstr ""
+"�ưa các dòng đầu bổ sung bạn cần lấy ngoài các dòng đầu chuẩn ở trên.\n"
+"Bạn có thể b� qua nếu ch�n \"M�i dòng đầu\"."
+
+#: ../plugins/imap-features/imap-headers.ui.h:6
+msgid ""
+"Select your IMAP Header Preferences. \n"
+"The more headers you have the more time it will take to download."
+msgstr ""
+"Ch�n Tuỳ thích Dòng đầu IMAP.\n"
+"Nhi�u dòng đầu hơn nghĩa là nhi�u th�i gian hơn để tải v�."
+
+#: ../plugins/imap-features/imap-headers.ui.h:8
+#| msgid ""
+#| "_Basic Headers - (Fastest) \n"
+#| "Use this if you do not have filters based on mailing lists"
+msgid ""
+"_Basic Headers (Fastest) \n"
+"Use this if you do not have filters based on mailing lists"
+msgstr ""
+"_Dòng đầu cơ bản - (Nhanh nhất)\n"
+"Dùng nếu bạn không l�c hộp thư chung"
+
+#: ../plugins/imap-features/imap-headers.ui.h:10
+msgid "_Fetch All Headers"
+msgstr "Lấy _m�i dòng đầu"
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
+msgid "Fine-tune your IMAP accounts."
+msgstr "Tinh chỉnh tài khoản IMAP của bạn."
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+msgid "IMAP Features"
+msgstr "Tính năng IMAP"
+
+#. Translators: The first '%s' is replaced with a calendar name,
+#. * the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:499
+#, c-format
+#| msgid "Failed to load the calendar '%s'"
+msgid "Failed to load the calendar '%s' (%s)"
+msgstr "Lỗi nạp lịch '%s' (%s)"
+
+#: ../plugins/itip-formatter/itip-formatter.c:659
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr "Có cuộc hẹn trong lịch « %s » xung đột với cuộc h�p này."
+
+#: ../plugins/itip-formatter/itip-formatter.c:683
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "Tìm thấy cuộc hẹn trong lịch « %s »"
+
+#: ../plugins/itip-formatter/itip-formatter.c:789
+msgid "Unable to find any calendars"
+msgstr "Không tìm thấy lịch nào"
+
+#: ../plugins/itip-formatter/itip-formatter.c:796
+msgid "Unable to find this meeting in any calendar"
+msgstr "Không tìm thấy cuộc h�p này trong lịch nào"
+
+#: ../plugins/itip-formatter/itip-formatter.c:800
+msgid "Unable to find this task in any task list"
+msgstr "Không tìm thấy tác vụ này trong danh sách tác vụ nào"
+
+#: ../plugins/itip-formatter/itip-formatter.c:804
+msgid "Unable to find this memo in any memo list"
+msgstr "Không tìm thấy bản ghi nhớ này trong bất cứ danh sách ghi nhớ nào"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1082
+#| msgid "Opening the calendar. Please wait.."
+msgid "Opening the calendar. Please wait..."
+msgstr "�ang mở lịch. Vui lòng ch�..."
+
+#: ../plugins/itip-formatter/itip-formatter.c:1085
+msgid "Searching for an existing version of this appointment"
+msgstr "�ang tìm kiếm một phiên bản hiện th�i của cuộc hẹn này"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1362
+msgid "Unable to parse item"
+msgstr "Không thể phân tích mục"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1451
+#, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr "Không gửi được mục cho lịch « %s ». %s"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1463
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr "�ã gửi cho lịch « %s » như đã chấp nhận"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1467
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr "�ã gửi cho lịch « %s » như dự định"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1472
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr "�ã gửi cho lịch « %s » như bị từ chối"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1477
+#, c-format
+msgid "Sent to calendar '%s' as canceled"
+msgstr "�ã gửi cho lịch « %s » với trạng thái « bị thôi »"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1579
+#, c-format
+msgid "Organizer has removed the delegate %s "
+msgstr "Bộ tổ chức đã gỡ b� ngư�i ủy nhiệm %s "
+
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+msgid "Sent a cancelation notice to the delegate"
+msgstr "�ã gửi một thông báo hủy b� cho ngư�i ủy nhiệm"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1588
+msgid "Could not send the cancelation notice to the delegate"
+msgstr "Không thể gửi thông báo hủy b� cho ngư�i ủy nhiệm"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1700
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr "Không thể cập nhật trạng thái ngư�i dự vì trạng thái không hợp lệ."
+
+#: ../plugins/itip-formatter/itip-formatter.c:1729
+#, c-format
+msgid "Unable to update attendee. %s"
+msgstr "Không cập nhật được ngư�i dự. %s"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1733
+msgid "Attendee status updated"
+msgstr "Trạng thái ngư�i dự đã được cập nhật."
+
+#: ../plugins/itip-formatter/itip-formatter.c:1737
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "Không thể cập nhật trạng thái ngư�i dự vì không còn có lại mục ấy."
+
+#: ../plugins/itip-formatter/itip-formatter.c:1759
+msgid "Meeting information sent"
+msgstr "Tin tức cuộc h�p đã được gửi"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1762
+msgid "Task information sent"
+msgstr "Thông tin tác vụ đã được gửi"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1765
+msgid "Memo information sent"
+msgstr "Thông tin ghi nhớ đã được gửi"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1774
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr "Không thể gửi thông tin v� cuộc h�p vì cuộc h�p không tồn tại"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1777
+msgid "Unable to send task information, the task does not exist"
+msgstr "Không thể gửi thông tin v� tác vụ vì tác vụ không tồn tại"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1780
+msgid "Unable to send memo information, the memo does not exist"
+msgstr "Không thể gửi thông tin v� bản ghi nhớ vì bản ghi nhớ không tồn tại"
+
+#. Translators: This is a default filename for a calendar.
+#: ../plugins/itip-formatter/itip-formatter.c:1846
+msgid "calendar.ics"
+msgstr "calendar.ics"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1851
+msgid "Save Calendar"
+msgstr "Lưu lịch"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1914
+#: ../plugins/itip-formatter/itip-formatter.c:1925
+msgid "The calendar attached is not valid"
+msgstr "Lịch đã đính kèm không hợp lệ"
+
+#: ../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 ""
+"Thư này tuyên bố chứa một lịch, nhưng mà lịch đó không phải là một iCalendar "
+"hợp lệ."
+
+#: ../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 "Mục trong lịch không hợp lệ."
+
+#: ../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 ""
+"Thư ấy có phải chứa một lịch, nhưng mà lịch ấy không chứa sự kiện nào, tác "
+"vụ nào hay thông tin rảnh/bận nào."
+
+#: ../plugins/itip-formatter/itip-formatter.c:2008
+msgid "The calendar attached contains multiple items"
+msgstr "Lịch đã đính kèm chứa nhi�u mục"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2009
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr "�ể xử lý m�i mục này thì nên lưu tập tin này và nhập lịch đó."
+
+#: ../plugins/itip-formatter/itip-formatter.c:2672
+msgctxt "cal-itip"
+msgid "None"
+msgstr "Không"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2688
+msgid "Tentatively Accepted"
+msgstr "Tạm đã chấp nhận"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2806
+msgid "This meeting recurs"
+msgstr "Cuộc h�p này lặp lại"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2809
+msgid "This task recurs"
+msgstr "Tác vụ này lặp lại"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2812
+msgid "This memo recurs"
+msgstr "Bản ghi nhớ này lặp lại"
+
+#: ../plugins/itip-formatter/itip-formatter.c:3036
+#| msgid "Meeting Information"
+msgid "Meeting Invitations"
+msgstr "Thư m�i h�p"
+
+#. Delete message after acting
+#. FIXME Need a schema for this
+#: ../plugins/itip-formatter/itip-formatter.c:3061
+msgid "_Delete message after acting"
+msgstr "_Xoá thư sau hành động"
+
+#: ../plugins/itip-formatter/itip-formatter.c:3071
+#: ../plugins/itip-formatter/itip-formatter.c:3104
+msgid "Conflict Search"
+msgstr "Tìm kiếm xung đột"
+
+#. Source selector
+#: ../plugins/itip-formatter/itip-formatter.c:3086
+msgid "Select the calendars to search for meeting conflicts"
+msgstr "Ch�n những lịch cần tìm kiệm cuộc h�p có xung đột với nhau"
+
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:196
+msgid "Today %H:%M"
+msgstr "Hôm nay %l:%M %p"
+
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:200
+msgid "Today %H:%M:%S"
+msgstr "Hôm nay %l:%M %p"
+
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:209
+msgid "Today %l:%M:%S %p"
+msgstr "Hôm nay %l:%M %p"
+
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:224
+msgid "Tomorrow %H:%M"
+msgstr "Ngày mai %H:%M"
+
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:228
+msgid "Tomorrow %H:%M:%S"
+msgstr "Ngày mai %H:%M:%S"
+
+#. strftime format of a time,
+#. * in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:233
+msgid "Tomorrow %l:%M %p"
+msgstr "Ngày mai %l:%M %p"
+
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:237
+msgid "Tomorrow %l:%M:%S %p"
+msgstr "Ngày mai %l:%M:%S %p"
+
+# Variable: don't translate / Biến: đừng dịch
+#. strftime format of a weekday.
+#: ../plugins/itip-formatter/itip-view.c:256
+#, c-format
+msgid "%A"
+msgstr "%A"
+
+#. strftime format of a weekday and a
+#. * time, in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:261
+msgid "%A %H:%M"
+msgstr "%A %H:%M"
+
+#. strftime format of a weekday and a
+#. * time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:265
+msgid "%A %H:%M:%S"
+msgstr "%A %H:%M:%S"
+
+#. strftime format of a weekday and a
+#. * time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:270
+msgid "%A %l:%M %p"
+msgstr "%A %l:%M %p"
+
+#. strftime format of a weekday and a
+#. * time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:274
+msgid "%A %l:%M:%S %p"
+msgstr "%A %l:%M:%S %p"
+
+#. strftime format of a weekday and a date
+#. * without a year.
+#: ../plugins/itip-formatter/itip-view.c:283
+msgid "%A, %B %e"
+msgstr "%A, %B %e"
+
+#. strftime format of a weekday, a date
+#. * without a year and a time,
+#. * in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:289
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %B %e %H:%M"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:293
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%A, %B %e %H:%M:%S"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:298
+msgid "%A, %B %e %l:%M %p"
+msgstr "%A, %B %e %l:%M %p"
+
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:302
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %B %e %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: ../plugins/itip-formatter/itip-view.c:308
+msgid "%A, %B %e, %Y"
+msgstr "%A, %B %e, %Y"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:313
+msgid "%A, %B %e, %Y %H:%M"
+msgstr "%A, %B %e, %Y %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:317
+msgid "%A, %B %e, %Y %H:%M:%S"
+msgstr "%A, %B %e, %Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:322
+msgid "%A, %B %e, %Y %l:%M %p"
+msgstr "%A, %B %e, %Y %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:326
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%A, %B %e, %Y %l:%M:%S %p"
+
+#: ../plugins/itip-formatter/itip-view.c: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 "Ngư�i lạ"
+
+#: ../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 "Vui lòng hồi đáp thay mặt cho %s"
+
+#: ../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 <b>%s</b>"
+msgid "Received on behalf of %s"
+msgstr "Nhận thay mặt cho %s"
+
+#: ../plugins/itip-formatter/itip-view.c:376
+#, c-format
+#| msgid ""
+#| "<b>%s</b> through %s has published the following meeting information:"
+msgid "%s through %s has published the following meeting information:"
+msgstr "%s thông qua %s đã công bố tin tức cuộc h�p sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:378
+#, c-format
+#| msgid "<b>%s</b> has published the following meeting information:"
+msgid "%s has published the following meeting information:"
+msgstr "%s đã công bố tin tức cuộc h�p sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:383
+#, c-format
+#| msgid "<b>%s</b> has delegated the following meeting to you:"
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s đã ủy nhiệm cuộc h�p sau cho bạn:"
+
+#: ../plugins/itip-formatter/itip-view.c:386
+#, c-format
+#| msgid ""
+#| "<b>%s</b> through %s requests your presence at the following meeting:"
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s thông qua %s yêu cầu sự hiện diện của bạn tại cuộc h�p sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:388
+#, c-format
+#| msgid "<b>%s</b> requests your presence at the following meeting:"
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s yêu cầu sự hiện diện của bạn tại cuộc h�p sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:394
+#, c-format
+#| msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%s thông qua %s muốn thêm vào một cuộc h�p đã có:"
+
+#: ../plugins/itip-formatter/itip-view.c:396
+#, c-format
+#| msgid "<b>%s</b> wishes to add to an existing meeting:"
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%s muốn thêm vào một cuộc h�p đã có:"
+
+#: ../plugins/itip-formatter/itip-view.c:400
+#, c-format
+#| msgid ""
+#| "<b>%s</b> through %s wishes to receive the latest information for the "
+#| "following meeting:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr "%s thông qua %s muốn nhận tin tức mới nhất v� cuộc h�p sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:402
+#, c-format
+#| msgid ""
+#| "<b>%s</b> wishes to receive the latest information for the following "
+#| "meeting:"
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%s> muốn nhận tin tức mới nhất v� cuộc h�p sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:406
+#, c-format
+#| msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%s thông qua %s đã trả l�i v� cuộc h�p sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:408
+#, c-format
+#| msgid "<b>%s</b> has sent back the following meeting response:"
+msgid "%s has sent back the following meeting response:"
+msgstr "%s đã trả l�i v� cuộc h�p sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:412
+#, c-format
+#| msgid "<b>%s</b> through %s has canceled the following meeting:"
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%s thông qua %s đã hủy b� cuộc h�p sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:414
+#, c-format
+#| msgid "<b>%s</b> has canceled the following meeting."
+msgid "%s has canceled the following meeting."
+msgstr "%s đã hủy b� cuộc h�p sau."
+
+#: ../plugins/itip-formatter/itip-view.c:418
+#, c-format
+#| msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%s thông qua %s đã đ� nghị những thay đổi cuộc h�p sau."
+
+#: ../plugins/itip-formatter/itip-view.c:420
+#, c-format
+#| msgid "<b>%s</b> has proposed the following meeting changes."
+msgid "%s has proposed the following meeting changes."
+msgstr "%s> đã đ� nghị những thay đổi cuộc h�p sau."
+
+#: ../plugins/itip-formatter/itip-view.c:424
+#, c-format
+#| msgid "<b>%s</b> through %s has declined the following meeting changes:"
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%s thông qua %s đã từ chối những thay đổi cuộc h�p sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:426
+#, c-format
+#| msgid "<b>%s</b> has declined the following meeting changes."
+msgid "%s has declined the following meeting changes."
+msgstr "%s> đã từ chối những thay đổi cuộc h�p sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:464
+#, c-format
+#| msgid "<b>%s</b> through %s has published the following task:"
+msgid "%s through %s has published the following task:"
+msgstr "%s thông qua %s đã công bố tác vụ sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:466
+#, c-format
+#| msgid "<b>%s</b> has published the following task:"
+msgid "%s has published the following task:"
+msgstr "%s đã công bố tác vụ sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:471
+#, c-format
+#| msgid "<b>%s</b> requests the assignment of %s to the following task:"
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s yêu cầu phân công %s cho tác vụ sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:474
+#, c-format
+#| msgid "<b>%s</b> through %s has assigned you a task:"
+msgid "%s through %s has assigned you a task:"
+msgstr "%s thông qua %s đã phân công bạn cho tác vụ sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:476
+#, c-format
+#| msgid "<b>%s</b> has assigned you a task:"
+msgid "%s has assigned you a task:"
+msgstr "%s đã phân công bạn cho tác vụ sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:482
+#, c-format
+#| msgid "<b>%s</b> through %s wishes to add to an existing task:"
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%s thông qua %s muốn thêm vào tác vụ đã có:"
+
+#: ../plugins/itip-formatter/itip-view.c:484
+#, c-format
+#| msgid "<b>%s</b> wishes to add to an existing task:"
+msgid "%s wishes to add to an existing task:"
+msgstr "%s muốn thêm vào tác vụ đã có:"
+
+#: ../plugins/itip-formatter/itip-view.c:488
+#, c-format
+#| msgid ""
+#| "<b>%s</b> through %s wishes to receive the latest information for the "
+#| "following assigned task:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr "%s thông qua %s muốn nhận tin tức v� tác vụ đã phân công sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:490
+#, c-format
+#| msgid ""
+#| "<b>%s</b> wishes to receive the latest information for the following "
+#| "assigned task:"
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr "%s muốn nhận tin tức v� tác vụ đã phân công sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:494
+#, c-format
+#| msgid ""
+#| "<b>%s</b> through %s has sent back the following assigned task response:"
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr "%s thông qua %s đã trả l�i tác vụ đã phân công sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:496
+#, c-format
+#| msgid "<b>%s</b> has sent back the following assigned task response:"
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s đã trả l�i tác vụ đã phân công sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:500
+#, c-format
+#| msgid "<b>%s</b> through %s has canceled the following assigned task:"
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s thông qua %s đã hủy b� tác vụ đã phân công sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:502
+#, c-format
+#| msgid "<b>%s</b> has canceled the following assigned task:"
+msgid "%s has canceled the following assigned task:"
+msgstr "%s đã hủy b� tác vụ đã phân công sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:506
+#, c-format
+#| msgid ""
+#| "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr "%s thông qua %s đã đ� nghị những thay đổi phân công tác vụ sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:508
+#, c-format
+#| msgid "<b>%s</b> has proposed the following task assignment changes:"
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s đã đ� nghị những thay đổi phân công tác vụ sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:512
+#, c-format
+#| msgid "<b>%s</b> through %s has declined the following assigned task:"
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s thông qua %s đã từ chối tác vụ được phân công sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:514
+#, c-format
+#| msgid "<b>%s</b> has declined the following assigned task:"
+msgid "%s has declined the following assigned task:"
+msgstr "%s đã từ chối tác vụ được phân công sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:551
+#, c-format
+#| msgid "<b>%s</b> through %s has published the following memo:"
+msgid "%s through %s has published the following memo:"
+msgstr "%s thông qua %s đã công bố bản ghi nhớ sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:553
+#, c-format
+#| msgid "<b>%s</b> has published the following memo:"
+msgid "%s has published the following memo:"
+msgstr "%s đã công bố bản ghi nhớ sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:558
+#, c-format
+#| msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%s thông qua %s muốn thêm vào một bản ghi nhớ đã có:"
+
+#: ../plugins/itip-formatter/itip-view.c:560
+#, c-format
+#| msgid "<b>%s</b> wishes to add to an existing memo:"
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s muốn thêm vào một bản ghi nhớ đã có:"
+
+#: ../plugins/itip-formatter/itip-view.c:564
+#, c-format
+#| msgid "<b>%s</b> through %s has canceled the following shared memo:"
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s thông qua %s đã hủy b� bản ghi nhớ dùng chung sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:566
+#, c-format
+#| msgid "<b>%s</b> has canceled the following shared memo:"
+msgid "%s has canceled the following shared memo:"
+msgstr "%s đã hủy b� bản ghi nhớ dùng chung sau:"
+
+#: ../plugins/itip-formatter/itip-view.c:690
+msgid "All day:"
+msgstr "Tr�n ngày:"
+
+#: ../plugins/itip-formatter/itip-view.c:700
+msgid "Start day:"
+msgstr "Ngày bắt đầu:"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:700
+#: ../plugins/itip-formatter/itip-view.c:1062
+msgid "Start time:"
+msgstr "Th�i điểm đầu:"
+
+#: ../plugins/itip-formatter/itip-view.c:712
+msgid "End day:"
+msgstr "Ngày kết thúc:"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:712
+#: ../plugins/itip-formatter/itip-view.c:1073
+msgid "End time:"
+msgstr "Th�i điểm kết thúc:"
+
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:848
+msgid "_Open Calendar"
+msgstr "_Mở Lịch"
+
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../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 "_Từ chối"
+
+#: ../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 "_Chấp nhận"
+
+#: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Decline all"
+msgstr "_Từ chối tất cả"
+
+#: ../plugins/itip-formatter/itip-view.c:859
+msgid "_Tentative all"
+msgstr "Tạ_m chấp nhận tất cả"
+
+#: ../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 "Tạm chấp _nhận"
+
+#: ../plugins/itip-formatter/itip-view.c:860
+msgid "A_ccept all"
+msgstr "C_hấp nhận tất cả"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:871
+msgid "_Send Information"
+msgstr "_Gửi thông tin"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:875
+msgid "_Update Attendee Status"
+msgstr "_Cập nhật trạng thái ngư�i dự"
+
+#: ../plugins/itip-formatter/itip-view.c:878
+msgid "_Update"
+msgstr "_Cập nhật"
+
+#. Comment
+#: ../plugins/itip-formatter/itip-view.c:1093
+#: ../plugins/itip-formatter/itip-view.c:1147
+msgid "Comment:"
+msgstr "Ghi chú:"
+
+#: ../plugins/itip-formatter/itip-view.c:1132
+msgid "Send _reply to sender"
+msgstr "T_rả l�i ngư�i gửi"
+
+#: ../plugins/itip-formatter/itip-view.c:1162
+msgid "Send _updates to attendees"
+msgstr "Gửi bản cậ_p nhật cho các ngư�i dự"
+
+#: ../plugins/itip-formatter/itip-view.c:1171
+msgid "_Apply to all instances"
+msgstr "�_p dụng cho m�i lần"
+
+#: ../plugins/itip-formatter/itip-view.c:1180
+msgid "Show time as _free"
+msgstr "Hiện gi� là _rảnh"
+
+#: ../plugins/itip-formatter/itip-view.c:1183
+msgid "_Preserve my reminder"
+msgstr "_Bảo tồn l�i nhắc nhở mình"
+
+#. To Translators: This is a check box to inherit a reminder.
+#: ../plugins/itip-formatter/itip-view.c:1189
+msgid "_Inherit reminder"
+msgstr "Kế thừa gh_i nhớ"
+
+#: ../plugins/itip-formatter/itip-view.c:1965
+msgid "_Tasks:"
+msgstr "_Tác vụ:"
+
+#: ../plugins/itip-formatter/itip-view.c:1967
+msgid "_Memos:"
+msgstr "Ghi _nhá»›:"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
+#| msgid "Displays text/calendar parts in messages."
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "Hiển thị phần \"text/calendar\" (lịch) trong thư."
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Itip Formatter"
+msgstr "Bộ định dạng Itip"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+#| msgid ""
+#| "&quot;{0}&quot; has delegated the meeting. Do you want to add the "
+#| "delegate &quot;{1}&quot;?"
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr ""
+"'{0}' đã ủy nhiệm cuộc h�p này. Bạn có muốn thêm ngư�i ủy nhiệm '{1}' không?"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+msgid "This meeting has been delegated"
+msgstr "Cuộc h�p này đã được ủy nhiệm."
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr ""
+"Hồi đáp này không phải đến từ một ngư�i dự hiện th�i. Thêm ngư�i này như là "
+"ngư�i dự không?"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Beep or play sound file."
+msgstr "Kêu bíp hay phát tập tin âm thanh."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Enable icon in notification area."
+msgstr "Hiển thị biểu tượng trong vùng thông báo."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr ""
+"�úng (\"true\") thì kêu Bíp, không thì phát tập tin âm thanh khi nhận thư "
+"má»›i."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Notify new messages for Inbox only."
+msgstr "Thông báo v� thư mới chỉ trong hộp thư nhận."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+msgid "Play sound when new messages arrive."
+msgstr "Phát âm thanh khi nhận thư mới"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#| msgid ""
+#| "Sound file to be played when new messages arrive, if not in beep mode."
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr ""
+"Tập tin âm thanh chủ đ� khi nhận thư mới, nếu không phải ở chế độ kêu bíp."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr "Hiển thị biểu tượng thư mới trong vùng thông báo khi nhận thư mớ."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+msgid "Sound file name to be played."
+msgstr "Tên của tập tin âm thanh cần phát."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr ""
+"Tập tin âm thanh cần phát khi nhận thư mới, nếu không phải ở chế độ kêu bíp."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#| msgid "Use underline"
+msgid "Use sound theme"
+msgstr "Dùng âm thanh chủ đ�"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid "Whether play sound or beep when new messages arrive."
+msgstr "Có nên phát âm thanh hay kêu bíp khi nhận thư mới."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr "Có nên thông báo chỉ v� thư mới trong hộp thư nhận, hay không."
+
+#: ../plugins/mail-notification/mail-notification.c:391
+#, c-format
+msgid ""
+"You have received %d new message\n"
+"in %s."
+msgid_plural ""
+"You have received %d new messages\n"
+"in %s."
+msgstr[0] ""
+"Bạn đã nhận %d thư mới\n"
+"trong %s."
+
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:416
+#, c-format
+#| msgid "Subject:"
+msgid "Subject: %s"
+msgstr "Chủ đ�: %s"
+
+#: ../plugins/mail-notification/mail-notification.c:427
+#, c-format
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
+msgstr[0] "Bạn đã nhận %d thư mới."
+
+#: ../plugins/mail-notification/mail-notification.c:436
+#: ../plugins/mail-notification/mail-notification.c:444
+#: ../plugins/mail-notification/mail-notification.c:447
+msgid "New email"
+msgstr "ThÆ° má»›i"
+
+#. Translators: The '%s' is a mail
+#. * folder name.  (e.g. "Show Inbox")
+#: ../plugins/mail-notification/mail-notification.c:468
+#, c-format
+#| msgid "Show Fields"
+msgid "Show %s"
+msgstr "Hiện %s"
+
+#: ../plugins/mail-notification/mail-notification.c:673
+#| msgid "_Play sound when new messages arrive"
+msgid "_Play sound when a new message arrives"
+msgstr "_Phát âm thanh khi nhận thư mới"
+
+#: ../plugins/mail-notification/mail-notification.c:703
+msgid "_Beep"
+msgstr "Kêu _bíp"
+
+#: ../plugins/mail-notification/mail-notification.c:716
+#| msgid "Use underline"
+msgid "Use sound _theme"
+msgstr "Dùng âm thanh _chủ đ�"
+
+#: ../plugins/mail-notification/mail-notification.c:735
+#| msgid "Play _sound file"
+msgid "Play _file:"
+msgstr "Phát _tập tin:"
+
+#: ../plugins/mail-notification/mail-notification.c:744
+msgid "Select sound file"
+msgstr "Ch�n tập tin âm thanh"
+
+#: ../plugins/mail-notification/mail-notification.c:801
+msgid "Notify new messages for _Inbox only"
+msgstr "Thông báo v� thư mớ_i chỉ trong hộp thư nhận"
+
+#: ../plugins/mail-notification/mail-notification.c:811
+#| msgid "Show new mail icon in notification area when new messages arrive."
+msgid "Show _notification when a new message arrives"
+msgstr "_Hiển thị thông báo khi nhận thư mới"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid "Mail Notification"
+msgstr "Thông báo thư"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#| msgid "Play sound when new messages arrive."
+msgid "Notifies you when new mail messages arrive."
+msgstr "Thông báo bạn khi nhận thư mới."
+
+#. 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
+#, c-format
+msgid "Created from a mail by %s"
+msgstr "Tạo từ thư bởi %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:603
+#, c-format
+msgid ""
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:606
+#, c-format
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:609
+#, c-format
+msgid ""
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:626
+#, c-format
+msgid ""
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:629
+#, c-format
+msgid ""
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:632
+#, c-format
+msgid ""
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:651
+#| msgid "Do you wish to overwrite it?"
+msgid "Do you wish to continue converting remaining mails?"
+msgstr "Bạn có muốn tiếp tục chuyển đổi phần còn lại không?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:726
+#| msgid "No Summary"
+msgid "[No Summary]"
+msgstr "[Không tóm tắt]"
+
+#: ../plugins/mail-to-task/mail-to-task.c:738
+msgid "Invalid object returned from a server"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:788
+#, c-format
+#| msgid "An error occurred while printing"
+msgid "An error occurred during processing: %s"
+msgstr "Gặp lỗi khi xử lý: %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:813
+#, c-format
+msgid "Cannot open calendar. %s"
+msgstr "Không thể mở lịch: %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:820
+#| msgid ""
+#| "Selected source is read only, thus cannot create task there. Select other "
+#| "source, please."
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
+msgstr ""
+"Bạn đã ch�n nguồn chỉ-đ�c nên không thể tạo sự kiện ở đó. Hãy ch�n nguồn "
+"khác."
+
+#: ../plugins/mail-to-task/mail-to-task.c:823
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
+msgstr ""
+"Bạn đã ch�n nguồn chỉ-đ�c nên không thể tạo tác vụ ở đó. Hãy ch�n nguồn khác."
+
+#: ../plugins/mail-to-task/mail-to-task.c:826
+#| msgid ""
+#| "Selected source is read only, thus cannot create task there. Select other "
+#| "source, please."
+msgid ""
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
+msgstr ""
+"Bạn đã ch�n nguồn chỉ-đ�c nên không thể tạo bản ghi nhớ ở đó. Hãy ch�n nguồn "
+"khác."
+
+#: ../plugins/mail-to-task/mail-to-task.c:1077
+#, c-format
+#| msgid "Cannot open source \"{2}\"."
+msgid "Cannot get source list. %s"
+msgstr "Không thể lấy danh sách nguồn. %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1138
+#| msgid "No description available."
+msgid "No writable calendar is available."
+msgstr "Không có lịch ghi được."
+
+#: ../plugins/mail-to-task/mail-to-task.c:1230
+#| msgid "_Create new view"
+msgid "Create an _Event"
+msgstr "Tạo _sự kiện mới"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1232
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new event from the selected message"
+msgstr "Tạo sự kiện mới từ thư được ch�n"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1237
+#| msgid "Create a new memo"
+msgid "Create a Mem_o"
+msgstr "Tạo _ghi nhớ mới"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1239
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new memo from the selected message"
+msgstr "Tạo ghi nhớ mới từ thư được ch�n"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1244
+#| msgid "Create a new task"
+msgid "Create a _Task"
+msgstr "Tạo _tác vụ mới"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1246
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Create a new task from the selected message"
+msgstr "Tạo tác vụ mới từ thư được ch�n"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1254
+#| msgid "New _Meeting"
+msgid "Create a _Meeting"
+msgstr "Tạo cuộc _h�p mới"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1256
+#| msgid "Create a new meeting request"
+msgid "Create a new meeting from the selected message"
+msgstr "Tạo cuộc h�p mới từ thư được ch�n"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#| msgid "Convert the selected message to a new task"
+msgid "Convert a mail message to a task."
+msgstr "Chuyển đổi thư sang tác vụ."
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:346
+msgid "Get List _Archive"
+msgstr "Lấy _kho hộp"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:348
+msgid "Get an archive of the list this message belongs to"
+msgstr "Lấy kho của hộp thư chung của thư này"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:353
+msgid "Get List _Usage Information"
+msgstr "G�i thông tin v� cách sử _dụng hộp"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:355
+msgid "Get information about the usage of the list this message belongs to"
+msgstr "Lấy thông tin v� cách sử dụng hộp thư chung của thư này"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:360
+msgid "Contact List _Owner"
+msgstr "Liên lạc với ngư�i _sở hữu hộ"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:362
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "Liên lạc với ngư�i chủ hộp thư chung của thư này."
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
+msgid "_Post Message to List"
+msgstr "_Gá»­i thÆ° cho há»™p"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "Gửi thư cho hộp thư chung của thư này"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
+msgid "_Subscribe to List"
+msgstr "�ăng _ký với hộp"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "�ăng ký với hộp thư chung của thư này"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
+msgid "_Unsubscribe from List"
+msgstr "_B� đăng ký kh�i hộp"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
+#| msgid "Unsubscribe to the mailing list this message belongs to"
+msgid "Unsubscribe from the mailing list this message belongs to"
+msgstr "B� đăng ký với hộp thư chung của thư này"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
+msgid "Mailing _List"
+msgstr "_Há»™p thÆ° chung"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Mailing List Actions"
+msgstr "Hành động Hộp thư chung"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+#| msgid ""
+#| "Provide actions for common mailing list commands (subscribe, "
+#| "unsubscribe...)."
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr ""
+"Thực hiện các thao tác thông thư�ng cho hộp thư chung (đăng ký, hủy đăng "
+"ký ...)"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+msgid "Action not available"
+msgstr "Hành động không sẵn sàng"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
+msgid ""
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
+msgstr ""
+"Sẽ gửi một thư cho địa chỉ mạng « {0} ». Bạn có thể hoặc tự động gửi thư ấy, "
+"hoặc xem và sửa đổi nó trước đó.\n"
+"\n"
+"Bạn nên nhận một trả l�i từ hộp thư chung một chút sau khi gửi thư ấy."
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
+msgid "Malformed header"
+msgstr "Dòng đầu sai định dạng"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+msgid "No e-mail action"
+msgstr "Không có hành động thư"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
+msgid "Posting not allowed"
+msgstr "Không cho phép gửi thư"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+"Không cho phép gửi thư cho hộp thư chung này. Có lẽ nó là hộp thư chung chỉ "
+"cho phép đ�c. Hãy liên lạc với ngư�i chủ hộp thư chung, để tìm biết chi tiết."
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+msgid "Send e-mail message to mailing list?"
+msgstr "Gửi thư cho hộp thư chung không?"
+
+#: ../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"
+"\n"
+"Header: {0}"
+msgstr ""
+"Không thể thực hiện hành vi đó. Dòng đầu của hành vi này không chứa hành vi "
+"nào có thể xử lý.\n"
+"\n"
+"Dòng đầu: {0}"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
+msgid ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+msgstr ""
+"Dòng đầu « {0} » của thư này có dạng sai nên không xử lý được nó.\n"
+"\n"
+"Dòng đầu: {1}"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+msgid ""
+"This message does not contain the header information required for this "
+"action."
+msgstr "Thư này không chứa thông tin đầu thư cần thiết cho hành động này."
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
+msgid "_Edit message"
+msgstr "_Sá»­a thÆ°"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
+msgid "_Send message"
+msgstr "_Gá»­i thÆ°"
+
+#: ../plugins/mark-all-read/mark-all-read.c:42
+msgid "Also mark messages in subfolders?"
+msgstr "Cũng đánh dấu thư trong thư mục con ?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:44
+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 ""
+"Muốn đánh dấu các thư đã đ�c chỉ trong thư mục hiện th�i, hoặc trong thư mục "
+"hiện th�i cũng như tất cả các thư mục con ?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:215
+#| msgid "Current Folder and _Subfolders"
+msgid "In Current Folder and _Subfolders"
+msgstr "Thư mục hiện th�i và các thư mục c_on"
+
+#: ../plugins/mark-all-read/mark-all-read.c:229
+#| msgid "Current _Folder Only"
+msgid "In Current _Folder Only"
+msgstr "Chỉ thư _mục hiện th�i"
+
+#: ../plugins/mark-all-read/mark-all-read.c:575
+msgid "Mark Me_ssages as Read"
+msgstr "�ánh dấ_u thư �ã đ�c"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+msgid "Mark All Read"
+msgstr "�ánh dấu tất cả �ã đ�c"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+#| msgid "Mark all messages in the folder as read"
+msgid "Mark all messages in a folder as read."
+msgstr "�ánh dấu đã đ�c m�i thư trong thư mục này"
+
+#. but then we also need to create our own section frame
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
+msgid "Plain Text Mode"
+msgstr "Chế độ chữ thô"
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Prefer Plain Text"
+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 ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:251
+msgid "Show HTML if present"
+msgstr "Hiển thị HTML nếu có"
+
+#: ../plugins/prefer-plain/prefer-plain.c:252
+msgid "Let Evolution choose the best part to show."
+msgstr "�ể Evolution tự ch�n cái gì tốt nhất."
+
+#: ../plugins/prefer-plain/prefer-plain.c:255
+msgid "Show plain text if present"
+msgstr "Hiện văn bản thô nếu có"
+
+#: ../plugins/prefer-plain/prefer-plain.c:256
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr "Hiện văn bản thô nếu có, không thì để Evolution tự ch�n."
+
+#: ../plugins/prefer-plain/prefer-plain.c:260
+msgid "Only ever show plain text"
+msgstr "Luôn luôn chỉ hiện văn bản thô"
+
+#: ../plugins/prefer-plain/prefer-plain.c:261
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:313
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:333
+msgid "HTML _Mode"
+msgstr "Chế độ HT_ML"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+msgid "Import Outlook messages from PST file"
+msgstr "Nhập các thư Outlook từ tập tin PST"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook PST import"
+msgstr "Nhập PST Outlook"
+
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Outlook personal folders (.pst)"
+msgstr "Các thư mục cá nhân Outlook (.pst)"
+
+#: ../plugins/pst-import/pst-importer.c:450
+msgid "_Mail"
+msgstr "_Thư tín"
+
+#: ../plugins/pst-import/pst-importer.c:469
+msgid "Destination folder:"
+msgstr "Thư mục đích:"
+
+#: ../plugins/pst-import/pst-importer.c:475
+msgid "_Address Book"
+msgstr "Sổ đị_a chỉ"
+
+#: ../plugins/pst-import/pst-importer.c:476
+msgid "A_ppointments"
+msgstr "C_uộc hẹn"
+
+#: ../plugins/pst-import/pst-importer.c:477 ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tác vụ"
+
+#: ../plugins/pst-import/pst-importer.c:478
+msgid "_Journal entries"
+msgstr "Mục nhập Nhật _ký"
+
+#: ../plugins/pst-import/pst-importer.c:585
+msgid "Importing Outlook data"
+msgstr "�ang nhập dữ liệu Outlook"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../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 "Xuất bản lịch"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+msgid "Locations"
+msgstr "�ịa điểm"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#| msgid "Allows calendars to be published to the web"
+msgid "Publish calendars to the web."
+msgstr "Cho phép công bố lịch trên web."
+
+#: ../plugins/publish-calendar/publish-calendar.c:216
+#: ../plugins/publish-calendar/publish-calendar.c:471
+#, c-format
+#| msgid "Could not open source"
+msgid "Could not open %s:"
+msgstr "Không thể mở %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:218
+#, c-format
+#| msgid "Could not parse PGP message: Unknown error"
+msgid "Could not open %s: Unknown error"
+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 ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:240
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:288
+#, c-format
+msgid "Mount of %s failed:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:619
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "E_nable"
+msgstr "_Bật"
+
+#: ../plugins/publish-calendar/publish-calendar.c:767
+msgid "Are you sure you want to remove this location?"
+msgstr "Bạn có chắc muốn gỡ b� địa chỉ này không?"
+
+#. 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
+msgid "Could not create publish thread."
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:1107
+msgid "_Publish Calendar Information"
+msgstr "_Xuất bản thông tin lịch"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Custom Location"
+msgstr "Vị trí tự ch�n"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+msgid "Daily"
+msgstr "Hàng ngày"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+msgid "FTP (with login)"
+msgstr "FTP (cần đăng nhập)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+msgid "Manual (via Actions menu)"
+msgstr "Tự ch�n (qua trình đơn Hành động)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
+msgid "P_ort:"
+msgstr "_Cổng:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+msgid "Public FTP"
+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"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
+msgid "Publishing _Frequency:"
+msgstr "_Tần số Xuất bản:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Secure FTP (SSH)"
+msgstr "FTP An toàn (SSH)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "Secure WebDAV (HTTPS)"
+msgstr "WebDAV An toàn (HTTPS)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:17
+msgid "Service _type:"
+msgstr "_Kiểu dịch vụ:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+msgid "Sources"
+msgstr "Nguồn"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:19
+msgid "Time _duration:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (HTTP)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Weekly"
+msgstr "Hàng tuần"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+msgid "Windows share"
+msgstr "Chia sẻ Windows"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+msgid "_File:"
+msgstr "_Tập tin:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
+msgid "_Password:"
+msgstr "_Mật khẩu:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+msgid "_Publish as:"
+msgstr "_Xuất dạng:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+msgid "_Remember password"
+msgstr "_Nhớ mật khẩu"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
+msgid "_Username:"
+msgstr "Tên _ngư�i dùng:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+msgid "iCal"
+msgstr "iCal"
+
+#: ../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 ""
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:518
+msgid "New Location"
+msgstr "�ịa chỉ mới"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:520
+msgid "Edit Location"
+msgstr "Sửa địa chỉ"
+
+#. 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:168
+msgid "%F %T"
+msgstr "%F %T"
+
+#: ../plugins/save-calendar/csv-format.c:382
+msgid "UID"
+msgstr "UID"
+
+#: ../plugins/save-calendar/csv-format.c:384
+msgid "Description List"
+msgstr "Danh sách mô tả"
+
+#: ../plugins/save-calendar/csv-format.c:385
+msgid "Categories List"
+msgstr "Danh sách Loại"
+
+#: ../plugins/save-calendar/csv-format.c:386
+msgid "Comment List"
+msgstr "Danh sách Ghi chú"
+
+#: ../plugins/save-calendar/csv-format.c:389
+msgid "Contact List"
+msgstr "Danh sách liên lạc"
+
+#: ../plugins/save-calendar/csv-format.c:390
+msgid "Start"
+msgstr "Bắt đầu"
+
+#: ../plugins/save-calendar/csv-format.c:391
+msgid "End"
+msgstr "Kết thúc"
+
+#: ../plugins/save-calendar/csv-format.c:392
+msgid "Due"
+msgstr "�ến hạn"
+
+#: ../plugins/save-calendar/csv-format.c:393
+msgid "percent Done"
+msgstr "Phần trăm xong"
+
+#: ../plugins/save-calendar/csv-format.c:395
+msgid "URL"
+msgstr "URL"
+
+#: ../plugins/save-calendar/csv-format.c:396
+msgid "Attendees List"
+msgstr "Danh sách ngư�i dự"
+
+#: ../plugins/save-calendar/csv-format.c:398
+msgid "Modified"
+msgstr "�ã sửa đổi"
+
+#: ../plugins/save-calendar/csv-format.c:573
+#| msgid "Advanced options for the CSV format"
+msgid "A_dvanced options for the CSV format"
+msgstr "Tùy ch�n _cấp cao cho định dạng CSV"
+
+#: ../plugins/save-calendar/csv-format.c:581
+#| msgid "Prepend a header"
+msgid "Prepend a _header"
+msgstr "Thêm _dòng đầu vào đầu"
+
+#: ../plugins/save-calendar/csv-format.c:590
+#| msgid "Value delimiter:"
+msgid "_Value delimiter:"
+msgstr "Dấu phân cách _giá trị:"
+
+#: ../plugins/save-calendar/csv-format.c:601
+#| msgid "Record delimiter:"
+msgid "_Record delimiter:"
+msgstr "Dấu định giới mục _ghi:"
+
+#: ../plugins/save-calendar/csv-format.c:612
+#| msgid "Encapsulate values with:"
+msgid "_Encapsulate values with:"
+msgstr "_Bao giá trị bằng:"
+
+#: ../plugins/save-calendar/csv-format.c:638
+#| msgid "Comma separated value format (.csv)"
+msgid "Comma separated values (.csv)"
+msgstr "Giá trị cách nhau bằng dấu phẩy (.csv)"
+
+#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:225
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
+msgid "Save Selected"
+msgstr "Lưu đi�u ch�n"
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+#| msgid "Saves selected calendar or tasks list to disk."
+msgid "Save a calendar or task list to disk."
+msgstr "Lưu lịch hay danh sách tác vụ vào đĩa."
+
+#.
+#. * Translator: the %FT%T is the thirth argument for a strftime function.
+#. * It lets you define the formatting of the date in the rdf-file.
+#. * Also check out http://www.w3.org/2002/12/cal/tzd
+#. *
+#: ../plugins/save-calendar/rdf-format.c:156
+msgid "%FT%T"
+msgstr "%FT%T"
+
+#: ../plugins/save-calendar/rdf-format.c:389
+#| msgid "RDF format (.rdf)"
+msgid "RDF (.rdf)"
+msgstr "RDF (.rdf)"
+
+#: ../plugins/save-calendar/save-calendar.c:127
+msgid "_Format:"
+msgstr "�ịnh _dạng:"
+
+#: ../plugins/save-calendar/save-calendar.c:189
+msgid "Select destination file"
+msgstr "Ch�n tập tin đích"
+
+#: ../plugins/save-calendar/save-calendar.c:344
+#| msgid "Saves selected calendar or tasks list to disk."
+msgid "Save the selected calendar to disk"
+msgstr "Lưu lịch đã ch�n vào đĩa."
+
+#: ../plugins/save-calendar/save-calendar.c:375
+#| msgid "Saves selected calendar or tasks list to disk."
+msgid "Save the selected memo list to disk"
+msgstr "Lưu bản ghi nhớ đã ch�n vào đĩa."
+
+#: ../plugins/save-calendar/save-calendar.c:406
+#| msgid "Saves selected calendar or tasks list to disk."
+msgid "Save the selected task list to disk"
+msgstr "Lưu danh sách tác vụ đã ch�n vào đĩa."
+
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Danh sách các cặp từ-khoá/giá-trị cho phần bổ sung Mẫu thay thế trong nội "
+"dung thÆ°."
+
+#: ../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."
+msgstr ""
+
+#: ../plugins/templates/templates.c:1094
+msgid "No Title"
+msgstr "Không tên"
+
+#: ../plugins/templates/templates.c:1195
+msgid "Save as _Template"
+msgstr "Lưu dạng _mẫu"
+
+#: ../plugins/templates/templates.c:1197
+msgid "Save as Template"
+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 ""
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "TNEF Decoder"
+msgstr "Bộ giải mã đính kèm TNEF"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+msgid "Inline vCards"
+msgstr ""
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr ""
+
+#: ../plugins/vcard-inline/vcard-inline.c:207
+#: ../plugins/vcard-inline/vcard-inline.c:292
+msgid "Show Full vCard"
+msgstr "Hiện toàn vCard"
+
+#: ../plugins/vcard-inline/vcard-inline.c:210
+msgid "Show Compact vCard"
+msgstr "Hiện vCard tóm g�n"
+
+#: ../plugins/vcard-inline/vcard-inline.c:271
+msgid "There is one other contact."
+msgstr "Có %d liên lạc khác."
+
+#: ../plugins/vcard-inline/vcard-inline.c:280
+#, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "Có %d liên lạc khác."
+
+#: ../plugins/vcard-inline/vcard-inline.c:301
+msgid "Save in Address Book"
+msgstr "Lưu vào sổ địa chỉ"
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "Add WebDAV contacts to Evolution."
+msgstr "Thêm liên lạc WebDAV vào Evolution."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "Liên lạc WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:283
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
+msgstr "Tránh dùng I_fMatch (yêu cầu trên Apache < 2.2.8)"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:1
+msgid "Authenticate proxy server connections"
+msgstr "Xác thực kết nối qua máy chủ ủy nhiệm"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:2
+msgid "Automatic proxy configuration URL"
+msgstr "URL tự động cấu hình máy chủ ủy nhiệm"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Configuration version"
+msgstr "Phiên bản cấu hình"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:4
+msgid "Default sidebar width"
+msgstr "�ộ rộng khung l� mặc định"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:5
+msgid "Default window X coordinate"
+msgstr "Toạ độ X mặc định của cửa sổ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+msgid "Default window Y coordinate"
+msgstr "Toạ độ Y mặc định của cửa sổ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
+msgid "Default window height"
+msgstr "�ộ cao cửa sổ mặc định"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid "Default window state"
+msgstr "Tình trạng cửa sổ mặc định"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "Default window width"
+msgstr "�ộ rộng cửa sổ mặc định"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "Enable express mode"
+msgstr "Bật tìm nhanh"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr "Hiệu lực thiết lập ủy nhiệm khi truy cập HTTP(S) qua Internet."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "Flag that enables a much simplified user interface."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "HTTP proxy host name"
+msgstr "Tên máy ủy nhiệm HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14
+msgid "HTTP proxy password"
+msgstr "Mật khẩu ủy nhiệm HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:15
+msgid "HTTP proxy port"
+msgstr "Cổng ủy nhiệm HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid "HTTP proxy username"
+msgstr "Tên ngư�i dùng ủy nhiệm HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Mặc định là hiển thị ID hay biệt hiệu của thành phần khi khởi động."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
+"�úng thì mỗi kết nối tới máy chủ ủy nhiệm sẽ yêu cầu xác thực. Tên ngư�i "
+"dùng được lấy từ khoá GConf « /apps/evolution/shell/network_config/"
+"authentication_user », và mật khẩu được lấy từ hoặc vòng khoá GNOME (gnome-"
+"keyring) hoặc tập tin mật khẩu « ~/.gnome2_private/Evolution »."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Initial attachment view"
+msgstr "Khung xem đinh kèm ban đầu"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "Initial file chooser folder"
+msgstr "Thư mục bộ ch�n tập tin ban đầu"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "Thư mục ban đầu cho hộp thoại GtkFileChooser."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Last upgraded configuration version"
+msgstr "Phiên bản cấu hình Evolution đã cập nhật cuối cùng"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+"Danh sách đư�ng dẫn cho những thư mục sẽ được đồng bộ với đĩa để sử dụng "
+"ngoại tuyến."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
+msgid "Non-proxy hosts"
+msgstr "Máy khác ủy nhiệm"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr "Mật khẩu cần gửi để xác thực khi kết nối qua máy chủ ủy nhiệm HTTP."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+msgid "Proxy configuration mode"
+msgstr "Chế độ cấu hình ủy nhiệm"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:28
+msgid "SOCKS proxy host name"
+msgstr "Tên máy ủy nhiệm SOCKS"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:29
+msgid "SOCKS proxy port"
+msgstr "Cổng ủy nhiệm SOCKS"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+msgid "Secure HTTP proxy host name"
+msgstr "Tên máy ủy nhiệm HTTP bảo mật"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:31
+msgid "Secure HTTP proxy port"
+msgstr "Cổng ủy nhiệm HTTP bảo mật"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:32
+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 ""
+"Hãy lựa ch�n chế độ cấu hình ủy nhiệm. Các giá trị đã hỗ trợ là:\n"
+" • 0\t\tdùng thiết lập của hệ thống\n"
+" • 1\t\tkhông có ủy nhiệm\n"
+" • 2\t\tdùng cấu hình ủy nhiệm thủ công\n"
+" • 3\t\tdùng cấu hình ủy nhiệm được cung cấp trong URL tự động cấu hình."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:33
+msgid "Sidebar is visible"
+msgstr "Hiện khung l�"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:34
+msgid "Skip development warning dialog"
+msgstr "B� qua hộp thoại cảnh báo phát triển"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
+msgid "Start in offline mode"
+msgstr "Khởi chạy trong chế độ ngoại tuyến"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "Statusbar is visible"
+msgstr "Hiện khung l�"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr ""
+"Phiên bản cấu hình của trình Evolution, với mức độ cấu hình lớn/nh� (v.d. « "
+"2.6.0 »)."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
+msgid "The default X coordinate for the main window."
+msgstr "Toạ độ X mặc định cửa của sổ chính."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid "The default Y coordinate for the main window."
+msgstr "Toạ độ Y mặc định cửa của sổ chính."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
+msgid "The default height for the main window, in pixels."
+msgstr "�ộ cao mặc định cửa của sổ chính, theo điểm ảnh."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid "The default width for the main window, in pixels."
+msgstr "�ộ rộng mặc định cửa của sổ chính, theo điểm ảnh."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
+msgid "The default width for the sidebar, in pixels."
+msgstr "�ộ rộng mặc định của thanh nách, theo điểm ảnh."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+"Phiên bản cấu hình Evolution đã cập nhật cuối cùng, với mức độ cấu hình lớn/"
+"nh� (v.d. « 2.6.0 »)."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "The machine name to proxy HTTP through."
+msgstr "Tên máy qua đó cần chạy kết nối HTTP ủy nhiệm."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "The machine name to proxy secure HTTP through."
+msgstr "Tên máy qua đó cần chạy kết nối HTTP bảo mật ủy nhiệm."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
+msgid "The machine name to proxy socks through."
+msgstr "Tên máy qua đó cần chạy kết nối SOCKS ủy nhiệm."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+"Cổng trên máy được xác định bởi « /apps/evolution/shell/network_config/"
+"http_host » qua đó bạn chạy kết nối ủy nhiệm."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+"Cổng trên máy được xác định bởi « /apps/evolution/shell/network_config/"
+"secure_host » qua đó bạn chạy kết nối ủy nhiệm."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:49
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+"Cổng trên máy được xác định bởi « /apps/evolution/shell/network_config/"
+"socks_host » qua đó bạn chạy kết nối ủy nhiệm."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:50
+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 ""
+"Kiểu dạng m�i cái nút cửa sổ. Có thể là \"text\" (chữ), \"icons\" (ảnh), "
+"\"both\" (cả hai) hay \"toolbar\" (thanh công cụ). Nếu lập « thanh công cụ » "
+"thì thiết lập thanh công cụ GNOME sẽ quyết định kiểu dạng các cái nút này."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:51
+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 ""
+"Khoá này chứa một danh sách các máy tới chúng kết nối trực tiếp, không phải "
+"qua máy chủ ủy nhiệm (nếu nó đang chạy). Các giá trị có thể là tên máy, mi�n "
+"(dùng một ký tự đại diện đầu tiên, v.d. « *.vnoss.org »), địa chỉ IP của máy "
+"(cả hai IPv4 và IPv6) và địa chỉ mạng có mặt nạ mạng (tương tự với « "
+"192.168.0.0/24 »)."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:52
+msgid "Toolbar is visible"
+msgstr "Hiện thanh công cụ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:53
+msgid "URL that provides proxy configuration values."
+msgstr "�ịa chỉ URL cung cấp các giá trị cấu hình ủy nhiệm."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:54
+msgid "Use HTTP proxy"
+msgstr "Dùng ủy nhiệm HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:55
+#| msgid "User name to pass as authentication when doing HTTP proxying."
+msgid "Username to pass as authentication when doing HTTP proxying."
+msgstr ""
+"Tên ngư�i dùng cần gửi để xác thực khi kết nối qua máy chủ ủy nhiệm HTTP."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:56
+msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr ""
+"Có nên kh�i chạy trình Evolution trong chế độ ngoại tuyến thay vào chế độ "
+"trực tuyến hay không."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:57
+msgid "Whether or not the window should be maximized."
+msgstr "Có nên phóng to cửa sổ hay không."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:58
+msgid "Whether the sidebar should be visible."
+msgstr "Có nên hiển thị khung l� hay không."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:59
+msgid "Whether the status bar should be visible."
+msgstr "Hiện/ẩn thanh trạng thái."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:60
+msgid "Whether the toolbar should be visible."
+msgstr "Có nên hiển thị thanh công cụ hay không."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:61
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+"Có nên b� qua hộp thoại cảnh báo trong phiên bản phát triển Evolution hay "
+"không."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:62
+msgid "Whether the window buttons should be visible."
+msgstr "Có nên hiển thị m�i cái nút trên cửa sổ hay không."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:63
+msgid "Window button style"
+msgstr "Kiểu nút cửa sổ"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:64
+msgid "Window buttons are visible"
+msgstr "Hiển thị nút cửa sổ"
+
+#: ../shell/e-shell-content.c:729 ../shell/e-shell-content.c:730
+msgid "Searches"
+msgstr "Việc tìm kiếm"
+
+#: ../shell/e-shell-content.c:773
+msgid "Save Search"
+msgstr "Lưu việc tìm kiếm"
+
+#. Translators: The "Show:" label precedes a combo box that
+#. * 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
+msgid "Sho_w:"
+msgstr "_Hiện:"
+
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:971
+msgid "Sear_ch:"
+msgstr "Tìm _kiếm:"
+
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:1034
+msgid "i_n"
+msgstr " tro_ng "
+
+# Name: do not translate/ tên: đừng dịch
+#: ../shell/e-shell-utils.c:223
+msgid "vCard (.vcf)"
+msgstr "vCard (.vcf)"
+
+#: ../shell/e-shell-utils.c:246
+msgid "All Files (*)"
+msgstr "M�i tập tin (*)"
+
+#: ../shell/e-shell-view.c:296
+msgid "Saving user interface state"
+msgstr "Lưu trạng thái giao diện ngư�i dùng"
+
+#. The translator-credits string is for translators to list
+#. * per-language credits for translation, displayed in the
+#. * about dialog.
+#: ../shell/e-shell-window-actions.c:645
+msgid "translator-credits"
+msgstr "Nhóm Việt hoá Gnome <gnomevi-list@lists.sourceforge.net>"
+
+#: ../shell/e-shell-window-actions.c:656
+msgid "Evolution Website"
+msgstr "Trang Web Evolution"
+
+#: ../shell/e-shell-window-actions.c:902
+#| msgid "Categories List"
+msgid "Categories Editor"
+msgstr "Trình đi�u chỉnh phân loại"
+
+#: ../shell/e-shell-window-actions.c:1237
+msgid "Bug Buddy is not installed."
+msgstr "Chưa cài đặt trình Bug Buddy (thông báo lỗi)."
+
+#: ../shell/e-shell-window-actions.c:1239
+msgid "Bug Buddy could not be run."
+msgstr "Không thể chạy trình Bug buddy."
+
+#: ../shell/e-shell-window-actions.c:1420
+msgid "Show information about Evolution"
+msgstr "Hiện thông tin v� Evolution"
+
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1439
+msgid "_Close Window"
+msgstr "�óng _cửa sổ"
+
+#: ../shell/e-shell-window-actions.c:1446
+msgid "_Contents"
+msgstr "_Ná»™i dung"
+
+#: ../shell/e-shell-window-actions.c:1448
+msgid "Open the Evolution User Guide"
+msgstr "Mở hướng dẫn sử dụng Evolution"
+
+#: ../shell/e-shell-window-actions.c:1474
+msgid "_Forget Passwords"
+msgstr "_Quên các mật khẩu"
+
+#: ../shell/e-shell-window-actions.c:1476
+msgid "Forget all remembered passwords"
+msgstr "Quên hết tất cả mật khẩu đã nhớ"
+
+#: ../shell/e-shell-window-actions.c:1481
+msgid "I_mport..."
+msgstr "_Nhập..."
+
+#: ../shell/e-shell-window-actions.c:1483
+msgid "Import data from other programs"
+msgstr "Nhập dữ liệu từ chương trình khác"
+
+#: ../shell/e-shell-window-actions.c:1488
+msgid "New _Window"
+msgstr "Cửa sổ _mới"
+
+#: ../shell/e-shell-window-actions.c:1490
+msgid "Create a new window displaying this view"
+msgstr "Tạo cửa sổ mới hiển thị khung xem này"
+
+#: ../shell/e-shell-window-actions.c:1502
+#| msgid "_Available Categories:"
+msgid "Available Cate_gories"
+msgstr "_Phân loại hiện có"
+
+#: ../shell/e-shell-window-actions.c:1504
+#| msgid "_Available Categories:"
+msgid "Manage available categories"
+msgstr "Quản lý phân loại hiện có"
+
+#: ../shell/e-shell-window-actions.c:1516
+msgid "_Quick Reference"
+msgstr "Tham khảo _nhanh"
+
+#: ../shell/e-shell-window-actions.c:1518
+msgid "Show Evolution's shortcut keys"
+msgstr "Hiện phím tắt Evolution"
+
+#: ../shell/e-shell-window-actions.c:1525
+msgid "Exit the program"
+msgstr "Thoát kh�i chương trình"
+
+#: ../shell/e-shell-window-actions.c:1530
+msgid "_Advanced Search..."
+msgstr "Tìm kiếm cấp c_ao..."
+
+#: ../shell/e-shell-window-actions.c:1532
+msgid "Construct a more advanced search"
+msgstr "Thực hiện tìm kiếm nâng cao"
+
+#: ../shell/e-shell-window-actions.c:1539
+msgid "Clear the current search parameters"
+msgstr "Huỷ tham số tìm kiếm hiện tại"
+
+#: ../shell/e-shell-window-actions.c:1544
+msgid "_Edit Saved Searches..."
+msgstr "_Sửa việc tìm kiếm đã lưu..."
+
+#: ../shell/e-shell-window-actions.c:1546
+msgid "Manage your saved searches"
+msgstr "Quản lý tìm kiếm đã lưu"
+
+#: ../shell/e-shell-window-actions.c:1553
+msgid "Click here to change the search type"
+msgstr "Nhấn vào đây để sửa đổi kiểu tìm kiếm"
+
+#: ../shell/e-shell-window-actions.c:1558
+msgid "_Find Now"
+msgstr "Tìm n_gay"
+
+#. Block the default Ctrl+F.
+#: ../shell/e-shell-window-actions.c:1560
+msgid "Execute the current search parameters"
+msgstr "Thực hiện tham số tìm kiếm hiện tại"
+
+#: ../shell/e-shell-window-actions.c:1565
+msgid "_Save Search..."
+msgstr "_Lưu việc tìm kiếm..."
+
+#: ../shell/e-shell-window-actions.c:1567
+msgid "Save the current search parameters"
+msgstr "Lưu thm số tìm kiếm hiện tại"
+
+#: ../shell/e-shell-window-actions.c:1579
+msgid "Submit _Bug Report..."
+msgstr "Gửi _báo cáo lỗi..."
+
+#: ../shell/e-shell-window-actions.c:1581
+msgid "Submit a bug report using Bug Buddy"
+msgstr "Báo cáo lỗi bằng Bug Buddy"
+
+#: ../shell/e-shell-window-actions.c:1586
+msgid "_Work Offline"
+msgstr "_Ngoại tuyến"
+
+#: ../shell/e-shell-window-actions.c:1588
+msgid "Put Evolution into offline mode"
+msgstr "�ặt Evolution vào chế độ ngoại tuyến"
+
+#: ../shell/e-shell-window-actions.c:1593
+msgid "_Work Online"
+msgstr "_Trực tuyến"
+
+#: ../shell/e-shell-window-actions.c:1595
+msgid "Put Evolution into online mode"
+msgstr "�ưa Evolution trở lại chế độ trực tuyến"
+
+#: ../shell/e-shell-window-actions.c:1623
+msgid "Lay_out"
+msgstr "_Bố trí"
+
+#: ../shell/e-shell-window-actions.c:1630
+msgid "_New"
+msgstr "Má»›_i"
+
+#: ../shell/e-shell-window-actions.c:1637
+msgid "_Search"
+msgstr "Tìm _kiếm"
+
+#: ../shell/e-shell-window-actions.c:1644
+msgid "_Switcher Appearance"
+msgstr "Hình thức bộ _chuyển đổi"
+
+#: ../shell/e-shell-window-actions.c:1658
+msgid "_Window"
+msgstr "_Cửa sổ"
+
+#: ../shell/e-shell-window-actions.c:1687
+msgid "Show Side _Bar"
+msgstr "Hiện khung _l�"
+
+#: ../shell/e-shell-window-actions.c:1689
+msgid "Show the side bar"
+msgstr "Hiện khung l�"
+
+#: ../shell/e-shell-window-actions.c:1695
+msgid "Show _Buttons"
+msgstr "Hiện _nút"
+
+#: ../shell/e-shell-window-actions.c:1697
+msgid "Show the switcher buttons"
+msgstr "Hiện nút chuyển"
+
+#: ../shell/e-shell-window-actions.c:1703
+msgid "Show _Status Bar"
+msgstr "Hiện thanh t_rạng thái"
+
+#: ../shell/e-shell-window-actions.c:1705
+msgid "Show the status bar"
+msgstr "Hiện thanh trạng thái"
+
+#: ../shell/e-shell-window-actions.c:1711
+msgid "Show _Tool Bar"
+msgstr "Hiện thanh công cụ"
+
+#: ../shell/e-shell-window-actions.c:1713
+msgid "Show the tool bar"
+msgstr "Hiện thanh công cụ"
+
+#: ../shell/e-shell-window-actions.c:1735
+msgid "_Icons Only"
+msgstr "Chỉ _hình"
+
+#: ../shell/e-shell-window-actions.c:1737
+msgid "Display window buttons with icons only"
+msgstr "Hiển thị m�i cái nút cửa sổ dùng chỉ ảnh thôi"
+
+#: ../shell/e-shell-window-actions.c:1742
+msgid "_Text Only"
+msgstr "Chỉ _nhãn"
+
+#: ../shell/e-shell-window-actions.c:1744
+msgid "Display window buttons with text only"
+msgstr "Hiển thị m�i cái nút cửa sổ dùng chỉ chữ thôi"
+
+#: ../shell/e-shell-window-actions.c:1749
+msgid "Icons _and Text"
+msgstr "Hình _và nhãn"
+
+#: ../shell/e-shell-window-actions.c:1751
+msgid "Display window buttons with icons and text"
+msgstr "Hiển thị m�i cái nút cửa sổ dùng ảnh và chữ đ�u"
+
+#: ../shell/e-shell-window-actions.c:1756
+msgid "Tool_bar Style"
+msgstr "_Kiểu thanh công cụ"
+
+#: ../shell/e-shell-window-actions.c:1758
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr ""
+"Hiển thị m�i cái nút cửa sổ dùng thiết lập thanh công cụ của màn hình n�n"
+
+#: ../shell/e-shell-window-actions.c:1766
+msgid "Define Views..."
+msgstr "Xác định ô xem..."
+
+#: ../shell/e-shell-window-actions.c:1768
+msgid "Create or edit views"
+msgstr "Tạo hay sửa ô xem"
+
+#: ../shell/e-shell-window-actions.c:1773
+msgid "Save Custom View..."
+msgstr "Lưu ô xem tự ch�n..."
+
+#: ../shell/e-shell-window-actions.c:1775
+msgid "Save current custom view"
+msgstr "Lưu ô xem riêng hiện th�i"
+
+#: ../shell/e-shell-window-actions.c:1782
+msgid "C_urrent View"
+msgstr "Ô _xem hiện th�i"
+
+#: ../shell/e-shell-window-actions.c:1792
+msgid "Custom View"
+msgstr "Ô xem tự ch�n"
+
+#: ../shell/e-shell-window-actions.c:1794
+msgid "Current view is a customized view"
+msgstr "Ô xem hiện th�i là ô xem đã tùy chỉnh"
+
+#: ../shell/e-shell-window-actions.c:1804
+msgid "Change the page settings for your current printer"
+msgstr "Thay đổi thiết lập trang cho máy in hiện th�i tại"
+
+#: ../shell/e-shell-window-actions.c:2194
+#, c-format
+msgid "Switch to %s"
+msgstr "Chuyển sang %s"
+
+#: ../shell/e-shell-window-actions.c:2414
+msgid "Execute these search parameters"
+msgstr "Thực thi những tham số tìm kiếm này"
+
+# Name: do not translate/ tên: đừng dịch
+#. Translators: This is used for the main window title.
+#: ../shell/e-shell-window-private.c:584
+#, c-format
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
+
+#: ../shell/e-shell-window.c:442
+msgid "New"
+msgstr "Má»›i"
+
+#: ../shell/e-shell.c:361
+msgid "Preparing to go offline..."
+msgstr "�ang chuẩn bị ngoại tuyến..."
+
+#: ../shell/e-shell.c:414
+msgid "Preparing to go online..."
+msgstr "�ang chuẩn bị trực tuyến..."
+
+#: ../shell/e-shell.c:476
+msgid "Preparing to quit..."
+msgstr "�ang chuẩn bị thoát..."
+
+#. Preview/Alpha/Beta version warning message
+#: ../shell/main.c:195
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Evolution groupware suite.\n"
+"\n"
+"This version of Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+"Xin chào. Xin cám ơn đã mất th�i gian để tải v� bản dùng thử này\n"
+"của bộ phần m�m nhóm Evolution.\n"
+"\n"
+"�ây là phiên bản Evolution chưa hoàn chỉnh. Nó gần hoàn chỉnh,\n"
+"nhưng vẫn còn vài tính năng hoặc chưa hoàn chỉnh,\n"
+"hoặc chưa làm việc đúng.\n"
+"\n"
+"Nếu bạn muốn dùng một phiên bản ổn định của Evolution, chúng tôi thúc giục "
+"bạn b� cài đặt phiên bản này, và để cài đặt phiên bản %s thay vào đó.\n"
+"\n"
+"Nếu bạn tìm thấy lỗi, vui lòng thông báo cho chúng tôi tại <bugzilla.gnome."
+"org>.\n"
+"Sản phẩm này không bảo đảm gì cả.\n"
+"\n"
+"Chúng tôi hy v�ng bạn thích kết quả của quá trình làm việc của chúng tôi,\n"
+"và chúng tôi háo hức ch� đ�i sự đóng góp của bạn!\n"
+
+#: ../shell/main.c:219
+msgid ""
+"Thanks\n"
+"The Evolution Team\n"
+msgstr ""
+"Xin cám ơn\n"
+"Nhóm Evolution\n"
+
+#: ../shell/main.c:226
+msgid "Do not tell me again"
+msgstr "�ừng nhắc lại lần nữa"
+
+#. Translators: Do NOT translate the five component
+#. * names, they MUST remain in English!
+#: ../shell/main.c:308
+msgid ""
+"Start Evolution showing the specified component. Available options are "
+"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+msgstr ""
+
+#: ../shell/main.c:312
+msgid "Apply the given geometry to the main window"
+msgstr "�p dụng toạ độ cho cửa sổ chính"
+
+#: ../shell/main.c:316
+msgid "Start in online mode"
+msgstr "Khởi chạy trong chế độ trực tuyến"
+
+#: ../shell/main.c:318
+msgid "Ignore network availability"
+msgstr "Không quan tâm tình trạng mạng"
+
+#: ../shell/main.c:320
+msgid "Start in \"express\" mode"
+msgstr "Bắt đầu chế độ \"tốc hành\""
+
+#: ../shell/main.c:323
+msgid "Forcibly shut down Evolution"
+msgstr "Buộc kết thúc Evolution"
+
+#: ../shell/main.c:326
+msgid "Send the debugging output of all components to a file."
+msgstr "Gửi thông tin gỡ lỗi của m�i thành phần vào tập tin."
+
+#: ../shell/main.c:328
+msgid "Disable loading of any plugins."
+msgstr "Tắt nạp phần bổ sung."
+
+#: ../shell/main.c:330
+msgid "Disable preview pane of Mail, Contacts and Tasks."
+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 ""
+
+#: ../shell/main.c:336
+msgid "Request a running Evolution process to quit"
+msgstr "Yêu cầu tiến trình Evolution đang chạy phải thoát"
+
+#: ../shell/main.c:512 ../shell/main.c:520
+msgid "- The Evolution PIM and Email Client"
+msgstr "— Ứng dụng thư điện tử và quản lý thông tin cá nhân Evolution"
+
+#: ../shell/main.c:583
+#, c-format
+#| msgid ""
+#| "%s: --online and --offline cannot be used together.\n"
+#| "  Use %s --help for more information.\n"
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Run '%s --help' for more information.\n"
+msgstr ""
+"%s: hai tùy ch�n --online (trực tuyến) và --offline (ngoại tuyến) không thể "
+"được dùng chung.\n"
+"  Hãy dùng lệnh %s --help (trợ giúp) để biết thêm thông tin.\n"
+
+#: ../shell/main.c:589
+#, c-format
+msgid ""
+"%s: --force-online and --offline cannot be used together.\n"
+"  Run '%s --help' for more information.\n"
+msgstr ""
+"%s: hai tùy ch�n --force-online (buộc trực tuyến) và --force-offline (buộc "
+"ngoại tuyến) không thể được dùng chung.\n"
+"  Hãy dùng lệnh '%s --help' (trợ giúp) để biết thêm thông tin.\n"
+
+#: ../shell/shell.error.xml.h:1
+msgid "Are you sure you want to forget all remembered passwords?"
+msgstr "Bạn có chắc muốn quên các mật khẩu đã nhớ không?"
+
+#: ../shell/shell.error.xml.h:2
+#| msgid "Delete old data from version {0}?"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "Không thể nâng cấp trực tiếp từ phiên bản {0}"
+
+#: ../shell/shell.error.xml.h:3
+msgid "Continue Anyway"
+msgstr "Vẫn tiếp"
+
+#: ../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."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed."
+msgstr ""
+"Quên đi các mật khẩu đã nhớ sẽ xoá hết mật khẩu đã nhớ. Như vậy bạn sẽ lại "
+"được nhắc gõ mật khẩu lần sau cần thiết."
+
+#: ../shell/shell.error.xml.h:7
+msgid "Quit Now"
+msgstr "Thoát ngay"
+
+#: ../shell/shell.error.xml.h:8
+#| msgid "Upgrade from previous version failed: {0}"
+msgid "Upgrade from previous version failed:"
+msgstr "Việc nâng cấp từ phiên bản trước bị lỗi:"
+
+#: ../shell/shell.error.xml.h:9
+msgid "_Forget"
+msgstr "_Quên"
+
+#: ../shell/shell.error.xml.h:10
+#| msgid ""
+#| "{1}\n"
+#| "\n"
+#| "If you choose to continue, you may not have access to some of your old "
+#| "data.\n"
+msgid ""
+"{0}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+"{0}\n"
+"\n"
+"Nếu bạn ch�n tiếp tục thì có lẽ sẽ không thể truy cập một phần dữ liệu cũ.\n"
+
+#: ../shell/test/e-test-shell-backend.c:56
+msgctxt "New"
+msgid "_Test Item"
+msgstr "Mục _kiểm thử"
+
+#: ../shell/test/e-test-shell-backend.c:58
+msgid "Create a new test item"
+msgstr "Tạo mục kiểm tra mới"
+
+#: ../shell/test/e-test-shell-backend.c:66
+#| msgid "Resource"
+msgctxt "New"
+msgid "Test _Source"
+msgstr "_Nguồn kiểm tra"
+
+#: ../shell/test/e-test-shell-backend.c:68
+#| msgid "Create a new test item"
+msgid "Create a new test source"
+msgstr "Tạo mục kiểm tra mới"
+
+#: ../smclient/eggdesktopfile.c:166
+#, c-format
+msgid "File is not a valid .desktop file"
+msgstr "Không phải tập tin .desktop hợp lệ"
+
+#: ../smclient/eggdesktopfile.c:189
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr "Phiên bản tập tin desktop không được hỗ trợ '%s'"
+
+#: ../smclient/eggdesktopfile.c:959
+#, c-format
+msgid "Starting %s"
+msgstr "�ang bắt đầu %s"
+
+#: ../smclient/eggdesktopfile.c:1102
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1170
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1370
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1391
+#, c-format
+#| msgid "Editor not launchable"
+msgid "Not a launchable item"
+msgstr "Mục không thể chạy"
+
+#: ../smclient/eggsmclient.c:226
+#| msgid "_Direct connection to the Internet"
+msgid "Disable connection to session manager"
+msgstr "Tắt kết nối tới trình quản lý phiên làm việc"
+
+#: ../smclient/eggsmclient.c:229
+#| msgid "Set up Pilot configuration"
+msgid "Specify file containing saved configuration"
+msgstr "Xác định tập tin chứ cấu hình được lưu"
+
+#: ../smclient/eggsmclient.c:229
+msgid "FILE"
+msgstr "TẬP-TIN"
+
+#: ../smclient/eggsmclient.c:232
+msgid "Specify session management ID"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:232
+msgid "ID"
+msgstr "ID"
+
+#: ../smclient/eggsmclient.c:253
+msgid "Session management options:"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:254
+msgid "Show session management options"
+msgstr "Hiện m�i tuỳ ch�n quản lý phiên làm việc"
+
+#: ../smime/gui/ca-trust-dialog.c:107
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+"Chức nhận « %s » là một chứng nhận CA (nhà cầm quy�n chứng nhận).\n"
+"\n"
+"Sửa đổi thiết lập tin cậy:"
+
+#: ../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 ""
+"Vì bạn tin cậy nhà cầm quy�n đã phát hành chứng nhận này, thì bạn tin cậy "
+"xác thực của chứng nhận này trừ khi chỉ thị cách khác ở đây."
+
+#: ../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 ""
+"Vì bạn không tin cậy nhà cầm quy�n đã phát hành chứng nhận này, thì bạn "
+"không tin cậy xác thực của chứng nhận này trừ khi chỉ thị cách khác ở đây."
+
+#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+msgid "Certificate Name"
+msgstr "Tên chứng nhận"
+
+#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+#| msgid "Or_ganization:"
+msgid "Issued To Organization"
+msgstr "Phát hành cho tổ chức"
+
+#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+#| msgid "Organizational Unit (OU)"
+msgid "Issued To Organizational Unit"
+msgstr "�ơn vị tổ chức (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
+msgid "Serial Number"
+msgstr "Số sản xuất"
+
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:115
+msgid "Purposes"
+msgstr "Mục đích"
+
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+msgid "Issued By"
+msgstr "Phát hành bởi"
+
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:117
+#| msgid "Or_ganization:"
+msgid "Issued By Organization"
+msgstr "Phát hành bởi tổ chức"
+
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118
+#| msgid "Organizational Unit (OU)"
+msgid "Issued By Organizational Unit"
+msgstr "Phát hành bởi đơn vị tổ chức (OU)"
+
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
+#| msgid "Issuer"
+msgid "Issued"
+msgstr "Phát hành lúc"
+
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120
+msgid "Expires"
+msgstr "Hết hạn"
+
+#: ../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 "Vân tay SHA1"
+
+#: ../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 "Vân tay MD5"
+
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
+#| msgid "Email _Address:"
+msgid "Email Address"
+msgstr "�ịa chỉ thư"
+
+#: ../smime/gui/certificate-manager.c:575
+msgid "Select a certificate to import..."
+msgstr "Hãy ch�n chứng nhận cần nhập..."
+
+#: ../smime/gui/certificate-manager.c:588
+msgid "All files"
+msgstr "M�i tập tin"
+
+#: ../smime/gui/certificate-manager.c:623
+#| msgid "Failed to authenticate.\n"
+msgid "Failed to import certificate"
+msgstr "Lỗi nhập chứng nhận"
+
+#: ../smime/gui/certificate-manager.c:991
+msgid "All PKCS12 files"
+msgstr "M�i tập tin PKCS12"
+
+#: ../smime/gui/certificate-manager.c:1009
+msgid "All email certificate files"
+msgstr "M�i tập tin chứng nhận thư điện tử"
+
+#: ../smime/gui/certificate-manager.c:1027
+msgid "All CA certificate files"
+msgstr "M�i tập tin chứng nhận Nhà cầm quy�n chứng nhận (CA)"
+
+#: ../smime/gui/certificate-viewer.c:345
+#, c-format
+msgid "Certificate Viewer: %s"
+msgstr "Bộ xem chứng nhận: %s"
+
+#: ../smime/gui/component.c:50
+#, c-format
+#| msgid "Enter the password for `%s'"
+msgid "Enter the password for '%s'"
+msgstr "Nhập mật khẩu cho '%s'"
+
+#. we're setting the password initially
+#: ../smime/gui/component.c:76
+msgid "Enter new password for certificate database"
+msgstr "Hãy gõ mật khẩu mới cho cơ sở dữ liệu chứng nhận"
+
+#: ../smime/gui/component.c:78
+msgid "Enter new password"
+msgstr "Hãy gõ mật khẩu mới"
+
+#. FIXME: add serial no, validity date, uses
+#: ../smime/gui/e-cert-selector.c:118
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+"Phát hành cho:\n"
+"  Chủ đ�: %s\n"
+
+#: ../smime/gui/e-cert-selector.c:119
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+"Phát hành bởi:\n"
+"  Chủ đ�: %s\n"
+
+#: ../smime/gui/e-cert-selector.c:172
+msgid "Select certificate"
+msgstr "Ch�n chứng nhận"
+
+#: ../smime/gui/smime-ui.ui.h:1
+msgid "<Not Part of Certificate>"
+msgstr "<Không phải phần chứng nhận>"
+
+#: ../smime/gui/smime-ui.ui.h:2
+msgid "Authorities"
+msgstr "Nhà cầm quy�n"
+
+#: ../smime/gui/smime-ui.ui.h:3
+msgid "Backup _All"
+msgstr "Sao _lưu tất cả"
+
+#: ../smime/gui/smime-ui.ui.h:4
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+"Trước khi tin cậy nhà cầm quy�n này để làm gì thì bạn nên kiểm tra chứng "
+"nhận của nó, và chính thức và thủ tục của nó (nếu công bố)."
+
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1097
+msgid "Certificate"
+msgstr "Chứng nhận"
+
+#: ../smime/gui/smime-ui.ui.h:6
+msgid "Certificate Authority Trust"
+msgstr "�ộ tin nhà cầm quy�n chứng nhận"
+
+#: ../smime/gui/smime-ui.ui.h:7
+msgid "Certificate Fields"
+msgstr "Trư�ng chứng nhận"
+
+#: ../smime/gui/smime-ui.ui.h:8
+msgid "Certificate Hierarchy"
+msgstr "Cây chứng nhận"
+
+#: ../smime/gui/smime-ui.ui.h:9
+msgid "Certificate details"
+msgstr "Chi tiết chứng nhận"
+
+#: ../smime/gui/smime-ui.ui.h:10
+msgid "Certificates Table"
+msgstr "Bảng chứng nhận"
+
+#: ../smime/gui/smime-ui.ui.h:11
+msgid "Common Name (CN)"
+msgstr "Tên chung (TC)"
+
+#: ../smime/gui/smime-ui.ui.h:12
+msgid "Contact Certificates"
+msgstr "Chứng nhận Liên lạc"
+
+#: ../smime/gui/smime-ui.ui.h:14
+msgid "Do not trust the authenticity of this certificate"
+msgstr "�ừng tin cậy tính xác thực của chứng nhận này."
+
+#: ../smime/gui/smime-ui.ui.h:15
+msgid "Email Certificate Trust Settings"
+msgstr "Thiết lập Tin cậy Chứng nhận Thư điện tử"
+
+#: ../smime/gui/smime-ui.ui.h:16
+msgid "Email Recipient Certificate"
+msgstr "Chứng nhận Ngư�i nhận Thư điện tử"
+
+#: ../smime/gui/smime-ui.ui.h:17
+msgid "Email Signer Certificate"
+msgstr "Chứng nhận Ký tên Thư điện tử"
+
+#: ../smime/gui/smime-ui.ui.h:18
+msgid "Expires On"
+msgstr "Hết hạn vào"
+
+#: ../smime/gui/smime-ui.ui.h:19
+msgid "Field Value"
+msgstr "Giá trị trư�ng"
+
+#: ../smime/gui/smime-ui.ui.h:20
+msgid "Fingerprints"
+msgstr "Vân tay"
+
+#: ../smime/gui/smime-ui.ui.h:24
+msgid "Issued On"
+msgstr "Phát hành vào"
+
+#: ../smime/gui/smime-ui.ui.h:25
+msgid "Issued To"
+msgstr "Phát hành cho"
+
+#: ../smime/gui/smime-ui.ui.h:27
+msgid "Organization (O)"
+msgstr "Tổ chức (T)"
+
+#: ../smime/gui/smime-ui.ui.h:28
+msgid "Organizational Unit (OU)"
+msgstr "�ơn vị Tổ chức (�T)"
+
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:829
+msgid "SSL Client Certificate"
+msgstr "Chứng nhận khách SSL"
+
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:833
+msgid "SSL Server Certificate"
+msgstr "Chứng nhận máy chủ SSL"
+
+#: ../smime/gui/smime-ui.ui.h:33
+#| msgid "<b>This certificate has been verified for the following uses:</b>"
+msgid "This certificate has been verified for the following uses:"
+msgstr "�ã xác minh chứng nhận này cho những cách sử dụng theo đây:"
+
+#: ../smime/gui/smime-ui.ui.h:34
+msgid "Trust the authenticity of this certificate"
+msgstr "Tin cậy tính xác thực của chứng nhận này"
+
+#: ../smime/gui/smime-ui.ui.h:35
+msgid "Trust this CA to identify email users."
+msgstr ""
+"Tin cậy nhà cầm quy�n chứng nhận này để nhận diện ngư�i dùng thư điện tử."
+
+#: ../smime/gui/smime-ui.ui.h:36
+msgid "Trust this CA to identify software developers."
+msgstr ""
+"Tin cậy nhà cầm quy�n chứng nhận này để nhận diện ngư�i phát triển phần m�m."
+
+#: ../smime/gui/smime-ui.ui.h:37
+#| msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify websites."
+msgstr "Tin cậy nhà cầm quy�n chứng nhận này để nhận diện trang web."
+
+#: ../smime/gui/smime-ui.ui.h:38
+msgid "Validity"
+msgstr "Tính hợp lệ"
+
+#: ../smime/gui/smime-ui.ui.h:39
+msgid "You have certificates from these organizations that identify you:"
+msgstr "Bạn có chứng nhận từ những tổ chức này có nhận diện bạn:"
+
+#: ../smime/gui/smime-ui.ui.h:40
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
+msgstr "Bạn đã lưu chứng nhận có nhận diện những nhà cầm quy�n chứng nhận này:"
+
+#: ../smime/gui/smime-ui.ui.h:41
+msgid "You have certificates on file that identify these people:"
+msgstr "Bạn đã lưu chứng nhận có nhận diện những ngư�i này:"
+
+#: ../smime/gui/smime-ui.ui.h:42
+msgid "Your Certificates"
+msgstr "Chứng nhận của bạn"
+
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:44
+msgid "_Backup"
+msgstr "Sao _lÆ°u"
+
+#: ../smime/gui/smime-ui.ui.h:45
+msgid "_Edit CA Trust"
+msgstr "_Sửa tính tin cậy CA"
+
+#: ../smime/lib/e-cert-db.c:912
+msgid "Certificate already exists"
+msgstr "Chứng nhận này đã có"
+
+#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#. x509 certificate usage types
+#: ../smime/lib/e-cert.c:417
+msgid "Sign"
+msgstr "Ký nhận"
+
+#: ../smime/lib/e-cert.c:418
+msgid "Encrypt"
+msgstr "Mật mã hoá"
+
+#: ../smime/lib/e-cert.c:530
+msgid "Version"
+msgstr "Phiên bản"
+
+#: ../smime/lib/e-cert.c:545
+msgid "Version 1"
+msgstr "Phiên bản 1"
+
+#: ../smime/lib/e-cert.c:548
+msgid "Version 2"
+msgstr "Phiên bản 2"
+
+#: ../smime/lib/e-cert.c:551
+msgid "Version 3"
+msgstr "Phiên bản 3"
+
+#: ../smime/lib/e-cert.c:634
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr "PCKS #1 MD2 với mã hoá RSA"
+
+#: ../smime/lib/e-cert.c:637
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr "PCKS #1 MD5 với mã hoá RSA"
+
+#: ../smime/lib/e-cert.c:640
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr "PCKS #1 SHA-1 với mã hoá RSA"
+
+#: ../smime/lib/e-cert.c:643
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PCKS #1 SHA-256 với mã hoá RSA"
+
+#: ../smime/lib/e-cert.c:646
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PCKS #1 SHA-384 với mã hoá RSA"
+
+#: ../smime/lib/e-cert.c:649
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PCKS #1 SHA-512 với mã hoá RSA"
+
+#: ../smime/lib/e-cert.c:676
+msgid "PKCS #1 RSA Encryption"
+msgstr "Mật mã RSA PKCS #1"
+
+#: ../smime/lib/e-cert.c:679
+msgid "Certificate Key Usage"
+msgstr "Cách dùng khoá chứng nhận"
+
+#: ../smime/lib/e-cert.c:682
+msgid "Netscape Certificate Type"
+msgstr "Kiểu chứng nhận Netscape"
+
+#: ../smime/lib/e-cert.c:685
+msgid "Certificate Authority Key Identifier"
+msgstr "Bộ nhận diện khoá nhà cầm quy�n chứng nhận"
+
+#: ../smime/lib/e-cert.c:697
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr "Bộ nhận diện đối tượng (%s)"
+
+#: ../smime/lib/e-cert.c:749
+msgid "Algorithm Identifier"
+msgstr "Bộ nhận diện thuật toán"
+
+#: ../smime/lib/e-cert.c:757
+msgid "Algorithm Parameters"
+msgstr "Tham số thuật toán"
+
+#: ../smime/lib/e-cert.c:779
+msgid "Subject Public Key Info"
+msgstr "Thông tin khoá công nhà nhận"
+
+#: ../smime/lib/e-cert.c:784
+msgid "Subject Public Key Algorithm"
+msgstr "Thuật toán khoá công nhà nhận"
+
+#: ../smime/lib/e-cert.c:799
+msgid "Subject's Public Key"
+msgstr "Khoá công nhà nhận"
+
+#: ../smime/lib/e-cert.c:820 ../smime/lib/e-cert.c:870
+msgid "Error: Unable to process extension"
+msgstr "Lỗi: không thể xử lý phần mở rộng"
+
+#: ../smime/lib/e-cert.c:841 ../smime/lib/e-cert.c:853
+msgid "Object Signer"
+msgstr "Bộ ký nhận đối tượng"
+
+#: ../smime/lib/e-cert.c:845
+msgid "SSL Certificate Authority"
+msgstr "Nhà cầm quy�n chứng nhận SSL"
+
+#: ../smime/lib/e-cert.c:849
+msgid "Email Certificate Authority"
+msgstr "Nhà cầm quy�n chứng nhận thư điện tử"
+
+#: ../smime/lib/e-cert.c:878
+msgid "Signing"
+msgstr "Ký nhận"
+
+#: ../smime/lib/e-cert.c:882
+msgid "Non-repudiation"
+msgstr "Không từ chối"
+
+#: ../smime/lib/e-cert.c:886
+msgid "Key Encipherment"
+msgstr "Mật mã hoá khoá"
+
+#: ../smime/lib/e-cert.c:890
+msgid "Data Encipherment"
+msgstr "Mật mã hoá dữ liệu"
+
+#: ../smime/lib/e-cert.c:894
+msgid "Key Agreement"
+msgstr "Chấp thuận khoá"
+
+#: ../smime/lib/e-cert.c:898
+msgid "Certificate Signer"
+msgstr "Ngư�i ký chứng nhận"
+
+#: ../smime/lib/e-cert.c:902
+msgid "CRL Signer"
+msgstr "Ngư�i ký CRL"
+
+#: ../smime/lib/e-cert.c:951
+msgid "Critical"
+msgstr "Nghiêm tr�ng"
+
+#: ../smime/lib/e-cert.c:953 ../smime/lib/e-cert.c:956
+msgid "Not Critical"
+msgstr "Không nghiêm tr�ng"
+
+#: ../smime/lib/e-cert.c:977
+msgid "Extensions"
+msgstr "Phần mở rộng"
+
+# Variable: do not translate/ biến: đừng dịch
+#. Translators: This string is used in Certificate
+#. * details for fields like Issuer or Subject, which
+#. * shows the field name on the left and its respective
+#. * value on the right, both as stored in the
+#. * certificate itself.  You probably do not need to
+#. * 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
+#, c-format
+msgid "%s = %s"
+msgstr "%s = %s"
+
+#: ../smime/lib/e-cert.c:1111 ../smime/lib/e-cert.c:1234
+msgid "Certificate Signature Algorithm"
+msgstr "Thuật toán chữ ký chứng nhận"
+
+#: ../smime/lib/e-cert.c:1120
+msgid "Issuer"
+msgstr "Nhà phát hành"
+
+#: ../smime/lib/e-cert.c:1175
+msgid "Issuer Unique ID"
+msgstr "Thông tin độc nhất nhận biết nhà phát hành"
+
+#: ../smime/lib/e-cert.c:1194
+msgid "Subject Unique ID"
+msgstr "Thông tin độc nhất nhận biết nhà nhận"
+
+#: ../smime/lib/e-cert.c:1240
+msgid "Certificate Signature Value"
+msgstr "Giá trị chữ ký chứng nhận"
+
+#: ../smime/lib/e-pkcs12.c:256
+msgid "PKCS12 File Password"
+msgstr "Mật khẩu tập tin PKCS12"
+
+#: ../smime/lib/e-pkcs12.c:257
+msgid "Enter password for PKCS12 file:"
+msgstr "Gõ mật khẩu cho tập tin PCKS12:"
+
+#: ../smime/lib/e-pkcs12.c:363
+msgid "Imported Certificate"
+msgstr "Chứng nhận đã nhập"
+
+#: ../views/addressbook/galview.xml.h:1
+msgid "By _Company"
+msgstr "Theo _Công ty"
+
+#: ../views/addressbook/galview.xml.h:2
+msgid "_Address Cards"
+msgstr "Thẻ đị_a chỉ"
+
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "Xem _danh sách"
+
+#: ../views/calendar/galview.xml.h:1
+msgid "W_eek View"
+msgstr "X_em tuần"
+
+#: ../views/calendar/galview.xml.h:2
+msgid "_Day View"
+msgstr "Xem n_gày"
+
+#: ../views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr "Xem t_háng"
+
+#: ../views/calendar/galview.xml.h:5
+msgid "_Work Week View"
+msgstr "Xem _tuần làm việc"
+
+#: ../views/mail/galview.xml.h:1
+msgid "As Sent Folder for Wi_de View"
+msgstr "The_o thư mục đã gửi cho ô xem rộng"
+
+#: ../views/mail/galview.xml.h:2
+msgid "As _Sent Folder"
+msgstr "Th_eo thư mục đã gửi"
+
+#: ../views/mail/galview.xml.h:3
+msgid "By S_tatus"
+msgstr "Theo _trạng thái"
+
+#: ../views/mail/galview.xml.h:4
+msgid "By Se_nder"
+msgstr "Theo _ngư�i gửi"
+
+#: ../views/mail/galview.xml.h:5
+msgid "By Su_bject"
+msgstr "Theo _chủ đ�"
+
+#: ../views/mail/galview.xml.h:6
+msgid "By _Follow Up Flag"
+msgstr "Theo c� the_o dõi tiếp"
+
+#: ../views/mail/galview.xml.h:7
+msgid "For _Wide View"
+msgstr "Cho ô xem _rộng"
+
+#: ../views/mail/galview.xml.h:8
+msgid "_Messages"
+msgstr "_ThÆ°"
+
+#: ../views/memos/galview.xml.h:1
+msgid "_Memos"
+msgstr "Ghi _nhá»›"
+
+#: ../views/tasks/galview.xml.h:1
+msgid "With _Due Date"
+msgstr "Với ngày đến _hạn"
+
+#: ../views/tasks/galview.xml.h:2
+msgid "With _Status"
+msgstr "Với t_rạng thái"
+
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../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:789
+msgid "UTC"
+msgstr "Gi� thế giới"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
+msgid "Select a Time Zone"
+msgstr "Ch�n múi gi�"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
+msgid "Time Zones"
+msgstr "Múi gi�"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
+msgid "Timezone drop-down combination box"
+msgstr "Hộp tổ hợp thả xuống múi gi�"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+"Hãy dùng nút chuột trái để phóng to vùng trên bản đồ và ch�n múi gi�.\n"
+"Dùng nút chuột phải để thu nh�."
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "_Ch�n"
+
+#: ../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 "�ịnh nghĩa ô xem cho %s"
+
+#: ../widgets/menus/gal-define-views-dialog.c:367
+#: ../widgets/menus/gal-define-views-dialog.c:369
+msgid "Define Views"
+msgstr "�ịnh nghĩa ô xem"
+
+#: ../widgets/menus/gal-define-views.ui.h:2
+#, no-c-format
+msgid "Define Views for \"%s\""
+msgstr "�ịnh nghĩa ô xem cho « %s »"
+
+#: ../widgets/menus/gal-view-factory-etable.c:111
+msgid "Table"
+msgstr "Bảng"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+msgid "Save Current View"
+msgstr "Lưu ô xem hiện th�i"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "Tạ_o ô xem mới"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "Tha_y thế ô xem hiện có"
+
+#: ../widgets/menus/gal-view-new-dialog.c:108
+msgid "Define New View"
+msgstr "Xác định ô xem mới"
+
+#: ../widgets/menus/gal-view-new-dialog.ui.h:1
+msgid "Name of new view:"
+msgstr "Tên ô xem mới:"
+
+#: ../widgets/menus/gal-view-new-dialog.ui.h:2
+msgid "Type of View"
+msgstr "Kiểu ô xem"
+
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
+msgid "Type of view:"
+msgstr "Kiểu ô xem:"
+
+#: ../widgets/misc/e-account-manager.c:353
+msgid "De_fault"
+msgstr "_Mặc định"
+
+#: ../widgets/misc/e-account-tree-view.c:243
+#| msgid "Account name"
+msgid "Account Name"
+msgstr "Tên tài khoản"
+
+#: ../widgets/misc/e-account-tree-view.c:274
+msgid "Protocol"
+msgstr "Giao thức"
+
+#: ../widgets/misc/e-attachment-dialog.c:308
+msgid "Attachment Properties"
+msgstr "Thuộc tính đính kèm"
+
+#: ../widgets/misc/e-attachment-dialog.c:330
+msgid "_Filename:"
+msgstr "Tên tập t_in:"
+
+#: ../widgets/misc/e-attachment-dialog.c:365
+#| msgid "MIME Type"
+msgid "MIME Type:"
+msgstr "Dạng MIME:"
+
+#: ../widgets/misc/e-attachment-dialog.c:373
+#: ../widgets/misc/e-attachment-store.c:559
+msgid "_Suggest automatic display of attachment"
+msgstr "�� nghị _hiển thị tự động đồ đính kèm"
+
+#: ../widgets/misc/e-attachment-handler-image.c:95
+#| msgid "Set as _Background"
+msgid "Could not set as background"
+msgstr "Không thể đặt làm n�n"
+
+#: ../widgets/misc/e-attachment-handler-image.c:145
+msgid "Set as _Background"
+msgstr "�ặt làm _n�n"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:93
+#| msgid "Could not open the link."
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "Không thể gửi đính kèm"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:135
+msgid "_Send To..."
+msgstr "_Gá»­i cho..."
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:137
+#| msgid "Select folder to save selected attachments..."
+msgid "Send the selected attachments somewhere"
+msgstr "Gửi đính kèm được ch�n đến đâu đó"
+
+#: ../widgets/misc/e-attachment-icon-view.c:162
+#: ../widgets/misc/e-attachment-tree-view.c:547
+msgid "Loading"
+msgstr "Nạp"
+
+#: ../widgets/misc/e-attachment-icon-view.c:174
+#: ../widgets/misc/e-attachment-tree-view.c:559
+msgid "Saving"
+msgstr "LÆ°u"
+
+#: ../widgets/misc/e-attachment-paned.c:97
+msgid "Hide Attachment _Bar"
+msgstr "Ẩn thanh đính _kèm"
+
+#: ../widgets/misc/e-attachment-paned.c:99
+#: ../widgets/misc/e-attachment-paned.c:639
+msgid "Show Attachment _Bar"
+msgstr "Hiện thanh đính _kèm"
+
+#: ../widgets/misc/e-attachment-store.c:547
+msgid "Add Attachment"
+msgstr "Thêm đính kèm"
+
+#: ../widgets/misc/e-attachment-store.c:550
+msgid "A_ttach"
+msgstr "�ính _kèm"
+
+#: ../widgets/misc/e-attachment-store.c:613
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "Lưu đính kèm"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment-store.c:642
+#: ../widgets/misc/e-attachment.c:1810 ../widgets/misc/e-attachment.c:2352
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../widgets/misc/e-attachment-view.c:404
+msgid "Open With Other Application..."
+msgstr "Mở bằng ứng dụng khác..."
+
+#: ../widgets/misc/e-attachment-view.c:411
+msgid "S_ave All"
+msgstr "Lư_u tất cả"
+
+#: ../widgets/misc/e-attachment-view.c:437
+msgid "A_dd Attachment..."
+msgstr "_Thêm đính kèm..."
+
+#: ../widgets/misc/e-attachment-view.c:461
+msgid "_Hide"
+msgstr "Ẩ_n"
+
+#: ../widgets/misc/e-attachment-view.c:468
+msgid "Hid_e All"
+msgstr "Ẩ_n tất cả"
+
+#: ../widgets/misc/e-attachment-view.c:475
+msgid "_View Inline"
+msgstr "_Xem trực tiếp"
+
+#: ../widgets/misc/e-attachment-view.c:482
+#| msgid "_View Inline"
+msgid "Vie_w All Inline"
+msgstr "_Xem trực tiếp tất cả"
+
+#: ../widgets/misc/e-attachment-view.c:803
+#, c-format
+#| msgid "Open in %s..."
+msgid "Open With \"%s\""
+msgstr "Mở bằng \"%s\""
+
+#: ../widgets/misc/e-attachment-view.c:806
+#, c-format
+#| msgid "Save attachment as"
+msgid "Open this attachment in %s"
+msgstr "Mở đồ đính kèm bằng %s"
+
+#. To Translators: This text is set as a description of an attached
+#. * 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:998
+msgid "Attached message"
+msgstr "Thư đính kèm"
+
+#: ../widgets/misc/e-attachment.c:1853 ../widgets/misc/e-attachment.c:2654
+msgid "A load operation is already in progress"
+msgstr "Thao tác nạp đang thực hiện"
+
+#: ../widgets/misc/e-attachment.c:1861 ../widgets/misc/e-attachment.c:2662
+msgid "A save operation is already in progress"
+msgstr "Thao tác lưu đang thực hiện"
+
+#: ../widgets/misc/e-attachment.c:1953
+#, c-format
+#| msgid "Could not load address book"
+msgid "Could not load '%s'"
+msgstr "Không thể nạp '%s'"
+
+#: ../widgets/misc/e-attachment.c:1956
+#, c-format
+#| msgid "Could not open the link."
+msgid "Could not load the attachment"
+msgstr "Không thể nạp đồ đính kèm."
+
+#: ../widgets/misc/e-attachment.c:2232
+#, c-format
+#| msgid "Could not open source"
+msgid "Could not open '%s'"
+msgstr "Không thể mở '%s'"
+
+#: ../widgets/misc/e-attachment.c:2235
+#, c-format
+#| msgid "Could not open the link."
+msgid "Could not open the attachment"
+msgstr "Không thể mở đồ đính kèm"
+
+#: ../widgets/misc/e-attachment.c:2670
+#| msgid "Attachment Reminder"
+msgid "Attachment contents not loaded"
+msgstr "Nhắc nhở đính kèm"
+
+#: ../widgets/misc/e-attachment.c:2746
+#, c-format
+#| msgid "Could not execute '%s': %s\n"
+msgid "Could not save '%s'"
+msgstr "Không thể lưu '%s'"
+
+#: ../widgets/misc/e-attachment.c:2749
+#, c-format
+#| msgid "Select folder to save all attachments"
+msgid "Could not save the attachment"
+msgstr "Không thể lưu đồ đính kèm"
+
+#. 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:387
+msgid "Ctrl-click to open a link"
+msgstr "Nhấn giữ Ctrl để mở liên kết"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../widgets/misc/e-calendar-item.c:1249
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../widgets/misc/e-calendar.c:226
+msgid "Month Calendar"
+msgstr "Lịch tháng"
+
+#: ../widgets/misc/e-charset-combo-box.c:96
+msgid "Character Encoding"
+msgstr "Bảng mã Ký tự"
+
+#: ../widgets/misc/e-charset-combo-box.c:119
+msgid "Enter the character set to use"
+msgstr "Hãy gõ bộ ký tự cần dùng"
+
+#: ../widgets/misc/e-charset-combo-box.c:339
+msgid "Other..."
+msgstr "Khác..."
+
+#: ../widgets/misc/e-contact-map-window.c:355
+#| msgid "Contacts map"
+msgid "Contacts Map"
+msgstr "Bản đồ liên lạc"
+
+#: ../widgets/misc/e-dateedit.c:501
+msgid "Date and Time"
+msgstr "Ngày và Gi�"
+
+#: ../widgets/misc/e-dateedit.c:522
+msgid "Text entry to input date"
+msgstr "Trư�ng nhập ngày"
+
+#: ../widgets/misc/e-dateedit.c:544
+msgid "Click this button to show a calendar"
+msgstr "Nhắp vào cái nút này để hiển thị một lịch"
+
+#: ../widgets/misc/e-dateedit.c:591
+msgid "Drop-down combination box to select time"
+msgstr "Hộp tổ hợp thả xuống để ch�n th�i gian"
+
+#: ../widgets/misc/e-dateedit.c:663
+msgid "No_w"
+msgstr "Bâ_y gi�"
+
+#: ../widgets/misc/e-dateedit.c:669
+msgid "_Today"
+msgstr "Hô_m nay"
+
+#. Note that we don't show this here, since by default a 'None' date
+#. * is not permitted.
+#: ../widgets/misc/e-dateedit.c:677
+msgid "_None"
+msgstr "_Không có"
+
+#. Translators: "None" for date field of a date edit, shown when
+#. * there is no date set.
+#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1921
+msgctxt "date"
+msgid "None"
+msgstr "Không"
+
+#: ../widgets/misc/e-dateedit.c:1815
+msgid "Invalid Date Value"
+msgstr "Giá trị ngày tháng không hợp lệ"
+
+#: ../widgets/misc/e-dateedit.c:1859
+msgid "Invalid Time Value"
+msgstr "Giá trị gi� không hợp lệ"
+
+#: ../widgets/misc/e-import-assistant.c:249
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr ""
+"Hãy ch�n tập tin muốn nhập vào Evolution, và ch�n dạng tập tin từ danh sách."
+
+#: ../widgets/misc/e-import-assistant.c:266
+msgid "F_ilename:"
+msgstr "Tên tập t_in:"
+
+#: ../widgets/misc/e-import-assistant.c:276
+msgid "Select a file"
+msgstr "Ch�n tập tin"
+
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
+msgid "File _type:"
+msgstr "Kiểu _tập tin:"
+
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:913
+msgid "Choose the destination for this import"
+msgstr "Hãy ch�n nhập vào đích nào"
+
+#: ../widgets/misc/e-import-assistant.c:358
+msgid "Choose the type of importer to run:"
+msgstr "Ch�n kiểu bộ nhập cần chạy:"
+
+#: ../widgets/misc/e-import-assistant.c:366
+msgid "Import data and settings from _older programs"
+msgstr "Nhập dữ liệu và thiết lập từ chương trình _cũ"
+
+#: ../widgets/misc/e-import-assistant.c:374
+msgid "Import a _single file"
+msgstr "Nhập _một tập tin riêng lẻ"
+
+#: ../widgets/misc/e-import-assistant.c:526
+#| msgid ""
+#| "Evolution checked for settings to import from the following\n"
+#| "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
+#| "settings found. If you would like to\n"
+#| "try again, please click the \"Back\" button.\n"
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"Trình Evolution đã kiểm tra có thiết lập để nhập từ những ứng dụng theo đây: "
+"Pine, Netscape, Elm, iCalendar. Không tìm thấy thiết lập có thể nhập. Nếu "
+"bạn muốn thử lại, hãy nhắp vào cái nút \"Lùi\"."
+
+#. Install a custom "Cancel Import" button.
+#: ../widgets/misc/e-import-assistant.c:768
+msgid "_Cancel Import"
+msgstr "_Huỷ nhập"
+
+#: ../widgets/misc/e-import-assistant.c:912
+msgid "Preview data to be imported"
+msgstr "Xem thử trước khi nhập"
+
+#: ../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 "Nhập dữ liệu"
+
+#: ../widgets/misc/e-import-assistant.c:926
+msgid "Select what type of file you want to import from the list."
+msgstr "Ch�n loại tập tin bạn muốn nhập từ danh sách."
+
+#: ../widgets/misc/e-import-assistant.c:1266
+#: ../widgets/misc/e-import-assistant.c:1301
+msgid "Evolution Import Assistant"
+msgstr "Trợ tá nhập Evolution"
+
+#: ../widgets/misc/e-import-assistant.c:1283
+#: ../widgets/misc/e-import-assistant.c:1339
+msgid "Import Location"
+msgstr "�ịa điểm nhập"
+
+#: ../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\n"
+#| "importing external files into Evolution."
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"Chào mừng dùng Trợ tá nhập Evolution.\n"
+"Với trợ tá này, bạn sẽ được hướng dẫn thông qua tiến trình nhập các tập tin "
+"bên ngoài vào Evolution."
+
+#: ../widgets/misc/e-import-assistant.c:1311
+msgid "Importer Type"
+msgstr "Kiểu bộ nhập"
+
+#: ../widgets/misc/e-import-assistant.c:1321
+msgid "Select Information to Import"
+msgstr "Ch�n thông tin cần nhập vào"
+
+#: ../widgets/misc/e-import-assistant.c:1330
+msgid "Select a File"
+msgstr "Ch�n tập tin"
+
+#: ../widgets/misc/e-import-assistant.c:1347
+#| msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "Nhấn \"�p dụng\" để bắt đầu nhập tập tin này vào Evolution. "
+
+#: ../widgets/misc/e-map.c:883
+msgid "World Map"
+msgstr "Bản đồ Thế giới"
+
+#: ../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 ""
+"Ô đi�u khiển bản đồ tương tác dựa vào con chuột để ch�n múi gi�. Ngư�i thích "
+"dùng bàn phím thì nên ch�n múi gi� trong hộp tổ hợp thả xuống bên dưới thay "
+"vào đó."
+
+#: ../widgets/misc/e-online-button.c:27
+#| msgid ""
+#| "Evolution is currently online.\n"
+#| "Click on this button to work offline."
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr ""
+"Evolution hiện th�i đang trực tuyến. Nhấn nút này để chuyển sang ngoại tuyến."
+
+#: ../widgets/misc/e-online-button.c:30
+#| msgid ""
+#| "Evolution is currently offline.\n"
+#| "Click on this button to work online."
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr ""
+"Evolution hiện th�i đang ngoại tuyến. Nhấn nút này để trở lại trực tuyến."
+
+#: ../widgets/misc/e-online-button.c:33
+#| msgid ""
+#| "Evolution is currently offline.\n"
+#| "Click on this button to work online."
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr "Evolution hiện th�i đang ngoại tuyến vì mạng không sẵn sàng."
+
+#: ../widgets/misc/e-preferences-window.c:279
+msgid "Evolution Preferences"
+msgstr "Tùy thích Evolution"
+
+#: ../widgets/misc/e-search-bar.c:81
+#, c-format
+msgid "Matches: %d"
+msgstr "Khá»›p: %d"
+
+#: ../widgets/misc/e-search-bar.c:563
+msgid "Close the find bar"
+msgstr "�óng thanh tìm kiếm"
+
+#: ../widgets/misc/e-search-bar.c:571
+msgid "Fin_d:"
+msgstr "Tì_m:"
+
+#: ../widgets/misc/e-search-bar.c:583
+msgid "Clear the search"
+msgstr "Xoá tìm kiếm"
+
+#: ../widgets/misc/e-search-bar.c:607
+msgid "_Previous"
+msgstr "_Lùi"
+
+#: ../widgets/misc/e-search-bar.c:613
+msgid "Find the previous occurrence of the phrase"
+msgstr "Tìm cái trước đó"
+
+#: ../widgets/misc/e-search-bar.c:626
+msgid "_Next"
+msgstr "_Kế"
+
+#: ../widgets/misc/e-search-bar.c:632
+msgid "Find the next occurrence of the phrase"
+msgstr "Tìm cái kế tiếp"
+
+#: ../widgets/misc/e-search-bar.c:645
+msgid "Mat_ch case"
+msgstr "_Phân biệt hoa/thư�ng"
+
+#: ../widgets/misc/e-search-bar.c:673
+msgid "Reached bottom of page, continued from top"
+msgstr "�ã đến trang cuối, quay lại trang đầu"
+
+#: ../widgets/misc/e-search-bar.c:695
+msgid "Reached top of page, continued from bottom"
+msgstr "�ã đến trang đầu, quay lại trang cuối"
+
+#: ../widgets/misc/e-send-options.c:552
+msgid "When de_leted:"
+msgstr "Khi đã _xoá:"
+
+#: ../widgets/misc/e-send-options.ui.h:1
+msgid "A_uto-delete sent item"
+msgstr "Tự động _xoá mục đã gửi"
+
+#: ../widgets/misc/e-send-options.ui.h:3
+msgid "Creat_e a sent item to track information"
+msgstr "Tạo mục đã gửi để th_eo dõi thông tin"
+
+#: ../widgets/misc/e-send-options.ui.h:4
+msgid "Deli_vered and opened"
+msgstr "�ã phát _và mở"
+
+#: ../widgets/misc/e-send-options.ui.h:5
+msgid "Delivery Options"
+msgstr "Tùy ch�n gửi"
+
+#: ../widgets/misc/e-send-options.ui.h:6
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "�ến _khi"
+
+#: ../widgets/misc/e-send-options.ui.h:7
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_Sau"
+
+#: ../widgets/misc/e-send-options.ui.h:8
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "ngày"
+
+#: ../widgets/misc/e-send-options.ui.h:9
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "Tr_ong vòng"
+
+#: ../widgets/misc/e-send-options.ui.h:10
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "ngày"
+
+#: ../widgets/misc/e-send-options.ui.h:11
+msgid "For Your Eyes Only"
+msgstr "Chỉ cho mắt của bạn"
+
+#: ../widgets/misc/e-send-options.ui.h:12
+msgid "Gene_ral Options"
+msgstr "Tùy ch�n ch_ung"
+
+#: ../widgets/misc/e-send-options.ui.h:15
+msgid "Mail Receipt"
+msgstr "Biên nhận thư"
+
+#: ../widgets/misc/e-send-options.ui.h:17
+msgid "Proprietary"
+msgstr "�ộc quy�n"
+
+#: ../widgets/misc/e-send-options.ui.h:18
+msgid "R_eply requested"
+msgstr "Yêu cầu t_rả l�i"
+
+#: ../widgets/misc/e-send-options.ui.h:20
+msgid "Return Notification"
+msgstr "Thông báo trả v�"
+
+#: ../widgets/misc/e-send-options.ui.h:21
+msgid "Secret"
+msgstr "Mật"
+
+#: ../widgets/misc/e-send-options.ui.h:23
+msgid "Sta_tus Tracking"
+msgstr "Theo dõi _trạng thái"
+
+#: ../widgets/misc/e-send-options.ui.h:24
+msgid "Standard"
+msgstr "Chuẩn"
+
+#: ../widgets/misc/e-send-options.ui.h:25
+#| msgid "Sta_tus Tracking"
+msgid "Status Tracking"
+msgstr "Theo dõi trạng thái"
+
+#: ../widgets/misc/e-send-options.ui.h:26
+msgid "Top Secret"
+msgstr "Tối mật"
+
+#: ../widgets/misc/e-send-options.ui.h:28
+msgid "When acce_pted:"
+msgstr "Khi đã chấ_p nhận"
+
+#: ../widgets/misc/e-send-options.ui.h:29
+msgid "When co_mpleted:"
+msgstr "Khi _hoàn tất:"
+
+#: ../widgets/misc/e-send-options.ui.h:30
+msgid "When decli_ned:"
+msgstr "Khi _bị từ chối:"
+
+#: ../widgets/misc/e-send-options.ui.h:31
+msgid "_All information"
+msgstr "_M�i thông tin"
+
+#: ../widgets/misc/e-send-options.ui.h:32
+msgid "_Classification:"
+msgstr "_Phân loại:"
+
+#: ../widgets/misc/e-send-options.ui.h:33
+msgid "_Delay message delivery"
+msgstr "Phát t_rễ thư"
+
+#: ../widgets/misc/e-send-options.ui.h:34
+msgid "_Delivered"
+msgstr "�ã _gửi"
+
+#: ../widgets/misc/e-send-options.ui.h:36
+msgid "_Set expiration date"
+msgstr "_Lập ngày hết hạn"
+
+#: ../widgets/misc/e-send-options.ui.h:37
+msgid "_When convenient"
+msgstr "Khi _tiện"
+
+#: ../widgets/misc/e-send-options.ui.h:38
+msgid "_When opened:"
+msgstr "Khi đã _mở:"
+
+#. Translators: Used in send options dialog
+#: ../widgets/misc/e-send-options.ui.h:40
+msgctxt "send-options"
+msgid "None"
+msgstr "Không"
+
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:564
+#: ../widgets/misc/e-signature-manager.c:372
+#: ../widgets/misc/e-signature-script-dialog.c:219
+msgid "Unnamed"
+msgstr "Không tên"
+
+#: ../widgets/misc/e-signature-editor.c:214
+msgid "_Save and Close"
+msgstr "_Lưu và �óng"
+
+#: ../widgets/misc/e-signature-editor.c:431
+msgid "Edit Signature"
+msgstr "Sửa chữ ký"
+
+#: ../widgets/misc/e-signature-editor.c:446
+msgid "_Signature Name:"
+msgstr "Tên chữ _ký:"
+
+#: ../widgets/misc/e-signature-manager.c:317
+msgid "Add Signature Script"
+msgstr "Thêm script chữ ký"
+
+#: ../widgets/misc/e-signature-manager.c:382
+msgid "Edit Signature Script"
+msgstr "Sửa script chữ ký"
+
+#: ../widgets/misc/e-signature-manager.c:602
+msgid "Add _Script"
+msgstr "Thêm _Script"
+
+#: ../widgets/misc/e-signature-script-dialog.c:268
+#| msgid ""
+#| "The output of this script will be used as your\n"
+#| "signature. The name you specify will be used\n"
+#| "for display purposes only. "
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"�ầu ra của tập lệnh này sẽ được dùng\n"
+"như là chữ ký bạn.\n"
+"Tên bạn xác định sẽ chỉ được dùng\n"
+"chỉ cho mục đích hiển thị."
+
+#: ../widgets/misc/e-signature-script-dialog.c:313
+msgid "S_cript:"
+msgstr "S_cript:"
+
+#: ../widgets/misc/e-signature-script-dialog.c:344
+#| msgid "The script file must exist and be executable."
+msgid "Script file must be executable."
+msgstr "Tập tin văn lệnh phải chạy được."
+
+#: ../widgets/misc/e-url-entry.c:78
+msgid "Click here to go to URL"
+msgstr "Nhấn đây để đi tới địa chỉ mạng"
+
+#: ../widgets/misc/e-web-view.c:410
+msgid "_Copy Link Location"
+msgstr "_Chép địa chỉ liên kết"
+
+#: ../widgets/misc/e-web-view.c:412
+msgid "Copy the link to the clipboard"
+msgstr "Sao chép liên kết sang bảng nháp"
+
+#: ../widgets/misc/e-web-view.c:420
+msgid "_Open Link in Browser"
+msgstr "_Mở liên kết bằng trình duyệt"
+
+#: ../widgets/misc/e-web-view.c:422
+msgid "Open the link in a web browser"
+msgstr "Mở liên kết bằng trình duyệt"
+
+#: ../widgets/misc/e-web-view.c:430
+msgid "_Copy Email Address"
+msgstr "Chép địa chỉ _thư"
+
+#: ../widgets/misc/e-web-view.c:447
+#| msgid "_No image"
+msgid "_Copy Image"
+msgstr "_Chép ảnh"
+
+#: ../widgets/misc/e-web-view.c:449
+#| msgid "Copy the link to the clipboard"
+msgid "Copy the image to the clipboard"
+msgstr "Chép ảnh sang bảng nháp"
+
+#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
+msgid "Select all text and images"
+msgstr "Ch�n toàn bộ hình và chữ"
+
+#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
+#: ../widgets/misc/e-web-view.c:986
+#, c-format
+msgid "Click to call %s"
+msgstr "Nhấn để g�i %s"
+
+#: ../widgets/misc/e-web-view.c:988
+msgid "Click to hide/unhide addresses"
+msgstr "Nhấn để (b�) ẩn địa chỉ"
+
+#: ../widgets/misc/e-web-view.c:990
+#, c-format
+msgid "Click to open %s"
+msgstr "Nhấn để mở %s"
+
+#: ../widgets/misc/ea-calendar-item.c:306
+#: ../widgets/misc/ea-calendar-item.c:315
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../widgets/misc/ea-calendar-item.c:318
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Lịch: từ %s đến %s"
+
+#: ../widgets/misc/ea-calendar-item.c:354
+msgid "evolution calendar item"
+msgstr "mục lịch evolution"
+
+#: ../widgets/table/e-cell-combo.c:187
+msgid "popup list"
+msgstr "danh sách tự mở"
+
+#: ../widgets/table/e-cell-date-edit.c:299
+msgid "Now"
+msgstr "Bây gi�"
+
+#. Translators: "None" as a label of a button to unset date in a date table cell
+#: ../widgets/table/e-cell-date-edit.c:316
+msgctxt "table-date"
+msgid "None"
+msgstr "Không"
+
+#: ../widgets/table/e-cell-date-edit.c:324
+msgid "OK"
+msgstr "OK"
+
+#: ../widgets/table/e-cell-date-edit.c:868
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "Th�i gian phải có định dạng: %s"
+
+#: ../widgets/table/e-cell-percent.c:80
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "Giá trị phần trăm phải nằm giữa 0 và 100, kể cả hai số đó"
+
+#: ../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:143
+msgid "click to add"
+msgstr "nhấn để thêm"
+
+#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
+msgid "(Ascending)"
+msgstr "(Tăng dần)"
+
+#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
+msgid "(Descending)"
+msgstr "(Giảm dần)"
+
+#: ../widgets/table/e-table-config.c:400
+msgid "Not sorted"
+msgstr "Chưa sắp xếp"
+
+#: ../widgets/table/e-table-config.c:441
+msgid "No grouping"
+msgstr "Chưa nhóm lại"
+
+#: ../widgets/table/e-table-config.c:666
+#: ../widgets/table/e-table-config.ui.h:11
+msgid "Show Fields"
+msgstr "Hiện trư�ng"
+
+#: ../widgets/table/e-table-config.c:686
+msgid "Available Fields"
+msgstr "Trư�ng có sẵn"
+
+#: ../widgets/table/e-table-config.ui.h:1
+msgid "A_vailable Fields:"
+msgstr "Trư�ng có _sẵn:"
+
+#: ../widgets/table/e-table-config.ui.h:2
+#: ../widgets/table/e-table-header-item.c:1717
+msgid "Ascending"
+msgstr "Tăng dần"
+
+#: ../widgets/table/e-table-config.ui.h:3
+msgid "Clear All"
+msgstr "Xoá tất cả"
+
+#: ../widgets/table/e-table-config.ui.h:4
+msgid "Clear _All"
+msgstr "_Xoá tất cả"
+
+#: ../widgets/table/e-table-config.ui.h:5
+#: ../widgets/table/e-table-header-item.c:1717
+msgid "Descending"
+msgstr "Giảm dần"
+
+#: ../widgets/table/e-table-config.ui.h:8
+msgid "Group Items By"
+msgstr "Nhóm lại mục theo"
+
+#: ../widgets/table/e-table-config.ui.h:9
+msgid "Move _Down"
+msgstr "Chuyển _xuống"
+
+#: ../widgets/table/e-table-config.ui.h:10
+msgid "Move _Up"
+msgstr "Chuyển _lên"
+
+#: ../widgets/table/e-table-config.ui.h:12
+msgid "Show _field in View"
+msgstr "Hiện t_rư�ng trong ô xem"
+
+#: ../widgets/table/e-table-config.ui.h:13
+msgid "Show field i_n View"
+msgstr "Hiệ_n trư�ng trong ô xem"
+
+#: ../widgets/table/e-table-config.ui.h:14
+msgid "Show field in _View"
+msgstr "Hiện trư�ng trong ô _xem"
+
+#: ../widgets/table/e-table-config.ui.h:15
+msgid "Sort"
+msgstr "Sắp xếp"
+
+#: ../widgets/table/e-table-config.ui.h:16
+msgid "Sort Items By"
+msgstr "Sắp xếp mục theo"
+
+#: ../widgets/table/e-table-config.ui.h:17
+msgid "Then By"
+msgstr "Rồi theo"
+
+#: ../widgets/table/e-table-config.ui.h:19
+msgid "_Fields Shown..."
+msgstr "T_rư�ng đã hiện..."
+
+#: ../widgets/table/e-table-config.ui.h:20
+msgid "_Group By..."
+msgstr "_Nhóm lại theo..."
+
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "_Gỡ b�"
+
+#: ../widgets/table/e-table-config.ui.h:22
+msgid "_Show field in View"
+msgstr "_Hiện trư�ng trong ô xem"
+
+#: ../widgets/table/e-table-config.ui.h:23
+msgid "_Show these fields in order:"
+msgstr "_Hiển thị những trư�ng này theo thứ tự:"
+
+#: ../widgets/table/e-table-config.ui.h:24
+msgid "_Sort..."
+msgstr "_Sắp xếp..."
+
+#: ../widgets/table/e-table-field-chooser-dialog.c:119
+msgid "Add a Column"
+msgstr "Thêm cột"
+
+#: ../widgets/table/e-table-field-chooser.c:153
+msgid ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
+msgstr ""
+"�ể thêm một cột vào bảng,\n"
+"hãy kéo nó vào vị trí đã định."
+
+#. 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)"
+#.
+#: ../widgets/table/e-table-group-container.c:361
+#, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+msgstr[0] "%s: %s (%d mục)"
+
+#. 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)"
+#.
+#: ../widgets/table/e-table-group-container.c:373
+#, c-format
+msgid "%s (%d item)"
+msgid_plural "%s (%d items)"
+msgstr[0] "%s (%d mục)"
+
+#: ../widgets/table/e-table-header-item.c:1557
+msgid "Customize Current View"
+msgstr "Tùy chỉnh ô xem hiện th�i"
+
+#: ../widgets/table/e-table-header-item.c:1579
+msgid "Sort _Ascending"
+msgstr "Sắp xếp _tăng dần"
+
+#: ../widgets/table/e-table-header-item.c:1582
+msgid "Sort _Descending"
+msgstr "Sắp xếp _giảm dần"
+
+#: ../widgets/table/e-table-header-item.c:1585
+msgid "_Unsort"
+msgstr "_Hủy sắp xếp"
+
+#: ../widgets/table/e-table-header-item.c:1588
+msgid "Group By This _Field"
+msgstr "Nhóm lại theo t_rư�ng này"
+
+#: ../widgets/table/e-table-header-item.c:1591
+msgid "Group By _Box"
+msgstr "Nhóm lại theo _hộp"
+
+#: ../widgets/table/e-table-header-item.c:1595
+msgid "Remove This _Column"
+msgstr "B� _cột này"
+
+#: ../widgets/table/e-table-header-item.c:1598
+msgid "Add a C_olumn..."
+msgstr "Thê_m cột..."
+
+#: ../widgets/table/e-table-header-item.c:1602
+msgid "A_lignment"
+msgstr "Chỉnh c_anh"
+
+#: ../widgets/table/e-table-header-item.c:1605
+msgid "B_est Fit"
+msgstr "_Vừa nhất"
+
+#: ../widgets/table/e-table-header-item.c:1608
+msgid "Format Column_s..."
+msgstr "�ịnh _dạng cột..."
+
+#: ../widgets/table/e-table-header-item.c:1612
+msgid "Custo_mize Current View..."
+msgstr "Tùy chỉnh ô xe_m hiện th�i..."
+
+#: ../widgets/table/e-table-header-item.c:1674
+msgid "_Sort By"
+msgstr "_Sắp xếp theo"
+
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1692
+msgid "_Custom"
+msgstr "Tự _ch�n"
+
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:125
+msgid "popup a child"
+msgstr "bật lên một đi�u con"
+
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:178
+msgid "toggle the cell"
+msgstr "bật/tắt ô này"
+
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:214
+msgid "expands the row in the ETree containing this cell"
+msgstr "dãn ra hàng trong ETree chứa ô này"
+
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:221
+msgid "collapses the row in the ETree containing this cell"
+msgstr "co lại hàng trong ETree chứa ô này"
+
+#: ../widgets/table/gal-a11y-e-cell.c:123
+msgid "Table Cell"
+msgstr "Ô bảng"
+
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
+msgid "click"
+msgstr "nhấn"
+
+#: ../widgets/table/gal-a11y-e-table-column-header.c:158
+msgid "sort"
+msgstr "sắp"
+
+#: ../widgets/text/e-text.c:2327
+msgid "Select All"
+msgstr "Ch�n tất cả"
+
+#: ../widgets/text/e-text.c:2339
+msgid "Input Methods"
+msgstr "Cách nhập"
+
+#~ msgid "(map)"
+#~ msgstr "(bản đồ)"
+
+#~ msgid "map"
+#~ msgstr "bản đồ"
+
+#~ msgid "Accessing LDAP Server anonymously"
+#~ msgstr "Truy cập vô danh tới máy chủ LDAP"
+
+#~ msgid "Enter password for %s (user %s)"
+#~ msgstr "Hãy gõ mật khẩu cho %s (ngư�i dùng %s)"
+
+#~| msgid "Invalid contact."
+#~ msgid "Invalid object"
+#~ msgstr "�ối tượng không hợp"
+
+#~ msgid "Edit Alarm"
+#~ msgstr "Sửa Báo động"
+
+#~ msgid "Add Alarm"
+#~ msgstr "Thêm Báo động"
+
+#~| msgid "Alarms"
+#~ msgid "Alarm"
+#~ msgstr "Báo động"
+
+#~ msgid "Alarms"
+#~ msgstr "Báo động"
+
+#~ msgid "Click here to close the current window"
+#~ msgstr "Nhấn đây để đóng cửa sổ hiện th�i"
+
+#~ msgid "Click here to view help available"
+#~ msgstr "Nhấn đây để xem trợ giúp có sẵn"
+
+#~ msgid "Click here to save the current window"
+#~ msgstr "Nhấn đây để lưu cửa sổ hiện th�i"
+
+#~ msgid "Click here to attach a file"
+#~ msgstr "Nhấn đây để đính kèm tập tin"
+
+#~ msgid "_Alarms"
+#~ msgstr "_Báo động"
+
+#~ msgid "The organizer selected no longer has an account."
+#~ msgstr "Bộ tổ chức đã ch�n không còn có tài khoản lại."
+
+#~| msgid "None"
+#~ msgctxt "cal-alarms"
+#~ msgid "None"
+#~ msgstr "Không"
+
+#~ msgid "Custom Alarm:"
+#~ msgstr "Báo động tự ch�n:"
+
+#~ msgid "_Alarm"
+#~ msgstr "_Báo động"
+
+#~ msgid "_Group:"
+#~ msgstr "_Nhóm:"
+
+#~ msgid "It has alarms."
+#~ msgstr "Nó có báo động."
+
+#~| msgid "It has alarms."
+#~ msgctxt "iCalImp"
+#~ msgid "has alarms"
+#~ msgstr "có báo động"
+
+#~ msgid "Run Anjal in a window"
+#~ msgstr "Chạy Anjal trong cửa sổ"
+
+#~| msgid "Mark as _default memo list"
+#~ msgid "Make Anjal the default email client"
+#~ msgstr "Ch�n Anjal là trình đ�c thư mặc định"
+
+#~| msgid "Default Mail Client "
+#~ msgid "Anjal email client"
+#~ msgstr "Trình đ�c thư Anjal"
+
+#~| msgid "Opening folder %s"
+#~ msgid "Opening folder '%s'"
+#~ msgstr "�ang mở thư mục '%s'"
+
+#~ msgid "Account Management"
+#~ msgstr "Quản lý Tài khoản"
+
+#~| msgid "Please select an image for this contact"
+#~ msgid "Please select a folder from the current account."
+#~ msgstr "Hãy ch�n thư mục từ tài khoản hiện tại."
+
+#~ msgid "Scanning folders in \"%s\""
+#~ msgstr "�ang quét các thư mục trong « %s »..."
+
+#~| msgid "Creating folder `%s'"
+#~ msgid "Creating folder '%s'"
+#~ msgstr "�ang tạo thư mục '%s'"
+
+#~ msgid "_Default junk plugin:"
+#~ msgstr "Phần bổ sung thư rác _mặc định:"
+
+#~ msgid "_Use Secure Connection:"
+#~ msgstr "Dùng kết nối _bảo mật:"
+
+#~| msgid "Scanning folders in \"%s\""
+#~ msgid "Scanning folders in '%s'"
+#~ msgstr "�ang quét các thư mục trong '%s'"
+
+#~| msgid "Retrieving quota information for folder %s"
+#~ msgid "Retrieving quota information for folder '%s'"
+#~ msgstr "�ang lấy thông hạn ngạch của thư mục '%s'"
+
+#~| msgid "Opening store %s"
+#~ msgid "Opening store '%s'"
+#~ msgstr "�ang mở kho '%s'"
+
+#~ msgid "Local Folders"
+#~ msgstr "Thư mục cục bộ"
+
+#~| msgid ""
+#~| "Error saving messages to: %s:\n"
+#~| " %s"
+#~ msgid "Error saving messages to: %s:\n"
+#~ msgstr "Gặp lỗi khi lưu thư vào: %s:\n"
+
+#~ msgid "Checking Service"
+#~ msgstr "�ang kiểm tra dịch vụ..."
+
+#~ msgid "Updating Search Folders for '%s'"
+#~ msgstr "�ang cập nhật các thư mục tìm kiếm cho « %s »"
+
+#~ msgid "Delete messages in Search Folder \"{0}\"?"
+#~ msgstr "Xoá các thư kh�i thư mục tìm kiếm « {0} » không?"
+
+#~| msgid "Create a new folder for storing mail"
+#~ msgid "Migrate local mbox folders to maildir"
+#~ msgstr "Chuyển thư mục cục bộ dạng mbox sang dạng maildir"
+
+#~ msgid "Alarm programs"
+#~ msgstr "Chương trình báo động"
+
+#~| msgid "Save as vCard..."
+#~ msgid "Save as iCalendar..."
+#~ msgstr "Lưu dạng iCalendar..."
+
+#~| msgid "None"
+#~ msgctxt "mail-junk-hook"
+#~ msgid "None"
+#~ msgstr "Không"
+
+#~ msgid "Header Value Contains:"
+#~ msgstr "Giá trị dòng đầu chứa:"
+
+#~ msgid "%s plugin is available and the binary is installed."
+#~ msgstr "Phần bổ sung %s sẵn sàng và tập tin nhị phân đã được cài đặt."
+
+#~ msgid ""
+#~ "%s plugin is not available. Please check whether the package is installed."
+#~ msgstr ""
+#~ "Phần bổ sung %s không sẵn sàng. Hãy kiểm tra gói đó đã được cài đặt chưa."
+
+#, fuzzy
+#~| msgid "No Junk plugin available"
+#~ msgid "No junk plugin available"
+#~ msgstr "Không có phần bổ sung Thư rác"
+
+#~ msgid "Bogofilter is not available. Please install it first."
+#~ msgstr "Bogofilter không có. Vui lòng cài Bogofilter đã."
+
+#~ msgid "Error occurred while spawning %s: %s."
+#~ msgstr "Gặp lỗi trong khi tạo %s: %s"
+
+#~ msgid "Bogofilter child process does not respond, killing..."
+#~ msgstr "Tiến trình con l�c Bogofilter không đáp ứng nên buộc kết thúc..."
+
+#~ msgid "Wait for Bogofilter child process interrupted, terminating..."
+#~ msgstr ""
+#~ "Khoảng đợi tiến trình con l�c Bogofilter bị gián đoạn nên chấm dứt..."
+
+#~ msgid "Pipe to Bogofilter failed, error code: %d."
+#~ msgstr "Lỗi gửi dữ liệu qua ống dẫn cho l�c Bogofilter, mã lỗi: %d"
+
+#, fuzzy
+#~| msgid "Bogofilter junk plugin"
+#~ msgid "Bogofilter Junk Filter"
+#~ msgstr "Phần mở rộng thư rác Bogofilter"
+
+#, fuzzy
+#~| msgid "Filters junk messages using Bogofilter."
+#~ msgid "Filter junk messages using Bogofilter."
+#~ msgstr "L�c ra thư rác bằng Bogofilter."
+
+#~ msgid "Use _SSL"
+#~ msgstr "Dùng _SSL"
+
+#~ msgid "_Secure connection"
+#~ msgstr "Kết nối _bảo mật"
+
+#, fuzzy
+#~| msgid "Send a message to the selected contacts"
+#~ msgid "Show a map of all the contacts"
+#~ msgstr "Gửi thư cho các liên lạc đã ch�n"
+
+#~| msgid "No contacts"
+#~ msgid "Map for contacts"
+#~ msgstr "Bản đồ liên lạc"
+
+#, fuzzy
+#~| msgid "Select folder to import into"
+#~ msgid "Select folder to import OE folder into"
+#~ msgstr "Ch�n thư mục để nhập vào"
+
+#, fuzzy
+#~| msgid "Select a (48*48) png of size < 700bytes"
+#~ msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
+#~ msgstr "Ch�n một ảnh (48×48) PNG kích cỡ < 700 byte"
+
+#~ msgid "Checklist"
+#~ msgstr "Danh sách kiểm"
+
+#~ msgid "New _Shared Folder..."
+#~ msgstr "Thư mục _chung mới..."
+
+#~ msgid "_Proxy Login..."
+#~ msgstr "�ăng nhậ_p ủy nhiệm..."
+
+#~ msgid "Junk Mail Settings..."
+#~ msgstr "Thiết lập Thư rác.."
+
+#~ msgid "Track Message Status..."
+#~ msgstr "Theo dõi trạng thái thư..."
+
+#~ msgid "Retract Mail"
+#~ msgstr "Hủy b� thư"
+
+#~ msgid "Accept"
+#~ msgstr "Chấp nhận"
+
+#~ msgid "Accept Tentatively"
+#~ msgstr "Chấp nhận tạm"
+
+#~ msgid "Decline"
+#~ msgstr "Từ chối"
+
+#, fuzzy
+#~| msgid "_Delegate Meeting..."
+#~ msgid "Rese_nd Meeting..."
+#~ msgstr "Ủ_y nhiệm cuộc h�p..."
+
+#~ msgid "Create folder"
+#~ msgstr "Tạo thư mục"
+
+#, fuzzy
+#~| msgid ""
+#~| "The user '%s' has shared a folder with you\n"
+#~| "\n"
+#~| "Message from '%s'\n"
+#~| "\n"
+#~| "\n"
+#~| "%s\n"
+#~| "\n"
+#~| "\n"
+#~| "Click 'Forward' to install the shared folder\n"
+#~| "\n"
+#~ msgid ""
+#~ "The user '%s' has shared a folder with you\n"
+#~ "\n"
+#~ "Message from '%s'\n"
+#~ "\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "\n"
+#~ "Click 'Apply' to install the shared folder\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Ngư�i dùng '%s' đã chia sẻ một thư mục cho bạn\n"
+#~ "\n"
+#~ "Thông báo từ '%s'\n"
+#~ "\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "\n"
+#~ "Nhấn 'Tới' để cài đặt thư mục chia sẻ này\n"
+#~ "\n"
+
+#~ msgid "Install the shared folder"
+#~ msgstr "Cài đặt thư mục chia sẻ"
+
+#~ msgid "Shared Folder Installation"
+#~ msgstr "Cài đặt thư mục chia sẻ"
+
+#~ msgid "Junk Settings"
+#~ msgstr "Thiết lập Thư rác"
+
+#~ msgid "Junk Mail Settings"
+#~ msgstr "Thiết lập Thư rác"
+
+#~ msgid "Email:"
+#~ msgstr "Thư điện tử:"
+
+#, fuzzy
+#~| msgid "_Junk List"
+#~ msgid "Junk List:"
+#~ msgstr "Danh sách _Thư rác"
+
+#~ msgid "_Enable"
+#~ msgstr "_Bật"
+
+#~ msgid "_Junk List"
+#~ msgstr "Danh sách _Thư rác"
+
+#~ msgid "Message Retract"
+#~ msgstr "Rút lui thư"
+
+#, fuzzy
+#~| msgid ""
+#~| "Retracting a message may remove it from the recipient's mailbox. Are you "
+#~| "sure you want to do this ?"
+#~ msgid ""
+#~ "Retracting a message may remove it from the recipient's mailbox. Are you "
+#~ "sure you want to do this?"
+#~ msgstr ""
+#~ "Rút lui một thư thì cũng có thể gỡ b� nó kh�i hộp thư của ngư�i nhận. Bạn "
+#~ "có chắc làm như thế không?"
+
+#~ msgid "Message retracted successfully"
+#~ msgstr "Thư đã được hủy b�"
+
+#~ msgid "Insert Send options"
+#~ msgstr "Chèn tùy ch�n gửi"
+
+#~ msgid "The participants will receive the following notification.\n"
+#~ msgstr "M�i ngư�i dự sẽ nhận thông báo theo đây.\n"
+
+#~ msgid "Add Send Options to GroupWise messages"
+#~ msgstr "Thêm Tùy ch�n Gửi vào thư GroupWise"
+
+#, fuzzy
+#~| msgid "A plugin for the features in GroupWise accounts."
+#~ msgid "Fine-tune your GroupWise accounts."
+#~ msgstr "Phần bổ sung cho những tính năng trong tài khoản GroupWise."
+
+#~ msgid "GroupWise Features"
+#~ msgstr "Tính năng GroupWise"
+
+#~ msgid "Message retract failed"
+#~ msgstr "Lỗi hủy b� thư"
+
+#~ msgid "The server did not allow the selected message to be retracted."
+#~ msgstr "Máy chủ không cho phép bạn hủy b� thư đó."
+
+#~ msgid ""
+#~ "Account &quot;{0}&quot; already exists. Please check your folder tree."
+#~ msgstr "Tài khoản « {0} » đã có. Hãy kiểm tra lại cây thư mục."
+
+#~ msgid "Account Already Exists"
+#~ msgstr "Tài khoản đã có"
+
+#~ msgid "Invalid user"
+#~ msgstr "Ngư�i dùng không hợp lệ"
+
+#~ msgid ""
+#~ "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+#~ "address and try again."
+#~ msgstr ""
+#~ "Lỗi đăng nhập qua máy chủ ủy nhiệm dưới « {0} ». Hãy kiểm tra lại địa chỉ "
+#~ "thư điện tử và thử lại."
+
+#~ msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+#~ msgstr ""
+#~ "Không thể cấp cho ngư�i dùng « {0} » quy�n truy cập qua máy chủ ủy nhiệm."
+
+#~ msgid "Specify User"
+#~ msgstr "Ghi rõ ngư�i dùng"
+
+#~ msgid "You have already given proxy permissions to this user."
+#~ msgstr "Bạn đã cấp cho ngư�i dùng này quy�n ủy nhiệm."
+
+#~ msgid "You have to specify a valid user name to give proxy rights."
+#~ msgstr ""
+#~ "Bạn cần phải ghi rõ một tên ngư�i dùng hợp lệ, để cấp quy�n ủy nhiệm."
+
+#~ msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+#~ msgstr "Bạn không thể chia sẻ thư mục này với ngư�i dùng đã ghi rõ « {0} »"
+
+#~ msgid "You have to specify a user name which you want to add to the list"
+#~ msgstr "Bạn cần phải ghi rõ tên ngư�i dùng cần thêm vào danh sách"
+
+#, fuzzy
+#~| msgid "Are you sure you want to delete this meeting?"
+#~ msgid "Do you want to resend the meeting?"
+#~ msgstr "Bạn có chắc muốn xoá cuộc h�p này không?"
+
+#, fuzzy
+#~| msgid "Are you sure you want to delete this meeting?"
+#~ msgid "Do you want to resend the recurring meeting?"
+#~ msgstr "Bạn có chắc muốn xoá cuộc h�p này không?"
+
+#, fuzzy
+#~| msgid "Do you want to recover unfinished messages?"
+#~ msgid "Do you want to retract the original item?"
+#~ msgstr "Bạn có muốn phục hồi các thư chưa hoàn tất không?"
+
+#, fuzzy
+#~| msgid "_Delete this item from all other recipient's mailboxes?"
+#~ msgid "The original will be removed from the recipient's mailbox."
+#~ msgstr "_Xoá mục này ra hộp thư của m�i ngư�i nhận khác không?"
+
+#~ msgid "This is a recurring meeting"
+#~ msgstr "�ây là cuộc h�p lặp"
+
+#~ msgid "Would you like to accept it?"
+#~ msgstr "Muốn chấp nhận ?"
+
+#~ msgid "Would you like to decline it?"
+#~ msgstr "Muốn từ chối ?"
+
+#~ msgid "C_ustomize notification message"
+#~ msgstr "Tuỳ _chỉnh thông điệp thông báo"
+
+#~ msgid "Con_tacts..."
+#~ msgstr "L_iên lạc..."
+
+#, fuzzy
+#~| msgid "Users"
+#~ msgid "Users:"
+#~ msgstr "Ngư�i dùng"
+
+#~ msgid "_Not Shared"
+#~ msgstr "Khô_ng chia sẻ"
+
+#~ msgid "_Shared With..."
+#~ msgstr "Chia sẻ _với..."
+
+#~ msgid "Access Rights"
+#~ msgstr "Quy�n truy cập"
+
+#~ msgid "Add/Edit"
+#~ msgstr "Thêm/Sửa"
+
+#~ msgid "Con_tacts"
+#~ msgstr "_Liên lạc"
+
+#~ msgid "Modify _folders/options/rules/"
+#~ msgstr "Sửa đổi _thư mục/tùy ch�n/quy tắc/"
+
+#~ msgid "Read items marked _private"
+#~ msgstr "��c mục có dấu _Riêng"
+
+#~ msgid "Subscribe to my _alarms"
+#~ msgstr "�ăng ký với _báo động tôi"
+
+#~ msgid "Subscribe to my _notifications"
+#~ msgstr "�ăng ký với thô_ng báo tôi"
+
+#~ msgid "_Write"
+#~ msgstr "_Ghi"
+
+#~ msgid "permission to read|_Read"
+#~ msgstr "��_c"
+
+#~ msgid "Proxy"
+#~ msgstr "Ủy nhiệm"
+
+#~ msgid "Proxy Login"
+#~ msgstr "�ăng nhập ủy nhiệm"
+
+#~ msgid "%sEnter password for %s (user %s)"
+#~ msgstr "%sGõ mật khẩu cho %s (ngư�i dùng %s)"
+
+#~ msgid "The Proxy tab will be available only when the account is online."
+#~ msgstr "Có thể sử dụng Thanh Ủy nhiệm chỉ khi tài khoản trực tuyến."
+
+#~ msgid "The Proxy tab will be available only when the account is enabled."
+#~ msgstr "Có thể sử dụng Thanh Ủy nhiệm chỉ khi tài khoản đã bật."
+
+#, fuzzy
+#~| msgid "Proxy"
+#~ msgctxt "GW"
+#~ msgid "Proxy"
+#~ msgstr "Ủy nhiệm"
+
+#~ msgid "Add User"
+#~ msgstr "Thêm ngư�i dùng"
+
+#~ msgid "Advanced send options"
+#~ msgstr "Tùy ch�n gửi cấp cao"
+
+#~ msgid "Users"
+#~ msgstr "Ngư�i dùng"
+
+#~ msgid "Enter the users and set permissions"
+#~ msgstr "Nhập những ngư�i dùng và lập quy�n hạn"
+
+#~ msgid "Sharing"
+#~ msgstr "Dùng chung"
+
+#~ msgid "Custom Notification"
+#~ msgstr "Thông báo tự ch�n"
+
+#~ msgid "Add   "
+#~ msgstr "Thêm   "
+
+#~ msgid "Modify"
+#~ msgstr "Sửa đổi"
+
+#~ msgid "Message Status"
+#~ msgstr "Trạng thái thư"
+
+#~ msgid "Subject:"
+#~ msgstr "Chủ đ�:"
+
+#~ msgid "From:"
+#~ msgstr "Từ:"
+
+#~ msgid "Creation date:"
+#~ msgstr "Ngày tạo:"
+
+#~ msgid "Recipient: "
+#~ msgstr "Ngư�i nhận: "
+
+#~ msgid "Delivered: "
+#~ msgstr "Phát: "
+
+#~ msgid "Opened: "
+#~ msgstr "Mở: "
+
+#~ msgid "Accepted: "
+#~ msgstr "Chấp nhận: "
+
+#~ msgid "Deleted: "
+#~ msgstr "Xoá: "
+
+#~ msgid "Declined: "
+#~ msgstr "Từ chối: "
+
+#~ msgid "Completed: "
+#~ msgstr "Xong: "
+
+#~ msgid "Undelivered: "
+#~ msgstr "Chưa phát: "
+
+#~ msgid "Enable D-Bus messages."
+#~ msgstr "Bật thông điệp D-Bus."
+
+#~ msgid "Generates a D-Bus message when new mail messages arrive."
+#~ msgstr "Tạo ra một thông điệp D-BUS khi nhận thư mới."
+
+#~ msgid "Popup message together with the icon."
+#~ msgstr "Hiển thị thông điệp cùng với biểu tượng."
+
+#~ msgid "Whether show message over the icon when new messages arrive."
+#~ msgstr ""
+#~ "Có nên hiển thị thông điệp ở trên biểu tượng hay không, khi nhận thư mới."
+
+#~ msgid "Show icon in _notification area"
+#~ msgstr "Hiể_n thị biểu tượng trong vùng thông báo"
+
+#~ msgid "Popup _message together with the icon"
+#~ msgstr "Hiển thị thông điệp cùng _với biểu tượng"
+
+#~ msgid "Generate a _D-Bus message"
+#~ msgstr "Tạo ra một thông điệp _D-Bus"
+
+#~ msgid "Evolution Profiler"
+#~ msgstr "Bộ tạo hồ sơ Evolution"
+
+#~ msgid "SpamAssassin not found, code: %d"
+#~ msgstr "Không tìm thấy SpamAssassin, mã: %d"
+
+#~ msgid "Failed to create pipe: %s"
+#~ msgstr "Lỗi tạo ống dẫn: %s"
+
+#~ msgid "Error after fork: %s"
+#~ msgstr "Lỗi sau khi tạo tiến trình con: %s"
+
+#~ msgid "SpamAssassin child process does not respond, killing..."
+#~ msgstr "Tiến trình con SpamAssassin không đáp ứng nên buộc kết thúc..."
+
+#~ msgid "Wait for SpamAssassin child process interrupted, terminating..."
+#~ msgstr "Khoảng đợi tiến trình con SpamAssassin bị gián đoạn nên chấm dứt..."
+
+#~ msgid "Pipe to SpamAssassin failed, error code: %d"
+#~ msgstr "Lỗi gửi dữ liệu qua ống dẫn cho SpamAssassin, mã lỗi: %d"
+
+#~| msgid "SpamAssassin is not available."
+#~ msgid "SpamAssassin is not available. Please install it first."
+#~ msgstr "SpamAssassin không có. Hãy cài SpamAssassin trước."
+
+#~| msgid "SpamAssassin junk plugin"
+#~ msgid "SpamAssassin Junk Filter"
+#~ msgstr "Bộ thư rác SpamAssassin"
+
+#~ msgid "iCalendar format (.ics)"
+#~ msgstr "Tập tin iCalendar (.ics)"
+
+#~ msgid "Drafts based template plugin"
+#~ msgstr "Phần bổ sung mẫu dựa vào bản nháp"
+
+# Name: do not translate/ tên: đừng dịch
+#~ msgid "Evolution _FAQ"
+#~ msgstr "_H�i �áp Evolution"
+
+#~ msgid "Open the Frequently Asked Questions webpage"
+#~ msgstr "Mở trang Web hiển thị các câu h�i thư�ng gặp"
+
+#~ msgid "E-Mail Address"
+#~ msgstr "�ịa chỉ thư"
+
+#~ msgid "search bar"
+#~ msgstr "thanh tìm"
+
+#~ msgid "evolution calendar search bar"
+#~ msgstr "thanh tìm kiếm lịch Evolution"
+
+#~ msgid "popup"
+#~ msgstr "bật lên"
+
+#~ msgid "edit"
+#~ msgstr "sá»­a"
+
+#~ msgid "begin editing this cell"
+#~ msgstr "bắt đầu sửa đổi ô này"
+
+#~ msgid "toggle"
+#~ msgstr "bật tắt"
+
+#~ msgid "expand"
+#~ msgstr "dãn ra"
+
+#~ msgid "collapse"
+#~ msgstr "co lại"
+
+#~ msgid "Combo Button"
+#~ msgstr "Nút tổ hợp"
+
+#~ msgid "Activate Default"
+#~ msgstr "Dùng mặc định"
+
+#~ msgid "Popup Menu"
+#~ msgstr "Trình đơn bật lên"
+
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "Hiện/ẩn thanh đính kèm"
+
+#~ msgid "activate"
+#~ msgstr "bật"
+
+#~| msgid "Error loading addressbook."
+#~ msgid "Error loading address book."
+#~ msgstr "Gặp lỗi khi nạp sổ địa chỉ."
+
+#~ msgid "Server Version"
+#~ msgstr "Phiên bản máy chủ"
+
+#~ msgid "{1}"
+#~ msgstr "{1}"
+
+#~ msgid "Default Sync Address:"
+#~ msgstr "�ịa chỉ đồng bộ mặc định:"
+
+#~ msgid "Could not read pilot's Address application block"
+#~ msgstr "Không thể đ�c khối ứng dụng �ịa chỉ của pilot"
+
+#~ msgid "C_ontacts"
+#~ msgstr "_Liên lạc"
+
+#~ msgid "Configure autocomplete here"
+#~ msgstr "Cấu hình tự động gỡ xong ở đây"
+
+#~ msgid "Evolution Address Book"
+#~ msgstr "Sổ địa chỉ Evolution"
+
+#~ msgid "Evolution Address Book address popup"
+#~ msgstr "Ô địa chỉ tự mở của Sổ địa chỉ Evolution"
+
+#~ msgid "Evolution Address Book address viewer"
+#~ msgstr "Ô xem địa chỉ của Sổ địa chỉ Evolution"
+
+#~ msgid "Evolution Address Book card viewer"
+#~ msgstr "Ô xem thẻ của Sổ địa chỉ Evolution"
+
+#~ msgid "Evolution Address Book component"
+#~ msgstr "Thành phần Sổ địa chỉ Evolution"
+
+#~| msgid "Evolution S/Mime Certificate Management Control"
+#~ msgid "Evolution S/MIME Certificate Management Control"
+#~ msgstr "Bộ �i�u khiển Quản lý Chứng nhận S/MIME Evolution"
+
+#~ msgid "Evolution folder settings configuration control"
+#~ msgstr "Bộ đi�u khiển cấu hình thiết lập thư mục Evolution"
+
+#~ msgid "Manage your S/MIME certificates here"
+#~ msgstr "Quản lý chứng nhận S/MIME của bạn ở đây"
+
+#~ msgid "Failed upgrading Address Book settings or folders."
+#~ msgstr "Việc nâng cấp thiết lập Sổ địa chỉ hoặc thư mục bị lỗi."
+
+#~ msgid "Base"
+#~ msgstr "Cơ sở"
+
+#~ msgid "LDAP Servers"
+#~ msgstr "Máy chủ LDAP"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "Thiết lập Tự động Gỡ xong"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution contact folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "�ịa chỉ và cây thư mục liên lạc Evolution đã thay đổi so với Evolution 1."
+#~ "x.\n"
+#~ "\n"
+#~ "Hãy kiên nhẫn trong khi Evolution chuyển đổi các thư mục..."
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "�ịnh dạng của liên lạc hộp thư chung đã thay đổi.\n"
+#~ "\n"
+#~ "Hãy kiên nhẫn trong khi Evolution chuyển đổi các thư mục của bạn..."
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Cách Evolution lưu một phần số điện thoại đã thay đổi.\n"
+#~ "\n"
+#~ "Hãy kiên nhẫn trong khi Evolution chuyển đổi các thư mục của bạn..."
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ msgstr ""
+#~ "Các tập tin bản ghi thay đổi và bản đồ đ�u của Evolution Palm Sync (trình "
+#~ "đồng bộ hoá máy tính cầm tay chạy hệ thống Palm) đã thay.\n"
+#~ "\n"
+#~ "Hãy kiên nhẫn trong khi Evolution chuyển đổi dữ liệu Pilot Sync..."
+
+#~ msgid "Rename the \"%s\" folder to:"
+#~ msgstr "�ổi tên thư mục « %s » thành:"
+
+#~ msgid "Rename Folder"
+#~ msgstr "�ổi tên thư mục"
+
+#~ msgid "Save As vCard..."
+#~ msgstr "Lưu dạng vCard..."
+
+#~ msgid "Contact Source Selector"
+#~ msgstr "Bộ ch�n nguồn liên lạc"
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the card and list views and the "
+#~ "preview pane, in pixels."
+#~ msgstr ""
+#~ "Vị trí của ô cửa sổ d�c giữa ô xem thẻ và ô xem danh sách và ô cửa sổ xem "
+#~ "thử, theo điểm ảnh."
+
+#~| msgid "_Lookup in local addressbook only"
+#~ msgid "Look up in address books"
+#~ msgstr "Tra tìm trong các sổ địa chỉ"
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "<b>Authentication</b>"
+#~ msgstr "<b>Xác thực</b>"
+
+#~ msgid "<b>Downloading</b>"
+#~ msgstr "<b>Tải v�</b>"
+
+#~ msgid "<b>Searching</b>"
+#~ msgstr "<b>Tìm kiếm</b>"
+
+#~ msgid "<b>Type:</b>"
+#~ msgstr "<b>Kiểu:</b>"
+
+#~ msgid "Add Address Book"
+#~ msgstr "Thêm Sổ địa chỉ"
+
+#~ msgid "Basic"
+#~ msgstr "Cơ bản"
+
+#~ msgid "Distinguished name"
+#~ msgstr "Tên phân biệt"
+
+#~ msgid ""
+#~ "Evolution will use this email address to authenticate you with the server."
+#~ msgstr ""
+#~ "Evolution sẽ dùng địa chỉ thư điện tử này để xác thực bạn với máy chủ."
+
+#~ msgid "Find Possible Search Bases"
+#~ msgstr "Tìm m�i cơ sở tìm có thể"
+
+#~ msgid ""
+#~ "The search base is the distinguished name (DN) of the entry where your "
+#~ "searches will begin. If you leave this blank, the search will begin at "
+#~ "the root of the directory tree."
+#~ msgstr ""
+#~ "Cơ sở tìm là tên phân biệt (TP) của mục nhập nơi bắt đầu tìm kiếm. Nếu "
+#~ "bạn b� trống chỗ này, tìm kiếm sẽ được bắt đầu từ gốc cây thư mục."
+
+#~| msgid ""
+#~| "This is the full name of your ldap server. For example, \"ldap.mycompany."
+#~| "com\"."
+#~ msgid ""
+#~ "This is the full name of your LDAP server. For example, \"ldap.mycompany."
+#~ "com\"."
+#~ msgstr ""
+#~ "�ây là tên đầy đủ của máy chủ LDAP được bạn dùng. Ví dụ « ldap."
+#~ "công_ty_mình.com.vn »."
+
+#~ msgid ""
+#~ "This is the maximum number of entries to download. Setting this number to "
+#~ "be too large will slow down your address book."
+#~ msgstr ""
+#~ "�ây là số mục tải v� tối đa. Dùng số quá lớn sẽ làm chậm sổ địa chỉ."
+
+#~ msgid ""
+#~ "This is the name for this server that will appear in your Evolution "
+#~ "folder list. It is for display purposes only. "
+#~ msgstr ""
+#~ "�ây là tên máy chủ xuất hiện trong danh sách thư mục Evolution. Chỉ được "
+#~ "dùng với mục đích hiển thị thôi."
+
+#~ msgid "Whenever Possible"
+#~ msgstr "Khi nào có thể"
+
+#~ msgid "_Add Address Book"
+#~ msgstr "_Thêm Sổ địa chỉ"
+
+#~ msgid "<b>Email</b>"
+#~ msgstr "<b>�ịa chỉ thư</b>"
+
+#~ msgid "<b>Home</b>"
+#~ msgstr "<b>Ở nhà</b>"
+
+#~ msgid "<b>Job</b>"
+#~ msgstr "<b>Việc làm</b>"
+
+#~ msgid "<b>Miscellaneous</b>"
+#~ msgstr "<b>Lặt vặt</b>"
+
+#~ msgid "<b>Other</b>"
+#~ msgstr "<b>Khác</b>"
+
+#~ msgid "<b>Telephone</b>"
+#~ msgstr "<b>�iện thoại</b>"
+
+#~ msgid "<b>Work</b>"
+#~ msgstr "<b>Chỗ làm</b>"
+
+#~ msgid "MSN Messenger"
+#~ msgstr "MSN Messenger"
+
+#~| msgid "Novell Groupwise"
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell GroupWise"
+
+#~ msgid "Novell Groupwise"
+#~ msgstr "Phần m�m nhóm Novell"
+
+#~ msgid "_Notes:"
+#~ msgstr "_Ghi chú:"
+
+#~ msgid "_Web Log:"
+#~ msgstr "_Nhật ký Web:"
+
+#~ msgid "Editable"
+#~ msgstr "Có thể sửa"
+
+#~ msgid "United States"
+#~ msgstr "Mỹ"
+
+#~ msgid "Afghanistan"
+#~ msgstr "�p-ga-ni-xtan"
+
+#~ msgid "Albania"
+#~ msgstr "An-ba-ni"
+
+#~ msgid "Algeria"
+#~ msgstr "An-giê-ri"
+
+#~ msgid "American Samoa"
+#~ msgstr "Xa-mô-a Mỹ"
+
+#~ msgid "Andorra"
+#~ msgstr "Ăn-đoa-râ"
+
+#~ msgid "Angola"
+#~ msgstr "Ăng-gô-la"
+
+#~ msgid "Anguilla"
+#~ msgstr "Ăng-ouí-la"
+
+#~ msgid "Antarctica"
+#~ msgstr "Nam-cá»±c"
+
+#~ msgid "Antigua And Barbuda"
+#~ msgstr "An-ti-gu-a và Ba-bu-đa"
+
+#~ msgid "Argentina"
+#~ msgstr "�c-hen-ti-na"
+
+#~ msgid "Armenia"
+#~ msgstr "Ac-mê-ni"
+
+#~ msgid "Aruba"
+#~ msgstr "Ä‚-ru-ba"
+
+#~ msgid "Australia"
+#~ msgstr "Úc"
+
+#~ msgid "Austria"
+#~ msgstr "�o"
+
+#~ msgid "Azerbaijan"
+#~ msgstr "A-dợ-bai-sanh"
+
+#~ msgid "Bahamas"
+#~ msgstr "Ba-ha-ma"
+
+#~ msgid "Bahrain"
+#~ msgstr "Bah-reinh"
+
+#~ msgid "Bangladesh"
+#~ msgstr "Bang-la-đe-xợ"
+
+#~ msgid "Barbados"
+#~ msgstr "Bác-ba-đốt"
+
+#~ msgid "Belarus"
+#~ msgstr "Be-la-ru-xợ"
+
+#~ msgid "Belgium"
+#~ msgstr "Bỉ"
+
+#~ msgid "Belize"
+#~ msgstr "Bê-li-xê"
+
+#~ msgid "Benin"
+#~ msgstr "Bê-ninh"
+
+#~ msgid "Bermuda"
+#~ msgstr "Be-mÆ°-Ä‘a"
+
+#~ msgid "Bhutan"
+#~ msgstr "Bu-thăn"
+
+#~ msgid "Bolivia"
+#~ msgstr "Bô-li-vi-a"
+
+#~ msgid "Bosnia And Herzegowina"
+#~ msgstr "Boxợ-ni-a và He-de-go-vi-nạ"
+
+#~ msgid "Botswana"
+#~ msgstr "Bốt-xoa-na"
+
+#~ msgid "Bouvet Island"
+#~ msgstr "�ảo Bu-vê"
+
+#~ msgid "Brazil"
+#~ msgstr "Bra-xin"
+
+#~ msgid "British Indian Ocean Territory"
+#~ msgstr "Mi�n �ại dương Ấn-độ quốc Anh"
+
+#~ msgid "Brunei Darussalam"
+#~ msgstr "Bợru-này �a-ru-xa-làm"
+
+#~ msgid "Bulgaria"
+#~ msgstr "Bảo-gai-lơi"
+
+#~ msgid "Burkina Faso"
+#~ msgstr "Buốc-khi-na Pha-xô"
+
+#~ msgid "Burundi"
+#~ msgstr "Bu-run-Ä‘i"
+
+#~ msgid "Cambodia"
+#~ msgstr "Khơ-me"
+
+#~ msgid "Cameroon"
+#~ msgstr "Ca-mơ-run"
+
+#~ msgid "Canada"
+#~ msgstr "Gia-na-đại"
+
+#~ msgid "Cape Verde"
+#~ msgstr "Cáp-ve-đẹ"
+
+#~ msgid "Cayman Islands"
+#~ msgstr "Quần đảo Cay-man"
+
+#~ msgid "Central African Republic"
+#~ msgstr "Cộng hòa Trung Phi"
+
+#~ msgid "Chad"
+#~ msgstr "Chê-đ"
+
+#~ msgid "Chile"
+#~ msgstr "Chi-lê"
+
+#~ msgid "China"
+#~ msgstr "Trung Quốc"
+
+#~ msgid "Christmas Island"
+#~ msgstr "�ảo Kh-ri-x-mạ-x"
+
+#~ msgid "Cocos (Keeling) Islands"
+#~ msgstr "Quần đảo Co-co-x (Khi-lịng)"
+
+#~ msgid "Colombia"
+#~ msgstr "Cô-lôm-bi-a"
+
+#~ msgid "Comoros"
+#~ msgstr "Co-mo-ro-xợ"
+
+#~ msgid "Congo"
+#~ msgstr "Công-gô"
+
+#~ msgid "Congo, The Democratic Republic Of The"
+#~ msgstr "Cộng hoà Dân chủ Công-gô"
+
+#~ msgid "Cook Islands"
+#~ msgstr "Quần đảo Khu-kh"
+
+#~ msgid "Costa Rica"
+#~ msgstr "Cốt-x-tha Ri-ca"
+
+#~ msgid "Cote d'Ivoire"
+#~ msgstr "Cót đi vouă"
+
+#~ msgid "Croatia"
+#~ msgstr "Cợ-rô-a-ti-a"
+
+#~ msgid "Cuba"
+#~ msgstr "Cu-ba"
+
+#~ msgid "Cyprus"
+#~ msgstr "Síp"
+
+#~ msgid "Czech Republic"
+#~ msgstr "Cộng hoà Séc"
+
+#~ msgid "Denmark"
+#~ msgstr "�an-nhánh"
+
+#~ msgid "Djibouti"
+#~ msgstr "Gi-bu-ti"
+
+#~ msgid "Dominica"
+#~ msgstr "�ô-mi-ni-cạ"
+
+#~ msgid "Dominican Republic"
+#~ msgstr "Cộng hoà �ô-mi-ni-cạ"
+
+#~ msgid "Ecuador"
+#~ msgstr "Ê-cu-a-đoa"
+
+#~ msgid "Egypt"
+#~ msgstr "Ai-cập"
+
+#~ msgid "El Salvador"
+#~ msgstr "En-san-va-Ä‘oa"
+
+#~ msgid "Equatorial Guinea"
+#~ msgstr "Ghi-nê Xích-đạo"
+
+#~ msgid "Eritrea"
+#~ msgstr "Ê-ri-tơ-rê-a"
+
+#~ msgid "Estonia"
+#~ msgstr "E-xtô-ni-a"
+
+#~ msgid "Ethiopia"
+#~ msgstr "Ê-ti-ô-pi-a"
+
+#~ msgid "Falkland Islands"
+#~ msgstr "Quần đảo Phoa-kh-lận"
+
+#~ msgid "Faroe Islands"
+#~ msgstr "Quần đảo Pha-rô"
+
+#~ msgid "Finland"
+#~ msgstr "Phần-lan"
+
+#~ msgid "France"
+#~ msgstr "Pháp"
+
+#~ msgid "French Guiana"
+#~ msgstr "Ghi-a-na Pháp"
+
+#~ msgid "French Polynesia"
+#~ msgstr "Pô-li-nê-di Pháp"
+
+#~ msgid "French Southern Territories"
+#~ msgstr "Mi�n Nam Pháp"
+
+#~ msgid "Gabon"
+#~ msgstr "Ga-bông"
+
+#~ msgid "Gambia"
+#~ msgstr "Găm-bi-a"
+
+#~ msgid "Georgia"
+#~ msgstr "Gi-oa-gi-a"
+
+#~ msgid "Germany"
+#~ msgstr "�ức"
+
+#~ msgid "Ghana"
+#~ msgstr "Ga-na"
+
+#~ msgid "Gibraltar"
+#~ msgstr "Gi-boa-tha"
+
+#~ msgid "Greece"
+#~ msgstr "Hy-lạp"
+
+#~ msgid "Greenland"
+#~ msgstr "�ảo băng"
+
+#~ msgid "Grenada"
+#~ msgstr "Gợ-rê-na-đa"
+
+#~ msgid "Guadeloupe"
+#~ msgstr "Gu-a-Ä‘e-luc"
+
+#~ msgid "Guam"
+#~ msgstr "Gu-ăm"
+
+#~ msgid "Guatemala"
+#~ msgstr "Gua-tê-ma-la"
+
+#~ msgid "Guernsey"
+#~ msgstr "GÆ¡nh-di"
+
+#~ msgid "Guinea"
+#~ msgstr "Ghi-nê"
+
+#~ msgid "Guinea-Bissau"
+#~ msgstr "Ghi-nê Bi-sau"
+
+#~ msgid "Guyana"
+#~ msgstr "Guy-a-na"
+
+#~ msgid "Haiti"
+#~ msgstr "Ha-i-ti"
+
+#~ msgid "Heard And McDonald Islands"
+#~ msgstr "Quần đảo Hơd và Mợc-đo-nợd"
+
+#~ msgid "Holy See"
+#~ msgstr "Toà thánh"
+
+#~ msgid "Honduras"
+#~ msgstr "Hôn-đu-rát"
+
+#~ msgid "Hong Kong"
+#~ msgstr "Hồng Kông"
+
+#~ msgid "Hungary"
+#~ msgstr "Hung-gia-lợi"
+
+#~ msgid "Iceland"
+#~ msgstr "Băng-đảo"
+
+#~ msgid "India"
+#~ msgstr "Ấn-độ"
+
+#~ msgid "Indonesia"
+#~ msgstr "Nam DÆ°Æ¡ng"
+
+#~ msgid "Iran"
+#~ msgstr "Ba-tÆ°"
+
+#~ msgid "Iraq"
+#~ msgstr "I-rắc"
+
+#~ msgid "Ireland"
+#~ msgstr "�i-nhĩ-lan"
+
+#~ msgid "Isle of Man"
+#~ msgstr "�ảo Man"
+
+#~ msgid "Israel"
+#~ msgstr "Do thái"
+
+#~ msgid "Italy"
+#~ msgstr "�"
+
+#~ msgid "Jamaica"
+#~ msgstr "Gia-mê-ca"
+
+#~ msgid "Japan"
+#~ msgstr "Nhật bản"
+
+#~ msgid "Jersey"
+#~ msgstr "Chơ-di"
+
+#~ msgid "Jordan"
+#~ msgstr "Gi-oa-Ä‘an"
+
+#~ msgid "Kazakhstan"
+#~ msgstr "Ca-da-kh-x-than"
+
+#~ msgid "Kenya"
+#~ msgstr "Khi-ni-a"
+
+#~ msgid "Kiribati"
+#~ msgstr "Ki-ri-ba-ti"
+
+#~ msgid "Korea, Democratic People's Republic Of"
+#~ msgstr "Cộng hoà Nhân dân Dân chủ Tri�u tiên"
+
+#~ msgid "Korea, Republic Of"
+#~ msgstr "Cộng hoà Tri�u tiên"
+
+#~ msgid "Kuwait"
+#~ msgstr "Cu-ouai-th"
+
+#~ msgid "Kyrgyzstan"
+#~ msgstr "Cơ-chi-x-tăng"
+
+#~ msgid "Laos"
+#~ msgstr "Lào"
+
+#~ msgid "Latvia"
+#~ msgstr "Lát-vi-a"
+
+#~ msgid "Lebanon"
+#~ msgstr "Le-ba-non"
+
+#~ msgid "Lesotho"
+#~ msgstr "Le-xô-tô"
+
+#~ msgid "Liberia"
+#~ msgstr "Li-bê-ri-a"
+
+#~ msgid "Libya"
+#~ msgstr "Li-bi-a"
+
+#~ msgid "Liechtenstein"
+#~ msgstr "Likh-ten-sợ-tainh"
+
+#~ msgid "Lithuania"
+#~ msgstr "Li-tu-a-ni"
+
+#~ msgid "Luxembourg"
+#~ msgstr "Lục-xâm-bảo"
+
+#~ msgid "Macao"
+#~ msgstr "Ma-cao"
+
+#~ msgid "Macedonia"
+#~ msgstr "Ma-xe-đô-ni-a"
+
+#~ msgid "Madagascar"
+#~ msgstr "Ma-đa-ga-x-că"
+
+#~ msgid "Malawi"
+#~ msgstr "Ma-la-uy"
+
+#~ msgid "Malaysia"
+#~ msgstr "Ma-lay-xi-a"
+
+#~ msgid "Maldives"
+#~ msgstr "Mal-đi-vợx"
+
+#~ msgid "Mali"
+#~ msgstr "Ma-li"
+
+#~ msgid "Malta"
+#~ msgstr "Moa-ta"
+
+#~ msgid "Marshall Islands"
+#~ msgstr "Quần đảo Mác-san"
+
+#~ msgid "Martinique"
+#~ msgstr "Mác-thi-ni-kh"
+
+#~ msgid "Mauritania"
+#~ msgstr "Mô-ri-ta-ni-a"
+
+#~ msgid "Mauritius"
+#~ msgstr "Mâu-ri-sơ-x"
+
+#~ msgid "Mexico"
+#~ msgstr "Mê-hi-cô"
+
+#~ msgid "Micronesia"
+#~ msgstr "Mi-cợ-rô-nê-xi-a"
+
+#~ msgid "Moldova, Republic Of"
+#~ msgstr "Cộng Hòa Mon-đô-va"
+
+#~ msgid "Monaco"
+#~ msgstr "Mô-na-cô"
+
+#~ msgid "Mongolia"
+#~ msgstr "Mông-cổ"
+
+#~ msgid "Montserrat"
+#~ msgstr "Mon-xe-rạc"
+
+#~ msgid "Morocco"
+#~ msgstr "Ma-rốc"
+
+#~ msgid "Mozambique"
+#~ msgstr "Mô-dam-bíkh"
+
+#~ msgid "Myanmar"
+#~ msgstr "Miến-điện"
+
+#~ msgid "Namibia"
+#~ msgstr "Na-mi-bi-a"
+
+#~ msgid "Nauru"
+#~ msgstr "Nau-ru"
+
+#~ msgid "Nepal"
+#~ msgstr "Nê-pan"
+
+#~ msgid "Netherlands"
+#~ msgstr "Hoà-lan"
+
+#~ msgid "Netherlands Antilles"
+#~ msgstr "An-thi-le-x Hoà-lan"
+
+#~ msgid "New Caledonia"
+#~ msgstr "Niu Ca-lê-đô-ni-a"
+
+#~ msgid "New Zealand"
+#~ msgstr "Niu Di-lân"
+
+#~ msgid "Nicaragua"
+#~ msgstr "Ni-ca-ra-gua"
+
+#~ msgid "Niger"
+#~ msgstr "Ni-giê"
+
+#~ msgid "Nigeria"
+#~ msgstr "Ni-giê-ri-a"
+
+#~ msgid "Niue"
+#~ msgstr "Ni-u-e"
+
+#~ msgid "Norfolk Island"
+#~ msgstr "�ảo Noa-phực"
+
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "Quần đảo Ma-ri-a-na Bắc"
+
+#~ msgid "Norway"
+#~ msgstr "Na-uy"
+
+#~ msgid "Oman"
+#~ msgstr "Ô-man"
+
+#~ msgid "Pakistan"
+#~ msgstr "Ba-ki-x-thăn"
+
+#~ msgid "Palau"
+#~ msgstr "Ba-lau"
+
+#~ msgid "Palestinian Territory"
+#~ msgstr "Lãnh thổ Pa-le-x-tính"
+
+#~ msgid "Panama"
+#~ msgstr "Ba-na-ma"
+
+#~ msgid "Papua New Guinea"
+#~ msgstr "Ba-bu-a Niu Ghi-nê"
+
+#~ msgid "Paraguay"
+#~ msgstr "Ba-ra-guay"
+
+#~ msgid "Peru"
+#~ msgstr "Pê-ru"
+
+#~ msgid "Philippines"
+#~ msgstr "Phi-li-pin"
+
+#~ msgid "Pitcairn"
+#~ msgstr "Bi-th-khenh"
+
+#~ msgid "Poland"
+#~ msgstr "Ba-lan"
+
+#~ msgid "Portugal"
+#~ msgstr "Bồ-đào-nha"
+
+#~ msgid "Puerto Rico"
+#~ msgstr "Bu-éc-thô Ri-cô"
+
+#~ msgid "Qatar"
+#~ msgstr "Ca-tă"
+
+#~ msgid "Reunion"
+#~ msgstr "Rê-u-ni-ợnh"
+
+#~ msgid "Romania"
+#~ msgstr "Lỗ-má-ni"
+
+#~ msgid "Russian Federation"
+#~ msgstr "Liên bang Nga"
+
+#~ msgid "Rwanda"
+#~ msgstr "Ru-oanh-Ä‘a"
+
+#~ msgid "Saint Kitts And Nevis"
+#~ msgstr "Xan Khi-th-x và Ne-vi-x"
+
+#~ msgid "Saint Lucia"
+#~ msgstr "Xan Lu-xi-a"
+
+#~ msgid "Saint Vincent And The Grenadines"
+#~ msgstr "Xan Vinh-xen và Gợ-re-na-đính"
+
+#~ msgid "Samoa"
+#~ msgstr "Xa-moa"
+
+#~ msgid "San Marino"
+#~ msgstr "Xan Ma-ri-nô"
+
+#~ msgid "Sao Tome And Principe"
+#~ msgstr "Xao Tô-mê và Pợ-rinh-xi-pê"
+
+#~ msgid "Saudi Arabia"
+#~ msgstr "A-rập Xau-đi"
+
+#~ msgid "Senegal"
+#~ msgstr "Xê-nê-gan"
+
+#~ msgid "Serbia And Montenegro"
+#~ msgstr "Xéc-bi và Mon-the-nê-gợ-rô"
+
+#~ msgid "Seychelles"
+#~ msgstr "Xê-sen"
+
+#~ msgid "Sierra Leone"
+#~ msgstr "Xi-e-ra Lê-ô-ne"
+
+#~ msgid "Singapore"
+#~ msgstr "Xin-ga-po"
+
+#~ msgid "Slovakia"
+#~ msgstr "Xlô-vác"
+
+#~ msgid "Slovenia"
+#~ msgstr "Xlô-ven"
+
+#~ msgid "Solomon Islands"
+#~ msgstr "Quần đảo Xô-lô-mông"
+
+#~ msgid "Somalia"
+#~ msgstr "Xo-ma-li"
+
+#~ msgid "South Africa"
+#~ msgstr "Nam Phi"
+
+#~ msgid "South Georgia And The South Sandwich Islands"
+#~ msgstr "Quần đảo Gi-oa-gi-a và Nam Xan-oui-ch"
+
+#~ msgid "Spain"
+#~ msgstr "Tây-ban-nha"
+
+#~ msgid "Sri Lanka"
+#~ msgstr "Xri-lăn-ca"
+
+#~ msgid "St. Helena"
+#~ msgstr "Xan He-lê-na"
+
+#~ msgid "St. Pierre And Miquelon"
+#~ msgstr "Xan Pi-e và Mi-quê-lon"
+
+#~ msgid "Sudan"
+#~ msgstr "Xu-đăng"
+
+#~ msgid "Suriname"
+#~ msgstr "Xu-ri-năm"
+
+#~ msgid "Svalbard And Jan Mayen Islands"
+#~ msgstr "Quần đảo X-văn-băn và Dăn May-en"
+
+#~ msgid "Swaziland"
+#~ msgstr "Xouă-di-lạn"
+
+#~ msgid "Sweden"
+#~ msgstr "Thụy-điển"
+
+#~ msgid "Switzerland"
+#~ msgstr "Thụy-sĩ"
+
+#~ msgid "Syria"
+#~ msgstr "Xi-ri-a"
+
+#~ msgid "Taiwan"
+#~ msgstr "�ài Loan"
+
+#~ msgid "Tajikistan"
+#~ msgstr "Tha-dikh-x-thăn"
+
+#~ msgid "Tanzania, United Republic Of"
+#~ msgstr "Cộng hoà Thông nhất Thăn-da-ni-a"
+
+#~ msgid "Thailand"
+#~ msgstr "Thái-lan"
+
+#~ msgid "Timor-Leste"
+#~ msgstr "Thi-moa Lex-the"
+
+#~ msgid "Togo"
+#~ msgstr "Tô-gô"
+
+#~ msgid "Tokelau"
+#~ msgstr "To-ke-lau"
+
+#~ msgid "Tonga"
+#~ msgstr "Tông-ga"
+
+#~ msgid "Trinidad And Tobago"
+#~ msgstr "Tợ-ri-ni-đat và To-ba-gô"
+
+#~ msgid "Tunisia"
+#~ msgstr "Tu-ni-xi-a"
+
+#~ msgid "Turkey"
+#~ msgstr "Thổ-nhĩ-kỳ"
+
+#~ msgid "Turkmenistan"
+#~ msgstr "Thua-khợ-me-ni-x-tăng"
+
+#~ msgid "Turks And Caicos Islands"
+#~ msgstr "Quần Thổ-kh-x và Cai-co-x"
+
+#~ msgid "Tuvalu"
+#~ msgstr "Tu-va-lu"
+
+#~ msgid "Uganda"
+#~ msgstr "U-găn-đa"
+
+#~ msgid "Ukraine"
+#~ msgstr "U-cợ-rainh"
+
+#~ msgid "United Arab Emirates"
+#~ msgstr "Các Tiểu Vương quốc A-rập Thống nhất"
+
+#~ msgid "United Kingdom"
+#~ msgstr "Vương quốc Anh Thống nhất"
+
+#~ msgid "United States Minor Outlying Islands"
+#~ msgstr "Quần đảo ở xa nh� Mỹ"
+
+#~ msgid "Uruguay"
+#~ msgstr "U-ru-guay"
+
+#~ msgid "Uzbekistan"
+#~ msgstr "U-dợ-be-ki-x-thăn"
+
+#~ msgid "Vanuatu"
+#~ msgstr "Va-nu-a-tu"
+
+#~ msgid "Venezuela"
+#~ msgstr "Vê-nê-du-ê-la"
+
+#~ msgid "Viet Nam"
+#~ msgstr "Việt Nam"
+
+#~ msgid "Virgin Islands, British"
+#~ msgstr "Quần đảo Vơ-ginh Anh"
+
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "Quần đảo Vơ-ginh Mỹ"
+
+#~ msgid "Wallis And Futuna Islands"
+#~ msgstr "Quần đảo Oua-lit và Phu-tu-na"
+
+#~ msgid "Western Sahara"
+#~ msgstr "Tây Sa-ha-ra"
+
+#~ msgid "Yemen"
+#~ msgstr "I-ê-mên"
+
+#~ msgid "Zambia"
+#~ msgstr "Dăm-bi-a"
+
+#~ msgid "Zimbabwe"
+#~ msgstr "Dim-ba-bu-ê"
+
+#~ msgid "AOL Instant Messenger"
+#~ msgstr "AOL Instant Messenger"
+
+#~ msgid "Yahoo Messenger"
+#~ msgstr "Yahoo Messenger"
+
+#~ msgid "Gadu-Gadu Messenger"
+#~ msgstr "Gadu-Gadu Messenger"
+
+#~ msgid "Service"
+#~ msgstr "Dịch vụ"
+
+#~ msgid "Username"
+#~ msgstr "Tên ngư�i dùng"
+
+#~ msgid "Source Book"
+#~ msgstr "Sổ nguồn"
+
+#~ msgid "Target Book"
+#~ msgstr "Sổ đích"
+
+#~ msgid "Is New Contact"
+#~ msgstr "Là Liên lạc mới"
+
+#~ msgid "Writable Fields"
+#~ msgstr "Trư�ng ghi được"
+
+#~ msgid "Required Fields"
+#~ msgstr "Trư�ng cần thiết"
+
+#~ msgid "Changed"
+#~ msgstr "�ã đổi"
+
+#~ msgid "Address _2:"
+#~ msgstr "�ịa chỉ _2:"
+
+#~ msgid "Ci_ty:"
+#~ msgstr "_Phố:"
+
+#~ msgid "Countr_y:"
+#~ msgstr "_Quốc gia:"
+
+#~ msgid "Full Address"
+#~ msgstr "�ịa chỉ đầy đủ"
+
+#~ msgid "_ZIP Code:"
+#~ msgstr "Mã _bưu điện:"
+
+#~ msgid "_Account name:"
+#~ msgstr "Tên tài _khoản:"
+
+#~ msgid "_IM Service:"
+#~ msgstr "Dịch vụ t_in nhắn:"
+
+#~ msgid "<b>Members</b>"
+#~ msgstr "<b>Thành viên</b>"
+
+#~ msgid "Book"
+#~ msgstr "Sổ"
+
+#~ msgid "Is New List"
+#~ msgstr "Là danh sách mới"
+
+#~ msgid "Query"
+#~ msgstr "Truy vấn"
+
+#~ msgid "Model"
+#~ msgstr "Mô hình"
+
+#~ msgid "Name begins with"
+#~ msgstr "Tên bắt đầu bằng"
+
+#~ msgid "_Open"
+#~ msgstr "_Mở"
+
+#~ msgid "_Print"
+#~ msgstr "_In"
+
+#~ msgid "Cop_y to Address Book..."
+#~ msgstr "_Chép vào Sổ địa chỉ..."
+
+#~ msgid "Mo_ve to Address Book..."
+#~ msgstr "Chuyển _vào Sổ địa chỉ..."
+
+#~ msgid "Cu_t"
+#~ msgstr "Cắ_t"
+
+#~ msgid "_Copy"
+#~ msgstr "_Chép"
+
+#~ msgid "P_aste"
+#~ msgstr "_Dán"
+
+#~ msgid "Height"
+#~ msgstr "Cao"
+
+#~ msgid "Has Focus"
+#~ msgstr "Có tiêu điểm"
+
+#~ msgid "Field"
+#~ msgstr "Trư�ng"
+
+#~ msgid "Text Model"
+#~ msgstr "Mô hình chữ"
+
+#~ msgid "Max field name length"
+#~ msgstr "�ộ dài tên trư�ng tối đa"
+
+#~ msgid "Column Width"
+#~ msgstr "Rá»™ng cá»™t"
+
+#~ msgid "Adapter"
+#~ msgstr "Bộ tiếp hợp"
+
+#~ msgid "Selected"
+#~ msgstr "�ã ch�n"
+
+#~ msgid "Has Cursor"
+#~ msgstr "Có con tr�"
+
+#~ msgid "Success"
+#~ msgstr "Thành công"
+
+#~ msgid "Backend busy"
+#~ msgstr "Hậu phương quá bận"
+
+#~ msgid "Repository offline"
+#~ msgstr "Kho ngoại tuyến"
+
+#~ msgid "Address Book does not exist"
+#~ msgstr "Không có Sổ địa chỉ này"
+
+#~ msgid "No Self Contact defined"
+#~ msgstr "Chưa định nghĩa Tự liên lạc"
+
+#~ msgid "Permission denied"
+#~ msgstr "Không đủ quy�n truy cập"
+
+#~ msgid "Contact not found"
+#~ msgstr "Không tìm thấy liên lạc"
+
+#~ msgid "Contact ID already exists"
+#~ msgstr "ID Liên lạc đã có"
+
+#~ msgid "Protocol not supported"
+#~ msgstr "Chưa hỗ trợ giao thức này"
+
+#~ msgid "Could not cancel"
+#~ msgstr "Không thể thôi"
+
+#~ msgid "Authentication Failed"
+#~ msgstr "Việc xác thực bị lỗi"
+
+#~ msgid "Authentication Required"
+#~ msgstr "Cần thiết xác thực"
+
+#~ msgid "TLS not Available"
+#~ msgstr "Không có TLS"
+
+#~ msgid "No such source"
+#~ msgstr "Không có nguồn như vậy"
+
+#~ msgid "Not available in offline mode"
+#~ msgstr "Không thể dùng trong chế độ ngoại tuyến"
+
+#~ msgid "Other error"
+#~ msgstr "Lỗi khác"
+
+#~ msgid "Invalid server version"
+#~ msgstr "Phiên bản máy chủ không hợp lệ"
+
+#~| msgid "Unsupported operation"
+#~ msgid "Unsupported authentication method"
+#~ msgstr "Phương pháp xác thực không được hỗ trợ"
+
+#~ msgid ""
+#~ "%s already exists\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "�ã có %s.\n"
+#~ "Bạn có muốn ghi đè lên nó không?"
+
+#~ msgid "Overwrite"
+#~ msgstr "Ghi đè"
+
+#~ msgid "contact"
+#~ msgid_plural "contacts"
+#~ msgstr[0] "liên lạc"
+
+#~ msgid "Querying Address Book..."
+#~ msgstr "�ang truy vấn Sổ địa chỉ..."
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
+
+#~ msgid "Blank forms at end:"
+#~ msgstr "Mẫu trống tại cuối:"
+
+#~ msgid "Body"
+#~ msgstr "Thân"
+
+#~ msgid "Bottom:"
+#~ msgstr "DÆ°á»›i:"
+
+#~ msgid "Dimensions:"
+#~ msgstr "Kích cỡ:"
+
+#~ msgid "F_ont..."
+#~ msgstr "_Phông chữ..."
+
+#~ msgid "Fonts"
+#~ msgstr "Phông chữ"
+
+#~ msgid "Footer:"
+#~ msgstr "Chân trang:"
+
+#~ msgid "Header/Footer"
+#~ msgstr "�ầu/Chân trang"
+
+#~ msgid "Headings"
+#~ msgstr "Tiêu đ�"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "Tiêu đ� cho mỗi lá thư"
+
+#~ msgid "Height:"
+#~ msgstr "Cao:"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "Theo ngay sau mỗi cái"
+
+#~ msgid "Landscape"
+#~ msgstr "Nằm ngang"
+
+#~ msgid "Left:"
+#~ msgstr "Trái:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "Tab thư tại bên"
+
+#~ msgid "Margins"
+#~ msgstr "Vi�n"
+
+#~ msgid "Number of columns:"
+#~ msgstr "Số cột:"
+
+#~ msgid "Orientation"
+#~ msgstr "HÆ°á»›ng"
+
+#~ msgid "Page Setup:"
+#~ msgstr "Thiết lập trang:"
+
+#~ msgid "Paper"
+#~ msgstr "Giấy"
+
+#~ msgid "Paper source:"
+#~ msgstr "Nguồn giấy:"
+
+#~ msgid "Portrait"
+#~ msgstr "Thẳng đứng"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "In bóng xám"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "�ể nguyên trang chẵn"
+
+#~ msgid "Right:"
+#~ msgstr "Phải:"
+
+#~ msgid "Sections:"
+#~ msgstr "Phần:"
+
+#~ msgid "Size:"
+#~ msgstr "Cỡ:"
+
+#~ msgid "Start on a new page"
+#~ msgstr "Bắt đầu trang mới"
+
+#~ msgid "Style name:"
+#~ msgstr "Tên kiểu:"
+
+#~ msgid "Top:"
+#~ msgstr "Trên:"
+
+#~ msgid "Width:"
+#~ msgstr "Rá»™ng:"
+
+#~ msgid "_Font..."
+#~ msgstr "_Phông..."
+
+#~| msgid "Repository offline"
+#~ msgid "Calendar repository is offline."
+#~ msgstr "Kho lịch hiện th�i ngoại tuyến."
+
+#~ msgid "No response from the server."
+#~ msgstr "Máy chủ không đáp ứng."
+
+#~| msgid "New Appointment"
+#~ msgid "Save Appointment"
+#~ msgstr "Lưu cuộc hẹn"
+
+#~| msgid "_Shared memo"
+#~ msgid "Save Memo"
+#~ msgstr "LÆ°u ghi nhá»›"
+
+#~| msgid "Save as..."
+#~ msgid "Save Task"
+#~ msgstr "Lưu tác vụ"
+
+#~| msgid "Failed to load the calendar '%s'"
+#~ msgid "Unable to load the calendar"
+#~ msgstr "Không thể nạp lịch"
+
+# Variable: do not translate/ biến: đừng dịch
+#~ msgid "{0}."
+#~ msgstr "{0}."
+
+#~ msgid "Split Multi-Day Events:"
+#~ msgstr "Tách sự kiện đa ngày:"
+
+#~ msgid "Could not start evolution-data-server"
+#~ msgstr "Không thể khởi động evolution-data-server (máy chủ dữ liệu)."
+
+#~ msgid "Could not read pilot's Calendar application block"
+#~ msgstr "Không thể đ�c khối ứng dụng lịch của pilot."
+
+#~ msgid "Could not read pilot's Memo application block"
+#~ msgstr "Không thể đ�c khối ứng dụng Ghi nhớ của pilot."
+
+#~ msgid "Could not write pilot's Memo application block"
+#~ msgstr "Không thể ghi khối ứng dụng Ghi nhớ của pilot."
+
+#~ msgid "Could not read pilot's ToDo application block"
+#~ msgstr "Không thể đ�c khối ứng dụng ToDo (cần làm) của pilot."
+
+#~ msgid "Could not write pilot's ToDo application block"
+#~ msgstr "Không thể ghi khối ứng dụng ToDo (cần làm) của pilot."
+
+#~ msgid "Configure your timezone, Calendar and Task List here "
+#~ msgstr "Cấu hình múi gi�, Lịch và danh sách Tác vụ ở đây "
+
+#~ msgid "Evolution Calendar and Tasks"
+#~ msgstr "Tác vụ và Lịch Evolution"
+
+#~ msgid "Evolution Calendar configuration control"
+#~ msgstr "�i�u khiển cấu hình lịch Evolution"
+
+#~ msgid "Evolution Calendar scheduling message viewer"
+#~ msgstr "Bộ xem thông báo lập lịch Evolution"
+
+#~ msgid "Evolution Calendar/Task editor"
+#~ msgstr "Bộ sửa lịch/tác vụ Evolution"
+
+#~ msgid "Evolution's Calendar component"
+#~ msgstr "Thành phần Lịch Evolution"
+
+#~ msgid "Evolution's Memos component"
+#~ msgstr "Thành phần Ghi nhớ của Evolution"
+
+#~ msgid "Evolution's Tasks component"
+#~ msgstr "Thành phần Tác vụ Evolution"
+
+#~ msgid "Memo_s"
+#~ msgstr "Ghi _nhá»›"
+
+#~ msgid "_Calendars"
+#~ msgstr "_Lịch"
+
+#~ msgid "Evolution Calendar alarm notification service"
+#~ msgstr "Dịch vụ báo động lịch Evolution"
+
+#~ msgid "Could not initialize Bonobo"
+#~ msgstr "Không thể khởi động Bonobo"
+
+#~ msgid ""
+#~ "Could not create the alarm notify service factory, maybe it's already "
+#~ "running..."
+#~ msgstr "Không thể tạo bộ tạo dịch vụ báo động; có lẽ nó đang chạy..."
+
+#~ msgid "Event Gradient"
+#~ msgstr "Dốc sự kiện"
+
+#~ msgid "Event Transparency"
+#~ msgstr "�ộ trong suốt sự kiện"
+
+#~ msgid "Gradient of the events in calendar views."
+#~ msgstr "Dốc của các sự kiện trong ô xem lịch."
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the task list and the task preview "
+#~ "pane, in pixels."
+#~ msgstr ""
+#~ "Vị trí của ô cửa sổ d�c, giữa danh sách tác vụ và ô xem cộng việc, theo "
+#~ "điểm ảnh."
+
+#~ msgid "Show the \"Preview\" pane."
+#~ msgstr "Hiện ô « Xem thử »"
+
+#~ msgid "Show week numbers in date navigator"
+#~ msgstr "Hiện số thứ tự tuần trong bộ duyệt ngày"
+
+#~ msgid ""
+#~ "Transparency of the events in calendar views, a value between 0 "
+#~ "(transparent) and 1 (opaque)."
+#~ msgstr ""
+#~ "�ộ trong suốt của sự kiện trong ô xem lịch (giá trị giữa 0 (trong suốt) "
+#~ "và 1 (đục)."
+
+#~| msgid "Whether to show week numbers in the date navigator."
+#~ msgid "Whether to show week number in the Day and Work Week View."
+#~ msgstr ""
+#~ "Có nên hiển thị số thứ tự tuần trong ô Xem Ngày và Tuần Làm Việc, hay "
+#~ "không."
+
+#~ msgid "Whether to use daylight savings time while displaying events."
+#~ msgstr "Có nên sử dụng gi� giữ ban ngày khi hiển thị sự hiện hay không."
+
+#~ msgid "daylight savings time"
+#~ msgstr "gi� giữ ban ngày"
+
+#~ msgid "Category is"
+#~ msgstr "Loại là"
+
+#~ msgid "Comment contains"
+#~ msgstr "Ghi chú chứa"
+
+#~ msgid "Location contains"
+#~ msgstr "�ịa điểm chứa"
+
+#~ msgid "_Make available for offline use"
+#~ msgstr "_Nhãn để dùng ngoại tuyến"
+
+#~ msgid "_Do not make available for offline use"
+#~ msgstr "Khô_ng nhãn để dùng ngoại tuyến"
+
+#~ msgid "Failed upgrading calendars."
+#~ msgstr "Lỗi cập nhật lịch."
+
+#~ msgid "Unable to open the calendar '%s' for creating events and meetings"
+#~ msgstr "Không thể mở lịch « %s » để tạo sự kiện và cuộc h�p."
+
+#~ msgid "There is no calendar available for creating events and meetings"
+#~ msgstr "Không có lịch nào sẵn sàng để tạo sự kiện và cuộc h�p."
+
+#~ msgid "New appointment"
+#~ msgstr "Cuộc hẹn mới"
+
+#~ msgid "New meeting"
+#~ msgstr "Cuộc h�p mới"
+
+#~ msgid "New all day appointment"
+#~ msgstr "Cuộc hẹn nguyên ngày mới"
+
+#~ msgid "Error while opening the calendar"
+#~ msgstr "Gặp lỗi khi mở lịch"
+
+#~ msgid "Method not supported when opening the calendar"
+#~ msgstr "Phương pháp không được hỗ trợ khi mở lịch."
+
+#~ msgid "Permission denied to open the calendar"
+#~ msgstr "Không đủ quy�n truy cập để mở lịch"
+
+#~ msgid "<b>Alarm</b>"
+#~ msgstr "<b>Báo động</b>"
+
+#~ msgid "<b>Options</b>"
+#~ msgstr "<b>Tùy ch�n</b>"
+
+#~ msgid "Attach file(s)"
+#~ msgstr "�ính kèm tập tin"
+
+#~ msgid ""
+#~ "60 minutes\n"
+#~ "30 minutes\n"
+#~ "15 minutes\n"
+#~ "10 minutes\n"
+#~ "05 minutes"
+#~ msgstr ""
+#~ "60 phút\n"
+#~ "30 phút\n"
+#~ "15 phút\n"
+#~ "10 phút\n"
+#~ "05 phút"
+
+#~ msgid "<span weight=\"bold\">Alerts</span>"
+#~ msgstr "<span weight=\"bold\">Báo động</span>"
+
+#~ msgid "<span weight=\"bold\">General</span>"
+#~ msgstr "<span weight=\"bold\">Chung</span>"
+
+#~ msgid "<span weight=\"bold\">Task List</span>"
+#~ msgstr "<span weight=\"bold\">Danh sách Tác vụ</span>"
+
+#~ msgid "<span weight=\"bold\">Time</span>"
+#~ msgstr "<span weight=\"bold\">Gi�</span>"
+
+#~ msgid "<span weight=\"bold\">Work Week</span>"
+#~ msgstr "<span weight=\"bold\">Tuần Làm Việc</span>"
+
+#~ msgid "Adjust for daylight sa_ving time"
+#~ msgstr "Chỉnh _với gi� giữ ban ngày"
+
+#~ msgid ""
+#~ "Minutes\n"
+#~ "Hours\n"
+#~ "Days"
+#~ msgstr ""
+#~ "Phút\n"
+#~ "Gi�\n"
+#~ "Ngày"
+
+#~ msgid ""
+#~ "Monday\n"
+#~ "Tuesday\n"
+#~ "Wednesday\n"
+#~ "Thursday\n"
+#~ "Friday\n"
+#~ "Saturday\n"
+#~ "Sunday"
+#~ msgstr ""
+#~ "Thứ Hai\n"
+#~ "Thứ Ba\n"
+#~ "Thứ Tư\n"
+#~ "Thứ Năm\n"
+#~ "Thứ Sáu\n"
+#~ "Thứ Bảy\n"
+#~ "Chủ Nhật"
+
+#~| msgid "Show week numbers in date navigator"
+#~ msgid "Show week n_umber in Day and Work Week View"
+#~ msgstr "Hiện số thứ tự t_uần trong ô Xem Ngày và Tuần Làm"
+
+#~ msgid "Attached message - %s"
+#~ msgstr "Thư đính kèm - %s"
+
+#~ msgid "Cancel _Drag"
+#~ msgstr "Thôi _kéo"
+
+#~ msgid "<b>%d</b> Attachment"
+#~ msgid_plural "<b>%d</b> Attachments"
+#~ msgstr[0] "<b>%d</b> đính kèm"
+
+#~ msgid "Show Attachments"
+#~ msgstr "Hiện các đồ đính kèm"
+
+#~ msgid "Press space key to toggle attachment bar"
+#~ msgstr "Bấm phím dài để bật/tắt thanh đính kèm"
+
+#~ msgid "The event could not be deleted due to a corba error"
+#~ msgstr "Không thể xoá sự kiện này vi gặp lỗi kiểu CORBA."
+
+#~ msgid "The task could not be deleted due to a corba error"
+#~ msgstr "Không thể xoá cộng việc này vi gặp lỗi kiểu CORBA."
+
+#~ msgid "The memo could not be deleted due to a corba error"
+#~ msgstr "Không thể xoá bản ghi nhớ này vi gặp lỗi kiểu CORBA."
+
+#~ msgid "The item could not be deleted due to a corba error"
+#~ msgstr "Không thể xoá mục này vi gặp lỗi kiểu CORBA."
+
+#~ msgid "Appoint_ment"
+#~ msgstr "Cuộc _hẹn"
+
+#~ msgid "_Add "
+#~ msgstr "_Thêm "
+
+#~ msgid "Attendee_s..."
+#~ msgstr "Ngư�i _dự..."
+
+#~ msgid "<b>Att_endees</b>"
+#~ msgstr "<b>Ngư�i _dự</b>"
+
+#~ msgid "C_hange Organizer"
+#~ msgstr "�ổi bộ tổ c_hức"
+
+#~ msgid "Co_ntacts..."
+#~ msgstr "Liê_n lạc..."
+
+#~ msgid "Organizer:"
+#~ msgstr "Tổ chức:"
+
+#~ msgid "<b>Preview</b>"
+#~ msgstr "<b>Xem thá»­</b>"
+
+#~ msgid "<b>Recurrence</b>"
+#~ msgstr "<b>�ịnh kỳ</b>"
+
+#~ msgid "<span weight=\"bold\">Miscellaneous</span>"
+#~ msgstr "<span weight=\"bold\">Linh tinh\t</span>"
+
+#~ msgid "<span weight=\"bold\">Status</span>"
+#~ msgstr "<span weight=\"bold\">Trạng thái</span>"
+
+#~ msgid "_Task"
+#~ msgstr "_Tác vụ"
+
+#~ msgid "Save As..."
+#~ msgstr "Lưu dạng..."
+
+# Variable: do not translate/ biến: đừng dịch
+#~ msgid "untitled_image.%s"
+#~ msgstr "untitled_image.%s"
+
+#~ msgid "_Save As..."
+#~ msgstr "_Lưu dạng..."
+
+#~ msgid "_Save Selected"
+#~ msgstr "_Lưu vùng ch�n"
+
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "P_rint..."
+#~ msgstr "_In..."
+
+#~ msgid "C_ut"
+#~ msgstr "Cắ_t"
+
+#~ msgid "_Paste"
+#~ msgstr "_Dán"
+
+#~ msgid "_Mark Selected Tasks as Complete"
+#~ msgstr "�ánh _dấu các tác vụ đã ch�n là hoàn tất"
+
+#~ msgid "_Mark Selected Tasks as Incomplete"
+#~ msgstr "�ánh dấu các tác vụ đã ch�n là chưa h_oàn tất"
+
+#~ msgid "_Delete Selected Tasks"
+#~ msgstr "_Xoá các tác vụ đã ch�n"
+
+#~ msgid "_Current View"
+#~ msgstr "Ô _xem hiện th�i"
+
+#~ msgid "Select T_oday"
+#~ msgstr "Ch�n hôm na_y"
+
+#~ msgid "_Select Date..."
+#~ msgstr "Ch�n n_gày..."
+
+#~ msgid "Pri_nt..."
+#~ msgstr "I_n..."
+
+#~ msgid "Yes. (Complex Recurrence)"
+#~ msgstr "Có. (Lặp lại phức tạp)"
+
+#~ msgid "Every day"
+#~ msgid_plural "Every %d days"
+#~ msgstr[0] "Mỗi %d ngày"
+
+#~ msgid "Every week"
+#~ msgid_plural "Every %d weeks"
+#~ msgstr[0] "Mỗi %d tuần"
+
+#~ msgid "Every week on "
+#~ msgid_plural "Every %d weeks on "
+#~ msgstr[0] "Mỗi %d tuần vào "
+
+#~ msgid " and "
+#~ msgstr " và "
+
+#~ msgid "The %s day of "
+#~ msgstr "Ngày %s "
+
+#~ msgid "The %s %s of "
+#~ msgstr "%s %s của "
+
+#~ msgid "every month"
+#~ msgid_plural "every %d months"
+#~ msgstr[0] "mỗi %d tháng"
+
+#~ msgid "Every year"
+#~ msgid_plural "Every %d years"
+#~ msgstr[0] "Mỗi %d năm"
+
+#~| msgid "a total of %d time"
+#~| msgid_plural " a total of %d times"
+#~ msgid "a total of %d time"
+#~ msgid_plural "a total of %d times"
+#~ msgstr[0] "tổng %d lần"
+
+#~ msgid ", ending on "
+#~ msgstr ", kết thúc vào "
+
+#~ msgid "Starts"
+#~ msgstr "Bắt đầu"
+
+#~ msgid "iCalendar Information"
+#~ msgstr "Thông tin iCalendar"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "Lá»—i iCalendar"
+
+#~ msgid ""
+#~ "<br> Please review the following information, and then select an action "
+#~ "from the menu below."
+#~ msgstr ""
+#~ "<br>Vui lòng xem lại các chỉ dẫn sau và ch�n một hành động từ trình đơn "
+#~ "bên dưới."
+
+#~ msgid ""
+#~ "The meeting has been canceled, however it could not be found in your "
+#~ "calendars"
+#~ msgstr ""
+#~ "Cuộc h�p đã được hủy, tuy nhiên không tìm thấy nó trong các lịch của bạn."
+
+#~ msgid ""
+#~ "The task has been canceled, however it could not be found in your task "
+#~ "lists"
+#~ msgstr ""
+#~ "Tác vụ đã được hủy, tuy nhiên không tìm thấy nó trong các danh sách tác "
+#~ "vụ của bạn."
+
+#~ msgid "<b>%s</b> has published meeting information."
+#~ msgstr "<b>%s</b> đã công bố tin tức cuộc h�p."
+
+#~ msgid "<b>%s</b> requests the presence of %s at a meeting."
+#~ msgstr "<b>%s</b> yêu cầu sự hiện diện của « %s » tại cuộc h�p."
+
+#~ msgid "<b>%s</b> requests your presence at a meeting."
+#~ msgstr "<b>%s</b> yêu cầu sự hiện diện của bạn tại cuộc h�p."
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "�� nghị cuộc h�p"
+
+#~ msgid "<b>%s</b> wishes to be added to an existing meeting."
+#~ msgstr "<b>%s</b> muốn được thêm vào một cuộc h�p đã có."
+
+#~ msgid "Meeting Update"
+#~ msgstr "Cập nhật cuộc h�p"
+
+#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
+#~ msgstr "<b>%s</b> muốn nhận tin tức v� cuộc h�p."
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "Yêu cầu cập nhật cuộc h�p"
+
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "<b>%s</b> đã trả l�i yêu cầu h�p."
+
+#~ msgid "Meeting Reply"
+#~ msgstr "Trả l�i h�p"
+
+#~ msgid "<b>%s</b> has canceled a meeting."
+#~ msgstr "<b>%s</b> đã hủy b� một cuộc h�p."
+
+#~ msgid "Meeting Cancelation"
+#~ msgstr "Hủy h�p"
+
+#~ msgid "<b>%s</b> has sent an unintelligible message."
+#~ msgstr "<b>%s</b> đã gửi một thư không thể hiểu."
+
+#~ msgid "Bad Meeting Message"
+#~ 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ụ."
+
+#~ msgid "Task Information"
+#~ msgstr "Tin tức tác vụ"
+
+#~ msgid "<b>%s</b> requests %s to perform a task."
+#~ msgstr "<b>%s</b> yêu cầu %s để thực hiện tác vụ."
+
+#~ msgid "<b>%s</b> requests you perform a task."
+#~ msgstr "<b>%s</b> yêu cầu bạn thực hiện tác vụ."
+
+#~ msgid "Task Proposal"
+#~ msgstr "�� nghị Tác vụ"
+
+#~ msgid "<b>%s</b> wishes to be added to an existing task."
+#~ msgstr "<b>%s</b> muốn được thêm vào tác vụ đã có."
+
+#~ msgid "Task Update"
+#~ msgstr "Cập nhật Tác vụ"
+
+#~ msgid "<b>%s</b> wishes to receive the latest task information."
+#~ msgstr "<b>%s</b> muốn nhận tin tức v� tác vụ."
+
+#~ msgid "Task Update Request"
+#~ msgstr "Yêu cầu Cập nhật Tác vụ"
+
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ msgstr "<b>%s</b> đã trả l�i v� cách gán tác vụ."
+
+#~ msgid "Task Reply"
+#~ msgstr "Trả l�i Tác vụ"
+
+#~ msgid "<b>%s</b> has canceled a task."
+#~ msgstr "<b>%s</b> đã hủy b� một tác vụ."
+
+#~ msgid "Task Cancelation"
+#~ msgstr "Hủy Tác vụ"
+
+#~ msgid "Bad Task Message"
+#~ 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"
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Tin tức bận/rảnh"
+
+#~ msgid "<b>%s</b> requests your free/busy information."
+#~ msgstr "<b>%s</b> yêu cầu tin tức Rảnh/Bận của bạn."
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Yêu cầu tin tức Rảnh/Bận"
+
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgstr "<b>%s</b> đã trả l�i yêu cầu tin tức Rảnh/Bận"
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Trả l�i tin tức Rảnh/Bận"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Thư Rảnh/Bận sai"
+
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "Thư có lẽ không đúng hình thức."
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Thư chỉ chứa yêu cầu chưa được hỗ trợ."
+
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "�ính kèm không chứa mục lịch nào có thể xem được."
+
+#~ msgid "Update complete\n"
+#~ msgstr "Mới cập nhật xong\n"
+
+#~ msgid "Object is invalid and cannot be updated\n"
+#~ msgstr "�ối tượng không hợp lệ nên không thể cập nhật nó.\n"
+
+#~ msgid "This response is not from a current attendee.  Add as an attendee?"
+#~ msgstr ""
+#~ "Hồi đáp này không phải đến từ một ngư�i dự hiện th�i. Thêm ngư�i này như "
+#~ "là ngư�i dự nhé?"
+
+#~ msgid "Attendee status could not be updated because of an invalid status!\n"
+#~ msgstr ""
+#~ "Không thể cập nhật trạng thái ngư�i dự vì trạng thái không hợp lệ!\n"
+
+#~ msgid "Attendee status updated\n"
+#~ msgstr "Mới cập nhật trạng thái ngư�i dự\n"
+
+#~ msgid "Item sent!\n"
+#~ msgstr "Mục đã được gửi.\n"
+
+#~ msgid "Choose an action:"
+#~ msgstr "Ch�n hành động:"
+
+#~ msgid "Update"
+#~ msgstr "Cập nhật"
+
+#~ msgid "Tentatively accept"
+#~ msgstr "Tạm chấp nhận"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Gửi tin tức Rảnh/Bận"
+
+#~ msgid "Update respondent status"
+#~ msgstr "Cập nhật trạng thái trả l�i"
+
+#~ msgid "--to--"
+#~ msgstr "--tá»›i--"
+
+#~ msgid "Date:"
+#~ msgstr "Ngày:"
+
+#~ msgid "Loading calendar..."
+#~ msgstr "�ang nạp lịch..."
+
+#~ msgid "A_ttendees..."
+#~ msgstr "Ngư�i _dự..."
+
+#~ msgid "_Delete Selected Memos"
+#~ msgstr "_Xoá các ghi nhớ đã ch�n"
+
+#~ msgid ""
+#~ "Error on %s:\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Lỗi khi « %s »:\n"
+#~ " %s"
+
+#~ msgid "Deleting selected objects..."
+#~ msgstr "�ang xoá các đối tượng đã ch�n..."
+
+#~ msgid "Completing tasks..."
+#~ msgstr "�ang hoàn tất tác vụ..."
+
+#~ msgid "_Custom View"
+#~ msgstr "Ô xem tự _ch�n"
+
+#~ msgid "_Save Custom View"
+#~ msgstr "_Lưu ô xem tự ch�n"
+
+#~ msgid "_Define Views..."
+#~ msgstr "�ịnh nghĩa ô _xem..."
+
+#~ msgid "Loading appointments at %s"
+#~ msgstr "�ang nạp cuộc hẹn lúc %s..."
+
+#~ msgid "Loading tasks at %s"
+#~ msgstr "�ang nạp tác vụ lúc %s..."
+
+#~ msgid "Loading memos at %s"
+#~ msgstr "�ang nạp ghi nhớ tại %s"
+
+#~ msgid "_Select Today"
+#~ msgstr "Ch�n _hôm nay"
+
+#~ msgid "Failed upgrading memos."
+#~ msgstr "Việc nâng cấp ghi nhớ bị lỗi."
+
+#~ msgid "Unable to open the memo list '%s' for creating events and meetings"
+#~ msgstr "Không thể mở danh sách ghi nhớ « %s » để tạo sự kiện và cuộc h�p"
+
+#~ msgid "There is no calendar available for creating memos"
+#~ msgstr "Không có lịch nào sẵn sàng để tạo ghi nhớ"
+
+#~ msgid "New shared memo"
+#~ msgstr "Ghi nhớ dùng chung mới"
+
+#~| msgid "Memo li_st"
+#~ msgctxt "New"
+#~ msgid "Memo li_st"
+#~ msgstr "Danh _sách ghi nhớ"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution task folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "�ịa chỉ và cây thư mục tác vụ Evolution đã thay đổi so với Evolution "
+#~ "phiên bản 1.x.\n"
+#~ "\n"
+#~ "Hãy kiên nhẫn trong khi Evolution chuyển đổi các thư mục..."
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution calendar folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "�ịa chỉ và cây thư mục lịch Evolution đã thay đổi so với Evolution phiên "
+#~ "bản 1.x.\n"
+#~ "\n"
+#~ "Hãy kiên nhẫn trong khi Evolution chuyển đổi các thư mục..."
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr ""
+#~ "Không thể chuyển đổi các thiết lập cũ từ tập tin evolution/config.xmldb"
+
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "Không thể chuyển đổi lịch « %s »."
+
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "Không thể chuyển đổi các tác vụ « %s »."
+
+#~ msgid "Failed upgrading tasks."
+#~ msgstr "Việc nâng cấp tác vụ bị lỗi."
+
+#~ msgid "Unable to open the task list '%s' for creating events and meetings"
+#~ msgstr "Không thể mở danh sách tác vụ « %s » để tạo sự kiện và cuộc h�p."
+
+#~ msgid "There is no calendar available for creating tasks"
+#~ msgstr "Không có lịch nào sẵn sàng để tạo tác vụ."
+
+#~ msgid "New task"
+#~ msgstr "Tác vụ mới"
+
+#~ msgid "New assigned task"
+#~ msgstr "Tác vụ đã gán mới"
+
+#~| msgid "Tas_k list"
+#~ msgctxt "New"
+#~ msgid "Tas_k list"
+#~ msgstr "Danh sách tác _vụ"
+
+#~ msgid "Could not open autosave file"
+#~ msgstr "Không thể mở tập tin tự động lưu"
+
+#~ msgid "Unable to retrieve message from editor"
+#~ msgstr "Không thể lấy thư từ bộ sửa."
+
+#~ msgid "_Security"
+#~ msgstr "_Bảo mật"
+
+#~ msgid "_From Field"
+#~ msgstr "Trư�ng _From (Từ)"
+
+#~ msgid "Toggles whether the From chooser is displayed"
+#~ msgstr "Bật tắt hiển thị bộ ch�n From (Từ)"
+
+#~ msgid "_Post-To Field"
+#~ msgstr "Trư�ng _Post-To (Gửi cho nhóm)"
+
+#~ msgid "Toggles whether the Post-To field is displayed"
+#~ msgstr "Bật tắt hiển thị trư�ng Post-To (Gửi cho nhóm tin tức)"
+
+#~ msgid "_Subject Field"
+#~ msgstr "Trư�ng C_hủ đ�"
+
+#~ msgid "Toggles whether the Subject field is displayed"
+#~ msgstr "Hiển thị/Ẩn trư�ng Chủ đ�"
+
+#~ msgid "_To Field"
+#~ msgstr "Trư�ng _To (Cho)"
+
+#~ msgid "Toggles whether the To field is displayed"
+#~ msgstr "Bật tắt hiển thị trư�ng To (Cho)"
+
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "Hiện th_anh đính kèm"
+
+#~ msgid "Hide _Attachment Bar"
+#~ msgstr "Ẩn th_anh đính kèm"
+
+#~ msgid "Could not create composer window."
+#~ msgstr "Không thể tạo cửa sổ soạn."
+
+#~ msgid "Directories can not be attached to Messages."
+#~ msgstr "Không thể đính thư mục kèm thư."
+
+#~| msgid ""
+#~| "Send options available only for Novell Groupwise and Microsoft Exchange "
+#~| "accounts."
+#~ msgid ""
+#~ "Send options available only for Novell GroupWise and Microsoft Exchange "
+#~ "accounts."
+#~ msgstr ""
+#~ "Các tùy ch�n gửi sẵn sàng chỉ cho tài khoản kiểu Novell GroupWise và "
+#~ "Microsoft Exchange."
+
+#~ msgid "Send options not available."
+#~ msgstr "Tùy ch�n gửi không sẵn sàng."
+
+#~ msgid ""
+#~ "To attach the contents of this directory, either attach the files in this "
+#~ "directory individually, or create an archive of the directory and attach "
+#~ "it."
+#~ msgstr ""
+#~ "�ể đính kèm nội dung thư mục này thì bạn hãy hoặc đính kèm mỗi tập tin "
+#~ "trong nó từng cái một, hoặc tạo một kho của toàn bộ thư mục và đính kèm "
+#~ "kho ấy."
+
+#~ msgid ""
+#~ "Unable to activate the HTML editor control.\n"
+#~ "\n"
+#~ "Please make sure that you have the correct version of gtkhtml and "
+#~ "libgtkhtml installed."
+#~ msgstr ""
+#~ "Không thể kích hoạt đi�u khiển bộ sửa HTML.\n"
+#~ "\n"
+#~ "Vui lòng kiểm tra xem GtkHTML và libGtkHTML có được cài đặt đúng phiên "
+#~ "bản chưa."
+
+#~ msgid "Unable to activate the address selector control."
+#~ msgstr "Không thể kích hoạt bộ đi�u khiển ch�n địa chỉ."
+
+#~ msgid "Warning: Modified Message"
+#~ msgstr "Cảnh báo: thư đã sửa đổi"
+
+#~ msgid "address card"
+#~ msgstr "thẻ địa chỉ"
+
+#~ msgid "calendar information"
+#~ msgstr "thông tin lịch"
+
+#~ msgid "Evolution Error"
+#~ msgstr "Lá»—i Evolution"
+
+#~ msgid "Evolution Warning"
+#~ msgstr "Cảnh báo Evolution"
+
+#~ msgid "Evolution Information"
+#~ msgstr "Thông tin Evolution"
+
+#~ msgid "Evolution Query"
+#~ msgstr "Truy vấn Evolution"
+
+#~ msgid "Internal error, unknown error '%s' requested"
+#~ msgstr "Lỗi nội bộ: yêu cầu lỗi không rõ « %s »."
+
+#~| msgid "Complete"
+#~ msgid "Component"
+#~ msgstr "Thành phần"
+
+#~ msgid "Name of the component being logged"
+#~ msgstr "Tên của thành phần đang được theo dõi"
+
+#~ msgid "Debug Logs"
+#~ msgstr "Bản ghi gỡ lỗi"
+
+#~ msgid "Show _errors in the status bar for"
+#~ msgstr "Hiện _lỗi trên thanh trạng thái trong vòng"
+
+#~ msgid "second(s)."
+#~ msgstr "giây."
+
+#~ msgid "Log Messages:"
+#~ msgstr "Thông điệp ghi lưu:"
+
+#~ msgid "Log Level"
+#~ msgstr "Mức ghi lưu"
+
+#~ msgid "Error"
+#~ msgstr "Lá»—i"
+
+#~ msgid "Errors"
+#~ msgstr "Lá»—i"
+
+#~ msgid "Warnings and Errors"
+#~ msgstr "Cảnh báo và Lỗi"
+
+#~ msgid "Debug"
+#~ msgstr "Gỡ lỗi"
+
+#~ msgid "Error, Warnings and Debug messages"
+#~ msgstr "Lỗi, Cảnh báo và Thông điệp Gỡ lỗi"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "Có nên bật phần mở rộng hay không"
+
+#~ msgid "Overwrite file?"
+#~ msgstr "Ghi đè lên tập tin không?"
+
+#~ msgid "Label name cannot be empty."
+#~ msgstr "Không cho phép tên nhãn còn trống."
+
+#~ msgid ""
+#~ "A label having the same tag already exists on the server. Please rename "
+#~ "your label."
+#~ msgstr "Một nhãn có thẻ đó đã có trên máy chủ. Hãy thay đổi tên của nhãn."
+
+#~ msgid "Test"
+#~ msgstr "Kiểm tra"
+
+#~ msgid "<b>_Filter Rules</b>"
+#~ msgstr "<b>Quy tắc _l�c</b>"
+
+#~ msgid "Rule name"
+#~ msgstr "Tên quy tắc"
+
+#~ msgid ""
+#~ "Configure mail preferences, including security and message display, here"
+#~ msgstr ""
+#~ "Cấu hình Tùy thích thư tín, bao gồm tính bảo mật và hiển thị thư, ở đây."
+
+#~ msgid "Configure spell-checking, signatures, and the message composer here"
+#~ msgstr "Cấu hình kiểm tra chính tả, chữ ký, và bộ soạn thảo thư ở đây"
+
+#~ msgid "Configure your network connection settings here"
+#~ msgstr "Cấu hình thiết lập kết nối mạng ở đây"
+
+#~ msgid "Evolution Mail"
+#~ msgstr "Thư tín Evolution"
+
+#~ msgid "Evolution Mail accounts configuration control"
+#~ msgstr "Bộ đi�u khiển cấu hình tài khoản thư tín Evolution."
+
+#~ msgid "Evolution Mail component"
+#~ msgstr "Thành phần thư tín Evolution"
+
+#~ msgid "Evolution Mail composer"
+#~ msgstr "Bộ soạn thư Evolution"
+
+#~ msgid "Evolution Mail composer configuration control"
+#~ msgstr "Bộ đi�u khiển cấu hình bộ soạn thư Evolution."
+
+#~ msgid "Evolution Mail preferences control"
+#~ msgstr "Bộ đi�u khiển tùy thích thư tín Evolution."
+
+#~ msgid "Evolution Network configuration control"
+#~ msgstr "�i�u khiển cấu hình Mạng Evolution"
+
+#~ msgid "%s License Agreement"
+#~ msgstr "�i�u kiện bản quy�n của %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "Please read carefully the license agreement\n"
+#~ "for %s displayed below\n"
+#~ "and tick the check box for accepting it\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Vui lòng đ�c cẩn thận đi�u kiện bản quy�n\n"
+#~ "v� %s được hiển thị bên dưới, và đánh dấu\n"
+#~ "trong hộp ch�n để chấp nhận các đi�u kiện này.\n"
+
+#~ msgid "[Default]"
+#~ msgstr "[Mặc định]"
+
+#~ msgid "Signature(s)"
+#~ msgstr "Chữ ký"
+
+#~ msgid "_Copy to Folder"
+#~ msgstr "_Chép vào thư mục"
+
+#~ msgid "_Move to Folder"
+#~ msgstr "Chu_yển vào thư mục"
+
+#~ msgid "Open in _New Window"
+#~ msgstr "Mở tro_ng cửa sổ mới"
+
+#~ msgid "_Move..."
+#~ msgstr "Chu_yển..."
+
+#~| msgid "Create _Search Folder"
+#~ msgid "_Unread Search Folder"
+#~ msgstr "Thư mục Tìm kiếm C_hưa đ�c"
+
+#~ msgid "U_ndelete"
+#~ msgstr "_Hủy xoá"
+
+#~ msgid "Fla_g Completed"
+#~ msgstr "C� _hoàn tất"
+
+#~ msgid "Cl_ear Flag"
+#~ msgstr "X_oá c�"
+
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "_Tạo quy tắc trên thư"
+
+#~ msgid "Search Folder based on _Subject"
+#~ msgstr "Thư mục tìm kiếm theo _Chủ đ�"
+
+#~ msgid "Search Folder based on Se_nder"
+#~ msgstr "Thư mục tìm kiếm theo Ngư�i _gửi"
+
+#~ msgid "Search Folder based on _Recipients"
+#~ msgstr "Thư mục tìm kiếm theo Ngư�i _nhận"
+
+#~ msgid "Filter based on Sub_ject"
+#~ msgstr "L�c th_eo Chủ đ�"
+
+#~ msgid "Filter based on Sen_der"
+#~ msgstr "L�c the_o Ngư�i gửi"
+
+#~ msgid "Filter based on Re_cipients"
+#~ msgstr "L�c theo Ngư�_i nhận"
+
+#~ msgid "Filter based on _Mailing List"
+#~ msgstr "L�c  theo Hộ_p thư chung"
+
+#~ msgid "Retrieving Message..."
+#~ msgstr "�ang lấy thư..."
+
+#~ msgid "C_all To..."
+#~ msgstr "_G�i cho..."
+
+#~ msgid "Completed on %B %d, %Y, %l:%M %p"
+#~ msgstr "Hoàn tất vào %d %B, %Y, %l:%M %p"
+
+#~ msgid "by %B %d, %Y, %l:%M %p"
+#~ msgstr "trÆ°á»›c %d %B, %Y, %l:%M %p"
+
+#~ msgid "_Fit to Width"
+#~ msgstr "_Vừa khít độ rộng"
+
+#~ msgid "_Save Selected..."
+#~ msgstr "_Lưu vùng ch�n..."
+
+#~ msgid "%d at_tachment"
+#~ msgid_plural "%d at_tachments"
+#~ msgstr[0] "%d đồ đí_nh kèm"
+
+#~ msgid "S_ave"
+#~ msgstr "_LÆ°u"
+
+#~ msgid " (%a, %R %Z)"
+#~ msgstr " (%a, %R %Z)"
+
+#~ msgid " (%R %Z)"
+#~ msgstr " (%R %Z)"
+
+#~ msgid "Tag"
+#~ msgstr "Thẻ"
+
+#~ msgid "To Do"
+#~ msgstr "Cần làm"
+
+#~ msgid "Later"
+#~ msgstr "Sau đó"
+
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "Không thể tạo thư mục mới « %s »: %s"
+
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "Không thể sao chép thư mục « %s » sang « %s »: %s"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr "Không thể quét tìm hộp thư đã có tại « %s »: %s"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution mailbox folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Vị trí và cây của các thư mục hộp thư Evolution đã thay đổi so sánh với "
+#~ "trình Evolution phiên bản 1.x.\n"
+#~ "\n"
+#~ "Hãy kiên nhẫn trong khi Evolution chuyển đổi các thư mục của bạn..."
+
+#~ msgid "Unable to open old POP keep-on-server data `%s': %s"
+#~ msgstr "Không thể mở dữ liệu giữ-trên-máy-chủ POP cũ « %s »: %s"
+
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr "Không thể tạo thư mục dữ liệu giữ-trên-máy-chủ POP3 « %s »: %s"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "Không thể sao chép dữ liệu giữ-trên-máy-chủ POP3 « %s »: %s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr "Việc tạo kho thư địa phương « %s » bị lỗi: %s"
+
+#~ msgid ""
+#~ "Unable to read settings from previous Evolution install, `evolution/"
+#~ "config.xmldb' does not exist or is corrupt."
+#~ msgstr ""
+#~ "Không thể đ�c thiết lập từ bản cài đặt Evolution cũ: tập tin «evolution/"
+#~ "config.xmldb» bị h�ng hay không tồn tại."
+
+#~ msgid "_Reply to sender"
+#~ msgstr "T_rả l�i ngư�i gửi"
+
+#~ msgid "This store does not support subscriptions, or they are not enabled."
+#~ msgstr "Kho này không hỗ trợ đăng ký, hay chưa hiệu lực khả năng ấy."
+
+#~ msgid "Please select a server."
+#~ msgstr "Hãy ch�n máy chủ."
+
+#~ msgid "No server has been selected"
+#~ msgstr "Chưa ch�n máy chủ."
+
+#~ msgid "message"
+#~ msgstr "thÆ°"
+
+#~ msgid "Add address"
+#~ msgstr "Thêm địa chỉ"
+
+#~| msgid "Allows evolution to display text part of limited size"
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr ""
+#~ "Cho Evolution có khả năng hiển thị phần văn bản có kích cỡ bị hạn chế"
+
+#~ msgid "Default height of the message window."
+#~ msgstr "�ộ cao mặc định cửa Cửa sổ Thư."
+
+#~ msgid "Default height of the subscribe dialog."
+#~ msgstr "�ộ cao mặc định cửa hộp thoại �ăng ký."
+
+#~ msgid "Default width of the message window."
+#~ msgstr "�ộ rộng mặc định cửa Cửa sổ Thư."
+
+#~ msgid "Default width of the subscribe dialog."
+#~ msgstr "�ộ rộng mặc định cửa hộp thoại �ăng ký."
+
+#~ msgid ""
+#~ "Enable side bar search feature so that you can start interactive "
+#~ "searching by typing in the text. Use is that you can easily find a folder "
+#~ "in that side bar by just typing the folder name and the selection jumps "
+#~ "automatically to that folder."
+#~ msgstr ""
+#~ "Bật tính năng tìm kiếm khung l� để bắt đầu tìm kiếm tương tác bằng cách "
+#~ "gõ vào đoạn. Có ích để tìm dễ dàng thư mục trong khung l� bằng cách đơn "
+#~ "giản gõ tên thư mục thì phần ch�n nhảy tự động tới thư mục đó."
+
+#~ msgid "Enable to render message text part of limited size."
+#~ msgstr "Bật vẽ phần văn bản thư có kích cỡ bị hạn chế."
+
+#~ msgid ""
+#~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
+#~ "vertically."
+#~ msgstr ""
+#~ "Nếu ô cửa sổ « Xem thử » được bật, hiển thị nó cạnh nhau hơn là theo "
+#~ "chi�u d�c."
+
+#~ msgid "Message Window default height"
+#~ msgstr "�ộ cao mặc định của Cửa sổ thư"
+
+#~ msgid "Message Window default width"
+#~ msgstr "�ộ rộng mặc định của Cửa sổ thư"
+
+#~ msgid "Prompt to check if the user wants to go offline immediately"
+#~ msgstr "Nhắc để kiểm tra ngư�i dùng muốn chuyển sang ngoại tuyến ngay không"
+
+#~ msgid "Subscribe dialog default height"
+#~ msgstr "�ộ cao mặc định của hộp thoại đăng ký"
+
+#~ msgid "Subscribe dialog default width"
+#~ msgstr "�ộ rộng mặc định của hộp thoại đăng ký"
+
+#~ msgid "Thread the message list."
+#~ msgstr "Hiển thị nhánh trong danh sách thư."
+
+#~ msgid "Thread the message-list"
+#~ msgstr "Hiển thị nhánh trong danh sách thư."
+
+#~ msgid "Use side-by-side or wide layout"
+#~ msgstr "Dùng bố trí cạnh nhau hay rộng"
+
+#~ msgid "View/Bcc menu item is checked"
+#~ msgstr "Mục trình đơn Xem/Bcc đã ch�n."
+
+#~ msgid "View/Bcc menu item is checked."
+#~ msgstr "Mục trình đơn Xem/Bcc đã ch�n."
+
+#~ msgid "View/Cc menu item is checked"
+#~ msgstr "Mục trình đơn Xem/Cc đã ch�n."
+
+#~ msgid "View/Cc menu item is checked."
+#~ msgstr "Mục trình đơn Xem/Cc đã ch�n."
+
+#~ msgid "View/From menu item is checked"
+#~ msgstr "Mục trình đơn Xem/Từ đã ch�n."
+
+#~ msgid "View/From menu item is checked."
+#~ msgstr "Mục trình đơn Xem/Từ đã ch�n."
+
+#~ msgid "View/PostTo menu item is checked"
+#~ msgstr "Mục trình đơn Xem/Gửi tới đã ch�n."
+
+#~ msgid "View/PostTo menu item is checked."
+#~ msgstr "Mục trình đơn Xem/Gửi tới đã ch�n."
+
+#~ msgid "View/ReplyTo menu item is checked"
+#~ msgstr "Mục trình đơn Xem/Trả l�i cho đã ch�n."
+
+#~ msgid "View/ReplyTo menu item is checked."
+#~ msgstr "Mục trình đơn Xem/Trả l�i cho đã ch�n."
+
+#~ msgid "New Mail Message"
+#~ msgstr "ThÆ° má»›i"
+
+#~ msgid "New Mail Folder"
+#~ msgstr "Há»™p thÆ° má»›i"
+
+#~ msgid "Failed upgrading Mail settings or folders."
+#~ msgstr "Việc cập nhật thiết lập hay thư mục Thư bị lỗi."
+
+#~ msgid " Ch_eck for Supported Types "
+#~ msgstr " _Kiểm tra có kiểu được hỗ trợ "
+
+#~ msgid "(Note: Requires restart of the application)"
+#~ msgstr "(Ghi chú: cần phải khởi chạy lại ứng dụng)"
+
+#~ msgid "<b>Sig_natures</b>"
+#~ msgstr "<b>Chữ _ký</b>"
+
+#~ msgid "<b>Top Posting Option</b> (Not Recommended)"
+#~ msgstr "<b>Tùy ch�n trả lại ở trên thân gốc</b> (Không phải khuyến khích)"
+
+#~ msgid "<b>_Languages</b>"
+#~ msgstr "<b>_Ngôn ngữ</b>"
+
+#~ msgid "<span weight=\"bold\">Account Information</span>"
+#~ msgstr "<span weight=\"bold\">Thông tin Tài khoản</span>"
+
+#~ msgid "<span weight=\"bold\">Authentication</span>"
+#~ msgstr "<span weight=\"bold\">Xác thực</span>"
+
+#~ msgid "<span weight=\"bold\">Composing Messages</span>"
+#~ msgstr "<span weight=\"bold\">Viết Thư</span>"
+
+#~ msgid "<span weight=\"bold\">Configuration</span>"
+#~ msgstr "<span weight=\"bold\">Cấu hình</span>"
+
+#~ msgid "<span weight=\"bold\">Default Behavior</span>"
+#~ msgstr "<span weight=\"bold\">Hành vi Mặc định</span>"
+
+#~ msgid "<span weight=\"bold\">Delete Mail</span>"
+#~ msgstr "<span weight=\"bold\">Xoá Thư</span>"
+
+#~ msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+#~ msgstr "<span weight=\"bold\">Dòng đầu t_hư đã hiển thị</span>"
+
+#~ msgid "<span weight=\"bold\">Labels</span>"
+#~ msgstr "<span weight=\"bold\">Nhãn</span>"
+
+#~ msgid "<span weight=\"bold\">Loading Images</span>"
+#~ msgstr "<span weight=\"bold\">Tải Ảnh</span>"
+
+#~ msgid "<span weight=\"bold\">Message Display</span>"
+#~ msgstr "<span weight=\"bold\">Hiển thị Thư</span>"
+
+#~ msgid "<span weight=\"bold\">Message Fonts</span>"
+#~ msgstr "<span weight=\"bold\">Phông Thư</span>"
+
+#~ msgid "<span weight=\"bold\">Message Receipts</span>"
+#~ msgstr "<span weight=\"bold\">Thông báo đã ��c thư</span>"
+
+#~ msgid "<span weight=\"bold\">Optional Information</span>"
+#~ msgstr "<span weight=\"bold\">Thông tin Tùy ch�n</span>"
+
+#~ msgid "<span weight=\"bold\">Options</span>"
+#~ msgstr "<span weight=\"bold\">Tùy ch�n</span>"
+
+#~ msgid "<span weight=\"bold\">Printed Fonts</span>"
+#~ msgstr "<span weight=\"bold\">Phông chữ in</span>"
+
+#~ msgid "<span weight=\"bold\">Proxy Settings</span>"
+#~ msgstr "<span weight=\"bold\">Thiết lập Ủy nhiệm</span>"
+
+#~ msgid "<span weight=\"bold\">Required Information</span>"
+#~ msgstr "<span weight=\"bold\">Thông tin cần thiết</span>"
+
+#~ msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+#~ msgstr "<span weight=\"bold\">MIME bảo mật (S/MIME)</span>"
+
+#~ msgid "<span weight=\"bold\">Security</span>"
+#~ msgstr "<span weight=\"bold\">Bảo mật</span>"
+
+#~ msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+#~ msgstr "<span weight=\"bold\">Thư �ã gửi và Thư Nháp</span>"
+
+#~ msgid "<span weight=\"bold\">Server Configuration</span>"
+#~ msgstr "<span weight=\"bold\">Cấu hình máy chủ</span>"
+
+#~ msgid "<span weight=\"bold\">_Authentication Type</span>"
+#~ msgstr "<span weight=\"bold\">Kiểu _xác thực</span>"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "Ban-tích (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "Ban-tích (ISO-8859-4)"
+
+#~ msgid "Ch_eck for Supported Types "
+#~ msgstr "_Kiểm tra có kiểu được hỗ trợ "
+
+#~ msgid "Checks incoming mail messages to be Junk"
+#~ msgstr "Kiểm tra nếu thư đã gửi đến là thư rác"
+
+#~| msgid "Do not format text contents in messages if the text si_ze exceeds"
+#~ msgid "Do not format messages when text si_ze exceeds"
+#~ msgstr "�ừng định dạng thư khi kích cỡ văn bản vượt _quá"
+
+#~ msgid "Email Accounts"
+#~ msgstr "Tài khoản Thư"
+
+#~| msgid "Enable Magic S_pacebar "
+#~ msgid "Enable Magic S_pacebar"
+#~ msgstr "Bật _phím dài ma thuật"
+
+#~ msgid "Enable Sea_rch Folders"
+#~ msgstr "Bật thư mục tìm _kiếm"
+
+#~ msgid "Fi_xed-width:"
+#~ msgstr "�ộ rộng _cố định:"
+
+#~ msgid "Font Properties"
+#~ msgstr "Thuộc tính phông chữ"
+
+#~ msgid "KB"
+#~ msgstr "KB"
+
+#~ msgid "Message Composer"
+#~ msgstr "Bộ soạn thư"
+
+#~ msgid ""
+#~ "Note: you will not be prompted for a password until you connect for the "
+#~ "first time"
+#~ msgstr "Ghi chú: sẽ không nhắc bạn gõ mật khẩu tới khi kết nối lần đầu."
+
+#~ msgid "S_OCKS Host:"
+#~ msgstr "Máy S_OCKS:"
+
+#~| msgid "Select Folder"
+#~ msgid "Select Drafts Folder"
+#~ msgstr "Ch�n thư mục Nháp"
+
+#~ msgid "Select HTML fixed width font for printing"
+#~ msgstr "Ch�n phông chữ HTML độ rộng cứng để in"
+
+#~ msgid "Select HTML variable width font for printing"
+#~ msgstr "Ch�n phông HTML độ rộng thay đổi để in"
+
+#~| msgid "Select Folder"
+#~ msgid "Select Sent Folder"
+#~ msgstr "Ch�n thư mục �ã Gửi"
+
+#~ msgid "Sending Mail"
+#~ msgstr "�ang gửi thư"
+
+#~ msgid "Signatures Table"
+#~ msgstr "Bảng Chữ ký"
+
+#~ msgid "V_ariable-width:"
+#~ msgstr "�ộ rộng _biến:"
+
+#~ msgid "_Automatic proxy configuration URL:"
+#~ msgstr "U_RL tự động cấu hình ủy nhiệm:"
+
+#~ msgid "_Mark messages as read after"
+#~ msgstr "�ánh dấu thư đã đ�c _sau"
+
+#~ msgid "_Shrink To / Cc / Bcc headers to "
+#~ msgstr "Th_u g�n dòng đầu Cho/CC/BCC thành "
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "<b>Search Folder Sources</b>"
+#~ msgstr "<b>Nguồn Thư mục Tìm kiếm</b>"
+
+#~ msgid "<span weight=\"bold\">Digital Signature</span>"
+#~ msgstr "<span weight=\"bold\">Chữ ký số</span>"
+
+#~ msgid "<span weight=\"bold\">Encryption</span>"
+#~ msgstr "<span weight=\"bold\">Mật mã</span>"
+
+#~ msgid "Case _sensitive"
+#~ msgstr "_Phân biệt hoa/thư�ng"
+
+#~ msgid "F_ind:"
+#~ msgstr "_Tìm:"
+
+#~ msgid "Find in Message"
+#~ msgstr "Tìm trong thư"
+
+#~ msgid "None Selected"
+#~ msgstr "Chưa ch�n"
+
+#~ msgid "S_erver:"
+#~ msgstr "Máy _phục vụ:"
+
+#~ msgid "Could not write data: %s"
+#~ msgstr "Không thể ghi dữ liệu: %s"
+
+#~ msgid "Because \"{0}\"."
+#~ msgstr "Vì « {0} »."
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "Vì « {2} »."
+
+#~ msgid "Delete \"{0}\"?"
+#~ msgstr "Xoá « {0} » ?"
+
+#~ msgid "Delete messages in Search Folder?"
+#~ msgstr "Xoá các thư kh�i thư mục tìm kiếm không?"
+
+#~ msgid "Discard changes?"
+#~ msgstr "Hủy các thay đổi không?"
+
+#~ msgid "Do not d_elete"
+#~ msgstr "�ừng x_oá"
+
+#~ msgid "Mark all messages as read"
+#~ msgstr "�ánh dấu m�i thư �ã đ�c"
+
+#~ msgid "Querying server"
+#~ msgstr "�ang truy vấn máy chủ..."
+
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "Những thư mục tìm kiếm theo đây:\n"
+#~ "{0}\n"
+#~ "đã dùng thư mục vừa mới bị gỡ b�:\n"
+#~ "    « {1} »\n"
+#~ "và đã được cập nhật."
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "Những quy tắc l�c theo đây:\n"
+#~ "{0}\n"
+#~ "đã dùng thư mục vừa mới bị gỡ b�:\n"
+#~ "    « {1} »\n"
+#~ "và đã được cập nhật."
+
+#~| msgid "Subject or Sender contains"
+#~ msgid "Subject or Recipients contains"
+#~ msgstr "Chủ đ� hay Ngư�i gửi chứa"
+
+#~ msgid "Provides core functionality for local address books."
+#~ msgstr "Cung cấp chức năng lõi cho các sổ địa chỉ cục bộ."
+
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr ""
+#~ "Danh sách các đầu mối cho phần bổ sung nhắc nhở đồ đính kèm tìm trong "
+#~ "thân thư."
+
+#~ msgid ""
+#~ "Looks for clues in a message for mention of attachments and warns if the "
+#~ "attachment is missing"
+#~ msgstr ""
+#~ "Trong thư, tìm đầu mối ngụ ý nên đính kèm tập tin, và cảnh báo nếu đồ "
+#~ "đính kèm còn thiếu"
+
+#~| msgid ""
+#~| "A formatter plugin which displays audio attachments inline and allows "
+#~| "you to play them directly from evolution."
+#~ msgid ""
+#~ "A formatter plugin which displays audio attachments inline and allows you "
+#~ "to play them directly from Evolution."
+#~ msgstr ""
+#~ "Một phần bổ sung định dạng mà hiển thị bên trong thư tập tin đính kèm "
+#~ "kiểu âm thanh, và cho phép ngư�i dùng phát chúng một cách trực tiếp từ "
+#~ "trình Evolution."
+
+#~ msgid "Audio inline plugin"
+#~ msgstr "Phần bổ sung trực tiếp âm thanh"
+
+#~ msgid "A plugin for backing up and restore Evolution data and settings."
+#~ msgstr ""
+#~ "Phần bổ sung để lưu trữ và phục hồi dữ liệu và thiết lập của trình "
+#~ "Evolution."
+
+#~ msgid ""
+#~ "Evolution backup can start only when Evolution is not running. Please "
+#~ "make sure that you save and close all your unsaved windows before "
+#~ "proceeding.  If you want Evolution to restart automatically after backup, "
+#~ "please enable the toggle button."
+#~ msgstr ""
+#~ "Việc sao lưu Evolution chỉ có thể khởi chạy khi Evolution không đang "
+#~ "chạy. Kiểm tra bạn đã lưu và đóng tất cả các cửa sổ chưa lưu trước khi "
+#~ "tiếp tục lại. Nếu bạn muốn Evolution tự động khởi chạy sau khi sao lưu, "
+#~ "hãy hiệu lực cái nút bật/tắt."
+
+#~ msgid ""
+#~ "This will delete all your current Evolution data and settings and restore "
+#~ "them from your backup. Evolution restore can start only when Evolution is "
+#~ "not running. Please make sure that you close all your unsaved windows "
+#~ "before you proceed. If you want Evolution to restart automatically "
+#~ "restart after restore, please enable the toggle button."
+#~ msgstr ""
+#~ "Việc này sẽ xoá tất cả các dữ liệu và thiết lập Evolution của bạn, rồi "
+#~ "phục hồi từ bản sao lưu. Việc phục hồi Evolution chỉ có thể khởi chạy khi "
+#~ "Evolution không đang chạy. Kiểm tra bạn đã lưu và đóng tất cả các cửa sổ "
+#~ "chưa lưu trước khi tiếp tục lại. Nếu bạn muốn Evolution tự động khởi chạy "
+#~ "sau khi phục hồi, hãy hiệu lực cái nút bật/tắt. "
+
+#~ msgid "R_estore Settings..."
+#~ msgstr "Thiết lập _Phục hồi..."
+
+#~ msgid "_Backup Settings..."
+#~ msgstr "Thiết lập _Sao lưu..."
+
+#~ msgid "CalDAV Calendar sources"
+#~ msgstr "Nguồn Lịch CalDAV"
+
+#~ msgid "Provides core functionality for local calendars."
+#~ msgstr "Cung cấp chức năng lõi cho các lịch cục bộ."
+
+#~ msgid "HTTP Calendars"
+#~ msgstr "Lịch HTTP"
+
+#~ msgid "Provides core functionality for webcal and http calendars."
+#~ msgstr "Cung cấp chức năng lõi cho lịch webcal và HTTP."
+
+#~ msgid "Provides core functionality for weather calendars."
+#~ msgstr "Cung cấp chức năng lõi cho lịch th�i tiết."
+
+#~ msgid ""
+#~ "A test plugin which demonstrates a popup menu plugin which lets you copy "
+#~ "things to the clipboard."
+#~ msgstr ""
+#~ "Một bổ sung thử nghiệm để biểu diễn một bổ sung trình đơn bật lên cho "
+#~ "phép bạn sao chép đi�u vào bảng nháp."
+
+#~ msgid "Copy tool"
+#~ msgstr "Công cụ chép"
+
+#~ msgid "Checks whether Evolution is the default mail client on startup."
+#~ msgstr "Kiểm tra nếu Evolution là trình thư mặc định, khi khởi chạy."
+
+#~| msgid ""
+#~| "Provides functionality for marking a calendar or an addressbook as the "
+#~| "default one."
+#~ msgid ""
+#~ "Provides functionality for marking a calendar or an address book as the "
+#~ "default one."
+#~ msgstr ""
+#~ "Cung cấp chức năng để đánh dấu một lịch hay sổ địa chỉ nào đó là cái mặc "
+#~ "định."
+
+#~ msgid "_Folder Name:"
+#~ msgstr "Tên thư _mục:"
+
+#~ msgid "_User:"
+#~ msgstr "_Ngư�i dùng:"
+
+#~ msgid "Secure Password"
+#~ msgstr "Mật khẩu bảo mật"
+
+#~ msgid ""
+#~ "This option will connect to the Exchange server using secure password "
+#~ "(NTLM) authentication."
+#~ msgstr ""
+#~ "Tùy ch�n này sẽ kết nối đến máy chủ Exchange dùng cách xác thực mặt khẩu "
+#~ "bảo mật (NTLM)."
+
+#~ msgid "Plaintext Password"
+#~ msgstr "Mật khẩu chữ thô"
+
+#~ msgid ""
+#~ "This option will connect to the Exchange server using standard plaintext "
+#~ "password authentication."
+#~ msgstr ""
+#~ "Tùy ch�n này sẽ kết nối tới máy chủ Exchange dùng cách xác thực mật khẩu "
+#~ "chữ thô (không mã hoá)."
+
+#~ msgid "Out Of Office"
+#~ msgstr "Ở ngoại văn phòng"
+
+#~ msgid ""
+#~ "The message specified below will be automatically sent to \n"
+#~ "each person who sends mail to you while you are out of the office."
+#~ msgstr ""
+#~ "Thư dưới đây sẽ được gửi tự động\n"
+#~ "tới mỗi ngư�i gửi thư cho bạn khi bạn ở ngoài văn phòng."
+
+#~ msgid "I am out of the office"
+#~ msgstr "Tôi hiện th�i ở ngoài văn phòng"
+
+#~ msgid "I am in the office"
+#~ msgstr "Tôi đang ở trong văn phòng"
+
+#~ msgid "Change the password for Exchange account"
+#~ msgstr "Thay đổi mật khẩu cho tài khoản Exchange"
+
+#~ msgid "Change Password"
+#~ msgstr "�ổi mật khẩu"
+
+#~ msgid "Manage the delegate settings for Exchange account"
+#~ msgstr "Quản lý thiết lập ủy nhiệm cho tài khoản Exchange"
+
+#~ msgid "Delegation Assistant"
+#~ msgstr "Trợ tá ủy nhiệm"
+
+#~ msgid "View the size of all Exchange folders"
+#~ msgstr "Xem kích cỡ của m�i thư mục Exchange"
+
+#~ msgid "Folders Size"
+#~ msgstr "Cỡ thư mục"
+
+#~ msgid "Exchange Settings"
+#~ msgstr "Thiết lập Exchange"
+
+#~ msgid "_OWA URL:"
+#~ msgstr "�ịa chỉ URL _OWA:"
+
+#~ msgid "A_uthenticate"
+#~ msgstr "_Xác thực"
+
+#~| msgid "Specify _filename:"
+#~ msgid "S_pecify the mailbox name"
+#~ msgstr "_Xác định tên hộp thư"
+
+#~| msgid "_Mail"
+#~ msgid "_Mailbox:"
+#~ msgstr "_Há»™p thÆ°:"
+
+# Variable and unit: do not translate/ biến và đơn vị: đừng dịch
+#~ msgid "%s KB"
+#~ msgstr "%s KB"
+
+#~ msgid "0 KB"
+#~ msgstr "0 KB"
+
+#~ msgid ""
+#~ "Evolution is in offline mode. You cannot create or modify folders now.\n"
+#~ "Please switch to online mode for such operations."
+#~ msgstr ""
+#~ "Trình Evolution hiện th�i trong chế độ ngoại tuyến. Như thế thì bạn chưa "
+#~ "có thể tạo hay sửa đổi thư mục.\n"
+#~ "Hãy chuyển đổi sang chế độ trực tuyến cho thao tác như vậy."
+
+#~ msgid ""
+#~ "The current password does not match the existing password for your "
+#~ "account. Please enter the correct password"
+#~ msgstr ""
+#~ "Mật khẩu hiện th�i không khớp với mật khẩu tồn tại cho tài khoản bạn. Hãy "
+#~ "gõ mật khẩu đúng."
+
+#~ msgid "The two passwords do not match. Please re-enter the passwords."
+#~ msgstr "Hai mật khẩu không khớp. Hãy nhập lại."
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Xác nhận mật khẩu:"
+
+#~ msgid "Current Password:"
+#~ msgstr "Mật khẩu hiện th�i"
+
+#~ msgid "New Password:"
+#~ msgstr "Mật khẩu mới:"
+
+#~ msgid "Your current password has expired. Please change your password now."
+#~ msgstr ""
+#~ "Mật khẩu hiện th�i của bạn đã hết hạn. Hãy thay đổi mật khẩu bạn ngay bây "
+#~ "gi�."
+
+#~ msgid "Your password will expire in the next %d days"
+#~ msgstr "Mật khẩu bạn sẽ hết hạn dùng trong vòng %d ngày"
+
+#~ msgid "Custom"
+#~ msgstr "Tự ch�n"
+
+#~ msgid "Editor (read, create, edit)"
+#~ msgstr "Ngư�i sửa (đ�c, tạo, sửa)"
+
+#~ msgid "Author (read, create)"
+#~ msgstr "Tác giả (đ�c, tạo)"
+
+#~ msgid "Reviewer (read-only)"
+#~ msgstr "Ngư�i xem lại (chỉ đ�c)"
+
+#~ msgid "Delegate Permissions"
+#~ msgstr "Quy�n hạn ủy nhiệm"
+
+#~ msgid "Permissions for %s"
+#~ msgstr "Quy�n hạn cho %s"
+
+#~ msgid ""
+#~ "This message was sent automatically by Evolution to inform you that you "
+#~ "have been designated as a delegate. You can now send messages on my "
+#~ "behalf."
+#~ msgstr ""
+#~ "Thư này đã được gửi tự động bởi Evolution để cho bạn biết rằng tôi đã ủy "
+#~ "nhiệm cho bạn. Vì vậy bạn có quy�n gửi thư cho mặt của tôi."
+
+#~ msgid "You have been given the following permissions on my folders:"
+#~ msgstr ""
+#~ "Bạn đã nhận những quy�n hạn theo đây để truy cập các thư mục của tôi:"
+
+#~ msgid "You are also permitted to see my private items."
+#~ msgstr "Bạn cũng có quy�n xem các mục riêng của tôi."
+
+#~ msgid "However you are not permitted to see my private items."
+#~ msgstr "Tuy nhiên, bạn không có quy�n xem các mục riêng của tôi."
+
+#~ msgid "You have been designated as a delegate for %s"
+#~ msgstr "%s đã ủy nhiệm cho bạn."
+
+#~ msgid "Could not access Active Directory"
+#~ msgstr "Không thể truy cập Thư mục Hoạt động."
+
+#~ msgid "Could not find self in Active Directory"
+#~ msgstr "Không tìm thấy chính nó trong Thư mục Hoạt động."
+
+#~ msgid "Could not find delegate %s in Active Directory"
+#~ msgstr "Không tìm thấy ngư�i ủy nhiệm %s trong Thư mục hoạt động."
+
+#~ msgid "Could not remove delegate %s"
+#~ msgstr "Không thể gỡ b� ngư�i ủy nhiệm %s."
+
+#~ msgid "Could not update list of delegates."
+#~ msgstr "Không thể cập nhật danh sách các ngư�i ủy nhiệm."
+
+#~ msgid "Could not add delegate %s"
+#~ msgstr "Không thể thêm ngư�i ủy nhiệm %s."
+
+#~ msgid "Error reading delegates list."
+#~ msgstr "Gặp lỗi khi đ�c danh sách các ngư�i ủy nhiệm."
+
+#~ msgid "C_alendar:"
+#~ msgstr "_Lịch:"
+
+#~ msgid "Co_ntacts:"
+#~ msgstr "Liê_n lạc:"
+
+#~ msgid "Delegates"
+#~ msgstr "Ngư�i ủy nhiệm"
+
+#~ msgid "Permissions for"
+#~ msgstr "Quy�n hạn cho"
+
+#~ msgid ""
+#~ "These users will be able to send mail on your behalf\n"
+#~ "and access your folders with the permissions you give them."
+#~ msgstr ""
+#~ "Những ngư�i dùng này sẽ có thể gửi thư điện tử\n"
+#~ "thay mặt cho bạn, cũng có thể truy cập các thư mục bạn,\n"
+#~ "dùng quy�n hạn mà bạn đã cho h�."
+
+#~ msgid "_Delegate can see private items"
+#~ msgstr "Ngư�i ủ_y nhiệm có thể thấy những mục tư nhân"
+
+#~ msgid "_Inbox:"
+#~ msgstr "Hộp Thư _�ến:"
+
+#~ msgid "_Summarize permissions"
+#~ msgstr "Tóm tắt _quy�n hạn"
+
+#~ msgid "Permissions..."
+#~ msgstr "Quy�n hạn..."
+
+#~ msgid "Folder Name"
+#~ msgstr "Tên thư mục:"
+
+#~ msgid "Folder Size"
+#~ msgstr "Cỡ thư mục"
+
+#~ msgid "User"
+#~ msgstr "Ngư�i dùng"
+
+#~ msgid "Exchange Folder Tree"
+#~ msgstr "Cây thư mục Exchange"
+
+#~ msgid "Unsubscribe Folder..."
+#~ msgstr "B� đăng ký thư mục..."
+
+#~ msgid "Unsubscribe from \"%s\""
+#~ msgstr "B� đăng ký trên thư mục « %s »"
+
+#~ msgid ""
+#~ "<b>Currently, your status is \"Out of the Office\". </b>\n"
+#~ "\n"
+#~ "Would you like to change your status to \"In the Office\"? "
+#~ msgstr ""
+#~ "<b>Hiện th�i, trạng thái của bạn là «Ngoài văn phòng». </b>\n"
+#~ "\n"
+#~ "Bạn có muốn thay đổi trạng thái thành «Trong văn phòng» không? "
+
+#~ msgid "<b>Out of Office Message:</b>"
+#~ msgstr "<b>Thư ngoài văn phòng:</b>"
+
+#~ msgid "<b>Status:</b>"
+#~ msgstr "<b>Trạng thái:</b>"
+
+#~ msgid ""
+#~ "<small>The message specified below will be automatically sent to each "
+#~ "person who sends\n"
+#~ "mail to you while you are out of the office.</small>"
+#~ msgstr ""
+#~ "<small>Thư dưới đây sẽ được tự động gửi tới mỗi ngư�i gửi thư cho bạn\n"
+#~ "khi bạn ở ngoài văn phòng.</small>"
+
+#~ msgid "I am currently in the office"
+#~ msgstr "Tôi đang ở trong văn phòng"
+
+#~ msgid "I am currently out of the office"
+#~ msgstr "Tôi hiện th�i ở ngoài văn phòng"
+
+#~ msgid "No, Don't Change Status"
+#~ msgstr "Không, đừng đổi trạng thái"
+
+#~ msgid "Out of Office Assistant"
+#~ msgstr "Trợ tá ngoài văn phòng"
+
+#~ msgid "Yes, Change Status"
+#~ msgstr "Có, đổi trạng thái"
+
+#~ msgid "Password Expiry Warning..."
+#~ msgstr "Cảnh báo Hết hạn dùng Mật khẩu..."
+
+#~ msgid "Your password will expire in 7 days..."
+#~ msgstr "Mật khẩu bạn sẽ hết hạn dùng trong vòng 7 ngày..."
+
+#~ msgid "_Change Password"
+#~ msgstr "Tha_y mật khẩu"
+
+#~ msgid "(Permission denied.)"
+#~ msgstr "(Không đủ quy�n truy cập.)"
+
+#~ msgid "Add User:"
+#~ msgstr "Thêm ngư�i dùng:"
+
+#~ msgid "<b>Permissions</b>"
+#~ msgstr "<b>Quy�n hạn</b>"
+
+#~ msgid "Cannot Delete"
+#~ msgstr "Không thể xoá"
+
+#~ msgid "Cannot Edit"
+#~ msgstr "Không thể Sửa"
+
+#~ msgid "Create items"
+#~ msgstr "Tạo mục"
+
+#~ msgid "Create subfolders"
+#~ msgstr "Tạo thư mục con"
+
+#~ msgid "Delete Any Items"
+#~ msgstr "Xoá m�i mục"
+
+#~ msgid "Delete Own Items"
+#~ msgstr "Xoá mục của mình"
+
+#~ msgid "Edit Any Items"
+#~ msgstr "Sửa m�i mục"
+
+#~ msgid "Edit Own Items"
+#~ msgstr "Sửa mục mình"
+
+#~ msgid "Folder contact"
+#~ msgstr "Liên lạc thư mục"
+
+#~ msgid "Folder owner"
+#~ msgstr "Ngư�i sở hữu thư mục"
+
+#~ msgid "Folder visible"
+#~ msgstr "Hiển thị thư mục"
+
+#~ msgid "Read items"
+#~ msgstr "Mục đã đ�c"
+
+#~ msgid "Role: "
+#~ msgstr "Vai trò: "
+
+#~ msgid "<b>Message Settings</b>"
+#~ msgstr "<b>Thiết lập Thông điệp</b>"
+
+#~ msgid "<b>Tracking Options</b>"
+#~ msgstr "<b>Tùy ch�n Theo dõi</b>"
+
+#~ msgid "Exchange - Send Options"
+#~ msgstr "Exchange - Tuỳ ch�n gửi"
+
+#~ msgid "I_mportance: "
+#~ msgstr "_Quan tr�ng: "
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "High\n"
+#~ "Low"
+#~ msgstr ""
+#~ "Bình thư�ng\n"
+#~ "Cao\n"
+#~ "Thấp"
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "Personal\n"
+#~ "Private\n"
+#~ "Confidential"
+#~ msgstr ""
+#~ "Bình thư�ng\n"
+#~ "Cá nhân\n"
+#~ "Riêng tư\n"
+#~ "Bí mật"
+
+#~ msgid "Request a _delivery receipt for this message"
+#~ msgstr "Yêu cầu một thông _báo đã gửi cho thư này"
+
+#~ msgid "Request a _read receipt for this message"
+#~ msgstr "Yêu cầu một thông báo đã đ�_c cho thư này"
+
+#~ msgid "Send as Delegate"
+#~ msgstr "Gửi với quy�n ngư�i ủy nhiệm"
+
+#~ msgid "_Sensitivity: "
+#~ msgstr "�ộ _nhạy cảm: "
+
+#~ msgid "_User"
+#~ msgstr "_Ngư�i dùng"
+
+#~ msgid "Select User"
+#~ msgstr "Ch�n ngư�i dùng"
+
+#~ msgid "Address Book..."
+#~ msgstr "Sổ địa chỉ..."
+
+#~ msgid "Subscribe to Other User's Contacts"
+#~ msgstr "�ăng ký với các liên lạc của ngư�i dùng khác"
+
+#~ msgid "Subscribe to Other User's Calendar"
+#~ msgstr "�ăng ký với lịch của ngư�i dùng khác"
+
+#~ msgid ""
+#~ "A plugin that manages a collection of Exchange account specific "
+#~ "operations and features."
+#~ msgstr ""
+#~ "Phần bổ sung có quản lý một số thao tác đặc trưng cho tài khoản Exchange."
+
+#~ msgid "Exchange Operations"
+#~ msgstr "Thiết lập Exchange"
+
+#~ msgid "Cannot access the \"Exchange settings\" tab in offline mode."
+#~ msgstr ""
+#~ "Không thể truy cập đến thẻ « Thiết lập Trao đổi » trong chế độ ngoại "
+#~ "tuyến."
+
+#~ msgid "Cannot change password due to configuration problems."
+#~ msgstr "Không thể thay đổi mật khẩu vì vấn đ� cấu hình."
+
+#~ msgid "Cannot display folders."
+#~ msgstr "Không thể hiển thị thư mục."
+
+#~ msgid "Cannot perform the operation."
+#~ msgstr "Không thể thực hiện thao tác đó."
+
+#~ msgid ""
+#~ "Changes to options for Exchange account \"{0}\" will only take effect "
+#~ "after restarting Evolution."
+#~ msgstr ""
+#~ "Các thay đổi trong tùy ch�n của tài khoản Evolution « {0} » sẽ có tác "
+#~ "động chỉ sau khi bạn khởi chạy lại trình Evolution."
+
+#~ msgid "Could not authenticate to server."
+#~ msgstr "Không thể xác thực tới máy chủ."
+
+#~ msgid "Could not change password."
+#~ msgstr "Không thể thay đổi mật khẩu."
+
+#~ msgid ""
+#~ "Could not configure Exchange account because \n"
+#~ "an unknown error occurred. Check the URL, \n"
+#~ "username, and password, and try again."
+#~ msgstr ""
+#~ "Không thể cấu hình tài khoản Exchange\n"
+#~ "vì gặp một lỗi lạ. Bạn hãy kiểm tra đã gõ đúng\n"
+#~ "địa chỉ mạng, tên ngư�i dùng và mật khẩu\n"
+#~ "rồi thử lại."
+
+#~ msgid "Could not connect to Exchange server."
+#~ msgstr "Không thể kết nối đến máy chủ Exchange."
+
+#~ msgid "Could not connect to server {0}."
+#~ msgstr "Không thể kết nối đến máy chủ {0}."
+
+#~ msgid "Could not determine folder permissions for delegates."
+#~ msgstr "Không thể xác định quy�n truy cập thư mục cho ngư�i ủy nhiệm."
+
+#~ msgid "Could not find Exchange Web Storage System."
+#~ msgstr "Không tìm thấy Hệ thống Cất giữ Web Exchange."
+
+#~ msgid "Could not locate server {0}."
+#~ msgstr "Không thể định vị máy chủ {0}."
+
+#~ msgid "Could not make {0} a delegate"
+#~ msgstr "Không thể ủy nhiệm cho {0}."
+
+#~ msgid "Could not read folder permissions"
+#~ msgstr "Không thể đ�c quy�n truy cập thư mục."
+
+#~ msgid "Could not read folder permissions."
+#~ msgstr "Không thể đ�c quy�n truy cập thư mục."
+
+#~ msgid "Could not read out-of-office state"
+#~ msgstr "Không thể đ�c tính trạng ngoài-văn-phòng."
+
+#~ msgid "Could not update folder permissions."
+#~ msgstr "Không thể cập nhật quy�n truy cập thư mục."
+
+#~ msgid "Could not update out-of-office state"
+#~ msgstr "Không thể cập nhật tính trạng ngoài-văn-phòng."
+
+#~ msgid "Evolution requires a restart to load the subscribed user's mailbox"
+#~ msgstr ""
+#~ "Evolution cần phải khởi động lại để nạp hộp thư của ngư�i dùng đã đăng ký"
+
+#~ msgid "Exchange Account is offline."
+#~ msgstr "Tài khoản Exchange đang ngoại tuyến."
+
+#~ msgid ""
+#~ "Exchange Connector requires access to certain\n"
+#~ "functionality on the Exchange Server that appears\n"
+#~ "to be disabled or blocked. (This is usually \n"
+#~ "unintentional.) Your Exchange Administrator will \n"
+#~ "need to enable this functionality in order for \n"
+#~ "you to be able to use Evolution Exchange Connector.\n"
+#~ "\n"
+#~ "For information to provide to your Exchange \n"
+#~ "administrator, please follow the link below:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "  "
+#~ msgstr ""
+#~ "Trình Exchange Connector cần thiết truy cập\n"
+#~ "chức năng nào đó trên máy chủ Exchange\n"
+#~ "dương như bị tắt hay bị trở ngại.\n"
+#~ "(Thư�ng không phải do chủ tâm.)\n"
+#~ "Quản trị Exchange của bạn sẽ cần phải bật\n"
+#~ "chức năng này để cho phép bạn sử dụng\n"
+#~ "trình Ximian Connector.\n"
+#~ "\n"
+#~ "�ể xem thông tin cần cung cấp cho quản trị Exchange,\n"
+#~ "hãy theo liên kết bên dưới đây:\n"
+#~ "\n"
+#~ "<{0}>\n"
+#~ "  "
+
+#~ msgid "Folder already exists"
+#~ msgstr "Thư mục này đã có"
+
+#~ msgid "Folder does not exist"
+#~ msgstr "Không có thư mục này"
+
+#~ msgid "Folder offline"
+#~ msgstr "Thư mục này ngoại tuyến."
+
+#~ msgid "Generic error"
+#~ msgstr "Lá»—i chung"
+
+#~ msgid "Global Catalog Server is not reachable"
+#~ msgstr "Không thể tới Trình phục vụ phân loại toàn cục"
+
+#~ msgid ""
+#~ "If OWA is running on a different path, you must specify that in the "
+#~ "account configuration dialog."
+#~ msgstr ""
+#~ "Nếu OWA đang chạy trên đư�ng dẫn khác thì bạn cần phải ghi rõ nó trong "
+#~ "hộp thoại cấu hình tài khoản."
+
+#~ msgid "Mailbox for {0} is not on this server."
+#~ msgstr "Không có hộp thư cho {0} trên máy chủ này."
+
+#~ msgid "Make sure the URL is correct and try again."
+#~ msgstr "Hãy kiểm tra xem gõ địa chỉ mạng đúng, rồi thử lại."
+
+#~ msgid "Make sure the server name is spelled correctly and try again."
+#~ msgstr "Hãy kiểm tra xem gõ tên phục vụ đúng, rồi thử lại."
+
+#~ msgid "Make sure the username and password are correct and try again."
+#~ msgstr "Hãy kiểm tra xem gõ tên ngư�i dùng và mật khẩu đúng, rồi thử lại."
+
+#~ msgid "No Global Catalog server configured for this account."
+#~ msgstr ""
+#~ "Không có trình phục vụ Phân loại Toàn cục được cấu hình cho tài khoản này."
+
+#~ msgid "No mailbox for user {0} on {1}."
+#~ msgstr "Không có hộp thư cho ngư�i dùng {0} trên {1}."
+
+#~ msgid "No such user {0}"
+#~ msgstr "Không có ngư�i dùng như vậy {0}."
+
+#~ msgid "Password successfully changed."
+#~ msgstr "Mật khẩu đã được thay đổi."
+
+#~ msgid ""
+#~ "Please enter a Delegate's ID or deselect the Send as a Delegate option."
+#~ msgstr ""
+#~ "Hãy gõ mã hiệu ngư�i ủy nhiệm, hoặc tắt tùy ch�n « Gửi với quy�n ngư�i ủy "
+#~ "nhiệm »."
+
+#~ msgid "Please make sure the Global Catalog Server name is correct."
+#~ msgstr "Hãy kiểm tra xem tên của Trình phục vụ phân loại toàn cục là đúng."
+
+#~ msgid "Please restart Evolution for changes to take effect"
+#~ msgstr "Hãy khởi chạy lại Evolution để các thay đổi có tác động"
+
+#~ msgid "Server rejected password because it is too weak."
+#~ msgstr "Máy chủ đã từ chối mật khẩu vì quá yếu."
+
+#~ msgid "The Exchange account will be disabled when you quit Evolution"
+#~ msgstr "Tài khoản Exchange sẽ bị vô hiệu hoá khi bạn thoát trình Evolution."
+
+#~ msgid "The Exchange account will be removed when you quit Evolution"
+#~ msgstr "Tài khoản Exchange sẽ bị gỡ b� khi bạn thoát trình Evolution."
+
+#~ msgid "The Exchange server is not compatible with Exchange Connector."
+#~ msgstr "Tài khoản Exchange không tương thích với Exchange Connector."
+
+#~ msgid ""
+#~ "The server is running Exchange 5.5. Exchange Connector \n"
+#~ "supports Microsoft Exchange 2000 and 2003 only."
+#~ msgstr ""
+#~ "Máy chủ có chạy phần m�m Exchange phiên bản 5.5.\n"
+#~ "Exchange Connector hỗ trợ chỉ Microsoft™ Exchange phiên bản 2000 và 2003."
+
+#~ msgid ""
+#~ "This probably means that your server requires \n"
+#~ "you to specify the Windows domain name \n"
+#~ "as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
+#~ "\n"
+#~ "Or you might have just typed your password wrong."
+#~ msgstr ""
+#~ "Rất có thể có nghĩa là máy chủ cần thiết\n"
+#~ "bạn ghi rõi tên mi�n Windows là phần của tên ngư�i dùng\n"
+#~ "(v.d. « MIỀN\\ngư�i_dùng »).\n"
+#~ "\n"
+#~ "Hoặc có lẽ bạn đã gõ sai mật khẩu."
+
+#~ msgid "Try again with a different password."
+#~ msgstr "Hãy thử lại với một mật khẩu mới."
+
+#~ msgid "Unable to add user to access control list:"
+#~ msgstr "Không thể thêm ngư�i dùng vào danh sách đi�u khiển truy cập."
+
+#~ msgid "Unable to edit delegates."
+#~ msgstr "Không thể sửa đổi ngư�i ủy nhiệm."
+
+#~ msgid "Unknown error looking up {0}"
+#~ msgstr "Gặp lỗi lạ khi tra cứu {0}."
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Thao tác không được hỗ trợ"
+
+#~ msgid ""
+#~ "You are nearing your quota available for storing mail on this server."
+#~ msgstr "Bạn gần vượt quá giới hạn lưu thư trên máy chủ này."
+
+#~ msgid ""
+#~ "You are permitted to send a message on behalf of only one delegator at a "
+#~ "time."
+#~ msgstr "Bạn có quy�n gửi mỗi thư thay mặt cho chỉ một ngư�i cho ủy nhiệm."
+
+#~ msgid "You cannot make yourself your own delegate"
+#~ msgstr "Bạn không thể ủy nhiệm cho mình."
+
+#~ msgid "You have exceeded your quota for storing mail on this server."
+#~ msgstr "Bạn đã vượt quá giới hạn lưu thư trên máy chủ này."
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. Try to clear up some space by deleting "
+#~ "some mail."
+#~ msgstr ""
+#~ "Hiện th�i bạn đang sử dụng chỗ: {0}KB. Hãy cố giải phóng thêm chỗ trống "
+#~ "bằng cách xoá một số thư."
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. You will not be able to either send or "
+#~ "receive mail now."
+#~ msgstr ""
+#~ "Hiện th�i bạn đang sử dụng chỗ: {0}KB. Như thế thì bạn hiện th�i không "
+#~ "thể gửi hoặc nhận thư."
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. You will not be able to send mail until "
+#~ "you clear up some space by deleting some mail."
+#~ msgstr ""
+#~ "Hiện th�i bạn đang sử dụng chỗ: {0}KB. Bạn sẽ không thể gửi thư đến khi "
+#~ "bạn giải phóng thêm chỗ trống bằng cách xoá một số thư."
+
+#~ msgid "Your password has expired."
+#~ msgstr "Mật khẩu bạn đã hết hạn."
+
+#~ msgid "{0} cannot be added to an access control list"
+#~ msgstr "Không thể thêm {0} vào danh sách đi�u khiển truy cập."
+
+#~ msgid "{0} is already a delegate"
+#~ msgstr "{0} đã một ngư�i ủy nhiệm."
+
+#~ msgid "Subscribe to Other User's Tasks"
+#~ msgstr "�ăng ký với các tác vụ của ngư�i dùng khác"
+
+#~ msgid "Check folder permissions"
+#~ msgstr "Hãy kiểm tra quy�n truy cập thư mục là đúng."
+
+#~ msgid "Compose messages using an external editor"
+#~ msgstr "Cấu tạo thư bằng trình soạn thảo bên ngoài"
+
+#~ msgid "PNG files"
+#~ msgstr "Tập tin PNG"
+
+#~ msgid "_Face"
+#~ msgstr "_Mặt"
+
+#~ msgid ""
+#~ "Attach Face header to outgoing messages. First time the user needs to "
+#~ "configure a 48*48 png image. It is base64 encoded and stored in ~/."
+#~ "evolution/faces This will be used in messages that are sent further."
+#~ msgstr ""
+#~ "�ính dòng đầu Mặt (Face) kèm các thư gửi đi. Lần đầu tiên ngư�i dùng cần "
+#~ "phải cấu hình một ảnh định dạng PNG có kích cỡ 48×48 điểm ảnh. Nó được mã "
+#~ "hoá base64 và được cất giữ trong thư mục « ~/.evolution/faces ». Nó sẽ "
+#~ "được dùng trong thư được gửi v� sau."
+
+#~| msgid ""
+#~| "Allows unsubscribing of mail folders in the folder tree context menu."
+#~ msgid "Allows unsubscribing of mail folders in the side bar context menu."
+#~ msgstr ""
+#~ "Cho phép hủy đăng ký thư mục thư trong trình đơn ngữ cảnh của khung l�."
+
+#~ msgid "Unsubscribe Folders"
+#~ msgstr "B� đăng ký thư mục"
+
+#~| msgid "<b>Members</b>"
+#~ msgid "<b>Server</b>"
+#~ msgstr "<b>máy chủ</b>"
+
+#~| msgid "A plugin to setup google calendar."
+#~ msgid "A plugin to setup Google Calendar and Contacts."
+#~ msgstr "Phần bổ sung để thiết lập Lịch Google và Liên lạc Google."
+
+#~ msgid "Google sources"
+#~ msgstr "Nguồn Google"
+
+#~| msgid "A plugin to setup groupwise calendar and contacts sources."
+#~ msgid "A plugin to setup GroupWise calendar and contacts sources."
+#~ msgstr "Phần bổ sung thiết lập nguồn lịch và liên lạc GroupWise."
+
+#~| msgid "Groupwise Account Setup"
+#~ msgid "GroupWise Account Setup"
+#~ msgstr "Thiết lập Tài khoản GroupWise"
+
+#~ msgid "<b>Junk List:</b>"
+#~ msgstr "<b>Danh sách Thư rác:</b>"
+
+#~ msgid "<b>Users:</b>"
+#~ msgstr "<b>Ngư�i dùng:</b>"
+
+#~ msgid "_Sharing"
+#~ msgstr "�ang chia _sẻ"
+
+#~ msgid "<b>Name</b>"
+#~ msgstr "<b>Tên</b>"
+
+#~ msgid "<b>Account Name</b>"
+#~ msgstr "<b>Tên tài khoản</b>"
+
+#~ msgid "A plugin to setup hula calendar sources."
+#~ msgstr "Phần bổ sung thiết lập nguồn lịch « hula »."
+
+#~ msgid "Hula Account Setup"
+#~ msgstr "Thiết lập Tài khoản Hula"
+
+#~ msgid "<b>Custom Headers</b>"
+#~ msgstr "<b>Dòng đầu tự ch�n</b>"
+
+#~ msgid "<b>IMAP Headers</b>"
+#~ msgstr "Dòng đầu IMAP"
+
+#~ msgid "A plugin for the features in the IMAP accounts."
+#~ msgstr "Phần bổ sung cho những tính năng trong tài khoản IMAP."
+
+#~ msgid "_Import to Calendar"
+#~ msgstr "_Nhập vào Lịch"
+
+#~ msgid "Import ICS"
+#~ msgstr "Nhập ICS"
+
+#~ msgid "Imports ICS attachments to calendar."
+#~ msgstr "Nhập khẩu đồ đính kèm ICS vào lịch."
+
+#~ msgid "Hardware Abstraction Layer not loaded"
+#~ msgstr "Chưa nạp lớp trừu tượng hoá phần cứng (Hardware Abstraction Layer)"
+
+#~ msgid ""
+#~ "The \"hald\" service is required but not currently running. Please enable "
+#~ "the service and rerun this program, or contact your system administrator."
+#~ msgstr ""
+#~ "Dịch vụ « hald » cần thiết nhưng không đang chạy. Hãy hiệu lực dịch vụ "
+#~ "này và khởi chạy lại chương trình này, hoặc liên lạc với quản trị hệ "
+#~ "thống."
+
+#~ msgid ""
+#~ "Evolution could not find an iPod to synchronize with. Either the iPod is "
+#~ "not connected to the system or it is not powered on."
+#~ msgstr ""
+#~ "Evolution không thể tìm thấy thiết bị iPod để đồng bộ hoá. Hoặc là nó "
+#~ "chưa được nối vào hệ thống, hoặc là nó chưa được bật nguồn."
+
+#~| msgid ""
+#~| "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+#~ msgid ""
+#~ "Synchronize the selected task/memo/calendar/address book with Apple iPod"
+#~ msgstr "�ồng bộ với Apple iPod sổ địa chỉ/lịch/ghi nhớ/tác vụ đã ch�n"
+
+#~ msgid "Synchronize to iPod"
+#~ msgstr "�ồng bộ tới iPod"
+
+#~ msgid "iPod Synchronization"
+#~ msgstr "�ồng bộ iPod"
+
+#~ msgid "_Accept"
+#~ msgstr "_Chấp nhận"
+
+#~ msgid "_Tasks :"
+#~ msgstr "_Tác vụ :"
+
+#~ msgid "Memos :"
+#~ msgstr "Ghi nhá»› :"
+
+#~ msgid "Allows disabling of accounts."
+#~ msgstr "Cho phép bắt tài khoản"
+
+#~ msgid "Blink icon in notification area."
+#~ msgstr "Chớp nháy biểu tượng trong vùng thông báo."
+
+#~ msgid "Whether the icon should blink or not."
+#~ msgstr "Biểu tượng có nên chớp nháy hay không."
+
+#~| msgid "Mail Notification"
+#~ msgid "Evolution's Mail Notification"
+#~ msgstr "Thông Báo Thư của Evolution"
+
+#~ msgid "B_link icon in notification area"
+#~ msgstr "Chớp nhá_y biểu tượng trong vùng thông báo"
+
+#~ msgid "Specify _filename:"
+#~ msgstr "_Xác định tên tập tin:"
+
+#~ msgid "Pl_ay"
+#~ msgstr "P_hát"
+
+#~ msgid ""
+#~ "Generates a D-Bus message or notifies the user with an icon in "
+#~ "notification area and a notification message whenever a new message has "
+#~ "arrived."
+#~ msgstr ""
+#~ "Tạo ra một thông điệp D-Bus, hoặc thông báo ngư�i dùng bằng bê trong vùng "
+#~ "thông báo và thông điệp thông báo, khi nào nhận thư mới."
+
+#~ msgid ""
+#~ "A plugin which allows the creation of meetings from the contents of a "
+#~ "mail message."
+#~ msgstr "Một bổ sung cho phép tạo cuộc h�p từ nội dung của một thư nào đó."
+
+#~ msgid "Con_vert to Meeting"
+#~ msgstr "Chu_yển đổi sang Cuộc h�p"
+
+#~ msgid "Mail to meeting"
+#~ msgstr "Gửi thư chơ cuộc h�p"
+
+#~ msgid ""
+#~ "A plugin which allows the creation of tasks from the contents of a mail "
+#~ "message."
+#~ msgstr "Một bổ sung cho phép tạo tác vụ từ nội dung của một thư nào đó."
+
+#~ msgid "Con_vert to Task"
+#~ msgstr "Chuyển đổi sang Tác _vụ"
+
+#~ msgid "Mail to task"
+#~ msgstr "Gửi thư chơ tác vụ"
+
+#~ msgid "Contact list _owner"
+#~ msgstr "Liên lạc với ngư�i _sở hữu hộp"
+
+#~ msgid "Get list _archive"
+#~ msgstr "Lấy _kho hộp"
+
+#~ msgid "Get list _usage information"
+#~ msgstr "G�i thông tin v� cách _dùng hộp"
+
+#~ msgid "_Post message to list"
+#~ msgstr "_Gá»­i thÆ° cho há»™p"
+
+#~ msgid "_Subscribe to list"
+#~ msgstr "�ăng _ký với hộp"
+
+#~ msgid "_Un-subscribe to list"
+#~ msgstr "Hủ_y đăng ký với hộp"
+
+#~ msgid "Used for marking all the messages under a folder as read"
+#~ msgstr "Dùng để đánh dấu �ã đ�c trên các thư dưới một thư mục nào đó"
+
+#~ msgid "A plugin which implements mono plugins."
+#~ msgstr "Phần bổ sung thực hiện bổ sung một nguồn."
+
+#~ msgid "Mono Loader"
+#~ msgstr "Bộ nạp một nguồn"
+
+#~ msgid "A plugin for managing which plugins are enabled or disabled."
+#~ msgstr "Một phần bổ sung quản lý phần bổ sung nào bật hay tắt."
+
+#~ msgid ""
+#~ "A test plugin which demonstrates a formatter plugin which lets you choose "
+#~ "to disable HTML messages.\n"
+#~ "\n"
+#~ "This plugin is unsupported demonstration code only.\n"
+#~ msgstr ""
+#~ "Một bổ sung thử nghiệm để biểu diễn một bổ sung định dạng cho phép bạn "
+#~ "ch�n tắt định dạng thư HTML.\n"
+#~ "\n"
+#~ "Phần bổ sung này chỉ chứa mã biểu diễn không được hỗ trợ thôi.\n"
+
+#~ msgid "Prefer PLAIN"
+#~ msgstr "Thích chữ thô hơn"
+
+#~ msgid "Writes a log of profiling data events."
+#~ msgstr "Ghi bản các sự kiện dữ liệu tạo hồ sơ"
+
+#~ msgid "<span weight=\"bold\">Location</span>"
+#~ msgstr "<span weight=\"bold\">�ịa điểm</span>"
+
+#~ msgid "<span weight=\"bold\">Sources</span>"
+#~ msgstr "<span weight=\"bold\">Nguồn</span>"
+
+#~| msgid ""
+#~| "SSH\n"
+#~| "Public FTP\n"
+#~| "FTP (with login)\n"
+#~| "Windows share\n"
+#~| "WebDAV (HTTP)\n"
+#~| "Secure WebDAV (HTTPS)\n"
+#~| "Custom Location"
+#~ msgid ""
+#~ "Secure FTP (SSH)\n"
+#~ "Public FTP\n"
+#~ "FTP (with login)\n"
+#~ "Windows share\n"
+#~ "WebDAV (HTTP)\n"
+#~ "Secure WebDAV (HTTPS)\n"
+#~ "Custom Location"
+#~ msgstr ""
+#~ "FTP bảo mật (SSH)\n"
+#~ "FTP công\n"
+#~ "FTP (cũng đang nhập)\n"
+#~ "chia sẻ Windows\n"
+#~ "WebDAV (HTTP)\n"
+#~ "WebDAV bảo mật (HTTPS)\n"
+#~ "�ịa chỉ riêng"
+
+#~ msgid ""
+#~ "iCal\n"
+#~ "Free/Busy"
+#~ msgstr ""
+#~ "iCal\n"
+#~ "Rảnh/Bận"
+
+#~ msgid "A plugin which loads other plugins written using Python."
+#~ msgstr "Một phần bổ sung mà nạp các phần bổ sung khác được ghi bằng Python."
+
+#~| msgid "Mono Loader"
+#~ msgid "Python Loader"
+#~ msgstr "Bộ nạp Python"
+
+#~ msgid "SpamAssassin (built-in)"
+#~ msgstr "Spamassassin (sẵn có)"
+
+#~ msgid ""
+#~ "Filters junk messages using SpamAssassin. This plugin requires "
+#~ "SpamAssassin to be installed."
+#~ msgstr ""
+#~ "L�c thư rác bằng SpamAssassin (bổ sung này cần thiết cài đặt "
+#~ "SpamAssassin)."
+
+#~ msgid "A plugin for saving all attachments or parts of a message at once."
+#~ msgstr "Một phần bổ sung lưu m�i đính kèm hay phần thư đ�u cùng lúc."
+
+#~ msgid "Save Attachments..."
+#~ msgstr "Lưu đính kèm..."
+
+#~ msgid "Save all attachments"
+#~ msgstr "Lưu m�i đính kèm"
+
+#~ msgid "Select save base name"
+#~ msgstr "Ch�n tên cơ bản khi lưu"
+
+#~ msgid "Save"
+#~ msgstr "LÆ°u"
+
+#~ msgid "Select one source"
+#~ msgstr "Ch�n một nguồn"
+
+#~ msgid "Selects a single calendar or task source for viewing."
+#~ msgstr "Ch�n chỉ một lịch hay nguồn tác vụ riêng lẻ để xem thôi."
+
+#~ msgid "Guides you through your initial account setup."
+#~ msgstr "Hướng dẫn ngư�i dùng qua quá trình thiết lập tài khoản đầu tiên."
+
+#~| msgid "Assistant"
+#~ msgid "Setup Assistant"
+#~ msgstr "Trợ lý Thiết lập"
+
+#~ msgid "Importing data."
+#~ msgstr "�ang nhập dữ liệu."
+
+#~ msgid "Please wait"
+#~ msgstr "Vui lòng ch�..."
+
+#~ msgid "Indicates if threading of messages should fall back to subject."
+#~ msgstr "Ngụ ý nếu cách tạo nhánh thư nên trở v� theo chủ đ�"
+
+#~ msgid "Subject Threading"
+#~ msgstr "Nhánh theo Chủ đ�"
+
+#~ msgid "Thread messages by subject"
+#~ msgstr "Hiển thị nhánh theo Chủ đ�"
+
+#~| msgid "A simple plugin which uses ytnef to decode tnef attachments."
+#~ msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+#~ msgstr ""
+#~ "Phần mở rộng đơn giản mà sử dụng yTNEF để giải mã tập tin đính kèm dạng "
+#~ "TNEF."
+
+#~| msgid "A plugin to setup google calendar."
+#~ msgid "A plugin to setup WebDAV contacts."
+#~ msgstr "Phần bổ sung để thiết lập các liên lạc WebDAV."
+
+#~ msgid "Evolution Shell"
+#~ msgstr "Trình bao Evolution"
+
+#~ msgid "Evolution Shell Config factory"
+#~ msgstr "Bộ tạo cấu hình trình bao Evolution"
+
+#~ msgid "Evolution Test"
+#~ msgstr "Kiểm tra Evolution"
+
+#~ msgid "Evolution Test component"
+#~ msgstr "Thành phần kiểm tra Evolution"
+
+#~ msgid "<b>Active Connections</b>"
+#~ msgstr "<b>Kết nối Hoạt động</b>"
+
+#~ msgid "Active Connections"
+#~ msgstr "Kết nối Hoạt động"
+
+#~ msgid "Click OK to close these connections and go offline"
+#~ msgstr "Nhấn nút OK để đóng những kết nối này và chuyển sang ngoại tuyến."
+
+#~ msgid "The GNOME Pilot tools do not appear to be installed on this system."
+#~ msgstr ""
+#~ "Hình như bộ công cụ GNOME Pilot chưa được cài đặt trên hệ thống này."
+
+#~ msgid "Error executing %s."
+#~ msgstr "Gặp lỗi khi thực hiện %s."
+
+#~ msgid "Work Offline"
+#~ msgstr "Ngoại tuyến"
+
+#~ msgid "Unknown system error."
+#~ msgstr "Lỗi hệ thống không rõ."
+
+# Variable and unit: do not translate/ biến và đơn vị: đừng dịch
+#~ msgid "%ld KB"
+#~ msgstr "%ld KB"
+
+#~ msgid "Invalid arguments"
+#~ msgstr "�ối số không hợp lệ"
+
+#~ msgid "Cannot register on OAF"
+#~ msgstr "Không thể đăng ký với OAF"
+
+#~ msgid "Configuration Database not found"
+#~ msgstr "Không tìm thấy cơ sở dữ liệu cấu hình"
+
+#~ msgid "New Test"
+#~ msgstr "Kiểm tra mới"
+
+#~ msgid "Import File"
+#~ msgstr "Nhập tập tin"
+
+#~ msgid "Start Evolution activating the specified component"
+#~ msgstr "Báo trình Evolution hoạt hoá thành phần đã ghi rõ"
+
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "Buộc tái nâng cấp từ Evolution 1.4"
+
+#~ msgid "Evolution can not start."
+#~ msgstr "Evolution không thể khởi chạy."
+
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "Không có đủ chỗ trên đĩa để nâng cấp."
+
+#~ msgid "Really delete old data?"
+#~ msgstr "Bạn thật sự muốn xoá dữ liệu cũ không?"
+
+#~ msgid ""
+#~ "The entire contents of the &quot;evolution&quot; directory are about to "
+#~ "be permanently removed.\n"
+#~ "\n"
+#~ "It is suggested you manually verify that all of your mail, contact, and "
+#~ "calendar data is present, and that this version of Evolution operates "
+#~ "correctly before deleting this old data.\n"
+#~ "\n"
+#~ "Once deleted, you cannot downgrade to the previous version of Evolution "
+#~ "without manual intervention.\n"
+#~ msgstr ""
+#~ "Sắp gỡ b� hoàn toàn m�i nội dung của thư mục « evolution ».\n"
+#~ "\n"
+#~ "Có đ� nghị là bạn tự kiểm chứng có tất cả dữ liệu thư, liên lạc và lịch "
+#~ "trong phiên bản mới, mà hoạt động cho đúng, trước khi xoá dữ liệu cũ "
+#~ "này.\n"
+#~ "\n"
+#~ "Một khi đã xoá nó, không thể hạ cấp xuống phiên bản trước nếu không có "
+#~ "khả năng đặc biệt cấp cao.\n"
+
+#~| msgid ""
+#~| "The previous version of evolution stored its data in a different "
+#~| "location.\n"
+#~| "\n"
+#~| "If you choose to remove this data, the entire contents of the &quot;"
+#~| "evolution&quot; directory will be removed permanently. If you choose to "
+#~| "keep this data, then you may manually remove the contents of &quot;"
+#~| "evolution&quot; at your convenience.\n"
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+#~ msgstr ""
+#~ "Các phiên bản Evolution trước đã lưu dữ liệu vào một vị trí khác.\n"
+#~ "\n"
+#~ "Nếu bạn ch�n gỡ b� dữ liệu này, toàn bộ nội dung của thư mục « evolution "
+#~ "» sẽ bị xoá hoàn toàn. Nếu bạn ch�n giữ dữ liệu này, bạn có thể tự gỡ b� "
+#~ "nội dung « evolution » vào một lúc thuận tiện.\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, "
+#~ "but you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "Nâng cấp các dữ liệu và thiết lập của bạn sẽ cần thiết đến {0} sức chứa "
+#~ "trên đĩa, nhưng mà hiện th�i bạn chỉ có {1} sẵn sàng.\n"
+#~ "\n"
+#~ "Như thế thì bạn sẽ phải giải phóng thêm chỗ rỗng trong thư mục chinh của "
+#~ "mình trước khi có thể tiếp tục lại."
+
+#~ msgid ""
+#~ "Your system configuration does not match your Evolution configuration.\n"
+#~ "\n"
+#~ "Click help for details"
+#~ msgstr ""
+#~ "Cấu hình hệ thống bạn không khớp với cấu hình Evolution.\n"
+#~ "\n"
+#~ "Hãy nhắp vào « Trợ giúp » để xem chi tiết."
+
+#~ msgid ""
+#~ "Your system configuration does not match your Evolution configuration:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "\n"
+#~ "Click help for details."
+#~ msgstr ""
+#~ "Cấu hình hệ thống bạn không khớp với cấu hình Evolution.\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "\n"
+#~ "Hãy nhắp vào « Trợ giúp » để xem chi tiết."
+
+#~ msgid "_Keep Data"
+#~ msgstr "_Giữ dữ liệu"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "_Nhắc nhở lần sau"
+
+#~ msgid "<b>Field Value</b>"
+#~ msgstr "<b>Giá trị trư�ng</b>"
+
+#~ msgid "<b>Fingerprints</b>"
+#~ msgstr "<b>Vân tay</b>"
+
+#~ msgid "<b>Issued By</b>"
+#~ msgstr "<b>Phát hành bởi</b>"
+
+#~ msgid "<b>Issued To</b>"
+#~ msgstr "<b>Phát hành cho</b>"
+
+#~ msgid "Dummy window only"
+#~ msgstr "Chỉ cửa sổ giả"
+
+#~ msgid "Edit"
+#~ msgstr "Hiệu chỉnh"
+
+#~ msgid "Shutting down %s (%s)\n"
+#~ msgstr "�ang tắt %s (%s)\n"
+
+#~ msgid "Copy"
+#~ msgstr "Chép"
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "Chép vào thư mục..."
+
+#~| msgid "Create a new addressbook folder"
+#~ msgid "Create a new address book folder"
+#~ msgstr "Tạo một thư mục sổ địa chỉ mới"
+
+#~ msgid "Cut"
+#~ msgstr "Cắt"
+
+#~ msgid "Forward Contact"
+#~ msgstr "Chuyển tiếp liên lạc"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "Chuyển sang thư mục..."
+
+#~ msgid "Paste"
+#~ msgstr "Dán"
+
+#~ msgid "Save as VCard..."
+#~ msgstr "Lưu dạng vCard..."
+
+#~ msgid "Select _All"
+#~ msgstr "Ch�n _tất cả"
+
+#~ msgid "Send message to contact"
+#~ msgstr "Gửi thư cho liên lạc"
+
+#~ msgid "St_op"
+#~ msgstr "_Dừng"
+
+#~ msgid "Stop"
+#~ msgstr "Dừng"
+
+#~ msgid "_Copy Folder Contacts To"
+#~ msgstr "_Chép Liên lạc Thư mục vào..."
+
+#~ msgid "_Move Folder Contacts To"
+#~ msgstr "Chu_yển liên lạc thư mục sang"
+
+#~ msgid "_Rename"
+#~ msgstr "Th_ay tên"
+
+#~ msgid "_Save Contact as VCard..."
+#~ msgstr "_Lưu Liên lạc dạng vCard..."
+
+#~ msgid "_Save Folder Contacts As VCard"
+#~ msgstr "_Lưu Liên lạc Thư mục dạng vCard"
+
+#~ msgid "Delete _all Occurrences"
+#~ msgstr "Xoá _m�i lần"
+
+#~ msgid "Show the working week"
+#~ msgstr "Xem tuần làm việc"
+
+#~ msgid "View the debug console for log messages"
+#~ msgstr "Xem bàn giao tiếp gỡ lỗi để tìm thông điệp ghi lưu"
+
+#~ msgid "_Debug Logs"
+#~ msgstr "Bản ghi _gỡ lỗi"
+
+#~ msgid "Show message preview side-by-side with the message list"
+#~ msgstr "Hiển thị ô xem thử thư cạnh nhau với danh sách thư"
+
+#~ msgid "Copy selected message(s) to the clipboard"
+#~ msgstr "Chép các thư đã ch�n sang bảng nháp"
+
+#~ msgid "Cut selected message(s) to the clipboard"
+#~ msgstr "Cắt các thư đã ch�n vào bảng nháp"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "Ẩn các thư đã đ�_c"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr "Ẩn các thư đã xoá thay vì hiển thị chúng dạng gạch đè"
+
+#~ msgid "Paste message(s) from the clipboard"
+#~ msgstr "Dán các thư từ bảng nháp"
+
+#~ msgid "Select _All Messages"
+#~ msgstr "Ch�n _m�i thư"
+
+#~ msgid "Select all and only the messages that are not currently selected"
+#~ msgstr "Ch�n tất cả và chỉ những thư hiện th�i không đã ch�n"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "Hiện thư bị ẩ_n"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "Hiển thị các thư đang bị ẩn tạm th�i"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "Ẩn tạm th�i m�i thư đã đ�c"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "Ẩn tạm th�i những thư đã ch�n"
+
+#~ msgid "Not Junk"
+#~ msgstr "Không phải rác"
+
+#~ msgid "Paste messages from the clipboard"
+#~ msgstr "Dán các thư từ bảng nháp"
+
+#~ msgid "Pos_t New Message to Folder"
+#~ msgstr "Gửi thư mới _tới thư mục"
+
+#~ msgid "Post a Repl_y"
+#~ msgstr "Gửi t_rả l�i"
+
+#~ msgid "Post a message to a Public folder"
+#~ msgstr "Gửi thư tới thư mục Công cộng"
+
+#~ msgid "Post a reply to a message in a Public folder"
+#~ msgstr "Gửi trả l�i thư trong thư mục Công cộng"
+
+#~ msgid "Select _All Text"
+#~ msgstr "Ch�n t_oàn bộ thân"
+
+#~ msgid "_Save Message..."
+#~ msgstr "_LÆ°u thÆ°..."
+
+#~ msgid "Main toolbar"
+#~ msgstr "Thanh công cụ chính"
+
+#~ msgid "Copy selected memo"
+#~ msgstr "Chép ghi nhớ đã ch�n"
+
+#~ msgid "Cut selected memo"
+#~ msgstr "Cắt ghi nhớ đã ch�n"
+
+#~ msgid "Copy selected tasks"
+#~ msgstr "Chép các tác vụ đã ch�n"
+
+#~ msgid "Cut selected tasks"
+#~ msgstr "Cắt các tác vụ đã ch�n"
+
+#~ msgid "Mar_k as Complete"
+#~ msgstr "Nhãn _hoàn tất"
+
+#~ msgid "Show task preview window"
+#~ msgstr "Hiện ô xem thử tác vụ"
+
+#~ msgid "About Evolution..."
+#~ msgstr "Giới thiệu v� Evolution..."
+
+#~ msgid "Change the visibility of the toolbar"
+#~ msgstr "Hiện/Ẩn thanh công cụ"
+
+#~ msgid "Forget remembered passwords so you will be prompted for them again"
+#~ msgstr ""
+#~ "Quên đi các mật khẩu đã nhớ, như vậy bạn sẽ lại được nhắc gõ mật khẩu"
+
+#~ msgid "Hide window buttons"
+#~ msgstr "Ẩn m�i nút cửa sổ"
+
+#~ msgid "Page Set_up..."
+#~ msgstr "Thiết lậ_p trang..."
+
+#~ msgid "Prefere_nces"
+#~ msgstr "Tù_y thích..."
+
+#~ msgid "Submit Bug Report"
+#~ msgstr "Gửi Báo cáo Lỗi"
+
+#~ msgid "Toggle whether we are working offline."
+#~ msgstr "Bật tắt hoạt động ngoại tuyến"
+
+#~ msgid "View/Hide the Side Bar"
+#~ msgstr "Hiện/Ẩn khung l�"
+
+#~ msgid "View/Hide the Status Bar"
+#~ msgstr "Xem/Ẩn thanh trạng thái"
+
+#~| msgid "Work Offline"
+#~ msgid "Work _Offline"
+#~ msgstr "Ng_oại tuyến"
+
+#~ msgid "_About"
+#~ msgstr "_Giới thiệu"
+
+#~ msgid "_Frequently Asked Questions"
+#~ msgstr "_Các câu h�i thư�ng gặp"
+
+#~ msgid "_Hide Buttons"
+#~ msgstr "Ẩ_n nút"
+
+#~ msgid "_Synchronization Options..."
+#~ msgstr "Tùy ch�n đồng _bộ..."
+
+#~ msgid "<b>Time Zones</b>"
+#~ msgstr "<b>Múi gi�</b>"
+
+#~ msgid "<b>_Selection</b>"
+#~ msgstr "<b>Vùng _ch�n</b>"
+
+#~ msgid "Collection"
+#~ msgstr "Tập hợp"
+
+#~ msgid "Instance"
+#~ msgstr "Lần"
+
+#~ msgid "Save Custom View"
+#~ msgstr "Lưu ô xem tự ch�n"
+
+#~ msgid "Select View: %s"
+#~ msgstr "Ch�n ô xem: %s"
+
+#~ msgid "Factory"
+#~ msgstr "Bộ tạo"
+
+#~ msgid "Attachment Bar"
+#~ msgstr "Thanh đính kèm"
+
+#~ msgid "Cannot attach file %s: %s"
+#~ msgstr "Không thể đính kèm tập tin « %s »: %s"
+
+#~ msgid "Cannot attach file %s: not a regular file"
+#~ msgstr "Không thể đính kèm tập tin « %s »: không phải tập tin bình thư�ng."
+
+#~ msgid "MIME type:"
+#~ msgstr "Dạng MIME:"
+
+#~ msgid "Suggest automatic display of attachment"
+#~ msgstr "�� nghị tự động hiển thị đính kèm"
+
+#~ msgid "Fill color"
+#~ msgstr "Màu tô đầy"
+
+#~ msgid "GDK fill color"
+#~ msgstr "Màu tô đầy GDK"
+
+#~ msgid "Fill stipple"
+#~ msgstr "Chấm lên tô đầy"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "�ộ rộng tối thiểu"
+
+#~ msgid "Minimum Width"
+#~ msgstr "�ộ rộng tối thiểu"
+
+#~ msgid "Spacing"
+#~ msgstr "Khoảng cách"
+
+#~ msgid "Unknown character set: %s"
+#~ msgstr "Bộ ký tự lạ: %s"
+
+#~ msgid "Expanded"
+#~ msgstr "�ã bung"
+
+#~ msgid "Whether or not the expander is expanded"
+#~ msgstr "Có bung mũi tên bung hay không"
+
+#~ msgid "Text of the expander's label"
+#~ msgstr "Chữ trong nhãn mũi tên bung"
+
+#~ msgid ""
+#~ "If set, an underline in the text indicates the next character should be "
+#~ "used for the mnemonic accelerator key"
+#~ msgstr "Nếu lập thì gạch chân ngú ý ký tự sau nó là phím tắt."
+
+#~ msgid "Space to put between the label and the child"
+#~ msgstr "Dấu cách giữa nhãn và con"
+
+#~ msgid "Label widget"
+#~ msgstr "Ô đi�u khiển nhãn"
+
+#~ msgid "A widget to display in place of the usual expander label"
+#~ msgstr "Một ô đi�u khiển cần hiển thị trong chỗ nhãn mũi tên bung thư�ng"
+
+#~ msgid "Expander Size"
+#~ msgstr "Cỡ mũi tên bung"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "Cỡ mũi tên bung"
+
+#~ msgid "Indicator Spacing"
+#~ msgstr "Dấu cách chỉ báo"
+
+#~ msgid "Spacing around expander arrow"
+#~ msgstr "Dấu cách ở quanh mũi tên bung"
+
+#~ msgid "_Searches"
+#~ msgstr "Việc tìm _kiếm"
+
+#~ msgid "Current Message"
+#~ msgstr "Thư hiện th�i"
+
+#~ msgid "Choose Image"
+#~ msgstr "Ch�n ảnh"
+
+#~| msgid "Inline"
+#~ msgid "Online"
+#~ msgstr "T_rực tuyến"
+
+#~ msgid "The button state is online"
+#~ msgstr "Tình trạng nút là trực tuyến"
+
+#~ msgid "Sync with:"
+#~ msgstr "�ồng bộ hoá với:"
+
+#~ msgid "Sync Private Records:"
+#~ msgstr "�ồng bộ hoá mục ghi riêng:"
+
+#~ msgid "Sync Categories:"
+#~ msgstr "�ồng bộ hoá các loại:"
+
+#~ msgid "Empty message"
+#~ msgstr "ThÆ° rá»—ng"
+
+#~ msgid "Reflow model"
+#~ msgstr "Mẫu thông lượng lại"
+
+#~ msgid "Column width"
+#~ msgstr "Rá»™ng cá»™t"
+
+#~ msgid "Search"
+#~ msgstr "Tìm kiếm"
+
+#~ msgid "_Clear"
+#~ msgstr "_D�n"
+
+#~ msgid "Item ID"
+#~ msgstr "Mã số mục"
+
+#~ msgid "Text"
+#~ msgstr "Văn bản"
+
+#~ msgid "Cursor Row"
+#~ msgstr "Hàng con tr�"
+
+#~ msgid "Cursor Column"
+#~ msgstr "Cột con tr�"
+
+#~ msgid "Sorter"
+#~ msgstr "Bộ sắp xếp"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "Chế độ con tr�"
+
+#~ msgid "<b>Replies</b>"
+#~ msgstr "<b>Trả l�i</b>"
+
+#~ msgid "<b>Status Tracking</b>"
+#~ msgstr "<b>Theo dõi Trạng thái</b>"
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "Proprietary\n"
+#~ "Confidential\n"
+#~ "Secret\n"
+#~ "Top Secret\n"
+#~ "For Your Eyes Only"
+#~ msgstr ""
+#~ "Chuẩn\n"
+#~ "Sở hữu\n"
+#~ "Mật\n"
+#~ "Rất mật\n"
+#~ "Tối mật\n"
+#~ "Chỉ cho bạn xem"
+
+#~ msgid ""
+#~ "Undefined\n"
+#~ "High\n"
+#~ "Standard\n"
+#~ "Low"
+#~ msgstr ""
+#~ "Chưa định nghĩa\n"
+#~ "Cao\n"
+#~ "Chuẩn\n"
+#~ "Thấp"
+
+# Variable: do not translate/ biến: đừng dịch
+#~ msgid "%s (...)"
+#~ msgstr "%s (...)"
+
+#~ msgid "Edit Master Category List..."
+#~ msgstr "Sửa đổi danh sách loại chính..."
+
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "Các mục thuộc v� những _loại này:"
+
+#~ msgid "categories"
+#~ msgstr "loại"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "Selected Column"
+#~ msgstr "Cột đã ch�n"
+
+#~ msgid "Focused Column"
+#~ msgstr "Cột có tiêu điểm"
+
+#~ msgid "Unselected Column"
+#~ msgstr "Cột đã b� ch�n"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "Cột đã gạch đè"
+
+#~ msgid "Underline Column"
+#~ msgstr "Cột đã gạch dưới"
+
+#~ msgid "Bold Column"
+#~ msgstr "Cột đậm"
+
+#~ msgid "Color Column"
+#~ msgstr "Cột màu"
+
+#~ msgid "BG Color Column"
+#~ msgstr "Cột màu n�n"
+
+#~ msgid "State"
+#~ msgstr "Tình trạng"
+
+#~ msgid "DnD code"
+#~ msgstr "Mã DnD"
+
+#~ msgid "Full Header"
+#~ msgstr "Phần đầu đầy đủ"
+
+#~ msgid "Add a column..."
+#~ msgstr "Thêm cột..."
+
+#~ msgid "Field Chooser"
+#~ msgstr "Bộ ch�n trư�ng"
+
+#~ msgid "Alternating Row Colors"
+#~ msgstr "Các màu hàng xen kẽ"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "Lưới vẽ ngang"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "Lưới vẽ d�c"
+
+#~ msgid "Draw focus"
+#~ msgstr "Tiêu điểm vẽ"
+
+#~ msgid "Cursor mode"
+#~ msgstr "Chế độ con tr�"
+
+#~ msgid "Selection model"
+#~ msgstr "Mô hình lựa ch�n"
+
+#~ msgid "Length Threshold"
+#~ msgstr "Ngưỡng dài"
+
+#~ msgid "Frozen"
+#~ msgstr "�ông cứng"
+
+#~ msgid "Font Description"
+#~ msgstr "Mô tả phông chữ"
+
+#~ msgid "Sort Info"
+#~ msgstr "Sắp xếp thông tin"
+
+#~ msgid "Tree"
+#~ msgstr "Cây"
+
+#~ msgid "Cursor row"
+#~ msgstr "Hàng con tr�"
+
+#~ msgid "Use click to add"
+#~ msgstr "Nhấn để thêm"
+
+#~ msgid "ETree table adapter"
+#~ msgstr "Bộ tiếp hợp ETree (bảng cây điện)"
+
+#~ msgid "Retro Look"
+#~ msgstr "Vẻ cũ"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "Vẽ đư�ng và mũi tên bung +/-"
+
+#~ msgid "Event Processor"
+#~ msgstr "Bộ xử lý sự kiện"
+
+#~ msgid "Bold"
+#~ msgstr "�ậm"
+
+#~ msgid "Strikeout"
+#~ msgstr "Gạch xoá"
+
+#~ msgid "Anchor"
+#~ msgstr "Neo"
+
+#~ msgid "Justification"
+#~ msgstr "Canh đ�u"
+
+#~ msgid "Clip Width"
+#~ msgstr "Rộng trích đoạn"
+
+#~ msgid "Clip Height"
+#~ msgstr "Cao trích đoạn"
+
+#~ msgid "Clip"
+#~ msgstr "Trích đoạn"
+
+#~ msgid "Fill clip rectangle"
+#~ msgstr "Tô đầy hình chữ nhật trích đoạn"
+
+#~ msgid "X Offset"
+#~ msgstr "Hiệu số X"
+
+#~ msgid "Y Offset"
+#~ msgstr "Hiệu số Y"
+
+#~ msgid "Text width"
+#~ msgstr "Rộng văn bản"
+
+#~ msgid "Text height"
+#~ msgstr "Cao văn bản"
+
+#~ msgid "Use ellipsis"
+#~ msgstr "Dùng dấu chấm lửng"
+
+#~ msgid "Ellipsis"
+#~ msgstr "Dấu chấm lửng"
+
+#~ msgid "Line wrap"
+#~ msgstr "Ngắt dòng"
+
+#~ msgid "Break characters"
+#~ msgstr "Ngắt ký tự"
+
+#~ msgid "Max lines"
+#~ msgstr "Số dòng tối đa"
+
+#~ msgid "Draw borders"
+#~ msgstr "Vi�n vẽ"
+
+#~ msgid "Allow newlines"
+#~ msgstr "Cho phép ký tự dòng mới"
+
+#~ msgid "Draw background"
+#~ msgstr "N�n vẽ"
+
+#~ msgid "Draw button"
+#~ msgstr "Nút vẽ"
+
+>>>>>>> master
 #~ msgid "Cursor position"
 #~ msgstr "Ví trị con tr�"
 
@@ -27383,7 +53884,12 @@ msgstr "Cách nhập"
 
 #~ msgid "Mark all messages in this folder and subfolders as read?"
 #~ msgstr ""
+<<<<<<< HEAD
 #~ "�ánh dấu « �ã đ�c » m�i thư nằm trong thư mục này và các thư mục con không?"
+=======
+#~ "�ánh dấu « �ã đ�c » m�i thư nằm trong thư mục này và các thư mục con "
+#~ "không?"
+>>>>>>> master
 
 #~ msgid "Do you want the operation to be performed also in the subfolders?"
 #~ msgstr "Bạn có muốn thực hiện thao tác đó xuống những thư mục con không?"
@@ -27435,8 +53941,13 @@ msgstr "Cách nhập"
 
 #~ msgid "'.' and '..' are reserved folder names."
 #~ msgstr ""
+<<<<<<< HEAD
 #~ "Dấu chấm « . » và hai dấu chấm tiếp tục « .. » là hai tên thư mục đặc biệt, "
 #~ "được dành riêng."
+=======
+#~ "Dấu chấm « . » và hai dấu chấm tiếp tục « .. » là hai tên thư mục đặc "
+#~ "biệt, được dành riêng."
+>>>>>>> master
 
 #~ msgid "Error opening the FAQ webpage."
 #~ msgstr "Gặp lỗi khi mở trang Web H�i �áp."
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 2b312038ba..ad9a0bb308 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -61,9 +61,8 @@ libeshell_la_CPPFLAGS =						\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(EGG_SMCLIENT_CFLAGS)					\
-	$(CLUTTER_CFLAGS)					\
-	$(TZDIALOG_CFLAGS)					\
-	$(SHELL_CFLAGS)
+	$(GTKHTML_CFLAGS)					\
+	$(CLUTTER_CFLAGS)
 
 libeshell_la_SOURCES =				\
 	$(eshellinclude_HEADERS)		\
@@ -99,8 +98,7 @@ libeshell_la_LIBADD =					\
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
 	$(EGG_SMCLIENT_LIBS)				\
-	$(CLUTTER_LIBS)					\
-	$(SHELL_LIBS)
+	$(CLUTTER_LIBS)
 
 # Evolution executable
 
@@ -131,10 +129,10 @@ evolution_CPPFLAGS =						\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"			\
 	-DDATADIR=\""$(datadir)"\"				\
 	-DLIBDIR=\""$(datadir)"\"				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(TZDIALOG_CFLAGS)					\
-	$(CLUTTER_CFLAGS)					\
-	$(SHELL_CFLAGS)
+	$(GTKHTML_CFLAGS)					\
+	$(CLUTTER_CFLAGS)
 
 evolution_SOURCES =				\
 	main.c
@@ -146,8 +144,7 @@ evolution_LDADD =							\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/filter/libfilter.la				\
-	$(TZDIALOG_LIBS)						\
-	$(SHELL_LIBS)							\
+	$(EVOLUTION_DATA_SERVER_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)						\
 	$(CLUTTER_LIBS)							\
 	$(EVOLUTIONICON)
diff --git a/shell/e-shell-backend.h b/shell/e-shell-backend.h
index 3364b16589..ae600bac3d 100644
--- a/shell/e-shell-backend.h
+++ b/shell/e-shell-backend.h
@@ -22,9 +22,10 @@
 #ifndef E_SHELL_BACKEND_H
 #define E_SHELL_BACKEND_H
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell-common.h>
 #include <e-util/e-activity.h>
-#include <e-util/e-extension.h>
 
 /* Standard GObject macros */
 #define E_TYPE_SHELL_BACKEND \
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index a109ffb4a7..c7a41510f2 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -32,12 +32,11 @@
 #include "e-shell-content.h"
 
 #include <glib/gi18n.h>
+#include <libebackend/e-extensible.h>
 
-#include "e-util/e-alert-dialog.h"
-#include "e-util/e-alert-sink.h"
-#include "e-util/e-extensible.h"
 #include "e-util/e-util.h"
 #include "e-util/e-alert-dialog.h"
+#include "e-util/e-alert-sink.h"
 #include "filter/e-rule-editor.h"
 #include "widgets/misc/e-action-combo-box.h"
 #include "widgets/misc/e-alert-bar.h"
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index e0c10c656a..13b0b49349 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -32,9 +32,9 @@
 #include "e-shell-searchbar.h"
 
 #include <glib/gi18n-lib.h>
+#include <libebackend/e-extensible.h>
 
 #include "e-util/e-util.h"
-#include "e-util/e-extensible.h"
 #include "widgets/misc/e-action-combo-box.h"
 #include "widgets/misc/e-hinted-entry.h"
 
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index abe37b7cbd..62652dee1f 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -31,8 +31,9 @@
 
 #include "e-shell-sidebar.h"
 
+#include <libebackend/e-extensible.h>
+
 #include <e-util/e-alert-sink.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-unicode.h>
 #include <shell/e-shell-view.h>
 
diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c
index 1bfe01ef25..77c1fd2929 100644
--- a/shell/e-shell-switcher.c
+++ b/shell/e-shell-switcher.c
@@ -32,7 +32,7 @@
 #include "e-shell-switcher.h"
 
 #include <glib/gi18n.h>
-#include <e-util/e-extensible.h>
+#include <libebackend/e-extensible.h>
 
 #define H_PADDING 6
 #define V_PADDING 6
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index 1ddbd357e0..adc0d27980 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -31,9 +31,9 @@
 
 #include "e-shell-taskbar.h"
 
-#include <e-shell-view.h>
+#include <libebackend/e-extensible.h>
 
-#include <e-util/e-extensible.h>
+#include <e-shell-view.h>
 #include <misc/e-activity-proxy.h>
 
 struct _EShellTaskbarPrivate {
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 49e05baf36..370aa90403 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -33,8 +33,8 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
+#include <libebackend/e-extensible.h>
 
-#include "e-util/e-extensible.h"
 #include "e-util/e-file-utils.h"
 #include "e-util/e-plugin-ui.h"
 #include "e-util/e-ui-manager.h"
diff --git a/shell/e-shell-window-private.h b/shell/e-shell-window-private.h
index 6a9744d971..d36a3e64f6 100644
--- a/shell/e-shell-window-private.h
+++ b/shell/e-shell-window-private.h
@@ -28,12 +28,12 @@
 #include <glib/gi18n.h>
 
 #include <gconf/gconf-client.h>
+#include <libebackend/e-extensible.h>
 
 #include <e-util/e-util.h>
 #include <e-util/e-util-private.h>
 #include <e-util/e-alert-dialog.h>
 #include <e-util/e-alert-sink.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-plugin-ui.h>
 #include <e-util/gconf-bridge.h>
 #include <widgets/misc/e-alert-bar.h>
diff --git a/shell/e-shell.c b/shell/e-shell.c
index dbcb55b36a..7ef48c2149 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -32,12 +32,12 @@
 #include "e-shell.h"
 
 #include <glib/gi18n.h>
+#include <libebackend/e-module.h>
+#include <libebackend/e-extensible.h>
 #include <libedataserverui/e-passwords.h>
 
-#include "e-util/e-module.h"
-#include "e-util/e-extensible.h"
-#include "e-util/e-util-private.h"
 #include "e-util/e-util.h"
+#include "e-util/e-util-private.h"
 #include "smclient/eggsmclient.h"
 #include "widgets/misc/e-preferences-window.h"
 
@@ -747,6 +747,12 @@ shell_dispose (GObject *object)
 		g_object_unref (alert);
 	}
 
+	while ((alert = g_queue_pop_head (&priv->alerts)) != NULL) {
+		g_signal_handlers_disconnect_by_func (
+			alert, shell_alert_response_cb, object);
+		g_object_unref (alert);
+	}
+
 	if (priv->startup_view != NULL) {
 		g_free (priv->startup_view);
 		priv->startup_view = NULL;
diff --git a/shell/main.c b/shell/main.c
index fd0b0508e6..bb056e3ded 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -27,10 +27,8 @@
 #include <glib/gstdio.h>
 
 #ifdef G_OS_UNIX
-#if GLIB_CHECK_VERSION(2,29,5)
 #include <glib-unix.h>
 #endif
-#endif
 
 #if HAVE_CLUTTER
 #include <clutter-gtk/clutter-gtk.h>
@@ -271,7 +269,6 @@ idle_cb (const gchar * const *uris)
 }
 
 #ifdef G_OS_UNIX
-#if GLIB_CHECK_VERSION(2,29,5)
 static gboolean
 handle_term_signal (gpointer data)
 {
@@ -287,7 +284,6 @@ handle_term_signal (gpointer data)
 	return FALSE;
 }
 #endif
-#endif
 
 static GOptionEntry entries[] = {
 #ifdef G_OS_WIN32
@@ -614,15 +610,9 @@ main (gint argc,
 	}
 
 #ifdef G_OS_UNIX
-#if GLIB_CHECK_VERSION(2,29,19)
 	g_unix_signal_add_full (
 		G_PRIORITY_DEFAULT, SIGTERM,
 		handle_term_signal, NULL, NULL);
-#elif GLIB_CHECK_VERSION(2,29,5)
-	g_unix_signal_add_watch_full (
-		SIGTERM, G_PRIORITY_DEFAULT,
-		handle_term_signal, NULL, NULL);
-#endif
 #endif
 
 	if (evolution_debug_log) {
diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am
index 2a28121fc1..c8fe999fc7 100644
--- a/smime/gui/Makefile.am
+++ b/smime/gui/Makefile.am
@@ -17,8 +17,8 @@ libevolution_smime_la_CPPFLAGS =			\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
 	-DPREFIX=\""$(prefix)"\"			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
 	$(CERT_UI_CFLAGS)
 
 libevolution_smime_la_SOURCES = 	\
@@ -41,6 +41,7 @@ libevolution_smime_la_LIBADD =				\
 	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/smime/lib/libessmime.la		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
 	$(CERT_UI_LIBS)
 
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index 5e23e1d865..274fc32aae 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -127,7 +127,6 @@ static const gchar* authoritycerts_mime_types[] =  { "application/x-x509-ca-cert
 
 typedef struct {
 	GtkTreeView *treeview;
-	GtkTreeStore *treemodel;
 	GtkTreeModel *streemodel;
 	GHashTable *root_hash;
 	GtkMenu *popup_menu;
@@ -474,6 +473,7 @@ select_certificate (CertPage *cp,
 
 	fcd.cp = cp;
 	fcd.cert = cert;
+	fcd.path = NULL;
 
 	gtk_tree_model_foreach (model, find_cert_cb, &fcd);
 
@@ -483,7 +483,7 @@ select_certificate (CertPage *cp,
 		selection = gtk_tree_view_get_selection (cp->treeview);
 		gtk_tree_selection_select_path (selection, fcd.path);
 
-		gtk_tree_view_scroll_to_cell (cp->treeview, fcd.path, NULL, FALSE, 0.0, 0.0);
+		gtk_tree_view_scroll_to_cell (cp->treeview, fcd.path, NULL, TRUE, 0.5, 0.5);
 		gtk_tree_path_free (fcd.path);
 	}
 }
@@ -644,10 +644,17 @@ delete_cert (GtkWidget *button,
 				    -1);
 
 		if (cert && e_cert_db_delete_cert (e_cert_db_peek (), cert)) {
-			GtkTreeIter child_iter;
+			GtkTreeIter child_iter, parent_iter;
+			gboolean has_parent;
+			GtkTreeStore *store = GTK_TREE_STORE (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (cp->streemodel)));
 
 			gtk_tree_model_sort_convert_iter_to_child_iter (GTK_TREE_MODEL_SORT (cp->streemodel), &child_iter, &iter);
-			gtk_tree_store_remove (cp->treemodel, &child_iter);
+			has_parent = gtk_tree_model_iter_parent (GTK_TREE_MODEL (store), &parent_iter, &child_iter);
+			gtk_tree_store_remove (store, &child_iter);
+
+			/* Remove parent if it became empty */
+			if (has_parent && gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), &parent_iter) == 0)
+				gtk_tree_store_remove (store, &parent_iter);
 
 			/* we need two unrefs here, one to unref the
 			 * gtk_tree_model_get above, and one to unref
@@ -861,14 +868,9 @@ cert_page_free (CertPage *cp)
 	if (!cp)
 		return;
 
-	/* Free all certificates in treeviews */
-	if (cp->treemodel) {
-		gtk_tree_model_foreach (GTK_TREE_MODEL (cp->treemodel),
-			(GtkTreeModelForeachFunc) free_cert, cp);
-	}
-
-	/* Free streemodel */
 	if (cp->streemodel) {
+		gtk_tree_model_foreach (GTK_TREE_MODEL (cp->streemodel),
+			(GtkTreeModelForeachFunc) free_cert, cp);
 		g_object_unref (cp->streemodel);
 		cp->streemodel = NULL;
 	}
@@ -978,7 +980,6 @@ e_cert_manager_config_init (ECertManagerConfig *ecmc)
 	priv->yourcerts_page = cp;
 	cp->treeview = GTK_TREE_VIEW (e_builder_get_widget (priv->builder, "yourcerts-treeview"));
 	cp->streemodel = NULL;
-	cp->treemodel = NULL;
 	cp->view_button = e_builder_get_widget (priv->builder, "your-view-button");
 	cp->backup_button = e_builder_get_widget (priv->builder, "your-backup-button");
 	cp->backup_all_button = e_builder_get_widget (priv->builder, "your-backup-all-button");
@@ -996,7 +997,6 @@ e_cert_manager_config_init (ECertManagerConfig *ecmc)
 	priv->contactcerts_page = cp;
 	cp->treeview = GTK_TREE_VIEW (e_builder_get_widget (priv->builder, "contactcerts-treeview"));
 	cp->streemodel = NULL;
-	cp->treemodel = NULL;
 	cp->view_button = e_builder_get_widget (priv->builder, "contact-view-button");
 	cp->backup_button = NULL;
 	cp->backup_all_button = NULL;
@@ -1014,7 +1014,6 @@ e_cert_manager_config_init (ECertManagerConfig *ecmc)
 	priv->authoritycerts_page = cp;
 	cp->treeview = GTK_TREE_VIEW (e_builder_get_widget (priv->builder, "authoritycerts-treeview"));
 	cp->streemodel = NULL;
-	cp->treemodel = NULL;
 	cp->view_button = e_builder_get_widget (priv->builder, "authority-view-button");
 	cp->backup_button = NULL;
 	cp->backup_all_button = NULL;
diff --git a/smime/gui/component.c b/smime/gui/component.c
index 091ebeefe8..fcbb9faf9f 100644
--- a/smime/gui/component.c
+++ b/smime/gui/component.c
@@ -50,10 +50,10 @@ smime_pk11_passwd (ECertDB *db,
 	prompt = g_strdup_printf (_("Enter the password for '%s'"), slot_name);
 	g_free (slot_name);
 
-	*passwd = e_passwords_ask_password (_("Enter password"), NULL, "",
-					    prompt,
-					    E_PASSWORDS_REMEMBER_NEVER | E_PASSWORDS_SECRET, NULL,
-					    NULL);
+	*passwd = e_passwords_ask_password (
+		_("Enter password"), NULL, "", prompt,
+		E_PASSWORDS_REMEMBER_NEVER | E_PASSWORDS_SECRET,
+		NULL, NULL);
 
 	g_free (prompt);
 
@@ -75,10 +75,10 @@ smime_pk11_change_passwd (ECertDB *db,
 		/* we're setting the password initially */
 		prompt = _("Enter new password for certificate database");
 
-		*passwd = e_passwords_ask_password (_("Enter new password"), NULL, "",
-						    prompt,
-						    E_PASSWORDS_REMEMBER_NEVER | E_PASSWORDS_SECRET, NULL,
-						    NULL);
+		*passwd = e_passwords_ask_password (
+			_("Enter new password"), NULL, "", prompt,
+			E_PASSWORDS_REMEMBER_NEVER | E_PASSWORDS_SECRET,
+			NULL, NULL);
 	}
 	else {
 		/* we're changing the password */
diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am
index d0f4873503..df2fb96208 100644
--- a/smime/lib/Makefile.am
+++ b/smime/lib/Makefile.am
@@ -14,7 +14,6 @@ libessmime_la_CPPFLAGS =				\
 	-DPREFIX=\""$(prefix)"\"			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(CAMEL_CFLAGS)					\
 	$(CERT_UI_CFLAGS)
 
 libessmime_la_SOURCES = 	\
@@ -33,7 +32,6 @@ libessmime_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)			\
-	$(CAMEL_LIBS)				\
 	$(CERT_UI_LIBS)
 
 libessmime_la_LDFLAGS = $(NO_UNDEFINED)
diff --git a/smime/lib/e-asn1-object.c b/smime/lib/e-asn1-object.c
index 28c3aa7c85..4dd519e2d4 100644
--- a/smime/lib/e-asn1-object.c
+++ b/smime/lib/e-asn1-object.c
@@ -129,7 +129,6 @@ e_asn1_object_get_type (void)
 	return asn1_object_type;
 }
 
-
 /* This function is used to interpret an integer that
  * was encoded in a DER buffer. This function is used
  * when converting a DER buffer into a nsIASN1Object
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index 7fdd20f6e7..6006168e20 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -616,8 +616,6 @@ e_cert_db_get_type (void)
 	return cert_type;
 }
 
-
-
 GStaticMutex init_mutex = G_STATIC_MUTEX_INIT;
 static ECertDB *cert_db = NULL;
 
diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c
index e7aecc10c8..930dd65474 100644
--- a/smime/lib/e-cert.c
+++ b/smime/lib/e-cert.c
@@ -194,8 +194,6 @@ e_cert_get_type (void)
 	return cert_type;
 }
 
-
-
 static void
 e_cert_populate (ECert *cert)
 {
@@ -286,8 +284,6 @@ e_cert_new_from_der (gchar *data,
 	return e_cert_new (cert);
 }
 
-
-
 CERTCertificate *
 e_cert_get_internal_cert (ECert *cert)
 {
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index 959924e69d..5f7a73ce65 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -143,8 +143,6 @@ e_pkcs12_get_type (void)
 	return pkcs12_type;
 }
 
-
-
 EPKCS12 *
 e_pkcs12_new (void)
 {
@@ -205,9 +203,10 @@ prompt_for_password (gchar *title,
 {
 	gchar *passwd;
 
-	passwd = e_passwords_ask_password (title, NULL, "", prompt,
-					   E_PASSWORDS_REMEMBER_NEVER | E_PASSWORDS_SECRET, NULL,
-					   NULL);
+	passwd = e_passwords_ask_password (
+		title, NULL, "", prompt,
+		E_PASSWORDS_REMEMBER_NEVER | E_PASSWORDS_SECRET,
+		NULL, NULL);
 
 	if (passwd) {
 		gsize len = strlen (passwd);
diff --git a/smime/tests/Makefile.am b/smime/tests/Makefile.am
index aa726538fd..be4cea34dc 100644
--- a/smime/tests/Makefile.am
+++ b/smime/tests/Makefile.am
@@ -3,8 +3,8 @@ noinst_PROGRAMS=import-cert
 TEST_CPPFLAGS=						\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)/smime/lib			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
 	$(CERT_UI_CFLAGS)
 
 TEST_LIBS= \
@@ -12,6 +12,7 @@ TEST_LIBS= \
 	-L/home/toshok/src/mozilla/mozilla/dist/lib	\
 	$(CERT_UI_LIBS)					\
 	$(top_builddir)/e-util/libeutil.la		\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)
 
 import_cert_LDADD=$(TEST_LIBS)
diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am
index fe5d468b3a..396ce6a4a5 100644
--- a/widgets/e-timezone-dialog/Makefile.am
+++ b/widgets/e-timezone-dialog/Makefile.am
@@ -6,8 +6,8 @@ libetimezonedialog_la_CPPFLAGS =					\
 	-I$(top_srcdir)/widgets						\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"				\
 	-DG_LOG_DOMAIN=__FILE__						\
-	$(GNOME_PLATFORM_CFLAGS)					\
-	$(TZDIALOG_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libetimezonedialog_la_SOURCES =	\
 	e-timezone-dialog.c	\
@@ -18,8 +18,7 @@ libetimezonedialog_la_LDFLAGS = $(NO_UNDEFINED)
 libetimezonedialog_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
-	$(EVOLUTION_CALENDAR_LIBS)
-	$(TZDIALOG_LIBS)				\
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)
 
 ui_DATA = e-timezone-dialog.ui
diff --git a/widgets/menus/Makefile.am b/widgets/menus/Makefile.am
index 3a33e64651..0dc38fce28 100644
--- a/widgets/menus/Makefile.am
+++ b/widgets/menus/Makefile.am
@@ -6,8 +6,8 @@ libmenus_la_CPPFLAGS =				\
 	-I$(top_srcdir)/widgets			\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"  \
 	-DG_LOG_DOMAIN=\"menus\"		\
-	$(GNOME_PLATFORM_CFLAGS)		\
-	$(E_UTIL_CFLAGS)
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
+	$(GNOME_PLATFORM_CFLAGS)
 
 libmenus_la_SOURCES = 				\
 	gal-define-views-dialog.c		\
@@ -46,8 +46,8 @@ libmenus_la_LIBADD =					\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/widgets/table/libetable.la	\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
-	$(GNOME_PLATFORM_LIBS)				\
-	$(E_UTIL_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)			\
+	$(GNOME_PLATFORM_LIBS)
 
 icons =
 EXTRA_DIST =			\
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 33bde9301c..cd5cada041 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -78,15 +78,15 @@ libemiscwidgets_la_CPPFLAGS =						\
 	-I$(top_srcdir)							\
 	-I$(top_srcdir)/filter						\
 	-I$(top_srcdir)/widgets						\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"				\
+	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"			\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"				\
 	-DG_LOG_DOMAIN=__FILE__						\
-	$(EVOLUTION_MAIL_CFLAGS)					\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
 	$(GNOME_PLATFORM_CFLAGS)					\
 	$(CHAMPLAIN_CFLAGS)						\
 	$(GEOCLUE_CFLAGS)						\
-	$(CLUTTER_CFLAGS)
-	
+	$(CLUTTER_CFLAGS)						\
+	$(GTKHTML_CFLAGS)
 
 libemiscwidgets_la_SOURCES =			\
 	$(widgetsinclude_HEADERS)		\
@@ -165,13 +165,14 @@ libemiscwidgets_la_LIBADD =					\
 	$(top_builddir)/filter/libfilter.la			\
 	$(top_builddir)/a11y/libevolution-a11y.la		\
 	$(top_builddir)/libgnomecanvas/libgnomecanvas.la	\
-	$(EVOLUTION_MAIL_LIBS)					\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(MATH_LIB)						\
 	$(ICONV_LIBS)						\
 	$(CHAMPLAIN_LIBS)					\
 	$(GEOCLUE_LIBS)						\
-	$(CLUTTER_LIBS)
+	$(CLUTTER_LIBS)						\
+	$(GTKHTML_LIBS)
 
 noinst_PROGRAMS = 			\
 	test-calendar			\
@@ -183,9 +184,9 @@ test_widgets_misc_CPPFLAGS=						\
 	-I$(top_srcdir)							\
 	-I$(top_srcdir)/filter						\
 	-I$(top_srcdir)/widgets						\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"				\
+	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"			\
 	-DG_LOG_DOMAIN=__FILE__						\
-	$(EVOLUTION_MAIL_CFLAGS)					\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
 	$(GNOME_PLATFORM_CFLAGS)
 
 # test-calendar
@@ -199,8 +200,8 @@ test_calendar_LDADD = 				\
 	libemiscwidgets.la			\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(top_builddir)/filter/libfilter.la	\
-	$(GNOME_PLATFORM_LIBS)			\
-	$(E_WIDGETS_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
+	$(GNOME_PLATFORM_LIBS)
 
 # test-dateedit
 
@@ -213,8 +214,8 @@ test_dateedit_LDADD = 				\
 	libemiscwidgets.la			\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(top_builddir)/filter/libfilter.la	\
-	$(GNOME_PLATFORM_LIBS)			\
-	$(E_WIDGETS_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
+	$(GNOME_PLATFORM_LIBS)
 
 # test-preferences-window
 
@@ -227,8 +228,8 @@ test_preferences_window_LDADD = 		\
 	libemiscwidgets.la			\
 	$(top_builddir)/e-util/libeutil.la	\
 	$(top_builddir)/filter/libfilter.la	\
-	$(GNOME_PLATFORM_LIBS)			\
-	$(E_WIDGETS_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)		\
+	$(GNOME_PLATFORM_LIBS)
 
 EXTRA_DIST = $(ui_DATA)
 
diff --git a/widgets/misc/e-account-tree-view.c b/widgets/misc/e-account-tree-view.c
index a2136433d4..7eae4e14aa 100644
--- a/widgets/misc/e-account-tree-view.c
+++ b/widgets/misc/e-account-tree-view.c
@@ -941,7 +941,8 @@ e_account_tree_view_get_selected_type (EAccountTreeView *tree_view)
  * Since: 3.4
  **/
 void
-e_account_tree_view_set_selected_type (EAccountTreeView *tree_view, EAccountTreeViewSelectedType select)
+e_account_tree_view_set_selected_type (EAccountTreeView *tree_view,
+                                       EAccountTreeViewSelectedType select)
 {
 	GtkTreeSelection *selection;
 	GtkTreeModel *model;
@@ -994,7 +995,8 @@ e_account_tree_view_set_selected_type (EAccountTreeView *tree_view, EAccountTree
 }
 
 static guint
-account_tree_view_get_slist_index (const GSList *account_uids, const gchar *uid)
+account_tree_view_get_slist_index (const GSList *account_uids,
+                                   const gchar *uid)
 {
 	guint res = 0;
 
@@ -1021,7 +1023,8 @@ account_tree_view_get_slist_index (const GSList *account_uids, const gchar *uid)
  * Since: 3.4
  **/
 void
-e_account_tree_view_set_sort_order (EAccountTreeView *tree_view, const GSList *account_uids)
+e_account_tree_view_set_sort_order (EAccountTreeView *tree_view,
+                                    const GSList *account_uids)
 {
 	GtkTreeModel *model;
 	GtkTreeIter iter;
@@ -1064,7 +1067,9 @@ e_account_tree_view_set_sort_order (EAccountTreeView *tree_view, const GSList *a
 }
 
 static gint
-eval_order_by_sort_hash_cb (gconstpointer a, gconstpointer b, gpointer user_data)
+eval_order_by_sort_hash_cb (gconstpointer a,
+                            gconstpointer b,
+                            gpointer user_data)
 {
 	guint asortorder = GPOINTER_TO_UINT (g_hash_table_lookup (user_data, a));
 	guint bsortorder = GPOINTER_TO_UINT (g_hash_table_lookup (user_data, b));
@@ -1173,7 +1178,8 @@ e_account_tree_view_sort_changed (EAccountTreeView *tree_view)
 }
 
 static void
-account_tree_view_swap_sort_order (EAccountTreeView *tree_view, gint direction)
+account_tree_view_swap_sort_order (EAccountTreeView *tree_view,
+                                   gint direction)
 {
 	GtkTreeSelection *selection;
 	GtkTreeModel *model;
@@ -1239,7 +1245,8 @@ e_account_tree_view_move_down (EAccountTreeView *tree_view)
 }
 
 void
-e_account_tree_view_set_sort_alpha (EAccountTreeView *tree_view, gboolean sort_alpha)
+e_account_tree_view_set_sort_alpha (EAccountTreeView *tree_view,
+                                    gboolean sort_alpha)
 {
 	g_return_if_fail (tree_view != NULL);
 	g_return_if_fail (E_IS_ACCOUNT_TREE_VIEW (tree_view));
@@ -1265,7 +1272,8 @@ e_account_tree_view_get_sort_alpha (EAccountTreeView *tree_view)
 }
 
 void
-e_account_tree_view_set_express_mode (EAccountTreeView *tree_view, gboolean express_mode)
+e_account_tree_view_set_express_mode (EAccountTreeView *tree_view,
+                                      gboolean express_mode)
 {
 	g_return_if_fail (tree_view != NULL);
 	g_return_if_fail (E_IS_ACCOUNT_TREE_VIEW (tree_view));
@@ -1291,7 +1299,9 @@ e_account_tree_view_get_express_mode (EAccountTreeView *tree_view)
 }
 
 static void
-update_special_enable_state (EAccountTreeView *tree_view, const gchar *display_name, gboolean enabled)
+update_special_enable_state (EAccountTreeView *tree_view,
+                             const gchar *display_name,
+                             gboolean enabled)
 {
 	GtkTreeModel *model;
 	GtkTreeIter iter;
@@ -1332,7 +1342,8 @@ update_special_enable_state (EAccountTreeView *tree_view, const gchar *display_n
 }
 
 void
-e_account_tree_view_set_enable_local_folders (EAccountTreeView *tree_view, gboolean enabled)
+e_account_tree_view_set_enable_local_folders (EAccountTreeView *tree_view,
+                                              gboolean enabled)
 {
 	g_return_if_fail (tree_view != NULL);
 	g_return_if_fail (E_IS_ACCOUNT_TREE_VIEW (tree_view));
@@ -1359,7 +1370,8 @@ e_account_tree_view_get_enable_local_folders (EAccountTreeView *tree_view)
 }
 
 void
-e_account_tree_view_set_enable_search_folders (EAccountTreeView *tree_view, gboolean enabled)
+e_account_tree_view_set_enable_search_folders (EAccountTreeView *tree_view,
+                                               gboolean enabled)
 {
 	g_return_if_fail (tree_view != NULL);
 	g_return_if_fail (E_IS_ACCOUNT_TREE_VIEW (tree_view));
diff --git a/widgets/misc/e-attachment-handler.h b/widgets/misc/e-attachment-handler.h
index e85cd9b2ee..81a883deeb 100644
--- a/widgets/misc/e-attachment-handler.h
+++ b/widgets/misc/e-attachment-handler.h
@@ -22,7 +22,7 @@
 #ifndef E_ATTACHMENT_HANDLER_H
 #define E_ATTACHMENT_HANDLER_H
 
-#include <e-util/e-extension.h>
+#include <libebackend/e-extension.h>
 #include <misc/e-attachment-view.h>
 
 /* Standard GObject macros */
diff --git a/widgets/misc/e-attachment-icon-view.c b/widgets/misc/e-attachment-icon-view.c
index 9dd782529b..cf14d97746 100644
--- a/widgets/misc/e-attachment-icon-view.c
+++ b/widgets/misc/e-attachment-icon-view.c
@@ -26,7 +26,7 @@
 #include "e-attachment-icon-view.h"
 
 #include <glib/gi18n.h>
-#include <e-util/e-extensible.h>
+#include <libebackend/e-extensible.h>
 
 #include "e-attachment.h"
 #include "e-attachment-store.h"
diff --git a/widgets/misc/e-attachment-store.c b/widgets/misc/e-attachment-store.c
index 8db9f2af80..691fd518b8 100644
--- a/widgets/misc/e-attachment-store.c
+++ b/widgets/misc/e-attachment-store.c
@@ -1080,7 +1080,7 @@ struct _SaveContext {
 static SaveContext *
 attachment_store_save_context_new (EAttachmentStore *store,
                                    GFile *destination,
-				   const gchar *filename_prefix,
+                                   const gchar *filename_prefix,
                                    GAsyncReadyCallback callback,
                                    gpointer user_data)
 {
@@ -1128,7 +1128,7 @@ attachment_store_save_context_free (SaveContext *save_context)
 
 	g_free (save_context->filename_prefix);
 	save_context->filename_prefix = NULL;
-	
+
 	if (save_context->fresh_directory) {
 		g_object_unref (save_context->fresh_directory);
 		save_context->fresh_directory = NULL;
@@ -1145,7 +1145,10 @@ attachment_store_save_context_free (SaveContext *save_context)
 }
 
 static void
-attachment_store_move_file (SaveContext *save_context, GFile *source, GFile *destination, GError **error)
+attachment_store_move_file (SaveContext *save_context,
+                            GFile *source,
+                            GFile *destination,
+                            GError **error)
 {
 	gchar *tmpl;
 	gchar *path;
@@ -1311,7 +1314,7 @@ attachment_store_save_cb (EAttachment *attachment,
 void
 e_attachment_store_save_async (EAttachmentStore *store,
                                GFile *destination,
-			       const gchar *filename_prefix,
+                               const gchar *filename_prefix,
                                GAsyncReadyCallback callback,
                                gpointer user_data)
 {
diff --git a/widgets/misc/e-attachment-tree-view.c b/widgets/misc/e-attachment-tree-view.c
index 529312006f..7c67fdb917 100644
--- a/widgets/misc/e-attachment-tree-view.c
+++ b/widgets/misc/e-attachment-tree-view.c
@@ -26,7 +26,7 @@
 #include "e-attachment-tree-view.h"
 
 #include <glib/gi18n.h>
-#include <e-util/e-extensible.h>
+#include <libebackend/e-extensible.h>
 
 #include "e-attachment.h"
 #include "e-attachment-store.h"
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index d3f42fd359..c7f2e049d9 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -25,6 +25,8 @@
 #include <config.h>
 #endif
 
+#include <libebackend/e-extensible.h>
+
 #include "e-calendar-item.h"
 #include "ea-widgets.h"
 
@@ -36,7 +38,6 @@
 #include <glib/gi18n.h>
 #include <libedataserver/e-data-server-util.h>
 #include <e-util/e-util.h>
-#include <e-util/e-extensible.h>
 
 static const gint e_calendar_item_days_in_month[12] = {
 	31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 2a9eb7f457..970a06b402 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -37,10 +37,10 @@
 #include <atk/atkrelation.h>
 #include <atk/atkrelationset.h>
 #include <glib/gi18n.h>
+#include <libebackend/e-extensible.h>
 #include <libedataserver/e-time-utils.h>
 #include <libedataserver/e-data-server-util.h>
 #include <e-util/e-util.h>
-#include <e-util/e-extensible.h>
 #include "e-calendar.h"
 
 struct _EDateEditPrivate {
diff --git a/widgets/misc/e-import-assistant.c b/widgets/misc/e-import-assistant.c
index 06dff88e29..a2588cd075 100644
--- a/widgets/misc/e-import-assistant.c
+++ b/widgets/misc/e-import-assistant.c
@@ -32,9 +32,9 @@
 
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
+#include <libebackend/e-extensible.h>
 
 #include <e-util/e-import.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-util-private.h>
 
 typedef struct _ImportFilePage ImportFilePage;
diff --git a/widgets/misc/e-url-entry.c b/widgets/misc/e-url-entry.c
index c4a174c0a6..c59cf0739c 100644
--- a/widgets/misc/e-url-entry.c
+++ b/widgets/misc/e-url-entry.c
@@ -118,8 +118,6 @@ mnemonic_activate (GtkWidget *widget,
 	return gtk_widget_mnemonic_activate (priv->entry, group_cycling);
 }
 
-
-
 GtkWidget *
 e_url_entry_new (void)
 {
diff --git a/widgets/misc/e-url-entry.h b/widgets/misc/e-url-entry.h
index 7b50f79f7a..119fe47b18 100644
--- a/widgets/misc/e-url-entry.h
+++ b/widgets/misc/e-url-entry.h
@@ -33,7 +33,6 @@ G_BEGIN_DECLS
 #define E_IS_URL_ENTRY(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_URL_ENTRY))
 #define E_IS_URL_ENTRY_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_URL_ENTRY))
 
-
 typedef struct _EUrlEntry        EUrlEntry;
 typedef struct _EUrlEntryPrivate EUrlEntryPrivate;
 typedef struct _EUrlEntryClass   EUrlEntryClass;
@@ -48,8 +47,6 @@ struct _EUrlEntryClass {
 	GtkHBoxClass parent_class;
 };
 
-
-
 GType      e_url_entry_get_type  (void);
 GtkWidget *e_url_entry_new       (void);
 GtkWidget *e_url_entry_get_entry (EUrlEntry *url_entry);
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index 8e037ac66c..c35bbcc123 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -26,11 +26,11 @@
 #include <glib/gi18n-lib.h>
 
 #include <camel/camel.h>
+#include <libebackend/e-extensible.h>
 
 #include <e-util/e-util.h>
 #include <e-util/e-alert-dialog.h>
 #include <e-util/e-alert-sink.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-plugin-ui.h>
 
 #include "e-popup-action.h"
diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index 0ae1e2b7e9..36af5ec2bf 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -7,11 +7,10 @@ libetable_la_CPPFLAGS =				\
 	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/widgets			\
-	$(E_UTIL_CFLAGS)			\
-	$(E_WIDGETS_CFLAGS)			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
 	$(GNOME_PLATFORM_CFLAGS)		\
-	-DEVOLUTION_UIDIR=\"$(uidir)\"	\
-        -DG_LOG_DOMAIN=\"e-table\"
+	-DEVOLUTION_UIDIR=\"$(uidir)\"		\
+	-DG_LOG_DOMAIN=\"e-table\"
 
 libetable_la_SOURCES = 				\
 	e-cell.c				\
@@ -173,10 +172,9 @@ libetable_la_LIBADD =						\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/widgets/text/libetext.la		\
 	$(top_builddir)/libgnomecanvas/libgnomecanvas.la	\
-	$(E_UTIL_LIBS)						\
-	$(E_WIDGETS_LIBS)					\
-	$(MATH_LIB)						\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)					\
+	$(MATH_LIB)
 
 icons = 			\
 	arrow-down.xpm		\
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index ecc414853c..78d8461b5f 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -491,17 +491,12 @@ etfci_draw (GnomeCanvasItem *item,
 	gint rows;
 	gint y1, y2;
 	gint row;
-	GtkStyle *style;
-	GtkStateType state;
 
 	if (etfci->combined_header == NULL)
 		return;
 
 	rows = e_table_header_count (etfci->combined_header);
 
-	style = gtk_widget_get_style (GTK_WIDGET (canvas));
-	state = gtk_widget_get_state (GTK_WIDGET (canvas));
-
 	y1 = y2 = 0;
 	for (row = 0; row < rows; row++, y1 = y2) {
 		ETableCol *ecol;
@@ -519,10 +514,7 @@ etfci_draw (GnomeCanvasItem *item,
 		if (y2 < y)
 			continue;
 
-		cairo_save (cr);
-
 		e_table_header_draw_button (cr, ecol,
-					    style, state,
 					    GTK_WIDGET (canvas),
 					    -x, y1 - y,
 					    width, height,
@@ -567,9 +559,6 @@ etfci_start_drag (ETableFieldChooserItem *etfci,
 	GtkWidget *widget = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas);
 	GtkTargetList *list;
 	GdkDragContext *context;
-	GdkWindow *window;
-	GtkStyle *style;
-	GtkStateType state;
 	ETableCol *ecol;
 	cairo_surface_t *cs;
 	cairo_t *cr;
@@ -604,28 +593,19 @@ etfci_start_drag (ETableFieldChooserItem *etfci,
 	g_free ((gpointer) etfci_drag_types[0].target);
 
 	button_height = e_table_header_compute_height (ecol, widget);
-	window = gtk_widget_get_window (widget);
-	cs = gdk_window_create_similar_surface (
-		window, CAIRO_CONTENT_COLOR, etfci->width, button_height);
-
-	style = gtk_widget_get_style (widget);
-	state = gtk_widget_get_state (widget);
+	cs = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+					 etfci->width, button_height);
+	cr = cairo_create (cs);
 
 	cr = cairo_create (cs);
 	e_table_header_draw_button (
-		cr, ecol, style,
-		state, widget, 0, 0,
+		cr, ecol,
+		widget, 0, 0,
 		etfci->width, button_height,
 		etfci->width, button_height,
 		E_TABLE_COL_ARROW_NONE);
 
-	pixbuf = gdk_pixbuf_get_from_window (window, 0, 0, etfci->width, button_height);
-	gtk_drag_set_icon_pixbuf (
-		context,
-		pixbuf,
-		etfci->width / 2,
-		button_height / 2);
-	g_object_unref (pixbuf);
+	gtk_drag_set_icon_surface (context, cs);
 
 	cairo_surface_destroy (cs);
 	cairo_destroy (cr);
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index d874834db1..7d04eda9d9 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -1252,7 +1252,7 @@ e_table_group_container_print_page (EPrintable *ep,
                                     gboolean quantize,
                                     ETGCPrintContext *groupcontext)
 {
-	cairo_t *cr;
+	cairo_t *cr = NULL;
 	GtkPageSetup *setup;
 	gdouble yd;
 	gdouble page_height, page_margin;
@@ -1301,8 +1301,7 @@ e_table_group_container_print_page (EPrintable *ep,
 		child_height = e_printable_height (child_printable, context, width,yd, quantize);
 		if (child_height < 0)
 			child_height = -child_height;
-		if (yd < 2 * TEXT_AREA_HEIGHT + 20 + child_height )
-		{
+		if (cr && yd < 2 * TEXT_AREA_HEIGHT + 20 + child_height) {
 			cairo_show_page (cr);
 			cairo_translate (cr, -2 * TEXT_AREA_HEIGHT, -TEXT_AREA_HEIGHT);
 			break;
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 11d8f31f81..b8aa55f369 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -996,9 +996,7 @@ ethi_draw (GnomeCanvasItem *item,
 	gint x1, x2;
 	gint col;
 	GHashTable *arrows = g_hash_table_new (NULL, NULL);
-	GtkStyle *style;
-
-	style = gtk_widget_get_style (GTK_WIDGET (canvas));
+	GtkStyleContext *context;
 
 	if (ethi->sort_info) {
 		gint length;
@@ -1040,10 +1038,13 @@ ethi_draw (GnomeCanvasItem *item,
 	ethi->width = e_table_header_total_width (ethi->eth) + ethi->group_indent_width;
 	x1 = x2 = 0;
 	x2 += ethi->group_indent_width;
+
+	context = gtk_widget_get_style_context (GTK_WIDGET (canvas));
+
 	for (col = 0; col < cols; col++, x1 = x2) {
 		ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
-		GtkStateType state;
 		gint col_width;
+		GtkRegionFlags flags = 0;
 
 		col_width = ecol->width;
 
@@ -1058,15 +1059,29 @@ ethi_draw (GnomeCanvasItem *item,
 		if (x2 <= x1)
 			continue;
 
-		state = gtk_widget_get_state (GTK_WIDGET (canvas));
+		if (((col + 1) % 2) == 0)
+			flags |= GTK_REGION_EVEN;
+		else
+			flags |= GTK_REGION_ODD;
+
+		if (col == 0)
+			flags |= GTK_REGION_FIRST;
+
+		if (col + 1 == cols)
+			flags |= GTK_REGION_LAST;
+
+		gtk_style_context_save (context);
+		gtk_style_context_add_region (
+			context, GTK_STYLE_REGION_COLUMN_HEADER, flags);
 
 		e_table_header_draw_button (
-			cr, ecol,
-			style, state, GTK_WIDGET (canvas),
+			cr, ecol, GTK_WIDGET (canvas),
 			x1 - x, -y, width, height,
 			x2 - x1, ethi->height,
 			(ETableColArrow) g_hash_table_lookup (
 			arrows, GINT_TO_POINTER (ecol->col_idx)));
+
+		gtk_style_context_restore (context);
 	}
 
 	g_hash_table_destroy (arrows);
@@ -1209,22 +1224,16 @@ ethi_start_drag (ETableHeaderItem *ethi,
 	ETableCol *ecol;
 	gint col_width;
 	cairo_surface_t *s;
-	GdkPixbuf *pixbuf;
 	cairo_t *cr;
 
 	gint group_indent = 0;
 	GHashTable *arrows = g_hash_table_new (NULL, NULL);
-	GtkStateType state;
-	GtkStyle *style;
 
 	GtkTargetEntry  ethi_drag_types[] = {
 		{ (gchar *) TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER },
 	};
 
 	widget = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas);
-	state = gtk_widget_get_state (widget);
-	style = gtk_widget_get_style (widget);
-
 	ethi->drag_col = ethi_find_col_by_x (ethi, event->motion.x);
 
 	if (ethi->drag_col == -1)
@@ -1269,27 +1278,17 @@ ethi_start_drag (ETableHeaderItem *ethi,
 
 	ecol = e_table_header_get_column (ethi->eth, ethi->drag_col);
 	col_width = ecol->width;
-	s = cairo_image_surface_create (CAIRO_FORMAT_A1, col_width, ethi->height);
+	s = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, col_width, ethi->height);
 	cr = cairo_create (s);
-	pixbuf = gdk_pixbuf_get_from_surface (
-		s, 0, 0, col_width, ethi->height);
-
-	state = gtk_widget_get_state (widget);
 
 	e_table_header_draw_button (
 		cr, ecol,
-		style, state,
 		widget, 0, 0,
 		col_width, ethi->height,
 		col_width, ethi->height,
 		(ETableColArrow) g_hash_table_lookup (
 			arrows, GINT_TO_POINTER (ecol->col_idx)));
-	gtk_drag_set_icon_pixbuf (
-		context,
-		pixbuf,
-		col_width / 2,
-		ethi->height / 2);
-	g_object_unref (pixbuf);
+	gtk_drag_set_icon_surface (context, s);
 	cairo_surface_destroy (s);
 
 	ethi->maybe_drag = FALSE;
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 34f93a701b..df5ee66b56 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -35,29 +35,21 @@
 #include "e-table-defines.h"
 #include "e-table-header-utils.h"
 
-static PangoLayout *
-build_header_layout (GtkWidget *widget,
-                     const gchar *str)
+static void
+get_button_padding (GtkWidget *widget,
+                    GtkBorder *padding)
 {
-	PangoLayout *layout;
-
-	layout = gtk_widget_create_pango_layout (widget, str);
-
-#ifdef FROB_FONT_DESC
-	{
-		PangoFontDescription *desc;
-		desc = pango_font_description_copy (gtk_widget_get_style (widget)->font_desc);
-		pango_font_description_set_size (desc,
-						 pango_font_description_get_size (desc) * 1.2);
+	GtkStyleContext *context;
+	GtkStateFlags state_flags;
 
-		pango_font_description_set_weight (desc, PANGO_WEIGHT_BOLD);
-		pango_layout_set_font_description (layout, desc);
+	context = gtk_widget_get_style_context (widget);
+	state_flags = gtk_widget_get_state_flags (widget);
 
-		pango_font_description_free (desc);
-	}
-#endif
+	gtk_style_context_save (context);
+	gtk_style_context_add_class (context, GTK_STYLE_CLASS_BUTTON);
+	gtk_style_context_get_padding (context, state_flags, padding);
 
-	return layout;
+	gtk_style_context_restore (context);
 }
 
 /**
@@ -73,17 +65,17 @@ gdouble
 e_table_header_compute_height (ETableCol *ecol,
                                GtkWidget *widget)
 {
-	gint ythick;
 	gint height;
 	PangoLayout *layout;
+	GtkBorder padding;
 
 	g_return_val_if_fail (ecol != NULL, -1);
 	g_return_val_if_fail (E_IS_TABLE_COL (ecol), -1);
 	g_return_val_if_fail (GTK_IS_WIDGET (widget), -1);
 
-	ythick = gtk_widget_get_style (widget)->ythickness;
+	get_button_padding (widget, &padding);
 
-	layout = build_header_layout (widget, ecol->text);
+	layout = gtk_widget_create_pango_layout (widget, ecol->text);
 
 	pango_layout_get_pixel_size (layout, NULL, &height);
 
@@ -93,8 +85,7 @@ e_table_header_compute_height (ETableCol *ecol,
 	}
 
 	height = MAX (height, MIN_ARROW_SIZE);
-
-	height += 2 * (ythick + HEADER_PADDING);
+	height += padding.top + padding.bottom + 2 * HEADER_PADDING;
 
 	g_object_unref (layout);
 
@@ -102,139 +93,18 @@ e_table_header_compute_height (ETableCol *ecol,
 }
 
 gdouble
-e_table_header_width_extras (GtkStyle *style)
+e_table_header_width_extras (GtkWidget *widget)
 {
-	g_return_val_if_fail (style != NULL, -1);
+	GtkBorder padding;
 
-	return 2 * (style->xthickness + HEADER_PADDING);
+	get_button_padding (widget, &padding);
+	return padding.left + padding.right + 2 * HEADER_PADDING;
 }
 
-/* Creates a pixmap that is a composite of a background color and the upper-left
- * corner rectangle of a pixbuf.
- */
-#if 0
-static GdkPixmap *
-make_composite_pixmap (GdkDrawable *drawable,
-                       GdkGC *gc,
-                       GdkPixbuf *pixbuf,
-                       GdkColor *bg,
-                       gint width,
-                       gint height,
-                       gint dither_xofs,
-                       gint dither_yofs)
-{
-	gint pwidth, pheight;
-	GdkPixmap *pixmap;
-	GdkPixbuf *tmp;
-	gint color;
-
-	pwidth = gdk_pixbuf_get_width (pixbuf);
-	pheight = gdk_pixbuf_get_height (pixbuf);
-	g_return_val_if_fail (width <= pwidth && height <= pheight, NULL);
-
-	color = ((bg->red & 0xff00) << 8) |
-		(bg->green & 0xff00) |
-		((bg->blue & 0xff00) >> 8);
-
-	if (width >= pwidth && height >= pheight) {
-		tmp = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
-		if (!tmp)
-			return NULL;
-
-		gdk_pixbuf_composite_color (pixbuf, tmp,
-					    0, 0,
-					    width, height,
-					    0, 0,
-					    1.0, 1.0,
-					    GDK_INTERP_NEAREST,
-					    255,
-					    0, 0,
-					    16,
-					    color, color);
-	} else {
-		gint x, y, rowstride;
-		GdkPixbuf *fade;
-		guchar *pixels;
-
-		/* Do a nice fade of the pixbuf down and to the right */
-
-		fade = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width, height);
-		if (!fade)
-			return NULL;
-
-		gdk_pixbuf_copy_area (pixbuf,
-				      0, 0,
-				      width, height,
-				      fade,
-				      0, 0);
-
-		rowstride = gdk_pixbuf_get_rowstride (fade);
-		pixels = gdk_pixbuf_get_pixels (fade);
-
-		for (y = 0; y < height; y++) {
-			guchar *p;
-			gint yfactor;
-
-			p = pixels + y * rowstride;
-
-			if (height < pheight)
-				yfactor = height - y;
-			else
-				yfactor = height;
-
-			for (x = 0; x < width; x++) {
-				gint xfactor;
-
-				if (width < pwidth)
-					xfactor = width - x;
-				else
-					xfactor = width;
-
-				p[3] = ((gint) p[3] * xfactor * yfactor / (width * height));
-				p += 4;
-			}
-		}
-
-		tmp = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
-		if (!tmp) {
-			g_object_unref (fade);
-			return NULL;
-		}
-
-		gdk_pixbuf_composite_color (fade, tmp,
-					    0, 0,
-					    width, height,
-					    0, 0,
-					    1.0, 1.0,
-					    GDK_INTERP_NEAREST,
-					    255,
-					    0, 0,
-					    16,
-					    color, color);
-
-		g_object_unref (fade);
-	}
-
-	pixmap = gdk_pixmap_new (drawable, width, height, -1);
-	gdk_draw_rgb_image_dithalign (pixmap, gc,
-				      0, 0,
-				      width, height,
-				      GDK_RGB_DITHER_NORMAL,
-				      gdk_pixbuf_get_pixels (tmp),
-				      gdk_pixbuf_get_rowstride (tmp),
-				      dither_xofs, dither_yofs);
-	g_object_unref (tmp);
-
-	return pixmap;
-}
-#endif
-
 /**
  * e_table_header_draw_button:
  * @drawable: Destination drawable.
  * @ecol: Table column for the header information.
- * @style: Style to use for drawing the button.
- * @state: State of the table widget.
  * @widget: The table widget.
  * @x: Leftmost coordinate of the button.
  * @y: Topmost coordinate of the button.
@@ -249,8 +119,6 @@ make_composite_pixmap (GdkDrawable *drawable,
 void
 e_table_header_draw_button (cairo_t *cr,
                             ETableCol *ecol,
-                            GtkStyle *style,
-                            GtkStateType state,
                             GtkWidget *widget,
                             gint x,
                             gint y,
@@ -260,58 +128,49 @@ e_table_header_draw_button (cairo_t *cr,
                             gint button_height,
                             ETableColArrow arrow)
 {
-	gint xthick, ythick;
 	gint inner_x, inner_y;
 	gint inner_width, inner_height;
 	gint arrow_width = 0, arrow_height = 0;
 	PangoLayout *layout;
-	static gpointer g_label = NULL;
+	GtkStyleContext *context;
+	GtkBorder padding;
+	GtkStateFlags state_flags;
 
 	g_return_if_fail (cr != NULL);
 	g_return_if_fail (ecol != NULL);
 	g_return_if_fail (E_IS_TABLE_COL (ecol));
-	g_return_if_fail (style != NULL);
 	g_return_if_fail (widget != NULL);
 	g_return_if_fail (GTK_IS_WIDGET (widget));
 	g_return_if_fail (button_width > 0 && button_height > 0);
 
-	if (g_label == NULL) {
-		GtkWidget *button = gtk_button_new_with_label("Hi");
-		GtkWidget *window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-		gtk_container_add (GTK_CONTAINER (window), button);
-		gtk_widget_ensure_style (window);
-		gtk_widget_ensure_style (button);
-		g_label = gtk_bin_get_child (GTK_BIN (button));
-		g_object_add_weak_pointer (G_OBJECT (g_label), &g_label);
-		gtk_widget_ensure_style (g_label);
-		gtk_widget_realize (g_label);
-	}
-
-	cairo_save (cr);
-	gdk_cairo_set_source_color (
-		cr, &gtk_widget_get_style (GTK_WIDGET (g_label))->fg[state]);
+	/* Button bevel */
+	context = gtk_widget_get_style_context (widget);
+	state_flags = gtk_widget_get_state_flags (widget);
 
-	xthick = style->xthickness;
-	ythick = style->ythickness;
+	gtk_style_context_save (context);
+	gtk_style_context_set_state (context, state_flags);
+	gtk_style_context_add_class (context, GTK_STYLE_CLASS_BUTTON);
 
-	/* Button bevel */
+	gtk_style_context_get_padding (context, state_flags, &padding);
 
-	gtk_paint_box (style, cr, state, GTK_SHADOW_OUT,
-		       widget, "button",
-		       x, y, button_width, button_height);
+	gtk_render_background (
+		context, cr, x, y,
+		button_width, button_height);
+	gtk_render_frame (
+		context, cr, x, y,
+		button_width, button_height);
 
 	/* Inside area */
 
-	inner_width = button_width - 2 * (xthick + HEADER_PADDING);
-	inner_height = button_height - 2 * (ythick + HEADER_PADDING);
+	inner_width = button_width - (padding.left + padding.right + 2 * HEADER_PADDING);
+	inner_height = button_height - (padding.top + padding.bottom + 2 * HEADER_PADDING);
 
 	if (inner_width < 1 || inner_height < 1) {
-		cairo_restore (cr);
 		return; /* nothing fits */
 	}
 
-	inner_x = x + xthick + HEADER_PADDING;
-	inner_y = y + ythick + HEADER_PADDING;
+	inner_x = x + padding.left + HEADER_PADDING;
+	inner_y = y + padding.top + HEADER_PADDING;
 
 	/* Arrow space */
 
@@ -333,11 +192,11 @@ e_table_header_draw_button (cairo_t *cr,
 	}
 
 	if (inner_width < 1) {
-		cairo_restore (cr);
+		gtk_style_context_restore (context);
 		return; /* nothing else fits */
 	}
 
-	layout = build_header_layout (widget, ecol->text);
+	layout = gtk_widget_create_pango_layout (widget, ecol->text);
 	pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
 
 	/* Pixbuf or label */
@@ -370,18 +229,19 @@ e_table_header_draw_button (cairo_t *cr,
 				layout, (inner_width - (xpos - inner_x)) *
 				PANGO_SCALE);
 
-			cairo_move_to (cr, xpos + pwidth + 1, ypos);
-			pango_cairo_show_layout (cr, layout);
+			gtk_render_layout (
+				context, cr, xpos + pwidth + 1,
+				ypos, layout);
 		}
 
-		gdk_cairo_set_source_pixbuf (cr, ecol->pixbuf,
-					     xpos, inner_y + (inner_height - clip_height) / 2);
-		cairo_paint (cr);
+		gtk_render_icon (
+			context, cr, ecol->pixbuf, xpos,
+			inner_y + (inner_height - clip_height) / 2);
+
 	} else {
 		pango_layout_set_width (layout, inner_width * PANGO_SCALE);
 
-		cairo_move_to (cr, inner_x, inner_y);
-		pango_cairo_show_layout (cr, layout);
+		gtk_render_layout (context, cr, inner_x, inner_y, layout);
 	}
 
 	switch (arrow) {
@@ -393,13 +253,13 @@ e_table_header_draw_button (cairo_t *cr,
 		if (ecol->icon_name == NULL)
 			inner_width += arrow_width + HEADER_PADDING;
 
-		gtk_paint_arrow (style, cr, state,
-				 GTK_SHADOW_NONE, widget, "header",
-				 (arrow == E_TABLE_COL_ARROW_UP) ? GTK_ARROW_UP : GTK_ARROW_DOWN,
-				 (ecol->icon_name == NULL),
-				 inner_x + inner_width - arrow_width,
-				 inner_y + (inner_height - arrow_height) / 2,
-				 arrow_width, arrow_height);
+		gtk_render_arrow (
+			context, cr,
+			(arrow == E_TABLE_COL_ARROW_UP) ? 0 : G_PI,
+			inner_x + inner_width - arrow_width,
+			inner_y + (inner_height - arrow_height) / 2,
+			MAX (arrow_width, arrow_height));
+
 		break;
 	}
 
@@ -409,5 +269,5 @@ e_table_header_draw_button (cairo_t *cr,
 	}
 
 	g_object_unref (layout);
-	cairo_restore (cr);
+	gtk_style_context_restore (context);
 }
diff --git a/widgets/table/e-table-header-utils.h b/widgets/table/e-table-header-utils.h
index c3b2de89c7..e6d2aaba1d 100644
--- a/widgets/table/e-table-header-utils.h
+++ b/widgets/table/e-table-header-utils.h
@@ -32,11 +32,9 @@ G_BEGIN_DECLS
 
 gdouble		e_table_header_compute_height	(ETableCol *ecol,
 						 GtkWidget *widget);
-gdouble		e_table_header_width_extras	(GtkStyle *style);
+gdouble		e_table_header_width_extras	(GtkWidget *widget);
 void		e_table_header_draw_button	(cairo_t *cr,
 						 ETableCol *ecol,
-						 GtkStyle *style,
-						 GtkStateType state,
 						 GtkWidget *widget,
 						 gint x,
 						 gint y,
diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c
index 28f10264f8..6fe853e6bb 100644
--- a/widgets/table/e-table-memory.c
+++ b/widgets/table/e-table-memory.c
@@ -176,8 +176,6 @@ e_table_memory_insert (ETableMemory *etmm,
 		e_table_model_row_inserted (E_TABLE_MODEL (etmm), row);
 }
 
-
-
 /**
  * e_table_memory_remove:
  * @etable:
diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c
index 007803585e..a534f22f07 100644
--- a/widgets/table/e-table-utils.c
+++ b/widgets/table/e-table-utils.c
@@ -40,7 +40,6 @@ e_table_state_to_header (GtkWidget *widget,
                          ETableState *state)
 {
 	ETableHeader *nh;
-	GtkStyle *style;
 	const gint max_cols = e_table_header_count (full_header);
 	gint column;
 	GValue *val = g_new0 (GValue, 1);
@@ -49,11 +48,9 @@ e_table_state_to_header (GtkWidget *widget,
 	g_return_val_if_fail (full_header, NULL);
 	g_return_val_if_fail (state, NULL);
 
-	style = gtk_widget_get_style (widget);
-
 	nh = e_table_header_new ();
 	g_value_init (val, G_TYPE_DOUBLE);
-	g_value_set_double (val, e_table_header_width_extras (style));
+	g_value_set_double (val, e_table_header_width_extras (widget));
 	g_object_set_property (G_OBJECT(nh), "width_extras", val);
 	g_free (val);
 
diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c
index 43fb41b29c..4f279aabb9 100644
--- a/widgets/table/e-tree-memory.c
+++ b/widgets/table/e-tree-memory.c
@@ -77,7 +77,6 @@ struct _ETreeMemoryPrivate {
 	gpointer         destroy_user_data;
 };
 
-
 /* ETreeMemoryPath functions */
 
 static inline void
@@ -169,8 +168,6 @@ e_tree_path_unlink (ETreeMemoryPath *path)
 	path->prev_sibling = NULL;
 }
 
-
-
 /**
  * e_tree_memory_freeze:
  * @etmm: the ETreeModel to freeze.
@@ -212,7 +209,6 @@ e_tree_memory_thaw (ETreeMemory *etmm)
 	}
 }
 
-
 /* virtual methods */
 
 static void
@@ -363,7 +359,6 @@ etmm_node_request_collapse (ETreeModel *etm,
 		parent_class->node_request_collapse (etm, node);
 }
 
-
 static void
 e_tree_memory_class_init (ETreeMemoryClass *class)
 {
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
index b37ce4bf17..24221418c0 100644
--- a/widgets/table/e-tree-model.c
+++ b/widgets/table/e-tree-model.c
@@ -61,7 +61,6 @@ enum {
 
 static guint e_tree_model_signals[LAST_SIGNAL] = {0, };
 
-
 static void
 e_tree_model_class_init (ETreeModelClass *class)
 {
@@ -419,8 +418,6 @@ e_tree_model_node_request_collapse (ETreeModel *tree_model,
 	g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[NODE_REQUEST_COLLAPSE], 0, collapsed_node);
 }
 
-
-
 /**
  * e_tree_model_new
  *
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index 72b4cba091..4d95fcc74b 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -119,8 +119,6 @@ static void free_path (ETreeSortedPath *path);
 static void generate_children (ETreeSorted *ets, ETreeSortedPath *path);
 static void regenerate_children (ETreeSorted *ets, ETreeSortedPath *path);
 
-
-
 /* idle callbacks */
 
 static gboolean
@@ -162,8 +160,6 @@ ets_insert_idle (ETreeSorted *ets)
 	return FALSE;
 }
 
-
-
 /* Helper functions */
 
 #define CHECK_AROUND_LAST_ACCESS
@@ -597,8 +593,6 @@ schedule_resort (ETreeSorted *ets,
 	}
 }
 
-
-
 /* virtual methods */
 
 static void
@@ -1210,8 +1204,6 @@ ets_sort_info_changed (ETableSortInfo *sort_info,
 	schedule_resort (ets, ets->priv->root, TRUE, TRUE);
 }
 
-
-
 /* Initialization and creation */
 
 static void
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 41818652bd..effd1e9aa6 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -472,6 +472,11 @@ et_dispose (GObject *object)
 		priv->table_canvas = NULL;
 	}
 
+	if (priv->item != NULL) {
+		g_object_unref (G_OBJECT (priv->item));
+		priv->item = NULL;
+	}
+
 	/* Chain up to parent's dispose() method. */
 	G_OBJECT_CLASS (e_tree_parent_class)->dispose (object);
 }
diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am
index 2577c6fe14..d7c62af74e 100644
--- a/widgets/text/Makefile.am
+++ b/widgets/text/Makefile.am
@@ -4,7 +4,7 @@ libetext_la_CPPFLAGS =				\
 	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/widgets			\
-	$(E_UTIL_CFLAGS)			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
 	$(GNOME_PLATFORM_CFLAGS)		\
 	-DG_LOG_DOMAIN=\"e-text\"
 
@@ -35,8 +35,9 @@ libetext_la_LIBADD = 						\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/libgnomecanvas/libgnomecanvas.la	\
-	$(E_UTIL_LIBS)						\
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
-	$(REGEX_LIBS)
+	$(REGEX_LIBS)						\
+	$(MATH_LIB)
 
 -include $(top_srcdir)/git.mk
diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c
index 02535d7b34..296d732590 100644
--- a/widgets/text/e-reflow.c
+++ b/widgets/text/e-reflow.c
@@ -746,8 +746,6 @@ column_width_changed (EReflow *reflow)
 	g_signal_emit (reflow, signals[COLUMN_WIDTH_CHANGED], 0, reflow->column_width);
 }
 
-
-
 /* Virtual functions */
 static void
 e_reflow_set_property (GObject *object,
@@ -1400,7 +1398,7 @@ e_reflow_point (GnomeCanvasItem *item,
                 gint cx,
                 gint cy)
 {
-	GnomeCanvasItem *child;
+	GnomeCanvasItem *child = NULL;
 
 	if (GNOME_CANVAS_ITEM_CLASS (e_reflow_parent_class)->point)
 		child = GNOME_CANVAS_ITEM_CLASS (e_reflow_parent_class)->point (item, x, y, cx, cy);
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index b57cec835d..d7afd1df5d 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -174,7 +174,16 @@ static gboolean e_text_delete_surrounding_cb   (GtkIMContext *context,
 
 static GdkAtom clipboard_atom = GDK_NONE;
 
-
+static void
+disconnect_im_context (EText *text)
+{
+	if (!text || !text->im_context)
+		return;
+
+	g_signal_handlers_disconnect_matched (
+		text->im_context, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, text);
+	text->im_context_signals_registered = FALSE;
+}
 
 static void
 disconnect_im_context (EText *text)