124 files changed, 41839 insertions, 18126 deletions

diff --git a/ChangeLog b/ChangeLog
index 1d44cf0449..70e7f4fcdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,43 @@
+2008-10-22  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #549025
+
+	* configure.in:
+	Restrict libmono linkage to the mono plugin, so that downstream
+	packagers can isolate the mono dependency to a subpackage.
+	Add configuration summary lines indicating whether the Mono and
+	Python bindings are enabled.
+
+2008-10-17  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fix for bug #548469
+
+	* configure.in: Drop support for deprecated libnm-glib. 
+
+2008-10-14	Sankar P  <psankar@novell.com>
+
+		* calendar/gui/gnome-cal.h
+		* calendar/gui/gnome-cal.c
+		* calendar/gui/calendar-commands.h
+		* calendar/gui/calendar-commands.c
+		* calendar/conduits/memo/memo-conduit.c
+		* calendar/conduits/calendar/calendar-conduit.c
+		* calendar/conduits/todo/todo-conduit.c
+		* addressbook/conduit/address-conduit.c :
+		
+		* Remove improper FSF copyright statements; was never signed
+		over to them and was incorrectly added to this file due to a
+		mistake made by the original developer.
+
+2008-10-13  Suman Manjunath  <msuman@novell.com>
+
+	** Fix for bug #424818 (bugzilla.novell.com)
+
+	* configure.in:
+	* plugins/mark-calendar-offline :
+	Integrate the mark-calendar-offline plugin into the main code as we already 
+	have a similar per-calendar option which does the same thing. 
+
 2008-10-01  Milan Crha  <mcrha@redhat.com>
 
 	** Part of fix for bug #554458
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 2ca19f74ff..46f6de9bd2 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,32 @@
+2008-10-17  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #511918
+
+	* tools/evolution-addressbook-export-list-cards.c:
+	(struct _EContactCSVFieldData), (csv_field_data[]),
+	(e_contact_csv_get_data_type), (e_contact_csv_get):
+	Use TRUE/FALSE texts for boolean values and do not
+	free returned value for them, otherwise it crashes.
+
+2008-10-14  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* conduit/address-conduit.c:
+
+2008-10-09  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #555494
+
+	* gui/widgets/e-addressbook-view.c (generate_viewoption_menu):
+	Category icons are not themed.  Load by file, not by icon name.
+
+2008-10-03  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/widgets/eab-contact-display.c:
+
 2008-10-01  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index 3a370fa060..be9b6be368 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -1,27 +1,28 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution addressbook - Address Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk>
- *          JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution addressbook - Address Conduit
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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 General Public License for more details.
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		Eskil Heyn Olsen <deity@eskil.dk>
+ *      JP Rosevear <jpr@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 5e1dc2d62a..1cbe322a96 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Chris Toshok <toshok@ximian.com>
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ * 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/>  
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ *		Chris Toshok <toshok@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c
index 285f1dc9bc..4b98bc77ac 100644
--- a/addressbook/tools/evolution-addressbook-export-list-cards.c
+++ b/addressbook/tools/evolution-addressbook-export-list-cards.c
@@ -139,115 +139,96 @@ enum _EContactFieldCSV
 	E_CONTACT_CSV_LAST
 };
 
+typedef enum {
+	DT_STRING,
+	DT_BOOLEAN
+} EContactCSVDataType;
+
 struct _EContactCSVFieldData
 {
 	gint csv_field;
 	gint contact_field;
 	gchar *csv_name;
+	EContactCSVDataType data_type;
 };
 
 #define NOMAP -1
 static EContactCSVFieldData csv_field_data[] = {
-	{E_CONTACT_CSV_FILE_AS, E_CONTACT_FILE_AS, ""},
-	{E_CONTACT_CSV_FULL_NAME, E_CONTACT_CSV_FULL_NAME, ""},
-	{E_CONTACT_CSV_EMAIL_1, E_CONTACT_EMAIL_1, ""},
-	{E_CONTACT_CSV_EMAIL_2, E_CONTACT_EMAIL_2, ""},
-	{E_CONTACT_CSV_EMAIL_3, E_CONTACT_EMAIL_3, ""},
-	{E_CONTACT_CSV_EMAIL_4, E_CONTACT_EMAIL_4, ""},
-	{E_CONTACT_CSV_PHONE_PRIMARY, E_CONTACT_PHONE_PRIMARY,
-	 ""},
-	{E_CONTACT_CSV_PHONE_ASSISTANT,
-	 E_CONTACT_PHONE_ASSISTANT, ""},
-	{E_CONTACT_CSV_PHONE_BUSINESS,
-	 E_CONTACT_PHONE_BUSINESS, ""},
-	{E_CONTACT_CSV_PHONE_CALLBACK,
-	 E_CONTACT_PHONE_CALLBACK, ""},
-	{E_CONTACT_CSV_PHONE_COMPANY, E_CONTACT_PHONE_COMPANY,
-	 ""},
-	{E_CONTACT_CSV_PHONE_HOME, E_CONTACT_PHONE_HOME, ""},
-	{E_CONTACT_CSV_ORG, E_CONTACT_ORG, ""},
+	{E_CONTACT_CSV_FILE_AS,		E_CONTACT_FILE_AS,	   "", DT_STRING},
+	{E_CONTACT_CSV_FULL_NAME,	E_CONTACT_CSV_FULL_NAME,   "", DT_STRING},
+	{E_CONTACT_CSV_EMAIL_1,		E_CONTACT_EMAIL_1,	   "", DT_STRING},
+	{E_CONTACT_CSV_EMAIL_2,		E_CONTACT_EMAIL_2,	   "", DT_STRING},
+	{E_CONTACT_CSV_EMAIL_3,		E_CONTACT_EMAIL_3,	   "", DT_STRING},
+	{E_CONTACT_CSV_EMAIL_4,		E_CONTACT_EMAIL_4,	   "", DT_STRING},
+	{E_CONTACT_CSV_PHONE_PRIMARY,	E_CONTACT_PHONE_PRIMARY,   "", DT_STRING},
+	{E_CONTACT_CSV_PHONE_ASSISTANT,	E_CONTACT_PHONE_ASSISTANT, "", DT_STRING},
+	{E_CONTACT_CSV_PHONE_BUSINESS,	E_CONTACT_PHONE_BUSINESS,  "", DT_STRING},
+	{E_CONTACT_CSV_PHONE_CALLBACK,	E_CONTACT_PHONE_CALLBACK,  "", DT_STRING},
+	{E_CONTACT_CSV_PHONE_COMPANY,	E_CONTACT_PHONE_COMPANY,   "", DT_STRING},
+	{E_CONTACT_CSV_PHONE_HOME,	E_CONTACT_PHONE_HOME,	   "", DT_STRING},
+	{E_CONTACT_CSV_ORG,		E_CONTACT_ORG,		   "", DT_STRING},
 	/*E_CONTACT_CSV_ADDRESS_BUSINESS, */
-	{E_CONTACT_CSV_ADDRESS_BUSINESS_STREET, NOMAP,
-	 "Business Address"},
-	{E_CONTACT_CSV_ADDRESS_BUSINESS_EXT, NOMAP,
-	 "Business Address2"},
-	{E_CONTACT_CSV_ADDRESS_BUSINESS_CITY, NOMAP,
-	 "Business Address City"},
-	{E_CONTACT_CSV_ADDRESS_BUSINESS_REGION, NOMAP,
-	 "Business Address State"},
-	{E_CONTACT_CSV_ADDRESS_BUSINESS_POSTCODE, NOMAP,
-	 "Business Address PostCode"},
-	{E_CONTACT_CSV_ADDRESS_BUSINESS_COUNTRY, NOMAP,
-	 "Business Address Country"},
+	{E_CONTACT_CSV_ADDRESS_BUSINESS_STREET,	  NOMAP, "Business Address", 	      DT_STRING},
+	{E_CONTACT_CSV_ADDRESS_BUSINESS_EXT,	  NOMAP, "Business Address2",         DT_STRING},
+	{E_CONTACT_CSV_ADDRESS_BUSINESS_CITY,	  NOMAP, "Business Address City",     DT_STRING},
+	{E_CONTACT_CSV_ADDRESS_BUSINESS_REGION,	  NOMAP, "Business Address State",    DT_STRING},
+	{E_CONTACT_CSV_ADDRESS_BUSINESS_POSTCODE, NOMAP, "Business Address PostCode", DT_STRING},
+	{E_CONTACT_CSV_ADDRESS_BUSINESS_COUNTRY,  NOMAP, "Business Address Country",  DT_STRING},
 	/*E_CONTACT_CSV_ADDRESS_HOME, */
-	{E_CONTACT_CSV_ADDRESS_HOME_STREET, NOMAP, "Home Address"},
-	{E_CONTACT_CSV_ADDRESS_HOME_EXT, NOMAP, "Home Address2"},
-	{E_CONTACT_CSV_ADDRESS_HOME_CITY, NOMAP, "Home Address City"},
-	{E_CONTACT_CSV_ADDRESS_HOME_REGION, NOMAP,
-	 "Home Address State"},
-	{E_CONTACT_CSV_ADDRESS_HOME_POSTCODE, NOMAP,
-	 "Home Address PostCode"},
-	{E_CONTACT_CSV_ADDRESS_HOME_COUNTRY, NOMAP,
-	 "Home Address Country"},
-	{E_CONTACT_CSV_PHONE_MOBILE, E_CONTACT_PHONE_MOBILE,
-	 ""},
-	{E_CONTACT_CSV_PHONE_CAR, E_CONTACT_PHONE_CAR, ""},
-	{E_CONTACT_CSV_PHONE_BUSINESS_FAX,
-	 E_CONTACT_PHONE_BUSINESS_FAX, ""},
-	{E_CONTACT_CSV_PHONE_HOME_FAX,
-	 E_CONTACT_PHONE_HOME_FAX, ""},
-	{E_CONTACT_CSV_PHONE_BUSINESS_2,
-	 E_CONTACT_PHONE_BUSINESS_2, ""},
-	{E_CONTACT_CSV_PHONE_HOME_2, E_CONTACT_PHONE_HOME_2,
-	 ""},
-	{E_CONTACT_CSV_PHONE_ISDN, E_CONTACT_PHONE_ISDN, ""},
-	{E_CONTACT_CSV_PHONE_OTHER, E_CONTACT_PHONE_OTHER, ""},
-	{E_CONTACT_CSV_PHONE_OTHER_FAX,
-	 E_CONTACT_PHONE_OTHER_FAX, ""},
-	{E_CONTACT_CSV_PHONE_PAGER, E_CONTACT_PHONE_PAGER, ""},
-	{E_CONTACT_CSV_PHONE_RADIO, E_CONTACT_PHONE_RADIO, ""},
-	{E_CONTACT_CSV_PHONE_TELEX, E_CONTACT_PHONE_TELEX, ""},
-	{E_CONTACT_CSV_PHONE_TTYTDD, E_CONTACT_PHONE_TTYTDD,
-	 ""},
+	{E_CONTACT_CSV_ADDRESS_HOME_STREET,   NOMAP, "Home Address",          DT_STRING},
+	{E_CONTACT_CSV_ADDRESS_HOME_EXT,      NOMAP, "Home Address2",         DT_STRING},
+	{E_CONTACT_CSV_ADDRESS_HOME_CITY,     NOMAP, "Home Address City",     DT_STRING},
+	{E_CONTACT_CSV_ADDRESS_HOME_REGION,   NOMAP, "Home Address State",    DT_STRING},
+	{E_CONTACT_CSV_ADDRESS_HOME_POSTCODE, NOMAP, "Home Address PostCode", DT_STRING},
+	{E_CONTACT_CSV_ADDRESS_HOME_COUNTRY,  NOMAP, "Home Address Country",  DT_STRING},
+	{E_CONTACT_CSV_PHONE_MOBILE, 	      E_CONTACT_PHONE_MOBILE,       "", DT_STRING},
+	{E_CONTACT_CSV_PHONE_CAR,	      E_CONTACT_PHONE_CAR,          "", DT_STRING},
+	{E_CONTACT_CSV_PHONE_BUSINESS_FAX,    E_CONTACT_PHONE_BUSINESS_FAX, "", DT_STRING},
+	{E_CONTACT_CSV_PHONE_HOME_FAX,        E_CONTACT_PHONE_HOME_FAX,     "", DT_STRING},
+	{E_CONTACT_CSV_PHONE_BUSINESS_2,      E_CONTACT_PHONE_BUSINESS_2,   "", DT_STRING},
+	{E_CONTACT_CSV_PHONE_HOME_2,          E_CONTACT_PHONE_HOME_2,       "", DT_STRING},
+	{E_CONTACT_CSV_PHONE_ISDN,            E_CONTACT_PHONE_ISDN,         "", DT_STRING},
+	{E_CONTACT_CSV_PHONE_OTHER,           E_CONTACT_PHONE_OTHER,        "", DT_STRING},
+	{E_CONTACT_CSV_PHONE_OTHER_FAX,       E_CONTACT_PHONE_OTHER_FAX,    "", DT_STRING},
+	{E_CONTACT_CSV_PHONE_PAGER,           E_CONTACT_PHONE_PAGER,        "", DT_STRING},
+	{E_CONTACT_CSV_PHONE_RADIO,           E_CONTACT_PHONE_RADIO,        "", DT_STRING},
+	{E_CONTACT_CSV_PHONE_TELEX,           E_CONTACT_PHONE_TELEX,        "", DT_STRING},
+	{E_CONTACT_CSV_PHONE_TTYTDD,          E_CONTACT_PHONE_TTYTDD,       "", DT_STRING},
 	/*E_CONTACT_CSV_ADDRESS_OTHER, */
-	{E_CONTACT_CSV_ADDRESS_OTHER_STREET, NOMAP, "Other Address"},
-	{E_CONTACT_CSV_ADDRESS_OTHER_EXT, NOMAP, "Other Address2"},
-	{E_CONTACT_CSV_ADDRESS_OTHER_CITY, NOMAP,
-	 "Other Address City"},
-	{E_CONTACT_CSV_ADDRESS_OTHER_REGION, NOMAP,
-	 "Other Address State"},
-	{E_CONTACT_CSV_ADDRESS_OTHER_POSTCODE, NOMAP,
-	 "Other Address PostCode"},
-	{E_CONTACT_CSV_ADDRESS_OTHER_COUNTRY, NOMAP,
-	 "Other Address Country"},
-	{E_CONTACT_CSV_HOMEPAGE_URL, E_CONTACT_HOMEPAGE_URL, ""},
-	{E_CONTACT_CSV_ORG_UNIT, E_CONTACT_ORG_UNIT, ""},
-	{E_CONTACT_CSV_OFFICE, E_CONTACT_OFFICE, ""},
-	{E_CONTACT_CSV_TITLE, E_CONTACT_TITLE, ""},
-	{E_CONTACT_CSV_ROLE, E_CONTACT_ROLE, ""},
-	{E_CONTACT_CSV_MANAGER, E_CONTACT_MANAGER, ""},
-	{E_CONTACT_CSV_ASSISTANT, E_CONTACT_ASSISTANT, ""},
-	{E_CONTACT_CSV_NICKNAME, E_CONTACT_NICKNAME, ""},
-	{E_CONTACT_CSV_SPOUSE, E_CONTACT_SPOUSE, ""},
-	{E_CONTACT_CSV_NOTE, E_CONTACT_NOTE, ""},
-	{E_CONTACT_CSV_CALENDAR_URI, E_CONTACT_CALENDAR_URI, ""},
-	{E_CONTACT_CSV_FREEBUSY_URL, E_CONTACT_FREEBUSY_URL, ""},
+	{E_CONTACT_CSV_ADDRESS_OTHER_STREET,   NOMAP, "Other Address",          DT_STRING},
+	{E_CONTACT_CSV_ADDRESS_OTHER_EXT,      NOMAP, "Other Address2",         DT_STRING},
+	{E_CONTACT_CSV_ADDRESS_OTHER_CITY,     NOMAP, "Other Address City",     DT_STRING},
+	{E_CONTACT_CSV_ADDRESS_OTHER_REGION,   NOMAP, "Other Address State",    DT_STRING},
+	{E_CONTACT_CSV_ADDRESS_OTHER_POSTCODE, NOMAP, "Other Address PostCode", DT_STRING},
+	{E_CONTACT_CSV_ADDRESS_OTHER_COUNTRY,  NOMAP, "Other Address Country",  DT_STRING},
+	{E_CONTACT_CSV_HOMEPAGE_URL,           E_CONTACT_HOMEPAGE_URL, "", DT_STRING},
+	{E_CONTACT_CSV_ORG_UNIT,               E_CONTACT_ORG_UNIT,     "", DT_STRING},
+	{E_CONTACT_CSV_OFFICE,                 E_CONTACT_OFFICE,       "", DT_STRING},
+	{E_CONTACT_CSV_TITLE,                  E_CONTACT_TITLE,        "", DT_STRING},
+	{E_CONTACT_CSV_ROLE,                   E_CONTACT_ROLE,         "", DT_STRING},
+	{E_CONTACT_CSV_MANAGER,                E_CONTACT_MANAGER,      "", DT_STRING},
+	{E_CONTACT_CSV_ASSISTANT,              E_CONTACT_ASSISTANT,    "", DT_STRING},
+	{E_CONTACT_CSV_NICKNAME,               E_CONTACT_NICKNAME,     "", DT_STRING},
+	{E_CONTACT_CSV_SPOUSE,                 E_CONTACT_SPOUSE,       "", DT_STRING},
+	{E_CONTACT_CSV_NOTE,                   E_CONTACT_NOTE,         "", DT_STRING},
+	{E_CONTACT_CSV_CALENDAR_URI,           E_CONTACT_CALENDAR_URI, "", DT_STRING},
+	{E_CONTACT_CSV_FREEBUSY_URL,           E_CONTACT_FREEBUSY_URL, "", DT_STRING},
 	/*E_CONTACT_ANNIVERSARY, */
-	{E_CONTACT_CSV_ANNIVERSARY_YEAR, NOMAP, "Anniversary Year"},
-	{E_CONTACT_CSV_ANNIVERSARY_MONTH, NOMAP, "Anniversary Month"},
-	{E_CONTACT_CSV_ANNIVERSARY_DAY, NOMAP, "Anniversary Day"},
+	{E_CONTACT_CSV_ANNIVERSARY_YEAR,       NOMAP, "Anniversary Year",  DT_STRING},
+	{E_CONTACT_CSV_ANNIVERSARY_MONTH,      NOMAP, "Anniversary Month", DT_STRING},
+	{E_CONTACT_CSV_ANNIVERSARY_DAY,        NOMAP, "Anniversary Day",   DT_STRING},
 	/*E_CONTACT_BIRTH_DATE, */
-	{E_CONTACT_CSV_BIRTH_DATE_YEAR, NOMAP, "Birth Year"},
-	{E_CONTACT_CSV_BIRTH_DATE_MONTH, NOMAP, "Birth Month"},
-	{E_CONTACT_CSV_BIRTH_DATE_DAY, NOMAP, "Birth Day"},
-	{E_CONTACT_CSV_MAILER, E_CONTACT_MAILER, ""},
-	{E_CONTACT_CSV_NAME_OR_ORG, E_CONTACT_NAME_OR_ORG, ""},
-	{E_CONTACT_CSV_CATEGORIES, E_CONTACT_CATEGORIES, ""},
-	{E_CONTACT_CSV_FAMILY_NAME, E_CONTACT_FAMILY_NAME, ""},
-	{E_CONTACT_CSV_GIVEN_NAME, E_CONTACT_GIVEN_NAME, ""},
-	{E_CONTACT_CSV_WANTS_HTML, E_CONTACT_WANTS_HTML, ""},
-	{E_CONTACT_CSV_IS_LIST, E_CONTACT_IS_LIST, ""},
-	{E_CONTACT_CSV_LAST, NOMAP, ""}
+	{E_CONTACT_CSV_BIRTH_DATE_YEAR,  NOMAP, "Birth Year",  DT_STRING},
+	{E_CONTACT_CSV_BIRTH_DATE_MONTH, NOMAP, "Birth Month", DT_STRING},
+	{E_CONTACT_CSV_BIRTH_DATE_DAY,   NOMAP, "Birth Day",   DT_STRING},
+	{E_CONTACT_CSV_MAILER,           E_CONTACT_MAILER,      "", DT_STRING},
+	{E_CONTACT_CSV_NAME_OR_ORG,      E_CONTACT_NAME_OR_ORG, "", DT_STRING},
+	{E_CONTACT_CSV_CATEGORIES,       E_CONTACT_CATEGORIES,  "", DT_STRING},
+	{E_CONTACT_CSV_FAMILY_NAME,      E_CONTACT_FAMILY_NAME, "", DT_STRING},
+	{E_CONTACT_CSV_GIVEN_NAME,       E_CONTACT_GIVEN_NAME,  "", DT_STRING},
+	{E_CONTACT_CSV_WANTS_HTML,       E_CONTACT_WANTS_HTML,  "", DT_BOOLEAN},
+	{E_CONTACT_CSV_IS_LIST,          E_CONTACT_IS_LIST,     "", DT_BOOLEAN},
+	{E_CONTACT_CSV_LAST,             NOMAP,                 "", DT_STRING}
 
 };
 
@@ -276,6 +257,12 @@ e_contact_csv_get_contact_field (EContactFieldCSV csv_field)
 	return csv_field_data[csv_field].contact_field;
 }
 
+static EContactCSVDataType
+e_contact_csv_get_data_type (EContactFieldCSV csv_field)
+{
+	return csv_field_data[csv_field].data_type;
+}
+
 gchar *
 e_contact_csv_get_name (EContactFieldCSV csv_field)
 {
@@ -310,8 +297,10 @@ e_contact_csv_get (EContact * contact, EContactFieldCSV csv_field)
 
 	if (contact_field != NOMAP) {
 		field_value = e_contact_get (contact, contact_field);
+		if (e_contact_csv_get_data_type (csv_field) == DT_BOOLEAN) {
+			field_value = g_strdup ((GPOINTER_TO_INT (field_value)) ? "TRUE" : "FALSE");
+		}
 	} else {
-
 		switch (csv_field) {
 		case E_CONTACT_CSV_ADDRESS_HOME_STREET:
 			delivery_address = e_contact_get (contact, E_CONTACT_ADDRESS_HOME);
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 04bfe0d70a..343a76a9e0 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,91 @@
+2008-10-20  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #555958 (patch by Anis Elleuch)
+
+	* gui/dialogs/comp-editor.c (comp_editor_init):
+	Add the UI manager's accelerator group to the editor window
+	so that menu shortcut keys work.
+
+2008-10-20  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #553715
+
+	* gui/e-week-view.c: (e_week_view_on_editing_stopped):
+	Set end time for the event properly, not same as start time.
+
+2008-10-20  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #528816
+
+	* importers/icalendar-importer.c: (vcal_supported): We do not support
+	vCalendar importer when we can parse the iCalendar from the file,
+	because the latter holds more information, like timezones.
+
+2008-10-17   Matt Davey  <mcdavey@mrao.cam.ac.uk>
+
+	** Fix for bug #556059
+
+	* conduits/common/Makefile.am:
+	* conduits/common/libecalendar-common-conduit.c: Allow building outside
+	the source tree.
+
+2008-10-17  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #553609
+
+	* gui/e-week-view.c: (e_week_view_set_selected_time_range):
+	Do not do any changes when the view has not been shown yet.
+
+2008-10-17  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #530872
+
+	* gui/e-calendar-table.c: (e_calendar_table_on_open_task):
+	Check for NULL soon enough to not crash.
+
+2008-10-14  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* conduits/calendar/calendar-conduit.c:
+	* conduits/memo/memo-conduit.c:
+	* conduits/todo/todo-conduit.c:
+	* gui/calendar-commands.c:
+	* gui/calendar-commands.h:
+	* gui/gnome-cal.c:
+	* gui/gnome-cal.h:
+
+2008-10-13  Suman Manjunath  <msuman@novell.com>
+
+	** Fix for bug #424818 (bugzilla.novell.com)
+
+	* gui/dialogs/calendar-setup.c (eccp_general_offline): Don't show offline
+	availability option for B&A calendars. 
+	* gui/e-cal-popup.c (e_cal_popup_target_new_source): Check for the correct 
+	property ("offline_sync" instead of "offline") while setting the GUI mask. 
+	* gui/calendar-component.c (set_offline_availability),
+	(mark_no_offline_cb), (mark_offline_cb):
+	* gui/memos-component.c (set_offline_availability),
+	(mark_no_offline_cb), (mark_offline_cb):
+	* gui/tasks-component.c (set_offline_availability), 
+	(mark_no_offline_cb), (mark_offline_cb):
+	Integrate the mark-calendar-offline plugin into the main code as we already 
+	have a similar per-calendar option which does the same thing. 
+
+2008-10-09  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #555494
+
+	* gui/cal-search-bar.c (generate_viewoption_menu):
+	Category icons are not themed.  Load by file, not by icon name.
+
+2008-10-08  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/alarm-notify/alarm.c:
+	* gui/dialogs/comp-editor.c:
+
 2008-10-01  Milan Crha  <mcrha@redhat.com>
 
 	** Part of fix for bug #554418
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 5d610132a3..b5d2e1abe1 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -1,24 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Calendar Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk>
- *          JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution calendar - Calendar Conduit
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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 General Public License for more details.
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		Eskil Heyn Olsen <deity@eskil.dk>
+ *      JP Rosevear <jpr@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <config.h>
diff --git a/calendar/conduits/common/Makefile.am b/calendar/conduits/common/Makefile.am
index 3f18ffa19c..2db1df5fca 100644
--- a/calendar/conduits/common/Makefile.am
+++ b/calendar/conduits/common/Makefile.am
@@ -1,4 +1,5 @@
 INCLUDES = 					\
+	-I$(top_srcdir)			\
 	-I$(top_srcdir)/e-util			\
 	-I$(top_builddir)/e-util		\
 	$(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
diff --git a/calendar/conduits/common/libecalendar-common-conduit.c b/calendar/conduits/common/libecalendar-common-conduit.c
index c5000875b7..1b7013bb0a 100644
--- a/calendar/conduits/common/libecalendar-common-conduit.c
+++ b/calendar/conduits/common/libecalendar-common-conduit.c
@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include <libedataserver/e-categories.h>
-#include <e-util/e-pilot-util.h>
+#include <e-pilot-util.h>
 #include <pi-appinfo.h>
 #include <glib.h>
 
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index 1a9638b0ce..ecaa07fa48 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -1,27 +1,28 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Memo Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk>
- *          JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution calendar - Memo Conduit
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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 General Public License for more details.
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		Eskil Heyn Olsen <deity@eskil.dk>
+ *      JP Rosevear <jpr@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index de93956d18..53aeab425b 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -1,27 +1,28 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk>
- *          JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution calendar - ToDo Conduit
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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 General Public License for more details.
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		Eskil Heyn Olsen <deity@eskil.dk>
+ *      JP Rosevear <jpr@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
index 7f6d1f41d5..bf96f1f664 100644
--- a/calendar/gui/alarm-notify/alarm.c
+++ b/calendar/gui/alarm-notify/alarm.c
@@ -1,23 +1,26 @@
-/* Evolution calendar - Low-level alarm timer mechanism
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution calendar - Low-level alarm timer mechanism
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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 General Public License for more details.
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *		Federico Mena-Quintero <federico@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <config.h>
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index d816aa7cd9..b8fe5a45fd 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -552,9 +552,8 @@ generate_viewoption_menu (CALSearchBarItem *subitems)
                         if (subitems[i].image) {
                                 GtkWidget *image;
 
-                                image = gtk_image_new_from_icon_name (
-                                        subitems[i].image,
-                                        GTK_ICON_SIZE_MENU);
+                                image = gtk_image_new_from_file (
+                                        subitems[i].image);
                                 gtk_image_menu_item_set_image (
                                         GTK_IMAGE_MENU_ITEM (menu_item),
                                         image);
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index c2a46fb4e5..c398b6e12b 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -1,27 +1,28 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Commands for the calendar GUI control
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          Rodrigo Moya <rodrigo@ximian.com>
+/*
+ * Evolution calendar - Commands for the calendar GUI control
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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 General Public License for more details.
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *      Federico Mena-Quintero <federico@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *      Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/gui/calendar-commands.h b/calendar/gui/calendar-commands.h
index ac996eeede..cfe2d24232 100644
--- a/calendar/gui/calendar-commands.h
+++ b/calendar/gui/calendar-commands.h
@@ -1,25 +1,27 @@
-/* Evolution calendar - Commands for the calendar GUI control
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
+/*
+ * Evolution calendar - Commands for the calendar GUI control
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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 General Public License for more details.
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *      Federico Mena-Quintero <federico@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef CALENDAR_COMMANDS_H
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index f7ab2ee846..724206a072 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -259,7 +259,8 @@ eccp_general_offline (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent,
 	GtkWidget *offline_setting = NULL;
 	const char *offline_sync;
 	int row;
-	gboolean is_local = g_str_has_prefix (e_source_group_peek_base_uri (sdialog->source_group), "file:");
+	const char *base_uri = e_source_group_peek_base_uri (sdialog->source_group); 
+	gboolean is_local = base_uri && (g_str_has_prefix (base_uri, "file://") || g_str_has_prefix (base_uri, "contacts://"));
 	offline_sync =  e_source_get_property (sdialog->source, "offline_sync");
 	if (old)
 		return old;
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 5e19e690eb..c1f123e836 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Framework for a calendar component editor dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution calendar - Framework for a calendar component editor dialog
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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 General Public License for more details.
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		Federico Mena-Quintero <federico@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -1752,6 +1756,10 @@ comp_editor_init (CompEditor *editor)
 	priv->attachment_bar = e_attachment_bar_new (NULL);
 	priv->manager = gtk_ui_manager_new ();
 
+        gtk_window_add_accel_group (
+                GTK_WINDOW (editor),
+                gtk_ui_manager_get_accel_group (priv->manager));
+
 	action_group = gtk_action_group_new ("core");
 	gtk_action_group_set_translation_domain (
 		action_group, GETTEXT_PACKAGE);
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index 7f61282a5a..6a5c5b3fa5 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -702,7 +702,7 @@ e_cal_popup_target_new_source(ECalPopup *eabp, ESourceSelector *selector)
 {
 	ECalPopupTargetSource *t = e_popup_target_new(&eabp->popup, E_CAL_POPUP_TARGET_SOURCE, sizeof(*t));
 	guint32 mask = ~0;
-	const char *source_uri;
+	const char *relative_uri;
 	char *uri;
 	ESource *source;
 	const char *offline = NULL;
@@ -719,42 +719,32 @@ e_cal_popup_target_new_source(ECalPopup *eabp, ESourceSelector *selector)
 		mask &= ~E_CAL_POPUP_SOURCE_PRIMARY;
 
 	/* FIXME Gross hack, should have a property or something */
-	source_uri = e_source_peek_relative_uri(source);
-	if (source_uri && !strcmp("system", source_uri))
+	relative_uri = e_source_peek_relative_uri(source);
+	if (relative_uri && !strcmp("system", relative_uri))
 		mask &= ~E_CAL_POPUP_SOURCE_SYSTEM;
 	else
 		mask &= ~E_CAL_POPUP_SOURCE_USER;
 
-	source = e_source_selector_peek_primary_selection (selector);
 	uri = e_source_get_uri (source);
 	if (!uri || (g_ascii_strncasecmp (uri, "file://", 7) && g_ascii_strncasecmp (uri, "contacts://", 11))) {
 		/* check for e_target_selector's offline_status property here */
-		offline = e_source_get_property (source, "offline");
-
-		if (offline  && strcmp (offline,"1") == 0) {
-			/* set the menu item to Mark Offline - */
-			mask &= ~E_CAL_POPUP_SOURCE_NO_OFFLINE;
-		} else {
+		offline = e_source_get_property (source, "offline_sync");
+		if (offline  && strcmp (offline, "1") == 0)
+			mask &= ~E_CAL_POPUP_SOURCE_NO_OFFLINE; 	/* set the menu item to Mark Offline */
+		else
 			mask &= ~E_CAL_POPUP_SOURCE_OFFLINE;
-		}
 	} else {
 		mask |= E_CAL_POPUP_SOURCE_NO_OFFLINE;
 		mask |= E_CAL_POPUP_SOURCE_OFFLINE;
 	}
 	g_free (uri);
 
-	source = e_source_selector_peek_primary_selection (selector);
-	/*check for delete_status property here*/
+	/* check for delete_status property here */
 	delete = e_source_get_property (source, "delete");
-
-	if (delete && strcmp (delete,"no") == 0) {
-		/*set the menu item to non deletable */
-		mask &= ~E_CAL_POPUP_SOURCE_NO_DELETE;
-	}
-	else {
+	if (delete && strcmp (delete, "no") == 0)
+		mask &= ~E_CAL_POPUP_SOURCE_NO_DELETE; 			/* set the menu item to non deletable */
+	else
 		mask &= ~E_CAL_POPUP_SOURCE_DELETE;
-	}
-
 
 	t->target.mask = mask;
 
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 3497dd4326..8b73cd7ccf 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1,30 +1,26 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * EDayView - displays the Day & Work-Week views of the calendar.
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
-
-/*
- * EDayView - displays the Day & Work-Week views of the calendar.
+ * 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/>  
+ *
+ * Authors:
+ *      Damon Chaplin <damon@ximian.com>
+ *      Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -214,11 +210,9 @@ static gboolean e_day_view_on_top_canvas_scroll (GtkWidget *widget,
 static gboolean e_day_view_on_main_canvas_scroll (GtkWidget *widget,
 						  GdkEventScroll *scroll,
 						  EDayView *day_view);
-
 static gboolean e_day_view_on_time_canvas_scroll (GtkWidget *widget,
 						  GdkEventScroll *scroll,
 						  EDayView *day_view);
-
 static gboolean e_day_view_on_main_canvas_motion (GtkWidget *widget,
 						  GdkEventMotion *event,
 						  EDayView *day_view);
@@ -2998,10 +2992,8 @@ e_day_view_on_top_canvas_scroll (GtkWidget *widget,
 		e_day_view_top_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
 		return TRUE;
 	default:
-		break;
+		return FALSE;
 	}
-
-	return FALSE;
 }
 
 static gboolean
@@ -3024,13 +3016,11 @@ e_day_view_on_time_canvas_scroll (GtkWidget      *widget,
 		e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
 		return TRUE;
 	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-static gboolean
+		return FALSE;
+	} 
+} 
+ 
+static gboolean 
 e_day_view_on_long_event_button_press (EDayView		*day_view,
 				       gint		 event_num,
 				       GdkEventButton	*event,
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 2b8f303acd..3a5dd92e2f 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -1402,6 +1402,11 @@ e_week_view_set_selected_time_range	(ECalendarView	*cal_view,
 
 	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
 
+	if (!g_date_valid (&week_view->base_date)) {
+		/* This view has not been initialized/shown yet, thus skip this. */
+		return;
+	}
+
 	time_to_gdate_with_zone (&date, start_time, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
 
 	/* Set the selection to the given days. */
@@ -3607,12 +3612,12 @@ e_week_view_on_editing_stopped (EWeekView *week_view,
 
 					e_cal_component_get_dtend (comp, &dt);
 					if (dt.value->zone) {
-						*dt.value = icaltime_from_timet_with_zone (
+						tt = icaltime_from_timet_with_zone (
 							event->comp_data->instance_end,
 							dt.value->is_date,
 							dt.value->zone);
 					} else {
-						*dt.value = icaltime_from_timet_with_zone (
+						tt = icaltime_from_timet_with_zone (
 							event->comp_data->instance_end,
 							dt.value->is_date,
 							e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index f479f5ba4b..31d72ee545 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1,28 +1,28 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Main calendar view widget
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          Rodrigo Moya <rodrigo@ximian.com>
+/*
+ * Evolution calendar - Main calendar view widget
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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 General Public License for more details.
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *      Federico Mena-Quintero <federico@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *      Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
index 29865d98fa..6c758a60cd 100644
--- a/calendar/gui/gnome-cal.h
+++ b/calendar/gui/gnome-cal.h
@@ -1,25 +1,27 @@
-/* Evolution calendar - Main calendar view widget
- *
- * Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *          Seth Alves <alves@hungry.com>
+/*
+ * Evolution calendar - Main calendar view widget
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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 General Public License for more details.
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *      Federico Mena-Quintero <federico@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef GNOME_CALENDAR_APP_H
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 7c70192c90..c2ad3a45ef 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -250,12 +250,39 @@ edit_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
 	calendar_setup_edit_task_list (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)), selected_source);
 }
 
+static void 
+set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char *value)
+{
+	TasksComponentView *component_view = data;
+	ESource *selected_source;
+
+	selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
+	if (!selected_source)
+		return;
+
+	e_source_set_property (selected_source, "offline_sync", value);
+}
+
+static void
+mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, void *data)
+{
+	set_offline_availability (ep, pitem, data, "0"); 
+}
+
+static void
+mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data)
+{
+	set_offline_availability (ep, pitem, data, "1"); 
+}
+
 static EPopupItem etc_source_popups[] = {
 	{ E_POPUP_ITEM, "10.new", N_("_New Task List"), new_task_list_cb, NULL, "stock_todo", 0, 0 },
 	{ E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_task_list_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
 
 	{ E_POPUP_BAR, "20.bar" },
 	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "30.mark_tasks_offline", N_("_Make available for offline use"), mark_offline_cb, NULL, "stock_disconnect", E_CAL_POPUP_SOURCE_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_OFFLINE },
+	{ E_POPUP_ITEM, "40.mark_tasks_no_offline", N_("_Do not make available for offline use"), mark_no_offline_cb, NULL, "stock_connect", E_CAL_POPUP_SOURCE_NO_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_NO_OFFLINE },
 
 	{ E_POPUP_BAR, "99.bar" },
 	{ E_POPUP_ITEM, "99.properties", N_("_Properties"), edit_task_list_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index da10434890..eb751d07a3 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -474,22 +474,34 @@ vcal_supported(EImport *ei, EImportTarget *target, EImportImporter *im)
 
 	if (g_file_get_contents(filename, &contents, NULL, NULL)) {
 		VObject *vcal;
+		icalcomponent *icalcomp;
 
-		/* parse the file */
-		vcal = Parse_MIME (contents, strlen (contents));
-		g_free (contents);
+		icalcomp = e_cal_util_parse_ics_string (contents);
 
-		if (vcal) {
-			icalcomponent *icalcomp;
+		if (icalcomp && icalcomponent_is_valid (icalcomp)) {
+			/* If we can create proper iCalendar from the file, then
+			   rather use ics importer, because it knows to read more
+			   information than older version, the vCalendar. */
+			ret = FALSE;
+			g_free (contents);
+		} else {
+			if (icalcomp)
+				icalcomponent_free (icalcomp);
 
-			icalcomp = icalvcal_convert (vcal);
+			/* parse the file */
+			vcal = Parse_MIME (contents, strlen (contents));
+			g_free (contents);
 
-			if (icalcomp) {
-				icalcomponent_free (icalcomp);
-				ret = TRUE;
-			}
+			if (vcal) {
+				icalcomp = icalvcal_convert (vcal);
 
-			cleanVObject (vcal);
+				if (icalcomp) {
+					icalcomponent_free (icalcomp);
+					ret = TRUE;
+				}
+
+				cleanVObject (vcal);
+			}
 		}
 	}
 	g_free (filename);
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 0e5a3dd328..cbc01d7bb4 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,25 @@
+2008-10-13  Bharath Acharya  <abharath@novell.com>
+
+	** Updated fix for bug #555775
+
+	* e-composer-private.c: (e_composer_private_init): Reverting a hunk 
+	from the previous patch as suggested by Matthew Barnes.
+
+2008-10-10  Bharath Acharya  <abharath@novell.com>
+
+	** Fix for bug #555775
+
+	* e-composer-private.c: (e_composer_private_init): Include 
+	e-util-private.h for Win32 redefinition of EVOLUTION_UIDIR and build 
+	the filename using it.
+
+2008-10-03  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #554664
+
+	* e-composer-actions.c: (action_attach_cb):
+	Call attach_remote_file when knows the URI points to it.
+
 2008-10-01  Milan Crha  <mcrha@redhat.com>
 
 	** Part of fix for bug #554418
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index c88f7e301e..4a2f659c99 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -86,7 +86,7 @@ action_attach_cb (GtkAction *action,
 		if (!g_ascii_strcasecmp (url->protocol, "file"))
 			e_attachment_bar_attach (bar, url->path, disposition);
 		else
-			e_attachment_bar_attach (bar, iter->data, disposition);
+			e_attachment_bar_attach_remote_file (bar, iter->data, disposition);
 
 		camel_url_free (url);
 	}
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index c1e463a98b..8985ecd72a 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -18,6 +18,7 @@
  */
 
 #include "e-composer-private.h"
+#include "e-util/e-util-private.h"
 
 #include "mail/e-mail-shell-module.h"
 
diff --git a/configure.in b/configure.in
index c47eaf2a77..a44167beb7 100644
--- a/configure.in
+++ b/configure.in
@@ -892,16 +892,19 @@ dnl Mono hooks
 dnl This should just define mono CFLAGS etc here, it is used later to
 dnl turn on the mono plugin or not.
 
+MONO_CFLAGS=
+MONO_LIBS=
 AC_ARG_ENABLE([mono],
 	      AC_HELP_STRING([--enable-mono],
 			     [Add Mono embedded hooks.]),
 	      [enable_mono=$enableval],[enable_mono=no])
-
 if test "x${enable_mono}" = "xyes"; then
+	PKG_CHECK_MODULES(MONO, "mono")
 	AC_DEFINE(ENABLE_MONO,1,[Define if Mono embedding should be enabled])
-	mono_package="mono"
 	MONO_PLUGIN="mono"
 fi
+AC_SUBST(MONO_CFLAGS)
+AC_SUBST(MONO_LIBS)
 
 dnl Python hooks
 dnl This should just define python CFLAGS etc here, it is used later to
@@ -1494,7 +1497,7 @@ else
 	E_UTIL_X11_CFLAGS=""
 	E_UTIL_X11_LIBS=""
 fi
-EVO_SET_COMPILE_FLAGS(E_UTIL, libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr $mono_package, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $E_UTIL_X11_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $E_UTIL_X11_LIBS)
+EVO_SET_COMPILE_FLAGS(E_UTIL, libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $E_UTIL_X11_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $E_UTIL_X11_LIBS)
 AC_SUBST(E_UTIL_CFLAGS)
 AC_SUBST(E_UTIL_LIBS)
 
@@ -1519,7 +1522,7 @@ dnl --- evolution (shell) flags
 NM_SUPPORT_PACKAGES=""
 
 PKG_CHECK_MODULES(NM, dbus-glib-1, NM_SUPPORT="yes", NM_SUPPORT="no")
-AC_CHECK_HEADER(NetworkManager/NetworkManager.h, [nm_header="yes"])
+AC_CHECK_HEADER(NetworkManager/NetworkManager.h, [ nm_header="yes" ] )
 if test "x$NM_SUPPORT" = "xyes" -a "x$nm_header" = "xyes"; then 
 	AC_DEFINE(NM_SUPPORT, 1, [network manager available])
 	NM_SUPPORT_PACKAGES="dbus-1 dbus-glib-1"
@@ -1735,7 +1738,7 @@ plugins_base_always="calendar-file calendar-http calendar-weather itip-formatter
 plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " 
 all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono"
 
-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates" 
+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates" 
 
 plugins_standard="$plugins_standard_always"
 all_plugins_standard="$plugins_standard"
@@ -2057,7 +2060,6 @@ plugins/subject-thread/Makefile
 plugins/save-attachments/Makefile
 plugins/save-calendar/Makefile
 plugins/select-one-source/Makefile
-plugins/mark-calendar-offline/Makefile
 plugins/prefer-plain/Makefile
 plugins/profiler/Makefile
 plugins/python/Makefile
@@ -2121,4 +2123,6 @@ echo "\
 	Plugins:	     $msg_plugins
 	DBus API version:    $FOUND_DBUS_VERSION
 	User documentation:  $with_help
+	Mono bindings:       $enable_mono
+	Python bindings:     $enable_python
 "
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 4c2e1d14d6..00e2a0aac1 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-06  Sankar P  <psankar@novell.com>
+
+	* widgets/table/e-cell-float.c:
+	* widgets/table/e-cell-float.h:
+	Remove obsolete function
+
 2008-10-01  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #554418
diff --git a/e-util/e-util.c b/e-util/e-util.c
index d5d25db1ac..2e46128a5a 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -478,45 +478,6 @@ do_format_number_as_float (gdouble number)
 	}
 }
 
-gchar *
-e_format_number_float (gfloat number)
-{
-	gfloat          int_part;
-	gint            fraction;
-	struct lconv   *locality;
-	gchar          *str_intpart;
-	gchar          *decimal_point;
-	gchar          *str_fraction;
-	gchar          *value;
-
-	locality = localeconv();
-
-	int_part = floor (number);
-	str_intpart = do_format_number_as_float ((gdouble) int_part);
-
-	if (!strcmp(locality->mon_decimal_point, "")) {
-		decimal_point = ".";
-	}
-	else {
-		decimal_point = locality->mon_decimal_point;
-	}
-
-	fraction = (gint) ((number - int_part) * 100);
-
-	if (fraction == 0) {
-		str_fraction = g_strdup ("00");
-	} else {
-		str_fraction = g_strdup_printf ("%02d", fraction);
-	}
-
-	value = g_strconcat (str_intpart, decimal_point, str_fraction, NULL);
-
-	g_free (str_intpart);
-	g_free (str_fraction);
-
-	return value;
-}
-
 /* Perform a binary search for key in base which has nmemb elements
    of size bytes each.  The comparisons are done by (*compare)().  */
 void
diff --git a/e-util/e-util.h b/e-util/e-util.h
index e9750176eb..44fbb811cf 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -63,7 +63,6 @@ gboolean	e_write_file_uri		(const gchar *filename,
 /* This only makes a filename safe for usage as a filename.
  * It still may have shell meta-characters in it. */
 gchar *		e_format_number			(gint number);
-gchar *		e_format_number_float		(gfloat number);
 
 typedef gint	(*ESortCompareFunc)		(gconstpointer first,
 				  		 gconstpointer second,
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 12ee719755..3534320543 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,19 @@
+2008-10-17  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fix for bug #503898
+
+	* filter-rule.c: (get_widget): s/criteria/condition/
+
+2008-10-06  Lucian Langa <lucilanga@gnome.org>
+
+	** Fix for bug #554566
+
+	* rule-editor.c: (rule_editor_class_init), (rule_edit),
+	(rule_top), (rule_up), (rule_down), (rule_bottom),
+	(cursor_changed)
+	(update_selected_rule): new function to update
+	current selected rule
+
 2008-10-01  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/filter/filter-rule.c b/filter/filter-rule.c
index 6b80bf5a3a..9febe8d0ee 100644
--- a/filter/filter-rule.c
+++ b/filter/filter-rule.c
@@ -877,7 +877,7 @@ get_widget (FilterRule *fr, struct _RuleContext *f)
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 	gtk_widget_show (hbox);
 
-	text = g_strdup_printf("<b>%s</b>", _("Find items that meet the following criteria"));
+	text = g_strdup_printf("<b>%s</b>", _("Find items that meet the following conditions"));
 	label = gtk_label_new (text);
 	gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
@@ -911,13 +911,13 @@ get_widget (FilterRule *fr, struct _RuleContext *f)
 
 	hbox = gtk_hbox_new (FALSE, 3);
 
-	add = gtk_button_new_with_mnemonic (_("A_dd Filter Criteria"));
+	add = gtk_button_new_with_mnemonic (_("A_dd Condition"));
 	gtk_button_set_image (GTK_BUTTON (add), gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON));
 	g_signal_connect (add, "clicked", G_CALLBACK (more_parts), data);
 	gtk_box_pack_start (GTK_BOX (hbox), add, FALSE, FALSE, 0);
 
 	if (f->flags & RULE_CONTEXT_GROUPING) {
-		const char *thread_types[] = { N_("If all criteria are met"), N_("If any criteria are met") };
+		const char *thread_types[] = { N_("If all conditions are met"), N_("If any conditions are met") };
 
 		label = gtk_label_new_with_mnemonic (_("_Find items:"));
 		menu = gtk_menu_new ();
diff --git a/filter/rule-editor.c b/filter/rule-editor.c
index 53c576540c..16e79f0ee3 100644
--- a/filter/rule-editor.c
+++ b/filter/rule-editor.c
@@ -43,6 +43,7 @@ static void set_source (RuleEditor *re, const char *source);
 static void set_sensitive (RuleEditor *re);
 static FilterRule *create_rule (RuleEditor *re);
 
+static gboolean update_selected_rule (RuleEditor *re);
 static void cursor_changed (GtkTreeView *treeview, RuleEditor *re);
 
 static void rule_editor_class_init (RuleEditorClass *klass);
@@ -442,6 +443,8 @@ rule_edit (GtkWidget *widget, RuleEditor *re)
 {
 	GtkWidget *rules;
 
+	update_selected_rule(re);
+
 	if (re->current == NULL || re->edit != NULL)
 		return;
 
@@ -483,6 +486,8 @@ rule_delete (GtkWidget *widget, RuleEditor *re)
 	GtkTreeIter iter;
 	int pos, len;
 
+	update_selected_rule(re);
+
 	d(printf ("delete rule\n"));
 	pos = rule_context_get_rank_rule (re->context, re->current, re->source);
 	if (pos != -1) {
@@ -576,6 +581,8 @@ rule_top (GtkWidget *widget, RuleEditor *re)
 {
 	int pos;
 
+	update_selected_rule(re);
+
 	d(printf ("top rule\n"));
 	pos = rule_context_get_rank_rule (re->context, re->current, re->source);
 	if (pos > 0)
@@ -587,6 +594,8 @@ rule_up (GtkWidget *widget, RuleEditor *re)
 {
 	int pos;
 
+	update_selected_rule(re);
+
 	d(printf ("up rule\n"));
 	pos = rule_context_get_rank_rule (re->context, re->current, re->source);
 	if (pos > 0)
@@ -598,6 +607,8 @@ rule_down (GtkWidget *widget, RuleEditor *re)
 {
 	int pos;
 
+	update_selected_rule(re);
+
 	d(printf ("down rule\n"));
 	pos = rule_context_get_rank_rule (re->context, re->current, re->source);
 	if (pos >= 0)
@@ -611,6 +622,8 @@ rule_bottom (GtkWidget *widget, RuleEditor *re)
 	int index = -1, count = 0;
 	FilterRule *rule = NULL;
 
+	update_selected_rule(re);
+
 	d(printf ("bottom rule\n"));
 	pos = rule_context_get_rank_rule (re->context, re->current, re->source);
 	/* There's probably a better/faster way to get the count of the list here */
@@ -669,8 +682,8 @@ dialog_rule_changed (FilterRule *fr, GtkWidget *dialog)
 	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, fr && fr->parts);
 }
 
-static void
-cursor_changed (GtkTreeView *treeview, RuleEditor *re)
+static gboolean
+update_selected_rule (RuleEditor *re)
 {
 	GtkTreeSelection *selection;
 	GtkTreeModel *model;
@@ -679,7 +692,16 @@ cursor_changed (GtkTreeView *treeview, RuleEditor *re)
 	selection = gtk_tree_view_get_selection (re->list);
 	if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
 		gtk_tree_model_get (GTK_TREE_MODEL (re->model), &iter, 1, &re->current, -1);
+		return TRUE;
+	}
+
+	return FALSE;
+}
 
+static void
+cursor_changed (GtkTreeView *treeview, RuleEditor *re)
+{
+	if (update_selected_rule(re)) {
 		g_return_if_fail (re->current);
 
 		rule_editor_set_sensitive (re);
diff --git a/mail/ChangeLog b/mail/ChangeLog
index d8d68f1a4a..a5a277b527 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,59 @@
+2008-10-22  Matthew Barnes  <mbarnes@redhat.com>
+
+	* mail-send-recv.c:
+	* mail-send-recv.h:
+	Just some minor code polishing.
+
+2008-10-21  Sankar P  <psankar@novell.com>
+
+	* em-folder-view.c (emfv_spin):
+	Re-factor spinner usage	
+
+2008-10-20  Patrick Ohly  <Patrick.Ohly@gmx.de>
+
+	* mail-component.h: Fixed a build break.
+
+2008-10-19  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #438155
+
+	* message-list.h: (struct _MessageList):
+	* message-list.c: (message_list_init), (message_list_finalise),
+	(regen_list_done), (regen_list_free), (ml_regen_timeout),
+	(mail_regen_cancel): Guard access to the 'regen' list with a lock.
+
+2008-10-17  Srinivasa Ragavan  <sragavan@novell.com>
+
+	** Fix for bug #555276
+
+	* mail/mail-vfolder.c: Don't load a vfolder as a sub folder.
+
+2008-10-17  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #364542
+
+	* em-utils.c: (struct TryOpenEBookStruct), (try_open_e_book_cb),
+	(try_open_e_book), (em_utils_in_addressbook), (em_utils_contact_photo):
+	Stop when camel operation has been canceled. Also check for
+	cancellation when opening EBook, thus the UI (preview) will
+	not freeze with slow address books.
+
+2008-10-07  Bharath Acharya  <abharath@novell.com>
+
+	** Fix for bug #555203
+
+	* mail-session.c: (get_password): Use the url value in cases where the 
+	account goes NULL. Fixes the issue of Exchange not sending mails, 
+	because it does not have a valid transport url to use.
+
+2008-10-05  Sankar P  <psankar@novell.com>
+
+	** Fix for bug #554349
+
+	* mail/em-folder-browser.c:
+	Expand threads and select messages,
+	if user has given select-all.
+
 2008-10-01  Milan Crha  <mcrha@redhat.com>
 
 	** Part of fix for bug #554418
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 159d77d557..3bfb198c2b 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -149,6 +149,8 @@ static void emfb_search_search_cleared(ESearchBar *esb);
 static int emfb_list_key_press(ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, EMFolderBrowser *emfb);
 static void emfb_list_message_selected (MessageList *ml, const char *uid, EMFolderBrowser *emfb);
 
+static void emfb_expand_all_threads(BonoboUIComponent *uid, void *data, const char *path);
+
 static const EMFolderViewEnable emfb_enable_map[] = {
 	{ "EditInvertSelection", EM_POPUP_SELECT_FOLDER },
 	{ "EditSelectAll", EM_POPUP_SELECT_FOLDER },
@@ -1426,13 +1428,35 @@ emfb_edit_invert_selection(BonoboUIComponent *uid, void *data, const char *path)
 	message_list_invert_selection(emfv->list);
 }
 
+static gboolean
+emfb_select_all_daemon (MessageList *ml)
+{
+		message_list_select_all(ml);
+		gtk_widget_grab_focus ((GtkWidget *)ml);
+		return FALSE;
+}
+
 static void
 emfb_edit_select_all(BonoboUIComponent *uid, void *data, const char *path)
 {
-	EMFolderView *emfv = data;
+		EMFolderView *emfv = data;
 
-	message_list_select_all(emfv->list);
-	gtk_widget_grab_focus ((GtkWidget *)emfv->list);
+		if (emfv->list->threaded) {
+
+				emfb_expand_all_threads (uid, data, path);
+
+				/* The time out below is added so that the execution thread to 
+				   expand all conversations threads would've completed. 
+
+				   The timeout 505 is just to ensure that the value is a small delta
+				   more than the timeout value in expand_all_threads thread. */
+
+				g_timeout_add (505, (GSourceFunc) emfb_select_all_daemon, emfv->list);
+
+		} else {
+				/* If there is no threading, just select-all immediately */
+				emfb_select_all_daemon (emfv->list);
+		}
 }
 
 static void
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 2e673fde84..87d5196dcc 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -2539,10 +2539,7 @@ emfv_spin(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject)
 		box = gtk_hbox_new (FALSE, 0);
 		g_free (msg);
 
-		ep = e_spinner_new ();
-		e_spinner_set_size ((ESpinner *)ep, GTK_ICON_SIZE_SMALL_TOOLBAR);
-		e_spinner_start ((ESpinner *)ep);
-
+		ep = e_spinner_new_spinning_small_shown ();
 		gtk_box_pack_start ((GtkBox *)box, ep, FALSE, FALSE, 0);
 		gtk_box_pack_start ((GtkBox *)box, label, FALSE, FALSE, 0);
 
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 8db127e5ed..b5c629ad1f 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -63,6 +63,7 @@
 #include "message-tag-followup.h"
 
 #include <libedataserver/e-data-server-util.h>
+#include <libedataserver/e-flag.h>
 #include "e-util/e-util.h"
 #include "e-util/e-util-private.h"
 #include "e-util/e-mktemp.h"
@@ -2045,6 +2046,72 @@ emu_addr_cancel_book(void *data)
 	g_clear_error(&err);
 }
 
+struct TryOpenEBookStruct {
+	GError **error;
+	EFlag *flag;
+	gboolean result;
+};
+
+static void
+try_open_e_book_cb (EBook *book, EBookStatus status, gpointer closure)
+{
+	struct TryOpenEBookStruct *data = (struct TryOpenEBookStruct *)closure;
+
+	if (!data)
+		return;
+
+	data->result = status == E_BOOK_ERROR_OK;
+
+	if (!data->result)
+		g_set_error (data->error, E_BOOK_ERROR, status, "EBookStatus returned %d", status);
+
+	e_flag_set (data->flag);
+}
+
+/**
+ * try_open_e_book:
+ * Tries to open address book asynchronously, but acts as synchronous.
+ * The advantage is it checks periodically whether the camel_operation
+ * has been canceled or not, and if so, then stops immediately, with
+ * result FALSE. Otherwise returns same as e_book_open
+ **/
+static gboolean
+try_open_e_book (EBook *book, gboolean only_if_exists, GError **error)
+{
+	struct TryOpenEBookStruct data;
+	gboolean canceled = FALSE;
+	EFlag *flag = e_flag_new ();
+
+	data.error = error;
+	data.flag = flag;
+	data.result = FALSE;
+
+	if (e_book_async_open (book, only_if_exists, try_open_e_book_cb, &data) != FALSE) {
+		e_flag_free (flag);
+		g_set_error (error, E_BOOK_ERROR, E_BOOK_ERROR_OTHER_ERROR, "Failed to call e_book_async_open.");
+		return FALSE;
+	}
+
+	while (canceled = camel_operation_cancel_check (NULL), !canceled && !e_flag_is_set (flag)) {
+		GTimeVal wait;
+
+		g_get_current_time (&wait);
+		g_time_val_add (&wait, 250000); /* waits 250ms */
+
+		e_flag_timed_wait (flag, &wait);
+	}
+
+	e_flag_free (flag);
+
+	if (canceled) {
+		g_set_error (error, E_BOOK_ERROR, E_BOOK_ERROR_CANCELLED, "Operation has been canceled.");
+		e_book_cancel_async_op (book, NULL);
+		return FALSE;
+	}
+
+	return data.result;
+}
+
 gboolean
 em_utils_in_addressbook (CamelInternetAddress *iaddr, gboolean local_only)
 {
@@ -2131,9 +2198,9 @@ em_utils_in_addressbook (CamelInternetAddress *iaddr, gboolean local_only)
 		hook = mail_cancel_hook_add(emu_addr_cancel_book, book);
 
 		/* ignore errors, but cancellation errors we don't try to go further either */
-		if (!e_book_open(book, TRUE, &err)
+		if (!try_open_e_book (book, TRUE, &err)
 		    || !e_book_get_contacts(book, query, &contacts, &err)) {
-			stop = err->domain == E_BOOK_ERROR && err->code == E_BOOK_ERROR_CANCELLED;
+			stop = err && err->domain == E_BOOK_ERROR && err->code == E_BOOK_ERROR_CANCELLED;
 			mail_cancel_hook_remove(hook);
 			g_object_unref(book);
 			d(g_warning("Can't get contacts: %s", err->message));
@@ -2149,6 +2216,8 @@ em_utils_in_addressbook (CamelInternetAddress *iaddr, gboolean local_only)
 			g_list_free(contacts);
 		}
 
+		stop = stop || camel_operation_cancel_check (NULL);
+
 		d(printf(" %s\n", stop?"found":"not found"));
 
 		g_object_unref(book);
@@ -2214,9 +2283,9 @@ em_utils_contact_photo (struct _CamelInternetAddress *cia, gboolean local)
 		source = s->data;
 
 		book = e_book_new(source, &err);
-		if (!e_book_open(book, TRUE, &err)
+		if (!try_open_e_book (book, TRUE, &err)
 		    || !e_book_get_contacts(book, query, &contacts, &err)) {
-			stop = err->domain == E_BOOK_ERROR && err->code == E_BOOK_ERROR_CANCELLED;
+			stop = err && err->domain == E_BOOK_ERROR && err->code == E_BOOK_ERROR_CANCELLED;
 			g_object_unref(book);
 			d(g_warning("Can't get contacts: %s", err->message));
 			g_clear_error(&err);
@@ -2234,6 +2303,9 @@ em_utils_contact_photo (struct _CamelInternetAddress *cia, gboolean local)
 			g_list_foreach (contacts, (GFunc)g_object_unref, NULL);
 			g_list_free (contacts);
 		}
+
+		stop = stop || camel_operation_cancel_check (NULL);
+
 		g_object_unref (source); /* Is it? */
 		g_object_unref(book);
 	}
diff --git a/mail/mail-component.h b/mail/mail-component.h
index 95017b5149..3aa088c890 100644
--- a/mail/mail-component.h
+++ b/mail/mail-component.h
@@ -27,7 +27,7 @@
 
 #include <bonobo/bonobo-object.h>
 #include "shell/evolution-component.h"
-#include "Evolution-Mail.h"
+#include "mail/Evolution-Mail.h"
 
 struct _CamelStore;
 
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 9894ec2fa5..87948fdf53 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -106,7 +106,7 @@ struct _send_info {
 	send_info_t type;		/* 0 = fetch, 1 = send */
 	CamelOperation *cancel;
 	char *uri;
-	int keep;
+	gboolean keep_on_server;
 	send_state_t state;
 	GtkWidget *progress_bar;
 	GtkWidget *cancel_button;
@@ -472,7 +472,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati
 			d(printf("adding source %s\n", source->url));
 
 			info->uri = g_strdup (source->url);
-			info->keep = source->keep_on_server;
+			info->keep_on_server = source->keep_on_server;
 			info->cancel = camel_operation_new (operation_status, info);
 			info->state = SEND_ACTIVE;
 			info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info);
@@ -554,7 +554,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati
 			d(printf("adding dest %s\n", destination));
 
 			info->uri = g_strdup (destination);
-			info->keep = FALSE;
+			info->keep_on_server = FALSE;
 			info->cancel = camel_operation_new (operation_status, info);
 			info->state = SEND_ACTIVE;
 			info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info);
@@ -938,7 +938,7 @@ mail_send_receive (void)
 
 		switch(info->type) {
 		case SEND_RECEIVE:
-			mail_fetch_mail(info->uri, info->keep,
+			mail_fetch_mail(info->uri, info->keep_on_server,
 					FILTER_SOURCE_INCOMING,
 					info->cancel,
 					receive_get_folder, info,
@@ -979,11 +979,15 @@ auto_timeout(void *data)
 {
 	struct _auto_data *info = data;
 
-	if (camel_session_is_online(session)) {
-		const char *uri = e_account_get_string(info->account, E_ACCOUNT_SOURCE_URL);
-		int keep = e_account_get_bool(info->account, E_ACCOUNT_SOURCE_KEEP_ON_SERVER);
+	if (camel_session_is_online (session)) {
+		const gchar *uri;
+		gboolean keep_on_server;
 
-		mail_receive_uri(uri, keep);
+		uri = e_account_get_string (
+			info->account, E_ACCOUNT_SOURCE_URL);
+		keep_on_server = e_account_get_bool (
+			info->account, E_ACCOUNT_SOURCE_KEEP_ON_SERVER);
+		mail_receive_uri (uri, keep_on_server);
 	}
 
 	return TRUE;
@@ -1098,7 +1102,7 @@ mail_autoreceive_init (CamelSession *session)
 /* 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_uri (const char *uri, int keep)
+mail_receive_uri (const gchar *uri, gboolean keep_on_server)
 {
 	struct _send_info *info;
 	struct _send_data *data;
@@ -1125,7 +1129,7 @@ mail_receive_uri (const char *uri, int keep)
 	info->progress_bar = NULL;
 	info->status_label = NULL;
 	info->uri = g_strdup (uri);
-	info->keep = keep;
+	info->keep_on_server = keep_on_server;
 	info->cancel = camel_operation_new (operation_status, info);
 	info->cancel_button = NULL;
 	info->data = data;
@@ -1138,7 +1142,7 @@ mail_receive_uri (const char *uri, int keep)
 
 	switch (info->type) {
 	case SEND_RECEIVE:
-		mail_fetch_mail (info->uri, info->keep,
+		mail_fetch_mail (info->uri, info->keep_on_server,
 				 FILTER_SOURCE_INCOMING,
 				 info->cancel,
 				 receive_get_folder, info,
@@ -1198,7 +1202,7 @@ mail_send (void)
 	info->progress_bar = NULL;
 	info->status_label = NULL;
 	info->uri = g_strdup (transport->url);
-	info->keep = FALSE;
+	info->keep_on_server = FALSE;
 	info->cancel = NULL; 
 	info->cancel_button = NULL;
 	info->data = data;
diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h
index 8d8e4bbde2..4fc4e991ec 100644
--- a/mail/mail-send-recv.h
+++ b/mail/mail-send-recv.h
@@ -24,25 +24,22 @@
 #define MAIL_SEND_RECV_H
 
 #include <gtk/gtk.h>
-#include "mail-config.h"
+#include <camel/camel-session.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-struct _CamelSession;
+G_BEGIN_DECLS
 
 /* send/receive all uri's */
-GtkWidget *mail_send_receive(void);
+GtkWidget *     mail_send_receive               (void);
+
 /* receive a single uri */
-void mail_receive_uri(const char *uri, int keep);
-void mail_send (void);
+void            mail_receive_uri                (const gchar *uri,
+						 gboolean keep_on_server);
+
+void            mail_send                       (void);
+
 /* setup auto receive stuff */
-void mail_autoreceive_init (struct _CamelSession *session);
+void            mail_autoreceive_init           (CamelSession *session);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* ! MAIL_SEND_RECV_H */
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 1de1ecfe61..3e7befb08d 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -171,13 +171,15 @@ get_password (CamelSession *session, CamelService *service, const char *domain,
 	char *ret = NULL;
 	EAccount *account = NULL;
 
-	url = service ? camel_url_to_string (service->url, CAMEL_URL_HIDE_ALL & (~CAMEL_URL_HIDE_AUTH)) : NULL;
+	url = service?camel_url_to_string(service->url, CAMEL_URL_HIDE_ALL):NULL;
 
 	if (!strcmp(item, "popb4smtp_uri")) {
 		/* not 100% mt safe, but should be ok */
 		if (url
 		    && (account = mail_config_get_account_by_transport_url(url)))
 			ret = g_strdup(account->source->url);
+		else
+			ret = g_strdup(url);
 	} else {
 		char *key = make_key(service, item);
 		EAccountService *config_service = NULL;
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 5df6d9e4cd..3dadf3d37f 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -103,6 +103,13 @@ vfolder_setup_exec (struct _setup_msg *m)
 	l = m->sources_uri;
 	while (l && !shutdown) {
 		d(printf(" Adding uri: %s\n", (char *)l->data));
+		if (strncmp((char *)l->data, "vfolder:/", 9) == 0 ||
+			strncmp((char *)l->data, "email://vfolder@local", 21) == 0) {
+			g_warning ("VFolder of VFolders not supporting. Ignoring loading this vfolder as a subfolder\n");
+			l=l->next;
+			continue;
+		}
+
 		folder = mail_tool_uri_to_folder (l->data, 0, &m->base.ex);
 		if (folder) {
 			list = g_list_append(list, folder);
@@ -712,6 +719,14 @@ rule_add_sources(GList *l, GList **sources_folderp, GList **sources_urip)
 	while (l) {
 		char *curi = em_uri_to_camel(l->data);
 
+		if (strncmp((char *)l->data, "vfolder:/", 9) == 0 ||
+			strncmp((char *)l->data, "email://vfolder@local", 21) == 0) {
+			g_warning ("VFolder of VFolders not supporting. Ignoring loading this vfolder as a subfolder\n");
+			l=l->next;
+			g_free(curi);
+			continue;
+		}
+
 		if (mail_note_get_folder_from_uri(curi, &newfolder)) {
 			if (newfolder)
 				sources_folder = g_list_append(sources_folder, newfolder);
diff --git a/mail/message-list.c b/mail/message-list.c
index 576bc1505d..5b3a1b646b 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -2273,6 +2273,8 @@ message_list_init (MessageList *message_list)
 	message_list->cursor_uid = NULL;
 	message_list->last_sel_single = FALSE;
 
+	message_list->regen_lock = g_mutex_new ();
+
 	/* TODO: Should this only get the selection if we're realised? */
 	p = message_list->priv = g_malloc0(sizeof(*message_list->priv));
 	p->invisible = gtk_invisible_new();
@@ -2374,6 +2376,7 @@ message_list_finalise (GObject *object)
 	g_free(message_list->cursor_uid);
 
 	g_mutex_free(message_list->hide_lock);
+	g_mutex_free (message_list->regen_lock);
 
 	g_free(message_list->folder_uri);
 	message_list->folder_uri = NULL;
@@ -4244,7 +4247,9 @@ regen_list_done (struct _regen_list_msg *m)
 	m->ml->search = m->search;
 	m->search = NULL;
 
+	g_mutex_lock (m->ml->regen_lock);
 	m->ml->regen = g_list_remove(m->ml->regen, m);
+	g_mutex_unlock (m->ml->regen_lock);
 
 	if (m->ml->regen == NULL && m->ml->pending_select_uid) {
 		char *uid = m->ml->pending_select_uid;
@@ -4307,7 +4312,9 @@ regen_list_free (struct _regen_list_msg *m)
 		camel_folder_change_info_free (m->changes);
 
 	/* we have to poke this here as well since we might've been cancelled and regened wont get called */
+	g_mutex_lock (m->ml->regen_lock);
 	m->ml->regen = g_list_remove(m->ml->regen, m);
+	g_mutex_unlock (m->ml->regen_lock);
 
 	if (m->expand_state)
 		xmlFreeDoc (m->expand_state);
@@ -4328,7 +4335,9 @@ ml_regen_timeout(struct _regen_list_msg *m)
 {
 	e_profile_event_emit("list.regenerate", m->folder->full_name, 0);
 
+	g_mutex_lock (m->ml->regen_lock);
 	m->ml->regen = g_list_prepend(m->ml->regen, m);
+	g_mutex_unlock (m->ml->regen_lock);
 	/* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */
 	mail_msg_fast_ordered_push (m);
 
@@ -4343,8 +4352,11 @@ mail_regen_cancel(MessageList *ml)
 {
 	/* cancel any outstanding regeneration requests, not we don't clear, they clear themselves */
 	if (ml->regen) {
-		GList *l = ml->regen;
+		GList *l;
+
+		g_mutex_lock (ml->regen_lock);
 
+		l = ml->regen;
 		while (l) {
 			MailMsg *mm = l->data;
 
@@ -4352,6 +4364,8 @@ mail_regen_cancel(MessageList *ml)
 				camel_operation_cancel(mm->cancel);
 			l = l->next;
 		}
+
+		g_mutex_unlock (ml->regen_lock);
 	}
 
 	/* including unqueued ones */
diff --git a/mail/message-list.h b/mail/message-list.h
index cc58e1e798..47be897fd2 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -151,6 +151,7 @@ struct _MessageList {
 
 	/* list of outstanding regeneration requests */
 	GList *regen;
+	GMutex *regen_lock; /* when writing to the regen, guard with this lock too */
 	char *pending_select_uid; /* set if we were busy regnerating while we had a select come in */
 	guint regen_timeout_id;
 	void *regen_timeout_msg;
diff --git a/plugins/audio-inline/ChangeLog b/plugins/audio-inline/ChangeLog
index 5b82ad2fc6..7ec5b04a59 100644
--- a/plugins/audio-inline/ChangeLog
+++ b/plugins/audio-inline/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-03  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* audio-inline.c:
+
 2008-09-24  Philip Withnall  <philip@tecnocode.co.uk>
 
 	** Fixes bug #553479
diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c
index 405c3d87d6..2568117b5a 100644
--- a/plugins/audio-inline/audio-inline.c
+++ b/plugins/audio-inline/audio-inline.c
@@ -1,11 +1,25 @@
 /*
-   Copyright (C) 2004 Novell, Inc.
-   Author: Radek Doulik
-
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		Radek Doulik <rodo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
-/* This file is licensed under the GNU GPL v2 or later */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/plugins/bogo-junk-plugin/ChangeLog b/plugins/bogo-junk-plugin/ChangeLog
index 0aec2b9e54..b14a280332 100644
--- a/plugins/bogo-junk-plugin/ChangeLog
+++ b/plugins/bogo-junk-plugin/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-14  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* bf-junk-filter.c:
+
 2008-04-29  Milan Crha  <mcrha@redhat.com>
 
 	* bf-junk-filter.c: (pipe_to_bogofilter):
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index a0d00c44d8..1e5fbbc656 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -1,19 +1,24 @@
 /*
- * Copyright 2005 Mikhail Zabaluev <mhz@altlinux.org>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * 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 General Public License for more details.
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		Mikhail Zabaluev <mikhail.zabaluev@gmail.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright 2005 Mikhail Zabaluev <mikhail.zabaluev@gmail.com>
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index b6661445a4..785857400a 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,28 @@
+2008-10-08  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #530606
+
+	* exchange-contacts.c: (e_exchange_contacts_get_contacts),
+	(e_exchange_contacts_pcontacts_on_change),
+	(e_exchange_contacts_pcontacts), (e_exchange_contacts_check),
+	(e_exchange_contacts_commit):
+	* exchange-account-setup.c: (btn_chpass_clicked), (btn_dass_clicked),
+	(btn_fsize_clicked), (org_gnome_exchange_show_folder_size_factory):
+	* exchange-calendar.c: (e_exchange_calendar_get_calendars),
+	(e_exchange_calendar_pcalendar_on_change),
+	(e_exchange_calendar_pcalendar), (e_exchange_calendar_check),
+	(e_exchange_calendar_commit):
+	Check validity of returned pointer before using it.
+
+2008-10-03  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* exchange-account-setup.c:
+	* exchange-contacts.c:
+	* exchange-operations.c:
+	* exchange-operations.h:
+
 2008-09-24  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index 3e9e64ea6a..275a214b90 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -1,21 +1,23 @@
-/* -*- Mf (id ode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * 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.
  *
- *  Sushma Rai <rsushma@novell.com>
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ * 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/>  
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ *		Sushma Rai <rsushma@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
@@ -121,6 +123,8 @@ btn_chpass_clicked (GtkButton *button, gpointer data)
  	ExchangeAccountResult result;
 
 	account = exchange_operations_get_exchange_account ();
+	if (!account)
+		return;
 
 	old_password = exchange_account_get_password (account);
 	if (!old_password) {
@@ -147,6 +151,8 @@ btn_dass_clicked (GtkButton *button, gpointer data)
 {
 	ExchangeAccount *account;
 	account = exchange_operations_get_exchange_account ();
+	if (!account)
+		return;
 	exchange_delegates (account, gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_WINDOW));
 }
 
@@ -157,6 +163,8 @@ btn_fsize_clicked (GtkButton *button, gpointer data)
 	GtkListStore *model;
 
 	account = exchange_operations_get_exchange_account ();
+	if (!account)
+		return;
 
 	model = exchange_account_folder_size_get_model (account);
 	if (model)
@@ -1048,7 +1056,10 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor
 	if (g_ascii_strcasecmp (provider->protocol, "exchange"))
 		return NULL;
 
-	account = exchange_operations_get_exchange_account ();  
+	account = exchange_operations_get_exchange_account ();
+	if (!account)
+		return NULL;
+
 	exchange_account_is_offline (account, &mode);  
 	if (mode == OFFLINE_MODE)  
 		return NULL;  
diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c
index c871f68d77..ef0eaaef79 100644
--- a/plugins/exchange-operations/exchange-calendar.c
+++ b/plugins/exchange-operations/exchange-calendar.c
@@ -81,6 +81,8 @@ e_exchange_calendar_get_calendars (ECalSourceType ftype)
 	}
 
 	account = exchange_operations_get_exchange_account ();
+	if (!account)
+		return NULL;
 
 	/* FIXME: Reconsider this hardcoding */
 	uri_prefix = g_strconcat ("exchange://", account->account_filename, "/;", NULL);
@@ -121,6 +123,8 @@ e_exchange_calendar_pcalendar_on_change (GtkTreeView *treeview, ESource *source)
 	gchar *es_ruri, *ruri;
 
 	account = exchange_operations_get_exchange_account ();
+	if (!account)
+		return;
 
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
 	gtk_tree_selection_get_selected(selection, &model, &iter);
@@ -249,9 +253,12 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	callist = e_exchange_calendar_get_calendars (t->source_type);
 
-	for (i=0; i<callist->len; ++i) {
-		ruri = g_ptr_array_index (callist, i);
-		exchange_operations_cta_add_node_to_tree (ts_pcalendar, NULL, ruri);
+	if (callist) {
+		for (i = 0; i < callist->len; i++) {
+			ruri = g_ptr_array_index (callist, i);
+			exchange_operations_cta_add_node_to_tree (ts_pcalendar, NULL, ruri);
+		}
+		g_ptr_array_free (callist, TRUE);
 	}
 
 	cr_calendar = gtk_cell_renderer_text_new ();
@@ -296,7 +303,6 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 		g_free (sruri);
 	}
 
-	g_ptr_array_free (callist, TRUE);
 	g_object_unref (ts_pcalendar);
 	return tv_pcalendar;
 }
@@ -337,6 +343,9 @@ e_exchange_calendar_check (EPlugin *epl, EConfigHookPageCheckData *data)
         }
 
 	account = exchange_operations_get_exchange_account ();
+	if (!account)
+		return FALSE;
+
 	uri_text = e_source_get_uri (t->source);
 	euri = e_uri_new (uri_text);
 	uri_string = e_uri_to_string (euri, FALSE);
@@ -392,7 +401,7 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 	}
 
 	account = exchange_operations_get_exchange_account ();
-	if (!is_exchange_personal_folder (account, uri_text))
+	if (!account || !is_exchange_personal_folder (account, uri_text))
 		return;
 
 	windows_domain = exchange_account_get_windows_domain (account);
diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c
index aee5a1889f..5fe233dec0 100644
--- a/plugins/exchange-operations/exchange-contacts.c
+++ b/plugins/exchange-operations/exchange-contacts.c
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Praveen Kumar <kpraveen@novell.com>
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * 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 General Public License for more details.
+ * 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/>  
+ *
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * Authors:
+ *		Praveen Kumar <kpraveen@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -69,6 +70,8 @@ e_exchange_contacts_get_contacts (void)
 	gchar *uri_prefix, *ruri;
 
 	account = exchange_operations_get_exchange_account ();
+	if (!account)
+		return NULL;
 
 	uri_prefix = g_strconcat ("exchange://", account->account_filename, "/;", NULL);
 	prefix_len = strlen (uri_prefix);
@@ -107,6 +110,8 @@ e_exchange_contacts_pcontacts_on_change (GtkTreeView *treeview, ESource *source)
 	gchar *ruri;
 
 	account = exchange_operations_get_exchange_account ();
+	if (!account)
+		return;
 
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
 	gtk_tree_selection_get_selected(selection, &model, &iter);
@@ -240,9 +245,12 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	conlist = e_exchange_contacts_get_contacts ();
 
-	for (i=0; i<conlist->len; ++i) {
-		ruri = g_ptr_array_index (conlist, i);
-		exchange_operations_cta_add_node_to_tree (ts_pcontacts, NULL, ruri);
+	if (conlist) {
+		for (i = 0; i < conlist->len; i++) {
+			ruri = g_ptr_array_index (conlist, i);
+			exchange_operations_cta_add_node_to_tree (ts_pcontacts, NULL, ruri);
+		}
+		g_ptr_array_free (conlist, TRUE);
 	}
 
 	cr_contacts = gtk_cell_renderer_text_new ();
@@ -292,7 +300,6 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
 		g_free (sruri);
 	}
 
-	g_ptr_array_free (conlist, TRUE);
 	g_object_unref (ts_pcontacts);
 	return vb_pcontacts;
 }
@@ -328,6 +335,8 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 	}
 
 	account = exchange_operations_get_exchange_account ();
+	if (!account)
+		return FALSE;
 
 	if (!rel_uri) {
 		GConfClient *client;
@@ -423,7 +432,7 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target)
 	}
 
 	account = exchange_operations_get_exchange_account ();
-	if (!is_exchange_personal_folder (account, uri_text))
+	if (!account || !is_exchange_personal_folder (account, uri_text))
 		return;
 
 	windows_domain = exchange_account_get_windows_domain (account);
diff --git a/plugins/exchange-operations/exchange-operations.c b/plugins/exchange-operations/exchange-operations.c
index bbdd26a87f..94240c051a 100644
--- a/plugins/exchange-operations/exchange-operations.c
+++ b/plugins/exchange-operations/exchange-operations.c
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Praveen Kumar <kpraveen@novell.com>
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * 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 General Public License for more details.
+ * 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/>  
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Authors:
+ *		Praveen Kumar <kpraveen@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/exchange-operations/exchange-operations.h b/plugins/exchange-operations/exchange-operations.h
index 52eec141ef..156339f437 100644
--- a/plugins/exchange-operations/exchange-operations.h
+++ b/plugins/exchange-operations/exchange-operations.h
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Praveen Kumar <kpraveen@novell.com>
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * 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 General Public License for more details.
+ * 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/>  
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Authors:
+ *		Praveen Kumar <kpraveen@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 202ce94ffa..884301b517 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,14 @@
+2008-10-17  Matthew Barnes  <mbarnes@redhat.com>
+
+	* send-options.c (org_gnome_send-options):
+	Don't mix declarations and statements.
+
+2008-10-03  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* proxy-login.c:
+
 2008-10-01  Gabor Kelemen  <kelemeng@gnome.hu>
 
 	*  send-options.c: Mark two forgotten strings for translation. Fixes bug #553070
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index 383e940fbe..1dc35e940b 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -1,25 +1,23 @@
-
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors:
- *  Shreyas Srinivasan <sshreyas@novell.com>
- *  Sankar P <psankar@novell.com>
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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/>  
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * Authors:
+ *		Shreyas Srinivasan <sshreyas@novell.com>
+ *		Sankar P <psankar@novell.com>
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index 124fffe8f3..8a15d954dc 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -198,12 +198,11 @@ org_gnome_send_options (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
 	EMConfigTargetAccount *target_account;
 	GtkWidget *frame, *button, *label, *vbox;
+	gchar *markup;
 
 	target_account = (EMConfigTargetAccount *)data->config->target;
 	account = target_account->account;
 
-	gchar *markup;
-
 	if(!g_strrstr (account->source->url, "groupwise://"))
 		return NULL;
 
diff --git a/plugins/imap-features/ChangeLog b/plugins/imap-features/ChangeLog
index fb125322e0..647f059f22 100644
--- a/plugins/imap-features/ChangeLog
+++ b/plugins/imap-features/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-03  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* imap-headers.c:
+
 2008-01-18  Srinivasa Ragavan  <sragavan@novell.com>
 
 	* imap-headers.c: (imap_headers_commit), (org_gnome_imap_headers):
diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c
index 3a99b1a341..e3d20334b9 100644
--- a/plugins/imap-features/imap-headers.c
+++ b/plugins/imap-features/imap-headers.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Author: Sankar P <psankar@novell.com>
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ * 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/>  
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ *		Sankar P <psankar@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index b30fd70aaa..f408872cdc 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,50 @@
+2008-10-20  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #514989
+
+	* itip-view.c: (format_date_and_time_x):
+	Calculate tomorrow from current time, not from the date to convert.
+
+2008-10-14  Srinivasa Ragavan  <sragavan@novell.com>
+
+	** Fix for bug #550441
+
+	* itip-formatter.c: (view_response_cb): Ignore if summary not there.
+
+2008-10-13  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #550441
+
+	* itip-formatter.c: (view_response_cb):
+	Use the proper functions to traverse messages in a folder's summary.
+
+2008-10-10  Patrick Ohly  <pohly@ecld0pohly>
+
+	** #541121: improved itip formatter: allow replying to forwarded
+	and already imported invitations; honor RVSP flag in invitation
+	
+	* itip-formatter.c: the whole logic for "reply to organize" was
+	improved.
+
+	If an organizer exists, replying is enabled. Sending a reply is
+	enabled by default if the event looks like a meeting (= has
+	attendees).  The wish of the organizer to not get replies is
+	checked (previous Evolution releases ignored it); in this case the
+	default is to not send a reply. In all cases the user can override
+	the default.
+
+2008-10-08  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* itip-formatter.c:
+
+2008-10-03  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* itip-view.c:
+
 2008-10-01  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #519491
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index e37c0d162a..a2ceffb77b 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: JP Rosevear <jpr@novell.com>
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ * 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/>  
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ *		JP Rosevear <jpr@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -107,6 +107,32 @@ struct _itip_puri {
 	guint progress_info_id;
 
 	gboolean delete_message;
+	/* a reply can only be sent if and only if there is an organizer */
+	gboolean has_organizer;
+	/*
+	 * Usually replies are sent unless the user unchecks that option.
+	 * There are some cases when the default is not to sent a reply
+	 * (but the user can still chose to do so by checking the option):
+	 * - the organizer explicitly set RSVP=FALSE for the current user
+	 * - the event has no ATTENDEEs: that's the case for most non-meeting
+	 *   events
+	 *
+	 * The last case is meant for forwarded non-meeting
+	 * events. Traditionally Evolution hasn't offered to send a
+	 * reply, therefore the updated implementation mimics that
+	 * behavior.
+	 *
+	 * Unfortunately some software apparently strips all ATTENDEEs
+	 * when forwarding a meeting; in that case sending a reply is
+	 * also unchecked by default. So the check for ATTENDEEs is a
+	 * tradeoff between sending unwanted replies in cases where
+	 * that wasn't done in the past and not sending a possibly
+	 * wanted reply where that wasn't possible in the past
+	 * (because replies to forwarded events were not
+	 * supported). Overall that should be an improvement, and the
+	 * user can always override the default.
+	 */
+	gboolean no_reply_wanted;
 
 };
 
@@ -235,6 +261,12 @@ find_to_address (struct _itip_puri *pitip, icalcomponent *ical_comp, icalparamet
 
 				pitip->my_address = g_strdup (account->id->address);
 
+				param = icalproperty_get_first_parameter (prop, ICAL_RSVP_PARAMETER);
+				if (param &&
+				    icalparameter_get_rsvp (param) == ICAL_RSVP_FALSE) {
+					pitip->no_reply_wanted = TRUE;
+				}
+
 				if (status) {
 					param = icalproperty_get_first_parameter (prop, ICAL_PARTSTAT_PARAMETER);
 					*status = param ? icalparameter_get_partstat (param) : ICAL_PARTSTAT_NEEDSACTION;
@@ -285,6 +317,12 @@ find_to_address (struct _itip_puri *pitip, icalcomponent *ical_comp, icalparamet
 
 				pitip->my_address = g_strdup (account->id->address);
 
+				param = icalproperty_get_first_parameter (prop, ICAL_RSVP_PARAMETER);
+				if (param &&
+				    ICAL_RSVP_FALSE == icalparameter_get_rsvp (param)) {
+					pitip->no_reply_wanted = TRUE;
+				}
+
 				if (status) {
 					param = icalproperty_get_first_parameter (prop, ICAL_PARTSTAT_PARAMETER);
 					*status = param ? icalparameter_get_partstat (param) : ICAL_PARTSTAT_NEEDSACTION;
@@ -641,8 +679,23 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 	d(printf ("Decreasing itip formatter search count to %d\n", fd->count));
 
 	if (fd->count == 0) {
+		gboolean rsvp_enabled = FALSE;
+
 		itip_view_remove_lower_info_item (ITIP_VIEW (pitip->view), pitip->progress_info_id);
 		pitip->progress_info_id = 0;
+		
+		/*
+		 * Only allow replies if backend doesn't do that automatically.
+		 * Replies only make sense for events with an organizer.
+		 */
+		if (!e_cal_get_static_capability (ecal, CAL_STATIC_CAPABILITY_SAVE_SCHEDULES) &&
+		    pitip->has_organizer) {
+			rsvp_enabled = TRUE;
+		}
+		itip_view_set_show_rsvp (ITIP_VIEW (pitip->view), rsvp_enabled);
+
+		/* default is chosen in extract_itip_data() based on content of the VEVENT */
+		itip_view_set_rsvp (ITIP_VIEW (pitip->view), !pitip->no_reply_wanted);
 
 		if ((pitip->method == ICAL_METHOD_PUBLISH || pitip->method ==  ICAL_METHOD_REQUEST)
 		    && !pitip->current_ecal) {
@@ -677,11 +730,6 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 			itip_view_set_source_list (ITIP_VIEW (pitip->view), pitip->source_lists[pitip->type]);
 			g_signal_connect (pitip->view, "source_selected", G_CALLBACK (source_selected_cb), pitip);
 
-			/* The only method that RSVP makes sense for is REQUEST */
-			/* FIXME Default to the suggestion for RSVP for my attendee */
-			itip_view_set_rsvp (ITIP_VIEW (pitip->view), pitip->method == ICAL_METHOD_REQUEST ? TRUE : FALSE);
-			itip_view_set_show_rsvp (ITIP_VIEW (pitip->view), pitip->method == ICAL_METHOD_REQUEST ? TRUE : FALSE);
-
 			if (source) {
 				itip_view_set_source (ITIP_VIEW (pitip->view), source);
 
@@ -1423,6 +1471,16 @@ extract_itip_data (struct _itip_puri *pitip, GtkContainer *container)
 	switch (icalcomponent_isa (pitip->ical_comp)) {
 	case ICAL_VEVENT_COMPONENT:
 		pitip->type = E_CAL_SOURCE_TYPE_EVENT;
+		pitip->has_organizer = icalcomponent_get_first_property (pitip->ical_comp, ICAL_ORGANIZER_PROPERTY) != NULL;
+		if (icalcomponent_get_first_property (pitip->ical_comp, ICAL_ATTENDEE_PROPERTY) == NULL) {
+			/* no attendees: assume that that this is not a meeting and organizer doesn't want a reply */
+			pitip->no_reply_wanted = TRUE;
+		} else {
+			/*
+			 * if we have attendees, then find_to_address() will check for our RSVP
+			 * and set no_reply_wanted=TRUE if RSVP=FALSE for the current user
+			 */
+		}
 		break;
 	case ICAL_VTODO_COMPONENT:
 		pitip->type = E_CAL_SOURCE_TYPE_TODO;
@@ -1652,7 +1710,8 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 	}
 
 	/*FIXME Save schedules is misused here, remove it */
-	save_schedules = e_cal_get_save_schedules (pitip->current_ecal);
+	save_schedules = e_cal_get_static_capability (pitip->current_ecal,
+                                                      CAL_STATIC_CAPABILITY_SAVE_SCHEDULES);
 
 	switch (response) {
 		case ITIP_VIEW_RESPONSE_ACCEPT:
@@ -1728,12 +1787,13 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 				tag = camel_message_info_user_tag (mi, "recurrence-key");
 				camel_message_info_free (mi);
 				if (tag) {
-					GPtrArray *summary_array;
-					int i=0;
+					int i = 0, count;
 
-					summary_array = camel_folder_summary_array (pitip->folder->summary);
-					for (i=0; i<summary_array->len; i++) {
-						mi = (CamelMessageInfo *)g_ptr_array_index (summary_array, i);
+					count = camel_folder_summary_count (pitip->folder->summary);
+					for (i = 0; i < count; i++) {
+						mi = camel_folder_summary_index (pitip->folder->summary, i);
+						if (!mi)
+							continue;
 						camel_message_info_ref (mi);
 						if ( camel_message_info_user_tag (mi, "recurrence-key") && g_str_equal (camel_message_info_user_tag (mi, "recurrence-key"), tag)) {
 
@@ -1742,7 +1802,6 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 						}
 						camel_message_info_free (mi);
 					}
-					camel_folder_summary_array_free (pitip->folder->summary, summary_array);
 				}
 			} else {
 				/* Either not a recurring appointment or "apply-to-all" is not selected. So just delete this instance alone */
@@ -1921,10 +1980,18 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 	} else {
 		switch (info->method) {
 		case ICAL_METHOD_PUBLISH:
-			itip_view_set_mode (ITIP_VIEW (info->view), ITIP_VIEW_MODE_PUBLISH);
-			break;
 		case ICAL_METHOD_REQUEST:
-			itip_view_set_mode (ITIP_VIEW (info->view), ITIP_VIEW_MODE_REQUEST);
+			/*
+			 * Treat meeting request (sent by organizer directly) and
+			 * published evend (forwarded by organizer or attendee) alike:
+			 * if the event has an organizer, then it can be replied to and
+			 * we show the "accept/tentative/decline" choice.
+			 * Otherwise only show "accept".
+			 */
+			itip_view_set_mode (ITIP_VIEW (info->view),
+					    info->has_organizer ?
+					    ITIP_VIEW_MODE_REQUEST :
+					    ITIP_VIEW_MODE_PUBLISH);
 			break;
 		case ICAL_METHOD_REPLY:
 			itip_view_set_mode (ITIP_VIEW (info->view), ITIP_VIEW_MODE_REPLY);
@@ -2254,6 +2321,8 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target)
 
 	gconf = gconf_client_get_default ();
 	puri->delete_message = gconf_client_get_bool (gconf, GCONF_KEY_DELETE, NULL);
+	puri->has_organizer = FALSE;
+	puri->no_reply_wanted = FALSE;
 	puri->folder = ((EMFormat *) target->format)->folder;
 	puri->uid = g_strdup (((EMFormat *) target->format)->uid);
 	puri->msg = ((EMFormat *) target->format)->message;
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 1e5e41195c..92a8460e48 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: JP Rosevear <jpr@novell.com>
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ * 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/>  
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ *		JP Rosevear <jpr@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -152,7 +152,7 @@ format_date_and_time_x		(struct tm	*date_tm,
 	/* Calculate a normalized "tomorrow" */
 	tomorrow_tm = *current_tm;
 	/* Don't need this if date is in the past. Also, year assumption won't fail. */
-	if (date_tm->tm_year >= current_tm->tm_year && tomorrow_tm.tm_mday == time_days_in_month (date_tm->tm_year + 1900, date_tm->tm_mon)) {
+	if (date_tm->tm_year >= current_tm->tm_year && tomorrow_tm.tm_mday == time_days_in_month (current_tm->tm_year + 1900, current_tm->tm_mon)) {
 		tomorrow_tm.tm_mday = 1;
 		if (tomorrow_tm.tm_mon == 11) {
 			tomorrow_tm.tm_mon = 1;
diff --git a/plugins/mail-account-disable/ChangeLog b/plugins/mail-account-disable/ChangeLog
index d40282a91b..86dc9a4897 100644
--- a/plugins/mail-account-disable/ChangeLog
+++ b/plugins/mail-account-disable/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-03  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* mail-account-disable.c:
+
 2007-11-18  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
 
 	** Fix bug #495875
diff --git a/plugins/mail-account-disable/mail-account-disable.c b/plugins/mail-account-disable/mail-account-disable.c
index 9996051636..886b66a66f 100644
--- a/plugins/mail-account-disable/mail-account-disable.c
+++ b/plugins/mail-account-disable/mail-account-disable.c
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Shreyas Srinivasan <sshreyas@novell.com>
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ * 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/>  
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Authors:
+ *		Shreyas Srinivasan <sshreyas@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/plugins/mark-calendar-offline/ChangeLog b/plugins/mark-calendar-offline/ChangeLog
deleted file mode 100644
index a57222d5a6..0000000000
--- a/plugins/mark-calendar-offline/ChangeLog
+++ /dev/null
@@ -1,54 +0,0 @@
-2008-09-12  Sankar P  <psankar@novell.com>
-
-License Changes
-
-	* mark-calendar-offline.c:
-
-2008-08-12  Bharath Acharya  <abharath@novell.com>
-
-	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
-	dlls on Windows.
-
-2007-11-11  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
-
-	** Fix bug #495872
-
-	* mark-calendar-offline.c: (org_gnome_mark_no_offline),
-	(org_gnome_mark_offline):
-	* org-gnome-mark-calendar-offline.eplug.xml:
-	add tasks and memos support
-
-2007-04-02  Sankar P  <psankar@novell.com>
-
-	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
-
-	* org-gnome-mark-calendar-offline.eplug.xml:
-	Cleanup. 
-	Fixes part of #301149
-
-2005-12-12  Harish Krishnaswamy  <kharish@novell.com>
-
-	* Makefile.am: Fix make-clean issues.
-
-2005-05-06  Not Zed  <NotZed@Ximian.com>
-
-	* Makefile.am: 
-	* org-gnome-mark-calendar-offline.eplug.xml: s/.in/.xml/ & i18n.
-
-2005-02-24  Björn Torkelsson  <torkel@acc.umu.se>
-
-	* org-gnome-mark-calendar-offline.eplug.in: Shortened the
-	name. 
-	Added author and description.
-	Added xml tag.
-
-2004-11-01  JP Rosevear  <jpr@novell.com>
-
-	* Makefile.am: dist .eplug.in file
-
-2004-10-22  Harish Krishnaswamy <kharish@novell.com>
-
-	* mark-calendar-offline.c: implement a plugin that lets the user mark a
-	calendar to be available for off-line use, if it is not already set to be so
-	and vice versa
-	
diff --git a/plugins/mark-calendar-offline/Makefile.am b/plugins/mark-calendar-offline/Makefile.am
deleted file mode 100644
index c7773ae87b..0000000000
--- a/plugins/mark-calendar-offline/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-INCLUDES =						\
-	-I$(top_srcdir)					\
-	$(EVOLUTION_CALENDAR_CFLAGS)
-
-@EVO_PLUGIN_RULE@
-
-plugin_DATA = org-gnome-mark-calendar-offline.eplug
-plugin_LTLIBRARIES = liborg-gnome-mark-calendar-offline.la
-
-liborg_gnome_mark_calendar_offline_la_SOURCES = mark-calendar-offline.c
-liborg_gnome_mark_calendar_offline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
-liborg_gnome_mark_calendar_offline_la_LIBADD =	\
-	$(EVOLUTION_CALENDAR_LIBS)
-
-EXTRA_DIST = org-gnome-mark-calendar-offline.eplug.xml
-
-BUILT_SOURCES = $(plugin_DATA)
-CLEANFILES = $(BUILT_SOURCES)
diff --git a/plugins/mark-calendar-offline/mark-calendar-offline.c b/plugins/mark-calendar-offline/mark-calendar-offline.c
deleted file mode 100644
index 68bd3f445b..0000000000
--- a/plugins/mark-calendar-offline/mark-calendar-offline.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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/>  
- *
- *
- * Authors:
- *		Harish Krishnaswamy <kharish@novell.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-/* This is prototype code only, this may, or may not, use undocumented
- * unstable or private internal function calls.
- * This code has been derived from the source of the sample eplugin
- * select_one_source.
- */
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <libedataserver/e-source.h>
-#include <libedataserverui/e-source-selector.h>
-#include <calendar/gui/e-cal-popup.h>
-
-void org_gnome_mark_offline (EPlugin *ep, ECalPopupTargetSource *target);
-void org_gnome_mark_no_offline (EPlugin *ep, ECalPopupTargetSource *target);
-
-void
-org_gnome_mark_no_offline (EPlugin *ep, ECalPopupTargetSource *target)
-{
-	ESource *source;
-
-	source = e_source_selector_peek_primary_selection (target->selector);
-	e_source_set_property (source, "offline", "0");
-}
-
-void
-org_gnome_mark_offline (EPlugin *ep, ECalPopupTargetSource *target)
-{
-	ESource *source;
-
-	source = e_source_selector_peek_primary_selection (target->selector);
-	e_source_set_property (source, "offline", "1");
-}
-
diff --git a/plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml b/plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml
deleted file mode 100644
index bde9805396..0000000000
--- a/plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<e-plugin-list>
-    <e-plugin id="org.gnome.evolution.mark_calendar_offline" type="shlib" 
-	_name="Mark calendar offline" 
-	location="@PLUGINDIR@/liborg-gnome-mark-calendar-offline@SOEXT@">
-	<author name="Harish Krishnaswamy" email="kharish@novell.com"/>
-       	<_description>Marks the selected calendar for offline viewing.</_description>
-
-		<hook class="org.gnome.evolution.calendar.popup:1.0">
-			<menu id="org.gnome.evolution.calendar.source.popup" target="source">
-				<item type="item" path="38.mark_calendar_offline" _label="_Make available for offline use" icon="stock_disconnect"  visible="offline" activate="org_gnome_mark_offline"/>
-			</menu>
-			<menu id="org.gnome.evolution.calendar.source.popup" target="source">
-				<item type="item" path="38.mark_calendar_no_offline" _label="_Do not make available for offline use" icon="stock_connect"  visible="no-offline" activate="org_gnome_mark_no_offline"/>
-			</menu>
-
-			<menu id="org.gnome.evolution.memos.source.popup" target="source">
-				<item type="item" path="38.mark_memos_offline" _label="_Make available for offline use" icon="stock_disconnect"  visible="offline" activate="org_gnome_mark_offline"/>
-			</menu>
-			<menu id="org.gnome.evolution.memos.source.popup" target="source">
-				<item type="item" path="38.mark_memos_no_offline" _label="_Do not make available for offline use" icon="stock_connect"  visible="no-offline" activate="org_gnome_mark_no_offline"/>
-			</menu>
-
-			<menu id="org.gnome.evolution.tasks.source.popup" target="source">
-				<item type="item" path="38.mark_tasks_offline" _label="_Make available for offline use" icon="stock_disconnect"  visible="offline" activate="org_gnome_mark_offline"/>
-			</menu>
-			<menu id="org.gnome.evolution.tasks.source.popup" target="source">
-				<item type="item" path="38.mark_tasks_no_offline" _label="_Do not make available for offline use" icon="stock_connect"  visible="no-offline" activate="org_gnome_mark_no_offline"/>
-			</menu>
-		</hook>
-
-	</e-plugin>
-</e-plugin-list>
diff --git a/plugins/mono/ChangeLog b/plugins/mono/ChangeLog
index a78216273d..ff07e79a0b 100644
--- a/plugins/mono/ChangeLog
+++ b/plugins/mono/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-22  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #549025
+
+	* Makefile.am:
+	Add $(MONO_CFLAGS) and $(MONO_LIBS) explicitly.  The mono plugin
+	is the only module that should be linking against libmono.
+
 2008-09-02  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/mono/Makefile.am b/plugins/mono/Makefile.am
index 680fd7a096..aa20b100e3 100644
--- a/plugins/mono/Makefile.am
+++ b/plugins/mono/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES =						\
 	-I$(top_srcdir)					\
-	$(E_UTIL_CFLAGS)
+	$(E_UTIL_CFLAGS)				\
+	$(MONO_CFLAGS)
 
 @EVO_PLUGIN_RULE@
 
@@ -10,7 +11,8 @@ plugin_LTLIBRARIES = liborg-gnome-evolution-mono.la
 liborg_gnome_evolution_mono_la_SOURCES = mono-plugin.c mono-plugin.h
 liborg_gnome_evolution_mono_la_LDFLAGS = -module -avoid-version
 liborg_gnome_evolution_mono_la_LIBADD =	\
-	$(E_UTIL_LIBS)
+	$(E_UTIL_LIBS)			\
+	$(MONO_LIBS)
 
 EXTRA_DIST = org-gnome-evolution-mono.eplug.xml
 
diff --git a/plugins/publish-calendar/ChangeLog b/plugins/publish-calendar/ChangeLog
index 52f1d4b2c0..fa6c292d11 100644
--- a/plugins/publish-calendar/ChangeLog
+++ b/plugins/publish-calendar/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-03  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* publish-calendar.c:
+	* url-editor-dialog.c:
+
 2008-09-26  Philip Withnall  <philip@tecnocode.co.uk>
 
 	** Fix for bug #553461 and bug #553389
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index a56c25e43d..98371345b5 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -1,21 +1,22 @@
 /*
- * Authors: David Trowbridge <trowbrds@cs.colorado.edu>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * 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 General Public License for more details.
+ * 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/>  
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Authors:
+ *		David Trowbridge <trowbrds@cs.colorado.edu>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index ddc1653959..abcd1ede38 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.c
@@ -1,22 +1,22 @@
 /*
- * Authors:
- *  David Trowbridge
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * 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 General Public License for more details.
+ * 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/>  
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Authors:
+ *		David Trowbridge <trowbrds@cs.colorado.edu>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/select-one-source/ChangeLog b/plugins/select-one-source/ChangeLog
index de715176df..0534fee906 100644
--- a/plugins/select-one-source/ChangeLog
+++ b/plugins/select-one-source/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-13  Suman Manjunath  <msuman@novell.com>
+
+	** Fix for bug #424818 (bugzilla.novell.com)
+
+	* mark-calendar-offline.c: Removed this unused PoC file. The 
+	corresponding plugin has also been integrated into the main code. 
+
 2008-08-27  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/select-one-source/mark-calendar-offline.c b/plugins/select-one-source/mark-calendar-offline.c
deleted file mode 100644
index 3ef3330f60..0000000000
--- a/plugins/select-one-source/mark-calendar-offline.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *
- * 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/>  
- *
- *
- * Authors:
- *		Harish Krishnaswamy <kharish@novell.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-/* This is prototype code only, this may, or may not, use undocumented
- * unstable or private internal function calls.
- * This code has been derived from the source of the sample eplugin
- * select_one_source.
- */
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <libedataserver/e-source.h>
-#include <libedataserverui/e-source-selector.h>
-#include <calendar/gui/e-cal-popup.h>
-
-void org_gnome_mark_calendar_offline (EPlugin *ep, ECalPopupTargetSource *target);
-void org_gnome_mark_calendar_no_offline (EPlugin *ep, ECalPopupTargetSource *target);
-
-void
-org_gnome_mark_calendar_no_offline (EPlugin *ep, ECalPopupTargetSource *target)
-{
-	ESource *source;
-
-	source = e_source_selector_peek_primary_selection (target->selector);
-	e_source_set_property (source, "offline", "0");
-}
-
-void
-org_gnome_mark_calendar_offline (EPlugin *ep, ECalPopupTargetSource *target)
-{
-	ESource *source;
-
-	source = e_source_selector_peek_primary_selection (target->selector);
-	e_source_set_property (source, "offline", "1");
-}
-
diff --git a/plugins/templates/ChangeLog b/plugins/templates/ChangeLog
index f0fc942dc0..789f58de0b 100644
--- a/plugins/templates/ChangeLog
+++ b/plugins/templates/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-15  Bharath Acharya  <abharath@novell.com>
+
+	** Fix for bug #556284
+
+	* templates.c: (reply_with_template), (org_gnome_templates_popup),
+	(action_template_cb): Fixes for fetching the store using 
+	mail_component_peek_local_store. Fixes the right-click crash issues 
+	caused on OS_WIN32 by Templates plugin.
+
 2008-09-15  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index 3c79bbcd01..8996c7f8c1 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -31,15 +31,13 @@
 
 #include <e-util/e-config.h>
 #include <camel/camel-url.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-mime-message.h>
 #include <camel/camel-multipart.h>
 #include <camel/camel-stream-mem.h>
-#include <camel/camel-store.h>
 
 #include <mail/em-composer-utils.h>
 #include <mail/em-popup.h>
 #include <mail/mail-session.h>
+#include <mail/mail-component.h>
 #include <mail/mail-ops.h>
 #include <e-util/e-error.h>
 #include <e-util/e-plugin.h>
@@ -502,21 +500,13 @@ static void
 reply_with_template (EPopup *ep, EPopupItem *item, void *data)
 {
 	CamelMimeMessage *new, *template, *reply_to;
-	CamelStore *store;
 	CamelFolder *templates_folder;
 	struct _camel_header_raw *header;
 	UserData *userdata = item->user_data;
-	char *cont, *basedir, *url;
+	char *cont;
 
 	/* We get the templates folder and all the uids of the messages in there */
-	basedir = g_build_filename (g_get_home_dir (), ".evolution", "mail", "local", NULL);
-	url = g_strdup_printf ("mbox://%s", basedir);
-	g_free (basedir);
-
-	store = (CamelStore *) camel_session_get_service (session, url, CAMEL_PROVIDER_STORE, NULL);
-	g_free (url);
-
-	templates_folder = camel_store_get_folder (store, _("Templates"), CAMEL_STORE_FOLDER_CREATE, NULL);
+	templates_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_TEMPLATES);
 
 	/* Get from the currently selected folder, the currently selected message */
 	reply_to = camel_folder_get_message (userdata->t->folder, 
@@ -672,21 +662,13 @@ org_gnome_templates_popup (EPlugin *ep, EMPopupTargetSelect *t)
 	CamelFolder *templates_folder;
 	CamelFolderInfo *templates_info;
 	CamelStore *store;
-	char *basedir;
-	char *url;
 
 	GSList *list = NULL;
 
 	/* We get the templates folder and all the uids of the messages in there */
-	basedir = g_build_filename (g_get_home_dir (), ".evolution", "mail", "local", NULL);
-	url = g_strdup_printf ("mbox://%s", basedir);
-
-	g_free (basedir);
-
-	store = (CamelStore *) camel_session_get_service (session, url, CAMEL_PROVIDER_STORE, NULL);
-	g_free (url);
+	store = mail_component_peek_local_store (NULL);
 
-	templates_folder = camel_store_get_folder (store, _("Templates"), CAMEL_STORE_FOLDER_CREATE, NULL);
+	templates_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_TEMPLATES);
 
 	templates_info = camel_store_get_folder_info (store, 
 			templates_folder->full_name, 
@@ -707,22 +689,10 @@ action_template_cb (GtkAction *action,
 {
 	CamelMessageInfo *info;
 	CamelMimeMessage *msg;
-	CamelStore *store;
 	CamelFolder *templates_folder;
 
-	char *basedir;
-	char *url;
-
 	/* We get the templates folder and all the uids of the messages in there */
-	basedir = g_build_filename (g_get_home_dir (), ".evolution", "mail", "local", NULL);
-	url = g_strdup_printf ("mbox://%s", basedir);
-	g_free (basedir);
-
-	store = (CamelStore *) camel_session_get_service (session, url, CAMEL_PROVIDER_STORE, NULL);
-	g_free (url);
-
-	templates_folder = camel_store_get_folder (store, _("Templates"), CAMEL_STORE_FOLDER_CREATE, NULL);
-
+	templates_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_TEMPLATES);
 	msg = e_msg_composer_get_message_draft (composer);
 	info = camel_message_info_new (NULL);
 
diff --git a/po/ChangeLog b/po/ChangeLog
index d918b68187..36f375afbf 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,72 @@
+2008-10-24  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2008-10-24  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-10-23  Gil Forcada  <gforcada@gnome.org>
+
+	* LINGUAS: Added ast.
+	* ast.po: Added Asturian translation on behalf of Mikel González.
+
+2008-10-23  Philipp Kerling  <k.philipp@gmail.com>
+
+	** Fixes bug #557563
+
+	* de.po: Updated German translation (patch by Ronny Standke).
+
+2008-10-19  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2008-10-17  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation.
+
+2008-10-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>   
+
+	* es.po: Updated Spanish translation
+
+2008-10-13  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #556191
+
+	* POTFILES.in: Remove org-gnome-mark-calendar-offline.eplug.xml
+
+2008-10-11  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Fixed typo in the Brazilian Portuguese translation.
+
+2008-10-11  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Merged from branch gnome-2-24.
+
+2008-10-11  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Fixed terminology in the Brazilian Portuguese translation.
+
+2008-10-11  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation.
+
+2008-10-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation, fixes bug #554832
+
+2008-10-04  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician translation.
+
+2008-10-04  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-10-03  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation.
+
 2008-10-01 Og Maciel <ogmaciel@gnome.org>
 
 	* pt_BR.po: Updated Brazilian Portuguese translation by Og Maciel.
diff --git a/po/LINGUAS b/po/LINGUAS
index 8167901aff..d890a7da80 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -3,6 +3,7 @@
 am
 ar
 as
+ast
 az
 be
 be@latin
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2226745497..be71ad3d8c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -388,7 +388,6 @@ plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml
 plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml
 plugins/mark-all-read/mark-all-read.c
 plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml
-plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml
 plugins/mono/org-gnome-evolution-mono.eplug.xml
 plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml
 plugins/plugin-manager/org-gnome-plugin-manager.xml
diff --git a/po/ast.po b/po/ast.po
new file mode 100644
index 0000000000..121002cda9
--- /dev/null
+++ b/po/ast.po
@@ -0,0 +1,23403 @@
+# Asturian translation for evolution
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the evolution package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+#: ../shell/main.c:589
+msgid ""
+msgstr ""
+"Project-Id-Version: evolution\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-23 15:59+0200\n"
+"PO-Revision-Date: 2008-10-20 19:04+0000\n"
+"Last-Translator: Astur <malditoastur@gmail.com>\n"
+"Language-Team: Asturian <ast@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2008-10-22 09:49+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../a11y/addressbook/ea-addressbook-view.c:94
+#: ../a11y/addressbook/ea-addressbook-view.c:103
+#: ../a11y/addressbook/ea-minicard-view.c:179
+msgid "evolution address book"
+msgstr "llibreta de direiciones d'evolution"
+
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:228
+msgid "New Contact"
+msgstr "Contautu nuevu"
+
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:236
+msgid "New Contact List"
+msgstr "Nueva llista de contautos"
+
+#: ../a11y/addressbook/ea-minicard-view.c:162
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "la carpeta de la llibreta de direiciones autual %s tien %d tarxeta"
+msgstr[1] "la carpeta de la llibreta de direiciones autual %s tien %d tarxetes"
+
+#: ../a11y/addressbook/ea-minicard.c:31
+msgid "Open"
+msgstr "Abrir"
+
+#: ../a11y/addressbook/ea-minicard.c:141
+msgid "Contact List: "
+msgstr "Llista de contautos: "
+
+#: ../a11y/addressbook/ea-minicard.c:142
+msgid "Contact: "
+msgstr "Contautu: "
+
+#: ../a11y/addressbook/ea-minicard.c:168
+msgid "evolution minicard"
+msgstr "minitarxeta d'Evolution"
+
+#: ../a11y/calendar/ea-cal-view-event.c:265
+msgid "It has alarms."
+msgstr "Tien alarmes."
+
+#: ../a11y/calendar/ea-cal-view-event.c:268
+msgid "It has recurrences."
+msgstr "Tien repeticiones."
+
+#: ../a11y/calendar/ea-cal-view-event.c:271
+msgid "It is a meeting."
+msgstr "Ye una reunión."
+
+#: ../a11y/calendar/ea-cal-view-event.c:277
+#, c-format
+msgid "Calendar Event: Summary is %s."
+msgstr "Asocedimientu de calendario: El resume ye %s."
+
+#: ../a11y/calendar/ea-cal-view-event.c:279
+msgid "Calendar Event: It has no summary."
+msgstr "Asocedimientu de calendario: Ensin resume."
+
+#: ../a11y/calendar/ea-cal-view-event.c:299
+msgid "calendar view event"
+msgstr "vista d'asocedimientos del calendariu"
+
+#: ../a11y/calendar/ea-cal-view-event.c:527
+msgid "Grab Focus"
+msgstr "Obtener el focu"
+
+#: ../a11y/calendar/ea-cal-view.c:299
+msgid "New Appointment"
+msgstr "Cita nueva"
+
+#: ../a11y/calendar/ea-cal-view.c:300
+msgid "New All Day Event"
+msgstr "Asocedimientu nuevu pa tol día"
+
+#: ../a11y/calendar/ea-cal-view.c:301
+msgid "New Meeting"
+msgstr "Nueva reunión"
+
+#: ../a11y/calendar/ea-cal-view.c:302
+msgid "Go to Today"
+msgstr "Dir a güei"
+
+#: ../a11y/calendar/ea-cal-view.c:303
+msgid "Go to Date"
+msgstr "Dir a una data"
+
+#: ../a11y/calendar/ea-day-view-main-item.c:301
+#: ../a11y/calendar/ea-week-view-main-item.c:298
+msgid "a table to view and select the current time range"
+msgstr "una tabla p'adicar y seleicionar el rangu de tiempu autual"
+
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
+#, c-format
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "Tien %d asocedimientu."
+msgstr[1] "Tien %d asocedimientos."
+
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
+msgid "It has no events."
+msgstr "Nun tien asocedíos."
+
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../a11y/calendar/ea-day-view.c:159
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "Vista de la selmana llaboral: %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."
+#: ../a11y/calendar/ea-day-view.c:165
+#, c-format
+msgid "Day View: %s. %s"
+msgstr "Vista diaria: %s. %s"
+
+#: ../a11y/calendar/ea-day-view.c:196
+msgid "calendar view for a work week"
+msgstr "vista de calendariu pa una selmana llaboral"
+
+#: ../a11y/calendar/ea-day-view.c:198
+msgid "calendar view for one or more days"
+msgstr "vista de calendariu pa ún o más díes"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:784
+msgid "%A %d %b %Y"
+msgstr "%A %d %b %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
+#: ../a11y/calendar/ea-gnome-calendar.c:189
+#: ../calendar/gui/calendar-component.c:787
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1577
+#: ../calendar/gui/e-week-view-main-item.c:335
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:191
+#: ../a11y/calendar/ea-gnome-calendar.c:196
+#: ../a11y/calendar/ea-gnome-calendar.c:198
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:215
+#: ../a11y/calendar/ea-gnome-calendar.c:221
+#: ../a11y/calendar/ea-gnome-calendar.c:227
+#: ../a11y/calendar/ea-gnome-calendar.c:229
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:815
+#: ../calendar/gui/calendar-component.c:821
+#: ../calendar/gui/calendar-component.c:823
+msgid "%d %b %Y"
+msgstr "%d %b %Y"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../a11y/calendar/ea-gnome-calendar.c:219
+#: ../calendar/gui/calendar-component.c:813
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/e-week-view-main-item.c:349
+msgid "%d %b"
+msgstr "%d %b"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
+#: ../calendar/importers/icalendar-importer.c:780
+msgid "Gnome Calendar"
+msgstr "Calendariu de GNOME"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:288
+msgid "search bar"
+msgstr "barra de gueta"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:289
+msgid "evolution calendar search bar"
+msgstr "barra de gueta del calendariu d'Evolution"
+
+#: ../a11y/calendar/ea-jump-button.c:147
+msgid "Jump button"
+msgstr "Botón de saltu"
+
+#: ../a11y/calendar/ea-jump-button.c:156
+msgid "Click here, you can find more events."
+msgstr "Calque equí pa guetar más asocedimientos."
+
+#: ../a11y/calendar/ea-week-view.c:154
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "Vista mensual: %s. %s"
+
+#: ../a11y/calendar/ea-week-view.c:158
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "Vista selmanal: %s. %s"
+
+#: ../a11y/calendar/ea-week-view.c:189
+msgid "calendar view for a month"
+msgstr "vista de calendariu pa un mes"
+
+#: ../a11y/calendar/ea-week-view.c:191
+msgid "calendar view for one or more weeks"
+msgstr "vista de calendariu pa una o más selmanes"
+
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
+msgid "popup"
+msgstr "emerxente"
+
+#. action name
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
+msgid "popup a child"
+msgstr "emerxer un descendiente"
+
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
+msgid "edit"
+msgstr "iguar"
+
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
+msgid "begin editing this cell"
+msgstr "entamar a iguar esta casulla"
+
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
+msgid "toggle"
+msgstr "camudar"
+
+#. action name
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
+msgid "toggle the cell"
+msgstr "camudar la casulla"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
+msgid "expand"
+msgstr "estenderexar"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
+msgid "expands the row in the ETree containing this cell"
+msgstr "estenderexa la filera nel ETree que contién esta casulla"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
+msgid "collapse"
+msgstr "contrayer"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
+msgid "collapses the row in the ETree containing this cell"
+msgstr "contrái la filera nel ETree que contién esta casulla"
+
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
+msgid "Table Cell"
+msgstr "Casulla de la tabla"
+
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
+#: ../widgets/table/e-table-click-to-add.c:580
+msgid "click to add"
+msgstr "calque p'amestar"
+
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
+msgid "click"
+msgstr "Picar"
+
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
+msgid "sort"
+msgstr "ordenar"
+
+#: ../a11y/widgets/ea-calendar-item.c:295
+#: ../a11y/widgets/ea-calendar-item.c:301
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../a11y/widgets/ea-calendar-item.c:303
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Calendariu: dende %s a %s"
+
+#: ../a11y/widgets/ea-calendar-item.c:338
+msgid "evolution calendar item"
+msgstr "elementu de calendariu d'Evolution"
+
+#: ../a11y/widgets/ea-combo-button.c:56
+msgid "Combo Button"
+msgstr "Botón combu"
+
+#: ../a11y/widgets/ea-combo-button.c:66
+msgid "Activate Default"
+msgstr "Activar predeterminaos"
+
+#: ../a11y/widgets/ea-combo-button.c:68
+msgid "Popup Menu"
+msgstr "Menú emerxente"
+
+#: ../a11y/widgets/ea-expander.c:40
+msgid "Toggle Attachment Bar"
+msgstr "Conmutar barra d'axuntos"
+
+#: ../a11y/widgets/ea-expander.c:50
+msgid "activate"
+msgstr "activar"
+
+#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:2
+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}» ye una llibreta de direiciones de namái llectura y nun pue modificase. "
+"Seleicione una llibreta de direiciones diferente de la barra llateral na "
+"vista de contautos."
+
+#: ../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 ""
+"Yá hai un contauto con esa direición. ¿Quier amestar una tarxeta nueva cola "
+"mesma direición de toes formes?"
+
+#: ../addressbook/addressbook.error.xml.h:4
+msgid "Address '{0}' already exists."
+msgstr "La direición «{0}» yá esiste."
+
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Cannot add new contact"
+msgstr "Nun se pue amestar un contautu nuevu"
+
+#: ../addressbook/addressbook.error.xml.h:6
+msgid "Cannot move contact."
+msgstr "El contautu nun se pue mover."
+
+#: ../addressbook/addressbook.error.xml.h:7
+msgid "Category editor not available."
+msgstr "Nun hai un editor de categoríes disponible"
+
+#: ../addressbook/addressbook.error.xml.h:8
+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 ""
+"Tea xuru de que la so contraseña tea escrita correchamente y que ta usando "
+"un métodu d'entamu de sesión sofitáu. Remembre que munches contraseñes "
+"distinguen ente mayúscules y minúscules. La so tecla de bloquéu de "
+"mayúscules pue tar activada."
+
+#: ../addressbook/addressbook.error.xml.h:9
+msgid "Could not get schema information for LDAP server."
+msgstr "Nun ye dable obtener l'esquema d'información del servidor LDAP."
+
+#: ../addressbook/addressbook.error.xml.h:10
+msgid "Could not remove address book."
+msgstr "Nun pudo desaniciase la llibreta de direiciones."
+
+#: ../addressbook/addressbook.error.xml.h:11
+msgid ""
+"Currently you can access only GroupWise System Address Book from Evolution. "
+"Please use some other GroupWise mail client once, to get your GroupWise "
+"Frequent Contacts and GroupWise Personal Contacts folders."
+msgstr ""
+"Anguaño namái pue acceder a la llibreta de direiciones del sistema de "
+"GroupWise dende Evolution. Use dalgún veceru de corréu de GroupWise una sola "
+"vegada pa obtener los sos Contautos frecuentes de GroupWise y les carpetes "
+"personales de contautos de GroupWise."
+
+#: ../addressbook/addressbook.error.xml.h:12
+msgid "Delete address book '{0}'?"
+msgstr "¿Quier esaniciar la llibreta de direiciones «{0}»?"
+
+#: ../addressbook/addressbook.error.xml.h:13
+msgid "Error loading address book."
+msgstr "Fallu al cargar la llibreta de direiciones."
+
+#: ../addressbook/addressbook.error.xml.h:14
+msgid "Error saving {0} to {1}: {2}"
+msgstr "Fallu guardando {0} a {1}: {2}"
+
+#: ../addressbook/addressbook.error.xml.h:15
+msgid "Failed to authenticate with LDAP server."
+msgstr "Fallu al autenticase col servidor LDAP."
+
+#. Unknown error
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+msgid "Failed to delete contact"
+msgstr "Fallu al esaniciar el contautu"
+
+#: ../addressbook/addressbook.error.xml.h:17
+msgid "GroupWise Address book creation:"
+msgstr "Criación de llibreta de direiciones GroupWise:"
+
+#: ../addressbook/addressbook.error.xml.h:18
+msgid "LDAP server did not respond with valid schema information."
+msgstr "El servidor LDAP nun retrucó con una información del esquema válida."
+
+#: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:50
+msgid "Server Version"
+msgstr "Versión del servidor"
+
+#: ../addressbook/addressbook.error.xml.h:20
+msgid "Some features may not work properly with your current server"
+msgstr ""
+"Dalgunes carauterístiques seique nun furrulen afayaízamente col so servidor "
+"autual"
+
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "The Evolution address book has quit unexpectedly."
+msgstr "La llibreta de direiciones d'Evolution zarróse de mou inesperáu."
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr "La imaxe que seleicionó ye grande. ¿Quier redimensionala y atroxala?"
+
+#: ../addressbook/addressbook.error.xml.h:23
+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 ""
+"Esti servidor LDAP seique use una versión de LDAP más antigua, que nun "
+"sofita esta funcionalidá o seique tea mal configuráu. Pida al so "
+"alministrador de sistema les bases de gueta sofitaes."
+
+#: ../addressbook/addressbook.error.xml.h:24
+msgid "This address book could not be opened."
+msgstr "Nu pudo abrise la llibreta de direiciones."
+
+#: ../addressbook/addressbook.error.xml.h:25
+msgid "This address book server does not have any suggested search bases."
+msgstr ""
+"Esti sirvidor de llibretes de direiciones nun tien denguna base suxerida de "
+"guetes."
+
+#: ../addressbook/addressbook.error.xml.h:26
+msgid ""
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+"Pue qu'esti sirvidor de llibretes de direiciones tea inalgamable, qu'el nome "
+"del sirvidor tea mal escritu o que la conexón de rede tea cayía."
+
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "Esta llibreta de direiciones esaniciarase pa siempres."
+
+#: ../addressbook/addressbook.error.xml.h:28
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Esti servidor nun sofita l'esquema d'información LDAPv3."
+
+#: ../addressbook/addressbook.error.xml.h:29
+msgid "Unable to open address book"
+msgstr "Incapaz d'abrir la llibreta de direiciones"
+
+#: ../addressbook/addressbook.error.xml.h:30
+msgid "Unable to perform search."
+msgstr "Nun ye dable facer la gueta."
+
+#: ../addressbook/addressbook.error.xml.h:31
+msgid "Unable to save {0}."
+msgstr "Nun se pue guardar {0}."
+
+#: ../addressbook/addressbook.error.xml.h:32
+msgid "Would you like to save your changes?"
+msgstr "¿Deseya guardar los cambeos?"
+
+#: ../addressbook/addressbook.error.xml.h:33
+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 ""
+"Ta tentando mover un contauto de una llibreta de direiciones a otra, pero "
+"nun se pue desaniciar de la llibreta d'orixe. ¿Deseya facer una copia "
+"n'arróu de movelu?"
+
+#: ../addressbook/addressbook.error.xml.h:34
+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 ""
+"Ta coneutando con un servidor GroupWise nun sofitáu y podría alcontrar "
+"problemes usando Evolution. Pa los meyores resultaos el servidor tendría "
+"d'autualizase a una versión sofitada"
+
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr ""
+"Nun tien permisos pa desaniciar esti contautu nesta llibreta de direiciones."
+
+#: ../addressbook/addressbook.error.xml.h:36
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr "Fizo camudamientos nesti contautu. ¿Deseya atroxar estos cambeos?"
+
+#: ../addressbook/addressbook.error.xml.h:37
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"Los contautos pa {0} nun tara disponibles hasta qu'Evolution se reanicie."
+
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
+#: ../plugins/groupwise-features/junk-settings.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:18
+msgid "_Add"
+msgstr "_Amestar"
+
+#: ../addressbook/addressbook.error.xml.h:39
+msgid "_Discard"
+msgstr "_Descartar"
+
+#: ../addressbook/addressbook.error.xml.h:40
+msgid "_Do not save"
+msgstr "_Non guardar"
+
+#: ../addressbook/addressbook.error.xml.h:41
+msgid "_Resize"
+msgstr "_Axustar Tamañu"
+
+#: ../addressbook/addressbook.error.xml.h:42
+msgid "_Use as it is"
+msgstr "_Usar talo como ye"
+
+#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+msgid "{0}"
+msgstr "{0}"
+
+#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
+#: ../addressbook/addressbook.error.xml.h:46
+msgid "{1}"
+msgstr "{1}"
+
+#: ../addressbook/conduit/address-conduit.c:300
+msgid "Default Sync Address:"
+msgstr "Direición de sincr. predeterminada:"
+
+#: ../addressbook/conduit/address-conduit.c:1321
+#: ../addressbook/conduit/address-conduit.c:1322
+msgid "Could not load address book"
+msgstr "Nun pudo cargase la llibreta de direiciones"
+
+#: ../addressbook/conduit/address-conduit.c:1399
+#: ../addressbook/conduit/address-conduit.c:1402
+msgid "Could not read pilot's Address application block"
+msgstr "Nun se pudo lleer el bloque de l'aplicación de Direiciones del Pilot"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Autocompletion"
+msgstr "Autocompletáu"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "C_ontacts"
+msgstr "C_ontautos"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Certificates"
+msgstr "Certificaos"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Configure autocomplete here"
+msgstr "Configure l'autocompletáu equí"
+
+#. Create the contacts group
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/addressbook-view.c:1325
+#: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:582
+msgid "Contacts"
+msgstr "Contautos"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Address Book"
+msgstr "Llibreta de direiciones d'Evolution"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Address Book address popup"
+msgstr "Direición emerxente na llibreta de direiciones d'Evolution"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Address Book address viewer"
+msgstr "Visor de direiciones de la llibreta de direiciones d'Evolution"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Address Book card viewer"
+msgstr "Visor de tarxetes de la llibreta de direiciones d'Evolution"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Address Book component"
+msgstr "Componente de llibreta de direiciones d'Evolution"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "Control de xestión de certificados S/MIME d'Evolution"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution folder settings configuration control"
+msgstr "Remanéu d'afitamientu de preferencies de carpetes d'Evolution"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manage your S/MIME certificates here"
+msgstr "Xestione los sos certificaos S/MIME equí"
+
+#. create the local source group
+#. On This Computer is always first and Search Folders is always last
+#: ../addressbook/gui/component/addressbook-component.c:143
+#: ../addressbook/gui/component/addressbook-migrate.c:500
+#: ../calendar/gui/calendar-component.c:236
+#: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
+#: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:311 ../mail/mail-vfolder.c:223
+#: ../mail/message-list.c:1518
+msgid "On This Computer"
+msgstr "Nesti equipu"
+
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person task list
+#. Create the default Person addressbook
+#. orange
+#: ../addressbook/gui/component/addressbook-component.c:151
+#: ../addressbook/gui/component/addressbook-migrate.c:508
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:204
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
+msgid "Personal"
+msgstr "Personal"
+
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:518
+msgid "On LDAP Servers"
+msgstr "En servidores LDAP"
+
+#: ../addressbook/gui/component/addressbook-component.c:230
+msgid "Create a new contact"
+msgstr "Cria un contautu nuevu"
+
+#: ../addressbook/gui/component/addressbook-component.c:238
+msgid "Create a new contact list"
+msgstr "Cria una llista de contautos nueva"
+
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1223
+msgid "New Address Book"
+msgstr "Llibreta de direiciones nueva"
+
+#: ../addressbook/gui/component/addressbook-component.c:246
+msgid "Create a new address book"
+msgstr "Cria una llibreta de direiciones nueva"
+
+#: ../addressbook/gui/component/addressbook-component.c:409
+msgid "Failed upgrading Address Book settings or folders."
+msgstr "Fallu al autualizar la configuración de la llibreta o les carpetes."
+
+#: ../addressbook/gui/component/addressbook-config.c:332
+msgid "Base"
+msgstr "Base"
+
+#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:170
+msgid "_Type:"
+msgstr "_Tipu:"
+
+#: ../addressbook/gui/component/addressbook-config.c:635
+msgid "Copy _book content locally for offline operation"
+msgstr "Copiar la lli_breta llocalmente pa trabayar desconeutáu"
+
+#: ../addressbook/gui/component/addressbook-config.c:998
+#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2441
+#: ../smime/gui/smime-ui.glade.h:28
+msgid "General"
+msgstr "Xeneral"
+
+#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:383
+msgid "Address Book"
+msgstr "Llibreta de direiciones"
+
+#: ../addressbook/gui/component/addressbook-config.c:1003
+msgid "Server Information"
+msgstr "Información del servidor"
+
+#: ../addressbook/gui/component/addressbook-config.c:1005
+msgid "Authentication"
+msgstr "Autenticación"
+
+#: ../addressbook/gui/component/addressbook-config.c:1008
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../smime/gui/smime-ui.glade.h:20
+msgid "Details"
+msgstr "Detáis"
+
+#: ../addressbook/gui/component/addressbook-config.c:1009
+#: ../mail/em-folder-browser.c:985
+msgid "Searching"
+msgstr "Gueta"
+
+#: ../addressbook/gui/component/addressbook-config.c:1011
+msgid "Downloading"
+msgstr "Descargando"
+
+#: ../addressbook/gui/component/addressbook-config.c:1221
+#: ../addressbook/gui/component/ldap-config.glade.h:11
+msgid "Address Book Properties"
+msgstr "Propiedaes de la llibreta de direiciones"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:74
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
+msgid "Migrating..."
+msgstr "Migrando…"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:126
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
+#, c-format
+msgid "Migrating '%s':"
+msgstr "Migrando «%s»:"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:646
+msgid "LDAP Servers"
+msgstr "Servidores LDAP"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:761
+msgid "Autocompletion Settings"
+msgstr "Configuración d'autocompletáu"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
+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 ""
+"El llugar y xerarquía de les carpetes de contautos d'Evolution camudó dende "
+"Evolution 1.x.\n"
+"\n"
+"Seya paciente mentantu Evolution migra les sos carpetes…"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:1151
+msgid ""
+"The format of mailing list contacts has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"El formatu de los contautos de llistes de corréu camudó.\n"
+"\n"
+"Seya paciente mentantu Evolution migra les sos carpetes…"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:1160
+msgid ""
+"The way Evolution stores some phone numbers has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"El mou del qu'Evolution atroxa dalgunos númberos de teléfonu tien camudao.\n"
+"\n"
+"Seya paciente mentantu Evolution migra les sos carpetes…"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:1170
+msgid ""
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data..."
+msgstr ""
+"Los ficheros del rexistru de cambeos y los mapes Palm Sync de Evolution "
+"tienen camudao.\n"
+"\n"
+"Seya paciente mentantu Evolution migra les sos carpetes…"
+
+#: ../addressbook/gui/component/addressbook-view.c:424
+#: ../mail/em-folder-utils.c:448
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Renomar la carpeta «%s» a:"
+
+#: ../addressbook/gui/component/addressbook-view.c:427
+#: ../mail/em-folder-utils.c:450
+msgid "Rename Folder"
+msgstr "Renomar carpeta"
+
+#: ../addressbook/gui/component/addressbook-view.c:432
+#: ../mail/em-folder-utils.c:456
+msgid "Folder names cannot contain '/'"
+msgstr "Los nomes de carpetes nun puen tener el caráuter «/»"
+
+#: ../addressbook/gui/component/addressbook-view.c:941
+msgid "_New Address Book"
+msgstr "Llibreta de direiciones _nueva"
+
+#: ../addressbook/gui/component/addressbook-view.c:942
+msgid "Save As vCard..."
+msgstr "Guardar como vCard…"
+
+#: ../addressbook/gui/component/addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/calendar-component.c:644
+#: ../calendar/gui/e-calendar-table.c:1598
+#: ../calendar/gui/e-calendar-view.c:1692 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/memos-component.c:493 ../calendar/gui/tasks-component.c:484
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
+#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-tasks.xml.h:24
+msgid "_Delete"
+msgstr "_Esaniciar"
+
+#: ../addressbook/gui/component/addressbook-view.c:948
+#: ../calendar/gui/calendar-component.c:649
+#: ../calendar/gui/dialogs/comp-editor.c:2043
+#: ../calendar/gui/memos-component.c:498 ../calendar/gui/tasks-component.c:489
+#: ../composer/e-msg-composer.c:1041 ../mail/em-folder-tree.c:2120
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Propiedaes"
+
+#: ../addressbook/gui/component/addressbook-view.c:1336
+msgid "Contact Source Selector"
+msgstr "Seleutor d'orixe de contautos"
+
+#: ../addressbook/gui/component/addressbook.c:102
+msgid "Accessing LDAP Server anonymously"
+msgstr "Accediendo al servidor LDAP anónimamente"
+
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
+msgid "Failed to authenticate.\n"
+msgstr "Nun ye dable autenticar.\n"
+
+#: ../addressbook/gui/component/addressbook.c:214
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Introduza la contraseña pa %s (usuariu %s)"
+
+#: ../addressbook/gui/component/addressbook.c:222
+#: ../calendar/common/authentication.c:51
+#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/publish-calendar/publish-calendar.c:191
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "Introduza la contraseña"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr "Llonxitú del autocompletáu"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "XML EFolderList pa la llista de URIs de completáu"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "XML EFolderList pa la llista de URIs de completáu."
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
+msgid ""
+"Position of the vertical pane, between the card and list views and the "
+"preview pane, in pixels."
+msgstr ""
+"Posición del panel vertical, ente les vistes de tarxetes y llistes, y el "
+"panel de vista previa, en píxeles."
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+msgid "Show preview pane"
+msgstr "Amosar el panel de vista previa"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+"El númberu de carauteres que tienen de teclease enantes de qu'Evolution "
+"tente auto-completar."
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+msgid "URI for the folder last used in the select names dialog"
+msgstr ""
+"URI pa la carpeta usada per cabera vegada nel diálogu de seleición de nomes"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+msgid "URI for the folder last used in the select names dialog."
+msgstr ""
+"URI pa la carpeta usada per cabera vegada nel diálogu de seleición de nomes"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+msgid "Vertical pane position"
+msgstr "Posición del panel vertical"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
+msgid "Whether to show the preview pane."
+msgstr "Conseña si s'amuesa el panel de vista previa."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:1
+msgid "1"
+msgstr "1"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:2
+msgid "3268"
+msgstr "3268"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:3
+msgid "389"
+msgstr "389"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:4
+msgid "5"
+msgstr "5"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:5
+msgid "636"
+msgstr "636"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:6
+msgid "<b>Authentication</b>"
+msgstr "<b>Autenticación</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:7
+msgid "<b>Downloading</b>"
+msgstr "<b>Descarga</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:8
+msgid "<b>Searching</b>"
+msgstr "<b>Gueta</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:9
+msgid "<b>Type:</b>"
+msgstr "<b>Tipu:</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:10
+msgid "Add Address Book"
+msgstr "Amesta una llibreta de direiciones"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../mail/em-account-editor.c:760
+msgid "Always"
+msgstr "Siempres"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:13
+msgid "Anonymously"
+msgstr "Anónimamente"
+
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+msgid "B_rowse this book until limit reached"
+msgstr "_Agüeyar esta llibreta hasta aportar al final"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:16
+msgid "Basic"
+msgstr "Básicu"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:18
+msgid "Distinguished name"
+msgstr "Nome distintivu"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:19
+msgid "Email address"
+msgstr "Direición de corréu-e"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:20
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr "Evolution usará esta direición de corréu-e p'autenticalu col servidor."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:21
+msgid "Find Possible Search Bases"
+msgstr "Guetar bases de busca dables"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:23
+msgid "Lo_gin:"
+msgstr "_Entamu de sesión:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../mail/em-account-editor.c:759
+msgid "Never"
+msgstr "Enxamás"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:287
+msgid "No encryption"
+msgstr "Ensin cifráu"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:26
+msgid "One"
+msgstr "Uno"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../mail/em-account-editor.c:295
+msgid "SSL encryption"
+msgstr "Encriptación SSL"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:28
+msgid "Search Filter"
+msgstr "Fieltru de busca"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:29
+msgid "Search _base:"
+msgstr "_Bas de busca:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:30
+msgid "Search _filter:"
+msgstr "_Fieltru de busca:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:31
+msgid "Search filter"
+msgstr "Fieltru de busca"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:32
+msgid ""
+"Search filter is the type of the objects searched for, while performing the "
+"search. If this is not modified, by  default search will be performed on "
+"objectclass of the type \"person\"."
+msgstr ""
+"Fieltru de busca ye'l tipu de los oxetos buscaos, mientres se fai la busca. "
+"Si esto nun se modifica, la busca por omisión fadráse sobro la clas d'oxetos "
+"de tipu «person»."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:33
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"Seleicionar esta opción significa qu'Evolution namái coneutará col so "
+"servidor LDAP si'l so servidor LDAP sofita SSL."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:34
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"Seleicionar esta opción significa qu'Evolution namái coneutará col so "
+"servidor LDAP si'l so servidor LDAP sofita TLS."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:35
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"Seleicionar esta opción significa que'l so servidor nun soporta nin SSL nin "
+"TLS. Esto significa que la so conexón sedrá insegura, y que vusté sedrá "
+"vulnerable a fallos de seguridá."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+msgid "Sub"
+msgstr "Sub"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:37
+msgid "Supported Search Bases"
+msgstr "Bases de busca sofitaes"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../mail/em-account-editor.c:291
+msgid "TLS encryption"
+msgstr "Encriptación TLS"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+msgid ""
+"The search base is the distinguished name (DN) of the entry where your "
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
+msgstr ""
+"La base de busca ye'l nome distintivu (ND) de la entrada au entamará les "
+"busques. Si dexa esto en blanco, la busca entamará nel raigón del árbol de "
+"direutorios."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:40
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+"L'ámbitu de busca define hasta qué profundidá deseya que la busca s'estienda "
+"a lo llargo d'un árbol de direutorios. Un ámbitu de busca de «sub» incluyirá "
+"toles entraes per debaxo de la so base de busca. Un ámbitu de «uno» namái "
+"incluyirá les entraes un nivel baxo la so base."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
+msgid ""
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
+"\"."
+msgstr ""
+"Esti ye'l nome completu del servidor LDAP. Por exemplu, «ldap.micompañia.com»."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:42
+msgid ""
+"This is the maximum number of entries to download. Setting this number to be "
+"too large will slow down your address book."
+msgstr ""
+"Esti ye'l máximu númberu d'entraes pa descargar. Si pon esti númberu mui "
+"altu ralentizará la so llibreta de direiciones."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:43
+#, fuzzy
+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 ""
+"Esti ye'l métodu qu'usará Evolution p'autenticalu a vusté. Decátese "
+"qu'afitar esto a «Direición de corréu-e» requier accesu anónimu al so "
+"servidor ldap."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:44
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list. It is for display purposes only. "
+msgstr ""
+"Esti ye'l nome qu'identificará esti servidor na llista de carpetes "
+"d'Evolution. Ye namái pa poder amosalu na pantalla. "
+
+#: ../addressbook/gui/component/ldap-config.glade.h:45
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+"Esti ye'l puertu del servidor LDAP al qu'Evolution tentará coneutase. Tiense "
+"proporcionao una llista de puertos estándar. Entrugue al so alministrador "
+"del sistema qué puertu tendría d'especificar."
+
+#: ../addressbook/gui/component/ldap-config.glade.h:46
+msgid "Using distinguished name (DN)"
+msgstr "Usando «Nome Distintivu» (ND)"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:47
+msgid "Using email address"
+msgstr "Usando direición de corréu-e"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:48
+msgid "Whenever Possible"
+msgstr "Cuando seya dable"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:49
+msgid "_Add Address Book"
+msgstr "_Amestar llibreta de direiciones"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:50
+msgid "_Download limit:"
+msgstr "Llímite de _descarga:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:51
+msgid "_Find Possible Search Bases"
+msgstr "_Guetar bases de busca dables"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:52
+msgid "_Login method:"
+msgstr "Métodu d'_entamu de sesión:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:177
+#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+msgid "_Name:"
+msgstr "_Nome:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+msgid "_Port:"
+msgstr "_Puertu:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:55
+msgid "_Search scope:"
+msgstr "�_mbitu de busca:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../mail/mail-config.glade.h:186
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+msgid "_Server:"
+msgstr "_Servidor:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:57
+msgid "_Timeout:"
+msgstr "_Tiempu d'espera:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:58
+msgid "_Use secure connection:"
+msgstr "Usar _conexón segura:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:59
+msgid "cards"
+msgstr "tarxetes"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
+#: ../plugins/calendar-http/calendar-http.c:279
+#: ../plugins/calendar-weather/calendar-weather.c:561
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
+msgid "minutes"
+msgstr "minutos"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+msgid "<b>Email</b>"
+msgstr "<b>Corréu</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+msgid "<b>Home</b>"
+msgstr "<b>Casa</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+msgid "<b>Instant Messaging</b>"
+msgstr "<b>Mensaxería Instantáneo</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+msgid "<b>Job</b>"
+msgstr "<b>Trabayu</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Misceláneu</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid "<b>Other</b>"
+msgstr "<b>Otru</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "<b>Telephone</b>"
+msgstr "<b>Teléfonu</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+msgid "<b>Web Addresses</b>"
+msgstr "<b>Páxines web</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+msgid "<b>Work</b>"
+msgstr "<b>Trabayu</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:614
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "Ca_tegoríes…"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:199
+msgid "Contact"
+msgstr "Contautu"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2421
+msgid "Contact Editor"
+msgstr "Remanador de contautos"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+msgid "Full _Name..."
+msgstr "_Nome completu…"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+msgid "Image"
+msgstr "Imaxe"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+msgid "Mailing Address"
+msgstr "Direición de corréu"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "Nic_kname:"
+msgstr "Noma_tu:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#, fuzzy
+msgid "Novell GroupWise"
+msgstr "Novell GroupWise"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+msgid "Novell Groupwise"
+msgstr "Novell GroupWise"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+msgid "Personal Information"
+msgstr "Información personal"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+msgid "Telephone"
+msgstr "Teléfonu"
+
+#. red
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../mail/em-migrate.c:1057
+msgid "Work"
+msgstr "Trabayu"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "_Address:"
+msgstr "_Direición:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "_Anniversary:"
+msgstr "_Aniversariu:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+msgid "_Assistant:"
+msgstr "_Secretaría:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+msgid "_Birthday:"
+msgstr "_Cumpleaños:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../calendar/gui/dialogs/event-page.c:791
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../plugins/itip-formatter/itip-view.c:1868
+msgid "_Calendar:"
+msgstr "_Calendariu:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+msgid "_City:"
+msgstr "_Ciudá:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+msgid "_Company:"
+msgstr "_Empresa:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "_Country:"
+msgstr "_País:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_Department:"
+msgstr "_Departamentu:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+msgid "_File under:"
+msgstr "A_rchivar como:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+msgid "_Free/Busy:"
+msgstr "_Disponibilidá:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+msgid "_Home Page:"
+msgstr "_Páxina personal:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+msgid "_Manager:"
+msgstr "_Xefe:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+msgid "_Notes:"
+msgstr "_Notes:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+msgid "_Office:"
+msgstr "_Oficina:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "_PO Box:"
+msgstr "_Aptáu. de correos:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+msgid "_Profession:"
+msgstr "_Profesión:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+msgid "_Spouse:"
+msgstr "_Cónxugue:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "_State/Province:"
+msgstr "E_stáu/Provincia:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+msgid "_Title:"
+msgstr "_Títulu:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+msgid "_Video Chat:"
+msgstr "_Charra per vídeu:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+msgid "_Wants to receive HTML mail"
+msgstr "_Quier recibir el corréu como HTML"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+msgid "_Web Log:"
+msgstr "_Diariu web:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "_Where:"
+msgstr "_Au:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+msgid "_Zip/Postal Code:"
+msgstr "_Códigu postal:"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
+msgid "Address"
+msgstr "Direición"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:292
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
+#: ../addressbook/gui/widgets/e-minicard-label.c:165
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../widgets/menus/gal-define-views-model.c:178
+#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
+msgid "Editable"
+msgstr "Iguable"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+msgid "United States"
+msgstr "Estaos Xuníos"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+msgid "Afghanistan"
+msgstr "Afganistán"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+msgid "Albania"
+msgstr "Albania"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+msgid "Algeria"
+msgstr "Arxelia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+msgid "American Samoa"
+msgstr "Samoa Americana"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+msgid "Andorra"
+msgstr "Andorra"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+msgid "Angola"
+msgstr "Angola"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+msgid "Anguilla"
+msgstr "Anguilla"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+msgid "Antarctica"
+msgstr "Antártida"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+msgid "Antigua And Barbuda"
+msgstr "Antigua y Barbuda"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+msgid "Argentina"
+msgstr "Arxentina"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+msgid "Armenia"
+msgstr "Armenia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+msgid "Aruba"
+msgstr "Aruba"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+msgid "Australia"
+msgstr "Australia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+msgid "Austria"
+msgstr "Austria"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+msgid "Azerbaijan"
+msgstr "Azerbaiyán"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+msgid "Bahamas"
+msgstr "Bahames"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+msgid "Bahrain"
+msgstr "Bahréin"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+msgid "Barbados"
+msgstr "Barbados"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+msgid "Belarus"
+msgstr "Bielorrusia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+msgid "Belgium"
+msgstr "Bélxica"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+msgid "Belize"
+msgstr "Belize"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+msgid "Benin"
+msgstr "Benin"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+msgid "Bermuda"
+msgstr "Bermudes"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+msgid "Bhutan"
+msgstr "Bután"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+msgid "Bolivia"
+msgstr "Bolivia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+msgid "Bosnia And Herzegowina"
+msgstr "Bosnia y Herzegovina"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+msgid "Botswana"
+msgstr "Botswana"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+msgid "Bouvet Island"
+msgstr "Islla Bouvet"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+msgid "Brazil"
+msgstr "Brasil"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+msgid "British Indian Ocean Territory"
+msgstr "Británicu del Océanu �ndicu, Territoriu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+msgid "Brunei Darussalam"
+msgstr "Brunei"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+msgid "Burundi"
+msgstr "Burundi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+msgid "Cambodia"
+msgstr "Camboya"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+msgid "Cameroon"
+msgstr "Camerún"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+msgid "Canada"
+msgstr "Canadá"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+msgid "Cape Verde"
+msgstr "Cabu Verde"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+msgid "Cayman Islands"
+msgstr "Islles Caimán"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+msgid "Central African Republic"
+msgstr "República Central Africana"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+msgid "Chad"
+msgstr "Chad"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+msgid "Chile"
+msgstr "Chile"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+msgid "China"
+msgstr "China"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+msgid "Christmas Island"
+msgstr "Islla de Navidad"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+msgid "Cocos (Keeling) Islands"
+msgstr "Islla Cocos (Keeling)"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+msgid "Colombia"
+msgstr "Colombia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+msgid "Comoros"
+msgstr "Comores"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+msgid "Congo"
+msgstr "Congo"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+msgid "Congo, The Democratic Republic Of The"
+msgstr "Congo, República Democrática del"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+msgid "Cook Islands"
+msgstr "Islles Cook"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+msgid "Cote d'Ivoire"
+msgstr "Costa de Marfil"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+msgid "Croatia"
+msgstr "Croacia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+msgid "Cuba"
+msgstr "Cuba"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+msgid "Cyprus"
+msgstr "Chipre"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+msgid "Czech Republic"
+msgstr "República Checa"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+msgid "Denmark"
+msgstr "Dinamarca"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+msgid "Djibouti"
+msgstr "Djibouti"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+msgid "Dominica"
+msgstr "Dominica"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+msgid "Dominican Republic"
+msgstr "República Dominicana"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+msgid "Ecuador"
+msgstr "Ecuador"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+msgid "Egypt"
+msgstr "Exiptu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+msgid "El Salvador"
+msgstr "El Salvador"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+msgid "Equatorial Guinea"
+msgstr "Guinea Ecuatorial"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+msgid "Eritrea"
+msgstr "Eritrea"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+msgid "Estonia"
+msgstr "Estonia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+msgid "Ethiopia"
+msgstr "Etiopía"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+msgid "Falkland Islands"
+msgstr "Islles Malvines"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+msgid "Faroe Islands"
+msgstr "Islles Feroe"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+msgid "Fiji"
+msgstr "Fiji"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+msgid "Finland"
+msgstr "Finlandia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+msgid "France"
+msgstr "Francia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+msgid "French Guiana"
+msgstr "Guinea Francesa"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+msgid "French Polynesia"
+msgstr "Polinesia Francesa"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+msgid "French Southern Territories"
+msgstr "Territorios Sur Franceses"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+msgid "Gabon"
+msgstr "Gabón"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+msgid "Gambia"
+msgstr "Gambia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+msgid "Georgia"
+msgstr "Xorxa"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+msgid "Germany"
+msgstr "Alemaña"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+msgid "Ghana"
+msgstr "Ghana"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+msgid "Gibraltar"
+msgstr "Xibraltar"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+msgid "Greece"
+msgstr "Grecia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+msgid "Greenland"
+msgstr "Groenlandia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+msgid "Grenada"
+msgstr "Granada"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+msgid "Guadeloupe"
+msgstr "Guadalupe"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+msgid "Guam"
+msgstr "Guam"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+msgid "Guatemala"
+msgstr "Guatemala"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+msgid "Guernsey"
+msgstr "Guernsey"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+msgid "Guinea"
+msgstr "Guinea"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guinea-Bissau"
+msgstr "Guinea-Bissau"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+msgid "Guyana"
+msgstr "Guyana"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+msgid "Haiti"
+msgstr "Haití"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+msgid "Heard And McDonald Islands"
+msgstr "Islles Heard y McDonald"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+msgid "Holy See"
+msgstr "Holy See"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+msgid "Honduras"
+msgstr "Hondures"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+msgid "Hong Kong"
+msgstr "Hong Kong"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+msgid "Hungary"
+msgstr "Hungría"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+msgid "Iceland"
+msgstr "Islandia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+msgid "India"
+msgstr "India"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+msgid "Indonesia"
+msgstr "Indonesia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+msgid "Iran"
+msgstr "Irán"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+msgid "Iraq"
+msgstr "Iraq"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+msgid "Ireland"
+msgstr "Irlanda"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+msgid "Isle of Man"
+msgstr "Islla de Man"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+msgid "Israel"
+msgstr "Israel"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+msgid "Italy"
+msgstr "Italia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+msgid "Jamaica"
+msgstr "Xamaica"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+msgid "Japan"
+msgstr "Xapón"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+msgid "Jersey"
+msgstr "Jersey"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+msgid "Jordan"
+msgstr "Xordania"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+msgid "Kazakhstan"
+msgstr "Kazajistán"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+msgid "Kenya"
+msgstr "Kenia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+msgid "Kiribati"
+msgstr "Kiribati"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+msgid "Korea, Democratic People's Republic Of"
+msgstr "República Democrática Popular de Corea"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+msgid "Korea, Republic Of"
+msgstr "República de Corea"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+msgid "Kuwait"
+msgstr "Kuwait"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+msgid "Kyrgyzstan"
+msgstr "Kirgizstán"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+msgid "Laos"
+msgstr "Laos"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+msgid "Latvia"
+msgstr "Letonia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+msgid "Lebanon"
+msgstr "Líbanu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+msgid "Lesotho"
+msgstr "Lesoto"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+msgid "Liberia"
+msgstr "Liberia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+msgid "Libya"
+msgstr "Libia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+msgid "Lithuania"
+msgstr "Lituania"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+msgid "Luxembourg"
+msgstr "Luxemburgo"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+msgid "Macao"
+msgstr "Macao"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+msgid "Macedonia"
+msgstr "Macedonia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+msgid "Madagascar"
+msgstr "Madagascar"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+msgid "Malawi"
+msgstr "Malawi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+msgid "Malaysia"
+msgstr "Malasia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+msgid "Maldives"
+msgstr "Maldives"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+msgid "Mali"
+msgstr "Mali"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+msgid "Malta"
+msgstr "Malta"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+msgid "Marshall Islands"
+msgstr "Islles Marshall"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+msgid "Martinique"
+msgstr "Martinica"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+msgid "Mauritania"
+msgstr "Mauritania"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+msgid "Mauritius"
+msgstr "Mauriciu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+msgid "Mayotte"
+msgstr "Mayotte"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+msgid "Mexico"
+msgstr "Méxicu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+msgid "Micronesia"
+msgstr "Micronesia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+msgid "Moldova, Republic Of"
+msgstr "República Moldava"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+msgid "Monaco"
+msgstr "Mónaco"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+msgid "Mongolia"
+msgstr "Mongolia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+msgid "Montserrat"
+msgstr "Montserrat"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+msgid "Morocco"
+msgstr "Marruecos"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+msgid "Mozambique"
+msgstr "Mozambique"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+msgid "Namibia"
+msgstr "Namibia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+msgid "Nauru"
+msgstr "Nauru"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+msgid "Nepal"
+msgstr "Nepal"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+msgid "Netherlands"
+msgstr "Holanda"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+msgid "Netherlands Antilles"
+msgstr "Antilles holandeses"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+msgid "New Caledonia"
+msgstr "Nueva Caledonia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+msgid "New Zealand"
+msgstr "Nueva Zelanda"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+msgid "Niger"
+msgstr "Níxer"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+msgid "Nigeria"
+msgstr "Nixeria"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+msgid "Niue"
+msgstr "Niue"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+msgid "Norfolk Island"
+msgstr "Islles Norfolk"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+msgid "Northern Mariana Islands"
+msgstr "Islles Marianes del Norte"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+msgid "Norway"
+msgstr "Noruega"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+msgid "Oman"
+msgstr "Omán"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+msgid "Pakistan"
+msgstr "Paquistán"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+msgid "Palau"
+msgstr "Palau"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+msgid "Palestinian Territory"
+msgstr "Territoriu Palestín"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+msgid "Panama"
+msgstr "Panamá"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+msgid "Papua New Guinea"
+msgstr "Papúa Nueva Guinea"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+msgid "Paraguay"
+msgstr "Paraguay"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+msgid "Peru"
+msgstr "Perú"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+msgid "Philippines"
+msgstr "Filipines"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+msgid "Pitcairn"
+msgstr "Pitcairn"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+msgid "Poland"
+msgstr "Polonia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+msgid "Portugal"
+msgstr "Pertual"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+msgid "Puerto Rico"
+msgstr "Puerto Rico"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+msgid "Qatar"
+msgstr "Qatar"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+msgid "Reunion"
+msgstr "Reunión"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+msgid "Romania"
+msgstr "Rumanía"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+msgid "Russian Federation"
+msgstr "Federación Rusa"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+msgid "Rwanda"
+msgstr "Ruanda"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+msgid "Saint Kitts And Nevis"
+msgstr "Sant Kitts y Nevis"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+msgid "Saint Lucia"
+msgstr "Santa Llucia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+msgid "Saint Vincent And The Grenadines"
+msgstr "San Vicente y les Granadines"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+msgid "Samoa"
+msgstr "Samoa"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+msgid "San Marino"
+msgstr "San Marino"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+msgid "Sao Tome And Principe"
+msgstr "Santo Tomé y Príncipe"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+msgid "Saudi Arabia"
+msgstr "Arabia Saudí"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+msgid "Senegal"
+msgstr "Senegal"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+msgid "Serbia And Montenegro"
+msgstr "Serbia y Montenegru"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+msgid "Seychelles"
+msgstr "Seychelles"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+msgid "Sierra Leone"
+msgstr "Sierra Leona"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+msgid "Singapore"
+msgstr "Singapur"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+msgid "Slovakia"
+msgstr "Eslovaquia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+msgid "Slovenia"
+msgstr "Eslovenia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+msgid "Solomon Islands"
+msgstr "Islles Salomón"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+msgid "Somalia"
+msgstr "Somalia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+msgid "South Africa"
+msgstr "Sudáfrica"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+msgid "South Georgia And The South Sandwich Islands"
+msgstr "Xorxa del Sur y les Islles Sandwich Meridionales"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+msgid "Spain"
+msgstr "España"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+msgid "St. Helena"
+msgstr "St. Helena"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+msgid "St. Pierre And Miquelon"
+msgstr "St. Pierre y Miquelon"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+msgid "Sudan"
+msgstr "Sudán"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+msgid "Suriname"
+msgstr "Surinám"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+msgid "Svalbard And Jan Mayen Islands"
+msgstr "Svalbard y Jan Mayen, Islas"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+msgid "Swaziland"
+msgstr "Swazilandia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+msgid "Sweden"
+msgstr "Suecia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+msgid "Switzerland"
+msgstr "Suiza"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+msgid "Syria"
+msgstr "Siria"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+msgid "Taiwan"
+msgstr "Taiwán"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+msgid "Tajikistan"
+msgstr "Tayikistán"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+msgid "Tanzania, United Republic Of"
+msgstr "Tanzania"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+msgid "Thailand"
+msgstr "Tailandia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+msgid "Timor-Leste"
+msgstr "Timor-Leste"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+msgid "Togo"
+msgstr "Togo"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+msgid "Tonga"
+msgstr "Tonga"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+msgid "Trinidad And Tobago"
+msgstr "Trinidad y Tobago"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+msgid "Tunisia"
+msgstr "Túnez"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+msgid "Turkey"
+msgstr "Turquía"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+msgid "Turkmenistan"
+msgstr "Turkmenistán"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+msgid "Turks And Caicos Islands"
+msgstr "Islles Turks y Caicos"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+msgid "Uganda"
+msgstr "Uganda"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+msgid "Ukraine"
+msgstr "Ucrania"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+msgid "United Arab Emirates"
+msgstr "Emiratos Arabes Xuníos"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+msgid "United Kingdom"
+msgstr "Reinu Xuníu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+msgid "United States Minor Outlying Islands"
+msgstr "Islles menores exteriores d'Estaos Xuníos"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+msgid "Uruguay"
+msgstr "Uruguay"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+msgid "Uzbekistan"
+msgstr "Uzbequistán"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+msgid "Venezuela"
+msgstr "Venezuela"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+msgid "Viet Nam"
+msgstr "Vietnam"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+msgid "Virgin Islands, British"
+msgstr "Islles Vírxenes, Britániques"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+msgid "Virgin Islands, U.S."
+msgstr "Islles Vírxenes, USA"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+msgid "Wallis And Futuna Islands"
+msgstr "Islles Wallis y Futuna"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+msgid "Western Sahara"
+msgstr "Sáhara occidental"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+msgid "Yemen"
+msgstr "Yemen"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+msgid "Zambia"
+msgstr "Zambia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:467
+#: ../plugins/exchange-operations/exchange-delegates.c:954
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/save-attachments/save-attachments.c:351
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../widgets/menus/gal-view-new-dialog.c:63
+msgid "Name"
+msgstr "Nome"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+msgid "AOL Instant Messenger"
+msgstr "Mensaxería AOL"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:617
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+msgid "Yahoo Messenger"
+msgstr "Mensaxería Yahoo"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+msgid "Gadu-Gadu Messenger"
+msgstr "Mensaxería Gadu-Gadu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:616
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
+msgid "Service"
+msgstr "Serviciu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
+#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:694
+#: ../plugins/save-calendar/csv-format.c:376
+msgid "Location"
+msgstr "Llocalización"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+msgid "Username"
+msgstr "Nome d'usuariu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/widgets/eab-contact-display.c:58
+msgid "Home"
+msgstr "Domiciliu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
+#: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
+msgid "Other"
+msgstr "Otru"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:618
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:615
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
+msgid "Source Book"
+msgstr "Llibru orixe"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
+msgid "Target Book"
+msgstr "Llibru destín"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
+msgid "Is New Contact"
+msgstr "Ye un contautu nuevu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
+msgid "Writable Fields"
+msgstr "Campos editables"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:285
+msgid "Required Fields"
+msgstr "Campos requeríos"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:299
+msgid "Changed"
+msgstr "Modificaos"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2416
+#, c-format
+msgid "Contact Editor - %s"
+msgstr "Remanador de contautos: %s"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+msgid "Please select an image for this contact"
+msgstr "Seleicione una imaxe pa esti contautu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
+msgid "_No image"
+msgstr "_Ensin imaxe"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
+msgid ""
+"The contact data is invalid:\n"
+"\n"
+msgstr ""
+"Los datos del contautu nun son válidos:\n"
+"\n"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3090
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr "«%s» tien un formatu inválidu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr "%s«%s» tien un formatu inválidu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
+#, c-format
+msgid "%s'%s' is empty"
+msgstr "%s«%s» ta ermu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3138
+msgid "Invalid contact."
+msgstr "Contautu inválidu."
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+msgid "Contact Quick-Add"
+msgstr "Amestar contautu rápidu"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
+msgid "_Edit Full"
+msgstr "_Iguar too"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:402
+msgid "_Full name"
+msgstr "Nome _completu"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:413
+msgid "E_mail"
+msgstr "_Corréu-e"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:424
+msgid "_Select Address Book"
+msgstr "_Seleicione la llibreta de direiciones"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact list (%s)?"
+msgstr ""
+"¿Daveres quier desaniciar\n"
+"la llista de contautos (%s)?"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
+msgid ""
+"Are you sure you want\n"
+"to delete these contact lists?"
+msgstr ""
+"¿Daveres quier desaniciar\n"
+"estes llistes de contautos?"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact (%s)?"
+msgstr ""
+"¿Daveres quier desaniciar\n"
+"el contautu (%s)?"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"¿Daveres quier desaniciar\n"
+"estos contautos?"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "Direición _2:"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Ci_ty:"
+msgstr "Ci_udá:"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr "_País:"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Full Address"
+msgstr "Direición completa"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "_ZIP Code:"
+msgstr "Códigu _postal:"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+msgid "Dr."
+msgstr "Dr."
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+msgid "Esq."
+msgstr "Esq."
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Full Name"
+msgstr "Nome Completu"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+msgid "I"
+msgstr "I"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+msgid "II"
+msgstr "II"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr "III"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr "Fíu"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+msgid "Miss"
+msgstr "Srta."
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr "Sr."
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr "Sra."
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr "Sta."
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+msgid "Sr."
+msgstr "Sr."
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+msgid "_First:"
+msgstr "_Nome:"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+msgid "_Last:"
+msgstr "_Apellíos:"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+msgid "_Middle:"
+msgstr "_2º Nome:"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+msgid "_Suffix:"
+msgstr "_Sufixu:"
+
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+msgid "Add IM Account"
+msgstr "Amestar cuenta de MI"
+
+#: ../addressbook/gui/contact-editor/im.glade.h:2
+msgid "_Account name:"
+msgstr "_Nome de la cuenta:"
+
+#: ../addressbook/gui/contact-editor/im.glade.h:3
+msgid "_IM Service:"
+msgstr "Serviciu de _MI:"
+
+#: ../addressbook/gui/contact-editor/im.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:409
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
+msgid "_Location:"
+msgstr "_Llugar:"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "<b>Members</b>"
+msgstr "<b>Miembros</b>"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
+msgid "Contact List Editor"
+msgstr "Remanador de llistes de contautos"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Select..."
+msgstr "Seleicionar…"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "_Hide addresses when sending mail to this list"
+msgstr "_Soverar direiciones al unviar corréu-e a esta llista"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_List name:"
+msgstr "_Nome de la llista:"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+msgid "_Type an email address or drag a contact into the list below:"
+msgstr ""
+"_Teclee una direición de corréu o arrastre un contautu a la llista inferior:"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
+msgid "Contact List Members"
+msgstr "Miembros de la llista de contautos"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
+msgid "_Members"
+msgstr "_Miembros"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:311
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
+msgid "Book"
+msgstr "Llibru"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
+msgid "Is New List"
+msgstr "Ye una llista nueva"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Contautu modificáu:"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Contautu en conflictu:"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+msgid "Duplicate Contact Detected"
+msgstr "Deteutóse un contautu duplicáu"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The name or email of this contact already exists in this folder.  Would you "
+"like to add it anyway?"
+msgstr ""
+"El nome o la direición de corréu-e d'esti contautu yá esiste nesta carpeta. "
+"¿Quier amestalu de toes formes?"
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+msgid "New Contact:"
+msgstr "Contautu nuevu:"
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+msgid "Original Contact:"
+msgstr "Contautu orixinal:"
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
+msgstr ""
+"El nome o la direición de corréu-e d'esti contautu yá\n"
+"esiste nesta carpeta. ¿Quier amestalu de toes formes?"
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
+msgid "_Merge"
+msgstr "_Mecer"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
+msgid "Merge Contact"
+msgstr "Combinar contautu"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:267
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
+msgid "Email"
+msgstr "Corréu ellectrónicu"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
+msgid "Any field contains"
+msgstr "Cualesquier campo contién"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+msgid "Email begins with"
+msgstr "El corréu-e entama por"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+msgid "Name contains"
+msgstr "El nome contién"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+msgid "No contacts"
+msgstr "Ensin contautos"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d contautu"
+msgstr[1] "%d contautos"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:318
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
+msgid "Query"
+msgstr "Consulta"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
+msgid "Error getting book view"
+msgstr "Fallu al obtener la vista de llibru"
+
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
+#: ../widgets/table/e-table-click-to-add.c:509
+#: ../widgets/table/e-table-selection-model.c:302
+#: ../widgets/table/e-table.c:3354
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3553
+msgid "Model"
+msgstr "Modelu"
+
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
+msgid "Error modifying card"
+msgstr "Fallu al modificar la tarxeta"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+msgid "Name begins with"
+msgstr "El nome entama por"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
+msgid "Source"
+msgstr "Orixe"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-meeting-list-view.c:508
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:5
+msgid "Type"
+msgstr "Tipu"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+msgid "Save as vCard..."
+msgstr "Guardar como vCard…"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:2041
+#: ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-view.c:1670 ../calendar/gui/e-memo-table.c:923
+#: ../ui/evolution-addressbook.xml.h:56
+msgid "_Open"
+msgstr "_Abrir"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+msgid "_New Contact..."
+msgstr "Contautu _nuevu…"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+msgid "New Contact _List..."
+msgstr "_Llista de contautos nueva…"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+msgid "_Save as vCard..."
+msgstr "G_uardar como vCard…"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+msgid "_Forward Contact"
+msgstr "_Reunviar contautu"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+msgid "_Forward Contacts"
+msgstr "_Reunviar contautos"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+msgid "Send _Message to Contact"
+msgstr "Unviar un _mensax al contautu"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+msgid "Send _Message to List"
+msgstr "Unviar un _mensax a la llista"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+msgid "Send _Message to Contacts"
+msgstr "Unviar un _mensax a los contautos"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+msgid "_Print"
+msgstr "_Imprentar"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+msgid "Cop_y to Address Book..."
+msgstr "_Copiar a la llibreta de direiciones…"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+msgid "Mo_ve to Address Book..."
+msgstr "Mo_ver a la llibreta de direiciones…"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+msgid "Cu_t"
+msgstr "Cor_tar"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:484
+#: ../calendar/gui/e-calendar-table.c:1584
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
+#: ../composer/e-msg-composer.c:2052 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2106
+#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+msgid "P_aste"
+msgstr "_Pegar"
+
+#. All, unmatched, separator
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
+msgid "Any Category"
+msgstr "Cualesquier categoría"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:634
+msgid "Assistant"
+msgstr "Asistente"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "Teléfonu del secretariu"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "Fax del trabayu"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "Teléfonu del trabayu"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "Teléfonu del trabayu 2"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "Teléfonu de devolución de llamaes"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "Teléfonu del coche"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
+#: ../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 "Categoríes"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+msgid "Company"
+msgstr "Compañía"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+msgid "Company Phone"
+msgstr "Teléfonu d'empresa"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 2"
+msgstr "Corréu-e 2"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Email 3"
+msgstr "Corréu-e 3"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "Family Name"
+msgstr "Apellíos"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+msgid "File As"
+msgstr "Archivar como"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Given Name"
+msgstr "Nome dau"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Fax"
+msgstr "Fax de casa"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone"
+msgstr "Teléfonu de casa"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Home Phone 2"
+msgstr "Teléfonu de casa 2"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "ISDN Phone"
+msgstr "Teléfonu RDSI"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Journal"
+msgstr "Diariu"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+msgid "Manager"
+msgstr "Xefe"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
+msgid "Mobile Phone"
+msgstr "Teléfonu móvil"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Nickname"
+msgstr "Nomatu"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:667
+msgid "Note"
+msgstr "Nota"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Oficina"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "Otru fax"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "Otru teléfonu"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Buscapersones"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "Teléfonu principal"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Radio"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: ../calendar/gui/e-meeting-list-view.c:520
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
+msgid "Role"
+msgstr "Rol"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
+msgid "Spouse"
+msgstr "Cónxugue"
+
+#. 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 "TTY/TDD"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+msgid "Telex"
+msgstr "Télex"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+msgid "Title"
+msgstr "Títulu"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Unit"
+msgstr "Unidá"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Web Site"
+msgstr "Sitiu web"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:116
+#: ../addressbook/gui/widgets/e-minicard.c:155
+#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
+#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
+#: ../widgets/table/e-table-click-to-add.c:523
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-field-chooser-item.c:654
+#: ../widgets/table/e-table-group-container.c:992
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
+msgid "Width"
+msgstr "Anchu"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:123
+#: ../addressbook/gui/widgets/e-minicard.c:162
+#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
+#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
+#: ../widgets/table/e-table-click-to-add.c:530
+#: ../widgets/table/e-table-field-chooser-item.c:661
+#: ../widgets/table/e-table-group-container.c:985
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
+#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
+msgid "Height"
+msgstr "Altu"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:130
+#: ../addressbook/gui/widgets/e-minicard.c:170
+msgid "Has Focus"
+msgstr "Tien el focu"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:137
+msgid "Field"
+msgstr "Campu"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:144
+msgid "Field Name"
+msgstr "Nome de Campu"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:151
+msgid "Text Model"
+msgstr "Modelu del testu"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:158
+msgid "Max field name length"
+msgstr "Llonxitú máx. del campu"
+
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
+msgid "Column Width"
+msgstr "Anchu de columna"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:178
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Guetando contautos..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
+msgid ""
+"\n"
+"\n"
+"Search for the Contact\n"
+"\n"
+"or double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Guetar el contautu.\n"
+"\n"
+"o calque equí dos vegaes pa criar un contautu nuevu."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Nun hai elementos p'amosar nesta vista.\n"
+"\n"
+"Calque equí dos vegaes pa criar un contautu nuevu."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
+msgid ""
+"\n"
+"\n"
+"Search for the Contact."
+msgstr ""
+"\n"
+"\n"
+"Guetar contautu."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Nun hai elementos p'amosar nesta vista."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
+msgid "Adapter"
+msgstr "Adaptador"
+
+#: ../addressbook/gui/widgets/e-minicard.c:100
+msgid "Work Email"
+msgstr "Corréu-e de trabayu"
+
+#: ../addressbook/gui/widgets/e-minicard.c:101
+msgid "Home Email"
+msgstr "Corréu-e de casa"
+
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:831
+msgid "Other Email"
+msgstr "Otru corréu-e"
+
+#: ../addressbook/gui/widgets/e-minicard.c:178
+msgid "Selected"
+msgstr "Esbilláu"
+
+#: ../addressbook/gui/widgets/e-minicard.c:185
+msgid "Has Cursor"
+msgstr "Tien el cursor"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
+msgid "_Open Link in Browser"
+msgstr "_Abrir enllaz nel ñavegador"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:173
+#: ../mail/em-folder-view.c:2792
+msgid "_Copy Link Location"
+msgstr "_Copiar direición del enllaz"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
+msgid "_Send New Message To..."
+msgstr "_Unviar un mensax nuevu a…"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Copiar direición de _corréu-e"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+#: ../addressbook/gui/widgets/eab-contact-display.c:372
+msgid "(map)"
+msgstr "(mapa)"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:306
+#: ../addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/eab-contact-display.c:402
+msgid "map"
+msgstr "mapa"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:487
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
+msgid "List Members"
+msgstr "Llistar miembros"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+msgid "Department"
+msgstr "Departamentu"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
+msgid "Profession"
+msgstr "Profesión"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
+msgid "Position"
+msgstr "Posición"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
+msgid "Video Chat"
+msgstr "Vídeu chat"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:636
+#: ../calendar/gui/calendar-commands.c:93
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/gnome-cal.c:2451
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:576
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
+#: ../plugins/hula-account-setup/camel-hula-listener.c:377
+#: ../plugins/hula-account-setup/camel-hula-listener.c:406
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "Calendariu"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:637
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/event-editor.c:115
+msgid "Free/Busy"
+msgstr "Disponibilidá"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
+msgid "Phone"
+msgstr "Teléfonu"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:639
+msgid "Fax"
+msgstr "Fax"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+msgid "Home Page"
+msgstr "Páxina personal"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
+msgid "Web Log"
+msgstr "Diariu web"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2342
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
+msgid "Birthday"
+msgstr "Cumpleaños"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
+msgid "Anniversary"
+msgstr "Aniversariu"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
+msgid "Job Title"
+msgstr "Títulu del Trabayu"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
+msgid "Home page"
+msgstr "Páxina inicial"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
+msgid "Blog"
+msgstr "Blog"
+
+#. E_BOOK_ERROR_OK
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Success"
+msgstr "Ésitu"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Backend busy"
+msgstr "Backend ocupáu"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Repository offline"
+msgstr "Repositoriu desconeutáu"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
+msgid "Address Book does not exist"
+msgstr "La llibreta de direiciones nun esiste"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
+msgid "No Self Contact defined"
+msgstr "Nun hai definíu un contautu pa sí mesmu"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+msgid "Permission denied"
+msgstr "Permisu denegáu"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
+msgid "Contact not found"
+msgstr "Contautu non alcontráu"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Contact ID already exists"
+msgstr "Yá esiste el ID del contautu"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Protocol not supported"
+msgstr "Protocolu non implementáu"
+
+#. E_BOOK_ERROR_CANCELLED
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../calendar/gui/e-cal-model-tasks.c:364
+#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-calendar-table.c:239
+#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/print.c:2557
+msgid "Canceled"
+msgstr "Encaboxáu"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
+msgid "Could not cancel"
+msgstr "Nun se pue encaboxar"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:427
+msgid "Authentication Failed"
+msgstr "Falló n'autenticación"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
+msgid "Authentication Required"
+msgstr "Fai falta identificase"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
+msgid "TLS not Available"
+msgstr "TLS non disponible"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
+msgid "No such source"
+msgstr "Nun esiste esi orixe"
+
+#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Not available in offline mode"
+msgstr "Nun ta disponible en mou desconeutáu"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
+msgid "Other error"
+msgstr "Otru fallu"
+
+#. E_BOOK_ERROR_INVALID_SERVER_VERSION
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Invalid server version"
+msgstr "Versión del servidor inválida"
+
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
+msgid "Unsupported authentication method"
+msgstr "Métodu d'autenticación non soportáu"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this address book. 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 ""
+"Nun pudo abrise esta llibreta de señes. Esto pue significar qu'esta llibreta "
+"nun foi conseñada o descargada entá pa ser usada en mou desconeutáu. Por "
+"favor, cargue una vegada la llibreta de direiciones en mou coneutáu pa "
+"descargar el so conteníu."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#, c-format
+msgid ""
+"We were unable to open this address book.  Please check that the path %s "
+"exists and that you have permission to access it."
+msgstr ""
+"Nun pudo abrise esta llibreta de señes. Por favor, compruebe qu'el camín %s "
+"esiste y que dispón de los permisos p'acceder a ella."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
+msgid ""
+"We were unable to open this address book.  This either means you have "
+"entered an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Nun pudo abrise esta llibreta de señes. Esto pue significar qu'introduxo un "
+"URI incorreutu o qu'el sirvidor LDAP nun ta accesible."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"A esta versión d'Evolution nun se-y compiló'l soporte LDAP. Si quier usar "
+"LDAP n'Evolution tien d'instalar un paquete d'Evolution con LDAP activáu."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:141
+msgid ""
+"We were unable to open this address book.  This either means you have "
+"entered an incorrect URI, or the server is unreachable."
+msgstr ""
+"Nun pudo abrise esta llibreta de direiciones. Esto puede significar "
+"qu'introduxo un URI incorreutu o que'l sirvidor nun ta accesible."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
+msgid "Detailed error:"
+msgstr "Detalle del fallu:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
+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 ""
+"Hai más tarxetes qu'encaxen con esta consulta de les qu'el sirvidor \n"
+"ta configuráu pa devolver o de les qu'Evolution ta configuráu\n"
+"p'amosar. Por favor, faiga una busca más específica o aumente\n"
+"el llímite de resultaos nes preferencies del sirvidor de direutoriu pa\n"
+"esta llibreta de señes."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have 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 ""
+"El tiempu pa executar esta consulta superó el llímite del sirvidor o el\n"
+"que configuró pa esta llibreta de señes. Por favor, faiga una busca \n"
+"más específica o aumente el llímite de resultaos nes preferencies del \n"
+"sirvidor de direutoriu pa esta llibreta de direiciones."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
+msgid "The backend for this address book was unable to parse this query."
+msgstr ""
+"El backend d'esta llibreta de señes nun pudo interpretar esta consulta."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
+msgid "The backend for this address book refused to perform this query."
+msgstr ""
+"El backend d'esta llibreta de señes nun pudo interpretar esta consulta."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:190
+msgid "This query did not complete successfully."
+msgstr "Esta consulta nun se completó con ésitu."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
+msgid "Error adding list"
+msgstr "Fallu al amestar la llista"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:688
+msgid "Error adding contact"
+msgstr "Fallu al amestar el contautu"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
+msgid "Error modifying list"
+msgstr "Fallu al modificar la llista"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
+msgid "Error modifying contact"
+msgstr "Fallu al modificar el contautu"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
+msgid "Error removing list"
+msgstr "Fallu al esaniciar la llista"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:638
+msgid "Error removing contact"
+msgstr "Fallu al esaniciar el contautu"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:317
+#, c-format
+msgid ""
+"Opening %d contact will open %d new window as well.\n"
+"Do you really want to display this contact?"
+msgid_plural ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr[0] ""
+"Abrir %d contautu abrirá %d ventana nueva tamién.\n"
+"¿Quier daveres amosar esti contautu?"
+msgstr[1] ""
+"Abrir %d contautos abrirá %d ventanes nueves tamién.\n"
+"¿Quier daveres amosar tooes estos contautos?"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
+msgid "_Don't Display"
+msgstr "_Non amosar"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:326
+msgid "Display _All Contacts"
+msgstr "Amosar t_olos contautos"
+
+#. For Translators only: "it" refers to the filename %s.
+#: ../addressbook/gui/widgets/eab-gui-util.c:352
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s yá esiste\n"
+"¿Quier sobroscribilu?"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:356
+msgid "Overwrite"
+msgstr "Soescribir"
+
+#. more than one, finding the total number of contacts might
+#. * hit performance while saving large number of contacts
+#.
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
+#: ../addressbook/gui/widgets/eab-gui-util.c:400
+msgid "contact"
+msgid_plural "contacts"
+msgstr[0] "contautu"
+msgstr[1] "contautos"
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
+msgid "card.vcf"
+msgstr "tarxeta.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:483
+msgid "Select Address Book"
+msgstr "Seleicione la llibreta de direiciones"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:597
+msgid "list"
+msgstr "llista"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:749
+msgid "Move contact to"
+msgstr "Mover contautu a"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
+msgid "Copy contact to"
+msgstr "Copiar contautu a"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:754
+msgid "Move contacts to"
+msgstr "Mover contautos a"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
+msgid "Copy contacts to"
+msgstr "Copiar contautos a"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
+msgid "Multiple vCards"
+msgstr "vCards múltiples"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
+#, c-format
+msgid "vCard for %s"
+msgstr "vCard pa %s"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:921
+#: ../addressbook/gui/widgets/eab-gui-util.c:947
+#, c-format
+msgid "Contact information"
+msgstr "Información de contautu"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:949
+#, c-format
+msgid "Contact information for %s"
+msgstr "Información de contautu de %s"
+
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
+msgid "Querying Address Book..."
+msgstr "Consultando la llibreta de direiciones…"
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
+#, c-format
+msgid "There is one other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "Hai otru contautu más."
+msgstr[1] "Hay otros %d contautos."
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
+msgid "Show Full vCard"
+msgstr "Amosar vCard ensembre"
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
+msgid "Show Compact vCard"
+msgstr "Amosar vCard compauta"
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
+msgid "Save in address book"
+msgstr "Guardar na llibreta de señes"
+
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
+msgid "Card View"
+msgstr "Vista de la tarxeta"
+
+#: ../addressbook/importers/evolution-csv-importer.c:661
+#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../calendar/importers/icalendar-importer.c:308
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
+msgid "Importing..."
+msgstr "Importando…"
+
+#: ../addressbook/importers/evolution-csv-importer.c:863
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr "VSC o Tab de Outlook (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:864
+msgid "Outlook CSV and Tab Importer"
+msgstr "Importador de VSC y Tab"
+
+#: ../addressbook/importers/evolution-csv-importer.c:872
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr "VSC o Tab de Mozilla (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:873
+msgid "Mozilla CSV and Tab Importer"
+msgstr "Importador de VSC y Tab de Mozilla"
+
+#: ../addressbook/importers/evolution-csv-importer.c:881
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr "VSC o Tab d'Evolution (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:882
+msgid "Evolution CSV and Tab Importer"
+msgstr "Importador de VSC y Tab d'Evolution"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:680
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "Formatu d'intercambéu de datos LDAP (.ldif)"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:681
+msgid "Evolution LDIF importer"
+msgstr "Importador de LDIF d'Evolution"
+
+#: ../addressbook/importers/evolution-vcard-importer.c:549
+msgid "vCard (.vcf, .gcrd)"
+msgstr "vCard (.vcf, .gcrd)"
+
+#: ../addressbook/importers/evolution-vcard-importer.c:550
+msgid "Evolution vCard Importer"
+msgstr "Importador de vCard d'Evolution"
+
+#: ../addressbook/printing/e-contact-print.glade.h:1
+msgid "10 pt. Tahoma"
+msgstr "Tahoma de 10 pt."
+
+#: ../addressbook/printing/e-contact-print.glade.h:2
+msgid "8 pt. Tahoma"
+msgstr "Tahoma de 8 pt."
+
+#: ../addressbook/printing/e-contact-print.glade.h:3
+msgid "Blank forms at end:"
+msgstr "Formularios ermos al final:"
+
+#: ../addressbook/printing/e-contact-print.glade.h:4
+msgid "Body"
+msgstr "Cuerpu"
+
+#: ../addressbook/printing/e-contact-print.glade.h:5
+msgid "Bottom:"
+msgstr "Abaxo:"
+
+#: ../addressbook/printing/e-contact-print.glade.h:6
+msgid "Dimensions:"
+msgstr "Dimensiones:"
+
+#: ../addressbook/printing/e-contact-print.glade.h:7
+msgid "F_ont..."
+msgstr "_Fonte…"
+
+#: ../addressbook/printing/e-contact-print.glade.h:8
+msgid "Fonts"
+msgstr "Fontes"
+
+#: ../addressbook/printing/e-contact-print.glade.h:9
+msgid "Footer:"
+msgstr "Pie:"
+
+#: ../addressbook/printing/e-contact-print.glade.h:10
+msgid "Format"
+msgstr "Formatu"
+
+#: ../addressbook/printing/e-contact-print.glade.h:11
+#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
+#: ../widgets/table/e-table-field-chooser-dialog.c:81
+#: ../widgets/table/e-table-field-chooser-item.c:647
+#: ../widgets/table/e-table-field-chooser.c:80
+#: ../widgets/table/e-table-header-item.c:1907
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "Encabezáu"
+
+#: ../addressbook/printing/e-contact-print.glade.h:12
+msgid "Header/Footer"
+msgstr "Encabezáu/Pie"
+
+#: ../addressbook/printing/e-contact-print.glade.h:13
+msgid "Headings"
+msgstr "Cabeceres"
+
+#: ../addressbook/printing/e-contact-print.glade.h:14
+msgid "Headings for each letter"
+msgstr "Cabeceres pa cada carta"
+
+#: ../addressbook/printing/e-contact-print.glade.h:15
+msgid "Height:"
+msgstr "Altu:"
+
+#: ../addressbook/printing/e-contact-print.glade.h:16
+msgid "Immediately follow each other"
+msgstr "Ún inmediatamente darrera del otru"
+
+#: ../addressbook/printing/e-contact-print.glade.h:17
+msgid "Include:"
+msgstr "Inclúi:"
+
+#: ../addressbook/printing/e-contact-print.glade.h:18
+msgid "Landscape"
+msgstr "Apaisáu"
+
+#: ../addressbook/printing/e-contact-print.glade.h:19
+msgid "Left:"
+msgstr "Esquierda:"
+
+#: ../addressbook/printing/e-contact-print.glade.h:20
+msgid "Letter tabs on side"
+msgstr "Les solapas de les lletres al llau"
+
+#: ../addressbook/printing/e-contact-print.glade.h:21
+msgid "Margins"
+msgstr "Márxenes"
+
+#: ../addressbook/printing/e-contact-print.glade.h:22
+msgid "Number of columns:"
+msgstr "Númberu de columnes:"
+
+#: ../addressbook/printing/e-contact-print.glade.h:23
+msgid "Options"
+msgstr "Opciones"
+
+#: ../addressbook/printing/e-contact-print.glade.h:24
+msgid "Orientation"
+msgstr "Aldu"
+
+#: ../addressbook/printing/e-contact-print.glade.h:25
+msgid "Page"
+msgstr "Páxina"
+
+#: ../addressbook/printing/e-contact-print.glade.h:26
+msgid "Page Setup:"
+msgstr "Configuración de páxina"
+
+#: ../addressbook/printing/e-contact-print.glade.h:27
+msgid "Paper"
+msgstr "Papel"
+
+#: ../addressbook/printing/e-contact-print.glade.h:28
+msgid "Paper source:"
+msgstr "Fonte del papel:"
+
+#: ../addressbook/printing/e-contact-print.glade.h:29
+msgid "Portrait"
+msgstr "Retratu"
+
+#: ../addressbook/printing/e-contact-print.glade.h:30
+msgid "Preview:"
+msgstr "Entever:"
+
+#: ../addressbook/printing/e-contact-print.glade.h:31
+msgid "Print using gray shading"
+msgstr "Imprentar usando escala de buxos"
+
+#: ../addressbook/printing/e-contact-print.glade.h:32
+msgid "Reverse on even pages"
+msgstr "Reversu en páxines impares"
+
+#: ../addressbook/printing/e-contact-print.glade.h:33
+msgid "Right:"
+msgstr "Drecha:"
+
+#: ../addressbook/printing/e-contact-print.glade.h:34
+msgid "Sections:"
+msgstr "Seiciones:"
+
+#: ../addressbook/printing/e-contact-print.glade.h:35
+msgid "Shading"
+msgstr "Solombreáu"
+
+#. FIXME: Take care of i18n
+#: ../addressbook/printing/e-contact-print.glade.h:36
+#: ../plugins/exchange-operations/exchange-account-setup.c:1080
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
+msgid "Size:"
+msgstr "Tamañu:"
+
+#: ../addressbook/printing/e-contact-print.glade.h:37
+msgid "Start on a new page"
+msgstr "Entamar nuna nueva páxina"
+
+#: ../addressbook/printing/e-contact-print.glade.h:38
+msgid "Style name:"
+msgstr "Nome del estilu:"
+
+#: ../addressbook/printing/e-contact-print.glade.h:39
+msgid "Top:"
+msgstr "Arriba:"
+
+#: ../addressbook/printing/e-contact-print.glade.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:154
+msgid "Type:"
+msgstr "Tipu:"
+
+#: ../addressbook/printing/e-contact-print.glade.h:41
+msgid "Width:"
+msgstr "Anchu:"
+
+#: ../addressbook/printing/e-contact-print.glade.h:42
+msgid "_Font..."
+msgstr "_Fonte..."
+
+#: ../addressbook/printing/test-contact-print-style-editor.c:54
+msgid "Contact Print Style Editor Test"
+msgstr "Test del editor d'imprentación d'estilos de contautos"
+
+#: ../addressbook/printing/test-contact-print-style-editor.c:55
+#: ../addressbook/printing/test-print.c:45
+msgid "Copyright (C) 2000, Ximian, Inc."
+msgstr "Copyright © 2000, Ximian, Inc."
+
+#: ../addressbook/printing/test-contact-print-style-editor.c:57
+msgid "This should test the contact print style editor widget"
+msgstr "Esto tendría de prebar el widget d'estilu d'imprentación de contautos"
+
+#: ../addressbook/printing/test-print.c:44
+msgid "Contact Print Test"
+msgstr "Preba d'imprentación de contautos"
+
+#: ../addressbook/printing/test-print.c:47
+msgid "This should test the contact print code"
+msgstr "Esto tendría de prebar el códigu d'imprentación de contautos"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+msgid "Can not open file"
+msgstr "Nun ye dable abrir l'archivu"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+msgid "Couldn't get list of address books"
+msgstr "Nun pudo obtenese la llista de llibretes de señes"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+msgid "failed to open book"
+msgstr "fallu al abrir llibreta de direiciones"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:48
+msgid "Specify the output file instead of standard output"
+msgstr "Especifique'l ficheru de salida n'arróu de la salida estándar"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:49
+msgid "OUTPUTFILE"
+msgstr "FICHERU-DE-SALIDA"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:52
+msgid "List local address book folders"
+msgstr "Llista de carpetes llocales de la llibreta de señes"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:55
+msgid "Show cards as vcard or csv file"
+msgstr "Amosar tarxetes como un ficheru vcard o csv"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:56
+msgid "[vcard|csv]"
+msgstr "[vcard|csv]"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:59
+msgid "Export in asynchronous mode"
+msgstr "Exportar en mou asíncronu"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:62
+msgid ""
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
+msgstr ""
+"El númberu de tarxetes nun ficheru de salida en mou asíncronu, tamañu "
+"predetermináu 100."
+
+#: ../addressbook/tools/evolution-addressbook-export.c:64
+msgid "NUMBER"
+msgstr "NÚMBERU"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:101
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+"Fallu nos argumentos de la llinia de comandos, use la opción --help p'adicar "
+"l'usu."
+
+#: ../addressbook/tools/evolution-addressbook-export.c:115
+msgid "Only support csv or vcard format."
+msgstr "Namái tan sofitaos los formatos csv o vcard."
+
+#: ../addressbook/tools/evolution-addressbook-export.c:124
+msgid "In async mode, output must be file."
+msgstr "En mou asíncronu, la salida tien de ser un ficheru."
+
+#: ../addressbook/tools/evolution-addressbook-export.c:132
+msgid "In normal mode, there is no need for the size option."
+msgstr "En mou normal, nun fai falta la opción de tamañu."
+
+#: ../addressbook/tools/evolution-addressbook-export.c:163
+msgid "Unhandled error"
+msgstr "Fallu non tratáu"
+
+#. 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}» ye un calendariu de namái llectura y nun pue camudase. Seleicione un "
+"calendariu diferente de la barra llateral na vista del calendariu."
+
+#. 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}» ye un calendariu de namái llectura y nun pue camudase. Seleicione un "
+"calendariu diferente que pueda aceutar cites."
+
+#: ../calendar/calendar.error.xml.h:5
+msgid ""
+"Adding a meaningful summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
+msgstr ""
+"Amestar un resume con sen a la so cita dará a los sos destinatarios una "
+"idega de qué trata la so cita."
+
+#: ../calendar/calendar.error.xml.h:6
+msgid ""
+"Adding a meaningful summary to your task will give your recipients an idea "
+"of what your task is about."
+msgstr ""
+"Amestar un resume con sen a la so xera dará a los sos destinatarios una "
+"idega de qué trata la so xera."
+
+#: ../calendar/calendar.error.xml.h:7
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr "Tola información d'estes notes desaniciaráse y nun podrá recuperase."
+
+#: ../calendar/calendar.error.xml.h:8
+msgid "All information in this memo will be deleted and can not be restored."
+msgstr "Tola información nesta nota esaniciaráse y nun se podrá recuperar."
+
+#: ../calendar/calendar.error.xml.h:9
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr "Tola información d'estes cites desaniciaráse y nun podrá recuperase."
+
+#: ../calendar/calendar.error.xml.h:10
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr "Tola información d'estes xeres desaniciaráse y nun podrá recuperase."
+
+#: ../calendar/calendar.error.xml.h:11
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr "Tola información d'esta cita desaniciaráse y nun podrá recuperase."
+
+#: ../calendar/calendar.error.xml.h:12
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+"Tola información tocante a esta reunión desaniciaráse y nun podrá recuperase."
+
+#: ../calendar/calendar.error.xml.h:13
+msgid "All information on this memo will be deleted and can not be restored."
+msgstr ""
+"Tola información tocante a esta nota desaniciaráse y nun podrá recuperase."
+
+#: ../calendar/calendar.error.xml.h:14
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+"Tola información tocante a esta xera desaniciaráse y nun podrá recuperase."
+
+#: ../calendar/calendar.error.xml.h:15
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "¿De xuru quier esaniciar la xera «{0}»?"
+
+#: ../calendar/calendar.error.xml.h:16
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "¿De xuru quier esaniciar la cita titulada «{0}»?"
+
+#: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr "¿De xuru quier esaniciar la nota «{0}»?"
+
+#: ../calendar/calendar.error.xml.h:18
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "¿De xuru quier esaniciar estes {0} cites?"
+
+#: ../calendar/calendar.error.xml.h:19
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "¿De xuru quier esaniciar estes {0} notes?"
+
+#: ../calendar/calendar.error.xml.h:20
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "¿De xuru quier esaniciar estes {0} xeres?"
+
+#: ../calendar/calendar.error.xml.h:21
+msgid "Are you sure you want to delete this appointment?"
+msgstr "¿De xuru quier esaniciar esta cita?"
+
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:182
+#, c-format
+msgid "Are you sure you want to delete this meeting?"
+msgstr "¿De xuru quier esaniciar esta reunión?"
+
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:188
+#, c-format
+msgid "Are you sure you want to delete this memo?"
+msgstr "¿De xuru quier esaniciar esta nota?"
+
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:185
+#, c-format
+msgid "Are you sure you want to delete this task?"
+msgstr "¿De xuru quier esaniciar esta xera?"
+
+#: ../calendar/calendar.error.xml.h:25
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "¿De xuru quier guardar la nota ensin un resume?"
+
+#: ../calendar/calendar.error.xml.h:26
+msgid "Are you sure you want to send the appointment without a summary?"
+msgstr "¿De xuru quier unviar la cita ensin un resume?"
+
+#: ../calendar/calendar.error.xml.h:27
+msgid "Are you sure you want to send the task without a summary?"
+msgstr "¿De xuru quier unviar la xera ensin un resume?"
+
+#: ../calendar/calendar.error.xml.h:28
+msgid "Cannot create a new event"
+msgstr "Nun ye dable criar un eventu nuevu"
+
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "Nun pue guardase l'asocedimientu"
+
+#: ../calendar/calendar.error.xml.h:30
+msgid "Delete calendar '{0}'?"
+msgstr "¿Deseya esaniciar el calendariu «{0}»?"
+
+#: ../calendar/calendar.error.xml.h:31
+msgid "Delete memo list '{0}'?"
+msgstr "¿Deseya borrar la llista de notes «{0}»?"
+
+#: ../calendar/calendar.error.xml.h:32
+msgid "Delete task list '{0}'?"
+msgstr "¿Deseya esaniciar la llista de xeres «{0}»?"
+
+#: ../calendar/calendar.error.xml.h:33
+msgid "Do _not Send"
+msgstr "_Nun unviar"
+
+#: ../calendar/calendar.error.xml.h:34
+msgid "Download in progress. Do you want to save the appointment?"
+msgstr "Descarga en progresu. ¿Deseya guardar la cita?"
+
+#: ../calendar/calendar.error.xml.h:35
+msgid "Download in progress. Do you want to save the task?"
+msgstr "Descarga en progresu. ¿Deseya guardar la xera?"
+
+#: ../calendar/calendar.error.xml.h:36
+msgid "Editor could not be loaded."
+msgstr "Nun ye dable cargar l'editor."
+
+#: ../calendar/calendar.error.xml.h:37
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+"Unviaránse invitaciones per corréu-e a tolos participantes y permitiráse-yos "
+"aceutar esta xera."
+
+#: ../calendar/calendar.error.xml.h:38
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+"Unviaránse invitaciones per corréu-e a tolos participantes y permitiráse-yos "
+"responder."
+
+#: ../calendar/calendar.error.xml.h:39
+msgid "Error loading calendar"
+msgstr "Fallu al cargar el calendariu"
+
+#: ../calendar/calendar.error.xml.h:40
+msgid "Error loading memo list"
+msgstr "Fallu al cargar la llista de notes"
+
+#: ../calendar/calendar.error.xml.h:41
+msgid "Error loading task list"
+msgstr "Fallu al cargar la llista de xeres"
+
+#: ../calendar/calendar.error.xml.h:42
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+"Si nun unvia una notificación de cancelación, los otros participantes seique "
+"nun sepan que la reunión albortóse."
+
+#: ../calendar/calendar.error.xml.h:43
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
+msgstr ""
+"Si nun unvia una notificación de cancelación, los otros participantes seique "
+"nun sepan que la nota desanicióse."
+
+#: ../calendar/calendar.error.xml.h:44
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+"Si nun unvia una notificación de cancelación, los otros participantes seique "
+"nun sepan que la xera desanicióse."
+
+#: ../calendar/calendar.error.xml.h:45
+msgid "Save Appointment"
+msgstr "Guardar cita"
+
+#: ../calendar/calendar.error.xml.h:46
+msgid "Save Memo"
+msgstr "Guardar memoria"
+
+#: ../calendar/calendar.error.xml.h:47
+msgid "Save Task"
+msgstr "Guardar xera"
+
+#: ../calendar/calendar.error.xml.h:48
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+"Al unviar información actualizada permite qu'otros participantes caltengan "
+"los sos calendarios al día."
+
+#: ../calendar/calendar.error.xml.h:49
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+"L'unviu d'información actualizada permite qu'otros participantes caltengan "
+"la so llista de xeres al día."
+
+#: ../calendar/calendar.error.xml.h:51
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
+"Hai dalgunos axuntos descargándose. Guardar la cita podría resultar na perda "
+"d'esos axuntos."
+
+#: ../calendar/calendar.error.xml.h:52
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+"Hai dalgunos axuntos descargándose. Guardar la xera podría resultar na perda "
+"d'esos axuntos."
+
+#: ../calendar/calendar.error.xml.h:53
+msgid "Some features may not work properly with your current server."
+msgstr ""
+"Seique dalgunes carauterístiques nun furrulen correchamente col so sirvidor "
+"actual."
+
+#: ../calendar/calendar.error.xml.h:54
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "El calendariu d'Evolution finó de miente inesperada"
+
+#: ../calendar/calendar.error.xml.h:55
+msgid "The Evolution memo has quit unexpectedly."
+msgstr "Les notes d'Evolution finaron inesperadamente."
+
+#: ../calendar/calendar.error.xml.h:56
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr "Les xeres d'Evolution finaron inesperadamente."
+
+#: ../calendar/calendar.error.xml.h:57
+msgid "The calendar is not marked for offline usage."
+msgstr "El calendariu nun ta conseñáu pa usase ensin conexón"
+
+#: ../calendar/calendar.error.xml.h:58
+msgid "The memo list is not marked for offline usage."
+msgstr "La llista de notes nun ta conseñada pa usase ensin conexón."
+
+#: ../calendar/calendar.error.xml.h:59
+msgid "The task list is not marked for offline usage."
+msgstr "La llista de xeres nun ta conseñada pa usase ensin conexón"
+
+#: ../calendar/calendar.error.xml.h:60
+msgid "This calendar will be removed permanently."
+msgstr "Esti calendariu esaniciaráse permanentemente."
+
+#: ../calendar/calendar.error.xml.h:61
+msgid "This memo list will be removed permanently."
+msgstr "Esta llista de notes esaniciaráse permanentemente."
+
+#: ../calendar/calendar.error.xml.h:62
+msgid "This task list will be removed permanently."
+msgstr "Esta llista de xeres esaniciaráse permanentemente."
+
+#: ../calendar/calendar.error.xml.h:63
+msgid "Would you like to save your changes to this appointment?"
+msgstr "¿Deseya guardar los cambeos d'esta cita?"
+
+#: ../calendar/calendar.error.xml.h:64
+msgid "Would you like to save your changes to this memo?"
+msgstr "¿Deseya guardar los cambeos d'esta nota?"
+
+#: ../calendar/calendar.error.xml.h:65
+msgid "Would you like to save your changes to this task?"
+msgstr "¿Deseya guardar los cambeos d'esta xera?"
+
+#: ../calendar/calendar.error.xml.h:66
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr "¿Quier unviar una notificación de cancelación pa esta nota?"
+
+#: ../calendar/calendar.error.xml.h:67
+msgid "Would you like to send all the participants a cancelation notice?"
+msgstr "¿Quier unviar a tolos participantes una notificación de cancelación?"
+
+#: ../calendar/calendar.error.xml.h:68
+msgid "Would you like to send meeting invitations to participants?"
+msgstr "¿Quier unviar invitaciones a la reunión a los participantes?"
+
+#: ../calendar/calendar.error.xml.h:69
+msgid "Would you like to send this task to participants?"
+msgstr "¿Quier unviar esta xera a los participantes?"
+
+#: ../calendar/calendar.error.xml.h:70
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+"¿Quier unviar información de la reunión actualizada a los participantes?"
+
+#: ../calendar/calendar.error.xml.h:71
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+"¿Quier unviar información actualizada de les xeres a los participantes?"
+
+#: ../calendar/calendar.error.xml.h:72
+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 ""
+"Ta coneutando con un sirvidor GroupWise non sofitáu y podría alcontrar "
+"problemes usando Evolution. Pa los meyores resultaos el sirvidor tendría "
+"d'actualizarse a una versión sofitada."
+
+#: ../calendar/calendar.error.xml.h:73
+msgid "You have changed this appointment, but not yet saved it."
+msgstr "Camudó la cita, pero entá nun se guardó."
+
+#: ../calendar/calendar.error.xml.h:74
+msgid "You have changed this task, but not yet saved it."
+msgstr "Fexo cambeos a esta xera, pero entá nun se guardó."
+
+#: ../calendar/calendar.error.xml.h:75
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr "Fexo cambeos a esta nota, pero entá nun se guardaron"
+
+#: ../calendar/calendar.error.xml.h:76
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+"Los sos calendarios nun tarán disponibles hasta que reanicie Evolution."
+
+#: ../calendar/calendar.error.xml.h:77
+msgid "Your memos will not be available until Evolution is restarted."
+msgstr "Les sos notes nun tarán disponibles hasta que reanicie Evolution."
+
+#: ../calendar/calendar.error.xml.h:78
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr "Les sos xeres nun tarán disponibles hasta que reanicie Evolution."
+
+#: ../calendar/calendar.error.xml.h:79
+#: ../composer/mail-composer.error.xml.h:30
+msgid "_Discard Changes"
+msgstr "_Descartar cambeos"
+
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:499
+msgid "_Save"
+msgstr "_Guardar"
+
+#: ../calendar/calendar.error.xml.h:81
+msgid "_Save Changes"
+msgstr "_Guardar cambeos"
+
+#: ../calendar/calendar.error.xml.h:82
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
+msgid "_Send"
+msgstr "_Unviar"
+
+#: ../calendar/calendar.error.xml.h:83
+msgid "_Send Notice"
+msgstr "_Unviar notificación"
+
+#: ../calendar/calendar.error.xml.h:84
+msgid "{0}."
+msgstr "{0}."
+
+#: ../calendar/conduits/calendar/calendar-conduit.c:258
+msgid "Split Multi-Day Events:"
+msgstr "Dixebrar acontecimientos de díes múltiples:"
+
+#: ../calendar/conduits/calendar/calendar-conduit.c:1523
+#: ../calendar/conduits/calendar/calendar-conduit.c:1524
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/memo/memo-conduit.c:822
+#: ../calendar/conduits/todo/todo-conduit.c:1019
+#: ../calendar/conduits/todo/todo-conduit.c:1020
+msgid "Could not start evolution-data-server"
+msgstr "Nun se pudo aniciar el servidor evolution-data-server"
+
+#: ../calendar/conduits/calendar/calendar-conduit.c:1631
+#: ../calendar/conduits/calendar/calendar-conduit.c:1634
+msgid "Could not read pilot's Calendar application block"
+msgstr "Nun ye dable lleer información de l'aplicación de calendariu del Pilot"
+
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
+msgid "Could not read pilot's Memo application block"
+msgstr "Nun ye dable lleer los datos de l'aplicación Memo del Pilot"
+
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
+msgid "Could not write pilot's Memo application block"
+msgstr "Nun ye dable escribir los datos de l'aplicación Memo del Pilot"
+
+#: ../calendar/conduits/todo/todo-conduit.c:241
+msgid "Default Priority:"
+msgstr "Prioridá predeterminada:"
+
+#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1106
+msgid "Could not read pilot's ToDo application block"
+msgstr "Nun ye dable lleer los datos de l'aplicación ToDo del Pilot"
+
+#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1151
+msgid "Could not write pilot's ToDo application block"
+msgstr "Nun ye dable escribir el bloque d'aplicación ToDo del Pilot"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../plugins/itip-formatter/itip-formatter.c:2432
+msgid "Calendar and Tasks"
+msgstr "Calendariu y xeres"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: ../calendar/gui/calendar-component.c:832
+#: ../calendar/gui/calendar-component.c:1429
+msgid "Calendars"
+msgstr "Calendarios"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure la so estaya horaria, calendariu y llista de xeres equí "
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Calendariu y xeres d'Evolution"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Remanamientu de configuración del calendariu d'Evolution"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visor de mensaxes de planificación del calendariu d'Evolution"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar/Task editor"
+msgstr "Iguador de calendariu/xeres d'Evolution"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution's Calendar component"
+msgstr "Componente de Calendariu d'Evolution"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution's Memos component"
+msgstr "Componente de Notes d'Evolution"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Tasks component"
+msgstr "Componente de Xeres d'Evolution"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Memo_s"
+msgstr "_Notes"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/e-memo-table.c:279 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:575
+#: ../calendar/gui/memos-component.c:1128 ../calendar/gui/memos-control.c:354
+#: ../calendar/gui/memos-control.c:370
+msgid "Memos"
+msgstr "Notes"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#: ../calendar/gui/e-calendar-table.c:703 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1984
+#: ../calendar/gui/tasks-component.c:566
+#: ../calendar/gui/tasks-component.c:1117 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:588
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
+msgid "Tasks"
+msgstr "Xeres"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+msgid "_Calendars"
+msgstr "_Calendarios"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
+#: ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Xeres"
+
+#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Serviciu de notificación por allerta del Calendariu d'Evolution"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minutu"
+msgstr[1] "minutos"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:119
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/calendar-http/calendar-http.c:280
+#: ../plugins/calendar-weather/calendar-weather.c:562
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
+msgid "hours"
+msgid_plural "hours"
+msgstr[0] "hora"
+msgstr[1] "hores"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+msgid "Start time"
+msgstr "Hora d'entamu"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
+msgid "Appointments"
+msgstr "Cites"
+
+#. Location
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1603
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1609
+#: ../calendar/gui/e-itip-control.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1004
+msgid "Location:"
+msgstr "Llugar:"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze _time:"
+msgstr "_Posponer durante:"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1336
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:169
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
+msgid "_Edit"
+msgstr "_Iguar"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+msgid "_Snooze"
+msgstr "_Posponer"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+msgid "location of appointment"
+msgstr "llugar de la cita"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1461
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
+msgid "No summary available."
+msgstr "Nun hai resume disponible."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
+msgid "No description available."
+msgstr "Nun hai descripción disponible."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1480
+msgid "No location information available."
+msgstr "Nun hai información del llugar disponible."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1525
+#, c-format
+msgid "You have %d alarms"
+msgstr "Tien %d alertes"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
+#: ../mail/mail-component.c:1596
+msgid "Warning"
+msgstr "Avisu"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1691
+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 ainda nun implementa recordatorios de calendariu\n"
+"con notificación por corréu-e, pero esti recordatoriu foi\n"
+"configuráu pa unviar un mensax de corréu-e.  En so llugar\n"
+"Evolution amosará un diálogu de recordatoriu normal."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1721
+#, 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 ""
+"Va a saltar un recordatoriu de calendariu d'Evolution. Esti recordatoriu ta "
+"configuráu pa executar el siguiente programa:\n"
+"\n"
+"        %s\n"
+"\n"
+"¿Daveres quier executar esti programa?"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
+msgid "Do not ask me about this program again."
+msgstr "Nun entrugar más sobro esti programa."
+
+#: ../calendar/gui/alarm-notify/notify-main.c:141
+msgid "Could not initialize Bonobo"
+msgstr "Nun pudo entamar Bonobo"
+
+#: ../calendar/gui/alarm-notify/notify-main.c:154
+msgid ""
+"Could not create the alarm notify service factory, maybe it's already "
+"running..."
+msgstr ""
+"Nun ye dable criar la fábrica del serviciu de l'alerta de notificación, "
+"seique yá se tea executando…"
+
+#: ../calendar/gui/alarm-notify/util.c:44
+msgid "invalid time"
+msgstr "hora non válida"
+
+#. 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
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d hores"
+
+#. 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
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minutu"
+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")
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/misc.c:126
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segundu"
+msgstr[1] "%d segundos"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
+msgid "Alarm programs"
+msgstr "Programes d'alerta"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
+msgid "Ask for confirmation when deleting items"
+msgstr "Pedir confirmación al esaniciar elementos"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr "Color de fondu pa les xeres que vencen güei, en formatu «#rrggbb»."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr "Color de fondu pa les xeres que tán retrasaes, en formatu «#rrggbb»."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
+msgid "Calendars to run alarms for"
+msgstr "Los calendarios executarán alertes durante"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr ""
+"Color pa dibuxar la llinia de Marcus Bains na barra de Tiempu (erma por "
+"omisión)."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr "Color pa dibuxar la llinia de Marcus Bains na vista diaria."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+msgid "Compress weekends in month view"
+msgstr "Comprimir fines de selmana na vista mensual"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+msgid "Confirm expunge"
+msgstr "Confirmar compautación"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr "Díes nos que tien de conseñase l'entamu y fin de les hores de trabayu."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+msgid "Default appointment reminder"
+msgstr "Recordatoriu predetermináu de cites"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+msgid "Default reminder units"
+msgstr "Unidaes predeterminaes del recordatoriu"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+msgid "Default reminder value"
+msgstr "Valor predetermináu del recordatoriu"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+msgid "Directory for saving alarm audio files"
+msgstr "Direutoriu pa guardar los ficheros de sonío d'alertes."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+msgid "Event Gradient"
+msgstr "Degradáu d'eventos"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+msgid "Event Transparency"
+msgstr "Tresparencia d'eventos"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+msgid "Free/busy server URLs"
+msgstr "URL del servidor de disponibilidá"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+msgid "Free/busy template URL"
+msgstr "URL de la plantía de disponibilidá"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+msgid "Gradient of the events in calendar views."
+msgstr "Degradáu de los eventos nes vistes de calendariu."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+msgid "Hide completed tasks"
+msgstr "Soverar les xeres finaes"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+msgid "Hide task units"
+msgstr "Soverar Llista de xeres nueva"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+msgid "Hide task value"
+msgstr "Soverar el valor de la xera"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+msgid "Horizontal pane position"
+msgstr "Posición horizontal del panel"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr ""
+"Hora na que fina la xornada llaboral, en formatu de veinticuatru hores, de 0 "
+"a 23."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr ""
+"Hora na qu'entama la xornada llaboral, en formatu de veinticuatru hores, de "
+"0 a 23."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr ""
+"Los intervalos de tiempu amosaos nes vistes diaries y selmanales, en minutos."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+msgid "Last alarm time"
+msgstr "Hora de la cabera alarma"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+msgid "List of server URLs for free/busy publishing."
+msgstr "Llista de URLs del servidor p'asoleyamientu de disponibilidá."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+msgid "Marcus Bains Line"
+msgstr "Llinia de Marcus Bains"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "Marcus Bains Line Color - Day View"
+msgstr "Color de la llinia de Marcus Bains - Vista de día"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+msgid "Marcus Bains Line Color - Time bar"
+msgstr "Color de la llinia de Marcus Bains de la barra de tiempu"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "Minutu nel que fina la xornada llaboral, de 0 a 59."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "Minutu nel qu'entama la xornada llaboral, de 0 a 59."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+msgid "Month view horizontal pane position"
+msgstr "Posición del panel horizontal de la vista mensual"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+msgid "Month view vertical pane position"
+msgstr "Posición del panel vertical na vista mensual"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+msgid "Number of units for determining a default reminder."
+msgstr "Númberu d'unidaes pa determinar un recordatoriu predetermináu."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+msgid "Number of units for determining when to hide tasks."
+msgstr "Númberu d'unidaes pa determinar cuándo soverar xeres."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+msgid "Overdue tasks color"
+msgstr "Color pa les xeres fuera de plazu"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+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ón del panel horizontal, ente la vista y la data del ñavegador del "
+"calendariu y llista de xeres cuando nun ta na vista mensual, en píxeles."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+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ón del panel horizontal, ente la vista y el ñavegador de dates del "
+"calendariu y la llista de xeres na vista mensual, en píxeles"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr ""
+"Posición del panel vertical, ente les llistes del calendariu y el ñavegador "
+"de dates del calendariu."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+msgid ""
+"Position of the vertical pane, between the task list and the task preview "
+"pane, in pixels."
+msgstr ""
+"Posición del panel vertical, ente la llista de xeres y la vista previa de "
+"xeres, en píxeles."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+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 del panel vertical, ente la vista y el ñavegador del calendariu y "
+"la llista de xeres na vista mensual, en píxeles."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+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 del panel vertical, ente la vista y el ñavegador de dates del "
+"calendariu y la llista de xeres cuando nun ta na vista mensual, en píxeles."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+msgid "Programs that are allowed to be run by alarms."
+msgstr "Programes que se permite que seyan executados poles alarmes."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+msgid "Save directory for alarm audio"
+msgstr "Direutoriu au atroxar los sonío de les alarmes"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr ""
+"Amosar el campu «Confirmar» nel editor d'acontecimientos/xeres/reuniones"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "Amosar el campu «Rol» nel editor d'acontecimientos/xeres/reuniones"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+msgid "Show appointment end times in week and month views"
+msgstr ""
+"Amosar les hores de finalización de les cites nes vistes selmanales y "
+"mensuales"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+msgid "Show categories field in the event/meeting/task editor"
+msgstr ""
+"Amosar el campu de categoríes nel editor d'acontecimientos/reuniones/xeres"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+msgid "Show display alarms in notification tray"
+msgstr "Amosar el visor de l'alarma nuna bandexa de notificación"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+msgid "Show status field in the event/task/meeting editor"
+msgstr "Amosar el campu d'estáu nel editor d'acontecimientos/xeres/reuniones"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Show the \"Preview\" pane"
+msgstr "Amosar el panel de vista previa"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show the \"Preview\" pane."
+msgstr "Amosar el panel de vista previa."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Show timezone field in the event/meeting editor"
+msgstr ""
+"Amosar el campu d'estaya horaria nel editor d'acontecimientos/reuniones"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+msgid "Show type field in the event/task/meeting editor"
+msgstr "Amosar el campu de tipu nel editor d'acontecimientos/xeres/reuniones"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+msgid "Show week numbers in date navigator"
+msgstr "Amosar los númberos de les selmanes nel ñavegador de dates"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+msgid "Tasks due today color"
+msgstr "Color pa les xeres que vencen güei"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+msgid "Tasks vertical pane position"
+msgstr "Posición del panel vertical de xeres"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#, 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 plantía URL pa usar como datos de resguardu de disponibilidá, %u "
+"reemplázase pela parte del usuariu de la direición de corréu y %d "
+"reemplázase pel dominiu."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+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 estaya horaria predeterminada que s'usará nes dates y hores nel "
+"calendariu, como una llocalización ensin tresllación de la base de datos de "
+"franxes horaries Olsen, como en \"América/New York\"."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+msgid "Time divisions"
+msgstr "Divisiones d'hora"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+msgid "Time the last alarm ran, in time_t."
+msgstr "La hora na que sonó la cabera alarma, en time_t."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../plugins/startup-wizard/startup-wizard.c:109
+msgid "Timezone"
+msgstr "Estaya horaria"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+msgid ""
+"Transparency of the events in calendar views, a value between 0 "
+"(transparent) and 1 (opaque)."
+msgstr ""
+"Tresparencia de los acontecimientos nes vistes del calendariu, un valor ente "
+"0 (tresparente) y 1 (opacu)."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+msgid "Twenty four hour time format"
+msgstr "Formatu d'hora de veinticuatru hores"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"Unidaes pal recordatoriu predetermináu, \"minutes\", \"hours\" o \"days\"."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"Unidaes pa determinar cuándo soverar xeres, \"minutes\", \"hours\" o \"days"
+"\"."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+msgid "Week start"
+msgstr "Entamu de la selmana"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgstr ""
+"El día nel qu'entama la selmana, dende'l domingu (0) hasta'l sábadu (6)."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+msgid "Whether or not to use the notification tray for display alarms."
+msgstr ""
+"Conseña si hai d'usar o non la bandexa de notificación p'amosar alarmes."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr "Conseña si hai de pidir confirmación al esaniciar una cita o xera."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr "Conseña si hai de pidir confirmación al compautar cites y xeres."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+"Conseña si hai de comprimir los fines de selmana, colo que se pon al sábadu "
+"y al domingu nel mesmu espaciu qu'un día llaborable."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+msgid "Whether to display the end time of events in the week and month views."
+msgstr ""
+"Conseña si hai d'amosar la de finalización de los acontecimientos nes vistes "
+"selmanales y mensuales."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr ""
+"Conseña si hai de dibuxar la llinia Marcus Bains (llinia a la hora autual) "
+"nel calendariu."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr "Conseña si hai de soverar les xeres terminaes na vista de xeres."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+msgid "Whether to set a default reminder for appointments."
+msgstr "Conseña si hai d'afitar un recordatoriu predetermináu pa les cites."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr ""
+"Conseña si hai d'amosar el campu «Confirmar» nel editor d'acontecimientos/"
+"xeres/reuniones"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr ""
+"Conseña si hai d'amosar el campu «Categoríes» nel editor d'acontecimientos/"
+"xeres"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr ""
+"Conseña si hai d'amosar el campu «Rol» nel editor d'acontecimientos/xeres/"
+"reuniones"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr ""
+"Conseña si hai d'amosar el campu «Estáu» nel editor d'acontecimientos/xeres/"
+"reuniones"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
+msgstr ""
+"Conseña si hai d'amosar les hores en formtu de veinticuatru hores n'arróu "
+"d'usar am/pm."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr ""
+"Conseña si hai d'amosar el campu «Estaya horaria» nel editor "
+"d'acontecimientos/reuniones"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr ""
+"Conseña si hai d'amosar el campu «Tipu» nel editor d'acontecimientos/xeres/"
+"reuniones"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+msgid "Whether to show week numbers in the date navigator."
+msgstr ""
+"Conseña si hai d'amosar los númberos de la selmana nel ñavegador de dates."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+msgid "Whether to use daylight savings time while displaying events."
+msgstr "Conseña si hai d'usar la hora del horariu de branu al amosar eventos."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+msgid "Work days"
+msgstr "Díes llaborables"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+msgid "Workday end hour"
+msgstr "Hora de finalización de la xornada llaboral"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+msgid "Workday end minute"
+msgstr "Minutu de finalización de la xornada llaboral"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+msgid "Workday start hour"
+msgstr "Hora d'entamu de la xornada llaboral"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+msgid "Workday start minute"
+msgstr "Minutu d'entamu de la xornada llaboral"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+msgid "daylight savings time"
+msgstr "Hora de branu"
+
+#: ../calendar/gui/cal-search-bar.c:75
+msgid "Summary contains"
+msgstr "El resume contién"
+
+#: ../calendar/gui/cal-search-bar.c:76
+msgid "Description contains"
+msgstr "La descripción contién"
+
+#: ../calendar/gui/cal-search-bar.c:77
+msgid "Category is"
+msgstr "La categoría ye"
+
+#: ../calendar/gui/cal-search-bar.c:78
+msgid "Comment contains"
+msgstr "El comentariu contién"
+
+#: ../calendar/gui/cal-search-bar.c:79
+msgid "Location contains"
+msgstr "El llugar contién"
+
+#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
+msgid "Unmatched"
+msgstr "Non coincidente"
+
+#: ../calendar/gui/cal-search-bar.c:640
+msgid "Next 7 Days' Tasks"
+msgstr "Xeres nos vinientes 7 díes"
+
+#: ../calendar/gui/cal-search-bar.c:644
+msgid "Active Tasks"
+msgstr "Xeres actives"
+
+#: ../calendar/gui/cal-search-bar.c:648
+msgid "Overdue Tasks"
+msgstr "Xeres fuera de plazu"
+
+#: ../calendar/gui/cal-search-bar.c:652
+msgid "Completed Tasks"
+msgstr "Xeres completaes"
+
+#: ../calendar/gui/cal-search-bar.c:656
+msgid "Tasks with Attachments"
+msgstr "Xeres con axuntos"
+
+#: ../calendar/gui/cal-search-bar.c:702
+msgid "Active Appointments"
+msgstr "Cites actives"
+
+#: ../calendar/gui/cal-search-bar.c:706
+msgid "Next 7 Days' Appointments"
+msgstr "Cites nos vinientes 7 díes"
+
+#: ../calendar/gui/calendar-commands.c:93 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Imprentar"
+
+#: ../calendar/gui/calendar-commands.c:318
+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 desaniciará permanentemente tolos acontecimientos conseñaos "
+"más antiguos que'l tiempu seleicionáu. Si continúa, nun podrá recuperar esos "
+"acontecimientos."
+
+#: ../calendar/gui/calendar-commands.c:324
+msgid "Purge events older than"
+msgstr "Purgar acontecimientos anteriores a"
+
+#: ../calendar/gui/calendar-commands.c:329
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/calendar-http/calendar-http.c:281
+#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../plugins/google-account-setup/google-source.c:664
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../widgets/misc/e-send-options.glade.h:39
+msgid "days"
+msgstr "díes"
+
+#. Create the On the web source group
+#. Create the LDAP source group
+#. Create the Webcal source group
+#. Create the LDAP source group
+#: ../calendar/gui/calendar-component.c:273
+#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
+#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
+#: ../calendar/gui/tasks-component.c:231
+msgid "On The Web"
+msgstr "Na web"
+
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
+msgid "Birthdays & Anniversaries"
+msgstr "Cumpleaños y aniversarios"
+
+#. Create the weather group
+#: ../calendar/gui/calendar-component.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:100
+msgid "Weather"
+msgstr "Meteoroloxía"
+
+#: ../calendar/gui/calendar-component.c:640
+msgid "_New Calendar"
+msgstr "Calendariu _nuevu"
+
+#: ../calendar/gui/calendar-component.c:641
+#: ../calendar/gui/memos-component.c:490 ../calendar/gui/tasks-component.c:481
+#: ../mail/em-folder-tree.c:2106
+msgid "_Copy..."
+msgstr "_Copiar…"
+
+#: ../calendar/gui/calendar-component.c:645
+#: ../calendar/gui/memos-component.c:494 ../calendar/gui/tasks-component.c:485
+msgid "_Make available for offline use"
+msgstr "_Facer esto disponible pal so usu desconeutáu"
+
+#: ../calendar/gui/calendar-component.c:646
+#: ../calendar/gui/memos-component.c:495 ../calendar/gui/tasks-component.c:486
+msgid "_Do not make available for offline use"
+msgstr "_Nun facer esto disponible ensin conexón"
+
+#: ../calendar/gui/calendar-component.c:976
+msgid "Failed upgrading calendars."
+msgstr "Fallu al autualizar calendarios."
+
+#: ../calendar/gui/calendar-component.c:1275
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr "Nun pudo abrise'l calendariu «%s» pa criar acontecimientos y reuniones"
+
+#: ../calendar/gui/calendar-component.c:1291
+msgid "There is no calendar available for creating events and meetings"
+msgstr "Nun hai un calendariu disponible pa criar acontecimientos y reuniones"
+
+#: ../calendar/gui/calendar-component.c:1404
+msgid "Calendar Source Selector"
+msgstr "Seleutor d'orixe del calendariu"
+
+#: ../calendar/gui/calendar-component.c:1623
+msgid "New appointment"
+msgstr "Cita nueva"
+
+#: ../calendar/gui/calendar-component.c:1625
+msgid "Create a new appointment"
+msgstr "Cria una cita nueva"
+
+#: ../calendar/gui/calendar-component.c:1631
+msgid "New meeting"
+msgstr "Reunión nueva"
+
+#: ../calendar/gui/calendar-component.c:1633
+msgid "Create a new meeting request"
+msgstr "Cria una solicitú de reunión nueva"
+
+#: ../calendar/gui/calendar-component.c:1639
+msgid "New all day appointment"
+msgstr "Nueva Cita pa tol día"
+
+#: ../calendar/gui/calendar-component.c:1641
+msgid "Create a new all-day appointment"
+msgstr "Cria una cita nueva pa tol día"
+
+#: ../calendar/gui/calendar-component.c:1647
+msgid "New calendar"
+msgstr "Calendariu nuevu"
+
+#: ../calendar/gui/calendar-component.c:1649
+msgid "Create a new calendar"
+msgstr "Cria un calendariu nuevu"
+
+#: ../calendar/gui/calendar-view-factory.c:113
+msgid "Day View"
+msgstr "Vista diaria"
+
+#: ../calendar/gui/calendar-view-factory.c:116
+msgid "Work Week View"
+msgstr "Vista de la selmana llaboral"
+
+#: ../calendar/gui/calendar-view-factory.c:119
+msgid "Week View"
+msgstr "Vista selmanal"
+
+#: ../calendar/gui/calendar-view-factory.c:122
+msgid "Month View"
+msgstr "Vista mensual"
+
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+msgid "Any Field"
+msgstr "Cualesquier campu"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:21
+msgid "Attachments"
+msgstr "Axuntos"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Participante"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "Empresa"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "Categoría"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "Clasificación"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "Competition"
+msgstr "Competición"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:250
+#: ../calendar/gui/e-cal-model.c:348 ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Confidencial"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "Descripción"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
+msgid "Description Contains"
+msgstr "La descripción contién"
+
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:38
+msgid "Do Not Exist"
+msgstr "Nun esisten"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:41
+msgid "Exist"
+msgstr "Esisten"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr "Favoritoso"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "Regalos"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "Metes/Oxetivos"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "Vacaciones"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "Tarxetes de vacaciones"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "Contautos frecuentes"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr "Idegues"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "Internacional"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "Veceru clave"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "D'otra miente"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "Próximos 7 díes"
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+msgid "Organizer"
+msgstr "Organizador"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "Llamaes de teléfonu"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:346 ../calendar/gui/e-calendar-table.c:545
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "Priváu"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-cal-model.c:344
+#: ../calendar/gui/e-calendar-table.c:544 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "Públicu"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:299
+msgid "Recurrence"
+msgstr "Repetición"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:86 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Estáu"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "Estratexes"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40
+#: ../plugins/save-calendar/csv-format.c:362
+msgid "Summary"
+msgstr "Resume"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
+msgid "Summary Contains"
+msgstr "El resume contién"
+
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "Soministradores"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "Tiempu y gastos"
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr "VIP"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "Aguardando"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:26
+msgid "contains"
+msgstr "contién"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:32
+msgid "does not contain"
+msgstr "nun contién"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:46
+msgid "is"
+msgstr "ye"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:52
+msgid "is not"
+msgstr "nun ye"
+
+#: ../calendar/gui/comp-editor-factory.c:409
+msgid "Error while opening the calendar"
+msgstr "Fallu al abrir el calendariu"
+
+#: ../calendar/gui/comp-editor-factory.c:415
+msgid "Method not supported when opening the calendar"
+msgstr "Métodu non soportáu al abrir el calendariu"
+
+#: ../calendar/gui/comp-editor-factory.c:421
+msgid "Permission denied to open the calendar"
+msgstr "Permisu refugáu p'abrir el calendariu"
+
+#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1272
+msgid "Unknown error"
+msgstr "Fallu desconocíu"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
+msgid "Edit Alarm"
+msgstr "Iguar alarma"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
+msgid "<b>Alarm</b>"
+msgstr "<b>Alarma</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
+msgid "<b>Options</b>"
+msgstr "<b>Preferencies</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
+msgid "<b>Repeat</b>"
+msgstr "<b>Repetición</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
+msgid "Add Alarm"
+msgstr "Amestar alarma"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
+msgid "Custom _message"
+msgstr "_Mensax personalizáu"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
+msgid "Custom alarm sound"
+msgstr "Soníu d'alarma personalizáu"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Mes_sage:"
+msgstr "_Mensax:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "Reproducir un soníu"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "Amosar una alarma emerxente"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "Executar un programa"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+msgid "Select A File"
+msgstr "Escueya un Ficheru"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Unviar a:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Unviar un corréu-e"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+msgid "_Arguments:"
+msgstr "_Argumentos:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+msgid "_Program:"
+msgstr "_Programa:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+msgid "_Repeat the alarm"
+msgstr "_Repetir la alarma"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+msgid "_Sound:"
+msgstr "_Soníu:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+msgid "after"
+msgstr "dempués"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
+msgid "before"
+msgstr "enantes"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "day(s)"
+msgstr "día(es)"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+msgid "end of appointment"
+msgstr "fin de la cita"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "vegaes adicionales cada"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+msgid "hour(s)"
+msgstr "hora(es)"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+msgid "minute(s)"
+msgstr "minutu(os)"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
+msgid "start of appointment"
+msgstr "entamu de cita"
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
+msgid "Action/Trigger"
+msgstr "Aición/Disparador"
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "Ames_tar"
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:4
+msgid "Alarms"
+msgstr "Alarmes"
+
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
+#: ../composer/e-composer-actions.c:64
+msgid "_Suggest automatic display of attachment"
+msgstr "_Suxerir amosar automáticamente l'axuntu"
+
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
+msgid "Attach file(s)"
+msgstr "Axuntar ficheru(os)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:484
+msgid "Selected Calendars for Alarms"
+msgstr "Calendarios seleicionados p'alarmes"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid ""
+"60 minutes\n"
+"30 minutes\n"
+"15 minutes\n"
+"10 minutes\n"
+"05 minutes"
+msgstr ""
+"60 minutos\n"
+"30 minutos\n"
+"15 minutos\n"
+"10 minutos\n"
+"05 minutos"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, no-c-format
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
+"<i>%u y %d reemplazaránse pol usuariu y el dominiu de la direición de corréu-"
+"e.</i>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../mail/mail-config.glade.h:10
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr "<span weight=\"bold\">Alertes</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+msgstr "<span weight=\"bold\">Servidor de disponibilidá predetermináu</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../mail/mail-config.glade.h:17
+#: ../plugins/publish-calendar/publish-calendar.glade.h:1
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">Xeneral</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "<span weight=\"bold\">Task List</span>"
+msgstr "<span weight=\"bold\">Llista de xeres</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "<span weight=\"bold\">Time</span>"
+msgstr "<span weight=\"bold\">Tiempu</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+msgid "<span weight=\"bold\">Work Week</span>"
+msgstr "<span weight=\"bold\">Selmana llaboral</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Adjust for daylight sa_ving time"
+msgstr "Axustar a la hora de _branu"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "Day _ends:"
+msgstr "La xornada _fina a les:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+msgid "Display"
+msgstr "Amosar"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:738
+msgid "Friday"
+msgstr "Vienres"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days"
+msgstr ""
+"Minutos\n"
+"Hores\n"
+"Díes"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:734
+msgid "Monday"
+msgstr "Llunes"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+msgstr ""
+"llunes\n"
+"martes\n"
+"miércoles\n"
+"xueves\n"
+"vienres\n"
+"sábadu\n"
+"domingu"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../mail/mail-config.glade.h:113
+msgid "Pick a color"
+msgstr "Escueya un color"
+
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "S_un"
+msgstr "_Dom"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/e-itip-control.c:739
+msgid "Saturday"
+msgstr "Sábadu"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+msgid "Select the calendars for alarm notification"
+msgstr "Seleicione los calendarios pa les alarmes de notificación"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Sh_ow a reminder"
+msgstr "A_mosar un recordatoriu"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+msgid "Show week _numbers in date navigator"
+msgstr "Amosar los _númberos de les selmanas nel ñavegador de dates"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/e-itip-control.c:733
+msgid "Sunday"
+msgstr "Domingu"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "T_asks due today:"
+msgstr "Xe_res que vencen güei:"
+
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "T_hu"
+msgstr "_Xue"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Template:"
+msgstr "Plantía:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:737
+msgid "Thursday"
+msgstr "Xueves"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Time _zone:"
+msgstr "_Estaya horaria:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "Time format:"
+msgstr "Formatu d'hora:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:735
+msgid "Tuesday"
+msgstr "Martes"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:736
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "Wee_k starts on:"
+msgstr "La _selmana entama en:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+msgid "Work days:"
+msgstr "Díes llaborables:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+msgid "_12 hour (AM/PM)"
+msgstr "_12 hores (AM/PM)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+msgid "_24 hour"
+msgstr "_24 hores"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+msgid "_Ask for confirmation when deleting items"
+msgstr "Pidir confirm_ación al esaniciar elementos"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+msgid "_Compress weekends in month view"
+msgstr "_Comprimir fines de selmana na vista mensual"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+msgid "_Day begins:"
+msgstr "La xornada llaboral _entama a les:"
+
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+msgid "_Fri"
+msgstr "_Vie"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+msgid "_Hide completed tasks after"
+msgstr "_Soverar xeres finaes tres"
+
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+msgid "_Mon"
+msgstr "_Llu"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+msgid "_Overdue tasks:"
+msgstr "Xeres fuera de pla_zu:"
+
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+msgid "_Sat"
+msgstr "_Sáb"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+msgid "_Show appointment end times in week and month view"
+msgstr ""
+"_Amosar la hora del final de les cites nes vistes selmanales y mensuales"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+msgid "_Time divisions:"
+msgstr "Divisiones d'_hora:"
+
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+msgid "_Tue"
+msgstr "_Mar"
+
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+msgid "_Wed"
+msgstr "M_ié"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+msgid "before every appointment"
+msgstr "enantes de cada cita"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:271
+msgid "Cop_y calendar contents locally for offline operation"
+msgstr ""
+"_Copiar el conteníu del calendariu llocalmente pa operación desconeutada"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:273
+msgid "Cop_y task list contents locally for offline operation"
+msgstr ""
+"Co_piar el conteníu del la llista de xeres llocalmente pa operación "
+"desconeutada"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:275
+msgid "Cop_y memo list contents locally for offline operation"
+msgstr ""
+"Copia_r el conteníu de la llista de notes llocalmente pa operación "
+"desconeutada"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:345
+msgid "Colo_r:"
+msgstr "Colo_r:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+msgid "Task List"
+msgstr "Llista de xeres"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+msgid "Memo List"
+msgstr "Llista de notes"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:476
+msgid "Calendar Properties"
+msgstr "Propiedaes del calendariu"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:476
+msgid "New Calendar"
+msgstr "Calendariu nuevu"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:532
+msgid "Task List Properties"
+msgstr "Propiedaes de llista de xeres"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:532
+msgid "New Task List"
+msgstr "Llista de xeres nueva"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:588
+msgid "Memo List Properties"
+msgstr "Propiedaes de llista de notes"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:588
+msgid "New Memo List"
+msgstr "Llista de notes nueva"
+
+#: ../calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr "Esti acontecimientu esanicióse."
+
+#: ../calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr "Esanicióse esta xera"
+
+#: ../calendar/gui/dialogs/changed-comp.c:68
+msgid "This memo has been deleted."
+msgstr "Esanicióse esta nota"
+
+#: ../calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr "%s  Fexo cambeos. ¿Escaecer cambeos y pesllar l'editor?"
+
+#: ../calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr "%s  Nun fexo cambeos, ¿pesllar l'editor?"
+
+#: ../calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr "Esti acontecimientu camudó"
+
+#: ../calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr "Esta xera camudó"
+
+#: ../calendar/gui/dialogs/changed-comp.c:92
+msgid "This memo has been changed."
+msgstr "Esta nota camudó"
+
+#: ../calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr "%s Fexo cambeos. ¿Escaecer estos cambeos y actualizar l'editor?"
+
+#: ../calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr "%s Nun fexo cambeos, ¿autualizar l'editor?"
+
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
+#, c-format
+msgid "Validation error: %s"
+msgstr "Fallu de validación: %s"
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2358
+msgid " to "
+msgstr " a "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2362
+msgid " (Completed "
+msgstr " (Completáu "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2364
+msgid "Completed "
+msgstr "Completáu "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2369
+msgid " (Due "
+msgstr " (Vence "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2371
+msgid "Due "
+msgstr "Vence "
+
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#, c-format
+msgid "Attached message - %s"
+msgstr "Mensax axuntu: %s"
+
+#. translators, this count will always be >1
+#: ../calendar/gui/dialogs/comp-editor.c:241
+#: ../calendar/gui/dialogs/comp-editor.c:414 ../composer/e-msg-composer.c:1766
+#: ../composer/e-msg-composer.c:1985
+#, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Mensax axuntu"
+msgstr[1] "%d mensaxes axuntos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:485 ../composer/e-msg-composer.c:2053
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2107
+msgid "_Move"
+msgstr "_Mover"
+
+#: ../calendar/gui/dialogs/comp-editor.c:487 ../composer/e-msg-composer.c:2055
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2109
+msgid "Cancel _Drag"
+msgstr "Encaboxar _arrastre"
+
+#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:3257 ../mail/em-utils.c:372
+#: ../plugins/prefer-plain/prefer-plain.c:91
+#: ../widgets/misc/e-attachment-bar.c:453
+msgid "attachment"
+msgstr "axuntu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:846
+msgid "Could not update object"
+msgstr "Nun ye dable autualizar l'oxetu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:934
+msgid "Edit Appointment"
+msgstr "Iguar cita"
+
+#: ../calendar/gui/dialogs/comp-editor.c:941
+#, c-format
+msgid "Meeting - %s"
+msgstr "Reunión - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:943
+#, c-format
+msgid "Appointment - %s"
+msgstr "Cita - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:949
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Xera asignada - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Task - %s"
+msgstr "Xera - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:956
+#, c-format
+msgid "Memo - %s"
+msgstr "Nota - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:972
+msgid "No Summary"
+msgstr "Ensin resume"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1266
+msgid "Click here to close the current window"
+msgstr "Calque equí pa zarrar la ventana autual"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1273
+msgid "Copy selected text to the clipboard"
+msgstr "Copia'l testu seleicionáu al cartafueyos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1280
+msgid "Cut selected text to the clipboard"
+msgstr "Corta'l testu seleicionáu al cartafueyos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1287
+msgid "Click here to view help available"
+msgstr "Calque equí pa ver l'aida disponible"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1294
+msgid "Paste text from the clipboard"
+msgstr "Pega testu dende'l cartafueyos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1315
+msgid "Click here to save the current window"
+msgstr "Calque equí pa guardar la vista autual"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1322
+msgid "Select all text"
+msgstr "Seleiciona tol testu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1329
+msgid "_Classification"
+msgstr "_Clasificación"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_Ficheru"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1350
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_Aida"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1357
+msgid "_Insert"
+msgstr "_Inxertar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1364
+msgid "_Options"
+msgstr "_Opciones"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1371 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
+msgid "_View"
+msgstr "_Ver"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1381
+#: ../composer/e-composer-actions.c:471
+msgid "_Attachment..."
+msgstr "_Axuntos..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1383
+msgid "Click here to attach a file"
+msgstr "Calque equí p'axuntar un ficheru"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1391
+msgid "_Categories"
+msgstr "_Categoríes"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1393
+msgid "Toggles whether to display categories"
+msgstr "Conmuta s'amuesen les categoríes"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1399
+msgid "Time _Zone"
+msgstr "_Estaya horaria"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1401
+msgid "Toggles whether the time zone is displayed"
+msgstr "Conmuta s'amuesa'l campu la «Estaya horaria»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1410
+msgid "Pu_blic"
+msgstr "Pú_blicu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "Classify as public"
+msgstr "Clasificar como públicu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1417
+msgid "_Private"
+msgstr "_Priváu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+msgid "Classify as private"
+msgstr "Clasificar como priváu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1424
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1426
+msgid "Classify as confidential"
+msgstr "Clasificar como confidencial"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1434
+msgid "R_ole Field"
+msgstr "Campu «_Rol»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1436
+msgid "Toggles whether the Role field is displayed"
+msgstr "Conmuta s'amuesa'l campu «Rol»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1442
+msgid "_RSVP"
+msgstr "_Confirmar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1444
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Conmuta cuando s'amuesa'l campu «Confirmar»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1450
+msgid "_Status Field"
+msgstr "Campu d'_estáu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1452
+msgid "Toggles whether the Status field is displayed"
+msgstr "Conmuta cuando s'amuesa'l campu «Estáu»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1458
+msgid "_Type Field"
+msgstr "Campu de _tipu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1460
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Conmuta conseñando si s'amuesa'l campu «Tipu de participante»"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1774
+#: ../composer/e-composer-private.c:66 ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent _Documents"
+msgstr "_Documentos recientes"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1793
+#: ../composer/e-composer-actions.c:699
+msgid "Attach"
+msgstr "Axuntar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1888
+#, c-format
+msgid "<b>%d</b> Attachment"
+msgid_plural "<b>%d</b> Attachments"
+msgstr[0] "<b>%d</b> axuntu"
+msgstr[1] "<b>%d</b> axuntos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1920
+msgid "Hide Attachment _Bar"
+msgstr "Soverar _barra d'axuntos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1923
+#: ../calendar/gui/dialogs/comp-editor.c:2231
+msgid "Show Attachment _Bar"
+msgstr "Amosar _barra d'axuntos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2042
+#: ../calendar/gui/dialogs/event-page.c:1875
+#: ../calendar/gui/dialogs/task-page.c:1197 ../composer/e-msg-composer.c:1040
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "_Esaniciar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2045
+#: ../composer/e-msg-composer.c:1043
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "_Amestar axuntu…"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2253
+#: ../mail/em-format-html-display.c:2201
+msgid "Show Attachments"
+msgstr "Amosar axuntos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2254
+msgid "Press space key to toggle attachment bar"
+msgstr "Calque na barra espaciadora pa camudar la barra d'axuntos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2398
+#: ../calendar/gui/dialogs/comp-editor.c:2445
+#: ../calendar/gui/dialogs/comp-editor.c:3290
+msgid "Changes made to this item may be discarded if an update arrives"
+msgstr ""
+"Los cambeos efeutuaos a esti elementi puen descartase si aporta una "
+"actualización per corréu"
+
+#: ../calendar/gui/dialogs/comp-editor.c:3319
+msgid "Unable to use current version!"
+msgstr "Nun ye dable obtener versión autual."
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
+msgid "Could not open source"
+msgstr "Nun se pue abrir l'orixe"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
+msgid "Could not open destination"
+msgstr "Nun se pue abrir el destín"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
+msgid "Destination is read only"
+msgstr "El destín ye de namái llectura"
+
+#: ../calendar/gui/dialogs/delete-comp.c:205
+msgid "_Delete this item from all other recipient's mailboxes?"
+msgstr "¿_Esaniciar esti elementu de tolos otros buzones del destinatariu?"
+
+#: ../calendar/gui/dialogs/delete-error.c:56
+msgid "The event could not be deleted due to a corba error"
+msgstr "L'acontecimientu nun pudo esaniciase darréu d'un fallu de CORBA"
+
+#: ../calendar/gui/dialogs/delete-error.c:59
+msgid "The task could not be deleted due to a corba error"
+msgstr "La xera nun pudo esaniciase darréu d'un fallu de CORBA"
+
+#: ../calendar/gui/dialogs/delete-error.c:62
+msgid "The memo could not be deleted due to a corba error"
+msgstr "Nun pudo esaniciase la nota darréu d'un fallu de CORBA"
+
+#: ../calendar/gui/dialogs/delete-error.c:65
+msgid "The item could not be deleted due to a corba error"
+msgstr "Nun pudo esaniciase l'elementu darréu d'un fallu de CORBA"
+
+#: ../calendar/gui/dialogs/delete-error.c:72
+msgid "The event could not be deleted because permission was denied"
+msgstr "Nun pudo esaniciase l'acontecimientu darréu d'un fallu de CORBA"
+
+#: ../calendar/gui/dialogs/delete-error.c:75
+msgid "The task could not be deleted because permission was denied"
+msgstr "La xera nun pudo esaniciase porque refugóse'l permisu"
+
+#: ../calendar/gui/dialogs/delete-error.c:78
+msgid "The memo could not be deleted because permission was denied"
+msgstr "La nota nun pudo esaniciase porque refugóse'l permisu"
+
+#: ../calendar/gui/dialogs/delete-error.c:81
+msgid "The item could not be deleted because permission was denied"
+msgstr "L'elementu nun pudo esaniciase porque refugóse'l permisu"
+
+#: ../calendar/gui/dialogs/delete-error.c:88
+msgid "The event could not be deleted due to an error"
+msgstr "L'acontecimientu nun pudo esaniciase porque refugóse'l permisu"
+
+#: ../calendar/gui/dialogs/delete-error.c:91
+msgid "The task could not be deleted due to an error"
+msgstr "La xera nun pudo esaniciase darréu d'un fallu"
+
+#: ../calendar/gui/dialogs/delete-error.c:94
+msgid "The memo could not be deleted due to an error"
+msgstr "L'elementu nun pudo esaniciase darréu d'un fallu"
+
+#: ../calendar/gui/dialogs/delete-error.c:97
+msgid "The item could not be deleted due to an error"
+msgstr "L'elementu nun pudo esaniciase darréu d'un fallu"
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+msgid "Contacts..."
+msgstr "Contautos…"
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-delegates.c:417
+msgid "Delegate To:"
+msgstr "Delegar en:"
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+msgid "Enter Delegate"
+msgstr "Introducir un delegáu"
+
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "_Alarms"
+msgstr "_Alarmes"
+
+#: ../calendar/gui/dialogs/event-editor.c:198
+msgid "Click here to set or unset alarms for this event"
+msgstr "Calque equí pa poner o quitar alertes pa esti asocedimientu"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "_Recurrence"
+msgstr "_Repetición"
+
+#: ../calendar/gui/dialogs/event-editor.c:205
+msgid "Make this a recurring event"
+msgstr "Convertir en asocedimientu repetitivu"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:212
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr "Opciones d'Unvíu"
+
+#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/task-editor.c:125
+msgid "Insert advanced send options"
+msgstr "Opciones d'unvíu avanzaes"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "All _Day Event"
+msgstr "Eventos pa tol _día"
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Toggles whether to have All Day Event"
+msgstr "Actívase cuando se tien un «Eventos pa tol día»"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Show Time as _Busy"
+msgstr "Amosar hora como _ocupada"
+
+#: ../calendar/gui/dialogs/event-editor.c:230
+msgid "Toggles whether to show time as busy"
+msgstr "Actívase cuando hai d'amosar la hora como ocupada"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "_Free/Busy"
+msgstr "_Disponibilidá"
+
+#: ../calendar/gui/dialogs/event-editor.c:241
+msgid "Query free / busy information for the attendees"
+msgstr "Consultar información de disponibilidá pa los participantes"
+
+#: ../calendar/gui/dialogs/event-editor.c:296
+msgid "Appoint_ment"
+msgstr "_Cita"
+
+#: ../calendar/gui/dialogs/event-page.c:735
+#: ../calendar/gui/dialogs/event-page.c:2718
+msgid "This event has alarms"
+msgstr "Esti acontecimientu tien alarmes."
+
+#: ../calendar/gui/dialogs/event-page.c:798
+#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
+msgid "Or_ganizer:"
+msgstr "Or_ganizador:"
+
+#: ../calendar/gui/dialogs/event-page.c:844
+msgid "_Delegatees"
+msgstr "_Delegaos"
+
+#: ../calendar/gui/dialogs/event-page.c:846
+msgid "Atte_ndees"
+msgstr "_Participantes"
+
+#: ../calendar/gui/dialogs/event-page.c:1030
+msgid "Event with no start date"
+msgstr "Acontecimientu ensin data d'entamu"
+
+#: ../calendar/gui/dialogs/event-page.c:1033
+msgid "Event with no end date"
+msgstr "Acontecimientu ensin data de términu"
+
+#: ../calendar/gui/dialogs/event-page.c:1202
+#: ../calendar/gui/dialogs/memo-page.c:640
+#: ../calendar/gui/dialogs/task-page.c:812
+msgid "Start date is wrong"
+msgstr "La data d'entamu ta enquivocada"
+
+#: ../calendar/gui/dialogs/event-page.c:1212
+msgid "End date is wrong"
+msgstr "La data de términu ta enquivocada"
+
+#: ../calendar/gui/dialogs/event-page.c:1235
+msgid "Start time is wrong"
+msgstr "La hora d'entamu ta enquivocada"
+
+#: ../calendar/gui/dialogs/event-page.c:1242
+msgid "End time is wrong"
+msgstr "La hora de términu ta enquivocada"
+
+#: ../calendar/gui/dialogs/event-page.c:1405
+#: ../calendar/gui/dialogs/memo-page.c:681
+#: ../calendar/gui/dialogs/task-page.c:872
+msgid "The organizer selected no longer has an account."
+msgstr "L'organizador seleicionado yá nun tien una cuenta."
+
+#: ../calendar/gui/dialogs/event-page.c:1411
+#: ../calendar/gui/dialogs/memo-page.c:687
+#: ../calendar/gui/dialogs/task-page.c:878
+msgid "An organizer is required."
+msgstr "Requierse un organizador."
+
+#: ../calendar/gui/dialogs/event-page.c:1436
+#: ../calendar/gui/dialogs/task-page.c:902
+msgid "At least one attendee is required."
+msgstr "Ye necesario a lo menos un asistente."
+
+#: ../calendar/gui/dialogs/event-page.c:1876
+#: ../calendar/gui/dialogs/task-page.c:1198
+msgid "_Add "
+msgstr "_Amestar "
+
+#: ../calendar/gui/dialogs/event-page.c:2594
+#, c-format
+msgid "Unable to open the calendar '%s'."
+msgstr "Nun ye dable abrir el calendariu «%s»."
+
+#: ../calendar/gui/dialogs/event-page.c:2638
+#: ../calendar/gui/dialogs/memo-page.c:890
+#: ../calendar/gui/dialogs/task-page.c:1797
+#, c-format
+msgid "You are acting on behalf of %s"
+msgstr "Ta autuando en nome de <b>%s</b>"
+
+#: ../calendar/gui/dialogs/event-page.c:2918
+#, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "%d día enantes de la cita"
+msgstr[1] "%d díes enantes de la cita"
+
+#: ../calendar/gui/dialogs/event-page.c:2924
+#, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "%d hora enantes de la cita"
+msgstr[1] "%d hores enantes de la cita"
+
+#: ../calendar/gui/dialogs/event-page.c:2930
+#, c-format
+msgid "%d minute before appointment"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "%d minutu enantes de la cita"
+msgstr[1] "%d minutos enantes de la cita"
+
+#: ../calendar/gui/dialogs/event-page.c:2943
+msgid "Customize"
+msgstr "Personalizar"
+
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/event-page.c:2948
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:945
+#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../plugins/calendar-weather/calendar-weather.c:370
+#: ../plugins/calendar-weather/calendar-weather.c:424
+#: ../plugins/exchange-operations/exchange-delegates-user.c:195
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:2088
+#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:70
+msgid "None"
+msgstr "Denguna"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+msgid "1 day before appointment"
+msgstr "1 día enantes de la cita"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:2
+msgid "1 hour before appointment"
+msgstr "1 hora enantes de la cita"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:3
+msgid "15 minutes before appointment"
+msgstr "15 minutos enantes de la cita"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:5
+msgid "Attendee_s..."
+msgstr "_Participantes…"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:8
+msgid "Custom Alarm:"
+msgstr "Alarma personalizada:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:9
+msgid "Event Description"
+msgstr "Descripción del acontecimientu"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.glade.h:6
+msgid "Su_mmary:"
+msgstr "Resu_me:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+msgid "_Alarm"
+msgstr "_Alarma"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+msgid "_Description:"
+msgstr "_Descripción:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+msgid "_Time:"
+msgstr "_Hora:"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "for"
+msgstr "durante"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
+msgid "until"
+msgstr "hasta"
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:1
+msgid "<b>Att_endees</b>"
+msgstr "<b>_Participantes</b>"
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:2
+msgid "C_hange Organizer"
+msgstr "Camudar or_ganizador"
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:3
+msgid "Co_ntacts..."
+msgstr "_Contautos…"
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Organizer:"
+msgstr "Organizador:"
+
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2478
+msgid "Memo"
+msgstr "Nota"
+
+#: ../calendar/gui/dialogs/memo-page.c:851
+#, c-format
+msgid "Unable to open memos in '%s'."
+msgstr "Nun ye dable abrir les notes en «%s»."
+
+#: ../calendar/gui/dialogs/memo-page.c:1006 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
+msgid "To"
+msgstr "Pa"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr "Data d'enta_mu:"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:5
+msgid "T_o:"
+msgstr "_Pa:"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.c:364
+#: ../calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Group:"
+msgstr "_Grupu:"
+
+#: ../calendar/gui/dialogs/recur-comp.c:54
+#, c-format
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr "Ta modificando un acontecimientu que se repite. ¿Qué quier modificar?"
+
+#: ../calendar/gui/dialogs/recur-comp.c:56
+#, c-format
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr "Ta delegando un acontecimientu que se repite. ¿Qué quier delegar?"
+
+#: ../calendar/gui/dialogs/recur-comp.c:60
+#, c-format
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr "Ta modificando una xera que se repite. ¿Qué quier modificar?"
+
+#: ../calendar/gui/dialogs/recur-comp.c:64
+#, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "Ta modificando una nota que se repite. ¿Qué quier modificar?"
+
+#: ../calendar/gui/dialogs/recur-comp.c:89
+msgid "This Instance Only"
+msgstr "Esta instancia namái"
+
+#: ../calendar/gui/dialogs/recur-comp.c:93
+msgid "This and Prior Instances"
+msgstr "Esta instancia y les anteriores"
+
+#: ../calendar/gui/dialogs/recur-comp.c:99
+msgid "This and Future Instances"
+msgstr "Esta instancia y les futures"
+
+#: ../calendar/gui/dialogs/recur-comp.c:104
+msgid "All Instances"
+msgstr "Toles instancies"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:562
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Esta cita tien repeticiones que nun pue ser iguaes por Evolution."
+
+#: ../calendar/gui/dialogs/recurrence-page.c:892
+msgid "Recurrence date is invalid"
+msgstr "La data de repetición ye inválida"
+
+#. 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:930
+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:994
+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:1000
+msgid "second"
+msgstr "segundu"
+
+#. 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:1005
+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:1010
+msgid "fourth"
+msgstr "cuartu"
+
+#. 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:1015
+msgid "last"
+msgstr "caberu"
+
+#. 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:1041
+msgid "Other Date"
+msgstr "Otra 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:1049
+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:1055
+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:1061
+msgid "21st to 31st"
+msgstr "del 21 al 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:1084
+msgid "day"
+msgstr "día"
+
+#. 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:1210
+msgid "on the"
+msgstr "nel"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1386
+msgid "occurrences"
+msgstr "repeticiones"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2089
+msgid "Add exception"
+msgstr "Amestar esceición"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2130
+msgid "Could not get a selection to modify."
+msgstr "Nun ye dable obtener una seleición que modificar."
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2136
+msgid "Modify exception"
+msgstr "Modificar esceición"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2180
+msgid "Could not get a selection to delete."
+msgstr "Nun ye dable obtener una seleición qu'esaniciar."
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2304
+msgid "Date/Time"
+msgstr "Data/Hora"
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
+msgid "<b>Exceptions</b>"
+msgstr "<b>Esceiciones</b>"
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
+#: ../mail/mail-config.glade.h:3
+msgid "<b>Preview</b>"
+msgstr "<b>Vista previa</b>"
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
+msgid "<b>Recurrence</b>"
+msgstr "<b>Repetición</b>"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "Every"
+msgstr "Cada"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "This appointment rec_urs"
+msgstr "Esta cita _repítese"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "forever"
+msgstr "pa siempres"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
+msgid "month(s)"
+msgstr "mes(es)"
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
+msgid "week(s)"
+msgstr "selmana(es)"
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
+msgid "year(s)"
+msgstr "añu(os)"
+
+#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-details-page.c:397
+msgid "Completed date is wrong"
+msgstr "La data de terminación ye errónea"
+
+#: ../calendar/gui/dialogs/task-details-page.c:482
+msgid "Web Page"
+msgstr "Páxina web"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "<span weight=\"bold\">Miscellaneous</span>"
+msgstr "<span weight=\"bold\"> Miscelánea</span>"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Estáu</span>"
+
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/dialogs/task-details-page.glade.h:4
+#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-model-tasks.c:362
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/print.c:2554 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:366
+msgid "Completed"
+msgstr "Completáu"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:5
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1066
+msgid "High"
+msgstr "Altu/a"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:6
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-cal-model-tasks.c:754
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2551
+msgid "In Progress"
+msgstr "En procesu"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:7
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:568 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1064
+msgid "Low"
+msgstr "Baxu/a"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:8
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1065
+msgid "Normal"
+msgstr "Normal"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:260
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:639 ../calendar/gui/print.c:2548
+#: ../calendar/gui/tasktypes.xml.h:33
+msgid "Not Started"
+msgstr "Ensin entamar"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+msgid "P_ercent complete:"
+msgstr "_Porcentax completáu:"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Stat_us:"
+msgstr "_Estáu:"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:44
+msgid "Undefined"
+msgstr "Ensin definir"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+msgid "_Date completed:"
+msgstr "_Data de terminación:"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../widgets/misc/e-send-options.glade.h:34
+msgid "_Priority:"
+msgstr "_Prioridá:"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Web Page:"
+msgstr "Páxina _web:"
+
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "_Status Details"
+msgstr "Detáis d'_estáu"
+
+#: ../calendar/gui/dialogs/task-editor.c:115
+msgid "Click to change or view the status details of the task"
+msgstr "Calque pa camudar o ver los detalles del estáu de la xera"
+
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:527
+msgid "_Send Options"
+msgstr "Opciones d'_unvíu"
+
+#: ../calendar/gui/dialogs/task-editor.c:318
+msgid "_Task"
+msgstr "_Xera"
+
+#: ../calendar/gui/dialogs/task-editor.c:321
+msgid "Task Details"
+msgstr "Detáis"
+
+#: ../calendar/gui/dialogs/task-page.c:372
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Organi_zer:"
+msgstr "Organi_zador:"
+
+#: ../calendar/gui/dialogs/task-page.c:785
+msgid "Due date is wrong"
+msgstr "La data de vencimientu ye errónea"
+
+#: ../calendar/gui/dialogs/task-page.c:1754
+#, c-format
+msgid "Unable to open tasks in '%s'."
+msgstr "Nun ye dable abrir les xeres en «%s»."
+
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
+msgstr "_Participantes…"
+
+#: ../calendar/gui/dialogs/task-page.glade.h:2
+msgid "Categor_ies..."
+msgstr "_Categoríes…"
+
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "D_ue date:"
+msgstr "Data de _vencimientu:"
+
+#: ../calendar/gui/dialogs/task-page.glade.h:7
+msgid "Time zone:"
+msgstr "Estaya horaria:"
+
+#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:394
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d día"
+msgstr[1] "%d díes"
+
+#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:400
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d selmana"
+msgstr[1] "%d selmanes"
+
+#: ../calendar/gui/e-alarm-list.c:462
+msgid "Unknown action to be performed"
+msgstr "Aición a facer desconocía"
+
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:476
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s enantes d'entamar 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:481
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s tres del entamu de la cita"
+
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:488
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s al entamu 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:499
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s enantes de la 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:504
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s tres finar la cita"
+
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:511
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s al finar 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:535
+#, 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:543
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s pa un tipu de disparador desconocíu"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3312
+#, c-format
+msgid "Click to open %s"
+msgstr "Calque p'abrir %s"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:858
+msgid "Untitled"
+msgstr "Ensin títulu"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
+msgid "Start Date:"
+msgstr "Data d'entamu:"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-itip-control.c:1218
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
+#: ../widgets/misc/e-attachment.glade.h:2
+msgid "Description:"
+msgstr "Descripción:"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
+msgid "Web Page:"
+msgstr "Páxina web:"
+
+#: ../calendar/gui/e-cal-component-preview.c:210
+#: ../calendar/gui/e-itip-control.c:1162
+#: ../calendar/gui/e-itip-control.glade.h:9
+msgid "Summary:"
+msgstr "Resume:"
+
+#: ../calendar/gui/e-cal-component-preview.c:239
+msgid "Due Date:"
+msgstr "Data de vencimientu:"
+
+#. write status
+#. Status
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/itip-formatter/itip-view.c:1029
+msgid "Status:"
+msgstr "Estáu:"
+
+#: ../calendar/gui/e-cal-component-preview.c:270
+msgid "Priority:"
+msgstr "Prioridá:"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Data de terminación"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
+msgid "Start Date"
+msgstr "Data d'entamu"
+
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:618
+msgid "Free"
+msgstr "Llibre"
+
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:396
+msgid "Busy"
+msgstr "Ocupada"
+
+#: ../calendar/gui/e-cal-model-tasks.c:627
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"La posición xeográfica tien d'introducirse col formatu: \n"
+"\n"
+"45.436845,125.862501"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:746
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
+msgid "Yes"
+msgstr "Sí"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:165
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+msgid "No"
+msgstr "Non"
+
+#. This is the default filename used for temporary file creation
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
+#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:987
+#: ../calendar/gui/print.c:1004 ../mail/em-utils.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:447
+#: ../plugins/itip-formatter/itip-formatter.c:2113
+#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:56
+msgid "Unknown"
+msgstr "Desconocíu"
+
+#: ../calendar/gui/e-cal-model.c:987
+msgid "Recurring"
+msgstr "Recurrente"
+
+#: ../calendar/gui/e-cal-model.c:989
+msgid "Assigned"
+msgstr "Asignáu"
+
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:416
+msgid "Save As..."
+msgstr "Guardar como…"
+
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2035
+msgid "Select folder to save selected attachments..."
+msgstr "Seleicione la carpeta au atroxar los axuntos seleicionaos…"
+
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:444
+#, c-format
+msgid "untitled_image.%s"
+msgstr "imaxe-_ensin-títulu.%s"
+
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1578
+#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:925
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+msgid "_Save As..."
+msgstr "Guardar _como…"
+
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
+msgid "Set as _Background"
+msgstr "Afitar como _fondu"
+
+#: ../calendar/gui/e-cal-popup.c:288
+msgid "_Save Selected"
+msgstr "_Guardar seleicionaos"
+
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:832
+#, c-format
+msgid "Open in %s..."
+msgstr "Abrir en %s…"
+
+#: ../calendar/gui/e-calendar-table.c:337
+msgid "* No Summary *"
+msgstr "* Ensin resume *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2214
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organizador: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:2218
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organizador: %s"
+
+#: ../calendar/gui/e-calendar-table.c:407
+msgid "Start: "
+msgstr "Entama: "
+
+#: ../calendar/gui/e-calendar-table.c:419
+msgid "Due: "
+msgstr "Fina: "
+
+#: ../calendar/gui/e-calendar-table.c:588
+msgid "0%"
+msgstr "0%"
+
+#: ../calendar/gui/e-calendar-table.c:589
+msgid "10%"
+msgstr "10%"
+
+#: ../calendar/gui/e-calendar-table.c:590
+msgid "20%"
+msgstr "20%"
+
+#: ../calendar/gui/e-calendar-table.c:591
+msgid "30%"
+msgstr "30%"
+
+#: ../calendar/gui/e-calendar-table.c:592
+msgid "40%"
+msgstr "40%"
+
+#: ../calendar/gui/e-calendar-table.c:593
+msgid "50%"
+msgstr "50%"
+
+#: ../calendar/gui/e-calendar-table.c:594
+msgid "60%"
+msgstr "60%"
+
+#: ../calendar/gui/e-calendar-table.c:595
+msgid "70%"
+msgstr "70%"
+
+#: ../calendar/gui/e-calendar-table.c:596
+msgid "80%"
+msgstr "80%"
+
+#: ../calendar/gui/e-calendar-table.c:597
+msgid "90%"
+msgstr "90%"
+
+#: ../calendar/gui/e-calendar-table.c:598
+msgid "100%"
+msgstr "100%"
+
+#: ../calendar/gui/e-calendar-table.c:878
+#: ../calendar/gui/e-calendar-view.c:664 ../calendar/gui/e-memo-table.c:438
+msgid "Deleting selected objects"
+msgstr "Esaniciando los oxetos seleicionaos"
+
+#: ../calendar/gui/e-calendar-table.c:1162
+#: ../calendar/gui/e-calendar-view.c:794 ../calendar/gui/e-memo-table.c:644
+msgid "Updating objects"
+msgstr "Autualizando oxetos"
+
+#: ../calendar/gui/e-calendar-table.c:1350
+#: ../calendar/gui/e-calendar-view.c:1220 ../calendar/gui/e-memo-table.c:820
+#: ../composer/e-composer-actions.c:277
+msgid "Save as..."
+msgstr "Guardar como…"
+
+#: ../calendar/gui/e-calendar-table.c:1573
+#: ../calendar/gui/e-calendar-view.c:1653
+msgid "New _Task"
+msgstr "_Xera nueva"
+
+#: ../calendar/gui/e-calendar-table.c:1577 ../calendar/gui/e-memo-table.c:924
+msgid "Open _Web Page"
+msgstr "Abrir páxina _web"
+
+#: ../calendar/gui/e-calendar-table.c:1579
+#: ../calendar/gui/e-calendar-view.c:1656 ../calendar/gui/e-memo-table.c:926
+msgid "P_rint..."
+msgstr "_Imprentar…"
+
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1676 ../calendar/gui/e-memo-table.c:930
+#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "C_ortar"
+
+#: ../calendar/gui/e-calendar-table.c:1585
+#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
+msgid "_Paste"
+msgstr "_Pegar"
+
+#: ../calendar/gui/e-calendar-table.c:1589 ../ui/evolution-tasks.xml.h:22
+msgid "_Assign Task"
+msgstr "_Asignar xera"
+
+#: ../calendar/gui/e-calendar-table.c:1590 ../calendar/gui/e-memo-table.c:936
+#: ../ui/evolution-tasks.xml.h:26
+msgid "_Forward as iCalendar"
+msgstr "_Reunviar como iCalendar"
+
+#: ../calendar/gui/e-calendar-table.c:1591
+msgid "_Mark as Complete"
+msgstr "_Conseñar como termináu"
+
+#: ../calendar/gui/e-calendar-table.c:1592
+msgid "_Mark Selected Tasks as Complete"
+msgstr "_Conseñar xeres seleicionaes como terminaes"
+
+#: ../calendar/gui/e-calendar-table.c:1593
+msgid "_Mark as Incomplete"
+msgstr "_Conseñar como incompletu"
+
+#: ../calendar/gui/e-calendar-table.c:1594
+msgid "_Mark Selected Tasks as Incomplete"
+msgstr "_Conseñar xeres seleicionaes como incompletes"
+
+#: ../calendar/gui/e-calendar-table.c:1599
+msgid "_Delete Selected Tasks"
+msgstr "_Esaniciar les xeres seleicionaes"
+
+#: ../calendar/gui/e-calendar-table.c:1836
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "Calque p'amestar una xera"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% Termináu"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:5
+msgid "Complete"
+msgstr "Completáu"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:6
+msgid "Completion date"
+msgstr "Data de terminación"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+msgid "Due date"
+msgstr "Data de vencimientu"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:373
+msgid "Priority"
+msgstr "Prioridá"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+msgid "Start date"
+msgstr "Data d'entamu"
+
+#: ../calendar/gui/e-calendar-view.c:1339
+msgid "Moving items"
+msgstr "Moviendo elementos"
+
+#: ../calendar/gui/e-calendar-view.c:1341
+msgid "Copying items"
+msgstr "Copiando elementos"
+
+#: ../calendar/gui/e-calendar-view.c:1650
+msgid "New _Appointment..."
+msgstr "_Cita nueva…"
+
+#: ../calendar/gui/e-calendar-view.c:1651
+msgid "New All Day _Event"
+msgstr "Acont_ecimientu nuevu pa tol día"
+
+#: ../calendar/gui/e-calendar-view.c:1652
+msgid "New _Meeting"
+msgstr "_Reunión nueva"
+
+#. FIXME: hook in this somehow
+#: ../calendar/gui/e-calendar-view.c:1663
+msgid "_Current View"
+msgstr "Vista _autual"
+
+#: ../calendar/gui/e-calendar-view.c:1665
+msgid "Select T_oday"
+msgstr "Seleicionar _güei"
+
+#: ../calendar/gui/e-calendar-view.c:1666
+msgid "_Select Date..."
+msgstr "_Seleicionar data…"
+
+#: ../calendar/gui/e-calendar-view.c:1672
+msgid "Pri_nt..."
+msgstr "_Imprentar…"
+
+#: ../calendar/gui/e-calendar-view.c:1682
+msgid "Cop_y to Calendar..."
+msgstr "Cop_iar al calendariu…"
+
+#: ../calendar/gui/e-calendar-view.c:1683
+msgid "Mo_ve to Calendar..."
+msgstr "Mo_ver al calendariu…"
+
+#: ../calendar/gui/e-calendar-view.c:1684
+msgid "_Delegate Meeting..."
+msgstr "_Delegar reunión…"
+
+#: ../calendar/gui/e-calendar-view.c:1685
+msgid "_Schedule Meeting..."
+msgstr "Concertar una _reunión..."
+
+#: ../calendar/gui/e-calendar-view.c:1686
+msgid "_Forward as iCalendar..."
+msgstr "Reunviar como i_Calendar…"
+
+#: ../calendar/gui/e-calendar-view.c:1687
+msgid "_Reply"
+msgstr "_Retrucar"
+
+#: ../calendar/gui/e-calendar-view.c:1688 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../ui/evolution-mail-message.xml.h:82
+msgid "Reply to _All"
+msgstr "Retrucar a _toos"
+
+#: ../calendar/gui/e-calendar-view.c:1693
+msgid "Make this Occurrence _Movable"
+msgstr "Facer esta repetición _movible"
+
+#: ../calendar/gui/e-calendar-view.c:1694 ../ui/evolution-calendar.xml.h:9
+msgid "Delete this _Occurrence"
+msgstr "Esaniciar esta _repetición"
+
+#: ../calendar/gui/e-calendar-view.c:1695
+msgid "Delete _All Occurrences"
+msgstr "Es_aniciar toles repeticiones"
+
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:2234 ../calendar/gui/print.c:2510
+#, c-format
+msgid "Location: %s"
+msgstr "Llugar: %s"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:2268
+#, 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:111
+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:114
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %e/%m/%Y %I:%M:%S %p"
+
+#: ../calendar/gui/e-cell-date-edit-text.c:122
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"%s"
+msgstr ""
+"La data tien d'introducise col formatu: \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:583
+#, c-format
+msgid "%02i minute divisions"
+msgstr "divisiones de %02i minutos"
+
+#. 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:851 ../calendar/gui/e-day-view.c:1560
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1674
+msgid "%A %d %B"
+msgstr "%A %e de %B"
+
+#. String to use in 12-hour time format for times in the morning.
+#: ../calendar/gui/e-day-view.c:800 ../calendar/gui/e-week-view.c:540
+#: ../calendar/gui/print.c:831
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: ../calendar/gui/e-day-view.c:803 ../calendar/gui/e-week-view.c:543
+#: ../calendar/gui/print.c:833
+msgid "pm"
+msgstr "pm"
+
+#: ../calendar/gui/e-itip-control.c:765
+msgid "Yes. (Complex Recurrence)"
+msgstr "Sí. (Repetición compuesta)"
+
+#: ../calendar/gui/e-itip-control.c:782
+#, c-format
+msgid "Every day"
+msgid_plural "Every %d days"
+msgstr[0] "Cada %d día"
+msgstr[1] "Cada %d díes"
+
+#: ../calendar/gui/e-itip-control.c:795
+#, c-format
+msgid "Every week"
+msgid_plural "Every %d weeks"
+msgstr[0] "Cada %d selmana"
+msgstr[1] "Cada %d selmanes"
+
+#: ../calendar/gui/e-itip-control.c:802
+#, c-format
+msgid "Every week on "
+msgid_plural "Every %d weeks on "
+msgstr[0] "Cada selmana en "
+msgstr[1] "Cada %d selmanes el "
+
+#. 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 " y "
+
+#: ../calendar/gui/e-itip-control.c:822
+#, c-format
+msgid "The %s day of "
+msgstr "El %s día de "
+
+#: ../calendar/gui/e-itip-control.c:838
+#, c-format
+msgid "The %s %s of "
+msgstr "El %s %s de "
+
+#: ../calendar/gui/e-itip-control.c:849
+#, c-format
+msgid "every month"
+msgid_plural "every %d months"
+msgstr[0] "cada mes"
+msgstr[1] "cada %d meses"
+
+#: ../calendar/gui/e-itip-control.c:861
+#, c-format
+msgid "Every year"
+msgid_plural "Every %d years"
+msgstr[0] "Cada añu"
+msgstr[1] "Cada %d años"
+
+#: ../calendar/gui/e-itip-control.c:874
+#, c-format
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] "un total de %d vegada"
+msgstr[1] "un total de %d vegaes"
+
+#. 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 ", finando en "
+
+#. For Translators : 'starts' is starts:date implying a task starts on what date
+#: ../calendar/gui/e-itip-control.c:907
+msgid "Starts"
+msgstr "Entama"
+
+#. For Translators : 'ends' is ends:date implying a task ends on what date
+#: ../calendar/gui/e-itip-control.c:921
+msgid "Ends"
+msgstr "Fina"
+
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:371
+msgid "Due"
+msgstr "Vence"
+
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
+msgid "iCalendar Information"
+msgstr "Información de iCalendar"
+
+#. Title
+#: ../calendar/gui/e-itip-control.c:1020
+msgid "iCalendar Error"
+msgstr "Fallu de iCalendar"
+
+#: ../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:344
+#: ../plugins/itip-formatter/itip-view.c:345
+#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:520
+#: ../plugins/itip-formatter/itip-view.c:521
+msgid "An unknown person"
+msgstr "Una persona desconocía"
+
+#. Describe what the user can do
+#: ../calendar/gui/e-itip-control.c:1143
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Revise la siguiente información y seleicione una aición del menú "
+"d'abaxo."
+
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/itip-utils.c:664
+#: ../plugins/itip-formatter/itip-formatter.c:2101
+msgid "Accepted"
+msgstr "Aceutáu"
+
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2104
+msgid "Tentatively Accepted"
+msgstr "Aceutáu provisionalmente"
+
+#: ../calendar/gui/e-itip-control.c:1199
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
+#: ../plugins/itip-formatter/itip-formatter.c:2107
+msgid "Declined"
+msgstr "Declináu/ada"
+
+#: ../calendar/gui/e-itip-control.c:1283
+msgid ""
+"The meeting has been canceled, however it could not be found in your "
+"calendars"
+msgstr "La reunión encaboxóse, sicasí nun pudo alcontrase nos sos calendarios"
+
+#: ../calendar/gui/e-itip-control.c:1285
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
+msgstr ""
+"La xera encaboxóse, sicasí nun pudo alcontrase nes sos llistes de xeres."
+
+#: ../calendar/gui/e-itip-control.c:1363
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> asoleyó información de reunión."
+
+#: ../calendar/gui/e-itip-control.c:1364
+msgid "Meeting Information"
+msgstr "Información de reunión"
+
+#: ../calendar/gui/e-itip-control.c:1370
+#, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr "<b>%s</b> solicita la presencia de %s nuna reunión."
+
+#: ../calendar/gui/e-itip-control.c:1372
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> solicita la so presencia nuna reunión."
+
+#: ../calendar/gui/e-itip-control.c:1373
+msgid "Meeting Proposal"
+msgstr "Propuesta de reunión"
+
+#. FIXME Whats going on here?
+#: ../calendar/gui/e-itip-control.c:1379
+#, c-format
+msgid "<b>%s</b> wishes to be added to an existing meeting."
+msgstr "<b>%s</b> deseya apuntase a una reunión esistente."
+
+#: ../calendar/gui/e-itip-control.c:1380
+msgid "Meeting Update"
+msgstr "Autualización de reunión"
+
+#: ../calendar/gui/e-itip-control.c:1384
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> deseya recibir la cabera información de la reunión."
+
+#: ../calendar/gui/e-itip-control.c:1385
+msgid "Meeting Update Request"
+msgstr "Solicitú d'autualización de la reunión"
+
+#: ../calendar/gui/e-itip-control.c:1392
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> contestó a la solicitú de reunión."
+
+#: ../calendar/gui/e-itip-control.c:1393
+msgid "Meeting Reply"
+msgstr "Rempuesta de reunión"
+
+#: ../calendar/gui/e-itip-control.c:1400
+#, c-format
+msgid "<b>%s</b> has canceled a meeting."
+msgstr "<b>%s</b> encaboxó una reunión."
+
+#: ../calendar/gui/e-itip-control.c:1401
+msgid "Meeting Cancelation"
+msgstr "Encaboxamientu de reunión"
+
+#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1528
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> unvió un mensax inintelixible."
+
+#: ../calendar/gui/e-itip-control.c:1412
+msgid "Bad Meeting Message"
+msgstr "Mensax de reunión erróneu"
+
+#: ../calendar/gui/e-itip-control.c:1439
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> asoleyó la información de la xera."
+
+#: ../calendar/gui/e-itip-control.c:1440
+msgid "Task Information"
+msgstr "Información de la xera"
+
+#: ../calendar/gui/e-itip-control.c:1447
+#, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr "<b>%s</b> pide a %s que faiga una xera."
+
+#: ../calendar/gui/e-itip-control.c:1449
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> pide-y que faiga una xera."
+
+#: ../calendar/gui/e-itip-control.c:1450
+msgid "Task Proposal"
+msgstr "Propuesta de xera"
+
+#. FIXME Whats going on here?
+#: ../calendar/gui/e-itip-control.c:1456
+#, c-format
+msgid "<b>%s</b> wishes to be added to an existing task."
+msgstr "<b>%s</b> deseya xunise a una xera esistente."
+
+#: ../calendar/gui/e-itip-control.c:1457
+msgid "Task Update"
+msgstr "Autualización de xera"
+
+#: ../calendar/gui/e-itip-control.c:1461
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> quier recibir la cabera información de la xera."
+
+#: ../calendar/gui/e-itip-control.c:1462
+msgid "Task Update Request"
+msgstr "Solicitú d'autualización de xera"
+
+#: ../calendar/gui/e-itip-control.c:1469
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> retrucó a una asignación de xera."
+
+#: ../calendar/gui/e-itip-control.c:1470
+msgid "Task Reply"
+msgstr "Rempuesta a una xera"
+
+#: ../calendar/gui/e-itip-control.c:1477
+#, c-format
+msgid "<b>%s</b> has canceled a task."
+msgstr "<b>%s</b> encaboxó una xera."
+
+#: ../calendar/gui/e-itip-control.c:1478
+msgid "Task Cancelation"
+msgstr "Encaboxamientu de xera"
+
+#: ../calendar/gui/e-itip-control.c:1489
+msgid "Bad Task Message"
+msgstr "Mensax de xera erróneu"
+
+#: ../calendar/gui/e-itip-control.c:1513
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> asoleyó la información de disponibilidá."
+
+#: ../calendar/gui/e-itip-control.c:1514
+msgid "Free/Busy Information"
+msgstr "Información de disponibilidá"
+
+#: ../calendar/gui/e-itip-control.c:1518
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> pide la so información de disponibilidá."
+
+#: ../calendar/gui/e-itip-control.c:1519
+msgid "Free/Busy Request"
+msgstr "Solicitú de disponibilidá"
+
+#: ../calendar/gui/e-itip-control.c:1523
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> retrucó a una solicitú de disponibilidá."
+
+#: ../calendar/gui/e-itip-control.c:1524
+msgid "Free/Busy Reply"
+msgstr "Rempuesta sobro disponibilidá"
+
+#: ../calendar/gui/e-itip-control.c:1529
+msgid "Bad Free/Busy Message"
+msgstr "Mensax de disponibilidá erróneu"
+
+#: ../calendar/gui/e-itip-control.c:1605
+msgid "The message does not appear to be properly formed"
+msgstr "El mensax nun paez tar formáu correchamente"
+
+#: ../calendar/gui/e-itip-control.c:1664
+msgid "The message contains only unsupported requests."
+msgstr "Esti mensax namái contién solicitúes non sofitaes."
+
+#: ../calendar/gui/e-itip-control.c:1697
+msgid "The attachment does not contain a valid calendar message"
+msgstr "L'axuntu nun contién un mensax de calendariu válidu."
+
+#: ../calendar/gui/e-itip-control.c:1735
+msgid "The attachment has no viewable calendar items"
+msgstr "L'axuntu nun tien elementos de calendariu visibles"
+
+#: ../calendar/gui/e-itip-control.c:1980
+msgid "Update complete\n"
+msgstr "Autualización finada\n"
+
+#: ../calendar/gui/e-itip-control.c:2014
+msgid "Object is invalid and cannot be updated\n"
+msgstr "L'oxetu ye inválidu y nun pue autualizase\n"
+
+#: ../calendar/gui/e-itip-control.c:2031
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+"Esta rempuesta nun ye d'un participante. ¿Deseya amestalu como participante?"
+
+#: ../calendar/gui/e-itip-control.c:2049
+msgid "Attendee status could not be updated because of an invalid status!\n"
+msgstr ""
+"L'estáu del participante nun pudo actualizase darréu d'un estáu inválidu\n"
+
+#: ../calendar/gui/e-itip-control.c:2073
+msgid "Attendee status updated\n"
+msgstr "Estáu del participante autualizáu\n"
+
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1301
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+"L'estáu del participante nun pudo actualizase porque yá nun esiste l'elementu"
+
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
+msgid "Item sent!\n"
+msgstr "Elementu unviáu.\n"
+
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
+msgid "The item could not be sent!\n"
+msgstr "L'elementu nun pudo unviase.\n"
+
+#: ../calendar/gui/e-itip-control.c:2256
+msgid "Choose an action:"
+msgstr "Escueya una aición:"
+
+#: ../calendar/gui/e-itip-control.c:2327
+msgid "Update"
+msgstr "Autualizar"
+
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/process-meeting.c:51
+msgid "Accept"
+msgstr "Aceutar"
+
+#: ../calendar/gui/e-itip-control.c:2356
+msgid "Tentatively accept"
+msgstr "Aceutar provisionalmente"
+
+#: ../calendar/gui/e-itip-control.c:2357
+#: ../plugins/groupwise-features/process-meeting.c:53
+msgid "Decline"
+msgstr "Refugar"
+
+#: ../calendar/gui/e-itip-control.c:2386
+msgid "Send Free/Busy Information"
+msgstr "Unviar información de disponibilidá"
+
+#: ../calendar/gui/e-itip-control.c:2414
+msgid "Update respondent status"
+msgstr "Autualizar l'estáu del remitente"
+
+#: ../calendar/gui/e-itip-control.c:2442
+msgid "Send Latest Information"
+msgstr "Unviar la cabera información"
+
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
+#: ../ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Encaboxar"
+
+#: ../calendar/gui/e-itip-control.glade.h:1
+msgid "--to--"
+msgstr "--a--"
+
+#: ../calendar/gui/e-itip-control.glade.h:2
+msgid "Calendar Message"
+msgstr "Mensax de calendariu"
+
+#: ../calendar/gui/e-itip-control.glade.h:3
+msgid "Date:"
+msgstr "Data:"
+
+#: ../calendar/gui/e-itip-control.glade.h:5
+msgid "Loading Calendar"
+msgstr "Cargando calendariu"
+
+#: ../calendar/gui/e-itip-control.glade.h:6
+msgid "Loading calendar..."
+msgstr "Cargando calendariu…"
+
+#: ../calendar/gui/e-itip-control.glade.h:8
+msgid "Server Message:"
+msgstr "Mensax del servidor:"
+
+#: ../calendar/gui/e-meeting-list-view.c:68
+msgid "Chair Persons"
+msgstr "Presidencia"
+
+#: ../calendar/gui/e-meeting-list-view.c:69
+msgid "Required Participants"
+msgstr "Participantes requeríos"
+
+#: ../calendar/gui/e-meeting-list-view.c:70
+msgid "Optional Participants"
+msgstr "Participantes opcionales"
+
+#: ../calendar/gui/e-meeting-list-view.c:71
+msgid "Resources"
+msgstr "Recursos"
+
+#: ../calendar/gui/e-meeting-list-view.c:152
+msgid "Attendees"
+msgstr "Participantes"
+
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:983
+msgid "Individual"
+msgstr "Individual"
+
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:984 ../widgets/table/e-table-config.glade.h:7
+msgid "Group"
+msgstr "Grupu"
+
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:985
+msgid "Resource"
+msgstr "Recursu"
+
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
+#: ../calendar/gui/print.c:986
+msgid "Room"
+msgstr "Sala"
+
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/print.c:1000
+msgid "Chair"
+msgstr "Silla"
+
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:1001
+msgid "Required Participant"
+msgstr "Participante requeríu"
+
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:1002
+msgid "Optional Participant"
+msgstr "Participante opcional"
+
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/print.c:1003
+msgid "Non-Participant"
+msgstr "Nun participen"
+
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:753
+msgid "Needs Action"
+msgstr "Necesítase aición"
+
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../calendar/gui/e-meeting-time-sel.c:395
+msgid "Tentative"
+msgstr "Provisional"
+
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/itip-utils.c:673
+#: ../plugins/itip-formatter/itip-formatter.c:2110
+msgid "Delegated"
+msgstr "Delegáu"
+
+#. The extra space is just a hack to occupy more space for Attendee
+#: ../calendar/gui/e-meeting-list-view.c:491
+msgid "Attendee                          "
+msgstr "Participante                          "
+
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:533
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "Confirmar"
+
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+msgid "In Process"
+msgstr "En procesu"
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2120
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %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:471
+#: ../calendar/gui/e-meeting-time-sel.c:2151
+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:475
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: ../calendar/gui/e-meeting-time-sel.c:397
+msgid "Out of Office"
+msgstr "Fuera de la oficina"
+
+#: ../calendar/gui/e-meeting-time-sel.c:398
+msgid "No Information"
+msgstr "Ensin información"
+
+#: ../calendar/gui/e-meeting-time-sel.c:413
+msgid "A_ttendees..."
+msgstr "_Participantes…"
+
+#: ../calendar/gui/e-meeting-time-sel.c:434
+msgid "O_ptions"
+msgstr "O_pciones"
+
+#: ../calendar/gui/e-meeting-time-sel.c:451
+msgid "Show _only working hours"
+msgstr "Amosar _namái les hores de trabayu"
+
+#: ../calendar/gui/e-meeting-time-sel.c:461
+msgid "Show _zoomed out"
+msgstr "Amosar quitando _ampliación"
+
+#: ../calendar/gui/e-meeting-time-sel.c:476
+msgid "_Update free/busy"
+msgstr "_Autualizar disponibilidá"
+
+#: ../calendar/gui/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr "_<<"
+
+#: ../calendar/gui/e-meeting-time-sel.c:509
+msgid "_Autopick"
+msgstr "_Auto-seleicionar"
+
+#: ../calendar/gui/e-meeting-time-sel.c:524
+msgid ">_>"
+msgstr ">_>"
+
+#: ../calendar/gui/e-meeting-time-sel.c:541
+msgid "_All people and resources"
+msgstr "_Toles persones y los recursos"
+
+#: ../calendar/gui/e-meeting-time-sel.c:550
+msgid "All _people and one resource"
+msgstr "Toles _persones y un recursu"
+
+#: ../calendar/gui/e-meeting-time-sel.c:559
+msgid "_Required people"
+msgstr "Persones _requeríes"
+
+#: ../calendar/gui/e-meeting-time-sel.c:568
+msgid "Required people and _one resource"
+msgstr "Persones requeríes y _un recursu"
+
+#: ../calendar/gui/e-meeting-time-sel.c:604
+msgid "_Start time:"
+msgstr "Hora d'_entamu:"
+
+#: ../calendar/gui/e-meeting-time-sel.c:631
+msgid "_End time:"
+msgstr "Hora de _fin:"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "Calque equí p'amestar un participante"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Nome común"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Delegáu por"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Delegáu a"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Llingua"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Miembru"
+
+#: ../calendar/gui/e-memo-table.c:941
+msgid "_Delete Selected Memos"
+msgstr "_Esaniciar les notes seleicionaes"
+
+#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
+msgid "Click to add a memo"
+msgstr "Calque equí p'amestar una nota"
+
+#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/gnome-cal.c:2961
+#, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr ""
+"Fallu en %s:\n"
+" %s"
+
+#: ../calendar/gui/e-memos.c:809
+msgid "Loading memos"
+msgstr "Cargando notes"
+
+#: ../calendar/gui/e-memos.c:890
+#, c-format
+msgid "Opening memos at %s"
+msgstr "Abriendo notes en %s"
+
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
+msgid "Deleting selected objects..."
+msgstr "Esaniciando los oxetos seleicionaos…"
+
+#: ../calendar/gui/e-tasks.c:963
+msgid "Loading tasks"
+msgstr "Cargando xeres"
+
+#: ../calendar/gui/e-tasks.c:1053
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Abriendo xeres en %s"
+
+#: ../calendar/gui/e-tasks.c:1298
+msgid "Completing tasks..."
+msgstr "Completando xeres…"
+
+#: ../calendar/gui/e-tasks.c:1348
+msgid "Expunging"
+msgstr "Compautando"
+
+#: ../calendar/gui/e-timezone-entry.c:128
+msgid "Select Timezone"
+msgstr "Seleicione la estaya horaria"
+
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1655
+msgid "%d %B"
+msgstr "%e de %B"
+
+#: ../calendar/gui/gnome-cal.c:2576
+msgid "_Custom View"
+msgstr "Vista _personalizada"
+
+#: ../calendar/gui/gnome-cal.c:2577
+msgid "_Save Custom View"
+msgstr "_Guardar vista personalizada"
+
+#: ../calendar/gui/gnome-cal.c:2582
+msgid "_Define Views..."
+msgstr "_Definir vistes…"
+
+#: ../calendar/gui/gnome-cal.c:2791
+#, c-format
+msgid "Loading appointments at %s"
+msgstr "Cargando cites de %s"
+
+#: ../calendar/gui/gnome-cal.c:2806
+#, c-format
+msgid "Loading tasks at %s"
+msgstr "Cargando xeres de %s"
+
+#: ../calendar/gui/gnome-cal.c:2815
+#, c-format
+msgid "Loading memos at %s"
+msgstr "Cargando notes en %s"
+
+#: ../calendar/gui/gnome-cal.c:2920
+#, c-format
+msgid "Opening %s"
+msgstr "Abriendo %s"
+
+#: ../calendar/gui/gnome-cal.c:3874
+msgid "Purging"
+msgstr "Compautando"
+
+#: ../calendar/gui/goto-dialog.glade.h:1
+msgid "April"
+msgstr "Abril"
+
+#: ../calendar/gui/goto-dialog.glade.h:2
+msgid "August"
+msgstr "Agostu"
+
+#: ../calendar/gui/goto-dialog.glade.h:3
+msgid "December"
+msgstr "Avientu"
+
+#: ../calendar/gui/goto-dialog.glade.h:4
+msgid "February"
+msgstr "Febreru"
+
+#: ../calendar/gui/goto-dialog.glade.h:5
+msgid "January"
+msgstr "Xineru"
+
+#: ../calendar/gui/goto-dialog.glade.h:6
+msgid "July"
+msgstr "Xunetu"
+
+#: ../calendar/gui/goto-dialog.glade.h:7
+msgid "June"
+msgstr "Xunu"
+
+#: ../calendar/gui/goto-dialog.glade.h:8
+msgid "March"
+msgstr "Marzu"
+
+#: ../calendar/gui/goto-dialog.glade.h:9
+msgid "May"
+msgstr "Mayu"
+
+#: ../calendar/gui/goto-dialog.glade.h:10
+msgid "November"
+msgstr "Payares"
+
+#: ../calendar/gui/goto-dialog.glade.h:11
+msgid "October"
+msgstr "Ochobre"
+
+#: ../calendar/gui/goto-dialog.glade.h:12
+msgid "Select Date"
+msgstr "Data selecionada"
+
+#: ../calendar/gui/goto-dialog.glade.h:13
+msgid "September"
+msgstr "Setiembre"
+
+#: ../calendar/gui/goto-dialog.glade.h:14
+msgid "_Select Today"
+msgstr "_Seleicionar güei"
+
+#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
+#: ../calendar/gui/itip-utils.c:544
+msgid "An organizer must be set."
+msgstr "Tien d'especificar un organizador."
+
+#: ../calendar/gui/itip-utils.c:448
+msgid "At least one attendee is necessary"
+msgstr "Faise necesario polo menos un participante"
+
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
+msgid "Event information"
+msgstr "Información del asocedimientu"
+
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
+msgid "Task information"
+msgstr "Información de la xera"
+
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
+msgid "Memo information"
+msgstr "Información de la nota"
+
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
+msgid "Free/Busy information"
+msgstr "Información de disponibilidá"
+
+#: ../calendar/gui/itip-utils.c:634
+msgid "Calendar information"
+msgstr "Información de calendariu"
+
+#: ../calendar/gui/itip-utils.c:683
+msgid "Updated"
+msgstr "Autualizáu"
+
+#: ../calendar/gui/itip-utils.c:691
+msgid "Refresh"
+msgstr "Refrescar"
+
+#: ../calendar/gui/itip-utils.c:695
+msgid "Counter-proposal"
+msgstr "Escontra-propuesta"
+
+#: ../calendar/gui/itip-utils.c:762
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr "Información de disponibilidá (de %s a %s)"
+
+#: ../calendar/gui/itip-utils.c:770
+msgid "iCalendar information"
+msgstr "Información de iCalendar"
+
+#: ../calendar/gui/itip-utils.c:941
+msgid "You must be an attendee of the event."
+msgstr "Tien de ser un participante nel asocedimientu."
+
+#: ../calendar/gui/memos-component.c:489
+msgid "_New Memo List"
+msgstr "Llista de notes _nueva"
+
+#: ../calendar/gui/memos-component.c:571
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d nota"
+msgstr[1] "%d notes"
+
+#: ../calendar/gui/memos-component.c:573 ../calendar/gui/tasks-component.c:564
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ", %d seleicionáu"
+msgstr[1] ",%d seleicionaos"
+
+#: ../calendar/gui/memos-component.c:620
+msgid "Failed upgrading memos."
+msgstr "Fallu al autualizar les notes."
+
+#: ../calendar/gui/memos-component.c:980
+#, c-format
+msgid "Unable to open the memo list '%s' for creating events and meetings"
+msgstr ""
+"Nun ye dable abrir la llista de notes «%s» pa criar asocedimientos ya "
+"reuniones"
+
+#: ../calendar/gui/memos-component.c:993
+msgid "There is no calendar available for creating memos"
+msgstr "Nun hai un calendariu afayaízu pa criar notes"
+
+#: ../calendar/gui/memos-component.c:1103
+msgid "Memo Source Selector"
+msgstr "Seleutor d'orixe de notes"
+
+#: ../calendar/gui/memos-component.c:1287
+msgid "New memo"
+msgstr "Nota nueva"
+
+#: ../calendar/gui/memos-component.c:1289
+msgid "Create a new memo"
+msgstr "Cria una nota nueva"
+
+#: ../calendar/gui/memos-component.c:1295
+msgid "New shared memo"
+msgstr "Nota nueva compartida"
+
+#: ../calendar/gui/memos-component.c:1297
+msgid "Create a shared new memo"
+msgstr "Cria una nota compartida nueva"
+
+#: ../calendar/gui/memos-component.c:1303
+msgid "New memo list"
+msgstr "Llista de notes nueva"
+
+#: ../calendar/gui/memos-component.c:1305
+msgid "Create a new memo list"
+msgstr "Cria una llista de notes nueva"
+
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
+msgid "Print Memos"
+msgstr "Imprentar notes"
+
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "Próximos 7 díes"
+
+#: ../calendar/gui/migration.c:157
+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 ""
+"El llugar y xerarquía de les carpetes de xeres d'Evolution camudó dende "
+"Evolution 1.x.\n"
+"\n"
+"Tenga paciencia mentantu Evolution migra les sos carpetes…"
+
+#: ../calendar/gui/migration.c:161
+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 ""
+"El llugar y xerarquía de les carpetes de calendariu d'Evolution camudó dende "
+"Evolution 1.x.\n"
+"\n"
+"Tenga paciencia mentantu Evolution migra les sos carpetes…"
+
+#. FIXME: set proper domain/code
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#, c-format
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+"Nun ye dable migrar la configuración antigua dende evolution/config.xmldb"
+
+#. FIXME: domain/code
+#: ../calendar/gui/migration.c:804
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr "Nun ye dable migrar el calendariu «%s»"
+
+#. FIXME: domain/code
+#: ../calendar/gui/migration.c:972
+#, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Nun ye dable migrar les xeres en «%s»"
+
+#: ../calendar/gui/migration.c:1227
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
+msgid "Notes"
+msgstr "Notes"
+
+#: ../calendar/gui/print.c:517
+msgid "1st"
+msgstr "1º"
+
+#: ../calendar/gui/print.c:517
+msgid "2nd"
+msgstr "2º"
+
+#: ../calendar/gui/print.c:517
+msgid "3rd"
+msgstr "3"
+
+#: ../calendar/gui/print.c:517
+msgid "4th"
+msgstr "4º"
+
+#: ../calendar/gui/print.c:517
+msgid "5th"
+msgstr "5º"
+
+#: ../calendar/gui/print.c:518
+msgid "6th"
+msgstr "6º"
+
+#: ../calendar/gui/print.c:518
+msgid "7th"
+msgstr "7º"
+
+#: ../calendar/gui/print.c:518
+msgid "8th"
+msgstr "8º"
+
+#: ../calendar/gui/print.c:518
+msgid "9th"
+msgstr "9º"
+
+#: ../calendar/gui/print.c:518
+msgid "10th"
+msgstr "10º"
+
+#: ../calendar/gui/print.c:519
+msgid "11th"
+msgstr "11º"
+
+#: ../calendar/gui/print.c:519
+msgid "12th"
+msgstr "12º"
+
+#: ../calendar/gui/print.c:519
+msgid "13th"
+msgstr "13º"
+
+#: ../calendar/gui/print.c:519
+msgid "14th"
+msgstr "14º"
+
+#: ../calendar/gui/print.c:519
+msgid "15th"
+msgstr "15º"
+
+#: ../calendar/gui/print.c:520
+msgid "16th"
+msgstr "16º"
+
+#: ../calendar/gui/print.c:520
+msgid "17th"
+msgstr "17º"
+
+#: ../calendar/gui/print.c:520
+msgid "18th"
+msgstr "18º"
+
+#: ../calendar/gui/print.c:520
+msgid "19th"
+msgstr "19º"
+
+#: ../calendar/gui/print.c:520
+msgid "20th"
+msgstr "20º"
+
+#: ../calendar/gui/print.c:521
+msgid "21st"
+msgstr "21º"
+
+#: ../calendar/gui/print.c:521
+msgid "22nd"
+msgstr "22º"
+
+#: ../calendar/gui/print.c:521
+msgid "23rd"
+msgstr "23º"
+
+#: ../calendar/gui/print.c:521
+msgid "24th"
+msgstr "24º"
+
+#: ../calendar/gui/print.c:521
+msgid "25th"
+msgstr "25º"
+
+#: ../calendar/gui/print.c:522
+msgid "26th"
+msgstr "26º"
+
+#: ../calendar/gui/print.c:522
+msgid "27th"
+msgstr "27º"
+
+#: ../calendar/gui/print.c:522
+msgid "28th"
+msgstr "28º"
+
+#: ../calendar/gui/print.c:522
+msgid "29th"
+msgstr "29º"
+
+#: ../calendar/gui/print.c:522
+msgid "30th"
+msgstr "30º"
+
+#: ../calendar/gui/print.c:523
+msgid "31st"
+msgstr "31º"
+
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:598
+msgid "Su"
+msgstr "Do"
+
+#: ../calendar/gui/print.c:598
+msgid "Mo"
+msgstr "Ll"
+
+#: ../calendar/gui/print.c:598
+msgid "Tu"
+msgstr "Ma"
+
+#: ../calendar/gui/print.c:598
+msgid "We"
+msgstr "Mi"
+
+#: ../calendar/gui/print.c:599
+msgid "Th"
+msgstr "Xu"
+
+#: ../calendar/gui/print.c:599
+msgid "Fr"
+msgstr "Vi"
+
+#: ../calendar/gui/print.c:599
+msgid "Sa"
+msgstr "Sa"
+
+#: ../calendar/gui/print.c:2474
+msgid "Appointment"
+msgstr "Cita"
+
+#: ../calendar/gui/print.c:2476
+msgid "Task"
+msgstr "Xera"
+
+#: ../calendar/gui/print.c:2501
+#, c-format
+msgid "Summary: %s"
+msgstr "Resume: %s"
+
+#: ../calendar/gui/print.c:2524
+msgid "Attendees: "
+msgstr "Participantes: "
+
+#: ../calendar/gui/print.c:2564
+#, c-format
+msgid "Status: %s"
+msgstr "Estáu: %s"
+
+#: ../calendar/gui/print.c:2581
+#, c-format
+msgid "Priority: %s"
+msgstr "Prioridá: %s"
+
+#: ../calendar/gui/print.c:2593
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Porcentax completáu: %i"
+
+#: ../calendar/gui/print.c:2605
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: ../calendar/gui/print.c:2618
+#, c-format
+msgid "Categories: %s"
+msgstr "Categoríes: %s"
+
+#: ../calendar/gui/print.c:2629
+msgid "Contacts: "
+msgstr "Contautos: "
+
+#: ../calendar/gui/tasks-component.c:480
+msgid "_New Task List"
+msgstr "_Llista de xers nueva"
+
+#: ../calendar/gui/tasks-component.c:562
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d xera"
+msgstr[1] "%d xeres"
+
+#: ../calendar/gui/tasks-component.c:611
+msgid "Failed upgrading tasks."
+msgstr "Fallu al autualizar les xeres."
+
+#: ../calendar/gui/tasks-component.c:968
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+"Nun ye dable abrir la llista de xeres «%s» pa criar asocedimientos y reuniones"
+
+#: ../calendar/gui/tasks-component.c:981
+msgid "There is no calendar available for creating tasks"
+msgstr "Nun hai un calendariu disponible pa criar xeres"
+
+#: ../calendar/gui/tasks-component.c:1092
+msgid "Task Source Selector"
+msgstr "Seleutor d'orixe de xeres"
+
+#: ../calendar/gui/tasks-component.c:1352
+msgid "New task"
+msgstr "Xera nueva"
+
+#: ../calendar/gui/tasks-component.c:1354
+msgid "Create a new task"
+msgstr "Cria una xera nueva"
+
+#: ../calendar/gui/tasks-component.c:1360
+msgid "New assigned task"
+msgstr "Nueva xera asignada"
+
+#: ../calendar/gui/tasks-component.c:1362
+msgid "Create a new assigned task"
+msgstr "Cria una xera nueva asignada"
+
+#: ../calendar/gui/tasks-component.c:1368
+msgid "New task list"
+msgstr "Llista de xeres nueva"
+
+#: ../calendar/gui/tasks-component.c:1370
+msgid "Create a new task list"
+msgstr "Cria una llista de xeres nueva"
+
+#: ../calendar/gui/tasks-control.c:452
+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 desaniciará permanentemente toles xeres conseñaes como "
+"terminaes. Si sigui, nun podrá recuperales.\n"
+"\n"
+"¿Daveres quier desaniciar eses xeres?"
+
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
+msgid "Do not ask me again."
+msgstr "Nun entrugame otra vegada."
+
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
+msgid "Print Tasks"
+msgstr "Imprentar xeres"
+
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% completáu"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Encaboxáu"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "En cursu"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:50
+msgid "is greater than"
+msgstr "ye mayor que"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:51
+msgid "is less than"
+msgstr "ye menor que"
+
+#: ../calendar/importers/icalendar-importer.c:75
+msgid "Appointments and Meetings"
+msgstr "Reuniones y cites"
+
+#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1635
+msgid "Opening calendar"
+msgstr "Apertura del calendariu"
+
+#: ../calendar/importers/icalendar-importer.c:440
+msgid "iCalendar files (.ics)"
+msgstr "Archivos iCalendar (.ics)"
+
+#: ../calendar/importers/icalendar-importer.c:441
+msgid "Evolution iCalendar importer"
+msgstr "Importador de iCalendar de Evolution"
+
+#: ../calendar/importers/icalendar-importer.c:529
+msgid "Reminder!"
+msgstr "¡Remembre!"
+
+#: ../calendar/importers/icalendar-importer.c:581
+msgid "vCalendar files (.vcf)"
+msgstr "Ficheros vCalendar (.vcf)"
+
+#: ../calendar/importers/icalendar-importer.c:582
+msgid "Evolution vCalendar importer"
+msgstr "Importador de vCalendar d'Evolution"
+
+#: ../calendar/importers/icalendar-importer.c:744
+msgid "Calendar Events"
+msgstr "Asocedimientos de calendariu"
+
+#: ../calendar/importers/icalendar-importer.c:781
+msgid "Evolution Calendar intelligent importer"
+msgstr "Importador intelixente del calendariu d'Evolution"
+
+#.
+#. *
+#. * 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/Arxel"
+
+#: ../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/Johannesburgo"
+
+#: ../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/Lumbasa"
+
+#: ../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/Mogadiscio"
+
+#: ../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/Túnez"
+
+#: ../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/Belice"
+
+#: ../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/Caimán"
+
+#: ../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/Curaçao"
+
+#: ../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/Granada"
+
+#: ../calendar/zones.h:119
+msgid "America/Guadeloupe"
+msgstr "América/Guadalupe"
+
+#: ../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/La Habana"
+
+#: ../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/Xamaica"
+
+#: ../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_Anxeles"
+
+#: ../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.glade.h:3
+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/Centru"
+
+#: ../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_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/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/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/Polu_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 "�rticu/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/Estambúl"
+
+#: ../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/Xerusalé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/Magadan"
+
+#: ../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/Samarkanda"
+
+#: ../calendar/zones.h:268
+msgid "Asia/Seoul"
+msgstr "Asia/Seoul"
+
+#: ../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ánticu/Azores"
+
+#: ../calendar/zones.h:286
+msgid "Atlantic/Bermuda"
+msgstr "Atlánticu/Bermudes"
+
+#: ../calendar/zones.h:287
+msgid "Atlantic/Canary"
+msgstr "Atlánticu/Islles_Canaries"
+
+#: ../calendar/zones.h:288
+msgid "Atlantic/Cape_Verde"
+msgstr "Atlánticu/Cabu_Verde"
+
+#: ../calendar/zones.h:289
+msgid "Atlantic/Faeroe"
+msgstr "Atlánticu/Feroe"
+
+#: ../calendar/zones.h:290
+msgid "Atlantic/Jan_Mayen"
+msgstr "Atlánticu/Jan Mayen"
+
+#: ../calendar/zones.h:291
+msgid "Atlantic/Madeira"
+msgstr "Atlánticu/Madeira"
+
+#: ../calendar/zones.h:292
+msgid "Atlantic/Reykjavik"
+msgstr "Atlánticu/Reykjavik"
+
+#: ../calendar/zones.h:293
+msgid "Atlantic/South_Georgia"
+msgstr "Atlánticu/Xorxa_Sur"
+
+#: ../calendar/zones.h:294
+msgid "Atlantic/St_Helena"
+msgstr "Atlánticu/St_Helena"
+
+#: ../calendar/zones.h:295
+msgid "Atlantic/Stanley"
+msgstr "Atlánticu/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/Atenes"
+
+#: ../calendar/zones.h:309
+msgid "Europe/Belfast"
+msgstr "Europa/Belfast"
+
+#: ../calendar/zones.h:310
+msgid "Europe/Belgrade"
+msgstr "Europa/Belgráu"
+
+#: ../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/Bruxeles"
+
+#: ../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/Xibraltar"
+
+#: ../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/Kaliningráu"
+
+#: ../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/Luxemburgu"
+
+#: ../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ónacu"
+
+#: ../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/Sarayevo"
+
+#: ../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/Estocolmu"
+
+#: ../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/Vaticanu"
+
+#: ../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 "�ndicu/Antananarivo"
+
+#: ../calendar/zones.h:358
+msgid "Indian/Chagos"
+msgstr "�ndicu/Chagos"
+
+#: ../calendar/zones.h:359
+msgid "Indian/Christmas"
+msgstr "�ndicu/Christmas"
+
+#: ../calendar/zones.h:360
+msgid "Indian/Cocos"
+msgstr "�ndicu/Cocos"
+
+#: ../calendar/zones.h:361
+msgid "Indian/Comoro"
+msgstr "�ndicu/Comores"
+
+#: ../calendar/zones.h:362
+msgid "Indian/Kerguelen"
+msgstr "�ndicu/Kerguelen"
+
+#: ../calendar/zones.h:363
+msgid "Indian/Mahe"
+msgstr "�ndicu/Mahe"
+
+#: ../calendar/zones.h:364
+msgid "Indian/Maldives"
+msgstr "�ndicu/Maldives"
+
+#: ../calendar/zones.h:365
+msgid "Indian/Mauritius"
+msgstr "�ndicu/Mauricio"
+
+#: ../calendar/zones.h:366
+msgid "Indian/Mayotte"
+msgstr "�ndicu/Mayotte"
+
+#: ../calendar/zones.h:367
+msgid "Indian/Reunion"
+msgstr "�ndicu/Reunión"
+
+#: ../calendar/zones.h:368
+msgid "Pacific/Apia"
+msgstr "Pacíficu/Apia"
+
+#: ../calendar/zones.h:369
+msgid "Pacific/Auckland"
+msgstr "Pacíficu/Auckland"
+
+#: ../calendar/zones.h:370
+msgid "Pacific/Chatham"
+msgstr "Pacíficu/Chatham"
+
+#: ../calendar/zones.h:371
+msgid "Pacific/Easter"
+msgstr "Pacíficu/Islla_de_Pascua"
+
+#: ../calendar/zones.h:372
+msgid "Pacific/Efate"
+msgstr "Pacíficu/Efate"
+
+#: ../calendar/zones.h:373
+msgid "Pacific/Enderbury"
+msgstr "Pacíficu/Enderbury"
+
+#: ../calendar/zones.h:374
+msgid "Pacific/Fakaofo"
+msgstr "Pacíficu/Fakaofo"
+
+#: ../calendar/zones.h:375
+msgid "Pacific/Fiji"
+msgstr "Pacíficu/Fiyi"
+
+#: ../calendar/zones.h:376
+msgid "Pacific/Funafuti"
+msgstr "Pacíficu/Funafuti"
+
+#: ../calendar/zones.h:377
+msgid "Pacific/Galapagos"
+msgstr "Pacíficu/Galápagos"
+
+#: ../calendar/zones.h:378
+msgid "Pacific/Gambier"
+msgstr "Pacíficu/Gambier"
+
+#: ../calendar/zones.h:379
+msgid "Pacific/Guadalcanal"
+msgstr "Pacíficu/Guadalcanal"
+
+#: ../calendar/zones.h:380
+msgid "Pacific/Guam"
+msgstr "Pacíficu/Guam"
+
+#: ../calendar/zones.h:381
+msgid "Pacific/Honolulu"
+msgstr "Pacíficu/Honolulú"
+
+#: ../calendar/zones.h:382
+msgid "Pacific/Johnston"
+msgstr "Pacíficu/Johnston"
+
+#: ../calendar/zones.h:383
+msgid "Pacific/Kiritimati"
+msgstr "Pacíficu/Kiritimati"
+
+#: ../calendar/zones.h:384
+msgid "Pacific/Kosrae"
+msgstr "Pacíficu/Kosrae"
+
+#: ../calendar/zones.h:385
+msgid "Pacific/Kwajalein"
+msgstr "Pacíficu/Kwajalein"
+
+#: ../calendar/zones.h:386
+msgid "Pacific/Majuro"
+msgstr "Pacíficu/Majuro"
+
+#: ../calendar/zones.h:387
+msgid "Pacific/Marquesas"
+msgstr "Pacíficu/Marqueseas"
+
+#: ../calendar/zones.h:388
+msgid "Pacific/Midway"
+msgstr "Pacíficu/Midway"
+
+#: ../calendar/zones.h:389
+msgid "Pacific/Nauru"
+msgstr "Pacíficu/Nauru"
+
+#: ../calendar/zones.h:390
+msgid "Pacific/Niue"
+msgstr "Pacíficu/Niue"
+
+#: ../calendar/zones.h:391
+msgid "Pacific/Norfolk"
+msgstr "Pacíficu/Norfolk"
+
+#: ../calendar/zones.h:392
+msgid "Pacific/Noumea"
+msgstr "Pacíficu/Noumea"
+
+#: ../calendar/zones.h:393
+msgid "Pacific/Pago_Pago"
+msgstr "Pacíficu/Pago_Pago"
+
+#: ../calendar/zones.h:394
+msgid "Pacific/Palau"
+msgstr "Pacíficu/Palau"
+
+#: ../calendar/zones.h:395
+msgid "Pacific/Pitcairn"
+msgstr "Pacíficu/Pitcairn"
+
+#: ../calendar/zones.h:396
+msgid "Pacific/Ponape"
+msgstr "Pacíficu/Ponape"
+
+#: ../calendar/zones.h:397
+msgid "Pacific/Port_Moresby"
+msgstr "Pacíficu/Port_Moresby"
+
+#: ../calendar/zones.h:398
+msgid "Pacific/Rarotonga"
+msgstr "Pacíficu/Rarotonga"
+
+#: ../calendar/zones.h:399
+msgid "Pacific/Saipan"
+msgstr "Pacíficu/Saipán"
+
+#: ../calendar/zones.h:400
+msgid "Pacific/Tahiti"
+msgstr "Pacíficu/Tahití"
+
+#: ../calendar/zones.h:401
+msgid "Pacific/Tarawa"
+msgstr "Pacíficu/Tarawa"
+
+#: ../calendar/zones.h:402
+msgid "Pacific/Tongatapu"
+msgstr "Pacíficu/Tongatapu"
+
+#: ../calendar/zones.h:403
+msgid "Pacific/Truk"
+msgstr "Pacíficu/Truk"
+
+#: ../calendar/zones.h:404
+msgid "Pacific/Wake"
+msgstr "Pacíficu/Wake"
+
+#: ../calendar/zones.h:405
+msgid "Pacific/Wallis"
+msgstr "Pacíficu/Wallis"
+
+#: ../calendar/zones.h:406
+msgid "Pacific/Yap"
+msgstr "Pacíficu/Yap"
+
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "Nun pudo abrise'l ficheru d'autoguardáu"
+
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "Nun pudo obtenese el mensax del editor"
+
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "Enxertar Axuntu"
+
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "_Axuntar"
+
+#: ../composer/e-composer-actions.c:142
+msgid "Untitled Message"
+msgstr "Mensax ensin títulu"
+
+#: ../composer/e-composer-actions.c:473
+msgid "Attach a file"
+msgstr "Axuntar un ficheru"
+
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "_Zarrar"
+
+#: ../composer/e-composer-actions.c:480
+msgid "Close the current file"
+msgstr "Zarrar esti ficheru"
+
+#: ../composer/e-composer-actions.c:485 ../mail/em-folder-view.c:1337
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "Im_prentar..."
+
+#: ../composer/e-composer-actions.c:492 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "Ente_ver Imprentación"
+
+#: ../composer/e-composer-actions.c:501
+msgid "Save the current file"
+msgstr "Guardar esti ficheru"
+
+#: ../composer/e-composer-actions.c:506
+msgid "Save _As..."
+msgstr "Guard_ar Como..."
+
+#: ../composer/e-composer-actions.c:508
+msgid "Save the current file with a different name"
+msgstr "Guardar esti ficheru con un nome distintu"
+
+#: ../composer/e-composer-actions.c:513
+msgid "Save _Draft"
+msgstr "Guardar _Borrador"
+
+#: ../composer/e-composer-actions.c:515
+msgid "Save as draft"
+msgstr "Guardar como borrador"
+
+#: ../composer/e-composer-actions.c:520
+msgid "S_end"
+msgstr "_Unviar"
+
+#: ../composer/e-composer-actions.c:522
+msgid "Send this message"
+msgstr "Unviar esti mensax"
+
+#: ../composer/e-composer-actions.c:529
+msgid "Insert Send options"
+msgstr "Enxertar opciones d'unvíu"
+
+#: ../composer/e-composer-actions.c:534
+msgid "New _Message"
+msgstr "_Mensax nuevu"
+
+#: ../composer/e-composer-actions.c:536
+msgid "Open New Message window"
+msgstr "Abrir la ventana del mensaxe nuevu"
+
+#: ../composer/e-composer-actions.c:543
+msgid "Character _Encoding"
+msgstr "_Codificación de carauteres"
+
+#: ../composer/e-composer-actions.c:550
+msgid "_Security"
+msgstr "_Seguridá"
+
+#: ../composer/e-composer-actions.c:560
+msgid "PGP _Encrypt"
+msgstr "Cif_rar con PGP"
+
+#: ../composer/e-composer-actions.c:562
+msgid "Encrypt this message with PGP"
+msgstr "Cifrar esti mensax con PGP"
+
+#: ../composer/e-composer-actions.c:568
+msgid "PGP _Sign"
+msgstr "_Roblar con PGP"
+
+#: ../composer/e-composer-actions.c:570
+msgid "Sign this message with your PGP key"
+msgstr "Roblar esti mensax cola so clave GPG"
+
+#: ../composer/e-composer-actions.c:576
+msgid "_Prioritize Message"
+msgstr "_Priorizar mensax"
+
+#: ../composer/e-composer-actions.c:578
+msgid "Set the message priority to high"
+msgstr "Afitar la prioridá del mensax a alta"
+
+#: ../composer/e-composer-actions.c:584
+msgid "Re_quest Read Receipt"
+msgstr "_Solicitar confirmación de llectura"
+
+#: ../composer/e-composer-actions.c:586
+msgid "Get delivery notification when your message is read"
+msgstr "Obtener notificación d'entrega cuando'l so mensax se llea"
+
+#: ../composer/e-composer-actions.c:592
+msgid "S/MIME En_crypt"
+msgstr "C_ifrar con S/MIME"
+
+#: ../composer/e-composer-actions.c:594
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "Cifrar esti mensax col so certificáu de cifráu S/MIME"
+
+#: ../composer/e-composer-actions.c:600
+msgid "S/MIME Sig_n"
+msgstr "Ro_blar con S/MIME"
+
+#: ../composer/e-composer-actions.c:602
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Roblar esti mensax col so certificáu de robla S/MIME"
+
+#: ../composer/e-composer-actions.c:608
+msgid "_Bcc Field"
+msgstr "Campu «Cc_t»"
+
+#: ../composer/e-composer-actions.c:610
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Conmutador qu'indica si s'amuesa'l campu «Cct»"
+
+#: ../composer/e-composer-actions.c:616
+msgid "_Cc Field"
+msgstr "Campu «_Cc»"
+
+#: ../composer/e-composer-actions.c:618
+msgid "Toggles whether the CC field is displayed"
+msgstr "Conmutador qu'indica si s'amuesa'l campu «Cc»"
+
+#: ../composer/e-composer-actions.c:624
+msgid "_From Field"
+msgstr "Campu «_De»"
+
+#: ../composer/e-composer-actions.c:626
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Conmutador qu'indica si s'amuesa'l campu «De»"
+
+#: ../composer/e-composer-actions.c:632
+msgid "_Post-To Field"
+msgstr "Campu «_Publicar-en»"
+
+#: ../composer/e-composer-actions.c:634
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "Conmutador qu'indica si s'amuesa'l campu «Publicar-en»"
+
+#: ../composer/e-composer-actions.c:640
+msgid "_Reply-To Field"
+msgstr "Campu «_Retrucar-a»"
+
+#: ../composer/e-composer-actions.c:642
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Conmutador qu'indica si s'amuesa'l campu «Retrucar-a»"
+
+#: ../composer/e-composer-actions.c:648
+msgid "_Subject Field"
+msgstr "Campu A_suntu"
+
+#: ../composer/e-composer-actions.c:650
+msgid "Toggles whether the Subject field is displayed"
+msgstr "Conmuta cuando s'amuesa'l campu «Asuntu»"
+
+#: ../composer/e-composer-actions.c:656
+msgid "_To Field"
+msgstr "Campu «_Pa»"
+
+#: ../composer/e-composer-actions.c:658
+msgid "Toggles whether the To field is displayed"
+msgstr "Conmutador qu'indica si s'amuesa'l campu «Pa»"
+
+#: ../composer/e-composer-header-table.c:66
+msgid "Enter the recipients of the message"
+msgstr "Escriba los destinatarios del mensax"
+
+#: ../composer/e-composer-header-table.c:68
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Escriba les direiciones que recibirán una copia del mensax"
+
+#: ../composer/e-composer-header-table.c:71
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message"
+msgstr ""
+"Escriba les señes que recibirán una copia del mensax ensin apaecer na llista "
+"de destinatarios del mensax"
+
+#: ../composer/e-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr "_De:"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr "_Retrucar a:"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr "_Pa:"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr "_Cc:"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr "Cc_t:"
+
+#: ../composer/e-composer-header-table.c:673
+msgid "_Post To:"
+msgstr "_Publicar en:"
+
+#: ../composer/e-composer-header-table.c:677
+msgid "S_ubject:"
+msgstr "A_suntu:"
+
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "_Robla:"
+
+#: ../composer/e-composer-name-header.c:115
+msgid "Click here for the address book"
+msgstr "Calque equí pa la llibreta de direiciones"
+
+#: ../composer/e-composer-post-header.c:137
+msgid "Posting destination"
+msgstr "Destín de publicación"
+
+#: ../composer/e-composer-post-header.c:138
+msgid "Choose folders to post the message to."
+msgstr "Escueya les carpetes nes que publicar el mensax."
+
+#: ../composer/e-composer-post-header.c:172
+msgid "Click here to select folders to post to"
+msgstr "Calque equí pa seleicionar carpetes nes que publicar"
+
+#: ../composer/e-composer-private.c:181 ../composer/e-msg-composer.c:1553
+msgid "Show _Attachment Bar"
+msgstr "Amosar Barra d'_Axuntos"
+
+#: ../composer/e-msg-composer.c:867
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Nun ye dable roblar el mensax saliente: Nun hai afitáu un certificáu de "
+"robla pa esta cuenta"
+
+#: ../composer/e-msg-composer.c:874
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Nun ye dable cifrar el mensax saliente: Nun hai afitáu un certificáu de "
+"cifráu pa esta cuenta"
+
+#: ../composer/e-msg-composer.c:1495 ../mail/em-format-html-display.c:1919
+#: ../mail/em-format-html-display.c:2411 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Axuntu"
+msgstr[1] "Axuntos"
+
+#: ../composer/e-msg-composer.c:1551
+msgid "Hide _Attachment Bar"
+msgstr "Soverar Barra d'_Axuntos"
+
+#: ../composer/e-msg-composer.c:1568 ../composer/e-msg-composer.c:2775
+msgid "Compose Message"
+msgstr "Escribir Mensax"
+
+#: ../composer/e-msg-composer.c:4050
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)</"
+"b>"
+msgstr ""
+"<b>(L'editor contién un mensax cuyu cuerpu nun tien testu, y que nun pue "
+"editase.)</b>"
+
+#: ../composer/mail-composer.error.xml.h:1
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr ""
+" Hai dalgunos axuntos descargándose. Unviar el corréu fadrá que s'unvíe "
+"ensin esos axuntos pendientes "
+
+#: ../composer/mail-composer.error.xml.h:2
+msgid "All accounts have been removed."
+msgstr "Esaniciáronse toles cuentes."
+
+#: ../composer/mail-composer.error.xml.h:3
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "¿De xuru quier descartar el mensax tituláu «{0}» que ta redautando?"
+
+#: ../composer/mail-composer.error.xml.h:4
+msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+msgstr ""
+"Debíu a «{0}», seique necesite seleicionar diferentes opciones de corréu."
+
+#: ../composer/mail-composer.error.xml.h:5
+msgid "Because &quot;{1}&quot;."
+msgstr "Porque «{1}»."
+
+#: ../composer/mail-composer.error.xml.h:6
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
+msgstr ""
+"Al zarrar esta ventana de redaición, descartaráse'l mensax permanentemente, "
+"a nun ser qu'escueya guardar el mensax na carpeta «Borradores». Esto "
+"permitirá-y continuar el mensax más sero."
+
+#: ../composer/mail-composer.error.xml.h:7
+msgid "Could not create composer window."
+msgstr "Nun ye dable criar la ventana de redaición."
+
+#: ../composer/mail-composer.error.xml.h:8
+msgid "Could not create message."
+msgstr "Nun ye dable criar un mensax."
+
+#: ../composer/mail-composer.error.xml.h:9
+msgid "Could not read signature file &quot;{0}&quot;."
+msgstr "Nun ye dable lleer el ficheru de robla «{0}»."
+
+#: ../composer/mail-composer.error.xml.h:10
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Nun pudo obtenese un mensax al qu'axuntar dende {0}."
+
+#: ../composer/mail-composer.error.xml.h:11
+msgid "Could not save to autosave file &quot;{0}&quot;."
+msgstr "Nun pue autoguardase'l ficheru «{0}»."
+
+#: ../composer/mail-composer.error.xml.h:12
+msgid "Directories can not be attached to Messages."
+msgstr "Los direutorios nun puen axuntase a los mensaxes."
+
+#: ../composer/mail-composer.error.xml.h:13
+msgid "Do you want to recover unfinished messages?"
+msgstr "¿Quier recuperar los mensaxes non finaos?"
+
+#: ../composer/mail-composer.error.xml.h:14
+msgid "Download in progress. Do you want to send the mail?"
+msgstr "Descarga en progresu. ¿Quier unviar el corréu?"
+
+#: ../composer/mail-composer.error.xml.h:15
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr "Error al autoguardar por aciu de «{1}»."
+
+#: ../composer/mail-composer.error.xml.h:16
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+"Evolution finó inesperadamente mentantu taba redactando un mensax nuevu. La "
+"recuperación del mensax permitirá-y continuar au lo dexó."
+
+#: ../composer/mail-composer.error.xml.h:17
+#, fuzzy
+msgid ""
+"Send options available only for Novell GroupWise and Microsoft Exchange "
+"accounts."
+msgstr ""
+"Opciones d'unvíu namái disponibles pa cuentes Novell Groupwise y Microsoft "
+"Exchange."
+
+#: ../composer/mail-composer.error.xml.h:18
+msgid "Send options not available."
+msgstr "Opciones d'unvíu non disponibles."
+
+#: ../composer/mail-composer.error.xml.h:19
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgstr ""
+"El ficheru «{0}» nun ye un ficheru regular y nun pue unviase nún mensax."
+
+#: ../composer/mail-composer.error.xml.h:20
+msgid ""
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
+msgstr ""
+"P'axuntar el conteníu d'esti direutoriu, o axunte individualmente cada "
+"ficheru, o críe un archivador del direutoriu y axúntelu."
+
+#: ../composer/mail-composer.error.xml.h:21
+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 ""
+"Nun ye dable activar el componente del editor HTML.\n"
+"\n"
+"Asegúrese de que tien la versión correuta de gtkhtml y libgtkthml instalada."
+
+#: ../composer/mail-composer.error.xml.h:24
+msgid "Unable to activate the address selector control."
+msgstr "Nun ye dable activar el control de seleición de direiciones."
+
+#: ../composer/mail-composer.error.xml.h:25
+msgid "Unfinished messages found"
+msgstr "Alcontráronse mensaxes non finaos"
+
+#: ../composer/mail-composer.error.xml.h:26
+msgid "Warning: Modified Message"
+msgstr "Avisu: Mensax modificáu"
+
+#: ../composer/mail-composer.error.xml.h:27
+msgid "You cannot attach the file `{0}' to this message."
+msgstr "Nun pue axuntar el ficheru «{0}» a esti mensax."
+
+#: ../composer/mail-composer.error.xml.h:28
+msgid "You need to configure an account before you can compose mail."
+msgstr "Necesita configurar una cuenta enantes de poder escribir corréu."
+
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Siguir editando"
+
+#: ../composer/mail-composer.error.xml.h:31
+msgid "_Do not Recover"
+msgstr "_Non recuperar"
+
+#: ../composer/mail-composer.error.xml.h:32
+msgid "_Recover"
+msgstr "_Recuperar"
+
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "Guardar _borrador"
+
+#: ../data/evolution.desktop.in.in.h:1
+msgid "Evolution Mail and Calendar"
+msgstr "Corréu y calendariu d'Evolution"
+
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
+msgid "Groupware Suite"
+msgstr "Suite de trabayu en grupu"
+
+#: ../data/evolution.desktop.in.in.h:3
+msgid "Manage your email, contacts and schedule"
+msgstr "Xestione'l so corréu-e, contautos y calendariu"
+
+#: ../data/evolution.keys.in.in.h:1
+msgid "address card"
+msgstr "tarxeta de direición"
+
+#: ../data/evolution.keys.in.in.h:2
+msgid "calendar information"
+msgstr "información de calendariu"
+
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
+msgid "Evolution Error"
+msgstr "Fallu d'Evolution"
+
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
+msgid "Evolution Warning"
+msgstr "Alvertencia d'Evolution"
+
+#: ../e-util/e-error.c:118
+msgid "Evolution Information"
+msgstr "Información d'Evolution"
+
+#: ../e-util/e-error.c:120
+msgid "Evolution Query"
+msgstr "Consulta d'Evolution"
+
+#. setup a dummy error
+#: ../e-util/e-error.c:450
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr "Fallu internu, solicitáu un fallu desconocíu «%s»"
+
+#: ../e-util/e-logger.c:161
+msgid "Component"
+msgstr "Componente"
+
+#: ../e-util/e-logger.c:162
+msgid "Name of the component being logged"
+msgstr "El nome del componente que rexistrar"
+
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../plugins/plugin-manager/plugin-manager.c:355
+#: ../plugins/publish-calendar/publish-calendar.c:690
+msgid "Enabled"
+msgstr "Habilitáu"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "Conseña si'l complementu ta activáu"
+
+#: ../e-util/e-print.c:160
+msgid "An error occurred while printing"
+msgstr "Hebo un fallu al imprentar"
+
+#: ../e-util/e-print.c:167
+msgid "The printing system reported the following details about the error:"
+msgstr ""
+"El sistema d'imprentación informó de los siguientes detalles sobro l'error:"
+
+#: ../e-util/e-print.c:173
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr ""
+"El sistema d'imprentación nun proporcionó dengún detalle adicional tocante "
+"al fallu."
+
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "Porque «{1}»."
+
+#: ../e-util/e-system.error.xml.h:2
+msgid "Cannot open file \"{0}\"."
+msgstr "Nun pue abrise'l ficheru «{0}»."
+
+#: ../e-util/e-system.error.xml.h:3
+msgid "Cannot save file \"{0}\"."
+msgstr "Nun pue guardase'l ficheru «{0}»."
+
+#: ../e-util/e-system.error.xml.h:4
+msgid "Do you wish to overwrite it?"
+msgstr "¿Quier sobroscribilu?"
+
+#: ../e-util/e-system.error.xml.h:5
+msgid "File exists \"{0}\"."
+msgstr "El ficheru esiste «{0}»."
+
+#: ../e-util/e-system.error.xml.h:6
+msgid "Overwrite file?"
+msgstr "¿Sobroscribir el ficheru?"
+
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+msgid "_Overwrite"
+msgstr "_Sobroscribir"
+
+#: ../e-util/e-util.c:96
+msgid "Could not display help for Evolution."
+msgstr "Nun pudo amosase l'aida d'Evolution."
+
+#: ../e-util/e-util-labels.c:37
+msgid "I_mportant"
+msgstr "_Importante"
+
+#. red
+#: ../e-util/e-util-labels.c:38
+msgid "_Work"
+msgstr "_Trabayu"
+
+#. orange
+#: ../e-util/e-util-labels.c:39
+msgid "_Personal"
+msgstr "_Personal"
+
+#. green
+#: ../e-util/e-util-labels.c:40
+msgid "_To Do"
+msgstr "_Xeres pendientes"
+
+#. blue
+#: ../e-util/e-util-labels.c:41
+msgid "_Later"
+msgstr "_Más sero"
+
+#: ../e-util/e-util-labels.c:309
+msgid "Label _Name:"
+msgstr "_Nome de la etiqueta:"
+
+#: ../e-util/e-util-labels.c:332
+msgid "Edit Label"
+msgstr "Editar etiqueta"
+
+#: ../e-util/e-util-labels.c:332
+msgid "Add Label"
+msgstr "Amestar etiqueta"
+
+#: ../e-util/e-util-labels.c:351
+msgid "Label name cannot be empty."
+msgstr "El nome de la etiqueta nun pue quedar ermu"
+
+#: ../e-util/e-util-labels.c:356
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
+msgstr ""
+"Yá esiste una etiqueta col mesmu nome nel sirvidor. Renome la etiqueta."
+
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "Fallu de GConf: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "N'adelantre tolos fallos namái s'amosarán nel terminal."
+
+#: ../filter/filter-datespec.c:81
+#, c-format
+msgid "1 second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "fai %d segundu"
+msgstr[1] "fai %d segundos"
+
+#: ../filter/filter-datespec.c:81
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] "dientro de %d segundu"
+msgstr[1] "dientro de %d segundos"
+
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "fai %d minutu"
+msgstr[1] "fai %d minutos"
+
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] "dientro de %d minutu"
+msgstr[1] "dientro de %d minutos"
+
+#: ../filter/filter-datespec.c:83
+#, c-format
+msgid "1 hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "fai 1 hora"
+msgstr[1] "fai %d hores"
+
+#: ../filter/filter-datespec.c:83
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] "dientro de 1 hora"
+msgstr[1] "ientro de %d hores"
+
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 day ago"
+msgid_plural "%d days ago"
+msgstr[0] "fai %d día"
+msgstr[1] "fai %d díes"
+
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] "dientro de %d día"
+msgstr[1] "dientro de %d díes"
+
+#: ../filter/filter-datespec.c:85
+#, c-format
+msgid "1 week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "fai %d selmana"
+msgstr[1] "fai %d selmanes"
+
+#: ../filter/filter-datespec.c:85
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] "dientro de %d selmana"
+msgstr[1] "dientro de %d selmanes"
+
+#: ../filter/filter-datespec.c:86
+#, c-format
+msgid "1 month ago"
+msgid_plural "%d months ago"
+msgstr[0] "fai %d mes"
+msgstr[1] "fai %d meses"
+
+#: ../filter/filter-datespec.c:86
+#, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] "dientro de %d mes"
+msgstr[1] "dientro de %d meses"
+
+#: ../filter/filter-datespec.c:87
+#, c-format
+msgid "1 year ago"
+msgid_plural "%d years ago"
+msgstr[0] "fai %d añu"
+msgstr[1] "fai %d años"
+
+#: ../filter/filter-datespec.c:87
+#, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] "dientro de %d añu"
+msgstr[1] "dientro de %d años"
+
+#: ../filter/filter-datespec.c:288
+msgid "<click here to select a date>"
+msgstr "<calque equí pa seleicionar una data>"
+
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
+msgid "now"
+msgstr "agora"
+
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: ../filter/filter-datespec.c:298
+msgid "%d-%b-%Y"
+msgstr "%d-%b-%Y"
+
+#: ../filter/filter-datespec.c:452
+msgid "Select a time to compare against"
+msgstr "Seleicione una data cola que comparar"
+
+#: ../filter/filter-file.c:284
+msgid "Choose a file"
+msgstr "Escueya un ficheru"
+
+#: ../filter/filter-part.c:532
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Preba"
+
+#: ../filter/filter-rule.c:853
+msgid "R_ule name:"
+msgstr "Nome de la _regla:"
+
+#: ../filter/filter-rule.c:881
+#, fuzzy
+msgid "Find items that meet the following conditions"
+msgstr "Guetar elementos que cumplen con estos criterios"
+
+#: ../filter/filter-rule.c:915
+#, fuzzy
+msgid "A_dd Condition"
+msgstr "Amestarr a_ición"
+
+#: ../filter/filter-rule.c:921
+#, fuzzy
+msgid "If all conditions are met"
+msgstr "Si se cumplen tolos criterios"
+
+#: ../filter/filter-rule.c:921
+#, fuzzy
+msgid "If any conditions are met"
+msgstr "Si se cumple dalgún criteriu"
+
+#: ../filter/filter-rule.c:923
+msgid "_Find items:"
+msgstr "_Guetar elementos:"
+
+#: ../filter/filter-rule.c:945
+msgid "All related"
+msgstr "Toles rellacionaes"
+
+#: ../filter/filter-rule.c:945
+msgid "Replies"
+msgstr "Rempuestes"
+
+#: ../filter/filter-rule.c:945
+msgid "Replies and parents"
+msgstr "Rempuestes y antecesores"
+
+#: ../filter/filter-rule.c:945
+msgid "No reply or parent"
+msgstr "Ensin rempuesta o antecesor"
+
+#: ../filter/filter-rule.c:947
+msgid "I_nclude threads"
+msgstr "I_ncluyir conversaciones"
+
+#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
+msgid "Incoming"
+msgstr "Entrante"
+
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:310
+msgid "Outgoing"
+msgstr "Saliente"
+
+#: ../filter/filter.error.xml.h:1
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr "Fallu na expresión regular «{0}»."
+
+#: ../filter/filter.error.xml.h:2
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr "Nun ye dable 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 ficheru «{0}» nun esiste o nun ye un ficheru regular."
+
+#: ../filter/filter.error.xml.h:4
+msgid "Missing date."
+msgstr "Falta la data."
+
+#: ../filter/filter.error.xml.h:5
+msgid "Missing file name."
+msgstr "Falta'l nome d'archivu."
+
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+msgid "Missing name."
+msgstr "Falta'l nome."
+
+#: ../filter/filter.error.xml.h:7
+msgid "Name &quot;{0}&quot; already used."
+msgstr "El nome «{0}» yá ta usándose."
+
+#: ../filter/filter.error.xml.h:8
+msgid "Please choose another name."
+msgstr "Escueya otru nome."
+
+#: ../filter/filter.error.xml.h:9
+msgid "You must choose a date."
+msgstr "Tien d'escoyer una data."
+
+#: ../filter/filter.error.xml.h:10
+msgid "You must name this filter."
+msgstr "Tien de dar un nome a esti fieltru"
+
+#: ../filter/filter.error.xml.h:11
+msgid "You must specify a file name."
+msgstr "Tien d'especificar un nome d'archivu."
+
+#: ../filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>Regles de _fieltráu</b>"
+
+#: ../filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Comparar con"
+
+#: ../filter/filter.glade.h:4
+msgid "Show filters for mail:"
+msgstr "Amosar fieltros pal corréu:"
+
+#: ../filter/filter.glade.h:5
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"La data del mensax compararáse coles\n"
+"12:00am de la data equí especificada."
+
+#: ../filter/filter.glade.h:7
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"La data del mensax compararáse con una\n"
+"data rellativa al intre del fieltráu."
+
+#: ../filter/filter.glade.h:9
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"La data del mensax compararáse cola\n"
+"data autual del intre del fieltráu."
+
+#: ../filter/filter.glade.h:12
+msgid "a time relative to the current time"
+msgstr "una data rellativa al intre autual"
+
+#: ../filter/filter.glade.h:13
+msgid "ago"
+msgstr "atrás"
+
+#: ../filter/filter.glade.h:16
+msgid "in the future"
+msgstr "nel futuru"
+
+#: ../filter/filter.glade.h:18
+msgid "months"
+msgstr "meses"
+
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:197
+msgid "seconds"
+msgstr "segundos"
+
+#: ../filter/filter.glade.h:20
+msgid "the current time"
+msgstr "la data autual"
+
+#: ../filter/filter.glade.h:21
+msgid "the time you specify"
+msgstr "la data qu'especifique"
+
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
+#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
+msgid "weeks"
+msgstr "selmanes"
+
+#: ../filter/filter.glade.h:23
+msgid "years"
+msgstr "años"
+
+#: ../filter/rule-editor.c:381
+msgid "Add Rule"
+msgstr "Amestar regla"
+
+#: ../filter/rule-editor.c:462
+msgid "Edit Rule"
+msgstr "Iguar regla"
+
+#: ../filter/rule-editor.c:808
+msgid "Rule name"
+msgstr "Nome de la regla"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Preferencies del editor"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Configure les preferencies de corréu incluyendo seguridá y visualización de "
+"mensaxes, equí"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Configure la ortografía, robles y l'editor de mensaxes equí"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Configure les sos cuentes de corréu equí"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr "Configure les sos conexones de rede equí"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Corréu d'Evolution"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Control de configuración de cuentes de corréu d'Evolution"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Componente de corréu d'Evolution"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Redactor de corréu d'Evolution"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Control de configuración del redactor de corréu d'Evolution"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Control de preferencies d'Evolution"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Network configuration control"
+msgstr "Control de configuración de rede d'Evolution"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
+#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
+#: ../mail/mail-component.c:762
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
+msgid "Mail"
+msgstr "Corréu"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
+msgid "Mail Accounts"
+msgstr "Cuentes de corréu"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
+msgid "Mail Preferences"
+msgstr "Opciones de corréu"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "Preferencies de rede"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
+msgid "_Mail"
+msgstr "_Corréu"
+
+#: ../mail/em-account-editor.c:386
+#, c-format
+msgid "%s License Agreement"
+msgstr "Alcuerdu de llicencia %s"
+
+#: ../mail/em-account-editor.c:393
+#, 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"
+"Por favor, llea con precuru l'alcuerdu de llicencia\n"
+"pa %s amosáu abaxo\n"
+"y conseñe la caxella p'aceutalu.\n"
+
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
+msgid "Select Folder"
+msgstr "Seleicionar Carpeta"
+
+#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
+#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:98
+msgid "Autogenerated"
+msgstr "Autoxenerada"
+
+#: ../mail/em-account-editor.c:761
+msgid "Ask for each message"
+msgstr "Entrugar por cada mensax"
+
+#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:94
+msgid "Identity"
+msgstr "Identidá"
+
+#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:124
+msgid "Receiving Email"
+msgstr "Recepción de corréu"
+
+#: ../mail/em-account-editor.c:2130
+msgid "Check for _new messages every"
+msgstr "Comprebar si hay corréu _nuevu cada"
+
+#: ../mail/em-account-editor.c:2138
+msgid "minu_tes"
+msgstr "minu_tos"
+
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:138
+msgid "Sending Email"
+msgstr "Unvíu de corréu"
+
+#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
+msgid "Defaults"
+msgstr "Predeterminaos"
+
+#. Security settings
+#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:323
+msgid "Security"
+msgstr "Seguridá"
+
+#. Most sections for this is auto-generated fromt the camel config
+#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
+msgid "Receiving Options"
+msgstr "Opciones de recepción"
+
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+msgid "Checking for New Messages"
+msgstr "Comprebando si hai mensaxes nuevos"
+
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "Editor de cuentes"
+
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:83
+msgid "Evolution Account Assistant"
+msgstr "Asistente de cuentes d'Evolution"
+
+#. translators: default account indicator
+#: ../mail/em-account-prefs.c:429
+msgid "[Default]"
+msgstr "[Predetermináu]"
+
+#: ../mail/em-account-prefs.c:488
+msgid "Account name"
+msgstr "Nome de la cuenta"
+
+#: ../mail/em-account-prefs.c:490
+msgid "Protocol"
+msgstr "Protocolu"
+
+#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
+msgid "Unnamed"
+msgstr "Ensin nome"
+
+#: ../mail/em-composer-prefs.c:992
+msgid "Language(s)"
+msgstr "Llingua(es)"
+
+#: ../mail/em-composer-prefs.c:1041
+msgid "Add signature script"
+msgstr "Amestar un script de robla"
+
+#: ../mail/em-composer-prefs.c:1083
+msgid "Signature(s)"
+msgstr "Robla(es)"
+
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
+msgid "-------- Forwarded Message --------"
+msgstr "--------- Mensax reunviáu --------"
+
+#: ../mail/em-composer-utils.c:1962
+msgid "an unknown sender"
+msgstr "un remitente desconocíu"
+
+#. 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:2009
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a les ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} escribió:"
+
+#: ../mail/em-composer-utils.c:2152
+msgid "-----Original Message-----"
+msgstr "-----Mensax orixinal-----"
+
+#: ../mail/em-filter-editor.c:156
+msgid "_Filter Rules"
+msgstr "Regles de _fieltrá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)
+#.
+#. Automatically generated. Do not edit.
+#: ../mail/em-filter-i18n.h:18
+msgid "Adjust Score"
+msgstr "Axustar puntuación"
+
+#: ../mail/em-filter-i18n.h:19
+msgid "Assign Color"
+msgstr "Asignar color"
+
+#: ../mail/em-filter-i18n.h:20
+msgid "Assign Score"
+msgstr "Asignar puntuación"
+
+#: ../mail/em-filter-i18n.h:22
+msgid "BCC"
+msgstr "Cct"
+
+#: ../mail/em-filter-i18n.h:23
+msgid "Beep"
+msgstr "Bip"
+
+#: ../mail/em-filter-i18n.h:24
+msgid "CC"
+msgstr "Cc"
+
+#: ../mail/em-filter-i18n.h:25
+msgid "Completed On"
+msgstr "Completáu en"
+
+#: ../mail/em-filter-i18n.h:27
+msgid "Copy to Folder"
+msgstr "Copiar a la carpeta"
+
+#: ../mail/em-filter-i18n.h:28
+msgid "Date received"
+msgstr "Data de recepción"
+
+#: ../mail/em-filter-i18n.h:29
+msgid "Date sent"
+msgstr "Data d'unvíu"
+
+#: ../mail/em-filter-i18n.h:30
+#: ../plugins/groupwise-features/share-folder.c:768
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Esaniciar"
+
+#: ../mail/em-filter-i18n.h:31
+msgid "Deleted"
+msgstr "Esaniciáu"
+
+#: ../mail/em-filter-i18n.h:33
+msgid "does not end with"
+msgstr "nun acaba en"
+
+#: ../mail/em-filter-i18n.h:34
+msgid "does not exist"
+msgstr "nun esiste"
+
+#: ../mail/em-filter-i18n.h:35
+msgid "does not return"
+msgstr "nun devuelve"
+
+#: ../mail/em-filter-i18n.h:36
+msgid "does not sound like"
+msgstr "nun suena como"
+
+#: ../mail/em-filter-i18n.h:37
+msgid "does not start with"
+msgstr "nun entama por"
+
+#: ../mail/em-filter-i18n.h:39
+msgid "Draft"
+msgstr "Borrador"
+
+#: ../mail/em-filter-i18n.h:40
+msgid "ends with"
+msgstr "fina con"
+
+#: ../mail/em-filter-i18n.h:42
+msgid "exists"
+msgstr "existe"
+
+#: ../mail/em-filter-i18n.h:43
+msgid "Expression"
+msgstr "Expresión"
+
+#: ../mail/em-filter-i18n.h:44
+msgid "Follow Up"
+msgstr "Seguimientu"
+
+#: ../mail/em-filter-i18n.h:45 ../mail/em-migrate.c:1056
+msgid "Important"
+msgstr "Importante"
+
+#: ../mail/em-filter-i18n.h:47
+msgid "is after"
+msgstr "ye postreru a"
+
+#: ../mail/em-filter-i18n.h:48
+msgid "is before"
+msgstr "ye anterior a"
+
+#: ../mail/em-filter-i18n.h:49
+msgid "is Flagged"
+msgstr "ta conseñáu"
+
+#: ../mail/em-filter-i18n.h:53
+msgid "is not Flagged"
+msgstr "nun ta conseñáu"
+
+#: ../mail/em-filter-i18n.h:54
+msgid "is not set"
+msgstr "nun ta afitada"
+
+#: ../mail/em-filter-i18n.h:55
+msgid "is set"
+msgstr "ta afitada"
+
+#: ../mail/em-filter-i18n.h:56 ../mail/mail-config.glade.h:97
+#: ../ui/evolution-mail-message.xml.h:48
+msgid "Junk"
+msgstr "Corréu puxarra"
+
+#: ../mail/em-filter-i18n.h:57
+msgid "Junk Test"
+msgstr "Deteición de Corréu puxarra"
+
+#: ../mail/em-filter-i18n.h:58 ../widgets/misc/e-expander.c:190
+msgid "Label"
+msgstr "Etiqueta"
+
+#: ../mail/em-filter-i18n.h:59
+msgid "Mailing list"
+msgstr "Llista de corréu"
+
+#: ../mail/em-filter-i18n.h:60
+msgid "Match All"
+msgstr "Concasar con too"
+
+#: ../mail/em-filter-i18n.h:61
+msgid "Message Body"
+msgstr "Cuerpu del mensax"
+
+#: ../mail/em-filter-i18n.h:62
+msgid "Message Header"
+msgstr "Cabecera del mensax"
+
+#: ../mail/em-filter-i18n.h:63
+msgid "Message is Junk"
+msgstr "El mensax ye Corréu puxarra"
+
+#: ../mail/em-filter-i18n.h:64
+msgid "Message is not Junk"
+msgstr "El mensax nun ye Corréu puxarra"
+
+#: ../mail/em-filter-i18n.h:65
+msgid "Move to Folder"
+msgstr "Mover a la carpeta"
+
+#: ../mail/em-filter-i18n.h:66
+msgid "Pipe to Program"
+msgstr "Encauzar al programa"
+
+#: ../mail/em-filter-i18n.h:67
+msgid "Play Sound"
+msgstr "Reproducir un soníu"
+
+#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
+#. Translators: "Read" as in "has been read" (message-tag-followup.c)
+#: ../mail/em-filter-i18n.h:69 ../mail/message-tag-followup.c:63
+msgid "Read"
+msgstr "Lleíu"
+
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:12
+msgid "Recipients"
+msgstr "Destinatariu"
+
+#: ../mail/em-filter-i18n.h:71
+msgid "Regex Match"
+msgstr "Concasa cola expresión regular"
+
+#: ../mail/em-filter-i18n.h:72
+msgid "Replied to"
+msgstr "Retrucó a"
+
+#: ../mail/em-filter-i18n.h:73
+msgid "returns"
+msgstr "devuelve"
+
+#: ../mail/em-filter-i18n.h:74
+msgid "returns greater than"
+msgstr "devuelve mayor que"
+
+#: ../mail/em-filter-i18n.h:75
+msgid "returns less than"
+msgstr "devuelve menor que"
+
+#: ../mail/em-filter-i18n.h:76
+msgid "Run Program"
+msgstr "Executar programa"
+
+#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:13
+msgid "Score"
+msgstr "Puntuación"
+
+#: ../mail/em-filter-i18n.h:78 ../mail/message-list.etspec.h:14
+msgid "Sender"
+msgstr "Remitente"
+
+#: ../mail/em-filter-i18n.h:79
+msgid "Set Label"
+msgstr "Afitar etiqueta"
+
+#: ../mail/em-filter-i18n.h:80
+msgid "Set Status"
+msgstr "Poner estáu"
+
+#: ../mail/em-filter-i18n.h:81
+msgid "Size (kB)"
+msgstr "Tamañu (Kb)"
+
+#: ../mail/em-filter-i18n.h:82
+msgid "sounds like"
+msgstr "suena como"
+
+#: ../mail/em-filter-i18n.h:83
+msgid "Source Account"
+msgstr "Cuenta d'orixe"
+
+#: ../mail/em-filter-i18n.h:84
+msgid "Specific header"
+msgstr "Cabecera específica"
+
+#: ../mail/em-filter-i18n.h:85
+msgid "starts with"
+msgstr "entama con"
+
+#: ../mail/em-filter-i18n.h:87
+msgid "Stop Processing"
+msgstr "Parar de procesar"
+
+#: ../mail/em-filter-i18n.h:88 ../mail/em-format-quote.c:342
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
+#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../smime/lib/e-cert.c:1115
+msgid "Subject"
+msgstr "Asuntu"
+
+#: ../mail/em-filter-i18n.h:89
+msgid "Unset Status"
+msgstr "Quitar estáu"
+
+#. and now for the action area
+#: ../mail/em-filter-rule.c:522
+msgid "Then"
+msgstr "Llueu"
+
+#: ../mail/em-filter-rule.c:550
+msgid "Add Ac_tion"
+msgstr "Amestarr a_ición"
+
+#: ../mail/em-folder-browser.c:192
+msgid "C_reate Search Folder From Search..."
+msgstr "C_riar una carpeta de gueta dende la busca…"
+
+#: ../mail/em-folder-browser.c:217
+msgid "All Messages"
+msgstr "Tolos Mensaxes"
+
+#: ../mail/em-folder-browser.c:218
+msgid "Unread Messages"
+msgstr "Mensaxes ensin lleer"
+
+#: ../mail/em-folder-browser.c:220
+msgid "No Label"
+msgstr "Ensin etiqueta"
+
+#: ../mail/em-folder-browser.c:227
+msgid "Read Messages"
+msgstr "Mensaxes lleíos"
+
+#: ../mail/em-folder-browser.c:228
+msgid "Recent Messages"
+msgstr "Mensaxes recientes"
+
+#: ../mail/em-folder-browser.c:229
+msgid "Last 5 Days' Messages"
+msgstr "Mensaxes nos caberos 5 díes"
+
+#: ../mail/em-folder-browser.c:230
+msgid "Messages with Attachments"
+msgstr "Mensaxes con Axuntos"
+
+#: ../mail/em-folder-browser.c:231
+msgid "Important Messages"
+msgstr "Mensaxes Importantes"
+
+#: ../mail/em-folder-browser.c:232
+msgid "Messages Not Junk"
+msgstr "Mensaxes que nun son Corréu puxarra"
+
+#: ../mail/em-folder-browser.c:1173
+msgid "Account Search"
+msgstr "Gueta na cuenta"
+
+#: ../mail/em-folder-browser.c:1226
+msgid "All Account Search"
+msgstr "Gueta en toles cuentes"
+
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:174
+msgid "Unread messages:"
+msgid_plural "Unread messages:"
+msgstr[0] "Mensaxes ensin lleer:"
+msgstr[1] "Mensaxes ensin lleer:"
+
+#. 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:178
+msgid "Total messages:"
+msgid_plural "Total messages:"
+msgstr[0] "Mensaxes en total:"
+msgstr[1] "Mensaxes en total:"
+
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "Usu de la cuota (%s):"
+
+#: ../mail/em-folder-properties.c:198
+#, c-format
+msgid "Quota usage"
+msgstr "Usu de cuota"
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:358 ../mail/em-folder-tree-model.c:507
+#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:159
+#: ../mail/mail-component.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "Bandexa d'entrada"
+
+#: ../mail/em-folder-properties.c:389
+#: ../plugins/groupwise-features/properties.glade.h:4
+msgid "Folder Properties"
+msgstr "Propiedaes de la carpeta"
+
+#: ../mail/em-folder-selection-button.c:120
+msgid "<click here to select a folder>"
+msgstr "<calque equí pa seleicionar una carpeta>"
+
+#: ../mail/em-folder-selector.c:254
+msgid "C_reate"
+msgstr "C_riar"
+
+#: ../mail/em-folder-selector.c:258
+msgid "Folder _name:"
+msgstr "_Nome de la carpeta:"
+
+#. load store to mail component
+#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
+#: ../mail/mail-vfolder.c:975 ../mail/mail-vfolder.c:1042
+msgid "Search Folders"
+msgstr "Carpetes de gueta"
+
+#. UNMATCHED is always last
+#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+msgid "UNMATCHED"
+msgstr "NON COINCIDENTE"
+
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:160
+msgid "Drafts"
+msgstr "Borradores"
+
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:161
+msgid "Outbox"
+msgstr "Bandexa de salida"
+
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:162
+msgid "Sent"
+msgstr "Unvíos Fechos"
+
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
+msgid "Loading..."
+msgstr "Cargando..."
+
+#: ../mail/em-folder-tree.c:741
+msgid "Mail Folder Tree"
+msgstr "�rbol de carpetes de corréu"
+
+#: ../mail/em-folder-tree.c:900
+#, c-format
+msgid "Moving folder %s"
+msgstr "Moviendo la carpeta %s"
+
+#: ../mail/em-folder-tree.c:902
+#, c-format
+msgid "Copying folder %s"
+msgstr "Copiando la carpeta %s"
+
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2015
+#, c-format
+msgid "Moving messages into folder %s"
+msgstr "Moviendo los mensaxes a la carpeta %s"
+
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2017
+#, c-format
+msgid "Copying messages into folder %s"
+msgstr "Copiando los mensaxes a la carpeta %s"
+
+#: ../mail/em-folder-tree.c:926
+msgid "Cannot drop message(s) into toplevel store"
+msgstr "Nun ye dable dexar el(los) mensaxe(s) nel atroxu de nivel superior"
+
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
+msgid "_Copy to Folder"
+msgstr "_Copiar a la carpeta"
+
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
+msgid "_Move to Folder"
+msgstr "_Mover a la carpeta"
+
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "Analizando carpetes en «%s»"
+
+#: ../mail/em-folder-tree.c:2099
+msgid "Open in _New Window"
+msgstr "Abrir nuna ventana _nueva"
+
+#. FIXME: need to disable for nochildren folders
+#: ../mail/em-folder-tree.c:2104
+msgid "_New Folder..."
+msgstr "Carpeta _nueva…"
+
+#: ../mail/em-folder-tree.c:2107
+msgid "_Move..."
+msgstr "_Mover…"
+
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
+msgid "_Rename..."
+msgstr "_Renomar..."
+
+#: ../mail/em-folder-tree.c:2115
+msgid "Re_fresh"
+msgstr "A_utualizar"
+
+#: ../mail/em-folder-tree.c:2116
+msgid "Fl_ush Outbox"
+msgstr "Unviar correos pe_ndientes"
+
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
+msgid "_Empty Trash"
+msgstr "_Vaciar Papelera"
+
+#: ../mail/em-folder-utils.c:101
+#, c-format
+msgid "Copying `%s' to `%s'"
+msgstr "Copiando «%s» a «%s»"
+
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
+#: ../mail/importers/evolution-mbox-importer.c:82
+msgid "Select folder"
+msgstr "Seleicionar carpeta"
+
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
+msgid "C_opy"
+msgstr "C_opiar"
+
+#: ../mail/em-folder-utils.c:532
+#: ../plugins/groupwise-features/share-folder-common.c:145
+#, c-format
+msgid "Creating folder `%s'"
+msgstr "Criando carpeta «%s»"
+
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
+#: ../plugins/groupwise-features/share-folder-common.c:387
+msgid "Create folder"
+msgstr "Criar carpeta"
+
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
+#: ../plugins/groupwise-features/share-folder-common.c:387
+msgid "Specify where to create the folder:"
+msgstr "Especifique au criar la carpeta:"
+
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
+msgid "Mail Deletion Failed"
+msgstr "Falló'l esaniciu del corréu"
+
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "Nun tien permisos abondos pa esaniciar esti corréu"
+
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
+msgid "_Reply to Sender"
+msgstr "_Retrucar al Remitente"
+
+#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../ui/evolution-mail-message.xml.h:109
+msgid "_Forward"
+msgstr "_Reunviar"
+
+#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:106
+msgid "_Edit as New Message..."
+msgstr "_Iguar como un mensax nuevu…"
+
+#: ../mail/em-folder-view.c:1341
+msgid "U_ndelete"
+msgstr "_Recuperar"
+
+#: ../mail/em-folder-view.c:1342
+msgid "_Move to Folder..."
+msgstr "_Mover a la carpeta…"
+
+#: ../mail/em-folder-view.c:1343
+msgid "_Copy to Folder..."
+msgstr "_Copiar a la carpeta…"
+
+#: ../mail/em-folder-view.c:1346
+msgid "Mar_k as Read"
+msgstr "Cons_eñar como lleíu"
+
+#: ../mail/em-folder-view.c:1347
+msgid "Mark as _Unread"
+msgstr "Conseñar como _non lleíu"
+
+#: ../mail/em-folder-view.c:1348
+msgid "Mark as _Important"
+msgstr "Conseñar como _Importante"
+
+#: ../mail/em-folder-view.c:1349
+msgid "Mark as Un_important"
+msgstr "Conseñar como non _importante"
+
+#: ../mail/em-folder-view.c:1350
+msgid "Mark as _Junk"
+msgstr "Conseñar como _Corréu puxarra"
+
+#: ../mail/em-folder-view.c:1351
+msgid "Mark as _Not Junk"
+msgstr "Conseñar como _non Corréu puxarra"
+
+#: ../mail/em-folder-view.c:1352
+msgid "Mark for Follo_w Up..."
+msgstr "Conseñar pa se_guimientu…"
+
+#: ../mail/em-folder-view.c:1354
+msgid "_Label"
+msgstr "_Etiqueta"
+
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:478
+msgid "_None"
+msgstr "_Dengún"
+
+#: ../mail/em-folder-view.c:1358
+msgid "_New Label"
+msgstr "Etiqueta _nueva"
+
+#: ../mail/em-folder-view.c:1362
+msgid "Fla_g Completed"
+msgstr "Co_nseñar como fináu"
+
+#: ../mail/em-folder-view.c:1363
+msgid "Cl_ear Flag"
+msgstr "_Quitar marca"
+
+#: ../mail/em-folder-view.c:1366
+msgid "Crea_te Rule From Message"
+msgstr "Criar re_gla dende'l mensax"
+
+#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
+#: ../mail/em-folder-view.c:1368
+msgid "Search Folder based on _Subject"
+msgstr "Carpeta de gueta según l'a_suntu"
+
+#: ../mail/em-folder-view.c:1369
+msgid "Search Folder based on Se_nder"
+msgstr "Carpeta de gueta según el re_mitente"
+
+#: ../mail/em-folder-view.c:1370
+msgid "Search Folder based on _Recipients"
+msgstr "Carpeta de gueta según los des_tinatarios"
+
+#: ../mail/em-folder-view.c:1371
+msgid "Search Folder based on Mailing _List"
+msgstr "Carpeta de gueta según la _llista de corréu"
+
+#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
+#: ../mail/em-folder-view.c:1376
+msgid "Filter based on Sub_ject"
+msgstr "Fieltru según l'_asuntu"
+
+#: ../mail/em-folder-view.c:1377
+msgid "Filter based on Sen_der"
+msgstr "Fieltru según el _remitente"
+
+#: ../mail/em-folder-view.c:1378
+msgid "Filter based on Re_cipients"
+msgstr "Fieltru según los _destinatarios"
+
+#: ../mail/em-folder-view.c:1379
+msgid "Filter based on _Mailing List"
+msgstr "Fieltru según la llista de _corréu"
+
+#. default charset used in mail view
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/em-folder-view.c:2255 ../mail/em-folder-view.c:2298
+#: ../plugins/google-account-setup/google-source.c:251
+#: ../plugins/google-account-setup/google-source.c:532
+#: ../plugins/google-account-setup/google-source.c:718
+msgid "Default"
+msgstr "Predetermináu"
+
+#: ../mail/em-folder-view.c:2516
+msgid "Unable to retrieve message"
+msgstr "Nun pudo obtenese'l mensax"
+
+#: ../mail/em-folder-view.c:2535
+msgid "Retrieving Message..."
+msgstr "Obteniendo mensax…"
+
+#: ../mail/em-folder-view.c:2791
+msgid "C_all To..."
+msgstr "Ll_amar a..."
+
+#: ../mail/em-folder-view.c:2794
+msgid "Create _Search Folder"
+msgstr "Criar Carpeta de Gueta"
+
+#: ../mail/em-folder-view.c:2795
+msgid "_From this Address"
+msgstr "_Dende esta direición"
+
+#: ../mail/em-folder-view.c:2796
+msgid "_To this Address"
+msgstr "_A esta direición"
+
+#: ../mail/em-folder-view.c:3293
+#, c-format
+msgid "Click to mail %s"
+msgstr "Calque pa unviar corréu a %s"
+
+#: ../mail/em-folder-view.c:3305
+#, c-format
+msgid "Click to call %s"
+msgstr "Calque pa llamar a %s"
+
+#: ../mail/em-folder-view.c:3310
+msgid "Click to hide/unhide addresses"
+msgstr "Calque pa soverar/amosar les direiciones"
+
+#. message-search popup match count string
+#: ../mail/em-format-html-display.c:471
+#, c-format
+msgid "Matches: %d"
+msgstr "Concasa con: %d"
+
+#: ../mail/em-format-html-display.c:615
+msgid "Fin_d:"
+msgstr "_Guetar:"
+
+#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
+#: ../mail/em-format-html-display.c:639
+msgid "_Previous"
+msgstr "_Anterior"
+
+#: ../mail/em-format-html-display.c:644
+msgid "_Next"
+msgstr "_Siguiente"
+
+#: ../mail/em-format-html-display.c:649
+msgid "M_atch case"
+msgstr "_Concasar con capitalización"
+
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
+msgid "Unsigned"
+msgstr "Non robláu"
+
+#: ../mail/em-format-html-display.c:948
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"Esti mensax nun tien robla. Nun hai garantía de que'l mensax seya auténticu."
+
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
+msgid "Valid signature"
+msgstr "Robla válida"
+
+#: ../mail/em-format-html-display.c:949
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"Esti mensax ta robláu y ye válidu, lo que significa que ye enforma dable "
+"que'l mensax seya auténticu."
+
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
+msgid "Invalid signature"
+msgstr "Robla non válida"
+
+#: ../mail/em-format-html-display.c:950
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+"La robla d'esti mensax nun pue verificase, ye dable que s'altere nel tránsitu"
+
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
+msgid "Valid signature, but cannot verify sender"
+msgstr "Robla válida, pero nun se pue verificar el remitente"
+
+#: ../mail/em-format-html-display.c:951
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"Esti mensax ta robláu con una robla válida, pero'l remitente del mensax nun "
+"se pudo verificar."
+
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:654
+msgid "Signature exists, but need public key"
+msgstr "La robla esiste pero necesétase la clave pública"
+
+#: ../mail/em-format-html-display.c:952
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr ""
+"Esti mensax ta robláu con una robla pero nun esiste una clave pública "
+"correspondiente."
+
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
+msgid "Unencrypted"
+msgstr "Descifráu"
+
+#: ../mail/em-format-html-display.c:959
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+"Esti mensax nun ta encriptáu. El so conteníu pue adicase en tránsitu a "
+"traviés d'Internet."
+
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
+msgid "Encrypted, weak"
+msgstr "Cifráu, feble"
+
+#: ../mail/em-format-html-display.c:960
+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 ""
+"Esti mensax ta encriptáu, pero con un algoritmu d'encriptáu feble. Tendría "
+"de ser abegoso, pero dable pa un espía, leer el conteníu d'esti mensax "
+"emplegando daqué de tiempu."
+
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
+msgid "Encrypted"
+msgstr "Cifráu"
+
+#: ../mail/em-format-html-display.c:961
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+"Esti mensax ta encriptáu. Tendría de ser abegoso pa un espía ver el conteníu "
+"d'esti mensax."
+
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:663
+msgid "Encrypted, strong"
+msgstr "Cifráu, fuerte"
+
+#: ../mail/em-format-html-display.c:962
+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 ""
+"Esti mensax ta encriptáu, pero con un algoritmu d'encriptáu fuerte. Tendría "
+"de ser bien abegoso pa un espía, leer el conteníu d'esti mensax emplegando "
+"daqué de tiempu."
+
+#: ../mail/em-format-html-display.c:1063 ../smime/gui/smime-ui.glade.h:48
+msgid "_View Certificate"
+msgstr "_Ver certificáu"
+
+#: ../mail/em-format-html-display.c:1078
+msgid "This certificate is not viewable"
+msgstr "Esti Certificáu nun ye visible"
+
+#: ../mail/em-format-html-display.c:1377
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "Fináu el %e de %B de %Y, %l:%M %p"
+
+#: ../mail/em-format-html-display.c:1385
+msgid "Overdue:"
+msgstr "Atrasáu:"
+
+#: ../mail/em-format-html-display.c:1388
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "enantes del %e de %B de %Y, %l:%M %p"
+
+#: ../mail/em-format-html-display.c:1466
+msgid "_View Inline"
+msgstr "_Ver incluyíu"
+
+#: ../mail/em-format-html-display.c:1467
+msgid "_Hide"
+msgstr "_Soverar"
+
+#: ../mail/em-format-html-display.c:1468
+msgid "_Fit to Width"
+msgstr "_Axustar al anchu"
+
+#: ../mail/em-format-html-display.c:1469
+msgid "Show _Original Size"
+msgstr "Amosar tamañu _orixinal"
+
+#: ../mail/em-format-html-display.c:1989
+msgid "Save attachment as"
+msgstr "Guardar axuntu como"
+
+#: ../mail/em-format-html-display.c:1993
+msgid "Select folder to save all attachments"
+msgstr "Seleicione la carpeta au guardar tolos axuntos"
+
+#: ../mail/em-format-html-display.c:2044
+msgid "_Save Selected..."
+msgstr "_Guardar seleicionaos…"
+
+#. Cant i put in the number of attachments here ?
+#: ../mail/em-format-html-display.c:2111
+#, c-format
+msgid "%d at_tachment"
+msgid_plural "%d at_tachments"
+msgstr[0] "%d a_xuntu"
+msgstr[1] "%d a_xuntos"
+
+#: ../mail/em-format-html-display.c:2118 ../mail/em-format-html-display.c:2207
+msgid "S_ave"
+msgstr "_Guardar"
+
+#: ../mail/em-format-html-display.c:2129
+msgid "S_ave All"
+msgstr "Guardar _too"
+
+#: ../mail/em-format-html-display.c:2203
+msgid "No Attachment"
+msgstr "Ensin axuntu"
+
+#: ../mail/em-format-html-display.c:2344 ../mail/em-format-html-display.c:2383
+msgid "View _Unformatted"
+msgstr "Ver _ensin formatu"
+
+#: ../mail/em-format-html-display.c:2346
+msgid "Hide _Unformatted"
+msgstr "Soverar e_nsin formatu"
+
+#: ../mail/em-format-html-display.c:2403
+msgid "O_pen With"
+msgstr "Abrir _con"
+
+#: ../mail/em-format-html-display.c:2479
+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 nun pue amosar esti corréu darréu de que ye enforma grande pa "
+"procesalu. Pue velu ensin formatu o con un editor de testu esternu."
+
+#: ../mail/em-format-html-print.c:156
+#, c-format
+msgid "Page %d of %d"
+msgstr "Páxina %d de %d"
+
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Obteniendo «%s»"
+
+#: ../mail/em-format-html.c:925
+msgid "Unknown external-body part."
+msgstr "Parte externa al cuerpu del mensax desconocía."
+
+#: ../mail/em-format-html.c:933
+msgid "Malformed external-body part."
+msgstr "Parte externa al cuerpu del mensax mal escrita."
+
+#: ../mail/em-format-html.c:963
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Punteru a sitiu FTP (%s)"
+
+#: ../mail/em-format-html.c:974
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Punteru a ficheru llocal (%s) válidu nel sitiu «%s»"
+
+#: ../mail/em-format-html.c:976
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Punteru a ficheru llocal (%s)"
+
+#: ../mail/em-format-html.c:997
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Punteru a datos remotos (%s)"
+
+#: ../mail/em-format-html.c:1008
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Punteru a datos externos desconocíos (tipu «%s»)"
+
+#: ../mail/em-format-html.c:1236
+msgid "Formatting message"
+msgstr "Formateando el mensax"
+
+#: ../mail/em-format-html.c:1410
+msgid "Formatting Message..."
+msgstr "Formateando el mensax…"
+
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:210
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
+msgid "Cc"
+msgstr "Cc"
+
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:210
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
+msgid "Bcc"
+msgstr "Cct"
+
+#. pseudo-header
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1451
+msgid "Mailer"
+msgstr "Mensaxería"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: ../mail/em-format-html.c:1771
+msgid " (%a, %R %Z)"
+msgstr " (%a, %R %Z)"
+
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: ../mail/em-format-html.c:1776
+msgid " (%R %Z)"
+msgstr " (%R %Z)"
+
+#. 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:1907
+#, c-format
+msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgstr "Esti mensax unviólu <b>%s</b> en nome de <b>%s</b>"
+
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:308
+msgid "From"
+msgstr "De"
+
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
+msgid "Reply-To"
+msgstr "Retrucar a"
+
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
+#: ../widgets/misc/e-dateedit.c:347
+msgid "Date"
+msgstr "Data"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "Grupos de noticies"
+
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "Cara"
+
+#: ../mail/em-format.c:1158
+#, c-format
+msgid "%s attachment"
+msgstr "%s ficheros axuntos"
+
+#: ../mail/em-format.c:1200
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Nun ye dable interpretar el mensax S/MIME: Fallu desconocíu"
+
+#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Nun ye dable analizar el mensax MIME. Amosando la fonte."
+
+#: ../mail/em-format.c:1345
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Tipu de cifráu non sofitáu pa multipart/encrypted"
+
+#: ../mail/em-format.c:1355
+msgid "Could not parse PGP/MIME message"
+msgstr "Nun pudo interpretase'l mensax PGP/MIME"
+
+#: ../mail/em-format.c:1355
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "Nun pudo interpretase'l mensax PGP/MIME: Fallu desconocíu"
+
+#: ../mail/em-format.c:1512
+msgid "Unsupported signature format"
+msgstr "Formatu de robla non sofitáu"
+
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
+msgid "Error verifying signature"
+msgstr "Fallu al verificar la robla"
+
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
+msgid "Unknown error verifying signature"
+msgstr "Fallu desconocíu al verificar la robla"
+
+#: ../mail/em-format.c:1663
+msgid "Could not parse PGP message"
+msgstr "Nun pudo interpretase'l mensax PGP"
+
+#: ../mail/em-format.c:1663
+msgid "Could not parse PGP message: Unknown error"
+msgstr "Nun pudo interpretase'l mensax PGP: Fallu desconocíu"
+
+#: ../mail/em-mailer-prefs.c:94
+msgid "Every time"
+msgstr "Cada vegada"
+
+#: ../mail/em-mailer-prefs.c:95
+msgid "Once per day"
+msgstr "Una vegada per día"
+
+#: ../mail/em-mailer-prefs.c:96
+msgid "Once per week"
+msgstr "Una vegada per selmana"
+
+#: ../mail/em-mailer-prefs.c:97
+msgid "Once per month"
+msgstr "Una vegada per mes"
+
+#: ../mail/em-mailer-prefs.c:327
+msgid "Add Custom Junk Header"
+msgstr "Amestar cabecera de C. Puxarra personalizada"
+
+#: ../mail/em-mailer-prefs.c:331
+msgid "Header Name:"
+msgstr "Nome de la cabecera:"
+
+#: ../mail/em-mailer-prefs.c:332
+msgid "Header Value Contains:"
+msgstr "El valor de cabecera contién:"
+
+#: ../mail/em-mailer-prefs.c:437
+msgid "Contains Value"
+msgstr "Contién el valor"
+
+#: ../mail/em-mailer-prefs.c:459
+msgid "Color"
+msgstr "Color"
+
+#: ../mail/em-mailer-prefs.c:462
+msgid "Tag"
+msgstr "Etiqueta"
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr "El complementu %s ta disponible y el binariu ta instaláu."
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr ""
+"El complementu (plugin) %s nun ta disponible. Comprebe si'l paquete ta "
+"instaláu."
+
+#: ../mail/em-mailer-prefs.c:1108
+msgid "No Junk plugin available"
+msgstr "Nun hai plugin pa C. Puxarra disponible"
+
+#. green
+#: ../mail/em-migrate.c:1059
+msgid "To Do"
+msgstr "Xeres pendientes"
+
+#. blue
+#: ../mail/em-migrate.c:1060
+msgid "Later"
+msgstr "Más sero"
+
+#: ../mail/em-migrate.c:1652
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Nun pudo criase la carpeta nueva: «%s»: %s"
+
+#: ../mail/em-migrate.c:1678
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "Nun ye dable copiar la carpeta «%s» a «%s»: %s"
+
+#: ../mail/em-migrate.c:1863
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Nun se pue facer una busca de buzones esistentes en «%s»: %s"
+
+#: ../mail/em-migrate.c:1868
+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 ""
+"El llugar y xerarquía de les carpetes de buzones de corréu camudó dende "
+"Evolution 1.x.\n"
+"\n"
+"Tenga paciencia mentantu Evolution migra les sos carpetes…"
+
+#: ../mail/em-migrate.c:2069
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Nun ye dable abrir los datos antiguos POP keep-on-server «%s»: %s"
+
+#: ../mail/em-migrate.c:2083
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "Fallu al criar direutoriu de datos POP3 keep-on-server «%s»: %s"
+
+#: ../mail/em-migrate.c:2112
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr "Nun se puen copiar los datos POP3 keep-on-server «%s»: %s"
+
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Nun ye dable criar l'atroxu de corréu llocal «%s»: %s"
+
+#: ../mail/em-migrate.c:2898
+#, fuzzy
+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 formatu de resúmenes de les carpetas del buzón d'Evolution movióse a "
+"sqlite dende Evolution 2.24.\n"
+"\n"
+"Tenga paciencia mientres Evolution migra les sos carpetes…"
+
+#: ../mail/em-migrate.c:2963
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr "Nun ye dable criar les carpetes de corréu llocal en: «%s»: %s"
+
+#: ../mail/em-migrate.c:2982
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+"Nun se pue lleer la configuración de la instalación anterior d'Evolution, "
+"«evolution/config.xmldb» nun esiste o ta corrompíu."
+
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
+msgid "_Reply to sender"
+msgstr "_Retrucar al remitente"
+
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../ui/evolution-mail-message.xml.h:83
+msgid "Reply to _List"
+msgstr "Retrucar a la _llista"
+
+#. make it first item
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:853
+msgid "_Add to Address Book"
+msgstr "_Amestar a la llibreta de direiciones"
+
+#: ../mail/em-subscribe-editor.c:582
+msgid "This store does not support subscriptions, or they are not enabled."
+msgstr "Esti almacén nun soporta soscripciones, o nun tán activaes."
+
+#: ../mail/em-subscribe-editor.c:615
+msgid "Subscribed"
+msgstr "Soscritu"
+
+#: ../mail/em-subscribe-editor.c:619
+msgid "Folder"
+msgstr "Carpeta"
+
+#. FIXME: This is just to get the shadow, is there a better way?
+#: ../mail/em-subscribe-editor.c:821
+msgid "Please select a server."
+msgstr "Seleicione un servidor."
+
+#: ../mail/em-subscribe-editor.c:842
+msgid "No server has been selected"
+msgstr "Nun se seleicionó dengún servidor"
+
+#. Check buttons
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
+msgid "_Do not show this message again."
+msgstr "_Nun amosar otra vegada esti mensax."
+
+#: ../mail/em-utils.c:317
+msgid "Message Filters"
+msgstr "Fieltros de mensaxes"
+
+#: ../mail/em-utils.c:370
+msgid "message"
+msgstr "mensax"
+
+#: ../mail/em-utils.c:654
+msgid "Save Message..."
+msgstr "Guardar mensax…"
+
+#: ../mail/em-utils.c:704
+msgid "Add address"
+msgstr "Amestar direición"
+
+#. Drop filename for messages from a mailbox
+#: ../mail/em-utils.c:1225
+#, c-format
+msgid "Messages from %s"
+msgstr "Correos de %s"
+
+#: ../mail/em-vfolder-editor.c:115
+msgid "Search _Folders"
+msgstr "_Carpetes de gueta"
+
+#: ../mail/em-vfolder-rule.c:593
+msgid "Search Folder source"
+msgstr "Orixe de la carpeta de gueta"
+
+#: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Altor de la ventana «Unviar y recibir corréu»"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "Estáu maximizáu de la ventana «Unviar y recibir corréu»"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Send and Receive Mail\" window width"
+msgstr "Anchor de la ventana «Unviar y recibir corréu»"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+#, fuzzy
+msgid "Allows Evolution to display text part of limited size"
+msgstr "Permite a Evolution amosar la parte de testu de tamañu llimitáu"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "Always request read receipt"
+msgstr "Siempres solicitar confirmación de llectura"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "Tiempu en segundos que tendrá d'amosase el fallu na barra d'estáu."
+
+#: ../mail/evolution-mail.schemas.in.h:7
+msgid "Automatic emoticon recognition"
+msgstr "Reconocimientu automáticu d'emoticonos"
+
+#: ../mail/evolution-mail.schemas.in.h:8
+msgid "Automatic link recognition"
+msgstr "Reconocimientu automáticu d'enllaces"
+
+#: ../mail/evolution-mail.schemas.in.h:9
+msgid "Check incoming mail being junk"
+msgstr "Comprebar si'l corréu entrante ye C. Puxarra"
+
+#: ../mail/evolution-mail.schemas.in.h:10
+msgid "Citation highlight color"
+msgstr "Color de resaltáu de cites"
+
+#: ../mail/evolution-mail.schemas.in.h:11
+msgid "Citation highlight color."
+msgstr "Color de resaltáu de cites"
+
+#: ../mail/evolution-mail.schemas.in.h:12
+msgid "Composer Window default height"
+msgstr "Altor predetermináu de la ventana de redacción de mensaxes"
+
+#: ../mail/evolution-mail.schemas.in.h:13
+msgid "Composer Window default width"
+msgstr "Anchor predetermináu de la ventana de redacción de mensaxes"
+
+#: ../mail/evolution-mail.schemas.in.h:14
+msgid "Composer load/attach directory"
+msgstr "Direutoriu de carga/axuntos del editor"
+
+#: ../mail/evolution-mail.schemas.in.h:15
+msgid "Compress display of addresses in TO/CC/BCC"
+msgstr "Comprimir la visualización de direiciones en A/CC/CCT"
+
+#: ../mail/evolution-mail.schemas.in.h:16
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+"Comprime la visualización de direiciones en A/CC/CCT al númberu especificáu "
+"en address_count."
+
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+"Remana la frecuencia cola que los cambeos llocales se sincronicen col "
+"sirvidor de corréu-e remotu. L'intervalu tien de ser a lo menos 30 segundos."
+
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid "Custom headers to use while checking for junk."
+msgstr "Cabeceres personalizaes qu'usar al comprobar si ye SPAM."
+
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"Cabeceres personalizaes qu'usar al comprobar si ye SPAM. La llista "
+"d'elementos son cadenes col formatu \"headername=valor\"."
+
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Default charset in which to compose messages"
+msgstr "Conxuntu de carauteres predetermináu pa redactar mensaxes"
+
+#: ../mail/evolution-mail.schemas.in.h:21
+msgid "Default charset in which to compose messages."
+msgstr "Conxuntu de carauteres predetermináu pa redactar mensaxes."
+
+#: ../mail/evolution-mail.schemas.in.h:22
+msgid "Default charset in which to display messages"
+msgstr "Conxuntu de carauteres predetermináu p'amosar mensaxes."
+
+#: ../mail/evolution-mail.schemas.in.h:23
+msgid "Default charset in which to display messages."
+msgstr "Conxuntu de carauteres predetermináu p'amosar mensaxes."
+
+#: ../mail/evolution-mail.schemas.in.h:24
+msgid "Default forward style"
+msgstr "Estilu de reunvíu predetermináu"
+
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Default height of the Composer Window."
+msgstr "Altor predetermináu de la ventana del editor de mensaxes."
+
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid "Default height of the message window."
+msgstr "Altor predetermináu de la ventana del mensax."
+
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Default height of the subscribe dialog."
+msgstr "Altor predetermináu del diálogu de soscripción."
+
+#: ../mail/evolution-mail.schemas.in.h:28
+msgid "Default reply style"
+msgstr "Estilu de rempuesta predetermináu"
+
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid "Default value for thread expand state"
+msgstr "Valor predetermináu pa l'estáu d'expansión de la conversación"
+
+#: ../mail/evolution-mail.schemas.in.h:30
+msgid "Default width of the Composer Window."
+msgstr "Anchor predetermináu de la ventana del editor de mensaxes."
+
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid "Default width of the message window."
+msgstr "Anchor predetermináu de la ventana de mensaxes."
+
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid "Default width of the subscribe dialog."
+msgstr "Anchor predetermináu del diálogu de soscripción."
+
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+"Determina si hai de guetar direiciones pal fieltráu de corréu puxarra namái "
+"nes llibretes de señes llocales."
+
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Determines whether to lookup in address book for sender email"
+msgstr ""
+"Determina si hai de guetar el remitente del corréu electrónicu na llibreta "
+"de señes"
+
+#: ../mail/evolution-mail.schemas.in.h:35
+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 hai de guetar el remitente del corréu electrónicu na llibreta "
+"de señes. Si l'alcuentra, ye que nun debe ser corréu puxarra. Gueta nes "
+"llibretes conseñaes con autocompletar. Pue resultar sele si les llibretes de "
+"señes remotes (como LDAP) tán conseñaes con autocompletar."
+
+#: ../mail/evolution-mail.schemas.in.h:36
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
+"Determina si hai d'usar cabeceres personalizaes pa comprebar si ye SPAM"
+
+#: ../mail/evolution-mail.schemas.in.h:37
+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 hai d'usar cabeceres personalizaes pa comprebar si ye SPAM. Si "
+"esta opción ta activada y les cabeceres se mencionen, meyoraráse la velocidá "
+"de comprobáu de corréu puxarra."
+
+#: ../mail/evolution-mail.schemas.in.h:38
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+msgstr ""
+"Determina si tienen d'usase les mesmes tipografíes pa les llinies «De» y "
+"«Asuntu» na columna «Mensaxes» de la vista vertical."
+
+#: ../mail/evolution-mail.schemas.in.h:39
+msgid "Directory for loading/attaching files to composer."
+msgstr "Direutoriu pa cargar/axuntar ficheros nel editor."
+
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Directory for saving mail component files."
+msgstr "Direutoriu p'atroxar ficheros unviaos per corréu"
+
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgstr ""
+"Desactivar o activar la elipsis de los nomes de les carpetes nel árbol de "
+"carpetes"
+
+#: ../mail/evolution-mail.schemas.in.h:42
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+"Dibuxar indicadores d'errores tipográficos nes pallabres mentantu s'escribe."
+
+#: ../mail/evolution-mail.schemas.in.h:43
+msgid "Empty Junk folders on exit"
+msgstr "Vaciar les carpetes Corréu puxarra al colar"
+
+#: ../mail/evolution-mail.schemas.in.h:44
+msgid "Empty Trash folders on exit"
+msgstr "Vaciar papelera al colar"
+
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "Vaciar toles carpetes Corréu puxarra al colar d'Evolution."
+
+#: ../mail/evolution-mail.schemas.in.h:46
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Vaciar toles papeleres al colar d'Evolution."
+
+#: ../mail/evolution-mail.schemas.in.h:47
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr "Habilitar mou cursor, pa que pueda ver un cursor cuando llee corréu."
+
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Enable or disable magic space bar"
+msgstr "Activa o desactiva la barra espaciadora máxica"
+
+#: ../mail/evolution-mail.schemas.in.h:49
+msgid "Enable or disable type ahead search feature"
+msgstr "Activa o desactiva la carauterística de gueta al teclear"
+
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid "Enable search folders"
+msgstr "Activar les carpetes de gueta"
+
+#: ../mail/evolution-mail.schemas.in.h:51
+msgid "Enable search folders on startup."
+msgstr "Activar les carpetes de gueta al entamu."
+
+#: ../mail/evolution-mail.schemas.in.h:52
+msgid ""
+"Enable side bar search feature so that you can start interactive searching "
+"by typing in the text. Use is that you can easily find a folder in that side "
+"bar by just typing the folder name and the selection jumps automatically to "
+"that folder."
+msgstr ""
+"Activa la carauterística de busca na barra pa que pueda aniciar una gueta "
+"interactiva tecleando el testu. L'usu ye pa que pueda alcontrar "
+"cenciellamente una carpeta nesa barra llateral namái tecleando'l nome de la "
+"carpeta y la seleición salta automáticamente a esa carpeta."
+
+#: ../mail/evolution-mail.schemas.in.h:53
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
+"Activar esto pa usar la barra espaciadora pa desplazase na vista previa del "
+"mensax, llista de mensaxes y carpetes."
+
+#: ../mail/evolution-mail.schemas.in.h:54
+msgid "Enable to render message text part of limited size."
+msgstr "Activar p'amosar la parte de testu del mensax de tamañu llimitáu"
+
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid "Enable/disable caret mode"
+msgstr "Activar/desactivar mou cursor"
+
+#: ../mail/evolution-mail.schemas.in.h:56
+msgid "Height of the message-list pane"
+msgstr "Altor del panel de llista de mensaxes"
+
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid "Height of the message-list pane."
+msgstr "Altor del panel de llista de mensaxes"
+
+#: ../mail/evolution-mail.schemas.in.h:58
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "Sovera la vista previa por carpeta y esanicia la seleición"
+
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
+msgstr ""
+"Si l'usuariu tenta d'abrir diez o más mensaxes al empar, entrugar al usuariu "
+"si daveres quier facelo."
+
+#: ../mail/evolution-mail.schemas.in.h:60
+msgid ""
+"If the \"Preview\" pane is on, then show it side-by-side rather than "
+"vertically."
+msgstr ""
+"Si el panel de «Vista previa» ta activáu, entós amuésalo nel llateral n'arróu "
+"de verticalmente."
+
+#: ../mail/evolution-mail.schemas.in.h:61
+#, fuzzy
+msgid ""
+"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
+"any MIME types appearing in this list which map to a Bonobo component viewer "
+"in GNOME's MIME type database may be used for displaying content."
+msgstr ""
+"Si nun hai un visor integráu pa un tipu mime particular dientro d'Evolution, "
+"cualesquier tipu mime qu'apaeza nesta llista que se mapee a un visor de "
+"componentes bonobo na base de datos de GNOME pue usase p'amosar el conteníu."
+
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Altor anicial de la ventana «Unviar y recibir corréu». El valor anovaráse "
+"según l'usuariu redimensiona verticalmente la ventana."
+
+#: ../mail/evolution-mail.schemas.in.h:63
+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 ""
+"Altor anicial de la ventana «Unviar y recibir corréu». El valor anovaráse "
+"cuando l'usuariu maximiza o amenorga la ventana. Nota: Evolution nun usa "
+"esti valor en particular yá que la ventana «Unviar y recibir corréu» nun pue "
+"maximizase. Esta clave esiste namái como un detalle d'implementación."
+
+#: ../mail/evolution-mail.schemas.in.h:64
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Anchor anicial de la ventana «Unviar y recibir corréu». El valor actualízase "
+"según l'usuario redimensiona horizontalmente la ventana."
+
+#: ../mail/evolution-mail.schemas.in.h:65
+msgid "It disables/enables the prompt while marking multiple messages."
+msgstr "Desactiva/activa la entruga cuando se conseñen dellos mensaxes."
+
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid ""
+"It disables/enables the repeated prompts to ask if offline sync is required "
+"before going into offline mode."
+msgstr ""
+"Habilita/deshabilita la carauterística au la entruga de si se requier "
+"sincronización enantes de pasar al mou trabayar ensin conexón se repite."
+
+#: ../mail/evolution-mail.schemas.in.h:67
+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/activa los mensaxes repetitivos d'alvertencia de que desaniciar "
+"mensaxes d'una carpeta de gueta desanicia dafechu'l mensax, non namái los "
+"desanicia de los resultaos de la busca."
+
+#: ../mail/evolution-mail.schemas.in.h:68
+msgid "Last time empty junk was run"
+msgstr "Cabera vegada que se vació el C. Puxarra"
+
+#: ../mail/evolution-mail.schemas.in.h:69
+msgid "Last time empty trash was run"
+msgstr "Cabera vegada que se vació la papelera"
+
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Level beyond which the message should be logged."
+msgstr "Nivel más alló, del que'l mensax tien de rexistrase"
+
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid "List of Labels and their associated colors"
+msgstr "Llista d'etiquetes y los sos colores apareyaos"
+
+#: ../mail/evolution-mail.schemas.in.h:72
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:73
+msgid "List of accepted licenses"
+msgstr "Llista de llicencies aceutaes"
+
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid "List of accounts"
+msgstr "Llista de cuentes"
+
+#: ../mail/evolution-mail.schemas.in.h:75
+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 cuentes conocíes pal componente de corréu d'Evolution. La llista "
+"contién cadenes denomando subdireutorios rellativos a /apps/evolution/mail/"
+"accounts."
+
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "List of custom headers and whether they are enabled."
+msgstr "Llista de cabeceres personalizaes y si tán activaes."
+
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+"Llista de los códigos de diccionariu usaos pa la correición ortográfica."
+
+#: ../mail/evolution-mail.schemas.in.h:78
+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 conocíes pal componente de corréu d'Evolution. La llista "
+"contién cadenes col nome:color au color usa la codificación hex HTML."
+
+#: ../mail/evolution-mail.schemas.in.h:79
+msgid "List of protocol names whose license has been accepted."
+msgstr "Llista de nomes de protocolos que la so llicencia foi aceutada."
+
+#: ../mail/evolution-mail.schemas.in.h:80
+#, fuzzy
+msgid "Load images for HTML messages over HTTP"
+msgstr "Cargar imáxenes pa mensaxes HTML sobro http"
+
+#: ../mail/evolution-mail.schemas.in.h:81
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid "Log filter actions"
+msgstr "Rexistrar aicciones de fieltráu"
+
+#: ../mail/evolution-mail.schemas.in.h:83
+msgid "Log filter actions to the specified log file."
+msgstr "Rexistrar aiciones de fieltráu nel ficheru de rexistru especificáu."
+
+#: ../mail/evolution-mail.schemas.in.h:84
+msgid "Logfile to log filter actions"
+msgstr "Ficheru de rexistru pa rexistrar les aiciones de fieltráu"
+
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid "Logfile to log filter actions."
+msgstr "Ficheru de rexistru pa rexistrar les aiciones de fieltráu."
+
+#: ../mail/evolution-mail.schemas.in.h:86
+msgid "Mark as Seen after specified timeout"
+msgstr "Conseñar como vistu dempués del tiempu especificáu"
+
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid "Mark as Seen after specified timeout."
+msgstr "Conseñar como vistu dempués del tiempu especificáu"
+
+#: ../mail/evolution-mail.schemas.in.h:88
+msgid "Mark citations in the message \"Preview\""
+msgstr "Conseñar cites testuales na «vista previa» del mensax"
+
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid "Mark citations in the message \"Preview\"."
+msgstr "Conseñar cites testuales na «vista previa» del mensax"
+
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid "Message Window default height"
+msgstr "Altor predetermináu de la ventana de mensaxes"
+
+#: ../mail/evolution-mail.schemas.in.h:91
+msgid "Message Window default width"
+msgstr "Anchor predetermináu de la ventana de mensaxes"
+
+#: ../mail/evolution-mail.schemas.in.h:92
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid "Minimum days between emptying the junk on exit"
+msgstr "Díes mínimos ente'l vaciáu del SPAM a la salida"
+
+#: ../mail/evolution-mail.schemas.in.h:94
+msgid "Minimum days between emptying the trash on exit"
+msgstr "Díes mínimos ente'l vaciáu de la papelera a la salida"
+
+#: ../mail/evolution-mail.schemas.in.h:95
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr "Tiempu mínimu ente'l vaciáu del SPAM a la salida, en díes."
+
+#: ../mail/evolution-mail.schemas.in.h:96
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr "Tiempu mínimu ente'l vaciáu de la papelera a la salida, en díes."
+
+#: ../mail/evolution-mail.schemas.in.h:97
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr "Númberu de direiciones a amosar en PA/CC/CCT"
+
+#: ../mail/evolution-mail.schemas.in.h:98
+msgid "Prompt on empty subject"
+msgstr "Entrugar cuando l'asuntu tea en blancu"
+
+#: ../mail/evolution-mail.schemas.in.h:99
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr "Entrugar al usuariu cuando tente compautar una carpeta."
+
+#: ../mail/evolution-mail.schemas.in.h:100
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:101
+msgid "Prompt to check if the user wants to go offline immediately"
+msgstr "Entrugar pa comprebar si l'usuariu quier desconeutase darréu"
+
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid "Prompt when deleting messages in search folder"
+msgstr "Entrugar al desaniciar mensaxes en carpetes de gueta"
+
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Prompt when user expunges"
+msgstr "Entrugar cuando l'usuariu compaute"
+
+#: ../mail/evolution-mail.schemas.in.h:104
+msgid "Prompt when user only fills Bcc"
+msgstr "Entrugar cuando l'usuariu namái enllene'l campu Cct"
+
+#: ../mail/evolution-mail.schemas.in.h:105
+msgid "Prompt when user tries to open 10 or more messages at once"
+msgstr "Entrugar cuando l'usuariu tente abrir diez o más mensaxes al empar"
+
+#: ../mail/evolution-mail.schemas.in.h:106
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:107
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:108
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr "Entrugar cuando l'usuariu tente unviar HTML non deseáu"
+
+#: ../mail/evolution-mail.schemas.in.h:109
+msgid "Prompt while marking multiple messages"
+msgstr "Entrugar cuando se conseñen dellos mensaxes"
+
+#: ../mail/evolution-mail.schemas.in.h:110
+msgid "Recognize emoticons in text and replace them with images."
+msgstr "Reconocer emoticonos nel testu y reemplazalos con imáxenes."
+
+#: ../mail/evolution-mail.schemas.in.h:111
+msgid "Recognize links in text and replace them."
+msgstr "Reconocer enllaces nel testu y reemplazalos."
+
+#: ../mail/evolution-mail.schemas.in.h:112
+msgid "Run junk test on incoming mail."
+msgstr "Executar la preba de SPAM nel corréu entrante."
+
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "Save directory"
+msgstr "Direutoriu au guardar"
+
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Search for the sender photo in local address books"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid "Send HTML mail by default"
+msgstr "Unviar corréu en HTML por omisión"
+
+#: ../mail/evolution-mail.schemas.in.h:116
+msgid "Send HTML mail by default."
+msgstr "Unviar corréu HTML por defeutu"
+
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid "Sender email-address column in the message list"
+msgstr "Columna del corréu-e del remitente na llista de mensaxes"
+
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:119
+msgid "Show Animations"
+msgstr "Amosar animaciones"
+
+#: ../mail/evolution-mail.schemas.in.h:120
+msgid "Show animated images as animations."
+msgstr "Amuesa les imáxenes animaes como animaciones."
+
+#: ../mail/evolution-mail.schemas.in.h:121
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr "Amuesa los mensaxes desaniciaos (tachaos) na llista de mensaxes."
+
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid "Show deleted messages in the message-list"
+msgstr "Amuesa los mensaxes desaniciaos na llista de mensaxes"
+
+#: ../mail/evolution-mail.schemas.in.h:123
+msgid "Show photo of the sender"
+msgstr "Amosar la semeya del remitente"
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Show the photo of the sender in the message reading pane."
+msgstr "Amuesa la semeya del remitente nel panel de llectura de mensaxes."
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Spell check inline"
+msgstr "Comprebación ortográfica en llinia"
+
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Spell checking color"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Spell checking languages"
+msgstr "Comprobación ortográfica de llingües"
+
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "Subscribe dialog default height"
+msgstr "Altor predetermináu del diálogu de soscripción"
+
+#: ../mail/evolution-mail.schemas.in.h:132
+msgid "Subscribe dialog default width"
+msgstr "Anchor predetermináu del diálogu de soscripción"
+
+#: ../mail/evolution-mail.schemas.in.h:133
+msgid "Terminal font"
+msgstr "Tipografía del terminal"
+
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Text message part limit"
+msgstr "Llímite de la parte de testu del mensax"
+
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid "The default plugin for Junk hook"
+msgstr "El complementu predetermináu pa SPAM"
+
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid "The last time empty junk was run, in days since the epoch."
+msgstr "La cabera vegada que se vació el SPAM, en díes dende entós."
+
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr "La cabera vegada que se vació la papelera, en díes dende entós."
+
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "The terminal font for mail display."
+msgstr "La tipografía de terminal p'amosar el corréu."
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "The variable width font for mail display."
+msgstr "La tipografía d'achor cimbrable p'amosar el corréu."
+
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid ""
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+msgstr ""
+"Esto pue tener tres valores dables. «0» pa errores. «1» p'avisos. «2» pa "
+"mensaxes de depuración."
+
+#: ../mail/evolution-mail.schemas.in.h:141
+#, fuzzy
+msgid ""
+"This decides the max size of the text part that can be formatted under "
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+msgstr ""
+"Esto decide'l tamañu máximu de la parte de testu que se pue formatear baxo "
+"Evolution. Lo predeterminao son 4 Mb/4096 Kb y ta especificao en términos de "
+"Kb."
+
+#: ../mail/evolution-mail.schemas.in.h:142
+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 ""
+"Ésta ye la papelera por defeutu del complementu, entá cuando hubiere munchos "
+"complementos permitíos. Si el complementu llistáu por defeutu ta desactiváu, "
+"entós dirá de nuevu a los otros complementos disponibles."
+
+#: ../mail/evolution-mail.schemas.in.h:143
+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 ye d'una sola llectura y dempués de lleela afítase a «false». Esto "
+"deseleiciona el corréu na llista y desanicia la vista previa pa esa carpeta."
+
+#: ../mail/evolution-mail.schemas.in.h:144
+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 tendría de tener una llista de cadarmes XML especificando "
+"cabeceres personalizaes, ya conseñando si tienen d'amosase. El formatu de la "
+"cadarma XML ye &lt;header enabled&gt;: poner a activáu si la cabecera tien "
+"d'amosase na vista de corréu."
+
+#: ../mail/evolution-mail.schemas.in.h:145
+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 ta rellacionada cola clave lookup_addressbook y usase pa "
+"determinar si namái hai de guetar direiciones na llibreta de señes llocal pa "
+"excluyir corréu unviáu por contautos conocíos dende'l fieltráu de corréu "
+"puxarra."
+
+#: ../mail/evolution-mail.schemas.in.h:146
+msgid "This option would help in improving the speed of fetching."
+msgstr "Esta opción aidará a meyorar la velocidá d'obtención."
+
+#: ../mail/evolution-mail.schemas.in.h:147
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr ""
+"Esto afita'l númberu de direiciones a amosar na vista de llista de mensaxes "
+"predeterminada, más alló de les que s'amuesa un «…»."
+
+#: ../mail/evolution-mail.schemas.in.h:148
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr ""
+"Esti axuste especifica si les conversaciones, de miente predeterminada, "
+"tendríen de tar n'estáu expandíu o contrayíu. Evolution necesita de "
+"reaniciase."
+
+#: ../mail/evolution-mail.schemas.in.h:149
+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 ""
+"Esti axuste especifica si les conversaciones tendríen d'ordenase según el "
+"caberu mensax de cada conversación, n'arróu de pela data del mensax. "
+"Evolution necesita de reaniciase."
+
+#: ../mail/evolution-mail.schemas.in.h:150
+msgid "Thread the message list."
+msgstr "Agrupar la llista de mensaxes."
+
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Thread the message-list"
+msgstr "Agrupar la llista de mensaxes"
+
+#: ../mail/evolution-mail.schemas.in.h:152
+msgid "Thread the message-list based on Subject"
+msgstr "Agrupar la llista de mensaxes en conversaciones basaes nel asuntu"
+
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid "Timeout for marking message as seen"
+msgstr "Tiempu pa conseñar un mensax como vistu"
+
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid "Timeout for marking message as seen."
+msgstr "Tiempu pa conseñar un mensax como vistu"
+
+#: ../mail/evolution-mail.schemas.in.h:155
+msgid "UID string of the default account."
+msgstr "Cadena UID pa la cuenta predeterminada."
+
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "Use SpamAssassin daemon and client"
+msgstr "Usar el demoniu y veceru de SpamAssassin"
+
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "Usar el demoniu y veceru de SpamAssassin (spamc/spamd)."
+
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid "Use custom fonts"
+msgstr "Usar tipografía personalizada"
+
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid "Use custom fonts for displaying mail."
+msgstr "Usar tipografía personalizada p'amosar el corréu"
+
+#: ../mail/evolution-mail.schemas.in.h:161
+msgid "Use only local spam tests."
+msgstr "Usar namái los tests de SPAM llocales."
+
+#: ../mail/evolution-mail.schemas.in.h:162
+msgid "Use only the local spam tests (no DNS)."
+msgstr "Usar namái los tests de SPAM llocales (ensin DNS)."
+
+#: ../mail/evolution-mail.schemas.in.h:163
+msgid "Use side-by-side or wide layout"
+msgstr "Usar distribución llau a llau, o ancha"
+
+#: ../mail/evolution-mail.schemas.in.h:164
+msgid "Variable width font"
+msgstr "Tipografía de anchor cimbrable"
+
+#: ../mail/evolution-mail.schemas.in.h:165
+msgid "View/Bcc menu item is checked"
+msgstr "L'elementu del menú «Ver/Cct» ta conseñáu"
+
+#: ../mail/evolution-mail.schemas.in.h:166
+msgid "View/Bcc menu item is checked."
+msgstr "L'elementu del menú «Ver/Cct» ta conseñáu"
+
+#: ../mail/evolution-mail.schemas.in.h:167
+msgid "View/Cc menu item is checked"
+msgstr "L'elementu del menú «Ver/Cc» ta conseñáu"
+
+#: ../mail/evolution-mail.schemas.in.h:168
+msgid "View/Cc menu item is checked."
+msgstr "L'elementu del menú «Ver/Cc» ta conseñáu"
+
+#: ../mail/evolution-mail.schemas.in.h:169
+msgid "View/From menu item is checked"
+msgstr "L'elementu del menú «Ver/De» ta conseñáu"
+
+#: ../mail/evolution-mail.schemas.in.h:170
+msgid "View/From menu item is checked."
+msgstr "L'elementu del menú «Ver/De» ta conseñáu"
+
+#: ../mail/evolution-mail.schemas.in.h:171
+msgid "View/PostTo menu item is checked"
+msgstr "L'elementu del menú «Ver/Asoleyar en» ta conseñáu"
+
+#: ../mail/evolution-mail.schemas.in.h:172
+msgid "View/PostTo menu item is checked."
+msgstr "L'elementu del menú «Ver/Asoleyar en» ta conseñáu"
+
+#: ../mail/evolution-mail.schemas.in.h:173
+msgid "View/ReplyTo menu item is checked"
+msgstr "L'elementu del menú «Ver/Retrucar a» ta conseñáu"
+
+#: ../mail/evolution-mail.schemas.in.h:174
+msgid "View/ReplyTo menu item is checked."
+msgstr "L'elementu del menú «Ver/Retrucar a» ta conseñáu"
+
+#: ../mail/evolution-mail.schemas.in.h:175
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Whether disable ellipsizing feature of folder names in folder tree."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:177
+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:178
+msgid "Whether sort threads based on latest message in that thread"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:179
+msgid "Width of the message-list pane"
+msgstr "Anchor del panel de llista de mensaxes"
+
+#: ../mail/evolution-mail.schemas.in.h:180
+msgid "Width of the message-list pane."
+msgstr "Anchor del panel de llista de mensaxes"
+
+#: ../mail/importers/elm-importer.c:182
+msgid "Importing Elm data"
+msgstr "Importando datos d'Elm"
+
+#: ../mail/importers/elm-importer.c:367
+msgid "Evolution Elm importer"
+msgstr "Importador d'Elm d'Evolution"
+
+#: ../mail/importers/elm-importer.c:368
+msgid "Import mail from Elm."
+msgstr "Importar corréu d'Elm."
+
+#: ../mail/importers/evolution-mbox-importer.c:79
+msgid "Destination folder:"
+msgstr "Carpeta de destín:"
+
+#: ../mail/importers/evolution-mbox-importer.c:82
+msgid "Select folder to import into"
+msgstr "Seleicione la carpeta na qu'importar"
+
+#: ../mail/importers/evolution-mbox-importer.c:219
+msgid "Berkeley Mailbox (mbox)"
+msgstr "Buzón Berkeley (mbox)"
+
+#: ../mail/importers/evolution-mbox-importer.c:220
+msgid "Importer Berkeley Mailbox format folders"
+msgstr "Importador de carpetes en formatu buzón de Berkeley"
+
+#: ../mail/importers/mail-importer.c:147
+msgid "Importing mailbox"
+msgstr "Importando buzón de corréu"
+
+#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
+#, c-format
+msgid "Importing `%s'"
+msgstr "Importando «%s»"
+
+#: ../mail/importers/mail-importer.c:371
+#, c-format
+msgid "Scanning %s"
+msgstr "Analizando %s"
+
+#: ../mail/importers/pine-importer.c:225
+msgid "Importing Pine data"
+msgstr "Importando datos de Pine"
+
+#: ../mail/importers/pine-importer.c:424
+msgid "Evolution Pine importer"
+msgstr "Importador de Pine d'Evolution"
+
+#: ../mail/importers/pine-importer.c:425
+msgid "Import mail from Pine."
+msgstr "Importar corréu de Pine."
+
+#: ../mail/mail-autofilter.c:75
+#, c-format
+msgid "Mail to %s"
+msgstr "Corréu pa %s"
+
+#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:278
+#, c-format
+msgid "Mail from %s"
+msgstr "Corréu de %s"
+
+#: ../mail/mail-autofilter.c:262
+#, c-format
+msgid "Subject is %s"
+msgstr "Asuntu ye %s"
+
+#: ../mail/mail-autofilter.c:297
+#, c-format
+msgid "%s mailing list"
+msgstr "Llista de corréu %s"
+
+#: ../mail/mail-autofilter.c:368
+msgid "Add Filter Rule"
+msgstr "Amestar regla de fieltráu"
+
+#: ../mail/mail-component.c:163
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr ""
+
+#: ../mail/mail-component.c:545
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:549
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:556
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:559
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:561
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:563
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:569
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:570
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:922
+msgid "New Mail Message"
+msgstr "Mensax de corréu nuevu"
+
+#: ../mail/mail-component.c:924
+msgid "Compose a new mail message"
+msgstr "Redacta un mensax de corréu nuevu"
+
+#: ../mail/mail-component.c:930
+msgid "New Mail Folder"
+msgstr "Nueva carpeta de corréu"
+
+#: ../mail/mail-component.c:932
+msgid "Create a new mail folder"
+msgstr "Cria una carpeta de corréu nueva"
+
+#: ../mail/mail-component.c:1079
+msgid "Failed upgrading Mail settings or folders."
+msgstr "Falló al autualizar la configuración de corréu o carpetes."
+
+#: ../mail/mail-component.c:1595
+msgid "Error"
+msgstr "Fallu"
+
+#: ../mail/mail-component.c:1595
+msgid "Errors"
+msgstr "Errores"
+
+#: ../mail/mail-component.c:1596
+msgid "Warnings and Errors"
+msgstr "Avisos y errores"
+
+#: ../mail/mail-component.c:1597
+msgid "Debug"
+msgstr "Depurar"
+
+#: ../mail/mail-component.c:1597
+msgid "Error, Warnings and Debug messages"
+msgstr "Mensaxes d'error, avisos y depuración"
+
+#: ../mail/mail-component.c:1724
+msgid "Debug Logs"
+msgstr "Depuración de socesos"
+
+#: ../mail/mail-component.c:1738
+msgid "Show _errors in the status bar for"
+msgstr "Amosar _errores na barra d'estáu pa"
+
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1754
+msgid "second(s)."
+msgstr ""
+
+#: ../mail/mail-component.c:1760
+msgid "Log Messages:"
+msgstr "Mensaxes de socesos:"
+
+#: ../mail/mail-component.c:1801
+msgid "Log Level"
+msgstr "Nivel de socesos"
+
+#: ../mail/mail-component.c:1810 ../widgets/misc/e-dateedit.c:389
+msgid "Time"
+msgstr "Tiempu"
+
+#: ../mail/mail-component.c:1820 ../mail/message-list.c:2519
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Mensaxes"
+
+#: ../mail/mail-component.c:1829 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Zarrar esta ventana"
+
+#: ../mail/mail-config.glade.h:1
+msgid " Ch_eck for Supported Types "
+msgstr " _Comprebar tribes sofitaes "
+
+#: ../mail/mail-config.glade.h:2
+msgid "(Note: Requires restart of the application)"
+msgstr "(Nota: Requier reaniciar l'aplicación)"
+
+#: ../mail/mail-config.glade.h:4
+msgid "<b>SSL is not supported in this build of Evolution</b>"
+msgstr "<b>SSL nun ta sofitáu nesta compilación d'Evolution</b>"
+
+#: ../mail/mail-config.glade.h:5
+msgid "<b>Sender Photograph</b>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:6
+msgid "<b>Sig_natures</b>"
+msgstr "<b>_Robles</b>"
+
+#: ../mail/mail-config.glade.h:7
+msgid "<b>Top Posting Option</b> (Not Recommended)"
+msgstr "<b>Opción asoleyar per encima</b> (nun s'encamienta)"
+
+#: ../mail/mail-config.glade.h:8
+msgid "<b>_Languages</b>"
+msgstr "<b>_Llingües</b>"
+
+#: ../mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Account Information</span>"
+msgstr "<span weight=\"bold\">Información de la cuenta</span>"
+
+#: ../mail/mail-config.glade.h:11
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr "<span weight=\"bold\">Autenticación</span>"
+
+#: ../mail/mail-config.glade.h:12
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr "<span weight=\"bold\">Redaición de mensaxes</span>"
+
+#: ../mail/mail-config.glade.h:13
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr "<span weight=\"bold\">Configuración</span>"
+
+#: ../mail/mail-config.glade.h:14
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr "<span weight=\"bold\">Comportamientu predetermináu</span>"
+
+#: ../mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr "<span weight=\"bold\">Esaniciar corréu</span>"
+
+#: ../mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+msgstr "<span weight=\"bold\">_Cabeceres de corréu amosaes</span>"
+
+#: ../mail/mail-config.glade.h:18
+msgid "<span weight=\"bold\">Labels</span>"
+msgstr "<span weight=\"bold\">Etiquetes</span>"
+
+#: ../mail/mail-config.glade.h:19
+msgid "<span weight=\"bold\">Loading Images</span>"
+msgstr "<span weight=\"bold\">Carga d'imáxenes</span>"
+
+#: ../mail/mail-config.glade.h:20
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr "<span weight=\"bold\">Presentación del mensax</span>"
+
+#: ../mail/mail-config.glade.h:21
+msgid "<span weight=\"bold\">Message Fonts</span>"
+msgstr "<span weight=\"bold\">Tipografíes del mensax</span>"
+
+#: ../mail/mail-config.glade.h:22
+msgid "<span weight=\"bold\">Message Receipts</span>"
+msgstr "<span weight=\"bold\">Notificaciones de receición de mensaxes</span>"
+
+#: ../mail/mail-config.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:3
+msgid "<span weight=\"bold\">Optional Information</span>"
+msgstr "<span weight=\"bold\">Información opcional</span>"
+
+#: ../mail/mail-config.glade.h:24
+msgid "<span weight=\"bold\">Options</span>"
+msgstr "<span weight=\"bold\">Opciones</span>"
+
+#: ../mail/mail-config.glade.h:25
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+
+#: ../mail/mail-config.glade.h:26
+msgid "<span weight=\"bold\">Printed Fonts</span>"
+msgstr "<span weight=\"bold\">Tipografía pa imprentación</span>"
+
+#: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:28
+msgid "<span weight=\"bold\">Required Information</span>"
+msgstr "<span weight=\"bold\">Información requería</span>"
+
+#: ../mail/mail-config.glade.h:29
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+msgstr "<span weight=\"bold\">MIME seguru (S/MIME)</span>"
+
+#: ../mail/mail-config.glade.h:30
+msgid "<span weight=\"bold\">Security</span>"
+msgstr "<span weight=\"bold\">Seguridá</span>"
+
+#: ../mail/mail-config.glade.h:31
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+msgstr "<span weight=\"bold\">Mensaxes unviaos y bocexos</span>"
+
+#: ../mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr "<span weight=\"bold\">Configuración del servidor</span>"
+
+#: ../mail/mail-config.glade.h:33
+msgid "<span weight=\"bold\">_Authentication Type</span>"
+msgstr "<span weight=\"bold\">Triba d'_autenticación</span>"
+
+#: ../mail/mail-config.glade.h:35
+msgid "Account Management"
+msgstr "Alministración de cuentes"
+
+#: ../mail/mail-config.glade.h:36
+msgid "Add Ne_w Signature..."
+msgstr "Amestar robla _nueva…"
+
+#: ../mail/mail-config.glade.h:37
+msgid "Add _Script"
+msgstr "Amestar _script"
+
+#: ../mail/mail-config.glade.h:38
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "_Roblar siempres los mensaxes salientes cuando s'use esta cuenta"
+
+#: ../mail/mail-config.glade.h:39
+msgid "Also encrypt to sel_f when sending encrypted messages"
+msgstr "Tamién cifrar a _mí mesmu cuando unvíe corréu cifráu"
+
+#: ../mail/mail-config.glade.h:40
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Siempres unviar _copia de carbón (Cc) a:"
+
+#: ../mail/mail-config.glade.h:41
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Siempres unviar con c_opia tapecida (Cct) a:"
+
+#: ../mail/mail-config.glade.h:42
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr "Siempres tener _enfotu nes claves del mio atroxu al cifrar"
+
+#: ../mail/mail-config.glade.h:43
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr "Siempres cifrar a _mí mesmu cuando unvíe corréu cifráu"
+
+#: ../mail/mail-config.glade.h:44
+msgid "Always request rea_d receipt"
+msgstr "Siempres _solicitar confirmación de llectura"
+
+#: ../mail/mail-config.glade.h:46
+msgid "Automatically insert _emoticon images"
+msgstr "Enxertar imáxenes d'_emoticonos automáticamente"
+
+#: ../mail/mail-config.glade.h:47
+msgid "Baltic (ISO-8859-13)"
+msgstr "Bálticu (ISO-8859-13)"
+
+#: ../mail/mail-config.glade.h:48
+msgid "Baltic (ISO-8859-4)"
+msgstr "Bálticu (ISO-8859-4)"
+
+#: ../mail/mail-config.glade.h:49
+msgid "C_haracter set:"
+msgstr "Conxuntu de carau_teres:"
+
+#: ../mail/mail-config.glade.h:50
+msgid "Ch_eck for Supported Types "
+msgstr "_Comprebar tribes sofitaes "
+
+#: ../mail/mail-config.glade.h:51
+msgid "Check cu_stom headers for junk"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:52
+msgid "Check incoming _messages for junk"
+msgstr "Comprebar si los _mensaxes entrantes son basoria"
+
+#: ../mail/mail-config.glade.h:53
+msgid "Check spelling while I _type"
+msgstr "Comprebar orto_grafía mentantu s'escribe"
+
+#: ../mail/mail-config.glade.h:54
+msgid "Checks incoming mail messages to be Junk"
+msgstr "Compreba si'l corréu qu'entra ye SPAM"
+
+#: ../mail/mail-config.glade.h:55
+msgid "Cle_ar"
+msgstr "_Vaciar"
+
+#: ../mail/mail-config.glade.h:56
+msgid "Clea_r"
+msgstr "Vacia_r"
+
+#: ../mail/mail-config.glade.h:57
+msgid "Color for _misspelled words:"
+msgstr "Color pa les pallabres _mal escrites:"
+
+#: ../mail/mail-config.glade.h:58
+msgid "Confirm _when expunging a folder"
+msgstr "_Confirmar enantes de compautar una carpeta"
+
+#: ../mail/mail-config.glade.h:59
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:65
+msgid "De_fault"
+msgstr "_Predeterminada"
+
+#: ../mail/mail-config.glade.h:66
+msgid "Default character e_ncoding:"
+msgstr "_Codificación de carauteres predeterminada:"
+
+#: ../mail/mail-config.glade.h:68
+msgid "Delete junk messages on e_xit"
+msgstr "Desaniciar los correos SPAM al _salir"
+
+#: ../mail/mail-config.glade.h:70
+msgid "Digitally sign o_utgoing messages (by default)"
+msgstr "Roblar dixitalmente los mensaxes s_alientes (por omisión)"
+
+#: ../mail/mail-config.glade.h:71
+msgid "Do not format messages when text si_ze exceeds"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:72
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:73
+msgid "Do not quote"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:74
+msgid "Done"
+msgstr "Fecho"
+
+#: ../mail/mail-config.glade.h:75
+msgid "Drafts _Folder:"
+msgstr "_Carpeta Borradores:"
+
+#: ../mail/mail-config.glade.h:76
+msgid "Email Accounts"
+msgstr "Cuentes de corréu-e"
+
+#: ../mail/mail-config.glade.h:77
+msgid "Email _Address:"
+msgstr "Dir_eición de corréu-e:"
+
+#: ../mail/mail-config.glade.h:78
+msgid "Empty trash folders on e_xit"
+msgstr "Vaciar _papelera al salir"
+
+#: ../mail/mail-config.glade.h:79
+msgid "Enable Magic S_pacebar "
+msgstr "Activar la barra e_spaciadora máxica "
+
+#: ../mail/mail-config.glade.h:80
+msgid "Enable Sea_rch Folders"
+msgstr "Activar les Carpetes de _gueta"
+
+#: ../mail/mail-config.glade.h:81
+msgid "Encry_ption certificate:"
+msgstr "Certificáu de ci_fráu:"
+
+#: ../mail/mail-config.glade.h:82
+msgid "Encrypt out_going messages (by default)"
+msgstr "Cifrar mensaxes _salientes (por omisión)"
+
+#: ../mail/mail-config.glade.h:84
+msgid "Fi_xed-width:"
+msgstr "A_nchor fixu:"
+
+#: ../mail/mail-config.glade.h:85
+msgid "Fix_ed width Font:"
+msgstr "Tipografía d'anchor fi_xu:"
+
+#: ../mail/mail-config.glade.h:86
+msgid "Font Properties"
+msgstr "Propiedaes de tipografíes"
+
+#: ../mail/mail-config.glade.h:87
+msgid "Format messages in _HTML"
+msgstr "Dar formatu _HTML a los mensaxes"
+
+#: ../mail/mail-config.glade.h:88
+msgid "Full Nam_e:"
+msgstr "Nome _completu:"
+
+#: ../mail/mail-config.glade.h:90
+msgid "HTML Messages"
+msgstr "Mensaxes HTML"
+
+#: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:92
+msgid "Headers"
+msgstr "Cabeceres"
+
+#: ../mail/mail-config.glade.h:93
+msgid "Highlight _quotations with"
+msgstr "Rescamplar testu _citáu con esti color:"
+
+#: ../mail/mail-config.glade.h:95
+msgid "Inline"
+msgstr "Incluyíu en llinia"
+
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:98
+msgid "KB"
+msgstr "KB"
+
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
+msgid "Labels"
+msgstr "Etiquetes"
+
+#: ../mail/mail-config.glade.h:100
+msgid "Languages Table"
+msgstr "Tabla de llingües"
+
+#: ../mail/mail-config.glade.h:101
+msgid "Mail Configuration"
+msgstr "Configuración del corréu"
+
+#: ../mail/mail-config.glade.h:102
+msgid "Mail Headers Table"
+msgstr "Tabla de cabeceres de corréu"
+
+#: ../mail/mail-config.glade.h:104
+msgid "Mailbox location"
+msgstr "Direición del buzón"
+
+#: ../mail/mail-config.glade.h:105
+msgid "Message Composer"
+msgstr "Editor de mensaxes"
+
+#: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:107
+msgid ""
+"Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:108
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:110
+msgid "Or_ganization:"
+msgstr "Organi_zación:"
+
+#: ../mail/mail-config.glade.h:111
+msgid "PGP/GPG _Key ID:"
+msgstr "ID de c_lave GPG/PGP:"
+
+#: ../mail/mail-config.glade.h:112
+msgid "Pass_word:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:114
+msgid ""
+"Please enter a descriptive name for this account in the space below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:116
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:117
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:118
+msgid "Please select among the following options"
+msgstr "Por favor seleicione ente les siguientes opciones"
+
+#: ../mail/mail-config.glade.h:119
+msgid "Port:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:120
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr "Entrugar al unviar mensaxes que namái  tengan definíu el _Cct"
+
+#: ../mail/mail-config.glade.h:121
+msgid "Quoted"
+msgstr "Citáu"
+
+#: ../mail/mail-config.glade.h:122
+msgid "Re_member password"
+msgstr "_Remembrar contraseña"
+
+#: ../mail/mail-config.glade.h:123
+msgid "Re_ply-To:"
+msgstr "Re_trucar a:"
+
+#: ../mail/mail-config.glade.h:125
+msgid "Remember _password"
+msgstr "Remembrar _contraseña"
+
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:127
+msgid "S_earch for sender photograph only in local address books"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:128
+msgid "S_elect..."
+msgstr "S_eleicionar…"
+
+#: ../mail/mail-config.glade.h:129
+msgid "S_end message receipts:"
+msgstr "_Unviar confirmaciones de mensaxes:"
+
+#: ../mail/mail-config.glade.h:130
+msgid "S_tandard Font:"
+msgstr "Tipografía _estándar:"
+
+#: ../mail/mail-config.glade.h:132
+msgid "Select Drafts Folder"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:133
+msgid "Select HTML fixed width font"
+msgstr "Seleiciona lletra d'anchor fixu pa HTML"
+
+#: ../mail/mail-config.glade.h:134
+msgid "Select HTML fixed width font for printing"
+msgstr "Seleiciona lletra d'anchor fixu en HTML pa imprentar"
+
+#: ../mail/mail-config.glade.h:135
+msgid "Select HTML variable width font"
+msgstr "Seleiciona lletra d'anchor cimbrable en HTML"
+
+#: ../mail/mail-config.glade.h:136
+msgid "Select HTML variable width font for printing"
+msgstr "Seleiciona lletra d'anchor cimbrable en HTML pa imprentar"
+
+#: ../mail/mail-config.glade.h:137
+msgid "Select Sent Folder"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:139
+msgid "Sending Mail"
+msgstr "Unviando corréu"
+
+#: ../mail/mail-config.glade.h:140
+msgid "Sent _Messages Folder:"
+msgstr "Carpeta de _Mensaxes Unviaos:"
+
+#: ../mail/mail-config.glade.h:141
+msgid "Ser_ver requires authentication"
+msgstr "El ser_vidor requier autenticación"
+
+#: ../mail/mail-config.glade.h:142
+msgid "Server _Type: "
+msgstr "_Triba de servidor: "
+
+#: ../mail/mail-config.glade.h:143
+msgid "Sig_ning certificate:"
+msgstr "Certificáu de _robla:"
+
+#: ../mail/mail-config.glade.h:144
+msgid "Signat_ure:"
+msgstr "R_obla:"
+
+#: ../mail/mail-config.glade.h:145
+msgid "Signatures"
+msgstr "Robles"
+
+#: ../mail/mail-config.glade.h:146
+msgid "Signatures Table"
+msgstr "Tabla de robles"
+
+#: ../mail/mail-config.glade.h:147
+msgid "Spell Checking"
+msgstr "Correición ortográfica"
+
+#: ../mail/mail-config.glade.h:148
+msgid "Start _typing at the bottom on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:149
+msgid "T_ype: "
+msgstr "_Tipu: "
+
+#: ../mail/mail-config.glade.h:150
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:151
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:154
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+
+#: ../mail/mail-config.glade.h:156
+msgid "Us_ername:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:157
+msgid "Use Authe_ntication"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:284
+#: ../plugins/google-account-setup/google-source.c:625
+#: ../plugins/google-account-setup/google-contacts-source.c:278
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
+msgid "User_name:"
+msgstr "_Nome d'usuariu:"
+
+#: ../mail/mail-config.glade.h:159
+msgid "V_ariable-width:"
+msgstr "An_chor variable:"
+
+#: ../mail/mail-config.glade.h:160
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin. "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:163
+msgid "_Add Signature"
+msgstr "_Amestar robla"
+
+#: ../mail/mail-config.glade.h:164
+msgid "_Always load images from the Internet"
+msgstr "_Siempres cargar les imáxenes dende Internet"
+
+#: ../mail/mail-config.glade.h:165
+msgid "_Automatic proxy configuration URL:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:166
+msgid "_Default junk plugin:"
+msgstr "Plugin SPAM pre_determináu:"
+
+#: ../mail/mail-config.glade.h:167
+msgid "_Direct connection to the Internet"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:168
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr "Nun _roblar les solicitúes de reunión (pa compatibilidá con Outlook)"
+
+#: ../mail/mail-config.glade.h:170
+msgid "_Forward style:"
+msgstr "_Estilu de reunvíu:"
+
+#: ../mail/mail-config.glade.h:171
+msgid "_Keep Signature above the original message on replying"
+msgstr "_Caltener la robla per encima del mensax orixinal al retrucar"
+
+#: ../mail/mail-config.glade.h:172
+msgid "_Load images in messages from contacts"
+msgstr "_Cargar imáxenes nos mensaxes de los mios contautos"
+
+#: ../mail/mail-config.glade.h:173
+msgid "_Lookup in local address book only"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:174
+msgid "_Make this my default account"
+msgstr "_Facer qu'ésta seya la mio cuenta predeterminada"
+
+#: ../mail/mail-config.glade.h:175
+msgid "_Manual proxy configuration:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:176
+msgid "_Mark messages as read after"
+msgstr "_Conseñar mensaxes como lleíos tres"
+
+#: ../mail/mail-config.glade.h:178
+msgid "_Never load images from the Internet"
+msgstr "_Enxamás cargar imáxenes dende Internet"
+
+#: ../mail/mail-config.glade.h:179
+msgid "_Path:"
+msgstr "C_amín:"
+
+#: ../mail/mail-config.glade.h:180
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:181
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "En_trugar al unviar mensaxes col asuntu ermu"
+
+#: ../mail/mail-config.glade.h:182
+msgid "_Reply style:"
+msgstr "Estilu de _rempuesta:"
+
+#: ../mail/mail-config.glade.h:183
+msgid "_Script:"
+msgstr "_Script:"
+
+#: ../mail/mail-config.glade.h:184
+msgid "_Secure HTTP Proxy:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:185
+msgid "_Select..."
+msgstr "_Seleicionar…"
+
+#. If enabled, show animation; if disabled, only display a static image without any animation
+#: ../mail/mail-config.glade.h:188
+msgid "_Show image animations"
+msgstr "_Amosar animaciones"
+
+#: ../mail/mail-config.glade.h:189
+msgid "_Show the photograph of sender in the message preview"
+msgstr "_Amosar la semeya del remitente na vista previa del corréu-e"
+
+#: ../mail/mail-config.glade.h:190
+msgid "_Shrink To / Cc / Bcc headers to "
+msgstr "_Amenorgar les cabeceres Pa / Cc / Cct a "
+
+#: ../mail/mail-config.glade.h:191
+msgid "_Use Secure Connection:"
+msgstr "_Usar conexón segura:"
+
+#: ../mail/mail-config.glade.h:192
+msgid "_Use system defaults"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:193
+msgid "_Use the same fonts as other applications"
+msgstr "_Usar les mesmes tipografíes que n'otres aplicaciones"
+
+#: ../mail/mail-config.glade.h:194
+msgid "addresses"
+msgstr "direiciones"
+
+#: ../mail/mail-config.glade.h:195
+msgid "color"
+msgstr "Testu y fondu"
+
+#: ../mail/mail-config.glade.h:196
+msgid "description"
+msgstr "descripción"
+
+#: ../mail/mail-dialogs.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../mail/mail-dialogs.glade.h:2
+msgid "<b>Search Folder Sources</b>"
+msgstr "<b>Oríxenes de la carpeta de busca</b>"
+
+#: ../mail/mail-dialogs.glade.h:3
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Robla dixital</span>"
+
+#: ../mail/mail-dialogs.glade.h:4
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Cifráu</span>"
+
+#: ../mail/mail-dialogs.glade.h:5
+msgid "All active remote folders"
+msgstr "Toles carpetes remotes actives"
+
+#: ../mail/mail-dialogs.glade.h:6
+msgid "All local and active remote folders"
+msgstr "Toles carpetes llocales y remotes actives"
+
+#: ../mail/mail-dialogs.glade.h:7
+msgid "All local folders"
+msgstr "Toles carpetes llocales"
+
+#: ../mail/mail-dialogs.glade.h:8
+msgid "Case _sensitive"
+msgstr "_Sensible a mayúsc/minúsc"
+
+#: ../mail/mail-dialogs.glade.h:9
+msgid "Co_mpleted"
+msgstr "_Completáu"
+
+#: ../mail/mail-dialogs.glade.h:10
+msgid "F_ind:"
+msgstr "_Guetar:"
+
+#: ../mail/mail-dialogs.glade.h:11
+msgid "Find in Message"
+msgstr "Guetar nel mensax"
+
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
+msgid "Flag to Follow Up"
+msgstr "Conseñar pa seguimientu"
+
+#: ../mail/mail-dialogs.glade.h:13
+msgid "Folder Subscriptions"
+msgstr "Soscripciones de carpetes"
+
+#: ../mail/mail-dialogs.glade.h:14
+msgid "License Agreement"
+msgstr "Llicencia d'Alcuerdu"
+
+#: ../mail/mail-dialogs.glade.h:15
+msgid "None Selected"
+msgstr "Dengún seleicionáu"
+
+#: ../mail/mail-dialogs.glade.h:16
+msgid "S_erver:"
+msgstr "S_ervidor:"
+
+#: ../mail/mail-dialogs.glade.h:17
+msgid "Security Information"
+msgstr "Información de seguridá"
+
+#: ../mail/mail-dialogs.glade.h:18
+msgid "Specific folders"
+msgstr "Carpetes específiques"
+
+#: ../mail/mail-dialogs.glade.h:19
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:21
+msgid "_Accept License"
+msgstr "_Aceutar llicencia"
+
+#: ../mail/mail-dialogs.glade.h:22
+msgid "_Due By:"
+msgstr "_Vence'l:"
+
+#: ../mail/mail-dialogs.glade.h:23
+msgid "_Flag:"
+msgstr "_Conseñar:"
+
+#: ../mail/mail-dialogs.glade.h:24
+msgid "_Tick this to accept the license agreement"
+msgstr "_Conseñe esto p'aceutar l'alcuerdu de llicencia"
+
+#: ../mail/mail-folder-cache.c:833
+#, c-format
+msgid "Pinging %s"
+msgstr "Faciendo ping a %s"
+
+#: ../mail/mail-ops.c:106
+msgid "Filtering Selected Messages"
+msgstr "Fieltráu de mensaxes seleicionaos"
+
+#: ../mail/mail-ops.c:265
+msgid "Fetching Mail"
+msgstr "Obteniendo mensaxes"
+
+#. sending mail, filtering failed
+#: ../mail/mail-ops.c:561
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Nun pudieron aplicase los fieltros al corréu saliente: %s"
+
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+msgstr ""
+
+#: ../mail/mail-ops.c:619
+#, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr "Nun ye dable anexar a la carpeta llocal «Corréu unviáu»: %s"
+
+#: ../mail/mail-ops.c:725
+msgid "Sending message"
+msgstr "Unviando mensax"
+
+#: ../mail/mail-ops.c:735
+#, c-format
+msgid "Sending message %d of %d"
+msgstr "Unviando mensax %d de %d"
+
+#: ../mail/mail-ops.c:762
+#, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "Fallu unviando %d de %d mensaxes"
+
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:698
+msgid "Canceled."
+msgstr "Encaboxáu"
+
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:700
+msgid "Complete."
+msgstr "Completáu"
+
+#: ../mail/mail-ops.c:872
+msgid "Saving message to folder"
+msgstr "Guardando mensax na carpeta"
+
+#: ../mail/mail-ops.c:950
+#, c-format
+msgid "Moving messages to %s"
+msgstr "Moviendo mensaxes a %s"
+
+#: ../mail/mail-ops.c:950
+#, c-format
+msgid "Copying messages to %s"
+msgstr "Copiando mensaxes a %s"
+
+#: ../mail/mail-ops.c:1167
+msgid "Forwarded messages"
+msgstr "Mensaxes reunviaos"
+
+#: ../mail/mail-ops.c:1208
+#, c-format
+msgid "Opening folder %s"
+msgstr "Abriendo carpeta %s"
+
+#: ../mail/mail-ops.c:1273
+#, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:1342
+#, c-format
+msgid "Opening store %s"
+msgstr "Abriendo atroxu %s"
+
+#: ../mail/mail-ops.c:1413
+#, c-format
+msgid "Removing folder %s"
+msgstr "Esaniciando carpeta %s"
+
+#: ../mail/mail-ops.c:1531
+#, c-format
+msgid "Storing folder '%s'"
+msgstr "Guardando carpeta «%s»"
+
+#: ../mail/mail-ops.c:1594
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr "Compautando y atroxando cuenta «%s»"
+
+#: ../mail/mail-ops.c:1595
+#, c-format
+msgid "Storing account '%s'"
+msgstr "Atroxando cuenta «%s»"
+
+#: ../mail/mail-ops.c:1649
+msgid "Refreshing folder"
+msgstr "Autualizando carpeta"
+
+#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
+msgid "Expunging folder"
+msgstr "Compautando carpeta"
+
+#: ../mail/mail-ops.c:1736
+#, c-format
+msgid "Emptying trash in '%s'"
+msgstr "Vaciando papelera en «%s»"
+
+#: ../mail/mail-ops.c:1737
+msgid "Local Folders"
+msgstr "Carpetes llocales"
+
+#: ../mail/mail-ops.c:1818
+#, c-format
+msgid "Retrieving message %s"
+msgstr "Obteniendo mensax %s"
+
+#: ../mail/mail-ops.c:1925
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-ops.c:2010
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-ops.c:2088
+#, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2160
+msgid "Saving attachment"
+msgstr "Guardando axuntu"
+
+#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
+#, c-format
+msgid ""
+"Cannot create output file: %s:\n"
+" %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2201
+#, c-format
+msgid "Could not write data: %s"
+msgstr "Nun ye dable escribir datos: %s"
+
+#: ../mail/mail-ops.c:2347
+#, c-format
+msgid "Disconnecting from %s"
+msgstr "Desconeutando de %s"
+
+#: ../mail/mail-ops.c:2347
+#, c-format
+msgid "Reconnecting to %s"
+msgstr "Reconeutar a %s"
+
+#: ../mail/mail-ops.c:2443
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "Tresnando la cuenta «%s» pa desconexón"
+
+#: ../mail/mail-ops.c:2529
+msgid "Checking Service"
+msgstr "Comprebando'l serviciu"
+
+#: ../mail/mail-send-recv.c:181
+msgid "Canceling..."
+msgstr "Encaboxando…"
+
+#: ../mail/mail-send-recv.c:383
+msgid "Send & Receive Mail"
+msgstr "Unviar y Recibir Corréu"
+
+#: ../mail/mail-send-recv.c:394
+msgid "Cancel _All"
+msgstr "Encaboxar _too"
+
+#: ../mail/mail-send-recv.c:502
+msgid "Updating..."
+msgstr "Autualizando..."
+
+#: ../mail/mail-send-recv.c:502 ../mail/mail-send-recv.c:578
+msgid "Waiting..."
+msgstr "Aguardando..."
+
+#: ../mail/mail-send-recv.c:804
+#, c-format
+msgid "Checking for new mail"
+msgstr "Comprebando corréu nuevu"
+
+#: ../mail/mail-session.c:209
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "Introduza la contraseña pa %s"
+
+#: ../mail/mail-session.c:211
+msgid "Enter Passphrase"
+msgstr "Introduza la contraseña"
+
+#: ../mail/mail-session.c:214
+#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#, c-format
+msgid "Enter Password for %s"
+msgstr "Introduza la so contraseña pa %s"
+
+#: ../mail/mail-session.c:216
+msgid "Enter Password"
+msgstr "Introduza la contraseña"
+
+#: ../mail/mail-session.c:258
+msgid "User canceled operation."
+msgstr "L'usuariu encaboxó la operación."
+
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr ""
+
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr ""
+
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr ""
+
+#: ../mail/mail-tools.c:120
+#, c-format
+msgid "Could not create spool directory `%s': %s"
+msgstr "Nun ye dable criar el direutoriu spool «%s»: %s"
+
+#: ../mail/mail-tools.c:150
+#, c-format
+msgid "Trying to movemail a non-mbox source `%s'"
+msgstr "Intentando mover corréu dende un orixe que nun ye un buzón «%s»"
+
+#: ../mail/mail-tools.c:256
+#, c-format
+msgid "Forwarded message - %s"
+msgstr "Mensax reunviáu: %s"
+
+#: ../mail/mail-tools.c:258
+msgid "Forwarded message"
+msgstr "Mensax reunviáu"
+
+#: ../mail/mail-tools.c:298
+#, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Carpeta inválida: «%s»"
+
+#: ../mail/mail-vfolder.c:89
+#, c-format
+msgid "Setting up Search Folder: %s"
+msgstr "Configurando carpeta de gueta: %s"
+
+#: ../mail/mail-vfolder.c:240
+#, c-format
+msgid "Updating Search Folders for '%s:%s'"
+msgstr "Autualizando carpetes de gueta pa «%s: %s»"
+
+#: ../mail/mail-vfolder.c:247
+#, c-format
+msgid "Updating Search Folders for '%s'"
+msgstr "Autualizando carpetes de gueta pa «%s»"
+
+#: ../mail/mail-vfolder.c:1081
+msgid "Edit Search Folder"
+msgstr "Editar carpeta de gueta"
+
+#: ../mail/mail-vfolder.c:1170
+msgid "New Search Folder"
+msgstr "Carpeta de gueta nueva"
+
+#: ../mail/mail.error.xml.h:1
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:2
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:3
+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 ""
+
+#: ../mail/mail.error.xml.h:6
+msgid ""
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:7
+msgid ""
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:8
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:9
+msgid "Are you sure you want to delete this account and all its proxies?"
+msgstr "¿Daveres quier esaniciar esta cuenta y tolos sos proxies?"
+
+#: ../mail/mail.error.xml.h:10
+msgid "Are you sure you want to delete this account?"
+msgstr "¿De xuru que quier esaniciar esta cuenta?"
+
+#: ../mail/mail.error.xml.h:11
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:12
+msgid "Are you sure you want to open {0} messages at once?"
+msgstr "¿De xuru que quier abrir {0} mensaxes al empar?"
+
+#: ../mail/mail.error.xml.h:13
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:14
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:15
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "¿De xuru quies unviar un mensax en formatu HTML?"
+
+#: ../mail/mail.error.xml.h:16
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "¿Daveres quier unviar un mensax con namái destinatarios Cct?"
+
+#: ../mail/mail.error.xml.h:17
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "¿Daveres quier unviar un mensax ensin asuntu?"
+
+#: ../mail/mail.error.xml.h:18
+msgid "Because \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:20
+msgid "Because \"{2}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:21
+msgid "Blank Signature"
+msgstr "Robla en blancu"
+
+#: ../mail/mail.error.xml.h:22
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:23
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:24
+msgid "Cannot create folder \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:25
+msgid "Cannot create temporary save directory."
+msgstr "Nun ye dable criar el direutoriu de guardáu temporal."
+
+#: ../mail/mail.error.xml.h:26
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr ""
+
+#: ../mail/mail.error.xml.h:27
+msgid "Cannot delete folder \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:28
+msgid "Cannot delete system folder \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:29
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:30
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:31
+msgid "Cannot open source \"{1}\""
+msgstr ""
+
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{2}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:33
+msgid "Cannot open target \"{2}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:34
+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 ""
+
+#: ../mail/mail.error.xml.h:35
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:36
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:37
+msgid "Cannot save changes to account."
+msgstr "Nun ye dable guardar los cambeos na cuenta."
+
+#: ../mail/mail.error.xml.h:38
+msgid "Cannot save to directory \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:39
+msgid "Cannot save to file \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:40
+msgid "Cannot set signature script \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:41
+msgid "Check Junk Failed"
+msgstr ""
+
+#: ../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 ""
+
+#: ../mail/mail.error.xml.h:43
+msgid "Could not save signature file."
+msgstr "Nun ye dable guardar el ficheru de robla."
+
+#: ../mail/mail.error.xml.h:44
+msgid "Delete \"{0}\"?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:45
+msgid "Delete account?"
+msgstr "¿Deseya desaniciar la cuenta?"
+
+#: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:47
+msgid "Delete messages in Search Folder?"
+msgstr "¿Desaniciar los mensaxes na carpeta de gueta?"
+
+#: ../mail/mail.error.xml.h:48
+msgid "Discard changes?"
+msgstr "¿Deseya descartar los cambeos?"
+
+#: ../mail/mail.error.xml.h:49
+msgid "Do not d_elete"
+msgstr "Non d_esaniciar"
+
+#: ../mail/mail.error.xml.h:50
+msgid "Do not delete"
+msgstr "Non desaniciar"
+
+#: ../mail/mail.error.xml.h:51
+msgid "Do not disable"
+msgstr "Non desactivar"
+
+#: ../mail/mail.error.xml.h:52
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:53
+msgid "Do you want to mark all messages as read?"
+msgstr "¿Quies conseñar tolos mensaxes como lleíos?"
+
+#: ../mail/mail.error.xml.h:54
+msgid "Do you wish to save your changes?"
+msgstr "¿Deseya guardar los cambeos?"
+
+#: ../mail/mail.error.xml.h:55
+msgid "Enter password."
+msgstr "Introduza la contraseña."
+
+#: ../mail/mail.error.xml.h:56
+msgid "Error loading filter definitions."
+msgstr "Fallu al cargar les definiciones de fieltros."
+
+#: ../mail/mail.error.xml.h:57
+msgid "Error while performing operation."
+msgstr "Fallu al facer la operación."
+
+#: ../mail/mail.error.xml.h:58
+msgid "Error while {0}."
+msgstr "Fallu mentantu «{0}»."
+
+#: ../mail/mail.error.xml.h:59
+msgid "File exists but cannot overwrite it."
+msgstr "El ficheru esiste pero nun pue sobroscribise."
+
+#: ../mail/mail.error.xml.h:60
+msgid "File exists but is not a regular file."
+msgstr "El ficheru esiste pero nun ye un ficheru regular."
+
+#: ../mail/mail.error.xml.h:61
+msgid "If you continue, you will not be able to recover these messages."
+msgstr "Si sigue, nun podrá recuperar estos mensaxes."
+
+#: ../mail/mail.error.xml.h:62
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:63
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr "Si sigue, les cuentes proxy desaniciaránse dafechu."
+
+#: ../mail/mail.error.xml.h:64
+msgid ""
+"If you proceed, the account information and\n"
+"all proxy information will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:66
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr "Si sigue, la información de la cuenta desaniciaráse dafechu."
+
+#: ../mail/mail.error.xml.h:67
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:68
+msgid "Ignore"
+msgstr "Inorar"
+
+#: ../mail/mail.error.xml.h:69
+msgid "Invalid authentication"
+msgstr "Autenticación inválida"
+
+#: ../mail/mail.error.xml.h:71
+msgid "Mail filters automatically updated."
+msgstr "Fieltros de corréu autualizaos automáticamente."
+
+#: ../mail/mail.error.xml.h:72
+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 ""
+"Munchos sistemes de corréu-e amesten una cabecera «Apparentely-To» a los "
+"mensaxes que namái tienen destinatarios Cct. Esta cabecera, si s'amesta, "
+"llistará tolos destinatarios del so mensax de toes formes. Pa evitar esto "
+"tendría d'amestar a lo menos un destinatariu «Pa:» o «CC:»."
+
+#: ../mail/mail.error.xml.h:73
+msgid "Mark all messages as read"
+msgstr "Conseñar tolos mensaxes como lleíos"
+
+#: ../mail/mail.error.xml.h:74
+msgid "Missing folder."
+msgstr "Falta la carpeta."
+
+#: ../mail/mail.error.xml.h:76
+msgid "No sources selected."
+msgstr "Nun se seleicionó dengún orixe."
+
+#: ../mail/mail.error.xml.h:77
+msgid "Opening too many messages at once may take a long time."
+msgstr "Abrir abondos mensaxes al empar pue llevar munchu tiempu."
+
+#: ../mail/mail.error.xml.h:78
+msgid "Please check your account settings and try again."
+msgstr "Comprebe la so configuración de la cuenta ya téntelo otra vegada."
+
+#: ../mail/mail.error.xml.h:79
+msgid "Please enable the account or send using another account."
+msgstr "Active la cuenta o unvíe usando otra cuenta."
+
+#: ../mail/mail.error.xml.h:80
+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
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:83
+msgid "Please provide an unique name to identify this signature."
+msgstr "Introduza un nome únicu pa identificar esta robla."
+
+#: ../mail/mail.error.xml.h:84
+msgid "Please wait."
+msgstr "Por favor aguarde."
+
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:86
+msgid "Querying server"
+msgstr "Consultando al servidor"
+
+#: ../mail/mail.error.xml.h:87
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:88
+msgid "Read receipt requested."
+msgstr "Solicitóse una notificación de llectura."
+
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:90
+msgid "Report Junk Failed"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:91
+msgid "Report Not Junk Failed"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:92
+msgid "Search Folders automatically updated."
+msgstr "Carpetes de gueta autoautualizaes."
+
+#: ../mail/mail.error.xml.h:93
+msgid "Send Receipt"
+msgstr "Unviar confirmación"
+
+#: ../mail/mail.error.xml.h:94
+msgid "Signature Already Exists"
+msgstr "La robla yá esiste"
+
+#: ../mail/mail.error.xml.h:95
+msgid "Synchronize"
+msgstr "Sincronizar"
+
+#: ../mail/mail.error.xml.h:96
+msgid "Synchronize folders locally for offline usage?"
+msgstr "¿Sincronizar les carpetes llocalmente pa usase ensin conexón?"
+
+#: ../mail/mail.error.xml.h:97
+msgid ""
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:98
+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 llista de contautos que ta unviando ta configurada pa soverar los "
+"destinatarios de la llista.\n"
+"Munchos sistemes de corréu amesten una cabecera Apparentely-To a los "
+"mensaxes que namái tienen destinatarios Cct. Esta cabecera llistará tolos "
+"destinatarios nel so mensax. Pa evitar esto, tendría d'amestar a lo menos un "
+"destinatariu a Pa: o Cc: "
+
+#: ../mail/mail.error.xml.h:101
+msgid ""
+"The following Search Folder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:106
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:111
+msgid "The script file must exist and be executable."
+msgstr "El ficheru de script tien d'esistir y ser executable."
+
+#: ../mail/mail.error.xml.h:112
+msgid ""
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:114
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:115
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:116
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:117
+msgid "This signature has been changed, but has not been saved."
+msgstr "Esta robla camudó, pero nun foi guardada."
+
+#: ../mail/mail.error.xml.h:118
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:119
+msgid "Unable to connect to the GroupWise server."
+msgstr "Nun ye dable coneutase col servidor GroupWise."
+
+#: ../mail/mail.error.xml.h:120
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:121
+msgid "Unable to read license file."
+msgstr "Nun ye dable lleer l'archivu de llicencia."
+
+#: ../mail/mail.error.xml.h:122
+msgid "Use _Default"
+msgstr "Usar _predeterminada"
+
+#: ../mail/mail.error.xml.h:123
+msgid "Use default drafts folder?"
+msgstr "¿Deseya usar la carpeta de bocexos predeterminada?"
+
+#: ../mail/mail.error.xml.h:124
+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 ""
+
+#: ../mail/mail.error.xml.h:127
+msgid "You have not filled in all of the required information."
+msgstr "Nun rellenó tola información requerida."
+
+#: ../mail/mail.error.xml.h:128
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Tien mensaxes ensin unviar, ¿quier colar de toes formes?"
+
+#: ../mail/mail.error.xml.h:129
+msgid "You may not create two accounts with the same name."
+msgstr "Nun pue criar dos cuentes col mesmu nome."
+
+#: ../mail/mail.error.xml.h:130
+msgid "You must name this Search Folder."
+msgstr "Tien de da-y un nome a esta carpeta de gueta."
+
+#: ../mail/mail.error.xml.h:131
+msgid "You must specify a folder."
+msgstr "Tien d'especificar una carpeta."
+
+#: ../mail/mail.error.xml.h:132
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:134
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:135
+msgid "_Append"
+msgstr "_Agregar"
+
+#: ../mail/mail.error.xml.h:136
+msgid "_Discard changes"
+msgstr "_Descartar los cambeos"
+
+#: ../mail/mail.error.xml.h:137
+msgid "_Do not Synchronize"
+msgstr "_Nun sincronizar"
+
+#: ../mail/mail.error.xml.h:139
+msgid "_Expunge"
+msgstr "C_ompautar"
+
+#: ../mail/mail.error.xml.h:140
+msgid "_Open Messages"
+msgstr "_Abrir mensaxes"
+
+#: ../mail/message-list.c:1053
+msgid "Unseen"
+msgstr "Ensin lleer"
+
+#: ../mail/message-list.c:1054
+msgid "Seen"
+msgstr "Vistu"
+
+#: ../mail/message-list.c:1055
+msgid "Answered"
+msgstr "Contestáu"
+
+#: ../mail/message-list.c:1056
+msgid "Forwarded"
+msgstr ""
+
+#: ../mail/message-list.c:1057
+msgid "Multiple Unseen Messages"
+msgstr "Múltiples mensaxes ensin lleer"
+
+#: ../mail/message-list.c:1058
+msgid "Multiple Messages"
+msgstr "Múltiples mensaxes"
+
+#: ../mail/message-list.c:1062
+msgid "Lowest"
+msgstr "La más baxa"
+
+#: ../mail/message-list.c:1063
+msgid "Lower"
+msgstr "Más baxa"
+
+#: ../mail/message-list.c:1067
+msgid "Higher"
+msgstr "Más alta"
+
+#: ../mail/message-list.c:1068
+msgid "Highest"
+msgstr "La más alta"
+
+#: ../mail/message-list.c:1657 ../widgets/table/e-cell-date.c:55
+msgid "?"
+msgstr "?"
+
+#. strftime format of a time,
+#. in 12-hour format, without seconds.
+#: ../mail/message-list.c:1664 ../plugins/itip-formatter/itip-view.c:203
+#: ../widgets/table/e-cell-date.c:70
+msgid "Today %l:%M %p"
+msgstr "Güei %l:%M %p"
+
+#: ../mail/message-list.c:1673 ../widgets/table/e-cell-date.c:80
+msgid "Yesterday %l:%M %p"
+msgstr "Ayeri %l:%M %p"
+
+#: ../mail/message-list.c:1685 ../widgets/table/e-cell-date.c:92
+msgid "%a %l:%M %p"
+msgstr "%a %l:%M %p"
+
+#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:100
+msgid "%b %d %l:%M %p"
+msgstr "%b %e %l:%M %p"
+
+#: ../mail/message-list.c:1695 ../widgets/table/e-cell-date.c:102
+msgid "%b %d %Y"
+msgstr "%e %b %Y"
+
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3981 ../mail/message-list.c:4452
+msgid "Generating message list"
+msgstr "Xenerando la llista de mensaxes"
+
+#: ../mail/message-list.c:4291
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4293
+msgid "There are no messages in this folder."
+msgstr ""
+
+#: ../mail/message-list.etspec.h:3
+msgid "Due By"
+msgstr "Fina en"
+
+#: ../mail/message-list.etspec.h:4
+msgid "Flag Status"
+msgstr "Conseña d'estáu"
+
+#: ../mail/message-list.etspec.h:5
+msgid "Flagged"
+msgstr "Conseñáu"
+
+#: ../mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr "Conseña de siguimientu"
+
+#: ../mail/message-list.etspec.h:11
+msgid "Received"
+msgstr "Recibíu"
+
+#: ../mail/message-list.etspec.h:15
+msgid "Sent Messages"
+msgstr "Mensaxes Unviaos"
+
+#: ../mail/message-list.etspec.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+msgid "Size"
+msgstr "Tamañu"
+
+#: ../mail/message-list.etspec.h:19
+#, fuzzy
+msgid "Subject - Trimmed"
+msgstr "Campu A_suntu"
+
+#: ../mail/message-tag-followup.c:56
+msgid "Call"
+msgstr "Llamar"
+
+#: ../mail/message-tag-followup.c:57
+msgid "Do Not Forward"
+msgstr "Non reunviar"
+
+#: ../mail/message-tag-followup.c:58
+msgid "Follow-Up"
+msgstr "Seguimientu"
+
+#: ../mail/message-tag-followup.c:59
+msgid "For Your Information"
+msgstr "Pa la so información"
+
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
+msgid "Forward"
+msgstr "Reunviar"
+
+#: ../mail/message-tag-followup.c:61
+msgid "No Response Necessary"
+msgstr "Nun ye necesaria una rempuesta"
+
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
+msgid "Reply"
+msgstr "Retrucar"
+
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
+msgid "Reply to All"
+msgstr "Retrucar a toos"
+
+#: ../mail/message-tag-followup.c:66
+msgid "Review"
+msgstr "Revisar"
+
+#: ../mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "El cuerpu contién"
+
+#: ../mail/searchtypes.xml.h:2
+msgid "Message contains"
+msgstr "El Mensax contién"
+
+#: ../mail/searchtypes.xml.h:3
+msgid "Recipients contain"
+msgstr "Destinatariu/os contién"
+
+#: ../mail/searchtypes.xml.h:4
+msgid "Sender contains"
+msgstr "El Remitente contién"
+
+#: ../mail/searchtypes.xml.h:5
+msgid "Subject contains"
+msgstr "L'Asuntu contién"
+
+#: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr ""
+
+#: ../mail/searchtypes.xml.h:7
+msgid "Subject or Sender contains"
+msgstr "L'Asuntu o Remitente contién"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+msgid "Local Address Books"
+msgstr "Llibretes llocal de direiciones"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Provides core functionality for local address books."
+msgstr ""
+
+#: ../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/apps-evolution-attachment-reminder.schemas.in.h:2
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr ""
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/templates/templates.c:390
+msgid "Keywords"
+msgstr "Pallabres clave"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid "Attachment Reminder"
+msgstr "Remembru d'axuntos"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid ""
+"Looks for clues in a message for mention of attachments and warns if the "
+"attachment is missing"
+msgstr ""
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+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:3
+msgid "Message has no attachments"
+msgstr "El mensax nun tien axuntos"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
+msgstr ""
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+msgid ""
+"A formatter plugin which displays audio attachments inline and allows you to "
+"play them directly from Evolution."
+msgstr ""
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+msgid "Audio inline plugin"
+msgstr "Plugin de soníu en llinia"
+
+#: ../plugins/backup-restore/backup-restore.c:127
+msgid "Select name of the Evolution backup file"
+msgstr "Seleicione'l nome d'archivu de respaldu Evolution"
+
+#: ../plugins/backup-restore/backup-restore.c:156
+msgid "_Restart Evolution after backup"
+msgstr "_Reaniciar Evolution dempués del respaldu"
+
+#: ../plugins/backup-restore/backup-restore.c:179
+msgid "Select name of the Evolution backup file to restore"
+msgstr "Seleicione'l nome del ficheru de respaldu d'Evolution pa restaurar"
+
+#: ../plugins/backup-restore/backup-restore.c:203
+msgid "_Restart Evolution after restore"
+msgstr "_Reaniciar Evolution dempués de la restauración"
+
+#: ../plugins/backup-restore/backup-restore.c:276
+msgid "Restore from backup"
+msgstr "Restaurar dende un respaldu"
+
+#: ../plugins/backup-restore/backup-restore.c:278
+msgid ""
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. \n"
+"It also restores all your personal settings, mail filters etc."
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:284
+msgid "_Restore Evolution from the backup file"
+msgstr "_Restaurar Evolution dende'l ficheru de respaldu"
+
+#: ../plugins/backup-restore/backup-restore.c:291
+msgid "Please select an Evolution Archive to restore:"
+msgstr "Seleicione un archivador d'Evolution pa restaurar:"
+
+#: ../plugins/backup-restore/backup-restore.c:294
+msgid "Choose a file to restore"
+msgstr "Escueya un archivador pa restaurar"
+
+#: ../plugins/backup-restore/backup.c:66
+msgid "Backup Evolution directory"
+msgstr "Respaldar el direutoriu d'Evolution"
+
+#: ../plugins/backup-restore/backup.c:68
+msgid "Restore Evolution directory"
+msgstr "Respaldar el direutoriu d'Evolution"
+
+#: ../plugins/backup-restore/backup.c:70
+msgid "Check Evolution Backup"
+msgstr "Comprebar respaldu d'Evolution"
+
+#: ../plugins/backup-restore/backup.c:72
+msgid "Restart Evolution"
+msgstr "Reaniciar Evolution"
+
+#: ../plugins/backup-restore/backup.c:74
+msgid "With Graphical User Interface"
+msgstr "Con interface gráfica d'usuariu"
+
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
+msgid "Shutting down Evolution"
+msgstr "Zarrando Evolution"
+
+#: ../plugins/backup-restore/backup.c:132
+msgid "Backing Evolution accounts and settings"
+msgstr "Respaldar les cuentes y la configuración d'Evolution"
+
+#: ../plugins/backup-restore/backup.c:136
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:147
+msgid "Backup complete"
+msgstr "Respaldu completáu"
+
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
+msgid "Restarting Evolution"
+msgstr "Reaniciando Evolution"
+
+#: ../plugins/backup-restore/backup.c:262
+msgid "Backup current Evolution data"
+msgstr "Respaldar los datos autuales d'Evolution"
+
+#: ../plugins/backup-restore/backup.c:267
+msgid "Extracting files from backup"
+msgstr "Extrayendo ficheros del respaldu"
+
+#: ../plugins/backup-restore/backup.c:274
+msgid "Loading Evolution settings"
+msgstr "Carga la configuración d'Evolution"
+
+#: ../plugins/backup-restore/backup.c:278
+msgid "Removing temporary backup files"
+msgstr "Esaniciando los ficheros temporales de respaldu"
+
+#: ../plugins/backup-restore/backup.c:285
+msgid "Ensuring local sources"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:455
+#, c-format
+msgid "Backing up to the folder %s"
+msgstr "Respaldando a la carpeta %s"
+
+#: ../plugins/backup-restore/backup.c:460
+#, c-format
+msgid "Restoring from the folder %s"
+msgstr "Restaurando dende la carpeta %s"
+
+#. Backup / Restore only can have GUI. We should restrict the rest
+#: ../plugins/backup-restore/backup.c:479
+msgid "Evolution Backup"
+msgstr "Respaldu d'Evolution"
+
+#: ../plugins/backup-restore/backup.c:479
+msgid "Evolution Restore"
+msgstr "Restaurador d'Evolution"
+
+#: ../plugins/backup-restore/backup.c:514
+msgid "Backing up Evolution Data"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:515
+msgid "Please wait while Evolution is backing up your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:517
+msgid "Restoring Evolution Data"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:518
+msgid "Please wait while Evolution is restoring your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:536
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
+msgid "A plugin for backing up and restore Evolution data and settings."
+msgstr ""
+
+#. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+msgid "Backup and restore plugin"
+msgstr "Plugin pa respaldar y restaurar"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Are you sure you want to close Evolution?"
+msgstr "¿Daveres quier zarrar Evolution?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Insufficient Permissions"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Invalid Evolution backup file"
+msgstr "Ficheru de respaldu d'Evolution non válidu"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid "Please select a valid backup file to restore."
+msgstr "Seleicione un ficheru de respaldu válidu pa restaurar."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid "The selected folder is not writable."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+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 ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
+msgid "Backup and restore Evolution data and settings"
+msgstr "Respaldar y restaurar los datos d'Evolution y la configuración"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+msgid "R_estore Settings..."
+msgstr "Configuración de la res_tauración…"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+msgid "_Backup Settings..."
+msgstr "Configuración del _respaldu…"
+
+#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+msgid "Automatic Contacts"
+msgstr "Contautos automáticos"
+
+#. Enable BBDB checkbox
+#: ../plugins/bbdb/bbdb.c:639
+msgid "_Auto-create address book entries when replying to messages"
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:645
+msgid "Select Address book for Automatic Contacts"
+msgstr "Seleicione la llibreta pa contautos automáticos"
+
+#: ../plugins/bbdb/bbdb.c:660
+msgid "Instant Messaging Contacts"
+msgstr "Contautos de mensaxería instantáneo"
+
+#. Enable Gaim Checkbox
+#: ../plugins/bbdb/bbdb.c:675
+msgid "Synchronize contact info and images from Pidgin buddy list"
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:681
+msgid "Select Address book for Pidgin buddy list"
+msgstr ""
+
+#. Synchronize now button.
+#: ../plugins/bbdb/bbdb.c:692
+msgid "Synchronize with _buddy list now"
+msgstr "Sincronizar cola llista de _collacios agora"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+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."
+msgstr ""
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+msgid "BBDB"
+msgstr "BBDB"
+
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:119
+#, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:143
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:145
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:318
+msgid "Convert message text to _Unicode"
+msgstr "Convertir el testu del corréu a _Unicode"
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "Convertir el testu de los correos a Unicode"
+
+#: ../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 ""
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
+msgid "Bogofilter Options"
+msgstr "Opciones de Bogofilter"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "Plugin pa spam Bogofilter"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
+msgid "Filters junk messages using Bogofilter."
+msgstr "Fieltrar corréu basoria usando Bogofilter."
+
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/calendar-http/calendar-http.c:126
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../plugins/caldav/caldav-source.c:271
+#: ../plugins/google-account-setup/google-source.c:618
+#: ../plugins/google-account-setup/google-contacts-source.c:301
+msgid "Use _SSL"
+msgstr "Usar _SSL"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+msgid "CalDAV Calendar sources"
+msgstr "Fontes de calendarios CalDAV"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "CalDAV sources"
+msgstr "Fontes CalDAV"
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
+msgid "Local Calendars"
+msgstr "Calendarios llocales"
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+msgid "Provides core functionality for local calendars."
+msgstr "Proporciona funcionalidá básica pa calendarios llocales."
+
+#: ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:546
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
+msgid "Re_fresh:"
+msgstr ""
+
+#: ../plugins/calendar-http/calendar-http.c:332
+msgid "_Secure connection"
+msgstr "_Securizar conexón"
+
+#: ../plugins/calendar-http/calendar-http.c:397
+msgid "Userna_me:"
+msgstr "Nome d'_usuariu:"
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
+msgid "HTTP Calendars"
+msgstr "Calendarios HTTP"
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+msgid "Provides core functionality for webcal and http calendars."
+msgstr "Proporciona funcionalidá básica pa calendarios webcal y http."
+
+#: ../plugins/calendar-weather/calendar-weather.c:54
+#: ../plugins/calendar-weather/calendar-weather.c:60
+msgid "Weather: Cloudy"
+msgstr "Meteoroloxía: Ñuboso"
+
+#: ../plugins/calendar-weather/calendar-weather.c:61
+msgid "Weather: Fog"
+msgstr "Meteoroloxía: Borrina"
+
+#: ../plugins/calendar-weather/calendar-weather.c:62
+msgid "Weather: Partly Cloudy"
+msgstr "Meteoroloxía: Parcialmente ñuboso"
+
+#: ../plugins/calendar-weather/calendar-weather.c:63
+msgid "Weather: Rain"
+msgstr "Meteoroloxía: Lluvia"
+
+#: ../plugins/calendar-weather/calendar-weather.c:64
+msgid "Weather: Snow"
+msgstr "Meteoroloxía: Ñeve"
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Sunny"
+msgstr "Meteoroloxía: Soleyero"
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
+msgid "Weather: Thunderstorms"
+msgstr "Meteoroloxía: Torbonada"
+
+#: ../plugins/calendar-weather/calendar-weather.c:267
+msgid "Select a location"
+msgstr "Seleicione un llugar"
+
+#: ../plugins/calendar-weather/calendar-weather.c:652
+msgid "_Units:"
+msgstr "_Unidaes:"
+
+#: ../plugins/calendar-weather/calendar-weather.c:659
+msgid "Metric (Celsius, cm, etc)"
+msgstr "Métrica (Celsius, cm, etc)"
+
+#: ../plugins/calendar-weather/calendar-weather.c:660
+msgid "Imperial (Fahrenheit, inches, etc)"
+msgstr "Imperial (Fahrenheit, pulgaes, etc)"
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
+msgid "Provides core functionality for weather calendars."
+msgstr "Proporciona funcionalidá básica pa calendarios meteorolóxicos."
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
+msgid "Weather Calendars"
+msgstr "Calendariu meteorolóxicu"
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
+msgid ""
+"A test plugin which demonstrates a popup menu plugin which lets you copy "
+"things to the clipboard."
+msgstr ""
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
+msgid "Copy tool"
+msgstr "Ferramienta de copia"
+
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Comprebar si Evolution ye l'aplicación de corréu predeterminada"
+
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
+msgid "Checks whether Evolution is the default mail client on startup."
+msgstr ""
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
+msgid "Default Mail Client "
+msgstr "Veceru de corréu predetermináu "
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
+msgid "Do you want to make Evolution your default e-mail client?"
+msgstr "¿Quier qu'Evolution seya'l so veceru de corréu predetermináu?"
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:585
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../plugins/default-source/default-source.c:82
+msgid "Mark as _default address book"
+msgstr ""
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default calendar"
+msgstr ""
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default task list"
+msgstr ""
+
+#: ../plugins/default-source/default-source.c:105
+msgid "Mark as _default memo list"
+msgstr ""
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+msgid "Default Sources"
+msgstr "Fontes predeterminaes"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid ""
+"Provides functionality for marking a calendar or an address book as the "
+"default one."
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:560
+msgid "_Custom Header"
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:881
+msgid "Key"
+msgstr ""
+
+#: ../plugins/email-custom-header/email-custom-header.c:892
+#: ../plugins/templates/templates.c:396
+msgid "Values"
+msgstr ""
+
+#. 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.glade.h:2
+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/org-gnome-email-custom-header.glade.h:1
+msgid "Email Custom Header"
+msgstr ""
+
+#. 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."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr ""
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr ""
+
+#: ../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/exchange-operations/e-foreign-folder-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Abrir la carpeta d'otru usuariu"
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Cuenta:"
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Nome de la carpeta:"
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Usuariu:"
+
+#. i18n: "Secure Password Authentication" is an Outlookism
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
+msgid "Secure Password"
+msgstr "Contraseña segura"
+
+#. i18n: "NTLM" probably doesn't translate
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
+msgid ""
+"This option will connect to the Exchange server using secure password (NTLM) "
+"authentication."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
+msgid "Plaintext Password"
+msgstr "Contraseña en testu planu"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
+msgid ""
+"This option will connect to the Exchange server using standard plaintext "
+"password authentication."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:263
+msgid "Out Of Office"
+msgstr "Fuera de la oficina"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:270
+msgid ""
+"The message specified below will be automatically sent to \n"
+"each person who sends mail to you while you are out of the office."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:282
+#: ../plugins/exchange-operations/exchange-account-setup.c:287
+msgid "I am out of the office"
+msgstr "Agora toi fuera de la oficina"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/exchange-operations/exchange-account-setup.c:286
+msgid "I am in the office"
+msgstr "Agora toi na oficina"
+
+#. Change Password
+#: ../plugins/exchange-operations/exchange-account-setup.c:334
+msgid "Change the password for Exchange account"
+msgstr "Camude la contraseña pa la cuenta d'Exchange"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:336
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+msgid "Change Password"
+msgstr "Camudar la Contraseña"
+
+#. Delegation Assistant
+#: ../plugins/exchange-operations/exchange-account-setup.c:341
+msgid "Manage the delegate settings for Exchange account"
+msgstr "Xestione los axustes de delegaciones pa la cuenta Exchange"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
+msgid "Delegation Assistant"
+msgstr "Asistente de delegaciones"
+
+#. Miscelleneous settings
+#: ../plugins/exchange-operations/exchange-account-setup.c:355
+msgid "Miscelleneous"
+msgstr "Misceláneu"
+
+#. Folder Size
+#: ../plugins/exchange-operations/exchange-account-setup.c:365
+msgid "View the size of all Exchange folders"
+msgstr "Adique'l tamañu de toles carpetes Exchange"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:367
+msgid "Folders Size"
+msgstr "Tamañu de les carpetes"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
+msgid "Exchange Settings"
+msgstr "Configuración d'Exchange"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:696
+msgid "_OWA URL:"
+msgstr "URL _OWA:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:722
+msgid "A_uthenticate"
+msgstr "A_utenticar"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:743
+msgid "_Mailbox:"
+msgstr "_Buzón:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:944
+msgid "_Authentication Type"
+msgstr "Tipu d'_autenticación"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:958
+msgid "Ch_eck for Supported Types"
+msgstr "_Comprebar tipos sofitaos"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:1073
+#: ../plugins/exchange-operations/exchange-contacts.c:217
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:1075
+#: ../plugins/exchange-operations/exchange-contacts.c:219
+#, c-format
+msgid "0 KB"
+msgstr "0 KB"
+
+#: ../plugins/exchange-operations/exchange-calendar.c:196
+#: ../plugins/exchange-operations/exchange-contacts.c:170
+msgid ""
+"Evolution is in offline mode. You cannot create or modify folders now.\n"
+"Please switch to online mode for such operations."
+msgstr ""
+
+#. User entered a wrong existing
+#. * password. Prompt him again.
+#.
+#: ../plugins/exchange-operations/exchange-change-password.c:114
+msgid ""
+"The current password does not match the existing password for your account. "
+"Please enter the correct password"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-change-password.c:121
+msgid "The two passwords do not match. Please re-enter the passwords."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+msgid "Confirm Password:"
+msgstr "Confirme la contraseña:"
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+msgid "Current Password:"
+msgstr "Contraseña autual:"
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+msgid "New Password:"
+msgstr "Contraseña nueva:"
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+msgid "Your current password has expired. Please change your password now."
+msgstr "La so autual contraseña caducó. Camude de contraseña agora."
+
+#: ../plugins/exchange-operations/exchange-config-listener.c:660
+#, c-format
+msgid "Your password will expire in the next %d days"
+msgstr "La so contraseña caducará nos siguientes %d díes"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:154
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
+msgid "Custom"
+msgstr "Personalizáu"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:184
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+msgid "Editor (read, create, edit)"
+msgstr "Editor (llectura, criación, edición)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:188
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+msgid "Author (read, create)"
+msgstr "Autor (llectura, criación)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+msgid "Reviewer (read-only)"
+msgstr "Revisor (namái llectura)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Delegate Permissions"
+msgstr "Permisos de delegados"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:253
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
+#, c-format
+msgid "Permissions for %s"
+msgstr "Permisos pa %s"
+
+#. To translators: This is a part of the message to be sent to the delegatee
+#. summarizing the permissions assigned to him.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:343
+msgid ""
+"This message was sent automatically by Evolution to inform you that you have "
+"been designated as a delegate. You can now send messages on my behalf."
+msgstr ""
+
+#. To translators: Another chunk of the same message.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+msgid "You have been given the following permissions on my folders:"
+msgstr "Otorgáronse-y los siguientes permisos sobro les mios carpetes:"
+
+#. To translators: This message is included if the delegatee has been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:366
+msgid "You are also permitted to see my private items."
+msgstr "Tamién se-y permite ver los mios elementos privaos."
+
+#. To translators: This message is included if the delegatee has not been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
+msgid "However you are not permitted to see my private items."
+msgstr "Non obstante nun se-y dexa ver los mios elementos privaos."
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
+#, c-format
+msgid "You have been designated as a delegate for %s"
+msgstr "Foi designáu como delegáu pa %s"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:417
+msgid "Delegate To"
+msgstr "Delegar en"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:582
+#, c-format
+msgid "Remove the delegate %s?"
+msgstr "¿Deseya quitar el delegáu %s?"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:700
+msgid "Could not access Active Directory"
+msgstr "Nun ye dable acceder al Active Directory"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:712
+msgid "Could not find self in Active Directory"
+msgstr "Nun ye dable alcontrase a sí mesmu nel Active Directory"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:725
+#, c-format
+msgid "Could not find delegate %s in Active Directory"
+msgstr "Nun ye dable alcontrar al delegáu %s nel Active Directory"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:737
+#, c-format
+msgid "Could not remove delegate %s"
+msgstr "Nun ye dable quitar al delegáu %s"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:797
+msgid "Could not update list of delegates."
+msgstr "Nun ye dable autualizar la llista de delegaos."
+
+#: ../plugins/exchange-operations/exchange-delegates.c:815
+#, c-format
+msgid "Could not add delegate %s"
+msgstr "Nun ye dable amestar el delegáu %s"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:983
+msgid "Error reading delegates list."
+msgstr "Fallu al lleer la llista de delegaos."
+
+#. Translators: This is used for permissions for <user> for the folder Calendar.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+msgid "C_alendar:"
+msgstr "_Calendariu:"
+
+#. Translators: This is used for permissions for <user> for the folder Contacts.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+msgid "Co_ntacts:"
+msgstr "Co_ntautos:"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid "Delegates"
+msgstr "Delegaos"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+msgid "Permissions for"
+msgstr "Permisos pa"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
+msgid ""
+"These users will be able to send mail on your behalf\n"
+"and access your folders with the permissions you give them."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+msgid "_Delegate can see private items"
+msgstr "El _delegáu pue adicar los elementos privaos"
+
+#. Translators: This is used for permissions for <user> for the folder Inbox.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
+msgid "_Inbox:"
+msgstr "_Bandexa d'entrada"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
+msgid "_Summarize permissions"
+msgstr "Re_sumir permisos"
+
+#. Translators: This is used for permissions for <user> for the folder Tasks.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+msgid "_Tasks:"
+msgstr "_Xeres:"
+
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
+#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
+msgid "Permissions..."
+msgstr "Permisos..."
+
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
+msgid "Folder Name"
+msgstr "Nome de la carpeta"
+
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
+msgid "Folder Size"
+msgstr "Tamañu de la carpeta"
+
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+msgid "User"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+msgid "Subscribe to Other User's Folder"
+msgstr "Soscribirse a la carpeta d'otru usuariu"
+
+#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
+msgid "Exchange Folder Tree"
+msgstr "�rbol de carpetes d'Exchange"
+
+#: ../plugins/exchange-operations/exchange-folder.c:67
+#: ../plugins/exchange-operations/exchange-folder.c:236
+#: ../plugins/exchange-operations/exchange-folder.c:246
+msgid "Unsubscribe Folder..."
+msgstr "Desoscribise de la carpeta…"
+
+#: ../plugins/exchange-operations/exchange-folder.c:466
+#: ../plugins/exchange-operations/exchange-folder.c:521
+#, c-format
+msgid "Really unsubscribe from folder \"%s\"?"
+msgstr "¿Daveres quier desoscribise de la carpeta «%s»?"
+
+#: ../plugins/exchange-operations/exchange-folder.c:478
+#: ../plugins/exchange-operations/exchange-folder.c:533
+#, c-format
+msgid "Unsubscribe from \"%s\""
+msgstr "Desoscribise de «%s»"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr "<b>Mensax pa cuando tea fuera de la oficina</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:5
+msgid "<b>Status:</b>"
+msgstr "<b>Estáu:</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
+msgid "I am currently in the office"
+msgstr "Agora toi na oficina"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
+msgid "I am currently out of the office"
+msgstr "Agora nun toi na oficina"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:10
+msgid "No, Don't Change Status"
+msgstr "Non, nun camudar l'estáu"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
+msgid "Out of Office Assistant"
+msgstr "Asistente pa fuera de la oficina"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
+msgid "Yes, Change Status"
+msgstr "Sí, camudar l'estáu"
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
+msgid "Password Expiry Warning..."
+msgstr "Alvertencia de caducidá de la contraseña..."
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
+msgid "Your password will expire in 7 days..."
+msgstr "La so contraseña caducará en 7 díes…"
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
+msgid "_Change Password"
+msgstr "_Camudar contraseña"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
+msgid "(Permission denied.)"
+msgstr "(Permisu denegáu.)"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+msgid "Add User:"
+msgstr "Amestar usuariu:"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-send-options.c:410
+#: ../plugins/groupwise-features/proxy.c:937
+#: ../plugins/groupwise-features/share-folder.c:716
+msgid "Add User"
+msgstr "Amestar usuariu"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+msgid "<b>Permissions</b>"
+msgstr "<b>Permisos</b>"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+msgid "Cannot Delete"
+msgstr "Nun ye dable esaniciar"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+msgid "Cannot Edit"
+msgstr "Nun ye dable editar"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+msgid "Create items"
+msgstr "Criar elementos"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+msgid "Create subfolders"
+msgstr "Criar subcarpetes"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+msgid "Delete Any Items"
+msgstr "Esaniciar cualesquier elementu"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+msgid "Delete Own Items"
+msgstr "Esaniciar los elementos propios"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+msgid "Edit Any Items"
+msgstr "Editar cualesquier elementu"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+msgid "Edit Own Items"
+msgstr "Iguar los elementos propios"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+msgid "Folder contact"
+msgstr "Contautu de la carpeta"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+msgid "Folder owner"
+msgstr "Propietariu de la carpeta"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+msgid "Folder visible"
+msgstr "Carpeta visible"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+msgid "Read items"
+msgstr "Lleer elementos"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+msgid "Role: "
+msgstr "Rol: "
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
+msgid "<b>Message Settings</b>"
+msgstr "<b>Configuración del mensax</b>"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
+msgid "<b>Tracking Options</b>"
+msgstr "<b>Opciones de seguimientu</b>"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
+msgid "Exchange - Send Options"
+msgstr "Exchange - Opciones d'unvíu"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
+msgid "I_mportance: "
+msgstr "_Importancia: "
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
+msgid ""
+"Normal\n"
+"High\n"
+"Low"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
+msgid ""
+"Normal\n"
+"Personal\n"
+"Private\n"
+"Confidential"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
+msgid "Request a _delivery receipt for this message"
+msgstr "Pidir una confirmación d'_entrega pa esti mensax"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
+msgid "Request a _read receipt for this message"
+msgstr "Pidir una confirmación de _llectura pa esti mensax"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
+msgid "Send as Delegate"
+msgstr "Unviar como delegáu"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
+msgid "_Sensitivity: "
+msgstr "_Sensibilidá: "
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
+msgid "_User"
+msgstr "_Usuariu"
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:136
+msgid "Select User"
+msgstr "Seleicionar usuariu"
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:174
+msgid "Address Book..."
+msgstr "Llibreta de direiciones…"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
+msgid "Subscribe to Other User's Contacts"
+msgstr "Soscribise a los contautos d'otru usuariu"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
+msgid "Subscribe to Other User's Calendar"
+msgstr "Soscribise al calendariu d'otru usuariu"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+msgid ""
+"A plugin that manages a collection of Exchange account specific operations "
+"and features."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
+msgid "Exchange Operations"
+msgstr "Operaciones d'Exchange"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+msgid "Cannot change password due to configuration problems."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+msgid "Cannot display folders."
+msgstr "Nun ye dable amosar carpetes."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+msgid "Cannot perform the operation."
+msgstr "Nun ye dable facer la operación."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+msgid ""
+"Changes to options for Exchange account \"{0}\" will only take effect after "
+"restarting Evolution."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+msgid "Could not authenticate to server."
+msgstr "Nun ye dable autenticar col servidor."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+msgid "Could not change password."
+msgstr "Nun ye dable camudar la contraseña."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
+msgid ""
+"Could not configure Exchange account because \n"
+"an unknown error occurred. Check the URL, \n"
+"username, and password, and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+msgid "Could not connect to Exchange server."
+msgstr "Nun ye dable coneutar col servidor Exchange."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+msgid "Could not connect to server {0}."
+msgstr "Nun ye dable coneutar col servidor {0}."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+msgid "Could not determine folder permissions for delegates."
+msgstr "Nun pudieron determinase los permisos de la carpeta pa delegaos."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+msgid "Could not find Exchange Web Storage System."
+msgstr "Nun ye dable alcontrar el sistema de atroxamientu Web d'Exchange."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+msgid "Could not locate server {0}."
+msgstr "Nun ye dable llocalizar el servidor {0}."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+msgid "Could not make {0} a delegate"
+msgstr "Nun ye dable facer de {0} un delegáu"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+msgid "Could not read folder permissions"
+msgstr "Nun pudieron lleese los permisos de la carpeta"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+msgid "Could not read folder permissions."
+msgstr "Nun pudieron lleese los permisos de la carpeta"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+msgid "Could not read out-of-office state"
+msgstr "Nun ye dable lleer l'estáu de disponibilidá"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+msgid "Could not update folder permissions."
+msgstr "Nun ye dable autualizar los permisos de la carpeta."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+msgid "Could not update out-of-office state"
+msgstr "Nun ye dable autualizar l'estáu de disponibilidá"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+msgid "Exchange Account is offline."
+msgstr "La cuenta d'Exchange ta desconeutada."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
+msgid ""
+"Exchange Connector requires access to certain\n"
+"functionality on the Exchange Server that appears\n"
+"to be disabled or blocked. (This is usually \n"
+"unintentional.) Your Exchange Administrator will \n"
+"need to enable this functionality in order for \n"
+"you to be able to use Evolution Exchange Connector.\n"
+"\n"
+"For information to provide to your Exchange \n"
+"administrator, please follow the link below:\n"
+"\n"
+"{0}\n"
+"  "
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+msgid "Failed to update delegates:"
+msgstr "Falló al autualizar delegaos:"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+msgid "Folder already exists"
+msgstr "La carpeta yá esiste"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+msgid "Folder does not exist"
+msgstr "La carpeta nun esiste"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+msgid "Folder offline"
+msgstr "Carpeta desconeutada"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1270
+msgid "Generic error"
+msgstr "Error xenéricu"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+msgid "Global Catalog Server is not reachable"
+msgstr "Nun ye dable aportar al Servidor de Catálogu Global"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+msgid ""
+"If OWA is running on a different path, you must specify that in the account "
+"configuration dialog."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+msgid "Mailbox for {0} is not on this server."
+msgstr "El buzón de {0} nun ta nesti servidor."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+msgid "Make sure the URL is correct and try again."
+msgstr "Tea xuru de que la URL ye correuta ya tente de nuevu."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+msgid "Make sure the server name is spelled correctly and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+msgid "Make sure the username and password are correct and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+msgid "No Global Catalog server configured for this account."
+msgstr "Nun hai un servidor de Catálogu Global configuráu pa esta cuenta."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+msgid "No mailbox for user {0} on {1}."
+msgstr "Nun hai buzón pal usuariu {0} en {1}."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "No such user {0}"
+msgstr "Nun esiste esi usuariu {0}"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+msgid "Password successfully changed."
+msgstr "La contraseña camudóse correchamente"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+msgid "Please make sure the Global Catalog Server name is correct."
+msgstr "Tea xuru de que'l nome del Servidor de Catálogu Global ye correutu."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+msgid "Please restart Evolution for changes to take effect"
+msgstr "Por favor, reanicie Evolution pa que los cambeos tengan efeutu"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+msgid "Please select a user."
+msgstr "Seleicione un usuariu."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+msgid "Server rejected password because it is too weak."
+msgstr "El servidor refugó la contraseña porque ye enforma feble."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+msgid "The Exchange account will be disabled when you quit Evolution"
+msgstr "La cuenta d'Exchange desactivaráse cuando cole d'Evolution"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+msgid "The Exchange account will be removed when you quit Evolution"
+msgstr "La cuenta d'Exchange desaniciaráse cuando cole d'Evolution"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+msgid "The Exchange server is not compatible with Exchange Connector."
+msgstr "El servidor Exchange nun ye compatible con Exchange Connector."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+msgid ""
+"The server is running Exchange 5.5. Exchange Connector \n"
+"supports Microsoft Exchange 2000 and 2003 only."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+msgid ""
+"This probably means that your server requires \n"
+"you to specify the Windows domain name \n"
+"as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
+"\n"
+"Or you might have just typed your password wrong."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+msgid "Try again with a different password."
+msgstr "Téntelo con una contraseña diferente."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+msgid "Unable to add user to access control list:"
+msgstr "Nun pue amestase l'usuariu a la llista de control d'accesu:"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+msgid "Unable to edit delegates."
+msgstr "Nun ye dable editar delegaos."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+msgid "Unknown error looking up {0}"
+msgstr "Fallu desconocíu al restolar {0}"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/google-account-setup/google-source.c:543
+msgid "Unknown error."
+msgstr "Error desconocíu."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+msgid "Unknown type"
+msgstr "Triba desconocida"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+msgid "Unsupported operation"
+msgstr "La operación nun ye sofitada"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+msgid "You are nearing your quota available for storing mail on this server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+msgid ""
+"You are permitted to send a message on behalf of only one delegator at a "
+"time."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+msgid "You cannot make yourself your own delegate"
+msgstr "Nun pue hacese a sí mesmu el so propiu delegáu"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+msgid "You have exceeded your quota for storing mail on this server."
+msgstr "Finó la cuota p'atroxar corréu nesti servidor."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+msgid "You may only configure a single Exchange account."
+msgstr "Namái pue configurar una sola cuenta d'Exchange."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+msgid ""
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
+"mail."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+msgid ""
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mail now."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+msgid ""
+"Your current usage is: {0} KB. You will not be able to send mail until you "
+"clear up some space by deleting some mail."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+msgid "Your password has expired."
+msgstr "La so contraseña caducó."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+msgid "{0} cannot be added to an access control list"
+msgstr "{0} nun pue amestase a la llista de control d'accesu"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+msgid "{0} is already a delegate"
+msgstr "{0} yá ye un delegáu"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
+msgid "{0} is already in the list"
+msgstr "{0} yá ta na llista"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
+msgid "Subscribe to Other User's Tasks"
+msgstr "Soscribise a les xeres d'otros usuarios"
+
+#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
+msgid "Check folder permissions"
+msgstr "Comprebe los permisos de la carpeta"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr ""
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+msgid ""
+"A plugin for using an external editor as the composer. You can send only "
+"plain-text messages."
+msgstr ""
+
+#. the path to the shared library
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
+msgid "External Editor"
+msgstr "Editor externu"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.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-errors.xml.h:4
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
+msgid "Compose in _External Editor"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
+msgid "Compose messages using an external editor"
+msgstr "Redactar mensaxes usando un editor externu"
+
+#: ../plugins/external-editor/external-editor.c:112
+msgid "Command to be executed to launch the editor: "
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:113
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+
+#: ../plugins/face/face.c:59
+msgid "Select a (48*48) png of size < 700bytes"
+msgstr "Seleicione un png (48*48) de tamañu < 700bytes"
+
+#: ../plugins/face/face.c:69
+msgid "PNG files"
+msgstr "Ficheros PNG"
+
+#: ../plugins/face/face.c:126
+msgid "_Face"
+msgstr "_Cara"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+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 ""
+
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
+#, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Desoscribiéndose de la carpeta «%s»"
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
+msgid "Allows unsubscribing of mail folders in the folder tree context menu."
+msgstr ""
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid "Unsubscribe Folders"
+msgstr "Desoscribirse de carpetas"
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+msgid "_Unsubscribe"
+msgstr "Des_oscribir"
+
+#: ../plugins/google-account-setup/google-source.c:83
+#: ../plugins/google-account-setup/google-source.c:90
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-source.c:439
+msgid "Please enter user name first."
+msgstr ""
+
+#: ../plugins/google-account-setup/google-source.c:443
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr ""
+
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+
+#: ../plugins/google-account-setup/google-source.c:693
+msgid "Cal_endar:"
+msgstr ""
+
+#: ../plugins/google-account-setup/google-source.c:728
+msgid "Retrieve _list"
+msgstr ""
+
+#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+msgid "<b>Server</b>"
+msgstr ""
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+#, fuzzy
+msgid "A plugin to setup Google Calendar and Contacts."
+msgstr "Un plugin pa configurar fontes de calendarios hula."
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Google sources"
+msgstr "Recursos de Google"
+
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+msgid "Checklist"
+msgstr "Llista de comprebación"
+
+#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
+#, fuzzy
+msgid "A plugin to setup GroupWise calendar and contacts sources."
+msgstr "Un plugin pa configurar fontes de calendarios hula."
+
+#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
+#, fuzzy
+msgid "GroupWise Account Setup"
+msgstr "Configuración de la cuenta Groupwise"
+
+#: ../plugins/groupwise-features/install-shared.c:220
+#, 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 'Forward' to install the shared folder\n"
+"\n"
+msgstr ""
+
+#: ../plugins/groupwise-features/install-shared.c:225
+msgid "Install the shared folder"
+msgstr "Instalar la carpeta compartida"
+
+#: ../plugins/groupwise-features/install-shared.c:227
+msgid "Shared Folder Installation"
+msgstr "Instalación de carpeta compartida"
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
+msgid "Junk Settings"
+msgstr "Opciones de Corréu puxarra (SPAM)"
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:93
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
+msgid "Junk Mail Settings"
+msgstr "Configuración de Corréu puxarra (SPAM)"
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
+msgid "Junk Mail Settings..."
+msgstr "Opciones de SPAM…"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:1
+msgid "<b>Junk List:</b>"
+msgstr "<b>Llista de SPAM:</b>"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:2
+msgid "Email:"
+msgstr "Corréu ellectrónicu:"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:5
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
+msgid "_Disable"
+msgstr "_Desactivar"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:6
+msgid "_Enable"
+msgstr "_Habilitar"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:7
+msgid "_Junk List"
+msgstr "Llista de _SPAM"
+
+#: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message Retract"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:77
+msgid "Message retracted successfully"
+msgstr "Mensax retractáu con éxitu"
+
+#: ../plugins/groupwise-features/mail-retract.c:87
+msgid "Retract Mail"
+msgstr "Retractar corréu"
+
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
+#, fuzzy
+msgid "Add Send Options to GroupWise messages"
+msgstr "Amestar opciones d'unvíu a los mensaxes de Groupwise"
+
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
+#, fuzzy
+msgid "A plugin for the features in GroupWise accounts."
+msgstr "Un complementu pa les carauterístiques nes cuentes Groupwise."
+
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
+#, fuzzy
+msgid "GroupWise Features"
+msgstr "Carauterístiques Groupwise"
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+msgid "Message retract failed"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+msgid "The server did not allow the selected message to be retracted."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+msgid "Invalid 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-errors.xml.h:3
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.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-errors.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-errors.xml.h:8
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+msgid "Account Already Exists"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr ""
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+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-shared-folder.errors.xml.h:7
+msgid "Would you like to decline it?"
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+#, fuzzy
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "Nun pue autoguardase'l ficheru «{0}»."
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+msgid "You have to specify a user name which you want to add to the list"
+msgstr ""
+
+#: ../plugins/groupwise-features/process-meeting.c:52
+msgid "Accept Tentatively"
+msgstr "Aceutar provisionalmente"
+
+#: ../plugins/groupwise-features/properties.glade.h:1
+msgid "<b>Users:</b>"
+msgstr "<b>Usuarios:</b>"
+
+#: ../plugins/groupwise-features/properties.glade.h:2
+msgid "C_ustomize notification message"
+msgstr "_Personalizar el mensax de notificación"
+
+#: ../plugins/groupwise-features/properties.glade.h:3
+msgid "Con_tacts..."
+msgstr "Con_tautos…"
+
+#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../widgets/table/e-table-click-to-add.c:516
+msgid "Message"
+msgstr "Mensax"
+
+#: ../plugins/groupwise-features/properties.glade.h:6
+msgid "Shared Folder Notification"
+msgstr "Notificación de carpeta compartida"
+
+#: ../plugins/groupwise-features/properties.glade.h:8
+msgid "The participants will receive the following notification.\n"
+msgstr "Los participantes recibirán la notificación siguiente.\n"
+
+#: ../plugins/groupwise-features/properties.glade.h:12
+msgid "_Not Shared"
+msgstr "_Ensin compartir"
+
+#: ../plugins/groupwise-features/properties.glade.h:14
+msgid "_Shared With..."
+msgstr "_Compartir con…"
+
+#: ../plugins/groupwise-features/properties.glade.h:15
+msgid "_Sharing"
+msgstr "_Compartir"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
+msgid "<b>Name</b>"
+msgstr "<b>Nome</b>"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+msgid "Access Rights"
+msgstr "Drechos d'accesu"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+msgid "Add/Edit"
+msgstr "Amestar/Iguar"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
+msgid "Con_tacts"
+msgstr "Con_tautos"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+msgid "Modify _folders/options/rules/"
+msgstr "Camudar _carpetes/opciones/regles/"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+msgid "Read items marked _private"
+msgstr "Lleer elementos conseñaos como _privaos"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+msgid "Reminder Notes"
+msgstr "Notas de recuerdo"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+msgid "Subscribe to my _alarms"
+msgstr "Soscribise a les _mios alertes"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+msgid "Subscribe to my _notifications"
+msgstr "Soscribise a les _mios notificaciones"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
+msgid "_Write"
+msgstr "_Escribir"
+
+#. To Translators: strip the part in front of the | and the | itself
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+msgid "permission to read|_Read"
+msgstr "Llectur_a"
+
+#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+msgid "<b>Account Name</b>"
+msgstr "<b>Nome de la cuenta</b>"
+
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+msgid "Proxy Login"
+msgstr "Sesión proxy"
+
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
+#: ../plugins/groupwise-features/proxy.c:491
+#: ../plugins/groupwise-features/send-options.c:85
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s Introduza la contraseña pa %s (usuariu %s)"
+
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
+#. * feature by which one person can send/read mails/appointments using another person's identity
+#. * without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy-login.c:510
+msgid "_Proxy Login..."
+msgstr "Sesión _proxy…"
+
+#. 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:692
+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:698
+msgid "The Proxy tab will be available only when the account is enabled."
+msgstr ""
+
+#: ../plugins/groupwise-features/send-options.c:214
+msgid "Advanced send options"
+msgstr ""
+
+#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:751
+msgid "Users"
+msgstr "Usuarios"
+
+#: ../plugins/groupwise-features/share-folder-common.c:322
+msgid "Enter the users and set permissions"
+msgstr "Introduza los usuarios y afite permisos"
+
+#: ../plugins/groupwise-features/share-folder-common.c:341
+msgid "New _Shared Folder..."
+msgstr "Carpeta compartida _nueva…"
+
+#: ../plugins/groupwise-features/share-folder-common.c:449
+msgid "Sharing"
+msgstr "Compartir"
+
+#: ../plugins/groupwise-features/share-folder.c:534
+msgid "Custom Notification"
+msgstr ""
+
+#: ../plugins/groupwise-features/share-folder.c:756
+msgid "Add   "
+msgstr "Amestar   "
+
+#: ../plugins/groupwise-features/share-folder.c:762
+msgid "Modify"
+msgstr "Camudar"
+
+#: ../plugins/groupwise-features/status-track.c:107
+msgid "Message Status"
+msgstr "Estáu del mensax"
+
+#. Subject
+#: ../plugins/groupwise-features/status-track.c:121
+msgid "Subject:"
+msgstr "Asuntu:"
+
+#: ../plugins/groupwise-features/status-track.c:135
+msgid "From:"
+msgstr "De:"
+
+#: ../plugins/groupwise-features/status-track.c:150
+msgid "Creation date:"
+msgstr "Data de criación:"
+
+#: ../plugins/groupwise-features/status-track.c:189
+msgid "Recipient: "
+msgstr "Destinatariu: "
+
+#: ../plugins/groupwise-features/status-track.c:196
+msgid "Delivered: "
+msgstr "Entregáu: "
+
+#: ../plugins/groupwise-features/status-track.c:202
+msgid "Opened: "
+msgstr "Abiertu: "
+
+#: ../plugins/groupwise-features/status-track.c:207
+msgid "Accepted: "
+msgstr "Aceutáu: "
+
+#: ../plugins/groupwise-features/status-track.c:212
+msgid "Deleted: "
+msgstr "Desaniciáu: "
+
+#: ../plugins/groupwise-features/status-track.c:217
+msgid "Declined: "
+msgstr "Refugáu: "
+
+#: ../plugins/groupwise-features/status-track.c:222
+msgid "Completed: "
+msgstr "Completáu: "
+
+#: ../plugins/groupwise-features/status-track.c:227
+msgid "Undelivered: "
+msgstr "Ensin entregar: "
+
+#: ../plugins/groupwise-features/status-track.c:251
+msgid "Track Message Status..."
+msgstr "Siguir l'estáu del mensax…"
+
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
+msgid "A plugin to setup hula calendar sources."
+msgstr "Un plugin pa configurar fontes de calendarios hula."
+
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
+msgid "Hula Account Setup"
+msgstr "Configuración de la cuenta Hula"
+
+#: ../plugins/imap-features/imap-headers.c:320
+msgid "Custom Headers"
+msgstr "Cabeceres personalizaes"
+
+#: ../plugins/imap-features/imap-headers.c:333
+msgid "IMAP Headers"
+msgstr "Cabeceres IMAP"
+
+#: ../plugins/imap-features/imap-headers.glade.h:1
+msgid "<b>Custom Headers</b>"
+msgstr "<b>Cabeceres personalizaes</b>"
+
+#: ../plugins/imap-features/imap-headers.glade.h:2
+msgid "<b>IMAP Headers</b>"
+msgstr "<b>Cabeceres IMAP</b>"
+
+#: ../plugins/imap-features/imap-headers.glade.h:3
+msgid "Basic and _Mailing List Headers (Default)"
+msgstr "Cabeceres básiques y de _llistes de corréu predeterminaes"
+
+#: ../plugins/imap-features/imap-headers.glade.h:4
+msgid "Fetch A_ll Headers"
+msgstr "Obtener _toles cabeceres"
+
+#: ../plugins/imap-features/imap-headers.glade.h:5
+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.glade.h:7
+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.glade.h:9
+msgid ""
+"_Basic Headers - (Fastest) \n"
+"Use this if you do not have filters based on mailing lists"
+msgstr ""
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
+msgid "A plugin for the features in the IMAP accounts."
+msgstr "Un plugin pa les carauterístiques nes cuentes IMAP."
+
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+msgid "IMAP Features"
+msgstr "Carauterístiques IMAP"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:78
+msgid "_Import to Calendar"
+msgstr "_Importar al calendariu"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:83
+msgid "_Import to Tasks"
+msgstr "_Importar a les xeres"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:201
+msgid "Import ICS"
+msgstr "Importar ICS"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:224
+msgid "Select Task List"
+msgstr "Seleicione la llista de xeres"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:228
+msgid "Select Calendar"
+msgstr "Seleicione'l calendariu"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
+msgid "_Import"
+msgstr "_Importar"
+
+#. the path to the shared library
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
+msgid "Import to Calendar"
+msgstr "Importar al calendariu"
+
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
+msgid "Imports ICS attachments to calendar."
+msgstr "Importa axuntos ICS al calendariu."
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
+msgid "Hardware Abstraction Layer not loaded"
+msgstr "La capa d'abstracción de hardware (HAL) nun ta cargada"
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
+msgid ""
+"The \"hald\" service is required but not currently running. Please enable "
+"the service and rerun this program, or contact your system administrator."
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
+msgid "Search for an iPod failed"
+msgstr "Falló la gueta de un iPod"
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
+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 ""
+
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
+msgid "iCalendar format (.ics)"
+msgstr "Formatu iCalendar (.ics)"
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
+msgstr ""
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+msgid "Synchronize to iPod"
+msgstr "Sincronizar con iPod"
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
+msgid "iPod Synchronization"
+msgstr "Sincronización con iPod"
+
+#: ../plugins/itip-formatter/itip-formatter.c:481
+#: ../plugins/itip-formatter/itip-formatter.c:606
+#, c-format
+msgid "Failed to load the calendar '%s'"
+msgstr "Nun ye dable cargar el calendariu «%s»"
+
+#: ../plugins/itip-formatter/itip-formatter.c:626
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr "Una cita nel calendariu «%s» entra en conflictu con esta reunión"
+
+#: ../plugins/itip-formatter/itip-formatter.c:652
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "Alncontróse la cita nel calendariu «%s»"
+
+#: ../plugins/itip-formatter/itip-formatter.c:738
+msgid "Unable to find any calendars"
+msgstr "Nun pue alcontrase dengún calendariu"
+
+#: ../plugins/itip-formatter/itip-formatter.c:745
+msgid "Unable to find this meeting in any calendar"
+msgstr "Nun pue alcontrase esta reunión en dengún calendariu"
+
+#: ../plugins/itip-formatter/itip-formatter.c:749
+msgid "Unable to find this task in any task list"
+msgstr "Nun pue alcontrase esta xera en denguna llista de xeres"
+
+#: ../plugins/itip-formatter/itip-formatter.c:753
+msgid "Unable to find this memo in any memo list"
+msgstr "Nun pue alcontrase esta nota en denguna llista de notes"
+
+#: ../plugins/itip-formatter/itip-formatter.c:824
+msgid "Searching for an existing version of this appointment"
+msgstr "Restolando por una versión existente d'esta cita"
+
+#: ../plugins/itip-formatter/itip-formatter.c:993
+msgid "Unable to parse item"
+msgstr "Nun ye dable interpretar l'elementu"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1051
+#, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr "Nun ye dable unviar l'elementu al calendariu «%s»: %s"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1063
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr "Unviáu al calendariu «%s» como aceutáu"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1067
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr "Unviáu al calendariu «%s» como tentativa"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1072
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr "Unviáu al calendariu «%s» como refugáu"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1077
+#, c-format
+msgid "Sent to calendar '%s' as canceled"
+msgstr "Unviáu al calendariu «%s» como encaboxáu"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1171
+#, c-format
+msgid "Organizer has removed the delegate %s "
+msgstr "L'organizador quitó al delegáu %s "
+
+#: ../plugins/itip-formatter/itip-formatter.c:1178
+msgid "Sent a cancelation notice to the delegate"
+msgstr "Unviar una notificación d'encaboxamientu al delegáu"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1180
+msgid "Could not send the cancelation notice to the delegate"
+msgstr "Nun ye dable unviar una notificación d'encaboxamientu al delegáu"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1266
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1293
+#, c-format
+msgid "Unable to update attendee. %s"
+msgstr "Nun ye dable autualizar l'asistencia. %s"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1297
+msgid "Attendee status updated"
+msgstr "Estáu d'asistencia autualizáu"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1323
+msgid "Meeting information sent"
+msgstr "Información de reunión unviada"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1326
+msgid "Task information sent"
+msgstr "Información de la xera unviada"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1329
+msgid "Memo information sent"
+msgstr "Información de la nota unviada"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1338
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr "Nun pue unviase la información de la reunión, la reunión nun esiste"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1341
+msgid "Unable to send task information, the task does not exist"
+msgstr "Nun pue unviase la información de la xera, la xera nun esiste"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1344
+msgid "Unable to send memo information, the memo does not exist"
+msgstr "Nun pue unviase la información de la nota, la nota nun esiste"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1424
+msgid "The calendar attached is not valid"
+msgstr "El calendariu axuntu nun ye válidu"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1414
+#: ../plugins/itip-formatter/itip-formatter.c:1425
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1465
+#: ../plugins/itip-formatter/itip-formatter.c:1493
+#: ../plugins/itip-formatter/itip-formatter.c:1575
+msgid "The item in the calendar is not valid"
+msgstr "L'elementu nel calendariu nun ye válidu"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1466
+#: ../plugins/itip-formatter/itip-formatter.c:1494
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+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:1505
+msgid "The calendar attached contains multiple items"
+msgstr "El calendariu axuntu contién elementos múltiples"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1506
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:2215
+msgid "This meeting recurs"
+msgstr "Esta reunión repítese"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2218
+msgid "This task recurs"
+msgstr "Esta xera repítese"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2221
+msgid "This memo recurs"
+msgstr "Esta nota repítese"
+
+#. Delete message after acting
+#. FIXME Need a schema for this
+#: ../plugins/itip-formatter/itip-formatter.c:2457
+msgid "_Delete message after acting"
+msgstr "_Desaniciar el mensax dempués d'autuar"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2467
+#: ../plugins/itip-formatter/itip-formatter.c:2499
+msgid "Conflict Search"
+msgstr "Busca de conflictos"
+
+#. Source selector
+#: ../plugins/itip-formatter/itip-formatter.c:2482
+msgid "Select the calendars to search for meeting conflicts"
+msgstr ""
+
+#. strftime format of a weekday and a date.
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
+msgid "Today"
+msgstr "Güei"
+
+#. strftime format of a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:194
+msgid "Today %H:%M"
+msgstr "Güei a les %H:%M"
+
+#. strftime format of a time,
+#. in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:198
+msgid "Today %H:%M:%S"
+msgstr "Güei a les %H:%M:%S"
+
+#. strftime format of a time,
+#. in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:207
+msgid "Today %l:%M:%S %p"
+msgstr "Güei a les %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: ../plugins/itip-formatter/itip-view.c:217
+msgid "Tomorrow"
+msgstr "Mañana"
+
+#. strftime format of a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:222
+msgid "Tomorrow %H:%M"
+msgstr "Mañana a les %H:%M"
+
+#. strftime format of a time,
+#. in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:226
+msgid "Tomorrow %H:%M:%S"
+msgstr "Mañana a les %H:%M:%S"
+
+#. strftime format of a time,
+#. in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:231
+msgid "Tomorrow %l:%M %p"
+msgstr "Mañana a les %l:%M %p"
+
+#. strftime format of a time,
+#. in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:235
+msgid "Tomorrow %l:%M:%S %p"
+msgstr "Mañana a les %l:%M:%S %p"
+
+#. strftime format of a weekday.
+#: ../plugins/itip-formatter/itip-view.c:254
+#, 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:259
+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:263
+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:268
+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:272
+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:281
+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:287
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %e de %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:291
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%A, %e de %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:296
+msgid "%A, %B %e %l:%M %p"
+msgstr "%A, %e de %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:300
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %e de %B %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: ../plugins/itip-formatter/itip-view.c:306
+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:311
+msgid "%A, %B %e, %Y %H:%M"
+msgstr "%A, %e de %B de %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:315
+msgid "%A, %B %e, %Y %H:%M:%S"
+msgstr "%A, %e de %B de %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:320
+msgid "%A, %B %e, %Y %l:%M %p"
+msgstr "%A, %e de %B de %Y, %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:324
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%A, %B %e, %Y %l:%M:%S %p"
+
+#: ../plugins/itip-formatter/itip-view.c:349
+#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:525
+#, c-format
+msgid "Please respond on behalf of <b>%s</b>"
+msgstr "Responda en nome de <b>%s</b>"
+
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
+#, c-format
+msgid "Received on behalf of <b>%s</b>"
+msgstr "Recibíu en nome de <b>%s</b>"
+
+#: ../plugins/itip-formatter/itip-view.c:356
+#, c-format
+msgid "<b>%s</b> through %s has published the following meeting information:"
+msgstr "<b>%s</b> espublizó información de reunión a traviés de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:358
+#, c-format
+msgid "<b>%s</b> has published the following meeting information:"
+msgstr "<b>%s</b> espublizó la siguiente información de reunión:"
+
+#: ../plugins/itip-formatter/itip-view.c:363
+#, c-format
+msgid "<b>%s</b> has delegated the following meeting to you:"
+msgstr "<b>%s</b> delegó la reunión siguiente en vusté:"
+
+#: ../plugins/itip-formatter/itip-view.c:366
+#, c-format
+msgid "<b>%s</b> through %s requests your presence at the following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:368
+#, c-format
+msgid "<b>%s</b> requests your presence at the following meeting:"
+msgstr "<b>%s</b> solicita la so presencia na siguiente reunión:"
+
+#: ../plugins/itip-formatter/itip-view.c:374
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+msgstr "<b>%s</b> deseya apuntase a una reunión esistente a traviés de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:376
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting:"
+msgstr "<b>%s</b> deseya apuntase a una reunión esistente:"
+
+#: ../plugins/itip-formatter/itip-view.c:380
+#, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:382
+#, c-format
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:386
+#, c-format
+msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgstr "<b>%s</b> per aciu de %s unvió la siguiente rempuesta a una cita:"
+
+#: ../plugins/itip-formatter/itip-view.c:388
+#, c-format
+msgid "<b>%s</b> has sent back the following meeting response:"
+msgstr "<b>%s</b> tien devuelto la siguiente rempuesta a la reunión:"
+
+#: ../plugins/itip-formatter/itip-view.c:392
+#, c-format
+msgid "<b>%s</b> through %s has canceled the following meeting:"
+msgstr "<b>%s</b> encaboxó la siguiente reunión a traviés de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:394
+#, c-format
+msgid "<b>%s</b> has canceled the following meeting."
+msgstr "<b>%s</b> encaboxó la reunión siguiente."
+
+#: ../plugins/itip-formatter/itip-view.c:398
+#, c-format
+msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgstr "<b>%s</b> per aciu de %s propón los siguientes cambeos nuna cita."
+
+#: ../plugins/itip-formatter/itip-view.c:400
+#, c-format
+msgid "<b>%s</b> has proposed the following meeting changes."
+msgstr "<b>%s</b> propunxo los cambeos siguientes pa la reunión."
+
+#: ../plugins/itip-formatter/itip-view.c:404
+#, c-format
+msgid "<b>%s</b> through %s has declined the following meeting changes:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:406
+#, c-format
+msgid "<b>%s</b> has declined the following meeting changes."
+msgstr "<b>%s</b> refugó los cambeos siguientes pa la reunión."
+
+#: ../plugins/itip-formatter/itip-view.c:444
+#, c-format
+msgid "<b>%s</b> through %s has published the following task:"
+msgstr "<b>%s</b> espublizó la siguiente xera a traviés de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:446
+#, c-format
+msgid "<b>%s</b> has published the following task:"
+msgstr "<b>%s</b> espublizó la xera siguiente:"
+
+#: ../plugins/itip-formatter/itip-view.c:451
+#, c-format
+msgid "<b>%s</b> requests the assignment of %s to the following task:"
+msgstr "<b>%s</b> solicita l'asignación de %s pa la siguiente xera:"
+
+#: ../plugins/itip-formatter/itip-view.c:454
+#, c-format
+msgid "<b>%s</b> through %s has assigned you a task:"
+msgstr "<b>%s</b> asignó-y una xera a traviés de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:456
+#, c-format
+msgid "<b>%s</b> has assigned you a task:"
+msgstr "<b>%s</b> asignó-y a vusté una xera:"
+
+#: ../plugins/itip-formatter/itip-view.c:462
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing task:"
+msgstr "<b>%s</b> deseya amestase a una xera esistente a traviés de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:464
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task:"
+msgstr "<b>%s</b> deseya amestase a una xera esistente:"
+
+#: ../plugins/itip-formatter/itip-view.c:468
+#, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:470
+#, c-format
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:474
+#, c-format
+msgid ""
+"<b>%s</b> through %s has sent back the following assigned task response:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:476
+#, c-format
+msgid "<b>%s</b> has sent back the following assigned task response:"
+msgstr "<b>%s</b> devolvió la siguiente remspuesta a la xera:"
+
+#: ../plugins/itip-formatter/itip-view.c:480
+#, c-format
+msgid "<b>%s</b> through %s has canceled the following assigned task:"
+msgstr "<b>%s</b> encaboxó la siguiente asignación de xera a traviés de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:482
+#, c-format
+msgid "<b>%s</b> has canceled the following assigned task:"
+msgstr "<b>%s</b> encaboxó la siguiente xera asignada:"
+
+#: ../plugins/itip-formatter/itip-view.c:486
+#, c-format
+msgid ""
+"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:488
+#, c-format
+msgid "<b>%s</b> has proposed the following task assignment changes:"
+msgstr "<b>%s</b> propunxo los siguientes cambeos n'asignación de xeres:"
+
+#: ../plugins/itip-formatter/itip-view.c:492
+#, c-format
+msgid "<b>%s</b> through %s has declined the following assigned task:"
+msgstr "<b>%s</b> refugó la siguiente xera asignada a traviés de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:494
+#, c-format
+msgid "<b>%s</b> has declined the following assigned task:"
+msgstr "<b>%s</b> refugó la siguiente xera asignada:"
+
+#: ../plugins/itip-formatter/itip-view.c:532
+#, c-format
+msgid "<b>%s</b> through %s has published the following memo:"
+msgstr "<b>%s</b> espublizó la siguiente nota a traviés de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:534
+#, c-format
+msgid "<b>%s</b> has published the following memo:"
+msgstr "<b>%s</b> espublizó la nota siguiente:"
+
+#: ../plugins/itip-formatter/itip-view.c:539
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+msgstr "<b>%s</b> deseya amestar daqué a una nota esistente a traviés de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:541
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing memo:"
+msgstr "<b>%s</b> deseya amestar daqué a una nota esistente:"
+
+#: ../plugins/itip-formatter/itip-view.c:545
+#, c-format
+msgid "<b>%s</b> through %s has canceled the following shared memo:"
+msgstr "<b>%s</b> encaboxó la siguiente nota compartía a traviés de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:547
+#, c-format
+msgid "<b>%s</b> has canceled the following shared memo:"
+msgstr "<b>%s</b> encaboxó la siguiente nota compartida:"
+
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:818
+msgid "_Open Calendar"
+msgstr "_Abrir calendariu"
+
+#: ../plugins/itip-formatter/itip-view.c:824
+#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:856
+msgid "_Decline"
+msgstr "_Refugar"
+
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
+msgid "_Accept"
+msgstr "_Aceutar"
+
+#: ../plugins/itip-formatter/itip-view.c:828
+msgid "_Decline all"
+msgstr "_Refugar too"
+
+#: ../plugins/itip-formatter/itip-view.c:829
+msgid "_Tentative all"
+msgstr "_Provisional too"
+
+#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:852
+#: ../plugins/itip-formatter/itip-view.c:857
+msgid "_Tentative"
+msgstr "_Provisional"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+msgid "_Accept all"
+msgstr "_Aceutar too"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:841
+msgid "_Send Information"
+msgstr "_Unviar información"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:845
+msgid "_Update Attendee Status"
+msgstr "_Autualizar l'estáu del participante"
+
+#: ../plugins/itip-formatter/itip-view.c:848
+msgid "_Update"
+msgstr "_Autualizar"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:1012
+msgid "Start time:"
+msgstr "Hora d'entamu:"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:1021
+msgid "End time:"
+msgstr "Hora de fin:"
+
+#. Comment
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
+msgid "Comment:"
+msgstr "Comentariu:"
+
+#: ../plugins/itip-formatter/itip-view.c:1073
+msgid "Send _reply to sender"
+msgstr "_Retrucar al remitente"
+
+#: ../plugins/itip-formatter/itip-view.c:1101
+msgid "Send _updates to attendees"
+msgstr "Mandar _autualizaciones a los participantes"
+
+#: ../plugins/itip-formatter/itip-view.c:1110
+msgid "_Apply to all instances"
+msgstr "_Aplicar a toles instancies"
+
+#: ../plugins/itip-formatter/itip-view.c:1119
+msgid "Show time as _free"
+msgstr "Amosar hora como _llibre"
+
+#: ../plugins/itip-formatter/itip-view.c:1870
+msgid "_Tasks :"
+msgstr "_Xeres:"
+
+#: ../plugins/itip-formatter/itip-view.c:1872
+msgid "Memos :"
+msgstr "Notes:"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
+msgid "Displays text/calendar parts in messages."
+msgstr "Amuesa les partes de testu/calendariu nos mensaxes."
+
+#: ../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 ""
+"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
+"&quot;{1}&quot;?"
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+msgid "This meeting has been delegated"
+msgstr "Esta reunión delegóse"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr ""
+
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
+msgid "Proxy _Logout"
+msgstr "_Zarrar sesión proxy"
+
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
+msgid "Allows disabling of accounts."
+msgstr "Permitir desactivar cuentes."
+
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable Account"
+msgstr "Desactivar cuenta"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Beep or play sound file."
+msgstr "Pitar o reproducir un ficheru de soníu."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Blink icon in notification area."
+msgstr "Iconu parpagueante na estaya de notificación."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Enable D-Bus messages."
+msgstr "Activar los mensaxes D-Bus."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Enable icon in notification area."
+msgstr "Activar l'icon na estaya de notificación."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr "Xenera un mensax D-BUS cuando aporta un mensax de corréu nuevu."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Notify new messages for Inbox only."
+msgstr "Notificar nuevos mensaxes namái pa la bandexa d'entrada."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+msgid "Play sound when new messages arrive."
+msgstr "Reproducir un soníu cuando aporte corréu nuevu."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Popup message together with the icon."
+msgstr "Mensax emerxente xunto col iconu."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid "Sound file name to be played."
+msgstr "Nome del ficheru de soníu que reproducir."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+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:13
+msgid "Whether play sound or beep when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Whether show message over the icon when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+msgid "Whether the icon should blink or not."
+msgstr "Conseña si l'iconu tien de parpaguiar o non."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:255
+msgid "Generate a _D-Bus message"
+msgstr "Xenerar un mensax _D-Bus"
+
+#: ../plugins/mail-notification/mail-notification.c:378
+msgid "Evolution's Mail Notification"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:399
+msgid "Mail Notification Properties"
+msgstr ""
+
+#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:458
+#, 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] ""
+msgstr[1] ""
+
+#: ../plugins/mail-notification/mail-notification.c:463
+#, c-format
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/mail-notification/mail-notification.c:480
+#: ../plugins/mail-notification/mail-notification.c:485
+msgid "New email"
+msgstr "Nuevu corréu-e"
+
+#: ../plugins/mail-notification/mail-notification.c:544
+msgid "Show icon in _notification area"
+msgstr "Amosar iconu na estaya de _notificación"
+
+#: ../plugins/mail-notification/mail-notification.c:547
+msgid "B_link icon in notification area"
+msgstr "Iconu pa_rpagueante na estaya de notificación"
+
+#: ../plugins/mail-notification/mail-notification.c:549
+msgid "Popup _message together with the icon"
+msgstr "_Mensax emerxente xunto col iconu"
+
+#: ../plugins/mail-notification/mail-notification.c:730
+msgid "_Play sound when new messages arrive"
+msgstr "Re_producir un soníu cuando aporte corréu nuevu"
+
+#: ../plugins/mail-notification/mail-notification.c:736
+msgid "_Beep"
+msgstr "_Pitar"
+
+#: ../plugins/mail-notification/mail-notification.c:737
+msgid "Play _sound file"
+msgstr "Reproducir ficheru de _soníu"
+
+#: ../plugins/mail-notification/mail-notification.c:748
+msgid "Specify _filename:"
+msgstr "Especificar nome de f_icheru:"
+
+#: ../plugins/mail-notification/mail-notification.c:749
+msgid "Select sound file"
+msgstr "Seleicione un ficheru de soníu"
+
+#: ../plugins/mail-notification/mail-notification.c:750
+msgid "Pl_ay"
+msgstr "Reprod_ucir"
+
+#: ../plugins/mail-notification/mail-notification.c:807
+msgid "Notify new messages for _Inbox only"
+msgstr "Notificar nuevos mensaxes namái pa la _bandexa d'entrada"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid ""
+"Generates a D-Bus message or notifies the user with an icon in notification "
+"area and a notification message whenever a new message has arrived."
+msgstr ""
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Mail Notification"
+msgstr "Notificación de corréu"
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+msgid ""
+"A plugin which allows the creation of meetings from the contents of a mail "
+"message."
+msgstr ""
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
+msgid "Con_vert to Meeting"
+msgstr "Convertir en _reunión"
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
+msgid "Mail to meeting"
+msgstr "Corréu a reunión"
+
+#: ../plugins/mail-to-task/mail-to-task.c:287
+#, c-format
+msgid "Cannot open calendar. %s"
+msgstr "Nun pue abrise'l calendariu. %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:292
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
+msgstr ""
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid ""
+"A plugin which allows the creation of tasks from the contents of a mail "
+"message."
+msgstr ""
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
+msgid "Con_vert to Task"
+msgstr "Convertir en _xera"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
+msgid "Mail to task"
+msgstr "Corréu a xera"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Convert the selected message to a new task"
+msgstr "Convierte'l mensax seleicionáu nuna xera nueva"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Contact list _owner"
+msgstr "_Responsable de la llista de contautos"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Get list _archive"
+msgstr "Obtener _archivador de la llista"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+msgid "Get list _usage information"
+msgstr "Obtener información d'_usi de la llista"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
+msgid "Mailing List Actions"
+msgstr "Aiciones de les llistes de corréu"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
+msgid "Mailing _List"
+msgstr "_Llista de corréu"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
+msgid ""
+"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+msgid "_Post message to list"
+msgstr "_Espublizar un mensax a la llista"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+msgid "_Subscribe to list"
+msgstr "_Soscribise a la llista"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+msgid "_Un-subscribe to list"
+msgstr "Des_oscribise de la llista"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+msgid "Action not available"
+msgstr "Aición non 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 ""
+
+#: ../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 "Ensin aición de corréu-e"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
+msgid "Posting not allowed"
+msgstr "Publicación non permitía"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+msgid "Send e-mail message to mailing list?"
+msgstr "¿Deseya unviar un mensax a la llista de corréu?"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+msgid ""
+"The action could not be performed. This means the header for this action did "
+"not contain any action we could process.\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 "_Editar mensax"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
+msgid "_Send message"
+msgstr "_Unviar mensax"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+msgid "Contact List _Owner"
+msgstr "_Responsable de la llista de contautos"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
+msgid "Get List _Archive"
+msgstr "Obtener _archivador de la llista"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+msgid "Get List _Usage Information"
+msgstr "Obtener información d'_usu de la llista"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
+msgid "Get an archive of the list this message belongs to"
+msgstr "Obtener un archivador de la llista a la que pertenez esti mensax"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+msgid "Get information about the usage of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
+msgid "Post a message to the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "Soscribise a la lista de corréu a la que pertenez esti mensax"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
+msgid "Unsubscribe to the mailing list this message belongs to"
+msgstr "Desoscribise de la llista de corréu a la que pertenez esti mensax"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+msgid "_Post Message to List"
+msgstr "_Espublizar un mensax a la llista"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+msgid "_Subscribe to List"
+msgstr "_Soscribise a la llista"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+msgid "_Unsubscribe from List"
+msgstr "_Desoscribise de la llista"
+
+#: ../plugins/mark-all-read/mark-all-read.c:39
+msgid "Also mark messages in subfolders?"
+msgstr ""
+
+#: ../plugins/mark-all-read/mark-all-read.c:41
+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:164
+msgid "Current Folder and _Subfolders"
+msgstr ""
+
+#: ../plugins/mark-all-read/mark-all-read.c:176
+msgid "Current _Folder Only"
+msgstr ""
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+msgid "Mark All Read"
+msgstr "Conseña too como lleío"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+msgid "Mark Me_ssages as Read"
+msgstr "Conseñar los mensaxes como _lleíos"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
+msgid "Used for marking all the messages under a folder as read"
+msgstr "Úsase pa conseñar tolos mensaxes baxo una carpeta como lleíos"
+
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
+msgid "A plugin which implements mono plugins."
+msgstr "Un plugin qu'implementa mono plugins."
+
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Mono Loader"
+msgstr "Cargador de Mono"
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
+msgid "A plugin for managing which plugins are enabled or disabled."
+msgstr "Un plugin pa xestionar qué plugins tan activaos o desactivaos."
+
+#. Setup the ui
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
+#: ../plugins/plugin-manager/plugin-manager.c:252
+msgid "Plugin Manager"
+msgstr "Alministrador de plugins"
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
+msgid "Enable and disable plugins"
+msgstr "Activar y desactivar plugins"
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
+msgid "_Plugins"
+msgstr "_Plugins"
+
+#: ../plugins/plugin-manager/plugin-manager.c:58
+msgid "Author(s)"
+msgstr "Autor(es)"
+
+#: ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "Configuración"
+
+#: ../plugins/plugin-manager/plugin-manager.c:265
+msgid "Note: Some changes will not take effect until restart"
+msgstr "Nota: Dalgunos cambeos nun fadrán efeutu hasta que reanicie"
+
+#: ../plugins/plugin-manager/plugin-manager.c:291
+msgid "Overview"
+msgstr "Vista xeneral"
+
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
+msgid "Plugin"
+msgstr "Plugin"
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
+msgid ""
+"A test plugin which demonstrates a formatter plugin which lets you choose to "
+"disable HTML messages.\n"
+"\n"
+"This plugin is unsupported demonstration code only.\n"
+msgstr ""
+
+#. but then we also need to create our own section frame
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+msgid "Plain Text Mode"
+msgstr "Mou de testu ensin formatu"
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
+msgid "Prefer plain-text"
+msgstr "Preferir testu ensin formatu"
+
+#: ../plugins/prefer-plain/prefer-plain.c:191
+msgid "Show HTML if present"
+msgstr "Amosar HTML si ta presente"
+
+#: ../plugins/prefer-plain/prefer-plain.c:192
+msgid "Prefer PLAIN"
+msgstr "Preferir ensin formatu"
+
+#: ../plugins/prefer-plain/prefer-plain.c:193
+msgid "Only ever show PLAIN"
+msgstr "Namái amosar ensin formatu"
+
+#: ../plugins/prefer-plain/prefer-plain.c:236
+msgid "HTML _Mode"
+msgstr "_Mou HTML"
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
+msgid "Evolution Profiler"
+msgstr "Perfilador d'Evolution"
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
+msgid "Writes a log of profiling data events."
+msgstr "Escribe un rexistru perfilando los datos de los eventos."
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+msgid "Allows calendars to be published to the web"
+msgstr "Permite espublizar calendarios na web"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+msgid "Calendar Publishing"
+msgstr "Espublización de calendarios"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Locations"
+msgstr "Llugares"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
+msgid "_Publish Calendar Information"
+msgstr "_Espublizar información del calendariu"
+
+#: ../plugins/publish-calendar/publish-calendar.c:596
+#, fuzzy
+msgid "Are you sure you want to remove this location?"
+msgstr "¿Daveres que quier desaniciar esta URL?"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:2
+msgid "<span weight=\"bold\">Location</span>"
+msgstr "<span weight=\"bold\">Llugar</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:4
+msgid "<span weight=\"bold\">Sources</span>"
+msgstr "<span weight=\"bold\">Fontes</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:6
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Manual (via Actions menu)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "_Activar"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+msgid "P_ort:"
+msgstr "_Puertu:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+msgid "Publishing Location"
+msgstr "Llugar d'espublización"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+msgid "Publishing _Frequency:"
+msgstr "_Frecuencia d'espublización:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:13
+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 ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+msgid "Service _type:"
+msgstr "_Tipu de serviciu:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+msgid "_File:"
+msgstr "_Ficheru:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+msgid "_Password:"
+msgstr "_Contraseña:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+msgid "_Publish as:"
+msgstr "_Espublizar como:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+msgid "_Remember password"
+msgstr "_Remembrar contraseña"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Username:"
+msgstr "_Usuariu:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+msgid ""
+"iCal\n"
+"Free/Busy"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using Python."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
+msgid "SpamAssassin (built-in)"
+msgstr "SpamAssassin (integráu)"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
+#, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
+#, c-format
+msgid "Failed to create pipe: %s"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
+#, c-format
+msgid "Error after fork: %s"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
+#, c-format
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
+#, c-format
+msgid "SpamAssassin is not available."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
+msgid "This will make SpamAssassin more reliable, but slower"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
+msgid "I_nclude remote tests"
+msgstr "I_ncluyir tests remotos"
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
+msgid ""
+"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
+"to be installed."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
+#, fuzzy
+msgid "SpamAssassin Options"
+msgstr "Opciones de SpamAssasin"
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+msgid "SpamAssassin junk plugin"
+msgstr "Plugin de fieltru de SPAM SpamAssassin"
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
+msgid "A plugin for saving all attachments or parts of a message at once."
+msgstr "Un plugin pa atroxar tolos axuntos o partes d'un mensax al empar."
+
+#. the path to the shared library
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
+#: ../plugins/save-attachments/save-attachments.c:315
+msgid "Save attachments"
+msgstr "Guarda los axuntos"
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
+msgid "Save Attachments..."
+msgstr "Guardar axuntos..."
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
+msgid "Save all attachments"
+msgstr "Guarda tolos axuntos"
+
+#: ../plugins/save-attachments/save-attachments.c:321
+msgid "Select save base name"
+msgstr "Seleicione'l nome base pa guardar"
+
+#: ../plugins/save-attachments/save-attachments.c:340
+msgid "MIME Type"
+msgstr "Tipu MIME"
+
+#: ../plugins/save-attachments/save-attachments.c:348
+msgid "Save"
+msgstr "Guardar"
+
+#.
+#. * 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:163
+msgid "%F %T"
+msgstr "%F %T"
+
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "UID"
+msgstr "UID"
+
+#: ../plugins/save-calendar/csv-format.c:363
+msgid "Description List"
+msgstr "Llista de descripción"
+
+#: ../plugins/save-calendar/csv-format.c:364
+msgid "Categories List"
+msgstr "Llista de categoríes"
+
+#: ../plugins/save-calendar/csv-format.c:365
+msgid "Comment List"
+msgstr "Llista de comentarios"
+
+#: ../plugins/save-calendar/csv-format.c:367
+msgid "Created"
+msgstr "Criáu"
+
+#: ../plugins/save-calendar/csv-format.c:368
+msgid "Contact List"
+msgstr "Llista de contautos"
+
+#: ../plugins/save-calendar/csv-format.c:369
+msgid "Start"
+msgstr "Entamu"
+
+#: ../plugins/save-calendar/csv-format.c:370
+msgid "End"
+msgstr "Fin"
+
+#: ../plugins/save-calendar/csv-format.c:372
+msgid "percent Done"
+msgstr "porcentax fináu"
+
+#: ../plugins/save-calendar/csv-format.c:374
+msgid "URL"
+msgstr "URL"
+
+#: ../plugins/save-calendar/csv-format.c:375
+msgid "Attendees List"
+msgstr "Llista de participantes"
+
+#: ../plugins/save-calendar/csv-format.c:377
+msgid "Modified"
+msgstr "Modificáu"
+
+#: ../plugins/save-calendar/csv-format.c:532
+msgid "Advanced options for the CSV format"
+msgstr "Opciones avanzaes pal formatu CSV"
+
+#: ../plugins/save-calendar/csv-format.c:539
+msgid "Prepend a header"
+msgstr "Anteponer una cabecera"
+
+#: ../plugins/save-calendar/csv-format.c:548
+msgid "Value delimiter:"
+msgstr "Dellimitador de valor:"
+
+#: ../plugins/save-calendar/csv-format.c:554
+msgid "Record delimiter:"
+msgstr "Dellimitador de rexistru:"
+
+#: ../plugins/save-calendar/csv-format.c:560
+msgid "Encapsulate values with:"
+msgstr "Encapsular valores con:"
+
+#: ../plugins/save-calendar/csv-format.c:582
+msgid "Comma separated value format (.csv)"
+msgstr "Formatu de valores separtaos por comes (.csv)"
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
+msgid "Save Selected"
+msgstr "Guardar seleicionaos"
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+msgid "Saves selected calendar or tasks list to disk."
+msgstr "Guarda'l calendariu o la llista de xeres seleicionada al discu."
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
+msgid "_Save to Disk"
+msgstr "_Guardar al discu"
+
+#.
+#. * 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:150
+msgid "%FT%T"
+msgstr "%FT%T"
+
+#: ../plugins/save-calendar/rdf-format.c:377
+msgid "RDF format (.rdf)"
+msgstr "Formatu RDF (.rdf)"
+
+#: ../plugins/save-calendar/save-calendar.c:161
+msgid "Select destination file"
+msgstr "Seleicione'l ficheru de destín"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
+msgid "Select one source"
+msgstr "Seleicione un orixe"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
+msgid "Selects a single calendar or task source for viewing."
+msgstr "Seleiciona un orixe de calendariu o xera pa velu."
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
+msgid "Show _only this Calendar"
+msgstr "Amosar _namái esti calendariu"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+msgid "Show _only this Memo List"
+msgstr "Amosar _namái esta llista de notes"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
+msgid "Show _only this Task List"
+msgstr "Amosar _namái esta llista de xeres"
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+msgid "Guides you through your initial account setup."
+msgstr ""
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
+msgid "Setup Assistant"
+msgstr ""
+
+#: ../plugins/startup-wizard/startup-wizard.c:85
+msgid "Evolution Setup Assistant"
+msgstr "Asistente de configuración d'Evolution"
+
+#: ../plugins/startup-wizard/startup-wizard.c:88
+msgid "Welcome"
+msgstr "Bienaportáu"
+
+#: ../plugins/startup-wizard/startup-wizard.c:89
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+
+#: ../plugins/startup-wizard/startup-wizard.c:135
+msgid "Importing files"
+msgstr "Importando ficheros"
+
+#: ../plugins/startup-wizard/startup-wizard.c:137
+#: ../shell/e-shell-importer.c:141
+msgid "Please select the information that you would like to import:"
+msgstr "Seleicione la información que quiera importar:"
+
+#: ../plugins/startup-wizard/startup-wizard.c:152
+#: ../shell/e-shell-importer.c:394
+#, c-format
+msgid "From %s:"
+msgstr "Dende %s:"
+
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:505
+#, c-format
+msgid "Importing data."
+msgstr "Importando datos."
+
+#: ../plugins/startup-wizard/startup-wizard.c:234
+#: ../shell/e-shell-importer.c:519
+msgid "Please wait"
+msgstr "Por favor aguarde"
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
+msgid "Indicates if threading of messages should fall back to subject."
+msgstr ""
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
+msgid "Subject Threading"
+msgstr "Agrupación según l'asuntu"
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
+msgid "Thread messages by subject"
+msgstr "Agrupar mensaxes según l'asuntu"
+
+#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
+#: ../plugins/subject-thread/subject-thread.c:56
+msgid "F_all back to threading messages by subject"
+msgstr "Agrupar los mensaxes por _asuntu"
+
+#: ../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 ""
+
+#: ../plugins/templates/templates.c:603
+msgid "No title"
+msgstr ""
+
+#: ../plugins/templates/templates.c:711
+msgid "Save as _Template"
+msgstr ""
+
+#: ../plugins/templates/templates.c:713
+msgid "Save as Template"
+msgstr ""
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr ""
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
+#, fuzzy
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+msgstr "Un plugin cenciellu qu'usa ytnef pa decodificar axuntos TNEF."
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "TNEF Attachment decoder"
+msgstr "Decodificador d'axuntos TNEF"
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr ""
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr ""
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+msgid "WebDAV"
+msgstr ""
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
+msgstr ""
+
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Intérprete d'Evolution"
+
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell Config factory"
+msgstr "Fábrica de configuración del intérprete d'Evolution"
+
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Preba d'Evolution"
+
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Componente de Preba d'Evolution"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:1
+msgid "Authenticate proxy server connections"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:2
+msgid "Automatic proxy configuration URL"
+msgstr ""
+
+#: ../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 "Anchor predetermináu de la barra llateral"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:5
+msgid "Default window height"
+msgstr "Altor predetermináu  de la ventana"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+msgid "Default window state"
+msgstr "Estáu predetermináu de la ventana"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
+msgid "Default window width"
+msgstr "Anchor predetermináu de la ventana"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "HTTP proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "HTTP proxy password"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy username"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Id o nomatu del componente que s'amosará al entamar."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14
+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 ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:15
+msgid "Last upgraded configuration version"
+msgstr "Cabera versión de la configuración autualizada"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Non-proxy hosts"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Proxy configuration mode"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "SOCKS proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "SOCKS proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "Secure HTTP proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Secure HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+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:25
+msgid "Sidebar is visible"
+msgstr "La barra llateral ye visible"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:26
+msgid "Skip development warning dialog"
+msgstr "Saltar el diálogu d'alvertencia de desendolcu"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
+msgid "Start in offline mode"
+msgstr "Aniciar en mou desconeutáu"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:28
+msgid "Statusbar is visible"
+msgstr "La barra d'estáu ye visible"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:29
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+msgid "The default height for the main window, in pixels."
+msgstr "Altor predetermináu de la ventana principal, en píxeles."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:31
+msgid "The default width for the main window, in pixels."
+msgstr "Anchor predetermináu de la ventana principal, en píxeles."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:32
+msgid "The default width for the sidebar, in pixels."
+msgstr "Anchor predetermináu pa la barra llateral, en píxeles."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:33
+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:34
+msgid "The machine name to proxy HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:35
+msgid "The machine name to proxy secure HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The machine name to proxy socks through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+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:38
+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:39
+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:40
+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:41
+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:42
+msgid "Toolbar is visible"
+msgstr "La barra de ferramientes ye visible"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid "URL that provides proxy configuration values."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "Use HTTP proxy"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
+msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "Whether or not the window should be maximized."
+msgstr "Indica si la ventana tien o non de maximizase."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
+msgid "Whether the sidebar should be visible."
+msgstr "Indica si la barra llateral tien de ser visible."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:49
+msgid "Whether the status bar should be visible."
+msgstr "Indica si la barra d'estáu tien de ser visible."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:50
+msgid "Whether the toolbar should be visible."
+msgstr "Indica si la barra de ferramientes tien de ser visible."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:51
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:52
+msgid "Whether the window buttons should be visible."
+msgstr "Indica si los botones de la ventana tienen de ser visibles."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:53
+msgid "Window button style"
+msgstr "Estilu de los botones de ventana"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:54
+msgid "Window buttons are visible"
+msgstr "Los botones de la ventana son visibles"
+
+#: ../shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
+msgstr "<b>Conexones actives</b>"
+
+#: ../shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Conexones actives"
+
+#: ../shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Calque «Aceutar» pa zarrar estes conexones y desconeutase"
+
+#: ../shell/e-shell-importer.c:131
+msgid "Choose the type of importer to run:"
+msgstr "Escueya'l tipu d'importador a executar:"
+
+#: ../shell/e-shell-importer.c:134
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr ""
+
+#: ../shell/e-shell-importer.c:138
+msgid "Choose the destination for this import"
+msgstr "Escueya'l destín d'esta importación"
+
+#: ../shell/e-shell-importer.c:144
+msgid ""
+"Evolution checked for settings to import from the following\n"
+"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
+"settings found. If you would like to\n"
+"try again, please click the \"Back\" button.\n"
+msgstr ""
+
+#: ../shell/e-shell-importer.c:282
+msgid "F_ilename:"
+msgstr "Nome del _ficheru:"
+
+#: ../shell/e-shell-importer.c:287
+msgid "Select a file"
+msgstr "Seleicione un ficheru"
+
+#: ../shell/e-shell-importer.c:296
+msgid "File _type:"
+msgstr "_Tipu de ficheru:"
+
+#: ../shell/e-shell-importer.c:332
+msgid "Import data and settings from _older programs"
+msgstr "Importar datos y configuración de programes _antiguos"
+
+#: ../shell/e-shell-importer.c:335
+msgid "Import a _single file"
+msgstr "Importar un _únicu ficheru"
+
+#: ../shell/e-shell-settings-dialog.c:313
+msgid "Evolution Preferences"
+msgstr "Preferencies d'Evolution"
+
+#. To translators: This is the window title and %s is the
+#. component name. Most translators will want to keep it as is.
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
+#, c-format
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
+
+#: ../shell/e-shell-window-commands.c:75
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr "Les utilidaes GNOME Pilot nun paecen tar instalaes nesti sistema."
+
+#: ../shell/e-shell-window-commands.c:83
+#, c-format
+msgid "Error executing %s."
+msgstr "Falu executando %s."
+
+#: ../shell/e-shell-window-commands.c:139
+msgid "Bug buddy is not installed."
+msgstr "Bug Buddy nun ta instaláu."
+
+#: ../shell/e-shell-window-commands.c:142
+msgid "Bug buddy could not be run."
+msgstr "Nun ye dable executar Bug Buddy."
+
+#. The translator-credits string is for translators to list
+#. * per-language credits for translation, displayed in the
+#. * about dialog.
+#: ../shell/e-shell-window-commands.c:942
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Astur https://launchpad.net/~malditoastur"
+
+#: ../shell/e-shell-window-commands.c:953
+msgid "Evolution Website"
+msgstr "Páxina web d'Evolution"
+
+#: ../shell/e-shell-window-commands.c:971
+msgid "Error opening the FAQ webpage."
+msgstr "Fallu al abrir la páxina web de P+F."
+
+#: ../shell/e-shell-window-commands.c:1174
+msgid "_Work Online"
+msgstr "_Trabayar coneutáu"
+
+#: ../shell/e-shell-window-commands.c:1187 ../ui/evolution.xml.h:57
+msgid "_Work Offline"
+msgstr "_Trabayar ensin conexón"
+
+#: ../shell/e-shell-window-commands.c:1200
+msgid "Work Offline"
+msgstr "Trabayar ensin conexón"
+
+#: ../shell/e-shell-window.c:377
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
+msgstr ""
+
+#: ../shell/e-shell-window.c:384
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution ta en procesu de desconeutase."
+
+#: ../shell/e-shell-window.c:391
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+msgstr ""
+
+#: ../shell/e-shell-window.c:787
+#, c-format
+msgid "Switch to %s"
+msgstr "Camudar a %s"
+
+#: ../shell/e-shell.c:641
+msgid "Unknown system error."
+msgstr "Fallu del sistema desconocíu."
+
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KiB"
+
+#: ../shell/e-shell.c:1262 ../widgets/misc/e-cell-date-edit.c:314
+msgid "OK"
+msgstr "Aceutar"
+
+#: ../shell/e-shell.c:1264
+msgid "Invalid arguments"
+msgstr "Argumentos inválidos"
+
+#: ../shell/e-shell.c:1266
+msgid "Cannot register on OAF"
+msgstr "Nun ye dable rexistrar en OAF"
+
+#: ../shell/e-shell.c:1268
+msgid "Configuration Database not found"
+msgstr "Nun s'alcontró la base de datos de configuración"
+
+#: ../shell/e-user-creatable-items-handler.c:678
+#: ../shell/e-user-creatable-items-handler.c:688
+#: ../shell/e-user-creatable-items-handler.c:693
+msgid "New"
+msgstr "Nuevu"
+
+#: ../shell/test/evolution-test-component.c:105
+msgid "New Test"
+msgstr "Preba nueva"
+
+#: ../shell/test/evolution-test-component.c:107
+msgid "Create a new test item"
+msgstr "Cria una elementu de preba nuevu"
+
+#: ../shell/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr "Calque «Importar» pa entamar a importar el ficheru n'Evolution. "
+
+#: ../shell/import.glade.h:2
+msgid "Evolution Import Assistant"
+msgstr "Asistente d'importación d'Evolution"
+
+#: ../shell/import.glade.h:3
+msgid "Import File"
+msgstr "Importar ficheru"
+
+#: ../shell/import.glade.h:4
+msgid "Import Location"
+msgstr "Llugar d'importación"
+
+#: ../shell/import.glade.h:5
+msgid "Importer Type"
+msgstr "Tipu d'importador"
+
+#: ../shell/import.glade.h:6
+#, fuzzy
+msgid "Select Information to Import"
+msgstr "Seleicione la carpeta na qu'importar"
+
+#: ../shell/import.glade.h:7
+msgid "Select a File"
+msgstr "Seleicione un ficheru"
+
+#: ../shell/import.glade.h:8
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#. Preview/Alpha/Beta version warning message
+#: ../shell/main.c:217
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Evolution groupware suite.\n"
+"\n"
+"This version of Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: ../shell/main.c:241
+msgid ""
+"Thanks\n"
+"The Evolution Team\n"
+msgstr ""
+
+#: ../shell/main.c:248
+msgid "Do not tell me again"
+msgstr "Nun entrugame más vegaes"
+
+#: ../shell/main.c:469
+msgid "Start Evolution activating the specified component"
+msgstr "Eniciar Evolution activando'l componente especificáu"
+
+#: ../shell/main.c:473
+msgid "Start in online mode"
+msgstr "Aniciar en mou coneutáu"
+
+#: ../shell/main.c:476
+msgid "Forcibly shut down all Evolution components"
+msgstr "Forciar el pieslle de tolos componentes d'Evolution"
+
+#: ../shell/main.c:480
+msgid "Forcibly re-migrate from Evolution 1.4"
+msgstr "Fuercia la reemigración dende Evolution 1.4"
+
+#: ../shell/main.c:483
+msgid "Send the debugging output of all components to a file."
+msgstr "Unvía la salida de depuración de tolos componentes a un ficheru."
+
+#: ../shell/main.c:485
+msgid "Disable loading of any plugins."
+msgstr "Desactivar la carga de cualesquier plugin."
+
+#: ../shell/main.c:487
+msgid "Disable preview pane of Mail, Contacts and Tasks."
+msgstr "Desactivar la vista previa del corréu, contautos y xeres."
+
+#: ../shell/main.c:572
+msgid "- The Evolution PIM and Email Client"
+msgstr "El veceru de corréu-e y GIP Evolution"
+
+#: ../shell/main.c:600
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:1
+msgid "Are you sure you want to forget all remembered passwords?"
+msgstr "¿Daveres que quier escaecer toles contraseñes atroxaes?"
+
+#: ../shell/shell.error.xml.h:2
+msgid "Cannot start Evolution"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:3
+msgid "Continue"
+msgstr "Siguir"
+
+#: ../shell/shell.error.xml.h:4
+msgid "Delete old data from version {0}?"
+msgstr "¿Daveres que quier desaniciar los datos antiguos de la versión {0}?"
+
+#: ../shell/shell.error.xml.h:5
+msgid "Evolution can not start."
+msgstr "Evolution nun se pudo aniciar."
+
+#: ../shell/shell.error.xml.h:6
+msgid ""
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:8
+msgid "Insufficient disk space for upgrade."
+msgstr "Espaciu de discu insuficiente pa l'autualización."
+
+#: ../shell/shell.error.xml.h:9
+msgid "Really delete old data?"
+msgstr "¿Daveres que quier desaniciar los datos antiguos?"
+
+#: ../shell/shell.error.xml.h:10
+msgid ""
+"The entire contents of the &quot;evolution&quot; directory are about to be "
+"permanently removed.\n"
+"\n"
+"It is suggested you manually verify that all of your mail, contact, and "
+"calendar data is present, and that this version of Evolution operates "
+"correctly before deleting this old data.\n"
+"\n"
+"Once deleted, you cannot downgrade to the previous version of Evolution "
+"without manual intervention.\n"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:16
+msgid ""
+"The previous version of Evolution stored its data in a different location.\n"
+"\n"
+"If you choose to remove this data, the entire contents of the &quot;"
+"evolution&quot; directory will be removed permanently. If you choose to keep "
+"this data, then you may manually remove the contents of &quot;"
+"evolution&quot; at your convenience.\n"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:20
+msgid "Upgrade from previous version failed: {0}"
+msgstr "La autualización dende la versión anterior falló: {0}"
+
+#: ../shell/shell.error.xml.h:21
+msgid ""
+"Upgrading your data and settings will require up to {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:24
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:27
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:32
+msgid "_Forget"
+msgstr "_Escaecer"
+
+#: ../shell/shell.error.xml.h:33
+msgid "_Keep Data"
+msgstr "_Caltener los datos"
+
+#: ../shell/shell.error.xml.h:34
+msgid "_Remind Me Later"
+msgstr "_Remembrámelo más sero"
+
+#: ../shell/shell.error.xml.h:35
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+
+#: ../smime/gui/ca-trust-dialog.c:102
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: ../smime/gui/cert-trust-dialog.c:151
+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:155
+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:137
+#: ../smime/gui/certificate-manager.c:380
+#: ../smime/gui/certificate-manager.c:604
+msgid "Select a certificate to import..."
+msgstr "Seleicione un certificáu pa importar…"
+
+#: ../smime/gui/certificate-manager.c:146
+msgid "All PKCS12 files"
+msgstr "Tolos fichero PKCS12"
+
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:394
+#: ../smime/gui/certificate-manager.c:618
+msgid "All files"
+msgstr "Tolos ficheros"
+
+#: ../smime/gui/certificate-manager.c:271
+#: ../smime/gui/certificate-manager.c:480
+#: ../smime/gui/certificate-manager.c:702
+msgid "Certificate Name"
+msgstr "Nome del certificáu"
+
+#: ../smime/gui/certificate-manager.c:280
+#: ../smime/gui/certificate-manager.c:498
+msgid "Purposes"
+msgstr "Envís"
+
+#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:553
+msgid "Serial Number"
+msgstr "Númberu de serie"
+
+#: ../smime/gui/certificate-manager.c:297
+msgid "Expires"
+msgstr "Caduca"
+
+#: ../smime/gui/certificate-manager.c:389
+msgid "All email certificate files"
+msgstr "Tolos ficheros de certificáu de correos-e"
+
+#: ../smime/gui/certificate-manager.c:489
+msgid "E-Mail Address"
+msgstr "Direición de corréu-e"
+
+#: ../smime/gui/certificate-manager.c:613
+msgid "All CA certificate files"
+msgstr "Tolos ficheros de certificaos AC"
+
+#: ../smime/gui/certificate-viewer.c:338
+#, c-format
+msgid "Certificate Viewer: %s"
+msgstr "Visor de certificaos: %s"
+
+#: ../smime/gui/component.c:46
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Introduza la contraseña para «%s»"
+
+#. we're setting the password initially
+#: ../smime/gui/component.c:69
+msgid "Enter new password for certificate database"
+msgstr "Introduza una contraseña nueva pa la base de datos de certificaos"
+
+#: ../smime/gui/component.c:71
+msgid "Enter new password"
+msgstr "Introduza la contraseña nueva"
+
+#. FIXME: add serial no, validity date, uses
+#: ../smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: ../smime/gui/e-cert-selector.c:118
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: ../smime/gui/e-cert-selector.c:170
+msgid "Select certificate"
+msgstr "Seleicione'l certificáu"
+
+#: ../smime/gui/smime-ui.glade.h:1
+msgid "<Not Part of Certificate>"
+msgstr "<Nun ye parte del certificáu>"
+
+#: ../smime/gui/smime-ui.glade.h:2
+msgid "<b>Certificate Fields</b>"
+msgstr "<b>Campos del certificáu</b>"
+
+#: ../smime/gui/smime-ui.glade.h:3
+msgid "<b>Certificate Hierarchy</b>"
+msgstr "<b>Xerarquía del certificáu</b>"
+
+#: ../smime/gui/smime-ui.glade.h:4
+msgid "<b>Field Value</b>"
+msgstr "<b>Valor del campu</b>"
+
+#: ../smime/gui/smime-ui.glade.h:5
+msgid "<b>Fingerprints</b>"
+msgstr "<b>Buelgues</b>"
+
+#: ../smime/gui/smime-ui.glade.h:6
+msgid "<b>Issued By</b>"
+msgstr "<b>Emitíu por</b>"
+
+#: ../smime/gui/smime-ui.glade.h:7
+msgid "<b>Issued To</b>"
+msgstr "<b>Emitíu pa</b>"
+
+#: ../smime/gui/smime-ui.glade.h:8
+msgid "<b>This certificate has been verified for the following uses:</b>"
+msgstr "<b>Esti certificáu foi verificáu pa los siguientes usos:</b>"
+
+#: ../smime/gui/smime-ui.glade.h:9
+msgid "<b>Validity</b>"
+msgstr "<b>Validez</b>"
+
+#: ../smime/gui/smime-ui.glade.h:10
+msgid "Authorities"
+msgstr "Autoridaes"
+
+#: ../smime/gui/smime-ui.glade.h:11
+msgid "Backup"
+msgstr "Respaldu (backup)"
+
+#: ../smime/gui/smime-ui.glade.h:12
+msgid "Backup All"
+msgstr "Respaldar too"
+
+#: ../smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
+msgid "Certificate"
+msgstr "Certificáu"
+
+#: ../smime/gui/smime-ui.glade.h:15
+msgid "Certificate Authority Trust"
+msgstr "Confianza na autoridá certificadora"
+
+#: ../smime/gui/smime-ui.glade.h:16
+msgid "Certificate details"
+msgstr "Detáis del certificáu"
+
+#: ../smime/gui/smime-ui.glade.h:17
+msgid "Certificates Table"
+msgstr "Tabla de certificaos"
+
+#: ../smime/gui/smime-ui.glade.h:18
+msgid "Common Name (CN)"
+msgstr "Nome común (CN)"
+
+#: ../smime/gui/smime-ui.glade.h:19
+msgid "Contact Certificates"
+msgstr "Certificaos de contautos"
+
+#: ../smime/gui/smime-ui.glade.h:21
+msgid "Do not trust the authenticity of this certificate"
+msgstr "Nun tener enfotu na autenticidá d'esti certificáu"
+
+#: ../smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr "Ventana muda únicamente"
+
+#: ../smime/gui/smime-ui.glade.h:23
+msgid "Edit"
+msgstr "Editar"
+
+#: ../smime/gui/smime-ui.glade.h:24
+msgid "Email Certificate Trust Settings"
+msgstr "Axustes de confianza de certificaos de corréu-e"
+
+#: ../smime/gui/smime-ui.glade.h:25
+msgid "Email Recipient Certificate"
+msgstr "Certificáu del destinatariu del corréu-e"
+
+#: ../smime/gui/smime-ui.glade.h:26
+msgid "Email Signer Certificate"
+msgstr "Certificáu del roblante del corréu-e"
+
+#: ../smime/gui/smime-ui.glade.h:27
+msgid "Expires On"
+msgstr "Caduca el"
+
+#: ../smime/gui/smime-ui.glade.h:29
+msgid "Import"
+msgstr "Importar"
+
+#: ../smime/gui/smime-ui.glade.h:30
+msgid "Issued On"
+msgstr "Emitíu el"
+
+#: ../smime/gui/smime-ui.glade.h:31
+msgid "MD5 Fingerprint"
+msgstr "Buelga MD5"
+
+#: ../smime/gui/smime-ui.glade.h:32
+msgid "Organization (O)"
+msgstr "Organización (O)"
+
+#: ../smime/gui/smime-ui.glade.h:33
+msgid "Organizational Unit (OU)"
+msgstr "Unidá organizativa (OU)"
+
+#: ../smime/gui/smime-ui.glade.h:34
+msgid "SHA1 Fingerprint"
+msgstr "Buelga SHA1"
+
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
+msgid "SSL Client Certificate"
+msgstr "Certificáu de veceru SSL"
+
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
+msgid "SSL Server Certificate"
+msgstr "Certificáu de servidor SSL"
+
+#: ../smime/gui/smime-ui.glade.h:38
+msgid "Trust the authenticity of this certificate"
+msgstr "Confiar na autenticidá d'esti certificáu"
+
+#: ../smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify email users."
+msgstr "Tener enfotu nesta AC pa identificar a usuarios de corréu-e."
+
+#: ../smime/gui/smime-ui.glade.h:40
+msgid "Trust this CA to identify software developers."
+msgstr "Tener enfotu nesta AC pa identificar a desendolcadores de software."
+
+#: ../smime/gui/smime-ui.glade.h:41
+msgid "Trust this CA to identify web sites."
+msgstr "Tener enfotu nesta AC pa identificar sitios web."
+
+#: ../smime/gui/smime-ui.glade.h:42
+msgid "View"
+msgstr "Ver"
+
+#: ../smime/gui/smime-ui.glade.h:43
+msgid "You have certificates from these organizations that identify you:"
+msgstr "Tien certificados d'estes organizaciones que-y identifiquen:"
+
+#: ../smime/gui/smime-ui.glade.h:44
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:45
+msgid "You have certificates on file that identify these people:"
+msgstr "Tien archivaos los certificaos qu'identifiquen a estes persones:"
+
+#: ../smime/gui/smime-ui.glade.h:46
+msgid "Your Certificates"
+msgstr "Los sos certificaos"
+
+#: ../smime/gui/smime-ui.glade.h:47
+msgid "_Edit CA Trust"
+msgstr "_Editar enfotu na AC"
+
+#. XXX we shouldn't be popping up dialogs in this code.
+#: ../smime/lib/e-cert-db.c:656
+msgid "Certificate already exists"
+msgstr "El certificáu yá esiste"
+
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
+msgid "%d/%m/%Y"
+msgstr "%e/%m/%Y"
+
+#. x509 certificate usage types
+#: ../smime/lib/e-cert.c:408
+msgid "Sign"
+msgstr "Robla"
+
+#: ../smime/lib/e-cert.c:409
+msgid "Encrypt"
+msgstr "Cifráu"
+
+#: ../smime/lib/e-cert.c:514
+msgid "Version"
+msgstr "Versión"
+
+#: ../smime/lib/e-cert.c:529
+msgid "Version 1"
+msgstr "Versión 1"
+
+#: ../smime/lib/e-cert.c:532
+msgid "Version 2"
+msgstr "Versión 2"
+
+#: ../smime/lib/e-cert.c:535
+msgid "Version 3"
+msgstr "Versión 3"
+
+#: ../smime/lib/e-cert.c:617
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr "PKCS #1 MD2 con cifráu RSA"
+
+#: ../smime/lib/e-cert.c:620
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr "PKCS #1 MD5 con cifráu RSA"
+
+#: ../smime/lib/e-cert.c:623
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr "PKCS #1 SHA-1 con cifráu RSA"
+
+#: ../smime/lib/e-cert.c:650
+msgid "PKCS #1 RSA Encryption"
+msgstr "PKCS #1 cifráu RSA"
+
+#: ../smime/lib/e-cert.c:653
+msgid "Certificate Key Usage"
+msgstr "Usu de la clave del certificáu"
+
+#: ../smime/lib/e-cert.c:656
+msgid "Netscape Certificate Type"
+msgstr "Tipu de certificáu Netscape"
+
+#: ../smime/lib/e-cert.c:659
+msgid "Certificate Authority Key Identifier"
+msgstr "Identificador de la clave de l'autoridá del certificáu"
+
+#: ../smime/lib/e-cert.c:671
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr "Identificador del oxetu (%s)"
+
+#: ../smime/lib/e-cert.c:722
+msgid "Algorithm Identifier"
+msgstr "Identificador del algoritmu"
+
+#: ../smime/lib/e-cert.c:730
+msgid "Algorithm Parameters"
+msgstr "Parámetros del algoritmu"
+
+#: ../smime/lib/e-cert.c:752
+msgid "Subject Public Key Info"
+msgstr "Información del asuntu de la clave pública"
+
+#: ../smime/lib/e-cert.c:757
+msgid "Subject Public Key Algorithm"
+msgstr "Asuntu del algoritmu de clave pública"
+
+#: ../smime/lib/e-cert.c:772
+msgid "Subject's Public Key"
+msgstr "Clave pública del asuntu"
+
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
+msgid "Error: Unable to process extension"
+msgstr "Fallu: Nun ye dable procesar la extensión"
+
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+msgid "Object Signer"
+msgstr "Roblante del oxetu"
+
+#: ../smime/lib/e-cert.c:818
+msgid "SSL Certificate Authority"
+msgstr "Autoridá certificadora SSL"
+
+#: ../smime/lib/e-cert.c:822
+msgid "Email Certificate Authority"
+msgstr "Autoridá certificadora de corréu"
+
+#: ../smime/lib/e-cert.c:850
+msgid "Signing"
+msgstr "Roblando"
+
+#: ../smime/lib/e-cert.c:854
+msgid "Non-repudiation"
+msgstr "Non repudiu"
+
+#: ../smime/lib/e-cert.c:858
+msgid "Key Encipherment"
+msgstr "Cifráu de la clave"
+
+#: ../smime/lib/e-cert.c:862
+msgid "Data Encipherment"
+msgstr "Cifráu de datos"
+
+#: ../smime/lib/e-cert.c:866
+msgid "Key Agreement"
+msgstr "Alcuerdu de claves"
+
+#: ../smime/lib/e-cert.c:870
+msgid "Certificate Signer"
+msgstr "Roblante del certificáu"
+
+#: ../smime/lib/e-cert.c:874
+msgid "CRL Signer"
+msgstr "Roblante de la LRC"
+
+#: ../smime/lib/e-cert.c:922
+msgid "Critical"
+msgstr "Críticu"
+
+#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
+msgid "Not Critical"
+msgstr "Non críticu"
+
+#: ../smime/lib/e-cert.c:948
+msgid "Extensions"
+msgstr "Estensiones"
+
+#: ../smime/lib/e-cert.c:1019
+#, c-format
+msgid "%s = %s"
+msgstr "%s = %s"
+
+#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
+msgid "Certificate Signature Algorithm"
+msgstr "Algoritmu de robla del certificáu"
+
+#: ../smime/lib/e-cert.c:1084
+msgid "Issuer"
+msgstr "Emisor"
+
+#: ../smime/lib/e-cert.c:1138
+msgid "Issuer Unique ID"
+msgstr "ID únicu del emisor"
+
+#: ../smime/lib/e-cert.c:1157
+msgid "Subject Unique ID"
+msgstr "ID único del asuntu"
+
+#: ../smime/lib/e-cert.c:1200
+msgid "Certificate Signature Value"
+msgstr "Valor de la robla del certificáu"
+
+#: ../smime/lib/e-pkcs12.c:249
+msgid "PKCS12 File Password"
+msgstr "Contraseña del ficheru PKCS12"
+
+#: ../smime/lib/e-pkcs12.c:249
+msgid "Enter password for PKCS12 file:"
+msgstr "Introduza la contraseña pal ficheru PKCS12:"
+
+#: ../smime/lib/e-pkcs12.c:348
+msgid "Imported Certificate"
+msgstr "Certificáu importáu"
+
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: ../tools/killev.c:61
+#, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr "Nun ye dable executar: «%s»: %s\n"
+
+#: ../tools/killev.c:76
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr "Zarrando %s (%s)\n"
+
+#: ../ui/evolution-addressbook.xml.h:1
+msgid "Address _Book Properties"
+msgstr "Propiedaes de la _llibreta de direiciones"
+
+#: ../ui/evolution-addressbook.xml.h:3
+msgid "Change the properties of the selected folder"
+msgstr "Camuda les propiedaes de la carpeta seleicionada"
+
+#: ../ui/evolution-addressbook.xml.h:4
+msgid "Co_py All Contacts To..."
+msgstr "Co_piar tolos contautos a…"
+
+#: ../ui/evolution-addressbook.xml.h:5
+msgid "Contact _Preview"
+msgstr "Vista _previa de contautos"
+
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Copiar"
+
+#: ../ui/evolution-addressbook.xml.h:7
+msgid "Copy Selected Contacts to Another Folder..."
+msgstr "Copia los contautos seleicionados a otra carpeta…"
+
+#: ../ui/evolution-addressbook.xml.h:8
+msgid "Copy the contacts of the selected folder into another folder"
+msgstr "Copia los contautos de la carpeta seleicionada n'otra carpeta"
+
+#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
+msgid "Copy the selection"
+msgstr "Copiar la seleición"
+
+#: ../ui/evolution-addressbook.xml.h:10
+msgid "Copy to Folder..."
+msgstr "Copia a la carpeta…"
+
+#: ../ui/evolution-addressbook.xml.h:11
+msgid "Create a new address book folder"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Cortar"
+
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
+msgid "Cut the selection"
+msgstr "Corta la seleición"
+
+#: ../ui/evolution-addressbook.xml.h:14
+msgid "Del_ete Address Book"
+msgstr "_Desanicia la llibreta de direiciones"
+
+#: ../ui/evolution-addressbook.xml.h:16
+msgid "Delete selected contacts"
+msgstr "Desanicia los contautos seleicionaos"
+
+#: ../ui/evolution-addressbook.xml.h:17
+msgid "Delete the selected folder"
+msgstr "Desanicia la carpeta seleicionada"
+
+#: ../ui/evolution-addressbook.xml.h:18
+msgid "Forward Contact"
+msgstr "Reunviar contautu"
+
+#: ../ui/evolution-addressbook.xml.h:19
+msgid "Mo_ve All Contacts To..."
+msgstr "Mo_ver toles contautos a…"
+
+#: ../ui/evolution-addressbook.xml.h:20
+msgid "Move Selected Contacts to Another Folder..."
+msgstr "Mueve los contautos seleicionaos a otra carpeta…"
+
+#: ../ui/evolution-addressbook.xml.h:21
+msgid "Move the contacts of the selected folder into another folder"
+msgstr "Mueve los contautos de la carpeta seleicionada a otra carpeta"
+
+#: ../ui/evolution-addressbook.xml.h:22
+msgid "Move to Folder..."
+msgstr "Mover a la carpeta…"
+
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Pegar"
+
+#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Pegar el conteníu del cartafueyos"
+
+#: ../ui/evolution-addressbook.xml.h:25
+msgid "Previews the contacts to be printed"
+msgstr "Previsualiza los contautos a imprentar"
+
+#: ../ui/evolution-addressbook.xml.h:28
+msgid "Print selected contacts"
+msgstr "Imprenta los contautos seleicionaos"
+
+#: ../ui/evolution-addressbook.xml.h:29
+msgid "Rename the selected folder"
+msgstr "Renoma la carpeta seleicionada"
+
+#: ../ui/evolution-addressbook.xml.h:30
+msgid "S_ave Address Book As VCard"
+msgstr "G_uarda la llibreta de direiciones como VCard"
+
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "Guardar como VCard…"
+
+#: ../ui/evolution-addressbook.xml.h:32
+msgid "Save selected contacts as a VCard."
+msgstr "Guarda los contautos seleicionaos nuna VCard."
+
+#: ../ui/evolution-addressbook.xml.h:33
+msgid "Save the contacts of the selected folder as VCard"
+msgstr "Guarda los contautos de la carpeta seleicionada como VCard"
+
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2724
+msgid "Select All"
+msgstr "Seleicionar too"
+
+#: ../ui/evolution-addressbook.xml.h:35
+msgid "Select _All"
+msgstr "Seleicion_ar too"
+
+#: ../ui/evolution-addressbook.xml.h:36
+msgid "Select all contacts"
+msgstr "Seleicionar tolos contautos"
+
+#: ../ui/evolution-addressbook.xml.h:37
+msgid "Send a message to the selected contacts."
+msgstr "Unvía un mensax a los contautos seleicionaos."
+
+#: ../ui/evolution-addressbook.xml.h:38
+msgid "Send message to contact"
+msgstr "Unviar mensax al contautu"
+
+#: ../ui/evolution-addressbook.xml.h:39
+msgid "Send selected contacts to another person."
+msgstr "Unvía los contautos seleicionaos a otra persona."
+
+#: ../ui/evolution-addressbook.xml.h:40
+msgid "Show contact preview window"
+msgstr "Amuesa una ventana de vista previa de contautos"
+
+#: ../ui/evolution-addressbook.xml.h:41
+msgid "St_op"
+msgstr "_Parar"
+
+#: ../ui/evolution-addressbook.xml.h:42
+msgid "Stop"
+msgstr "Parar"
+
+#: ../ui/evolution-addressbook.xml.h:43
+msgid "Stop Loading"
+msgstr "Parar la carga"
+
+#: ../ui/evolution-addressbook.xml.h:44
+msgid "View the current contact"
+msgstr "Ver el contautu autual"
+
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-tasks.xml.h:21
+msgid "_Actions"
+msgstr "A_iciones"
+
+#: ../ui/evolution-addressbook.xml.h:47
+msgid "_Copy Contact to..."
+msgstr "_Copiar contautu a…"
+
+#: ../ui/evolution-addressbook.xml.h:48
+msgid "_Copy Folder Contacts To"
+msgstr "_Copiar carpeta de contautos a"
+
+#: ../ui/evolution-addressbook.xml.h:50
+msgid "_Delete Contact"
+msgstr "_Desaniciar contautu"
+
+#: ../ui/evolution-addressbook.xml.h:52
+msgid "_Forward Contact..."
+msgstr "_Reunviar contautu…"
+
+#: ../ui/evolution-addressbook.xml.h:53
+msgid "_Move Contact to..."
+msgstr "_Mover contautu a…"
+
+#: ../ui/evolution-addressbook.xml.h:54
+msgid "_Move Folder Contacts To"
+msgstr "_Mover contautos de la carpeta a"
+
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
+msgid "_New"
+msgstr "_Nuevu"
+
+#: ../ui/evolution-addressbook.xml.h:60
+msgid "_Rename"
+msgstr "_Renomar"
+
+#: ../ui/evolution-addressbook.xml.h:61
+msgid "_Save Contact as VCard..."
+msgstr "G_uardar contatu como vCard…"
+
+#: ../ui/evolution-addressbook.xml.h:62
+msgid "_Save Folder Contacts As VCard"
+msgstr "_Guardar los contautos de la carpeta como una VCard"
+
+#: ../ui/evolution-addressbook.xml.h:63
+msgid "_Send Message to Contact..."
+msgstr "_Unviar Mensax al Contautu"
+
+#: ../ui/evolution-calendar.xml.h:4
+msgid "Day"
+msgstr "Día"
+
+#: ../ui/evolution-calendar.xml.h:6
+msgid "Delete _all Occurrences"
+msgstr "Desaniciar _toles repeticiones"
+
+#: ../ui/evolution-calendar.xml.h:7
+msgid "Delete all occurrences"
+msgstr "Desanicia toles repeticiones"
+
+#: ../ui/evolution-calendar.xml.h:8
+msgid "Delete the appointment"
+msgstr "Desanicia la cita"
+
+#: ../ui/evolution-calendar.xml.h:10
+msgid "Delete this occurrence"
+msgstr "Desaniciar esta repetición"
+
+#: ../ui/evolution-calendar.xml.h:11
+msgid "Go To"
+msgstr "Dir a"
+
+#: ../ui/evolution-calendar.xml.h:12
+msgid "Go back"
+msgstr "Retroceder"
+
+#: ../ui/evolution-calendar.xml.h:13
+msgid "Go forward"
+msgstr "Avanzar"
+
+#: ../ui/evolution-calendar.xml.h:14
+msgid "List"
+msgstr "Llista"
+
+#: ../ui/evolution-calendar.xml.h:15
+msgid "Month"
+msgstr "Mes"
+
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
+#: ../widgets/misc/e-calendar.c:195
+msgid "Next"
+msgstr "Siguiente"
+
+#: ../ui/evolution-calendar.xml.h:18
+msgid "Previews the calendar to be printed"
+msgstr "Previsualiza el calendariu a imprentar"
+
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:171
+msgid "Previous"
+msgstr "Previu"
+
+#: ../ui/evolution-calendar.xml.h:22
+msgid "Print this calendar"
+msgstr "Imprenta esti calendariu"
+
+#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+msgid "Purg_e"
+msgstr "Purg_ar"
+
+#: ../ui/evolution-calendar.xml.h:24
+msgid "Purge old appointments and meetings"
+msgstr "Purgar reuniones y asocedimientos antiguos"
+
+#: ../ui/evolution-calendar.xml.h:25
+msgid "Select _Date"
+msgstr "Seleicionar _data"
+
+#: ../ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
+msgstr "Seleicionar _güei"
+
+#: ../ui/evolution-calendar.xml.h:27
+msgid "Select a specific date"
+msgstr "Seleiciona una data específica"
+
+#: ../ui/evolution-calendar.xml.h:28
+msgid "Select today"
+msgstr "Seleiciona güei"
+
+#: ../ui/evolution-calendar.xml.h:29
+msgid "Show as list"
+msgstr "Amuesa como una llista"
+
+#: ../ui/evolution-calendar.xml.h:30
+msgid "Show one day"
+msgstr "Amuesa un día"
+
+#: ../ui/evolution-calendar.xml.h:31
+msgid "Show one month"
+msgstr "Amuesa un mes"
+
+#: ../ui/evolution-calendar.xml.h:32
+msgid "Show one week"
+msgstr "Amuesa una selmana"
+
+#: ../ui/evolution-calendar.xml.h:33
+msgid "Show the working week"
+msgstr "Amuesa la selmana llaboral"
+
+#: ../ui/evolution-calendar.xml.h:35
+msgid "View the current appointment"
+msgstr "Ver la cita autual"
+
+#: ../ui/evolution-calendar.xml.h:36
+msgid "Week"
+msgstr "Selmana"
+
+#: ../ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Selmana llaboral"
+
+#: ../ui/evolution-calendar.xml.h:42
+msgid "_Open Appointment"
+msgstr "_Abrir cita"
+
+#: ../ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
+msgstr "Encaboxa la operación de corréu autual"
+
+#: ../ui/evolution-mail-global.xml.h:3
+msgid "Copy the selected folder into another folder"
+msgstr "Copia la carpeta seleicionada n'otra carpeta"
+
+#: ../ui/evolution-mail-global.xml.h:4
+msgid "Create a new folder for storing mail"
+msgstr "Cria una carpeta nueva p'atroxar corréu"
+
+#: ../ui/evolution-mail-global.xml.h:5
+msgid "Create or edit Search Folder definitions"
+msgstr "Cria o edita definiciones de carpetes de gueta"
+
+#: ../ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr "Cria o edita regles pal fieltráu de mensaxes nuevos"
+
+#: ../ui/evolution-mail-global.xml.h:7
+msgid "Download messages of accounts/folders marked for offline"
+msgstr "Descargar mensaxes pa cuentes/carpetes conseñaes como ensin conexón"
+
+#: ../ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "Vaciar _Papelera"
+
+#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
+msgid "F_older"
+msgstr "_Carpeta"
+
+#: ../ui/evolution-mail-global.xml.h:10
+msgid "Move the selected folder into another folder"
+msgstr "Mueve la carpeta seleicionada a otra carpeta"
+
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-global.xml.h:12
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Desanicia dafechu tolos mensaxes desaniciaos de toles carpetes"
+
+#: ../ui/evolution-mail-global.xml.h:13
+msgid "Search F_olders"
+msgstr "_Carpetes de gueta"
+
+#: ../ui/evolution-mail-global.xml.h:14
+msgid "Show Message _Preview"
+msgstr "Amosar vista _previa del mensax"
+
+#: ../ui/evolution-mail-global.xml.h:15
+msgid "Show message preview below the message list"
+msgstr "Amuesa la vista previa del mensax baxo la llista de mensaxes"
+
+#: ../ui/evolution-mail-global.xml.h:16
+msgid "Show message preview side-by-side with the message list"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:17
+msgid "Show message preview window"
+msgstr "Amuesa una ventana de vista previa de mensaxes"
+
+#: ../ui/evolution-mail-global.xml.h:18
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "Ver la consola de depuración pa los mensaxes de socesos"
+
+#: ../ui/evolution-mail-global.xml.h:20
+msgid "_Classic View"
+msgstr "Vista _clásica"
+
+#: ../ui/evolution-mail-global.xml.h:21
+msgid "_Copy Folder To..."
+msgstr "_Copiar carpeta a…"
+
+#: ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "_Depurar sucesos"
+
+#: ../ui/evolution-mail-global.xml.h:23
+msgid "_Download Messages for Offline Usage"
+msgstr "_Descargar Mensaxes pa Usar ensin Conexón"
+
+#: ../ui/evolution-mail-global.xml.h:25
+msgid "_Message Filters"
+msgstr "Fieltros de _Mensax"
+
+#: ../ui/evolution-mail-global.xml.h:26
+msgid "_Move Folder To..."
+msgstr "_Mover carpeta a…"
+
+#: ../ui/evolution-mail-global.xml.h:27
+msgid "_New..."
+msgstr "_Nuevu..."
+
+#: ../ui/evolution-mail-global.xml.h:28
+msgid "_Preview"
+msgstr "Vista _previa"
+
+#.
+#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
+#.
+#: ../ui/evolution-mail-global.xml.h:32
+msgid "_Subscriptions"
+msgstr "_Soscripciones"
+
+#: ../ui/evolution-mail-global.xml.h:33
+msgid "_Vertical View"
+msgstr "Vista _vertical"
+
+#: ../ui/evolution-mail-list.xml.h:1
+msgid "Change the name of this folder"
+msgstr "Camuda'l nome d'esta carpeta"
+
+#: ../ui/evolution-mail-list.xml.h:2
+msgid "Change the properties of this folder"
+msgstr "Camuda les propiedaes d'esta carpeta"
+
+#: ../ui/evolution-mail-list.xml.h:3
+msgid "Collapse All _Threads"
+msgstr "Contrayer toles _conversaciones"
+
+#: ../ui/evolution-mail-list.xml.h:4
+msgid "Collapse all message threads"
+msgstr "Contrái toles conversaciones"
+
+#: ../ui/evolution-mail-list.xml.h:5
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Copiar mensax(es) seleicionáu(os) al cartafueyos"
+
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-list.xml.h:7
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Corta el(los) mensax(es) seleicionáu(os) al cartafueyos"
+
+#: ../ui/evolution-mail-list.xml.h:8
+msgid "E_xpand All Threads"
+msgstr "E_spandir toles conversaciones"
+
+#: ../ui/evolution-mail-list.xml.h:9
+msgid "E_xpunge"
+msgstr "C_ompautar"
+
+#: ../ui/evolution-mail-list.xml.h:10
+msgid "Expand all message threads"
+msgstr "Espandir toles conversaciones"
+
+#: ../ui/evolution-mail-list.xml.h:12
+msgid "Hide S_elected Messages"
+msgstr "Soverar mensaxes s_eleicionaos"
+
+#: ../ui/evolution-mail-list.xml.h:13
+msgid "Hide _Deleted Messages"
+msgstr "Soverar mensaxes _desaniciaos"
+
+#: ../ui/evolution-mail-list.xml.h:14
+msgid "Hide _Read Messages"
+msgstr "Soverar mensaxes _lleíos"
+
+#: ../ui/evolution-mail-list.xml.h:15
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:16
+msgid "Mar_k All Messages as Read"
+msgstr "Conseñar Tolos Mensaxes como Lleíos"
+
+#: ../ui/evolution-mail-list.xml.h:17
+msgid "Mark all messages in the folder as read"
+msgstr "Conseñar tolos mensaxes na carpeta como lleíos"
+
+#: ../ui/evolution-mail-list.xml.h:18
+msgid "Paste message(s) from the clipboard"
+msgstr "Pegar mensax(es) dende'l cartafueyos"
+
+#: ../ui/evolution-mail-list.xml.h:19
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Desanicia dafechu tolos mensaxes desaniciaos d'esta carpeta"
+
+#: ../ui/evolution-mail-list.xml.h:20
+msgid "Permanently remove this folder"
+msgstr "Desanicia dafechu esta carpeta"
+
+#: ../ui/evolution-mail-list.xml.h:21
+msgid "Re_fresh..."
+msgstr "A_utualizar…"
+
+#: ../ui/evolution-mail-list.xml.h:22
+msgid "Refresh the folder"
+msgstr "Autualizar la carpeta"
+
+#: ../ui/evolution-mail-list.xml.h:23
+msgid "Select Message S_ubthread"
+msgstr "Seleicionar s_ubconversación del mensax"
+
+#: ../ui/evolution-mail-list.xml.h:24
+msgid "Select Message _Thread"
+msgstr "Seleicionar con_versación del mensax"
+
+#: ../ui/evolution-mail-list.xml.h:25
+msgid "Select _All Messages"
+msgstr "Seleicionar _Tolos Mensaxes"
+
+#: ../ui/evolution-mail-list.xml.h:26
+msgid "Select all and only the messages that are not currently selected"
+msgstr "Seleiciona tolos mensaxes que nun tean seleicionaos anguaño"
+
+#: ../ui/evolution-mail-list.xml.h:27
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:28
+msgid "Select all replies to the currently selected message"
+msgstr "Seleicionar toles rempuestes al mensax autualmente seleicionáu"
+
+#: ../ui/evolution-mail-list.xml.h:29
+msgid "Select all visible messages"
+msgstr "Seleiciona tolos mensaxes visibles"
+
+#: ../ui/evolution-mail-list.xml.h:30
+msgid "Show Hidde_n Messages"
+msgstr "_Amosar mensaxes soveraos"
+
+#: ../ui/evolution-mail-list.xml.h:31
+msgid "Show messages that have been temporarily hidden"
+msgstr "Amuesa los mensaxes que tuvieron soveraos temporalmente"
+
+#: ../ui/evolution-mail-list.xml.h:32
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Sovera temporalmente tolos mensaxes que foron lleíos"
+
+#: ../ui/evolution-mail-list.xml.h:33
+msgid "Temporarily hide the selected messages"
+msgstr "Sovera temporalmente los mensaxes seleicionaos"
+
+#: ../ui/evolution-mail-list.xml.h:34
+msgid "Threaded Message list"
+msgstr "Llista de mensaxes por conversaciones"
+
+#: ../ui/evolution-mail-list.xml.h:36
+msgid "_Group By Threads"
+msgstr "A_grupar por conversaciones"
+
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-messagedisplay.xml.h:7
+msgid "_Message"
+msgstr "_Mensax"
+
+#: ../ui/evolution-mail-message.xml.h:1
+msgid "A_dd Sender to Address Book"
+msgstr "_Amestar remitente a la llibreta"
+
+#: ../ui/evolution-mail-message.xml.h:2
+msgid "A_pply Filters"
+msgstr "Aplicar _fieltros"
+
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-message.xml.h:4
+msgid "Add Sender to Address Book"
+msgstr "Amesta'l remitente a la llibreta de direiciones"
+
+#: ../ui/evolution-mail-message.xml.h:5
+msgid "All Message _Headers"
+msgstr "_Toles cabeceres del mensax"
+
+#: ../ui/evolution-mail-message.xml.h:6
+msgid "Apply filter rules to the selected messages"
+msgstr "Aplica fieltros a los mensaxes seleicionaos"
+
+#: ../ui/evolution-mail-message.xml.h:7
+msgid "Check for _Junk"
+msgstr "Deteutar _SPAM"
+
+#: ../ui/evolution-mail-message.xml.h:8
+msgid "Compose _New Message"
+msgstr "Redactar un mensax _nuevu"
+
+#: ../ui/evolution-mail-message.xml.h:9
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Responde a tolos destinatarios del mensax seleicionáu"
+
+#: ../ui/evolution-mail-message.xml.h:10
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "Respuende a la llista de corréu remitente del mensax seleicionáu"
+
+#: ../ui/evolution-mail-message.xml.h:11
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Respuende al remitente del mensax seleicionáu"
+
+#: ../ui/evolution-mail-message.xml.h:12
+msgid "Copy selected messages to another folder"
+msgstr "Copia mensaxes seleicionaos a otra carpeta"
+
+#: ../ui/evolution-mail-message.xml.h:13
+msgid "Copy selected messages to the clipboard"
+msgstr "Copiar los mensaxes seleicionaos al cartafueyos"
+
+#: ../ui/evolution-mail-message.xml.h:14
+msgid "Create R_ule"
+msgstr "Criar _regla"
+
+#: ../ui/evolution-mail-message.xml.h:15
+msgid "Create a Search Folder for these recipients"
+msgstr "Cria una carpeta de gueta pa estos destinatarios"
+
+#: ../ui/evolution-mail-message.xml.h:16
+msgid "Create a Search Folder for this mailing list"
+msgstr "Cria una carpeta de gueta pa esta llista de corréu"
+
+#: ../ui/evolution-mail-message.xml.h:17
+msgid "Create a Search Folder for this sender"
+msgstr "Cria una carpeta de gueta pa esti remitente"
+
+#: ../ui/evolution-mail-message.xml.h:18
+msgid "Create a Search Folder for this subject"
+msgstr "Cria una carpeta de gueta pa esti asuntu"
+
+#: ../ui/evolution-mail-message.xml.h:19
+msgid "Create a rule to filter messages from this sender"
+msgstr "Cria una regla pa fieltrar los mensaxes d'esti remitente"
+
+#: ../ui/evolution-mail-message.xml.h:20
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Cria una regla pa fieltrar los mensaxes d'estos destinatarios"
+
+#: ../ui/evolution-mail-message.xml.h:21
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Cria una regla pa fieltrar los mensaxes d'esta llista de corréu"
+
+#: ../ui/evolution-mail-message.xml.h:22
+msgid "Create a rule to filter messages with this subject"
+msgstr "Cria una regla pa fieltrar los mensaxes con esi asuntu"
+
+#: ../ui/evolution-mail-message.xml.h:23
+msgid "Cut selected messages to the clipboard"
+msgstr "Corta los mensaxes seleicionaos al cartafueyos"
+
+#: ../ui/evolution-mail-message.xml.h:24
+msgid "Decrease the text size"
+msgstr "Amenorgar el tamañu del testu"
+
+#: ../ui/evolution-mail-message.xml.h:26
+msgid "Display the next important message"
+msgstr "Amosar el siguiente mensax importante"
+
+#: ../ui/evolution-mail-message.xml.h:27
+msgid "Display the next message"
+msgstr "Amuesa'l mensax siguiente"
+
+#: ../ui/evolution-mail-message.xml.h:28
+msgid "Display the next thread"
+msgstr "Amuesa la siguiente conversación"
+
+#: ../ui/evolution-mail-message.xml.h:29
+msgid "Display the next unread message"
+msgstr "Amuesa'l siguiente mensax non lleíu"
+
+#: ../ui/evolution-mail-message.xml.h:30
+msgid "Display the previous important message"
+msgstr "Amosar l'anterior mensax importante"
+
+#: ../ui/evolution-mail-message.xml.h:31
+msgid "Display the previous message"
+msgstr "Amuesa'l mensax anterior"
+
+#: ../ui/evolution-mail-message.xml.h:32
+msgid "Display the previous unread message"
+msgstr "Amuesa l'anterior mensax non lleíu"
+
+#: ../ui/evolution-mail-message.xml.h:33
+msgid "F_orward As..."
+msgstr "Reunviar _como…"
+
+#: ../ui/evolution-mail-message.xml.h:34
+msgid "Filter on Mailing _List..."
+msgstr "Fieltru según la _llista de corréu…"
+
+#: ../ui/evolution-mail-message.xml.h:35
+msgid "Filter on Se_nder..."
+msgstr "Fieltru según el _remitente…"
+
+#: ../ui/evolution-mail-message.xml.h:36
+msgid "Filter on _Recipients..."
+msgstr "Fieltru según los _destinatarios…"
+
+#: ../ui/evolution-mail-message.xml.h:37
+msgid "Filter on _Subject..."
+msgstr "Fieltru según l'_asuntu…"
+
+#: ../ui/evolution-mail-message.xml.h:38
+msgid "Filter the selected messages for junk status"
+msgstr "Fieltra los mensaxes seleicionaos pol estáu de SPAM"
+
+#: ../ui/evolution-mail-message.xml.h:39
+msgid "Flag selected messages for follow-up"
+msgstr "Conseña los mensaxes seleicionaos pa seguimientu"
+
+#: ../ui/evolution-mail-message.xml.h:40
+msgid "Follow _Up..."
+msgstr "Se_guimientu…"
+
+#: ../ui/evolution-mail-message.xml.h:41
+msgid "Force images in HTML mail to be loaded"
+msgstr "Fuercia la carga d'imáxenes nel corréu HTML"
+
+#: ../ui/evolution-mail-message.xml.h:43
+msgid "Forward the selected message in the body of a new message"
+msgstr "Reunvía'l mensax seleicionáu nel cuerpu d'un mensax nuevu"
+
+#: ../ui/evolution-mail-message.xml.h:44
+msgid "Forward the selected message quoted like a reply"
+msgstr "Reunvía'l mensax seleicionáu citáu como una rempuesta"
+
+#: ../ui/evolution-mail-message.xml.h:45
+msgid "Forward the selected message to someone"
+msgstr "Reunvía'l a daquién el mensax seleicionáu"
+
+#: ../ui/evolution-mail-message.xml.h:46
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Reunvía'l a daquién el mensax como un axuntu"
+
+#: ../ui/evolution-mail-message.xml.h:47
+msgid "Increase the text size"
+msgstr "Aumentar el tamañu del testu"
+
+#: ../ui/evolution-mail-message.xml.h:49
+msgid "Mar_k as"
+msgstr "Cons_eñar como"
+
+#: ../ui/evolution-mail-message.xml.h:50
+msgid "Mark the selected messages as having been read"
+msgstr "Conseña los mensaxes seleicionaos como lleíos"
+
+#: ../ui/evolution-mail-message.xml.h:51
+msgid "Mark the selected messages as important"
+msgstr "Conseñar los mensaxes seleicionaos como importantes"
+
+#: ../ui/evolution-mail-message.xml.h:52
+msgid "Mark the selected messages as junk"
+msgstr "Conseña los mensaxes seleicionaos como SPAM"
+
+#: ../ui/evolution-mail-message.xml.h:53
+msgid "Mark the selected messages as not being junk"
+msgstr "Conseña los mensaxes seleicionaos como non SPAM"
+
+#: ../ui/evolution-mail-message.xml.h:54
+msgid "Mark the selected messages as not having been read"
+msgstr "Conseña los mensaxes seleicionaos como non lleíos"
+
+#: ../ui/evolution-mail-message.xml.h:55
+msgid "Mark the selected messages as unimportant"
+msgstr "Conseñar los mensaxes seleicionaos como non importantes"
+
+#: ../ui/evolution-mail-message.xml.h:56
+msgid "Mark the selected messages for deletion"
+msgstr "Conseña los mensaxes seleicionaos pa desaniciar"
+
+#: ../ui/evolution-mail-message.xml.h:57
+msgid "Move selected messages to another folder"
+msgstr "Mueve los mensaxes seleicionaos a otra carpeta"
+
+#: ../ui/evolution-mail-message.xml.h:59
+msgid "Next _Important Message"
+msgstr "Siguiente _Mensax Importante"
+
+#: ../ui/evolution-mail-message.xml.h:60
+msgid "Next _Thread"
+msgstr "_Conversación siguiente"
+
+#: ../ui/evolution-mail-message.xml.h:61
+msgid "Next _Unread Message"
+msgstr "Mensax siguiente _non lleíu"
+
+#: ../ui/evolution-mail-message.xml.h:62
+msgid "Not Junk"
+msgstr "Non spam"
+
+#: ../ui/evolution-mail-message.xml.h:63
+msgid "Open a window for composing a mail message"
+msgstr "Abre una ventana pa escribir un mensax de corréu"
+
+#: ../ui/evolution-mail-message.xml.h:64
+msgid "Open the selected messages in a new window"
+msgstr "Abre los mensaxes seleicionaos nuna ventana nueva"
+
+#: ../ui/evolution-mail-message.xml.h:65
+msgid "Open the selected messages in the composer for editing"
+msgstr "Abre los mensaxes seleicionaos nel editor pa editalos"
+
+#: ../ui/evolution-mail-message.xml.h:66
+msgid "P_revious Unread Message"
+msgstr "Mensax ante_rior non lleíu"
+
+#: ../ui/evolution-mail-message.xml.h:67
+msgid "Paste messages from the clipboard"
+msgstr "Pega los mensaxes dende'l cartafueyos"
+
+#: ../ui/evolution-mail-message.xml.h:68
+msgid "Pos_t New Message to Folder"
+msgstr "_Espublizar un mensaxe nuevu na carpeta"
+
+#: ../ui/evolution-mail-message.xml.h:69
+msgid "Post a Repl_y"
+msgstr "Espublizar una _rempuesta"
+
+#: ../ui/evolution-mail-message.xml.h:70
+msgid "Post a message to a Public folder"
+msgstr "Espubliza un mensaxe nuna carpeta pública"
+
+#: ../ui/evolution-mail-message.xml.h:71
+msgid "Post a reply to a message in a Public folder"
+msgstr "Espublizar una rempuesta a un mensax nuna carpeta pública"
+
+#: ../ui/evolution-mail-message.xml.h:72
+msgid "Pr_evious Important Message"
+msgstr "Anterior Mensa_x Importante"
+
+#: ../ui/evolution-mail-message.xml.h:73
+msgid "Preview the message to be printed"
+msgstr "Vista previa del mensax que va a imprentase"
+
+#: ../ui/evolution-mail-message.xml.h:77
+msgid "Print this message"
+msgstr "Imprenta esti mensax"
+
+#: ../ui/evolution-mail-message.xml.h:78
+msgid "Re_direct"
+msgstr "Re_dirixir"
+
+#: ../ui/evolution-mail-message.xml.h:79
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Redirixe (rebota) el mensax seleicionáu a daquién"
+
+#: ../ui/evolution-mail-message.xml.h:84
+msgid "Reset the text to its original size"
+msgstr "Reafitar el testu al so tamañu orixinal"
+
+#: ../ui/evolution-mail-message.xml.h:85
+msgid "Save the selected messages as a text file"
+msgstr "Guarda los mensaxes como un ficheru de testu"
+
+#: ../ui/evolution-mail-message.xml.h:86
+msgid "Search Folder from Mailing _List..."
+msgstr "Carpeta de gueta según la _llista de corréu..."
+
+#: ../ui/evolution-mail-message.xml.h:87
+msgid "Search Folder from Recipien_ts..."
+msgstr "Carpeta de gueta según los destina_tarios…"
+
+#: ../ui/evolution-mail-message.xml.h:88
+msgid "Search Folder from S_ubject..."
+msgstr "Carpeta de gueta según l'a_suntu…"
+
+#: ../ui/evolution-mail-message.xml.h:89
+msgid "Search Folder from Sen_der..."
+msgstr "Carpeta de gueta según el remite_nte…"
+
+#: ../ui/evolution-mail-message.xml.h:90
+msgid "Search for text in the body of the displayed message"
+msgstr "Gueta un testu nel cuerpu del mensax amosáu"
+
+#: ../ui/evolution-mail-message.xml.h:91
+msgid "Select _All Text"
+msgstr "Seleicionar _tol testu"
+
+#: ../ui/evolution-mail-message.xml.h:92
+msgid "Select all the text in a message"
+msgstr "Seleiciona tol testu d'un mensax"
+
+#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+msgid "Set up the page settings for your current printer"
+msgstr "Afitar la configuración de la páxina pa la imprentadora autual"
+
+#: ../ui/evolution-mail-message.xml.h:94
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Amuesa un cursor parpagueante nel cuerpu de los mensaxes amosaos"
+
+#: ../ui/evolution-mail-message.xml.h:95
+msgid "Show messages with all email headers"
+msgstr "Amuesa los mensaxes con toles cabeceres de corréu-e"
+
+#: ../ui/evolution-mail-message.xml.h:96
+msgid "Show the raw email source of the message"
+msgstr "Amuesa mensax de corréu-e en bruto"
+
+#: ../ui/evolution-mail-message.xml.h:97
+msgid "Undelete the selected messages"
+msgstr "Recupera los mensaxes seleicionaos"
+
+#: ../ui/evolution-mail-message.xml.h:98
+msgid "Uni_mportant"
+msgstr "_Non importante"
+
+#: ../ui/evolution-mail-message.xml.h:99
+msgid "Zoom _Out"
+msgstr "A_menorgar"
+
+#: ../ui/evolution-mail-message.xml.h:100
+msgid "_Attached"
+msgstr "_Axuntáu"
+
+#: ../ui/evolution-mail-message.xml.h:101
+msgid "_Caret Mode"
+msgstr "Activar _cursor"
+
+#: ../ui/evolution-mail-message.xml.h:102
+msgid "_Clear Flag"
+msgstr "_Quitar conseña"
+
+#: ../ui/evolution-mail-message.xml.h:105
+msgid "_Delete Message"
+msgstr "_Desaniciar el mensax"
+
+#: ../ui/evolution-mail-message.xml.h:107
+msgid "_Find in Message..."
+msgstr "G_uetar nel mensax…"
+
+#: ../ui/evolution-mail-message.xml.h:108
+msgid "_Flag Completed"
+msgstr "Con_señar como fináu"
+
+#: ../ui/evolution-mail-message.xml.h:110
+msgid "_Go To"
+msgstr "_Dir a"
+
+#: ../ui/evolution-mail-message.xml.h:111
+msgid "_Important"
+msgstr "_Importante"
+
+#: ../ui/evolution-mail-message.xml.h:112
+msgid "_Inline"
+msgstr "_Incluyíu na llinia"
+
+#: ../ui/evolution-mail-message.xml.h:113
+msgid "_Junk"
+msgstr "_Spam"
+
+#: ../ui/evolution-mail-message.xml.h:114
+msgid "_Load Images"
+msgstr "Cargar _imáxenes"
+
+#: ../ui/evolution-mail-message.xml.h:116
+msgid "_Message Source"
+msgstr "Mensax en _bruto"
+
+#: ../ui/evolution-mail-message.xml.h:118
+msgid "_Next Message"
+msgstr "Mensax _siguiente"
+
+#: ../ui/evolution-mail-message.xml.h:119
+msgid "_Normal Size"
+msgstr "Tamañu _Normal"
+
+#: ../ui/evolution-mail-message.xml.h:120
+msgid "_Not Junk"
+msgstr "_Non spam"
+
+#: ../ui/evolution-mail-message.xml.h:121
+msgid "_Open in New Window"
+msgstr "_Abrir nuna ventana nueva"
+
+#: ../ui/evolution-mail-message.xml.h:122
+msgid "_Previous Message"
+msgstr "Mensax _Previu"
+
+#: ../ui/evolution-mail-message.xml.h:124
+msgid "_Quoted"
+msgstr "_Citau"
+
+#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
+#: ../ui/evolution-mail-message.xml.h:126
+msgid "_Read"
+msgstr "_Llectura"
+
+#: ../ui/evolution-mail-message.xml.h:128
+msgid "_Save Message..."
+msgstr "_Guardar Mensax..."
+
+#: ../ui/evolution-mail-message.xml.h:129
+msgid "_Undelete Message"
+msgstr "_Recuperar mensax"
+
+#: ../ui/evolution-mail-message.xml.h:130
+msgid "_Unread"
+msgstr "_Non lleíu"
+
+#: ../ui/evolution-mail-message.xml.h:131
+msgid "_Zoom"
+msgstr "_Zoom"
+
+#: ../ui/evolution-mail-message.xml.h:132
+msgid "_Zoom In"
+msgstr "_Ampliar zoom"
+
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Zarrar"
+
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
+msgid "Main toolbar"
+msgstr "Barra de ferramientes principal"
+
+#: ../ui/evolution-memos.xml.h:3
+msgid "Copy selected memo"
+msgstr "Copia la nota seleicionada"
+
+#: ../ui/evolution-memos.xml.h:5
+msgid "Cut selected memo"
+msgstr "Corta la nota seleicionada"
+
+#: ../ui/evolution-memos.xml.h:7
+msgid "Delete selected memos"
+msgstr "Esanicia les notes seleicionaes"
+
+#: ../ui/evolution-memos.xml.h:9
+msgid "Paste memo from the clipboard"
+msgstr "Pegar notes dende'l cartafueyos"
+
+#: ../ui/evolution-memos.xml.h:10
+msgid "Previews the list of memos to be printed"
+msgstr "Vista previa de la llista de notes a imprentar"
+
+#: ../ui/evolution-memos.xml.h:13
+msgid "Print the list of memos"
+msgstr "Imprenta la llista de notes"
+
+#: ../ui/evolution-memos.xml.h:14
+msgid "View the selected memo"
+msgstr "Ver la nota seleicionada"
+
+#: ../ui/evolution-memos.xml.h:18
+msgid "_Open Memo"
+msgstr "_Abrir nota"
+
+#: ../ui/evolution-tasks.xml.h:3
+msgid "Copy selected tasks"
+msgstr "Copia les xeres seleicionaes"
+
+#: ../ui/evolution-tasks.xml.h:5
+msgid "Cut selected tasks"
+msgstr "Corta les xeres seleicionaes"
+
+#: ../ui/evolution-tasks.xml.h:7
+msgid "Delete completed tasks"
+msgstr "Esanicia les xeres completaes"
+
+#: ../ui/evolution-tasks.xml.h:8
+msgid "Delete selected tasks"
+msgstr "Esanicia les xeres seleicionaes"
+
+#: ../ui/evolution-tasks.xml.h:9
+msgid "Mar_k as Complete"
+msgstr "_Conseñar como completu"
+
+#: ../ui/evolution-tasks.xml.h:10
+msgid "Mark selected tasks as complete"
+msgstr "Conseñar xeres seleicionaes como terminaes"
+
+#: ../ui/evolution-tasks.xml.h:12
+msgid "Paste tasks from the clipboard"
+msgstr "Pega les xeres del cartafueyos"
+
+#: ../ui/evolution-tasks.xml.h:13
+msgid "Previews the list of tasks to be printed"
+msgstr "Vista previa de la llista de xeres a imprentar"
+
+#: ../ui/evolution-tasks.xml.h:16
+msgid "Print the list of tasks"
+msgstr "Imprenta la llista de xeres"
+
+#: ../ui/evolution-tasks.xml.h:18
+msgid "Show task preview window"
+msgstr "Amuesa una ventana de vista previa de xera"
+
+#: ../ui/evolution-tasks.xml.h:19
+msgid "Task _Preview"
+msgstr "_Vista previa de xera"
+
+#: ../ui/evolution-tasks.xml.h:20
+msgid "View the selected task"
+msgstr "Ver la xeraseleicionada"
+
+#: ../ui/evolution-tasks.xml.h:27
+msgid "_Open Task"
+msgstr "_Abrir xera"
+
+#: ../ui/evolution.xml.h:1
+msgid "About Evolution..."
+msgstr "Tocante a Evolution…"
+
+#: ../ui/evolution.xml.h:2
+msgid "Change Evolution's settings"
+msgstr "Camuda la configuración d'Evolution"
+
+#: ../ui/evolution.xml.h:3
+msgid "Change the visibility of the toolbar"
+msgstr "Camudar la visibilidá de la barra de ferramientes"
+
+#: ../ui/evolution.xml.h:5
+msgid "Create a new window displaying this folder"
+msgstr "Cria una ventana nueva amosando esta carpeta"
+
+#: ../ui/evolution.xml.h:6
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr ""
+
+#: ../ui/evolution.xml.h:7
+msgid "Display window buttons with icons and text"
+msgstr "Amosar los botones de la ventana con iconos y testu"
+
+#: ../ui/evolution.xml.h:8
+msgid "Display window buttons with icons only"
+msgstr "Amosar los botones de la ventana namái con iconos"
+
+#: ../ui/evolution.xml.h:9
+msgid "Display window buttons with text only"
+msgstr "Amosar los botones de la ventana namái con testu"
+
+#: ../ui/evolution.xml.h:10
+msgid "Evolution _FAQ"
+msgstr "_Dubies frecuentes n'Evolution"
+
+#: ../ui/evolution.xml.h:11
+msgid "Exit the program"
+msgstr "Sal del programa"
+
+#: ../ui/evolution.xml.h:12
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr "Escaez les contraseñes atroxaes, asina qu'entrugaránse-y otra vegada"
+
+#: ../ui/evolution.xml.h:13
+msgid "Hide window buttons"
+msgstr "Soverar los botones de la ventana"
+
+#: ../ui/evolution.xml.h:14
+msgid "I_mport..."
+msgstr "I_mportar..."
+
+#: ../ui/evolution.xml.h:15
+msgid "Icons _and Text"
+msgstr "Iconos _y testu"
+
+#: ../ui/evolution.xml.h:16
+msgid "Import data from other programs"
+msgstr "Importa datos d'otros programes"
+
+#: ../ui/evolution.xml.h:17
+msgid "Lay_out"
+msgstr "_Distribución"
+
+#: ../ui/evolution.xml.h:19
+msgid "New _Window"
+msgstr "_Ventana nueva"
+
+#: ../ui/evolution.xml.h:20
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "Abrir la páxina web d'entrugues más frecuentes"
+
+#: ../ui/evolution.xml.h:21
+msgid "Page Set_up..."
+msgstr "Config_uración de Páxina"
+
+#: ../ui/evolution.xml.h:22
+msgid "Prefere_nces"
+msgstr "Prefere_ncies"
+
+#: ../ui/evolution.xml.h:23
+msgid "Send / Receive"
+msgstr "Unviar / Recibir"
+
+#: ../ui/evolution.xml.h:24
+msgid "Send / _Receive"
+msgstr "Unviar / _Recibir"
+
+#: ../ui/evolution.xml.h:25
+msgid "Send queued items and retrieve new items"
+msgstr "Unvía'l corréu en cola y obtién el nuevu"
+
+#: ../ui/evolution.xml.h:26
+msgid "Set up Pilot configuration"
+msgstr "Configuración del Pilot"
+
+#: ../ui/evolution.xml.h:28
+msgid "Show Side _Bar"
+msgstr "Amoar barra _llateral"
+
+#: ../ui/evolution.xml.h:29
+msgid "Show _Status Bar"
+msgstr "Amosar barra d'_estáu"
+
+#: ../ui/evolution.xml.h:30
+msgid "Show _Toolbar"
+msgstr "Amosar barra de _ferramientes"
+
+#: ../ui/evolution.xml.h:31
+msgid "Show information about Evolution"
+msgstr "Amuesa información tocante a Evolution"
+
+#: ../ui/evolution.xml.h:32
+msgid "Submit Bug Report"
+msgstr "Unvía un informe de fallos"
+
+#: ../ui/evolution.xml.h:33
+msgid "Submit _Bug Report"
+msgstr "Unviar informe de _fallos"
+
+#: ../ui/evolution.xml.h:34
+msgid "Submit a bug report using Bug Buddy"
+msgstr "Unvía un informe de fallos usando Bug Buddy"
+
+#: ../ui/evolution.xml.h:35
+msgid "Toggle whether we are working offline."
+msgstr "Camudar si se ta trabayando desconeutáu"
+
+#: ../ui/evolution.xml.h:36
+msgid "Tool_bar Style"
+msgstr "Estilu de la _barra de ferramientes"
+
+#: ../ui/evolution.xml.h:37
+msgid "View/Hide the Side Bar"
+msgstr "Ver/Soverar la barra llateral"
+
+#: ../ui/evolution.xml.h:38
+msgid "View/Hide the Status Bar"
+msgstr "Ver/Soverar la barra d'estáu"
+
+#: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr ""
+
+#: ../ui/evolution.xml.h:40
+msgid "_About"
+msgstr "Tocante _a"
+
+#: ../ui/evolution.xml.h:41
+msgid "_Close Window"
+msgstr "_Zarrar ventana"
+
+#: ../ui/evolution.xml.h:44
+msgid "_Forget Passwords"
+msgstr "_Escaecer Contraseñes"
+
+#: ../ui/evolution.xml.h:45
+msgid "_Frequently Asked Questions"
+msgstr "_Entrugues más frecuentes"
+
+#: ../ui/evolution.xml.h:47
+msgid "_Hide Buttons"
+msgstr "_Soverar botones"
+
+#: ../ui/evolution.xml.h:48
+msgid "_Icons Only"
+msgstr "Namái _iconos"
+
+#: ../ui/evolution.xml.h:50
+msgid "_Quick Reference"
+msgstr "_Referencia rápida"
+
+#: ../ui/evolution.xml.h:51
+msgid "_Quit"
+msgstr "_Colar"
+
+#: ../ui/evolution.xml.h:52
+msgid "_Switcher Appearance"
+msgstr "Aspeutu del _selector"
+
+#: ../ui/evolution.xml.h:53
+msgid "_Synchronization Options..."
+msgstr "Opciones de _sincronización…"
+
+#: ../ui/evolution.xml.h:54
+msgid "_Text Only"
+msgstr "Namái _testu"
+
+#: ../ui/evolution.xml.h:56
+msgid "_Window"
+msgstr "_Ventana"
+
+#: ../views/addressbook/galview.xml.h:1
+msgid "By _Company"
+msgstr "Por _compañía"
+
+#: ../views/addressbook/galview.xml.h:2
+msgid "_Address Cards"
+msgstr "_Tarxetes de visita"
+
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "Vista de _llista"
+
+#: ../views/calendar/galview.xml.h:1
+msgid "W_eek View"
+msgstr "Vista _selmanal"
+
+#: ../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 selmana _llaboral"
+
+#: ../views/mail/galview.xml.h:1
+msgid "As Sent Folder for Wi_de View"
+msgstr "Como carpeta d'unviaos pa la vista _ancha"
+
+#: ../views/mail/galview.xml.h:2
+msgid "As _Sent Folder"
+msgstr "Como carpeta d'_unviaos"
+
+#: ../views/mail/galview.xml.h:3
+msgid "By S_tatus"
+msgstr "Por es_táu"
+
+#: ../views/mail/galview.xml.h:4
+msgid "By Se_nder"
+msgstr "Por re_mitente"
+
+#: ../views/mail/galview.xml.h:5
+msgid "By Su_bject"
+msgstr "Por _asuntu"
+
+#: ../views/mail/galview.xml.h:6
+msgid "By _Follow Up Flag"
+msgstr "Por marca de _seguimientu"
+
+#: ../views/mail/galview.xml.h:7
+msgid "For _Wide View"
+msgstr "Pa la vista _enancha"
+
+#: ../views/mail/galview.xml.h:8
+msgid "_Messages"
+msgstr "_Mensaxes"
+
+#: ../views/memos/galview.xml.h:1
+msgid "_Memos"
+msgstr "_Notes"
+
+#: ../views/tasks/galview.xml.h:1
+msgid "With _Due Date"
+msgstr "Con data de _vencimientu"
+
+#: ../views/tasks/galview.xml.h:2
+msgid "With _Status"
+msgstr "Con _estáu"
+
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
+msgid "UTC"
+msgstr "UTC"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+msgid "<b>Time Zones</b>"
+msgstr "<b>Estayes horaries</b>"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "<b>_Selection</b>"
+msgstr "<b>_Seleición</b>"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid "Select a Time Zone"
+msgstr "Seleicione una estaya horaria"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+msgid "Timezone drop-down combination box"
+msgstr ""
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+
+#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-model.c:185
+msgid "Collection"
+msgstr "Escoyeta"
+
+#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views.glade.h:4
+#, no-c-format
+msgid "Define Views for %s"
+msgstr "Definir vistes pa %s"
+
+#: ../widgets/menus/gal-define-views-dialog.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:368
+msgid "Define Views"
+msgstr "Definir vistes"
+
+#: ../widgets/menus/gal-define-views.glade.h:2
+#, no-c-format
+msgid "Define Views for \"%s\""
+msgstr "Definir vistes pa «%s»"
+
+#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-scrolled.c:215
+#: ../widgets/table/e-table-scrolled.c:216
+msgid "Table"
+msgstr "Tabla"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
+msgid "Instance"
+msgstr "Instancia"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+msgid "Save Current View"
+msgstr "Guardar vista autual"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+msgid "_Create new view"
+msgstr "_Criar vista nueva"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+msgid "_Replace existing view"
+msgstr "_Reemplazar vista esistente"
+
+#. bonobo displays this string so it must be in locale
+#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-menus.c:368
+msgid "Custom View"
+msgstr "Vista personalizada"
+
+#: ../widgets/menus/gal-view-instance.c:583
+msgid "Save Custom View"
+msgstr "Guardar vista personalizada"
+
+#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-menus.c:392
+msgid "Define Views..."
+msgstr "Definir vistes…"
+
+#: ../widgets/menus/gal-view-menus.c:305
+msgid "C_urrent View"
+msgstr "Vista _autual"
+
+#: ../widgets/menus/gal-view-menus.c:329
+#, c-format
+msgid "Select View: %s"
+msgstr "Seleicionar vista: %s"
+
+#: ../widgets/menus/gal-view-menus.c:373
+msgid "Current view is a customized view"
+msgstr "La vista autual ye una vista personalizada"
+
+#: ../widgets/menus/gal-view-menus.c:378
+msgid "Save Custom View..."
+msgstr "Guardar vista personalizada…"
+
+#: ../widgets/menus/gal-view-menus.c:383
+msgid "Save current custom view"
+msgstr "Guardar la vista autual personalizada"
+
+#: ../widgets/menus/gal-view-menus.c:397
+msgid "Create or edit views"
+msgstr "Criar o editar vistes"
+
+#: ../widgets/menus/gal-view-new-dialog.c:70
+msgid "Factory"
+msgstr "Fábrica"
+
+#: ../widgets/menus/gal-view-new-dialog.c:105
+msgid "Define New View"
+msgstr "Definir vistes nuevas"
+
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+msgid "Name of new view:"
+msgstr "Nome de la vista nueva:"
+
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+msgid "Type of View"
+msgstr "Tipu de vista"
+
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+msgid "Type of view:"
+msgstr "Tipoude vista:"
+
+#: ../widgets/misc/e-attachment-bar.c:1137
+msgid "Attachment Bar"
+msgstr "Barra d'axuntos"
+
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "Nun se pue axuntar el ficheru %s: %s"
+
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "Nun ye dable axuntar el ficheru %s: nun ye un ficheru normal"
+
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr "Propiedaes d'axuntos"
+
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "File name:"
+msgstr "Nome del ficheru:"
+
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr "Tipu MIME:"
+
+#: ../widgets/misc/e-attachment.glade.h:5
+msgid "Suggest automatic display of attachment"
+msgstr "Suxerir amosar axuntos automáticamente"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../widgets/misc/e-calendar-item.c:1267
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../widgets/misc/e-calendar.c:220
+msgid "Month Calendar"
+msgstr "Calendariu mensual"
+
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
+#: ../widgets/text/e-text.c:3645
+msgid "Fill color"
+msgstr "Color de rellenu"
+
+#: ../widgets/misc/e-canvas-background.c:461
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3651
+#: ../widgets/text/e-text.c:3652 ../widgets/text/e-text.c:3659
+#: ../widgets/text/e-text.c:3660
+msgid "GDK fill color"
+msgstr "Color de rellenu GDK"
+
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666
+#: ../widgets/text/e-text.c:3667
+msgid "Fill stipple"
+msgstr "Puntéu de rellenu"
+
+#: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
+msgid "X1"
+msgstr "X1"
+
+#: ../widgets/misc/e-canvas-background.c:489
+#: ../widgets/misc/e-canvas-background.c:490
+msgid "X2"
+msgstr "X2"
+
+#: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:497
+msgid "Y1"
+msgstr "Y1"
+
+#: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:504
+msgid "Y2"
+msgstr "Y2"
+
+#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
+#: ../widgets/table/e-table-group-container.c:999
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3070
+msgid "Minimum width"
+msgstr "Anchu mínimu"
+
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3071
+msgid "Minimum Width"
+msgstr "Anchu Mínimu"
+
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:206
+msgid "Spacing"
+msgstr "Espaciáu"
+
+#: ../widgets/misc/e-cell-date-edit.c:290
+msgid "Now"
+msgstr "Agora"
+
+#: ../widgets/misc/e-cell-date-edit.c:847
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "La data tien de tar nel formatu: %s"
+
+#: ../widgets/misc/e-cell-percent.c:78
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "El valor del porcentax tien de tar ente 0 y 100, inclusive"
+
+#: ../widgets/misc/e-charset-picker.c:57
+msgid "Arabic"
+msgstr "�rabe"
+
+#: ../widgets/misc/e-charset-picker.c:58
+msgid "Baltic"
+msgstr "Bálticu"
+
+#: ../widgets/misc/e-charset-picker.c:59
+msgid "Central European"
+msgstr "Centroeuropéu"
+
+#: ../widgets/misc/e-charset-picker.c:60
+msgid "Chinese"
+msgstr "Chinu"
+
+#: ../widgets/misc/e-charset-picker.c:61
+msgid "Cyrillic"
+msgstr "Cirílicu"
+
+#: ../widgets/misc/e-charset-picker.c:62
+msgid "Greek"
+msgstr "Griegu"
+
+#: ../widgets/misc/e-charset-picker.c:63
+msgid "Hebrew"
+msgstr "Hebréu"
+
+#: ../widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr "Xaponés"
+
+#: ../widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr "Coreanu"
+
+#: ../widgets/misc/e-charset-picker.c:66
+msgid "Thai"
+msgstr "Tailandés (thai)"
+
+#: ../widgets/misc/e-charset-picker.c:67
+msgid "Turkish"
+msgstr "Turcu"
+
+#: ../widgets/misc/e-charset-picker.c:68
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../widgets/misc/e-charset-picker.c:69
+msgid "Western European"
+msgstr "Européu occidental"
+
+#: ../widgets/misc/e-charset-picker.c:70
+msgid "Western European, New"
+msgstr "Européu occidental, nuevu"
+
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
+msgid "Traditional"
+msgstr "Tradicional"
+
+#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
+msgid "Simplified"
+msgstr "Simplificáu"
+
+#: ../widgets/misc/e-charset-picker.c:98
+msgid "Ukrainian"
+msgstr "Ucranianu"
+
+#: ../widgets/misc/e-charset-picker.c:101
+msgid "Visual"
+msgstr "Visual"
+
+#: ../widgets/misc/e-charset-picker.c:170
+#, c-format
+msgid "Unknown character set: %s"
+msgstr "Conxuntu de carauteres desconocíu: %s"
+
+#: ../widgets/misc/e-charset-picker.c:215
+msgid "Character Encoding"
+msgstr "Codificación de carauteres"
+
+#: ../widgets/misc/e-charset-picker.c:230
+msgid "Enter the character set to use"
+msgstr "Introduza'l conxunto de carauteres a usar"
+
+#: ../widgets/misc/e-charset-picker.c:337
+msgid "Other..."
+msgstr "Otru ..."
+
+#: ../widgets/misc/e-charset-picker.c:599
+msgid "Ch_aracter Encoding"
+msgstr "C_odificación de carauteres"
+
+#: ../widgets/misc/e-dateedit.c:303
+msgid "Date and Time"
+msgstr "Data y hora"
+
+#: ../widgets/misc/e-dateedit.c:324
+msgid "Text entry to input date"
+msgstr "Entrada de testu pa introducir la data"
+
+#: ../widgets/misc/e-dateedit.c:346
+msgid "Click this button to show a calendar"
+msgstr "Calque esti botón p'amosar un calendariu"
+
+#: ../widgets/misc/e-dateedit.c:388
+msgid "Drop-down combination box to select time"
+msgstr ""
+
+#: ../widgets/misc/e-dateedit.c:464
+msgid "No_w"
+msgstr "_Agora"
+
+#: ../widgets/misc/e-dateedit.c:470
+msgid "_Today"
+msgstr "Güe_i"
+
+#: ../widgets/misc/e-dateedit.c:1635
+msgid "Invalid Date Value"
+msgstr "Valor de data inválidu"
+
+#: ../widgets/misc/e-dateedit.c:1664
+msgid "Invalid Time Value"
+msgstr "Valor de data inválidu"
+
+#: ../widgets/misc/e-expander.c:182
+msgid "Expanded"
+msgstr "Expandíu"
+
+#: ../widgets/misc/e-expander.c:183
+msgid "Whether or not the expander is expanded"
+msgstr "Conseña si l'expansor ta o non expandíu"
+
+#: ../widgets/misc/e-expander.c:191
+msgid "Text of the expander's label"
+msgstr "Testu de la etiqueta del expansor"
+
+#: ../widgets/misc/e-expander.c:198
+msgid "Use underline"
+msgstr "Usar solliñáu"
+
+#: ../widgets/misc/e-expander.c:199
+msgid ""
+"If set, an underline in the text indicates the next character should be used "
+"for the mnemonic accelerator key"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:207
+msgid "Space to put between the label and the child"
+msgstr "Espaciu pa poner ente la etiqueta y el descendiente"
+
+#: ../widgets/misc/e-expander.c:216
+msgid "Label widget"
+msgstr "Etiqueta del widget"
+
+#: ../widgets/misc/e-expander.c:217
+msgid "A widget to display in place of the usual expander label"
+msgstr "Un widget p'amosar nel llugar de la etiqueta usual del expansor"
+
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
+msgid "Expander Size"
+msgstr "Tamañu del expansor"
+
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
+msgid "Size of the expander arrow"
+msgstr "Tamañu de la flecha del expansor"
+
+#: ../widgets/misc/e-expander.c:232
+msgid "Indicator Spacing"
+msgstr "Indicador d'espaciu"
+
+#: ../widgets/misc/e-expander.c:233
+msgid "Spacing around expander arrow"
+msgstr "Espaciado al rodiu de la flecha del expansor"
+
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:126 ../widgets/misc/e-filter-bar.c:179
+#: ../widgets/misc/e-filter-bar.c:307 ../widgets/misc/e-filter-bar.c:749
+msgid "Advanced Search"
+msgstr "Gueta Avanzada..."
+
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:230
+msgid "Save Search"
+msgstr "Guardar gueta"
+
+#: ../widgets/misc/e-filter-bar.c:267
+msgid "_Searches"
+msgstr "_Guetes"
+
+#: ../widgets/misc/e-filter-bar.c:269
+msgid "Searches"
+msgstr "Guetes"
+
+#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
+msgid "_Save Search..."
+msgstr "_Guardar gueta…"
+
+#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
+msgid "_Edit Saved Searches..."
+msgstr "_Editar guetes guardaes…"
+
+#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
+msgid "_Advanced Search..."
+msgstr "_Gueta Avanzada..."
+
+#: ../widgets/misc/e-filter-bar.h:107
+msgid "All Accounts"
+msgstr "Toles Cuentes"
+
+#: ../widgets/misc/e-filter-bar.h:108
+msgid "Current Account"
+msgstr "Cuenta Autual"
+
+#: ../widgets/misc/e-filter-bar.h:109
+msgid "Current Folder"
+msgstr "Carpeta Autual"
+
+#: ../widgets/misc/e-filter-bar.h:110
+msgid "Current Message"
+msgstr "Mensax Autual"
+
+#: ../widgets/misc/e-image-chooser.c:169
+msgid "Choose Image"
+msgstr "Escueya una imaxe"
+
+#: ../widgets/misc/e-map.c:627
+msgid "World Map"
+msgstr "Mapa mundial"
+
+#: ../widgets/misc/e-map.c:629
+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:106
+msgid "Online"
+msgstr ""
+
+#: ../widgets/misc/e-online-button.c:107
+msgid "The button state is online"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:102
+msgid "Sync with:"
+msgstr "Sincronizar con:"
+
+#: ../widgets/misc/e-pilot-settings.c:110
+msgid "Sync Private Records:"
+msgstr "Sincr. rexistros privaos:"
+
+#: ../widgets/misc/e-pilot-settings.c:119
+msgid "Sync Categories:"
+msgstr "Sincr. categoríes:"
+
+#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
+msgid "Empty message"
+msgstr "Mensax ermu"
+
+#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
+msgid "Reflow model"
+msgstr "Modelu de refluxu"
+
+#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
+msgid "Column width"
+msgstr "Anchu de columna"
+
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
+msgid "Search"
+msgstr "Guetar"
+
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
+msgid "Click here to change the search type"
+msgstr "Calque equí pa camudar el tipu de gueta"
+
+#: ../widgets/misc/e-search-bar.c:603
+msgid "_Search"
+msgstr "_Guetar"
+
+#: ../widgets/misc/e-search-bar.c:609
+msgid "_Find Now"
+msgstr "G_uetar agora"
+
+#: ../widgets/misc/e-search-bar.c:610
+msgid "_Clear"
+msgstr "L_limpiar"
+
+#: ../widgets/misc/e-search-bar.c:865
+msgid "Item ID"
+msgstr "ID d'elementu"
+
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
+#: ../widgets/text/e-text.c:3567
+msgid "Text"
+msgstr "Testu"
+
+#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
+#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
+#: ../widgets/misc/e-search-bar.c:1003
+msgid "Sho_w: "
+msgstr "Am_osar: "
+
+#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
+#. the term to search for
+#: ../widgets/misc/e-search-bar.c:1020
+msgid "Sear_ch: "
+msgstr "Gue_tar: "
+
+#. To Translators: The " in " label is part of the Quick Search Bar, example:
+#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
+#: ../widgets/misc/e-search-bar.c:1032
+msgid " i_n "
+msgstr " e_n "
+
+#: ../widgets/misc/e-selection-model-array.c:594
+#: ../widgets/table/e-tree-selection-model.c:806
+msgid "Cursor Row"
+msgstr "Cursor de filera"
+
+#: ../widgets/misc/e-selection-model-array.c:601
+#: ../widgets/table/e-tree-selection-model.c:813
+msgid "Cursor Column"
+msgstr "Cursor de columna"
+
+#: ../widgets/misc/e-selection-model.c:209
+msgid "Sorter"
+msgstr "Ordenador"
+
+#: ../widgets/misc/e-selection-model.c:216
+msgid "Selection Mode"
+msgstr "Mou de seleición"
+
+#: ../widgets/misc/e-selection-model.c:224
+msgid "Cursor Mode"
+msgstr "Mou del cursor"
+
+#: ../widgets/misc/e-send-options.c:522
+msgid "When de_leted:"
+msgstr "Al _esaniciar:"
+
+#: ../widgets/misc/e-send-options.glade.h:1
+msgid "<b>Delivery Options</b>"
+msgstr "<b>Opciones d'entrega</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:2
+msgid "<b>Replies</b>"
+msgstr "<b>Rempuestes</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:3
+msgid "<b>Return Notification</b>"
+msgstr "<b>Devolver notificación</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:4
+msgid "<b>Status Tracking</b>"
+msgstr "<b>Seguimientu d'estáu</b>"
+
+#: ../widgets/misc/e-send-options.glade.h:5
+msgid "A_uto-delete sent item"
+msgstr "_Autoesaniciar l'elementu unviáu"
+
+#: ../widgets/misc/e-send-options.glade.h:7
+msgid "Creat_e a sent item to track information"
+msgstr "_Criar un elementu unviáu pa seguimiento de la información"
+
+#: ../widgets/misc/e-send-options.glade.h:8
+msgid "Deli_vered and opened"
+msgstr "_Entregáu y abiertu"
+
+#: ../widgets/misc/e-send-options.glade.h:9
+msgid "Gene_ral Options"
+msgstr "Opciones xene_rales"
+
+#: ../widgets/misc/e-send-options.glade.h:10
+msgid ""
+"None\n"
+"Mail Receipt"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:12
+msgid ""
+"Normal\n"
+"Proprietary\n"
+"Confidential\n"
+"Secret\n"
+"Top Secret\n"
+"For Your Eyes Only"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:18
+msgid "R_eply requested"
+msgstr "_Rempuesta solicitada"
+
+#: ../widgets/misc/e-send-options.glade.h:20
+msgid "Sta_tus Tracking"
+msgstr "Seguimientu d'es_táu"
+
+#: ../widgets/misc/e-send-options.glade.h:21
+msgid ""
+"Undefined\n"
+"High\n"
+"Standard\n"
+"Low"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:25
+msgid "When acce_pted:"
+msgstr "Al ace_utar:"
+
+#: ../widgets/misc/e-send-options.glade.h:26
+msgid "When co_mpleted:"
+msgstr "Al _finar:"
+
+#: ../widgets/misc/e-send-options.glade.h:27
+msgid "When decli_ned:"
+msgstr "Al _refugar:"
+
+#: ../widgets/misc/e-send-options.glade.h:28
+msgid "Wi_thin"
+msgstr "_Dientro"
+
+#: ../widgets/misc/e-send-options.glade.h:29
+msgid "_After:"
+msgstr "_Dempués"
+
+#: ../widgets/misc/e-send-options.glade.h:30
+msgid "_All information"
+msgstr "_Tola información"
+
+#. To translators: This means Delay the message delivery for some time
+#: ../widgets/misc/e-send-options.glade.h:32
+msgid "_Delay message delivery"
+msgstr "_Retrasar la entrega del mensax"
+
+#: ../widgets/misc/e-send-options.glade.h:33
+msgid "_Delivered"
+msgstr "_Entregáu"
+
+#: ../widgets/misc/e-send-options.glade.h:35
+msgid "_Set expiration date"
+msgstr "_Afitar data de caducidá"
+
+#: ../widgets/misc/e-send-options.glade.h:36
+msgid "_Until:"
+msgstr "_Hasta:"
+
+#: ../widgets/misc/e-send-options.glade.h:37
+msgid "_When convenient"
+msgstr "_Cuandu convenga"
+
+#: ../widgets/misc/e-send-options.glade.h:38
+msgid "_When opened:"
+msgstr "_Al abrir:"
+
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
+#: ../widgets/misc/e-task-widget.c:252
+#, c-format
+msgid "%s (...)"
+msgstr "%s (…)"
+
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
+#. %d is a number between 0 and 100, describing the percentage of operation complete
+#: ../widgets/misc/e-task-widget.c:258
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% completáu)"
+
+#: ../widgets/misc/e-url-entry.c:106
+msgid "Click here to go to URL"
+msgstr "Calque equí pa dir a la URL"
+
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "Edit Master Category List..."
+msgstr "Editar llista de categoríes mayestra…"
+
+#: ../widgets/misc/gal-categories.glade.h:2
+msgid "Item(s) belong to these _categories:"
+msgstr "Elemento(s) pertenecientes a estes _categoríes:"
+
+#: ../widgets/misc/gal-categories.glade.h:3
+msgid "_Available Categories:"
+msgstr "_Categoríes disponibles:"
+
+#: ../widgets/misc/gal-categories.glade.h:4
+msgid "categories"
+msgstr "categoríes"
+
+#: ../widgets/table/e-cell-combo.c:170
+msgid "popup list"
+msgstr "llista emerxente"
+
+#: ../widgets/table/e-cell-date.c:62
+msgid "%l:%M %p"
+msgstr "%l:%M %p"
+
+#: ../widgets/table/e-cell-pixbuf.c:360
+msgid "Selected Column"
+msgstr "Columna seleicionada"
+
+#: ../widgets/table/e-cell-pixbuf.c:367
+msgid "Focused Column"
+msgstr "Columna enfocada"
+
+#: ../widgets/table/e-cell-pixbuf.c:374
+msgid "Unselected Column"
+msgstr "Columna deseleicionada"
+
+#: ../widgets/table/e-cell-text.c:1807
+msgid "Strikeout Column"
+msgstr "Tachar columna"
+
+#: ../widgets/table/e-cell-text.c:1814
+msgid "Underline Column"
+msgstr "Sorrayar columna"
+
+#: ../widgets/table/e-cell-text.c:1821
+msgid "Bold Column"
+msgstr "Columna en negrina"
+
+#: ../widgets/table/e-cell-text.c:1828
+msgid "Color Column"
+msgstr "Color de la columna"
+
+#: ../widgets/table/e-cell-text.c:1842
+msgid "BG Color Column"
+msgstr "Color de fondu de la columna"
+
+#: ../widgets/table/e-table-config.c:152
+msgid "State"
+msgstr "Estáu"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Ascending)"
+msgstr "(Ascendente)"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Descending)"
+msgstr "(Descendente)"
+
+#: ../widgets/table/e-table-config.c:392
+msgid "Not sorted"
+msgstr "Ensin ordenar"
+
+#: ../widgets/table/e-table-config.c:433
+msgid "No grouping"
+msgstr "Ensin agrupar"
+
+#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.glade.h:11
+msgid "Show Fields"
+msgstr "Amosar campos"
+
+#: ../widgets/table/e-table-config.c:664
+msgid "Available Fields"
+msgstr "Campos disponibles"
+
+#: ../widgets/table/e-table-config.glade.h:1
+msgid "A_vailable Fields:"
+msgstr "Campos _disponibles:"
+
+#: ../widgets/table/e-table-config.glade.h:2
+#: ../widgets/table/e-table-header-item.c:1582
+msgid "Ascending"
+msgstr "Ascendente"
+
+#: ../widgets/table/e-table-config.glade.h:3
+msgid "Clear All"
+msgstr "Llimpiar too"
+
+#: ../widgets/table/e-table-config.glade.h:4
+msgid "Clear _All"
+msgstr "Llimpiar _too"
+
+#: ../widgets/table/e-table-config.glade.h:5
+#: ../widgets/table/e-table-header-item.c:1582
+msgid "Descending"
+msgstr "Descendente"
+
+#: ../widgets/table/e-table-config.glade.h:8
+msgid "Group Items By"
+msgstr "Agrupar elementos por"
+
+#: ../widgets/table/e-table-config.glade.h:9
+msgid "Move _Down"
+msgstr "_Mover Abaxo"
+
+#: ../widgets/table/e-table-config.glade.h:10
+msgid "Move _Up"
+msgstr "M_over Arriba"
+
+#: ../widgets/table/e-table-config.glade.h:12
+msgid "Show _field in View"
+msgstr "Amosar ca_mpu na vista"
+
+#: ../widgets/table/e-table-config.glade.h:13
+msgid "Show field i_n View"
+msgstr "Amosar campu _na vista"
+
+#: ../widgets/table/e-table-config.glade.h:14
+msgid "Show field in _View"
+msgstr "Amosar campu na _Vista"
+
+#: ../widgets/table/e-table-config.glade.h:15
+msgid "Sort"
+msgstr "Ordenar"
+
+#: ../widgets/table/e-table-config.glade.h:16
+msgid "Sort Items By"
+msgstr "Ordenar elementos por"
+
+#: ../widgets/table/e-table-config.glade.h:17
+msgid "Then By"
+msgstr "Llueu por"
+
+#: ../widgets/table/e-table-config.glade.h:19
+msgid "_Fields Shown..."
+msgstr "_Campos amosaos…"
+
+#: ../widgets/table/e-table-config.glade.h:20
+msgid "_Group By..."
+msgstr "_Agrupar por…"
+
+#: ../widgets/table/e-table-config.glade.h:22
+msgid "_Show field in View"
+msgstr "_Amoar campu na vista"
+
+#: ../widgets/table/e-table-config.glade.h:23
+msgid "_Show these fields in order:"
+msgstr "_Amosar estos campos n'orde:"
+
+#: ../widgets/table/e-table-config.glade.h:24
+msgid "_Sort..."
+msgstr "_Ordenar…"
+
+#: ../widgets/table/e-table-field-chooser-dialog.c:67
+#: ../widgets/table/e-table-field-chooser-item.c:633
+#: ../widgets/table/e-table-field-chooser.c:66
+#: ../widgets/table/e-table-header-item.c:1886
+msgid "DnD code"
+msgstr "Códigu DnD"
+
+#: ../widgets/table/e-table-field-chooser-dialog.c:74
+#: ../widgets/table/e-table-field-chooser-item.c:640
+#: ../widgets/table/e-table-field-chooser.c:73
+#: ../widgets/table/e-table-header-item.c:1900
+msgid "Full Header"
+msgstr "Cabecera completa"
+
+#: ../widgets/table/e-table-field-chooser-dialog.c:116
+msgid "Add a column..."
+msgstr "Amestar una columna…"
+
+#: ../widgets/table/e-table-field-chooser.glade.h:1
+msgid "Field Chooser"
+msgstr "Seleutor de campos"
+
+#: ../widgets/table/e-table-field-chooser.glade.h:2
+msgid ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:344
+#, c-format
+msgid "%s : %s (%d item)"
+msgid_plural "%s : %s (%d items)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../widgets/table/e-table-group-container.c:350
+#, c-format
+msgid "%s (%d item)"
+msgid_plural "%s (%d items)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../widgets/table/e-table-group-container.c:922
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+msgid "Alternating Row Colors"
+msgstr "Alternar colores de les fileres"
+
+#: ../widgets/table/e-table-group-container.c:929
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
+msgid "Horizontal Draw Grid"
+msgstr "Dibuxar rexella horizontal"
+
+#: ../widgets/table/e-table-group-container.c:936
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
+msgid "Vertical Draw Grid"
+msgstr "Dibuxar rexella vertical"
+
+#: ../widgets/table/e-table-group-container.c:943
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
+#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
+msgid "Draw focus"
+msgstr "Dibuxar el focu"
+
+#: ../widgets/table/e-table-group-container.c:950
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
+msgid "Cursor mode"
+msgstr "Mou del cursor"
+
+#: ../widgets/table/e-table-group-container.c:957
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+msgid "Selection model"
+msgstr "Modelu de seleición"
+
+#: ../widgets/table/e-table-group-container.c:964
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
+#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-tree.c:3338
+msgid "Length Threshold"
+msgstr "Umbral de llonxitú"
+
+#: ../widgets/table/e-table-group-container.c:971
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
+#: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-tree.c:3370
+msgid "Uniform row height"
+msgstr "Altor uniforme de la filera"
+
+#: ../widgets/table/e-table-group-container.c:978
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
+msgid "Frozen"
+msgstr "Conxeláu"
+
+#: ../widgets/table/e-table-header-item.c:1452
+msgid "Customize Current View"
+msgstr "Personalizar vista autual"
+
+#: ../widgets/table/e-table-header-item.c:1472
+msgid "Sort _Ascending"
+msgstr "Ordenar _ascendentemente"
+
+#: ../widgets/table/e-table-header-item.c:1473
+msgid "Sort _Descending"
+msgstr "Ordenar _descendentemente"
+
+#: ../widgets/table/e-table-header-item.c:1474
+msgid "_Unsort"
+msgstr "_Desordenar"
+
+#: ../widgets/table/e-table-header-item.c:1476
+msgid "Group By This _Field"
+msgstr "Agrupar por _esti campu"
+
+#: ../widgets/table/e-table-header-item.c:1477
+msgid "Group By _Box"
+msgstr "Agrupar por _caxa"
+
+#: ../widgets/table/e-table-header-item.c:1479
+msgid "Remove This _Column"
+msgstr "Quitar esta c_olumna"
+
+#: ../widgets/table/e-table-header-item.c:1480
+msgid "Add a C_olumn..."
+msgstr "Amestar una c_olumna…"
+
+#: ../widgets/table/e-table-header-item.c:1482
+msgid "A_lignment"
+msgstr "A_lliniación"
+
+#: ../widgets/table/e-table-header-item.c:1483
+msgid "B_est Fit"
+msgstr "Axust_e automáticu"
+
+#: ../widgets/table/e-table-header-item.c:1484
+msgid "Format Column_s..."
+msgstr "Formatear columne_s…"
+
+#: ../widgets/table/e-table-header-item.c:1486
+msgid "Custo_mize Current View..."
+msgstr "Perso_nalizar vista autual…"
+
+#: ../widgets/table/e-table-header-item.c:1542
+msgid "_Sort By"
+msgstr "_Ordenar por"
+
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1560
+msgid "_Custom"
+msgstr "_Personalizáu"
+
+#: ../widgets/table/e-table-header-item.c:1893
+msgid "Font Description"
+msgstr "Descripción de la tipografía"
+
+#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-sorter.c:172
+msgid "Sort Info"
+msgstr "Ordenar información"
+
+#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "�rbol"
+
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+msgid "Table header"
+msgstr "Cabecera de la tabla"
+
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
+msgid "Table model"
+msgstr "Modelu de la tabla"
+
+#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
+msgid "Cursor row"
+msgstr "Filera del cursor"
+
+#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-tree.c:3377
+msgid "Always search"
+msgstr "Guetar siempres"
+
+#: ../widgets/table/e-table.c:3347
+msgid "Use click to add"
+msgstr "Calcar p'amestar"
+
+#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
+msgid "ETree table adapter"
+msgstr "Adaptador de tabla Etree"
+
+#: ../widgets/table/e-tree.c:3383
+msgid "Retro Look"
+msgstr "Aspeutu retro"
+
+#: ../widgets/table/e-tree.c:3384
+msgid "Draw lines and +/- expanders."
+msgstr "Dibuxar llinies y expansores +/−."
+
+#: ../widgets/text/e-text.c:2736
+msgid "Input Methods"
+msgstr "Métodos d'entrada"
+
+#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
+msgid "Event Processor"
+msgstr "Procesador d'asocedimientos"
+
+#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
+msgid "Bold"
+msgstr "Negrina"
+
+#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
+msgid "Strikeout"
+msgstr "Tacháu"
+
+#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
+msgid "Anchor"
+msgstr "Anclax"
+
+#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
+msgid "Justification"
+msgstr "Xustificación"
+
+#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
+msgid "Clip Width"
+msgstr "Anchor del clip"
+
+#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
+msgid "Clip Height"
+msgstr "Altor del clip"
+
+#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
+msgid "Clip"
+msgstr "Clip"
+
+#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
+msgid "Fill clip rectangle"
+msgstr "Rellenar el reutángulu del clip"
+
+#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
+msgid "X Offset"
+msgstr "Desplazamientu en X"
+
+#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638
+msgid "Y Offset"
+msgstr "Desplazamientu en Y"
+
+#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
+msgid "Text width"
+msgstr "Anchor del testu"
+
+#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
+msgid "Text height"
+msgstr "Altor del testu"
+
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
+msgid "Use ellipsis"
+msgstr "Usar elipsis"
+
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
+msgid "Ellipsis"
+msgstr "Elipsis"
+
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
+msgid "Line wrap"
+msgstr "Axuste de llinia"
+
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
+msgid "Break characters"
+msgstr "Carauteres de ruptura"
+
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
+msgid "Max lines"
+msgstr "Llinies máximes"
+
+#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
+msgid "Draw borders"
+msgstr "Dibuxar berbesos"
+
+#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
+msgid "Allow newlines"
+msgstr "Permitir nueves llinies"
+
+#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
+msgid "Draw background"
+msgstr "Dibuxar fondu"
+
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
+msgid "Draw button"
+msgstr "Dibuxar botón"
+
+#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
+msgid "Cursor position"
+msgstr "Posición del cursor"
+
+#: ../widgets/text/e-text.c:3780 ../widgets/text/e-text.c:3781
+msgid "IM Context"
+msgstr "Contestu IM"
+
+#: ../widgets/text/e-text.c:3787 ../widgets/text/e-text.c:3788
+msgid "Handle Popup"
+msgstr "Tirador emerxente"
+
+#~ msgctxt "New"
+#~ msgid "_Contact"
+#~ msgstr "_Contautu"
+
+#~ msgctxt "New"
+#~ msgid "Contact _List"
+#~ msgstr "_Llista de contautos"
+
+#~ msgctxt "New"
+#~ msgid "Address _Book"
+#~ msgstr "Llibreta de _direiciones"
+
+#~ msgctxt "New"
+#~ msgid "_Appointment"
+#~ msgstr "_Cita"
+
+#~ msgctxt "New"
+#~ msgid "M_eeting"
+#~ msgstr "_Reunión"
+
+#~ msgctxt "New"
+#~ msgid "All Day A_ppointment"
+#~ msgstr "_Cita pa tol día"
+
+#~ msgctxt "New"
+#~ msgid "Cale_ndar"
+#~ msgstr "Cale_ndariu"
+
+#~ msgctxt "New"
+#~ msgid "Mem_o"
+#~ msgstr "_Nota"
+
+#~ msgctxt "New"
+#~ msgid "_Shared memo"
+#~ msgstr "Nota _compartida"
+
+#~ msgctxt "New"
+#~ msgid "Memo li_st"
+#~ msgstr "_Llista de notes"
+
+#~ msgctxt "New"
+#~ msgid "_Task"
+#~ msgstr "_Xera"
+
+#~ msgctxt "New"
+#~ msgid "Assigne_d Task"
+#~ msgstr "Xera _asignada"
+
+#~ msgctxt "New"
+#~ msgid "Tas_k list"
+#~ msgstr "_Llista de xeres"
+
+#~ msgid "Read and write emails"
+#~ msgstr "Lleer y escribir mensaxes"
+
+#~ msgid "A_dd Filter Criteria"
+#~ msgstr "_Amestar regla de fieltráu"
+
+#~ msgctxt "folder-display"
+#~ msgid "%s (%u)"
+#~ msgstr "%s (%u)"
+
+#~ msgctxt "New"
+#~ msgid "_Mail Message"
+#~ msgstr "_Mensax de corréu"
+
+#~ msgctxt "New"
+#~ msgid "Mail _Folder"
+#~ msgstr "_Carpeta de corréu"
+
+#~ msgid "Mark calendar offline"
+#~ msgstr "Conseñar calendariu como desconeutáu"
+
+#~ msgid "Marks the selected calendar for offline viewing."
+#~ msgstr "Conseña'l calendariu seleicionáu pa velu desconeutáu."
+
+#~ msgctxt "New"
+#~ msgid "_Test"
+#~ msgstr "_Preba"
+
+#~ msgid "Select Importers"
+#~ msgstr "Seleicionar importadores"
diff --git a/po/de.po b/po/de.po
index 27b387b8a9..b164bd5b19 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,8 +22,8 @@ msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-19 12:50+0200\n"
-"PO-Revision-Date: 2008-09-19 13:14+0200\n"
-"Last-Translator: Hendrik Richter <hendrikr@gnome.org>\n"
+"PO-Revision-Date: 2008-10-23 13:21+0200\n"
+"Last-Translator: Philipp Kerling <k.philipp@gmail.com>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14452,7 +14452,7 @@ msgstr "Aus diesem Konto ausgehende Nachrichten _immer signieren"
 #: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr ""
-"Beim Verschicken verschlüsselter E-Mails auch zu sich sel_bst verschlüsseln"
+"Beim Verschicken verschlüsselter E-Mails auch für sich sel_bst verschlüsseln"
 
 #: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
@@ -14469,7 +14469,7 @@ msgstr "Schlüssel am Schlüsselbund beim Verschlüsseln _immer vertrauen"
 #: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr ""
-"Beim Verschicken verschlüsselter E-Mails _immer vor mir selbst verschlüsseln"
+"Beim Verschicken verschlüsselter E-Mails _immer für mich selbst verschlüsseln"
 
 #: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
diff --git a/po/es.po b/po/es.po
index b0e52ced47..b15de93db3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-06 16:13+0000\n"
-"PO-Revision-Date: 2008-09-17 15:09+0200\n"
+"POT-Creation-Date: 2008-10-14 03:09+0000\n"
+"PO-Revision-Date: 2008-10-17 14:38+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -27,21 +27,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution address book"
 msgstr "libreta de direcciones de Evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "Contacto nuevo"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "Lista de contactos nueva"
 
-#: ../a11y/addressbook/ea-minicard-view.c:161
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -158,7 +158,7 @@ msgid "calendar view for one or more days"
 msgstr "vista de calendario para uno o más días"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:784
 msgid "%A %d %b %Y"
 msgstr "%A, %e de %b de %Y"
 
@@ -169,8 +169,8 @@ msgstr "%A, %e de %b de %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1568
+#: ../calendar/gui/calendar-component.c:787
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1577
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a, %e de %b"
@@ -178,9 +178,9 @@ msgstr "%a, %e de %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:762
-#: ../calendar/gui/calendar-component.c:767
-#: ../calendar/gui/calendar-component.c:769
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%a %d %b %Y"
 msgstr "%a, %e de %b de %Y"
 
@@ -188,10 +188,10 @@ msgstr "%a, %e de %b de %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:788
-#: ../calendar/gui/calendar-component.c:794
-#: ../calendar/gui/calendar-component.c:796
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:815
+#: ../calendar/gui/calendar-component.c:821
+#: ../calendar/gui/calendar-component.c:823
 msgid "%d %b %Y"
 msgstr "%e de %B de %Y"
 
@@ -201,15 +201,15 @@ msgstr "%e de %B de %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1584
+#: ../calendar/gui/calendar-component.c:813
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1593
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%e de %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:766
+#: ../calendar/importers/icalendar-importer.c:768
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
@@ -256,11 +256,11 @@ msgstr "emergente"
 msgid "popup a child"
 msgstr "emerger un descendiente"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
 msgid "edit"
 msgstr "editar"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
 msgid "begin editing this cell"
 msgstr "empezar a editar esta celda"
 
@@ -273,19 +273,19 @@ msgstr "cambiar"
 msgid "toggle the cell"
 msgstr "cambiar la celda"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "expandir"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
 msgid "expands the row in the ETree containing this cell"
 msgstr "expande la fila en el ETree que contiene esta celda"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr "contraer"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
 msgid "collapses the row in the ETree containing this cell"
 msgstr "contrae la fila en el ETree que contiene esta celda"
 
@@ -436,6 +436,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "El servidor LDAP no respondió con una información del esquema válida."
 
 #: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:50
 msgid "Server Version"
 msgstr "Versión del servidor"
 
@@ -611,9 +612,9 @@ msgstr "Configure el autocompletado aquí"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../addressbook/gui/component/addressbook-view.c:1325
 #: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "Contactos"
@@ -652,15 +653,15 @@ msgstr "Gestione sus certificados S/MIME aquí"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../addressbook/gui/component/addressbook-component.c:143
+#: ../addressbook/gui/component/addressbook-migrate.c:500
 #: ../calendar/gui/calendar-component.c:236
 #: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
 #: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
-#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1457
+#: ../mail/mail-component.c:311 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1518
 msgid "On This Computer"
 msgstr "En este equipo"
 
@@ -669,9 +670,9 @@ msgstr "En este equipo"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/component/addressbook-component.c:151
+#: ../addressbook/gui/component/addressbook-migrate.c:508
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
 #: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
@@ -682,126 +683,126 @@ msgid "Personal"
 msgstr "Privado"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:163
-#: ../addressbook/gui/component/addressbook-migrate.c:517
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "En servidores LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ../addressbook/gui/component/addressbook-component.c:231
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "Crea un contacto nuevo"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_Lista de contactos"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "Crea una lista de contactos nueva"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-#: ../addressbook/gui/component/addressbook-config.c:1207
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "Libreta de direcciones nueva"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Libreta de _direcciones"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "Crea una libreta de direcciones nueva"
 
-#: ../addressbook/gui/component/addressbook-component.c:410
+#: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Falló al actualizar la configuración de la libreta o las carpetas."
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:332
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../addressbook/gui/component/addressbook-config.c:533
 #: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../addressbook/gui/component/addressbook-config.c:619
+#: ../addressbook/gui/component/addressbook-config.c:635
 msgid "Copy _book content locally for offline operation"
 msgstr "Copiar la li_breta localmente para trabajar desconectado"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/component/addressbook-config.c:998
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 #: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2367
+#: ../plugins/itip-formatter/itip-formatter.c:2439
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "General"
 
-#: ../addressbook/gui/component/addressbook-config.c:983
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
-#: ../mail/importers/pine-importer.c:385
+#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
-#: ../addressbook/gui/component/addressbook-config.c:987
+#: ../addressbook/gui/component/addressbook-config.c:1003
 msgid "Server Information"
 msgstr "Información del servidor"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:1005
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/addressbook-config.c:1008
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalles"
 
-#: ../addressbook/gui/component/addressbook-config.c:993
-#: ../mail/em-folder-browser.c:983
+#: ../addressbook/gui/component/addressbook-config.c:1009
+#: ../mail/em-folder-browser.c:985
 msgid "Searching"
 msgstr "Búsqueda"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
+#: ../addressbook/gui/component/addressbook-config.c:1011
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-config.c:1221
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Propiedades de la libreta de direcciones"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../addressbook/gui/component/addressbook-migrate.c:74
 #: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Migrando…"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../addressbook/gui/component/addressbook-migrate.c:126
 #: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Migrando «%s»:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:645
+#: ../addressbook/gui/component/addressbook-migrate.c:646
 msgid "LDAP Servers"
 msgstr "Servidores LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:760
+#: ../addressbook/gui/component/addressbook-migrate.c:761
 msgid "Autocompletion Settings"
 msgstr "Configuración de autocompletado"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -813,7 +814,7 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas…"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
+#: ../addressbook/gui/component/addressbook-migrate.c:1151
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -823,7 +824,7 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas…"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
+#: ../addressbook/gui/component/addressbook-migrate.c:1160
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -833,7 +834,7 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas…"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
+#: ../addressbook/gui/component/addressbook-migrate.c:1170
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -844,36 +845,36 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus datos Pilot Sync…"
 
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:501
+#: ../addressbook/gui/component/addressbook-view.c:424
+#: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renombrar la carpeta «%s» a:"
 
-#: ../addressbook/gui/component/addressbook-view.c:428
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:427
+#: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
 msgstr "Renombrar carpeta"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:509
+#: ../addressbook/gui/component/addressbook-view.c:432
+#: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
 msgstr "Los nombres de carpetas no pueden contener el carácter «/»"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:941
 msgid "_New Address Book"
 msgstr "Libreta de direcciones _nueva"
 
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "Save As vCard..."
 msgstr "Guardar como vCard…"
 
-#: ../addressbook/gui/component/addressbook-view.c:946
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:619
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
+#: ../addressbook/gui/component/addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/calendar-component.c:644
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1692 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/memos-component.c:493 ../calendar/gui/tasks-component.c:484
 #: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
@@ -881,16 +882,16 @@ msgstr "Guardar como vCard…"
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: ../addressbook/gui/component/addressbook-view.c:949
-#: ../calendar/gui/calendar-component.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:2035
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1046 ../mail/em-folder-tree.c:2120
+#: ../addressbook/gui/component/addressbook-view.c:948
+#: ../calendar/gui/calendar-component.c:649
+#: ../calendar/gui/dialogs/comp-editor.c:2039
+#: ../calendar/gui/memos-component.c:498 ../calendar/gui/tasks-component.c:489
+#: ../composer/e-msg-composer.c:1041 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1336
 msgid "Contact Source Selector"
 msgstr "Selector de origen de contactos"
 
@@ -912,7 +913,7 @@ msgstr "Introduzca la contraseña para %s (usuario %s)"
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
 #: ../plugins/google-account-setup/google-source.c:444
-#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../plugins/publish-calendar/publish-calendar.c:191
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Introduzca contraseña"
@@ -938,10 +939,14 @@ msgstr ""
 "y el panel de vista previa, en píxeles."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr "Mostrar el nombre autocompletado con la dirección"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "Mostrar el panel de vista previa"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -949,24 +954,32 @@ msgstr ""
 "El número de caracteres que deben teclearse antes de que Evolution intente "
 "autocompletar."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 "URI para la carpeta usada por última vez en el diálogo de selección de "
 "nombres"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 msgid "URI for the folder last used in the select names dialog."
 msgstr ""
 "URI para la carpeta usada por última vez en el diálogo de selección de "
 "nombres."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
 msgstr "Posición del panel vertical"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+"Indica si se debe forzar el mostrado de la dirección de corre-e con el "
+"nombre autocompletado del contacto en la entrada."
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
 msgid "Whether to show the preview pane."
 msgstr "Indica si se muestra el panel de vista previa."
 
@@ -1011,7 +1024,7 @@ msgid "Add Address Book"
 msgstr "Añade una libreta de direcciones"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:760
 msgid "Always"
 msgstr "Siempre"
 
@@ -1051,14 +1064,14 @@ msgid "Lo_gin:"
 msgstr "_Inicio de sesión:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:759
 msgid "Never"
 msgstr "Nunca"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:288
+#: ../mail/em-account-editor.c:287
 msgid "No encryption"
 msgstr "Sin cifrado"
 
@@ -1070,7 +1083,7 @@ msgstr "Uno"
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:296
+#: ../mail/em-account-editor.c:295
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
@@ -1138,7 +1151,7 @@ msgstr "Bases de búsqueda soportadas"
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:292
+#: ../mail/em-account-editor.c:291
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
@@ -1166,10 +1179,10 @@ msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
-"Este es el nombre completo del servidor LDAP. Por ejemplo, «ldap.micompañia."
+"Este es el nombre completo del servidor LDAP. Por ejemplo, «ldap.miempresa."
 "com»."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:42
@@ -1181,9 +1194,10 @@ msgstr ""
 "demasiado alto ralentizará su libreta de direcciones."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
+#, fuzzy
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
+"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 "
@@ -1238,7 +1252,7 @@ msgstr "Método de _inicio de sesión:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:177
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1253,7 +1267,7 @@ msgid "_Search scope:"
 msgstr "�_mbito de búsqueda:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:186
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Servidor:"
@@ -1318,7 +1332,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Trabajo</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1330,16 +1344,16 @@ msgid "Ca_tegories..."
 msgstr "Ca_tegorías…"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/widgets/e-minicard.c:199
 msgid "Contact"
 msgstr "Contacto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2421
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -1366,132 +1380,136 @@ msgstr "Apo_do:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+msgid "Novell GroupWise"
+msgstr "Novell GroupWise"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "Teléfono"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
 #: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Trabajo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Dirección:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "_Aniversario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "_Secretaría:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "_Cumpleaños:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:787
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../calendar/gui/dialogs/event-page.c:791
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1868
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_Ciudad:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Empresa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_País:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "A_rchivar como:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_Disponibilidad:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "_Página personal:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Jefe:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Notas:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_Apdo. de correos:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Profesión:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "_Cónyuge:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Tratamiento:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Charla por vídeo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_Quiere recibir el correo como HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Diario web:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Dónde:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_Código postal:"
 
@@ -1504,16 +1522,16 @@ msgstr "Dirección"
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:292
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-label.c:165
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
 #: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../addressbook/gui/widgets/e-minicard.c:192
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3687
 #: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "Editable"
@@ -2487,13 +2505,13 @@ msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
-#: ../mail/em-mailer-prefs.c:466
+#: ../mail/em-mailer-prefs.c:467
 #: ../plugins/exchange-operations/exchange-delegates.c:954
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
 #: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:350
+#: ../plugins/save-attachments/save-attachments.c:351
 #: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Nombre"
@@ -2503,7 +2521,7 @@ msgid "AOL Instant Messenger"
 msgstr "Mensajería AOL"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
@@ -2517,7 +2535,7 @@ msgid "Gadu-Gadu Messenger"
 msgstr "Mensajería Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
@@ -2529,8 +2547,8 @@ msgstr "Servicio"
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
 #: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:693
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/publish-calendar/publish-calendar.c:694
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Lugar"
 
@@ -2539,77 +2557,77 @@ msgid "Username"
 msgstr "Usuario"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Domicilio"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Otro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Source Book"
 msgstr "Libro origen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Target Book"
 msgstr "Libro destino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
 msgid "Is New Contact"
 msgstr "Es un contacto nuevo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Writable Fields"
 msgstr "Campos editables"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Required Fields"
 msgstr "Campos requeridos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Modificados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2416
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactos: %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "Please select an image for this contact"
 msgstr "Seleccione una imagen para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "_No image"
 msgstr "_Sin imagen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2617,47 +2635,47 @@ msgstr ""
 "Los datos del contacto son inválidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3090
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» tiene un formato inválido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» tiene un formato inválido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» está vacío"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3138
 msgid "Invalid contact."
 msgstr "Contacto inválido."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "Contact Quick-Add"
 msgstr "Añadir contacto rápido"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
 msgid "_Edit Full"
 msgstr "_Editar todo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:402
 msgid "_Full name"
 msgstr "Nombre _completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:413
 msgid "E_mail"
 msgstr "_Correo-e"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:424
 msgid "_Select Address Book"
 msgstr "_Seleccione la libreta de direcciones"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2666,7 +2684,7 @@ msgstr ""
 "¿Seguro que quiere\n"
 "borrar la lista de contactos (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:324
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2674,7 +2692,7 @@ msgstr ""
 "¿Seguro que quiere\n"
 "borrar estas listas de contactos?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2683,7 +2701,7 @@ msgstr ""
 "¿Seguro que quiere\n"
 "borrar el contacto (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:332
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2791,8 +2809,8 @@ msgstr "Servicio de _MI:"
 #: ../addressbook/gui/contact-editor/im.glade.h:4
 #: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:243
-#: ../plugins/exchange-operations/exchange-contacts.c:234
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
 msgid "_Location:"
 msgstr "_Lugar:"
 
@@ -2832,9 +2850,9 @@ msgid "_Members"
 msgstr "_Miembros"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:298
+#: ../addressbook/gui/widgets/e-addressbook-model.c:311
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
 #: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
@@ -2896,19 +2914,19 @@ msgstr "Combinar contacto"
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
 #: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "Correo-e"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
-#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:3
 #: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "El correo-e empieza por"
 
@@ -2916,34 +2934,34 @@ msgstr "El correo-e empieza por"
 msgid "Name contains"
 msgstr "El nombre contiene"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "Sin contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contacto"
 msgstr[1] "%d contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-model.c:318
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
 #: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Consulta"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "Error al obtener la vista de libro"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
 #: ../widgets/table/e-table-click-to-add.c:509
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3353
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/table/e-table.c:3354
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "Modelo"
@@ -2952,15 +2970,15 @@ msgstr "Modelo"
 msgid "Error modifying card"
 msgstr "Error al modificar la tarjeta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Name begins with"
 msgstr "El nombre empieza por"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "Fuente"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-meeting-list-view.c:508
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
@@ -2968,87 +2986,87 @@ msgstr "Fuente"
 msgid "Type"
 msgstr "Tipo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Guardar como vCard…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/e-calendar-table.c:1574
-#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../calendar/gui/e-calendar-table.c:1573
+#: ../calendar/gui/e-calendar-view.c:1670 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "Contacto _nuevo…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "_Lista de contactos nueva…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "G_uardar como vCard…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "_Reenviar contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "_Reenviar contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "Enviar un _mensaje al contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "Enviar un _mensaje a la lista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "Enviar un _mensaje a los contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "Im_primir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "_Copiar a la libreta de direcciones…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "Mo_ver a la libreta de direcciones…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:480
-#: ../calendar/gui/e-calendar-table.c:1582
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2057 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:484
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
+#: ../composer/e-msg-composer.c:2052 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2106
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "_Pegar"
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1524
-#: ../calendar/gui/cal-search-bar.c:625 ../calendar/gui/cal-search-bar.c:668
-#: ../calendar/gui/cal-search-bar.c:687
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Any Category"
 msgstr "Cualquier categoría"
 
@@ -3221,55 +3239,55 @@ msgstr "Unidad"
 msgid "Web Site"
 msgstr "Sitio web"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../addressbook/gui/widgets/e-minicard-label.c:116
+#: ../addressbook/gui/widgets/e-minicard.c:155
 #: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
 #: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-col.c:99
-#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-field-chooser-item.c:654
 #: ../widgets/table/e-table-group-container.c:992
 #: ../widgets/table/e-table-group-container.c:993
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
+#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
 #: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Anchura"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../addressbook/gui/widgets/e-minicard-label.c:123
+#: ../addressbook/gui/widgets/e-minicard.c:162
 #: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
 #: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../widgets/table/e-table-field-chooser-item.c:661
 #: ../widgets/table/e-table-group-container.c:985
 #: ../widgets/table/e-table-group-container.c:986
 #: ../widgets/table/e-table-group-leaf.c:630
 #: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
+#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
 #: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Altura"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
+#: ../addressbook/gui/widgets/e-minicard-label.c:130
+#: ../addressbook/gui/widgets/e-minicard.c:170
 msgid "Has Focus"
 msgstr "Tiene el foco"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:137
 msgid "Field"
 msgstr "Campo"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:144
 msgid "Field Name"
 msgstr "Nombre del campo"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:151
 msgid "Text Model"
 msgstr "Modelo del texto"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:158
 msgid "Max field name length"
 msgstr "Longitud máx. del campo"
 
@@ -3339,24 +3357,24 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adaptador"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "Correo-e de trabajo"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "Correo-e de casa"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:830
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:831
 msgid "Other Email"
 msgstr "Otro correo-e"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
+#: ../addressbook/gui/widgets/e-minicard.c:178
 msgid "Selected"
 msgstr "Seleccionado"
 
-#: ../addressbook/gui/widgets/e-minicard.c:184
+#: ../addressbook/gui/widgets/e-minicard.c:185
 msgid "Has Cursor"
 msgstr "Tiene el cursor"
 
@@ -3413,9 +3431,9 @@ msgstr "Charla por vídeo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/gnome-cal.c:2451
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
@@ -3450,13 +3468,13 @@ msgid "Web Log"
 msgstr "Diario web"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2342
 #: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Cumpleaños"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2343
 #: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Aniversario"
@@ -3474,113 +3492,113 @@ msgid "Blog"
 msgstr "Diario web"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "Éxito"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "Backend ocupado"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "La libreta de direcciones no existe"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
 msgstr "No hay definido un contacto para sí mismo"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "Contacto no encontrado"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "Ya existe el ID del contacto"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "Protocolo no implementado"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:240
-#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
+#: ../calendar/gui/e-cal-model-tasks.c:364
+#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-calendar-table.c:239
+#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/print.c:2557
 msgid "Canceled"
 msgstr "Cancelado"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "No es posible cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../calendar/gui/comp-editor-factory.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Failed"
 msgstr "Falló en la autenticación"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Authentication Required"
 msgstr "Autenticación requerida"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "TLS no disponible"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "No existe ese origen"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
 msgstr "No disponible en modo desconectado"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Other error"
 msgstr "Otro error"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
 msgstr "Versión del servidor inválida"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 msgid "Unsupported authentication method"
 msgstr "Método de autenticación no soportado"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "We were unable to open this address book. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3591,7 +3609,7 @@ msgstr ""
 "uso desconectado. Por favor, cargue la libreta de direcciones una vez en "
 "modo conectado para descargar su contenido"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
 msgid ""
 "We were unable to open this address book.  Please check that the path %s "
@@ -3600,7 +3618,7 @@ msgstr ""
 "No es posible abrir esta libreta de direcciones. Compruebe que la ruta %s "
 "exista y que tenga permisos para acceder a ella."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid ""
 "We were unable to open this address book.  This either means you have "
 "entered an incorrect URI, or the LDAP server is unreachable."
@@ -3608,7 +3626,7 @@ msgstr ""
 "No es posible abrir esta libreta de direcciones.  Esto significa que ha "
 "introducido una URI errónea, o que el servidor LDAP es inaccesible."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:130
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3618,7 +3636,7 @@ msgstr ""
 "usar LDAP en Evolution debe instalar un paquete de Evolution con LDAP "
 "activado."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:141
 msgid ""
 "We were unable to open this address book.  This either means you have "
 "entered an incorrect URI, or the server is unreachable."
@@ -3626,11 +3644,11 @@ msgstr ""
 "No es posible abrir esta libreta de direcciones. Esto significa que ha "
 "introducido una URI errónea, o que el servidor LDAP es inaccesible."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:143
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
 msgid "Detailed error:"
 msgstr "Detalle del error:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3643,7 +3661,7 @@ msgstr ""
 "aumente el límite de resultados en las preferencias del servidor\n"
 "de directorios para esta libreta de direcciones."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this address book.  Please make your search\n"
@@ -3656,47 +3674,47 @@ msgstr ""
 "tiempo en las opciones del servidor de directorios para esta libreta\n"
 " de direcciones."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "The backend for this address book was unable to parse this query."
 msgstr ""
 "El backend de esta libreta de direcciones no pudo analizar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:181
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
 msgid "The backend for this address book refused to perform this query."
 msgstr ""
 "El backend para esta libreta de direcciones rehusó a efectuar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:190
 msgid "This query did not complete successfully."
 msgstr "Esta consulta no se completó con éxito."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error adding list"
 msgstr "Error al añadir la lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:206
-#: ../addressbook/gui/widgets/eab-gui-util.c:682
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:688
 msgid "Error adding contact"
 msgstr "Error al añadir el contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying list"
 msgstr "Error al modificar la lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying contact"
 msgstr "Error al modificar el contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
 msgid "Error removing list"
 msgstr "Error al eliminar la lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:229
-#: ../addressbook/gui/widgets/eab-gui-util.c:632
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:638
 msgid "Error removing contact"
 msgstr "Error al eliminar el contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:311
+#: ../addressbook/gui/widgets/eab-gui-util.c:317
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3711,16 +3729,16 @@ msgstr[1] ""
 "Abrir %d contactos abrirá %d ventanas nuevas también.\n"
 "¿Quiere realmente mostrar todos estos contactos?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "_Don't Display"
 msgstr "_No mostrar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:320
+#: ../addressbook/gui/widgets/eab-gui-util.c:326
 msgid "Display _All Contacts"
 msgstr "Mostrar t_odos los contactos"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:346
+#: ../addressbook/gui/widgets/eab-gui-util.c:352
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3729,65 +3747,65 @@ msgstr ""
 "%s ya existe\n"
 "¿Quiere sobreescribirlo?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:350
+#: ../addressbook/gui/widgets/eab-gui-util.c:356
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:391
-#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
+#: ../addressbook/gui/widgets/eab-gui-util.c:400
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contacto"
 msgstr[1] "contactos"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:440
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "card.vcf"
 msgstr "tarjeta.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:477
+#: ../addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Select Address Book"
 msgstr "Seleccione la libreta de direcciones"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:591
+#: ../addressbook/gui/widgets/eab-gui-util.c:597
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:743
+#: ../addressbook/gui/widgets/eab-gui-util.c:749
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:745
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:754
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:895
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
 msgid "Multiple vCards"
 msgstr "vCards múltiples"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard para %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:914
-#: ../addressbook/gui/widgets/eab-gui-util.c:940
+#: ../addressbook/gui/widgets/eab-gui-util.c:921
+#: ../addressbook/gui/widgets/eab-gui-util.c:947
 #, c-format
 msgid "Contact information"
 msgstr "Información de contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:942
+#: ../addressbook/gui/widgets/eab-gui-util.c:949
 #, c-format
 msgid "Contact information for %s"
 msgstr "Información de contacto de %s"
@@ -3796,23 +3814,23 @@ msgstr "Información de contacto de %s"
 msgid "Querying Address Book..."
 msgstr "Consultando la libreta de direcciones…"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Hay otro contacto más."
 msgstr[1] "Hay otros %d contactos."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Show Full vCard"
 msgstr "Mostrar vCard completa"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 msgid "Show Compact vCard"
 msgstr "Mostrar vCard compacta"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
 msgid "Save in address book"
 msgstr "Guardar en la libreta de direcciones"
 
@@ -3821,10 +3839,10 @@ msgid "Card View"
 msgstr "Vista de la tarjeta"
 
 #: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:498
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:306
-#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../calendar/importers/icalendar-importer.c:308
+#: ../calendar/importers/icalendar-importer.c:673 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Importando…"
 
@@ -3852,19 +3870,19 @@ msgstr "VSC o Tab de Evolution (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importador de VSC y Tab de Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:665
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de intercambio de datos LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:681
 msgid "Evolution LDIF importer"
 msgstr "Importador de LDIF de Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:550
 msgid "Evolution vCard Importer"
 msgstr "Importador de vCard de Evolution"
 
@@ -3909,11 +3927,11 @@ msgid "Format"
 msgstr "Formato"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:502
+#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:648
-#: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-field-chooser-item.c:647
+#: ../widgets/table/e-table-field-chooser.c:80
+#: ../widgets/table/e-table-header-item.c:1907
 #: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Cabecera"
@@ -4016,9 +4034,9 @@ msgstr "Escala de grises"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1069
-#: ../plugins/exchange-operations/exchange-calendar.c:232
-#: ../plugins/exchange-operations/exchange-contacts.c:217
+#: ../plugins/exchange-operations/exchange-account-setup.c:1080
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
 msgid "Size:"
 msgstr "Tamaño:"
 
@@ -4082,31 +4100,31 @@ msgstr "No se pudo obtener una lista de libretas de direcciones"
 msgid "failed to open book"
 msgstr "falló al abrir libreta de direcciones"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:48
 msgid "Specify the output file instead of standard output"
 msgstr "Especifique el archivo de salida en lugar del la salida estándar"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:50
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "OUTPUTFILE"
 msgstr "ARCHIVO-DE-SALIDA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "List local address book folders"
 msgstr "Listar las carpetas de libretas de direcciones locales"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "Show cards as vcard or csv file"
 msgstr "Mostrar tarjetas como un archivo vcard o csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Export in asynchronous mode"
 msgstr "Exportar en modo asíncrono"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -4114,30 +4132,30 @@ msgstr ""
 "El número de tarjetas en un archivo de salida en modo asíncrono, tamaño "
 "predeterminado 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "NUMBER"
 msgstr "NÚMERO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:102
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 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."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "Sólo se soportan los los formatos csv o vcard."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 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:133
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 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:164
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "Error no tratado"
 
@@ -4245,19 +4263,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "¿Seguro que quiere borrar esta cita?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:178
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "¿Seguro que quiere borrar esta reunión?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:184
+#: ../calendar/gui/dialogs/delete-comp.c:188
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "¿Seguro que quiere borrar esta nota?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:181
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "¿Seguro que quiere borrar esta tarea?"
@@ -4362,6 +4380,18 @@ msgstr ""
 "no sepan que la tarea ha sido borrada."
 
 #: ../calendar/calendar.error.xml.h:45
+msgid "Save Appointment"
+msgstr "Guardar cita"
+
+#: ../calendar/calendar.error.xml.h:46
+msgid "Save Memo"
+msgstr "Guardar nota"
+
+#: ../calendar/calendar.error.xml.h:47
+msgid "Save Task"
+msgstr "Guardar tarea"
+
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4369,7 +4399,7 @@ msgstr ""
 "Al enviar información actualizada permite que otros participantes mantengan "
 "sus calendarios al día."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4377,7 +4407,7 @@ msgstr ""
 "El envío de información actualizada permite que otros participantes "
 "mantengan su lista de tareas al día."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4385,7 +4415,7 @@ msgstr ""
 "Hay algunos adjuntos descargándose. Guardar la cita podría resultar en la "
 "pérdida de esos adjuntos."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4393,88 +4423,88 @@ msgstr ""
 "Hay algunos adjuntos descargándose. Guardar la tarea podría resultar en la "
 "pérdida de esos adjuntos."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:53
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Algunas características quizá no funcionen correctamente con su servidor "
 "actual."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "El calendario de Evolution ha terminado inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Las notas de Evolution han terminado inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Las tareas de Evolution han terminado inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 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:54
+#: ../calendar/calendar.error.xml.h:58
 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:55
+#: ../calendar/calendar.error.xml.h:59
 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:56
+#: ../calendar/calendar.error.xml.h:60
 msgid "This calendar will be removed permanently."
 msgstr "Este calendario se eliminará permanentemente."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:61
 msgid "This memo list will be removed permanently."
 msgstr "Esta lista de notas se eliminará permanentemente."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:62
 msgid "This task list will be removed permanently."
 msgstr "Esta lista de tareas se eliminará permanentemente."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this appointment?"
 msgstr "¿Desea guardar los cambios de esta cita?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "¿Desea guardar los cambios de esta nota?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "¿Desea guardar los cambios de esta tarea?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:66
 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:63
+#: ../calendar/calendar.error.xml.h:67
 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?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:68
 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:65
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "¿Quiere enviar esta tarea a los participantes?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 "¿Quiere enviar información de la reunión actualizada a los participantes?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 "¿Quiere enviar información actualizada de las tareas a los participantes?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:72
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4484,54 +4514,54 @@ msgstr ""
 "problemas usando Evolution. Para los mejores resultados el servidor debería "
 "actualizarse a una versión soportada."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:73
 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:70
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "Ha realizado cambios a esta tarea, pero no la ha guardado aún."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Ha realizado cambios a esta nota, pero no los ha guardado aún."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:76
 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:73
+#: ../calendar/calendar.error.xml.h:77
 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:74
+#: ../calendar/calendar.error.xml.h:78
 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:75
+#: ../calendar/calendar.error.xml.h:79
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Descartar cambios"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_Guardar"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "_Guardar cambios"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:82
 #: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "_Enviar notificación"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:84
 msgid "{0}."
 msgstr "{0}."
 
@@ -4579,13 +4609,13 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "No es posible escribir el bloque de aplicación ToDo del Pilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2430
 msgid "Calendar and Tasks"
 msgstr "Calendario y tareas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:805
-#: ../calendar/gui/calendar-component.c:1402
+#: ../calendar/gui/calendar-component.c:832
+#: ../calendar/gui/calendar-component.c:1429
 msgid "Calendars"
 msgstr "Calendarios"
 
@@ -4626,22 +4656,22 @@ msgid "Memo_s"
 msgstr "_Notas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:354
+#: ../calendar/gui/e-memo-table.c:279 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:575
+#: ../calendar/gui/memos-component.c:1128 ../calendar/gui/memos-control.c:354
 #: ../calendar/gui/memos-control.c:370
 msgid "Memos"
 msgstr "Notas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1982
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/e-calendar-table.c:703 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1984
+#: ../calendar/gui/tasks-component.c:566
+#: ../calendar/gui/tasks-component.c:1117 ../calendar/gui/tasks-control.c:492
 #: ../calendar/gui/tasks-control.c:508
-#: ../calendar/importers/icalendar-importer.c:74
-#: ../calendar/importers/icalendar-importer.c:735
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:737
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:588
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
@@ -4692,8 +4722,8 @@ msgstr "Citas"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1603
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1609
 #: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
@@ -4704,9 +4734,9 @@ msgid "Snooze _time:"
 msgstr "_Posponer durante:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+#: ../calendar/gui/dialogs/comp-editor.c:1336
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:169
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
@@ -4724,32 +4754,32 @@ msgstr "_Posponer"
 msgid "location of appointment"
 msgstr "lugar de la cita"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1461
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
 msgid "No summary available."
 msgstr "No hay resumen disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
 msgid "No description available."
 msgstr "No hay descripción disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1480
 msgid "No location information available."
 msgstr "No hay información del lugar disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1525
 #, c-format
 msgid "You have %d alarms"
 msgstr "Tiene %d alertas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
+#: ../mail/mail-component.c:1596
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1691
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4761,7 +4791,7 @@ msgstr ""
 "configurado para enviar un mensaje de correo-e.  En su lugar\n"
 "Evolution mostrará un diálogo de recordatorio normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1721
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4778,15 +4808,15 @@ msgstr ""
 "\n"
 "¿Está seguro que quiere ejecutar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
 msgid "Do not ask me about this program again."
 msgstr "No preguntar otra vez sobre este programa."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:138
+#: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
 msgstr "No es posible inicializar Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:154
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4799,7 +4829,7 @@ msgid "invalid time"
 msgstr "hora inválida"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -4808,7 +4838,7 @@ msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -4819,7 +4849,7 @@ 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")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -5137,7 +5167,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "La hora en que la última alerta sonó, en time_t."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:107
+#: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Zona horaria "
 
@@ -5295,56 +5325,56 @@ msgstr "Minuto de comienzo de la jornada laboral"
 msgid "daylight savings time"
 msgstr "Hora de verano"
 
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "El resumen contiene"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "La descripción contiene"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "Categoría es"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "El comentario contiene"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
 msgid "Location contains"
 msgstr "El lugar contiene"
 
-#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
+#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
 msgid "Unmatched"
 msgstr "No coincidente"
 
-#: ../calendar/gui/cal-search-bar.c:637
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Next 7 Days' Tasks"
 msgstr "Tareas de los próximos 7 días"
 
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Active Tasks"
 msgstr "Tareas activas"
 
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Overdue Tasks"
 msgstr "Tareas fuera de plazo"
 
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Completed Tasks"
 msgstr "Tareas completadas"
 
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:656
 msgid "Tasks with Attachments"
 msgstr "Tareas con adjuntos"
 
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:706
 msgid "Next 7 Days' Appointments"
 msgstr "Citas de los próximos 7 días"
 
@@ -5399,83 +5429,93 @@ msgstr "Cumpleaños y aniversarios"
 msgid "Weather"
 msgstr "Meteorología"
 
-#: ../calendar/gui/calendar-component.c:615
+#: ../calendar/gui/calendar-component.c:640
 msgid "_New Calendar"
 msgstr "Calendario _nuevo"
 
-#: ../calendar/gui/calendar-component.c:616
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
+#: ../calendar/gui/calendar-component.c:641
+#: ../calendar/gui/memos-component.c:490 ../calendar/gui/tasks-component.c:481
 #: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Copiar…"
 
-#: ../calendar/gui/calendar-component.c:949
+#: ../calendar/gui/calendar-component.c:645
+#: ../calendar/gui/memos-component.c:494 ../calendar/gui/tasks-component.c:485
+msgid "_Make available for offline use"
+msgstr "_Hacer esto disponible para su uso desconectado"
+
+#: ../calendar/gui/calendar-component.c:646
+#: ../calendar/gui/memos-component.c:495 ../calendar/gui/tasks-component.c:486
+msgid "_Do not make available for offline use"
+msgstr "_No hacer esto disponible sin conexión"
+
+#: ../calendar/gui/calendar-component.c:976
 msgid "Failed upgrading calendars."
 msgstr "Falló al actualizar calendarios."
 
-#: ../calendar/gui/calendar-component.c:1248
+#: ../calendar/gui/calendar-component.c:1275
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "No es posible abrir el calendario «%s» para crear acontecimientos y reuniones"
 
-#: ../calendar/gui/calendar-component.c:1264
+#: ../calendar/gui/calendar-component.c:1291
 msgid "There is no calendar available for creating events and meetings"
 msgstr "No hay un calendario disponible para crear acontecimientos y reuniones"
 
-#: ../calendar/gui/calendar-component.c:1377
+#: ../calendar/gui/calendar-component.c:1404
 msgid "Calendar Source Selector"
 msgstr "Selector de origen del calendario"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1623
 msgid "New appointment"
 msgstr "Cita nueva"
 
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1624
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: ../calendar/gui/calendar-component.c:1598
+#: ../calendar/gui/calendar-component.c:1625
 msgid "Create a new appointment"
 msgstr "Crea una cita nueva"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1631
 msgid "New meeting"
 msgstr "Reunión nueva"
 
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1632
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Reunión"
 
-#: ../calendar/gui/calendar-component.c:1606
+#: ../calendar/gui/calendar-component.c:1633
 msgid "Create a new meeting request"
 msgstr "Crea una solicitud de reunión nueva"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1639
 msgid "New all day appointment"
 msgstr "Cita nueva para todo el día"
 
-#: ../calendar/gui/calendar-component.c:1613
+#: ../calendar/gui/calendar-component.c:1640
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Cita para todo el _día"
 
-#: ../calendar/gui/calendar-component.c:1614
+#: ../calendar/gui/calendar-component.c:1641
 msgid "Create a new all-day appointment"
 msgstr "Crea una cita nueva para todo el día"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1647
 msgid "New calendar"
 msgstr "Calendario nuevo"
 
-#: ../calendar/gui/calendar-component.c:1621
+#: ../calendar/gui/calendar-component.c:1648
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../calendar/gui/calendar-component.c:1622
+#: ../calendar/gui/calendar-component.c:1649
 msgid "Create a new calendar"
 msgstr "Crea un calendario nuevo"
 
@@ -5501,7 +5541,7 @@ msgid "Any Field"
 msgstr "Cualquier campo"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:21
 msgid "Attachments"
 msgstr "Adjuntos"
 
@@ -5532,7 +5572,7 @@ msgid "Competition"
 msgstr "Completado"
 
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:250
-#: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-calendar-table.c:547
+#: ../calendar/gui/e-cal-model.c:348 ../calendar/gui/e-calendar-table.c:546
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Confidential"
 msgstr "Confidencial"
@@ -5550,12 +5590,12 @@ msgid "Description Contains"
 msgstr "La descripción contiene"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:38
 msgid "Do Not Exist"
 msgstr "No existen"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:41
 msgid "Exist"
 msgstr "Existen"
 
@@ -5625,14 +5665,14 @@ msgid "Phone Calls"
 msgstr "Llamadas de teléfono"
 
 #: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:335 ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/e-cal-model.c:346 ../calendar/gui/e-calendar-table.c:545
 #: ../calendar/gui/memotypes.xml.h:29
 msgid "Private"
 msgstr "Privado"
 
 #: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:326 ../calendar/gui/e-cal-model.c:333
-#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+#: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-cal-model.c:344
+#: ../calendar/gui/e-calendar-table.c:544 ../calendar/gui/memotypes.xml.h:30
 msgid "Public"
 msgstr "Público"
 
@@ -5646,7 +5686,7 @@ msgstr "Repetición"
 #: ../calendar/gui/e-meeting-list-view.c:545
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
-#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+#: ../mail/em-filter-i18n.h:86 ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Estado"
 
@@ -5660,7 +5700,7 @@ msgstr "Estrategias"
 #: ../calendar/gui/e-calendar-table.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
 #: ../calendar/gui/tasktypes.xml.h:40
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "Resumen"
 
@@ -5690,38 +5730,38 @@ msgid "Waiting"
 msgstr "Esperando"
 
 #: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
-#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:26
 msgid "contains"
 msgstr "contiene"
 
 #: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
-#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:32
 msgid "does not contain"
 msgstr "no contiene"
 
 #: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
-#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:46
 msgid "is"
 msgstr "es"
 
 #: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:52
 msgid "is not"
 msgstr "no es"
 
-#: ../calendar/gui/comp-editor-factory.c:405
+#: ../calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Error al abrir el calendario"
 
-#: ../calendar/gui/comp-editor-factory.c:411
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Method not supported when opening the calendar"
 msgstr "Método no soportado al abrir el calendario"
 
-#: ../calendar/gui/comp-editor-factory.c:417
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Permission denied to open the calendar"
 msgstr "Permiso denegado para abrir el calendario"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
+#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -5758,17 +5798,17 @@ msgid "Mes_sage:"
 msgstr "_Mensaje:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Reproducir un sonido"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Mostrar una alerta emergente"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Ejecutar un programa"
 
@@ -5781,7 +5821,7 @@ msgid "Send To:"
 msgstr "Enviar a:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Enviar un correo-e"
 
@@ -5859,7 +5899,7 @@ msgstr "_Sugerir mostrar automáticamente el adjunto"
 msgid "Attach file(s)"
 msgstr "Adjuntar archivo(s)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:484
 msgid "Selected Calendars for Alarms"
 msgstr "Calendarios seleccionados para alertas"
 
@@ -5925,7 +5965,7 @@ msgid "Display"
 msgstr "Mostrar"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "viernes"
@@ -5941,7 +5981,7 @@ msgstr ""
 "días"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "lunes"
@@ -5975,7 +6015,7 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "sábado"
@@ -5993,7 +6033,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Mostrar los _números de las semanas en el navegador de fechas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "domingo"
@@ -6012,7 +6052,7 @@ msgid "Template:"
 msgstr "Plantilla:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "jueves"
@@ -6027,13 +6067,13 @@ msgid "Time format:"
 msgstr "Formato de la hora:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "martes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "miércoles"
@@ -6113,101 +6153,101 @@ msgstr "M_ié"
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 "_Copiar el contenido del calendario localmente para trabajar desconectado"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "Co_piar el contenido del la lista de tareas localmente para trabajar "
 "desconectado"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:275
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 "Copia_r el contenido de la lista de notas localmente para trabajar "
 "desconectado"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:345
 msgid "Colo_r:"
 msgstr "Colo_r:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Task List"
 msgstr "Lista de tareas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 msgid "Memo List"
 msgstr "Lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "Calendar Properties"
 msgstr "Propiedades del calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "New Calendar"
 msgstr "Calendario nuevo"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "Task List Properties"
 msgstr "Propiedades de lista de tareas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "New Task List"
 msgstr "Lista de tareas nueva"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "Memo List Properties"
 msgstr "Propiedades de lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "New Memo List"
 msgstr "Lista de notas nueva"
 
-#: ../calendar/gui/dialogs/changed-comp.c:56
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Se ha borrado este acontecimiento."
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Se ha borrado esta tarea."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This memo has been deleted."
 msgstr "Se ha borrado esta nota."
 
-#: ../calendar/gui/dialogs/changed-comp.c:73
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Ha hecho cambios. ¿Quiere olvidar esos cambios y cerrar el editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  No ha hecho cambios, ¿quiere cerrar el editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Este acontecimiento ha cambiado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Esta tarea ha cambiado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This memo has been changed."
 msgstr "Esta nota ha cambiado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:97
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Ha realizado cambios. ¿Quiere olvidar esos cambios y actualizar el "
 "editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No ha realizado cambios, ¿quiere actualizar el editor?"
@@ -6217,358 +6257,358 @@ msgstr "%s  No ha realizado cambios, ¿quiere actualizar el editor?"
 msgid "Validation error: %s"
 msgstr "Error de validación: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2358
 msgid " to "
 msgstr " a "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2362
 msgid " (Completed "
 msgstr "(Completado "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2364
 msgid "Completed "
 msgstr "Completado "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2369
 msgid " (Due "
 msgstr " (Vence "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2371
 msgid "Due "
 msgstr "Vence "
 
-#: ../calendar/gui/dialogs/comp-editor.c:232
+#: ../calendar/gui/dialogs/comp-editor.c:236
 #, c-format
 msgid "Attached message - %s"
 msgstr "Mensaje adjunto: %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1771
-#: ../composer/e-msg-composer.c:1990
+#: ../calendar/gui/dialogs/comp-editor.c:241
+#: ../calendar/gui/dialogs/comp-editor.c:414 ../composer/e-msg-composer.c:1766
+#: ../composer/e-msg-composer.c:1985
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Mensaje adjunto"
 msgstr[1] "%d mensajes adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../calendar/gui/dialogs/comp-editor.c:485 ../composer/e-msg-composer.c:2053
 #: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2107
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:487 ../composer/e-msg-composer.c:2055
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2109
 msgid "Cancel _Drag"
 msgstr "Cancelar _arrastre"
 
-#: ../calendar/gui/dialogs/comp-editor.c:616
-#: ../calendar/gui/dialogs/comp-editor.c:3249 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "adjunto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:842
+#: ../calendar/gui/dialogs/comp-editor.c:846
 msgid "Could not update object"
 msgstr "No es posible actualizar el objeto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:934
 msgid "Edit Appointment"
 msgstr "Editar cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:941
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunión: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:943
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:949
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarea asignada: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:956
 #, c-format
 msgid "Memo - %s"
 msgstr "Nota - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:972
 msgid "No Summary"
 msgstr "Sin resumen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1266
 msgid "Click here to close the current window"
 msgstr "Pulse aquí para cerrar la ventana actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
+#: ../calendar/gui/dialogs/comp-editor.c:1273
 msgid "Copy selected text to the clipboard"
 msgstr "Copia el texto seleccionado al portapapeles"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1280
 msgid "Cut selected text to the clipboard"
 msgstr "Corta el texto seleccionado al portapapeles"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1287
 msgid "Click here to view help available"
 msgstr "Pulse aquí para ver la ayuda disponible"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1294
 msgid "Paste text from the clipboard"
 msgstr "Pega texto desde el portapapeles"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1315
 msgid "Click here to save the current window"
 msgstr "Pulse aquí para guardar la vista actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1322
 msgid "Select all text"
 msgstr "Selecciona todo el texto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1329
 msgid "_Classification"
 msgstr "_Clasificación"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1343
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../calendar/gui/dialogs/comp-editor.c:1350
 #: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "Ay_uda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1357
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1364
 msgid "_Options"
 msgstr "_Opciones"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367 ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1371 ../mail/em-folder-tree.c:2098
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Ver"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../calendar/gui/dialogs/comp-editor.c:1381
 #: ../composer/e-composer-actions.c:471
 msgid "_Attachment..."
 msgstr "_Adjunto…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1383
 msgid "Click here to attach a file"
 msgstr "Pulse aquí para adjuntar un archivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1391
 msgid "_Categories"
 msgstr "_Categorías"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1393
 msgid "Toggles whether to display categories"
 msgstr "Conmuta cuando se muestran las categorías"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1399
 msgid "Time _Zone"
 msgstr "_Zona horaria"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1401
 msgid "Toggles whether the time zone is displayed"
 msgstr "Conmuta cuando se muestra la «Zona horaria»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "Pu_blic"
 msgstr "Pú_blico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1408
+#: ../calendar/gui/dialogs/comp-editor.c:1412
 msgid "Classify as public"
 msgstr "Clasificar como público"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1413
+#: ../calendar/gui/dialogs/comp-editor.c:1417
 msgid "_Private"
 msgstr "_Privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1415
+#: ../calendar/gui/dialogs/comp-editor.c:1419
 msgid "Classify as private"
 msgstr "Clasificar como privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1424
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1426
 msgid "Classify as confidential"
 msgstr "Clasificar como confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1434
 msgid "R_ole Field"
 msgstr "Campo «_Rol»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1432
+#: ../calendar/gui/dialogs/comp-editor.c:1436
 msgid "Toggles whether the Role field is displayed"
 msgstr "Conmuta cuando se muestra el campo «Rol»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1442
 msgid "_RSVP"
 msgstr "_Confirmar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1440
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Conmuta cuando se muestra el campo «Confirmar»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1450
 msgid "_Status Field"
 msgstr "Campo de _estado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1448
+#: ../calendar/gui/dialogs/comp-editor.c:1452
 msgid "Toggles whether the Status field is displayed"
 msgstr "Conmuta cuando se muestra el campo «Estado»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1458
 msgid "_Type Field"
 msgstr "Campo de _tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1460
 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:1766
-#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+#: ../calendar/gui/dialogs/comp-editor.c:1770
+#: ../composer/e-composer-private.c:66 ../widgets/misc/e-attachment-bar.c:1381
 msgid "Recent _Documents"
 msgstr "_Documentos recientes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../calendar/gui/dialogs/comp-editor.c:1789
 #: ../composer/e-composer-actions.c:699
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1880
+#: ../calendar/gui/dialogs/comp-editor.c:1884
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> adjunto"
 msgstr[1] "<b>%d</b> adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1912
+#: ../calendar/gui/dialogs/comp-editor.c:1916
 msgid "Hide Attachment _Bar"
 msgstr "Ocultar _barra de adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:1919
+#: ../calendar/gui/dialogs/comp-editor.c:2227
 msgid "Show Attachment _Bar"
 msgstr "Mostrar _barra de adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/event-page.c:1871
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1045
+#: ../calendar/gui/dialogs/comp-editor.c:2038
+#: ../calendar/gui/dialogs/event-page.c:1875
+#: ../calendar/gui/dialogs/task-page.c:1197 ../composer/e-msg-composer.c:1040
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1048
+#: ../calendar/gui/dialogs/comp-editor.c:2041
+#: ../composer/e-msg-composer.c:1043
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Añadir adjunto…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
-#: ../mail/em-format-html-display.c:2195
+#: ../calendar/gui/dialogs/comp-editor.c:2249
+#: ../mail/em-format-html-display.c:2201
 msgid "Show Attachments"
 msgstr "Mostrar adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:2250
 msgid "Press space key to toggle attachment bar"
 msgstr "Pulse la barra espaciadora para cambiar la barra de adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2390
-#: ../calendar/gui/dialogs/comp-editor.c:2437
-#: ../calendar/gui/dialogs/comp-editor.c:3282
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Los cambios efectuados a este elemento pueden descartarse si llega una "
 "actualización por correo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3311
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "Imposible usar la versión actual."
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:60
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 msgid "Could not open source"
 msgstr "No se puede abrir el origen"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:68
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
 msgstr "No se puede abrir el destino"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:77
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr "El destino es de sólo lectura"
 
-#: ../calendar/gui/dialogs/delete-comp.c:201
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "¿_Borrar este elemento de todos los otros buzones del destinatario?"
 
-#: ../calendar/gui/dialogs/delete-error.c:52
+#: ../calendar/gui/dialogs/delete-error.c:56
 msgid "The event could not be deleted due to a corba error"
 msgstr "No se pudo borrar el acontecimiento debido a un error de CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:59
 msgid "The task could not be deleted due to a corba error"
 msgstr "No se pudo borrar la tarea debido a un error de CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
+#: ../calendar/gui/dialogs/delete-error.c:62
 msgid "The memo could not be deleted due to a corba error"
 msgstr "No se pudo borrar la nota debido a un error de CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:65
 msgid "The item could not be deleted due to a corba error"
 msgstr "No se pudo borrar el elemento debido a un error de CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:72
 msgid "The event could not be deleted because permission was denied"
 msgstr "No se pudo borrar el acontecimiento porque se ha denegado el permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The task could not be deleted because permission was denied"
 msgstr "No se pudo borrar la tarea porque se ha denegado el permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The memo could not be deleted because permission was denied"
 msgstr "No se pudo borrar la nota porque se ha denegado el permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The item could not be deleted because permission was denied"
 msgstr "No se pudo borrar el elemento porque se ha denegado el permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:88
 msgid "The event could not be deleted due to an error"
 msgstr "No se pudo borrar el acontecimiento debido a un error"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
+#: ../calendar/gui/dialogs/delete-error.c:91
 msgid "The task could not be deleted due to an error"
 msgstr "No se pudo borrar la tarea debido a un error"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
+#: ../calendar/gui/dialogs/delete-error.c:94
 msgid "The memo could not be deleted due to an error"
 msgstr "No se pudo borrar el elemento debido a un error"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:97
 msgid "The item could not be deleted due to an error"
 msgstr "No se pudo borrar el elemento debido a un error"
 
@@ -6603,6 +6643,7 @@ msgstr "Convertir en acontecimiento repetitivo"
 
 #: ../calendar/gui/dialogs/event-editor.c:210
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:213
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "Opciones de envío"
@@ -6640,125 +6681,125 @@ msgstr "Consultar información de disponibilidad para los participantes"
 msgid "Appoint_ment"
 msgstr "_Cita"
 
-#: ../calendar/gui/dialogs/event-page.c:731
-#: ../calendar/gui/dialogs/event-page.c:2714
+#: ../calendar/gui/dialogs/event-page.c:735
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "Este acontecimiento tiene alertas."
 
-#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.c:798
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:844
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:846
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no start date"
 msgstr "Acontecimiento sin fecha de inicio"
 
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1033
 msgid "Event with no end date"
 msgstr "Acontecimiento sin fecha de finalización"
 
-#: ../calendar/gui/dialogs/event-page.c:1198
-#: ../calendar/gui/dialogs/memo-page.c:636
-#: ../calendar/gui/dialogs/task-page.c:808
+#: ../calendar/gui/dialogs/event-page.c:1202
+#: ../calendar/gui/dialogs/memo-page.c:640
+#: ../calendar/gui/dialogs/task-page.c:812
 msgid "Start date is wrong"
 msgstr "La fecha de inicio está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1212
 msgid "End date is wrong"
 msgstr "La fecha de finalización está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1235
 msgid "Start time is wrong"
 msgstr "La hora de inicio está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1242
 msgid "End time is wrong"
 msgstr "La hora de finalización está equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1401
-#: ../calendar/gui/dialogs/memo-page.c:677
-#: ../calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/event-page.c:1405
+#: ../calendar/gui/dialogs/memo-page.c:681
+#: ../calendar/gui/dialogs/task-page.c:872
 msgid "The organizer selected no longer has an account."
 msgstr "El organizador seleccionado ya no tiene una cuenta."
 
-#: ../calendar/gui/dialogs/event-page.c:1407
-#: ../calendar/gui/dialogs/memo-page.c:683
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1411
+#: ../calendar/gui/dialogs/memo-page.c:687
+#: ../calendar/gui/dialogs/task-page.c:878
 msgid "An organizer is required."
 msgstr "Se requiere un organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1432
-#: ../calendar/gui/dialogs/task-page.c:898
+#: ../calendar/gui/dialogs/event-page.c:1436
+#: ../calendar/gui/dialogs/task-page.c:902
 msgid "At least one attendee is required."
 msgstr "Es necesario por lo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1194
+#: ../calendar/gui/dialogs/event-page.c:1876
+#: ../calendar/gui/dialogs/task-page.c:1198
 msgid "_Add "
 msgstr "_Añadir"
 
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2594
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "No es posible abrir el calendario «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2634
-#: ../calendar/gui/dialogs/memo-page.c:886
-#: ../calendar/gui/dialogs/task-page.c:1793
+#: ../calendar/gui/dialogs/event-page.c:2638
+#: ../calendar/gui/dialogs/memo-page.c:890
+#: ../calendar/gui/dialogs/task-page.c:1797
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Está actuando en nombre de <b>%s</b>"
 
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2918
 #, 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:2920
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, 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:2926
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, 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:2939
+#: ../calendar/gui/dialogs/event-page.c:2943
 msgid "Customize"
 msgstr "Personalizar"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2944
+#: ../calendar/gui/dialogs/event-page.c:2948
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
-#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:945
+#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
 #: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
+#: ../plugins/exchange-operations/exchange-delegates-user.c:195
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1731
+#: ../plugins/itip-formatter/itip-formatter.c:2086
+#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1513
+#: ../widgets/misc/e-dateedit.c:1727
 #: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "Ninguno"
@@ -6838,19 +6879,19 @@ msgstr "_Contactos…"
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2478
 msgid "Memo"
 msgstr "Nota"
 
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:851
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "No es posible abrir las notas en «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../calendar/gui/dialogs/memo-page.c:1006 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Para"
 
@@ -6864,59 +6905,59 @@ msgid "T_o:"
 msgstr "_Para:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:360
+#: ../calendar/gui/dialogs/task-page.c:364
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:50
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 "Está modificando un acontecimiento que se repite. ¿Qué quiere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Está delegando un acontecimiento que se repite. ¿Qué quiere delegar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Está modificando una tarea que se repite. ¿Qué quiere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Está modificando una nota que se repite. ¿Qué quiere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:85
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This Instance Only"
 msgstr "Esta instancia únicamente"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:93
 msgid "This and Prior Instances"
 msgstr "Esta instancia y las anteriores"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:99
 msgid "This and Future Instances"
 msgstr "Esta instancia y las futuras"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:104
 msgid "All Instances"
 msgstr "Todas las instancias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:562
 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:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "La fecha de repetición es inválida"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:930
 msgid "on"
 msgstr "en"
 
@@ -6924,7 +6965,7 @@ msgstr "en"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:994
 msgid "first"
 msgstr "primer"
 
@@ -6933,7 +6974,7 @@ msgstr "primer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1000
 msgid "second"
 msgstr "segundo"
 
@@ -6941,7 +6982,7 @@ msgstr "segundo"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:1005
 msgid "third"
 msgstr "tercer"
 
@@ -6949,7 +6990,7 @@ msgstr "tercer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1008
+#: ../calendar/gui/dialogs/recurrence-page.c:1010
 msgid "fourth"
 msgstr "cuarto"
 
@@ -6957,13 +6998,13 @@ msgstr "cuarto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 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:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "Other Date"
 msgstr "Otra fecha"
 
@@ -6971,7 +7012,7 @@ msgstr "Otra fecha"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 msgid "1st to 10th"
 msgstr "del 1 al 10"
 
@@ -6979,7 +7020,7 @@ msgstr "del 1 al 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1053
+#: ../calendar/gui/dialogs/recurrence-page.c:1055
 msgid "11th to 20th"
 msgstr "del 11 al 20"
 
@@ -6987,45 +7028,45 @@ msgstr "del 11 al 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1061
 msgid "21st to 31st"
 msgstr "del 21 al 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:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 msgid "day"
 msgstr "día"
 
 #. 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:1208
+#: ../calendar/gui/dialogs/recurrence-page.c:1210
 msgid "on the"
 msgstr "en el"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1384
+#: ../calendar/gui/dialogs/recurrence-page.c:1386
 msgid "occurrences"
 msgstr "repeticiones"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2087
+#: ../calendar/gui/dialogs/recurrence-page.c:2089
 msgid "Add exception"
 msgstr "Añadir excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2130
 msgid "Could not get a selection to modify."
 msgstr "No es posible obtener una selección que modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2134
+#: ../calendar/gui/dialogs/recurrence-page.c:2136
 msgid "Modify exception"
 msgstr "Modificar excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2178
+#: ../calendar/gui/dialogs/recurrence-page.c:2180
 msgid "Could not get a selection to delete."
 msgstr "No es posible obtener una selección que borrar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2304
 msgid "Date/Time"
 msgstr "Fecha/Hora"
 
@@ -7097,53 +7138,53 @@ msgstr "<span weight=\"bold\">Estado</span>"
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
 #: ../calendar/gui/e-cal-component-preview.c:253
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-cal-model-tasks.c:362
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/e-itip-control.c:946
 #: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/print.c:2554 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Terminado"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1065
+#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1066
 msgid "High"
 msgstr "Alta"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:356
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-cal-model-tasks.c:754
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2551
 msgid "In Progress"
 msgstr "En proceso"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1063
+#: ../calendar/gui/e-calendar-table.c:568 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1064
 msgid "Low"
 msgstr "Baja"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:974 ../calendar/gui/e-calendar-table.c:568
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1065
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
 #: ../calendar/gui/e-cal-component-preview.c:260
-#: ../calendar/gui/e-cal-model-tasks.c:354
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:639 ../calendar/gui/print.c:2548
 #: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Sin comenzar"
@@ -7157,7 +7198,7 @@ msgid "Stat_us:"
 msgstr "_Estado:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Sin definir"
 
@@ -7195,16 +7236,16 @@ msgstr "_Tarea"
 msgid "Task Details"
 msgstr "Detalles"
 
-#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.c:372
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:781
+#: ../calendar/gui/dialogs/task-page.c:785
 msgid "Due date is wrong"
 msgstr "La fecha de vencimiento es errónea"
 
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1754
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "No es posible abrir las tareas en «%s»."
@@ -7226,7 +7267,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:392
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -7234,69 +7275,69 @@ 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:398
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
 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:474
+#: ../calendar/gui/e-alarm-list.c:476
 #, 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:479
+#: ../calendar/gui/e-alarm-list.c:481
 #, 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:486
+#: ../calendar/gui/e-alarm-list.c:488
 #, 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:497
+#: ../calendar/gui/e-alarm-list.c:499
 #, 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:502
+#: ../calendar/gui/e-alarm-list.c:504
 #, 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:509
+#: ../calendar/gui/e-alarm-list.c:511
 #, 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:533
+#: ../calendar/gui/e-alarm-list.c:535
 #, 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:541
+#: ../calendar/gui/e-alarm-list.c:543
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
@@ -7308,7 +7349,7 @@ msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "Sin título"
 
@@ -7345,7 +7386,7 @@ msgstr "Fecha de vencimiento:"
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:246
 #: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Estado:"
@@ -7364,17 +7405,17 @@ msgid "Start Date"
 msgstr "Fecha de inicio"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:618
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:620
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:396
 msgid "Busy"
 msgstr "Ocupada"
 
-#: ../calendar/gui/e-cal-model-tasks.c:623
+#: ../calendar/gui/e-cal-model-tasks.c:627
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7384,7 +7425,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
 #: ../calendar/gui/e-meeting-store.c:746
@@ -7392,7 +7433,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Sí"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
 #: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:165
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -7400,209 +7441,209 @@ msgid "No"
 msgstr "No"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:339 ../calendar/gui/e-cal-popup.c:105
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
 #: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
 #: ../calendar/gui/e-meeting-list-view.c:167
 #: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
-#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:409
-#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:987
+#: ../calendar/gui/print.c:1004 ../mail/em-utils.c:1340
+#: ../plugins/itip-formatter/itip-formatter.c:447
+#: ../plugins/itip-formatter/itip-formatter.c:2111
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../calendar/gui/e-cal-model.c:976
+#: ../calendar/gui/e-cal-model.c:987
 msgid "Recurring"
 msgstr "Repetición"
 
-#: ../calendar/gui/e-cal-model.c:978
+#: ../calendar/gui/e-cal-model.c:989
 msgid "Assigned"
 msgstr "Asignado"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Guardar como…"
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2035
 msgid "Select folder to save selected attachments..."
 msgstr "Seleccione la carpeta donde guardar los adjuntos seleccionados…"
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "imagen-_sin-título.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1672 ../calendar/gui/e-memo-table.c:926
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1575
+#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:925
 #: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "Guardar _como…"
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:562
 #: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "Establecer como _fondo"
 
-#: ../calendar/gui/e-cal-popup.c:287
+#: ../calendar/gui/e-cal-popup.c:288
 msgid "_Save Selected"
 msgstr "_Guardar seleccionados"
 
-#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:832
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s…"
 
-#: ../calendar/gui/e-calendar-table.c:338
+#: ../calendar/gui/e-calendar-table.c:337
 msgid "* No Summary *"
 msgstr "* Sin resumen *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2215
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2214
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:377
-#: ../calendar/gui/e-calendar-view.c:2219
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:2218
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "Start: "
 msgstr "Empieza: "
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "Due: "
 msgstr "Vence: "
 
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:588
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:592
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:593
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:594
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:595
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:596
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:597
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:598
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:878
+#: ../calendar/gui/e-calendar-view.c:664 ../calendar/gui/e-memo-table.c:438
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1162
+#: ../calendar/gui/e-calendar-view.c:794 ../calendar/gui/e-memo-table.c:644
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
-#: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:821
+#: ../calendar/gui/e-calendar-table.c:1347
+#: ../calendar/gui/e-calendar-view.c:1220 ../calendar/gui/e-memo-table.c:820
 #: ../composer/e-composer-actions.c:277
 msgid "Save as..."
 msgstr "Guardar como…"
 
-#: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-table.c:1570
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Task"
 msgstr "_Tarea nueva"
 
-#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1574 ../calendar/gui/e-memo-table.c:924
 msgid "Open _Web Page"
 msgstr "Abrir página _web"
 
-#: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-view.c:1656 ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "_Imprimir…"
 
-#: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1580
+#: ../calendar/gui/e-calendar-view.c:1676 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1586 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Asignar tarea"
 
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1587 ../calendar/gui/e-memo-table.c:936
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Reenviar como iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1588
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminado"
 
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tareas seleccionadas como terminadas"
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark as Incomplete"
 msgstr "_Marcar como incompleto"
 
-#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Marcar tareas seleccionadas como incompletas"
 
-#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-table.c:1596
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1834
+#: ../calendar/gui/e-calendar-table.c:1833
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Pulse para añadir una tarea"
@@ -7626,7 +7667,7 @@ msgstr "Fecha de vencimiento"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
 #: ../calendar/gui/tasktypes.xml.h:37
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "Prioridad"
 
@@ -7634,93 +7675,93 @@ msgstr "Prioridad"
 msgid "Start date"
 msgstr "Fecha de inicio"
 
-#: ../calendar/gui/e-calendar-view.c:1340
+#: ../calendar/gui/e-calendar-view.c:1339
 msgid "Moving items"
 msgstr "Moviendo elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1342
+#: ../calendar/gui/e-calendar-view.c:1341
 msgid "Copying items"
 msgstr "Copiando elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1650
 msgid "New _Appointment..."
 msgstr "_Cita nueva…"
 
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New All Day _Event"
 msgstr "Acont_ecimiento nuevo para todo el día"
 
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New _Meeting"
 msgstr "_Reunión nueva"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1663
 msgid "_Current View"
 msgstr "Vista _actual"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1665
 msgid "Select T_oday"
 msgstr "Seleccionar _hoy"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "_Select Date..."
 msgstr "_Seleccionar fecha…"
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1672
 msgid "Pri_nt..."
 msgstr "_Imprimir…"
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar al calendario…"
 
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver al calendario…"
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "_Delegate Meeting..."
 msgstr "_Delegar reunión…"
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Schedule Meeting..."
 msgstr "_Concertar una reunión…"
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendar…"
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1689 ../mail/em-folder-view.c:1330
+#: ../calendar/gui/e-calendar-view.c:1688 ../mail/em-folder-view.c:1330
 #: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta repetición _movible"
 
-#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1694 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _repetición"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las repeticiones"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2234 ../calendar/gui/print.c:2510
 #, c-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2268
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -7759,20 +7800,20 @@ msgstr "divisiones de %02i minutos"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1672
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1560
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1674
 msgid "%A %d %B"
 msgstr "%A %e de %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
-#: ../calendar/gui/print.c:829
+#: ../calendar/gui/e-day-view.c:800 ../calendar/gui/e-week-view.c:540
+#: ../calendar/gui/print.c:831
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:803 ../calendar/gui/e-week-view.c:543
+#: ../calendar/gui/print.c:833
 msgid "pm"
 msgstr "pm"
 
@@ -7853,7 +7894,7 @@ msgid "Ends"
 msgstr "Termina"
 
 #: ../calendar/gui/e-itip-control.c:961
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "Vence "
 
@@ -7890,12 +7931,12 @@ msgstr ""
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
 #: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2034
+#: ../plugins/itip-formatter/itip-formatter.c:2099
 msgid "Accepted"
 msgstr "Aceptado"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../plugins/itip-formatter/itip-formatter.c:2102
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
@@ -7903,7 +7944,7 @@ msgstr "Aceptado provisionalmente"
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
 #: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2040
+#: ../plugins/itip-formatter/itip-formatter.c:2105
 msgid "Declined"
 msgstr "Rehusado"
 
@@ -8126,7 +8167,7 @@ msgid "Attendee status updated\n"
 msgstr "Estado del participante actualizado\n"
 
 #: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../plugins/itip-formatter/itip-formatter.c:1301
 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 "
@@ -8225,49 +8266,49 @@ msgstr "Participantes"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:983
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
 #: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/print.c:984 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/print.c:985
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/print.c:986
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:998
+#: ../calendar/gui/print.c:1000
 msgid "Chair"
 msgstr "Presidente"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
 #: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:1001
 msgid "Required Participant"
 msgstr "Participante requerido"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/print.c:1002
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:1001
+#: ../calendar/gui/print.c:1003
 msgid "Non-Participant"
 msgstr "No participan"
 
@@ -8279,14 +8320,14 @@ msgstr "Necesita acción"
 
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-time-sel.c:397
+#: ../calendar/gui/e-meeting-time-sel.c:395
 msgid "Tentative"
 msgstr "Provisional"
 
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
 #: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2043
+#: ../plugins/itip-formatter/itip-formatter.c:2108
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -8308,7 +8349,7 @@ msgstr "En proceso"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2122
+#: ../calendar/gui/e-meeting-time-sel.c:2120
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
@@ -8317,7 +8358,7 @@ msgstr "%A, %d de %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2153
+#: ../calendar/gui/e-meeting-time-sel.c:2151
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -8327,67 +8368,67 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%e/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Out of Office"
 msgstr "Fuera de la oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "No Information"
 msgstr "Sin información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "A_ttendees..."
 msgstr "_Participantes…"
 
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:434
 msgid "O_ptions"
 msgstr "O_pciones"
 
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:451
 msgid "Show _only working hours"
 msgstr "Mostrar _sólo las horas de trabajo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _zoomed out"
 msgstr "Mostrar quitando _ampliación"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:476
 msgid "_Update free/busy"
 msgstr "_Actualizar disponibilidad"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:509
 msgid "_Autopick"
 msgstr "_Auto-seleccionar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:524
 msgid ">_>"
 msgstr "_>>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:541
 msgid "_All people and resources"
 msgstr "_Todas las personas y los recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "All _people and one resource"
 msgstr "Todas las _personas y un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:559
 msgid "_Required people"
 msgstr "Personas _requeridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:568
 msgid "Required people and _one resource"
 msgstr "Personas requeridas y _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:604
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:631
 msgid "_End time:"
 msgstr "Hora de _fin:"
 
@@ -8415,11 +8456,11 @@ msgstr "Idioma"
 msgid "Member"
 msgstr "Miembro"
 
-#: ../calendar/gui/e-memo-table.c:942
+#: ../calendar/gui/e-memo-table.c:941
 msgid "_Delete Selected Memos"
 msgstr "_Borrar las notas seleccionadas"
 
-#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Pulse aquí para añadir una nota"
 
@@ -8463,14 +8504,14 @@ msgstr "Terminando tareas…"
 msgid "Expunging"
 msgstr "Compactando"
 
-#: ../calendar/gui/e-timezone-entry.c:129
+#: ../calendar/gui/e-timezone-entry.c:128
 msgid "Select Timezone"
 msgstr "Seleccione la zona horaria"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1653
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1655
 msgid "%d %B"
 msgstr "%e de %B"
 
@@ -8620,79 +8661,79 @@ msgstr "Información de iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante en el acontecimiento."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:489
 msgid "_New Memo List"
 msgstr "Lista de notas _nueva"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:571
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d nota"
 msgstr[1] "%d notas"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:573 ../calendar/gui/tasks-component.c:564
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d seleccionado"
 msgstr[1] ", %d seleccionados"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:620
 msgid "Failed upgrading memos."
 msgstr "Fallo al actualizar las notas."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:980
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "No es posible abrir la lista de notas «%s» para crear acontecimientos y "
 "reuniones"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:993
 msgid "There is no calendar available for creating memos"
 msgstr "No hay un calendario disponible para crear notas"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1103
 msgid "Memo Source Selector"
 msgstr "Selector de origen de notas"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1287
 msgid "New memo"
 msgstr "Nota nueva"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1288
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Nota"
 
-#: ../calendar/gui/memos-component.c:1262
+#: ../calendar/gui/memos-component.c:1289
 msgid "Create a new memo"
 msgstr "Crea una nota nueva"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1295
 msgid "New shared memo"
 msgstr "Nota nueva compartida"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1296
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "Nota _compartida"
 
-#: ../calendar/gui/memos-component.c:1270
+#: ../calendar/gui/memos-component.c:1297
 msgid "Create a shared new memo"
 msgstr "Crea una nota compartida nueva"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1303
 msgid "New memo list"
 msgstr "Lista de notas nueva"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1304
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "_Lista de notas"
 
-#: ../calendar/gui/memos-component.c:1278
+#: ../calendar/gui/memos-component.c:1305
 msgid "Create a new memo list"
 msgstr "Crea una lista de notas nueva"
 
@@ -8754,271 +8795,271 @@ msgstr "No es posible migrar las tareas en «%s»"
 msgid "Notes"
 msgstr "Notas"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:523
 msgid "31st"
 msgstr "31"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Su"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Mo"
 msgstr "Lu"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Tu"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "We"
 msgstr "Mi"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Th"
 msgstr "Ju"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Fr"
 msgstr "Vi"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2474
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2476
 msgid "Task"
 msgstr "Tarea"
 
-#: ../calendar/gui/print.c:2499
+#: ../calendar/gui/print.c:2501
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumen: %s"
 
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2524
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2562
+#: ../calendar/gui/print.c:2564
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2579
+#: ../calendar/gui/print.c:2581
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridad: %s"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2593
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaje completado: %i"
 
-#: ../calendar/gui/print.c:2603
+#: ../calendar/gui/print.c:2605
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2616
+#: ../calendar/gui/print.c:2618
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:2629
 msgid "Contacts: "
 msgstr "Contactos: "
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:480
 msgid "_New Task List"
 msgstr "Lista de tareas _nueva"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:562
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarea"
 msgstr[1] "%d tareas"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:611
 msgid "Failed upgrading tasks."
 msgstr "Fallo al actualizar las tareas."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:968
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "No es posible abrir la lista de tareas «%s» para crear acontecimientos y "
 "reuniones"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:981
 msgid "There is no calendar available for creating tasks"
 msgstr "No hay un calendario disponible para crear tareas"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1092
 msgid "Task Source Selector"
 msgstr "Selector de origen de tareas"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1352
 msgid "New task"
 msgstr "Tarea nueva"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1353
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tarea"
 
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/tasks-component.c:1354
 msgid "Create a new task"
 msgstr "Crea una tarea nueva"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1360
 msgid "New assigned task"
 msgstr "Nueva tarea asignada"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1361
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarea _asignada"
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1362
 msgid "Create a new assigned task"
 msgstr "Crea una tarea nueva asignada"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1368
 msgid "New task list"
 msgstr "Lista de tareas nueva"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1369
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Lista de ta_reas"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1370
 msgid "Create a new task list"
 msgstr "Crea una lista de tareas nueva"
 
@@ -9055,49 +9096,49 @@ msgstr "Cancelado"
 msgid "In progress"
 msgstr "En proceso"
 
-#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:50
 msgid "is greater than"
 msgstr "es mayor que"
 
-#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:51
 msgid "is less than"
 msgstr "es menor que"
 
-#: ../calendar/importers/icalendar-importer.c:73
+#: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
 msgstr "Reuniones y citas"
 
-#: ../calendar/importers/icalendar-importer.c:331
-#: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:616
+#: ../plugins/itip-formatter/itip-formatter.c:1635
 msgid "Opening calendar"
 msgstr "Apertura del calendario"
 
-#: ../calendar/importers/icalendar-importer.c:438
+#: ../calendar/importers/icalendar-importer.c:440
 msgid "iCalendar files (.ics)"
 msgstr "Archivos iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:441
 msgid "Evolution iCalendar importer"
 msgstr "Importador de iCalendar de Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:515
+#: ../calendar/importers/icalendar-importer.c:517
 msgid "Reminder!"
 msgstr "¡Recuerde!"
 
-#: ../calendar/importers/icalendar-importer.c:567
+#: ../calendar/importers/icalendar-importer.c:569
 msgid "vCalendar files (.vcf)"
 msgstr "Archivos vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:568
+#: ../calendar/importers/icalendar-importer.c:570
 msgid "Evolution vCalendar importer"
 msgstr "Importador de vCalendar de Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:730
+#: ../calendar/importers/icalendar-importer.c:732
 msgid "Calendar Events"
 msgstr "Acontecimientos de calendario"
 
-#: ../calendar/importers/icalendar-importer.c:767
+#: ../calendar/importers/icalendar-importer.c:769
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador inteligente del calendario de Evolution"
 
@@ -10912,18 +10953,18 @@ msgstr "Elija las carpetas en las que publicar el mensaje."
 msgid "Click here to select folders to post to"
 msgstr "Pulse aquí para seleccionar carpetas en las que publicar"
 
-#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
+#: ../composer/e-composer-private.c:181 ../composer/e-msg-composer.c:1553
 msgid "Show _Attachment Bar"
 msgstr "Mostrar _barra de adjuntos"
 
-#: ../composer/e-msg-composer.c:872
+#: ../composer/e-msg-composer.c:867
 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:879
+#: ../composer/e-msg-composer.c:874
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10931,23 +10972,23 @@ msgstr ""
 "No es posible cifrar el mensaje saliente: no hay establecido un certificado "
 "de cifrado para esta cuenta"
 
-#: ../composer/e-msg-composer.c:1500 ../mail/em-format-html-display.c:1913
-#: ../mail/em-format-html-display.c:2405 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1495 ../mail/em-format-html-display.c:1919
+#: ../mail/em-format-html-display.c:2411 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Adjunto"
 msgstr[1] "Adjuntos"
 
-#: ../composer/e-msg-composer.c:1556
+#: ../composer/e-msg-composer.c:1551
 msgid "Hide _Attachment Bar"
 msgstr "Ocultar _barra de adjuntos"
 
-#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
+#: ../composer/e-msg-composer.c:1568 ../composer/e-msg-composer.c:2775
 msgid "Compose Message"
 msgstr "Redactar un mensaje"
 
-#: ../composer/e-msg-composer.c:4055
+#: ../composer/e-msg-composer.c:4050
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11038,8 +11079,9 @@ msgstr ""
 "nuevo. La recuperación del mensaje le permitirá continuar donde lo dejó."
 
 #: ../composer/mail-composer.error.xml.h:17
+#, fuzzy
 msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
+"Send options available only for Novell GroupWise and Microsoft Exchange "
 "accounts."
 msgstr ""
 "Opciones de envío sólo disponibles para cuentas Novell Groupwise y Microsoft "
@@ -11113,7 +11155,7 @@ msgstr "Guardar _borrador"
 msgid "Evolution Mail and Calendar"
 msgstr "Correo y calendario de Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
 msgid "Groupware Suite"
 msgstr "Suite de trabajo en grupo"
 
@@ -11129,40 +11171,40 @@ msgstr "tarjeta de dirección"
 msgid "calendar information"
 msgstr "información de calendario"
 
-#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Error de Evolution"
 
-#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Advertencia de Evolution"
 
-#: ../e-util/e-error.c:117
+#: ../e-util/e-error.c:118
 msgid "Evolution Information"
 msgstr "Información de Evolution"
 
-#: ../e-util/e-error.c:119
+#: ../e-util/e-error.c:120
 msgid "Evolution Query"
 msgstr "Consulta de Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:449
+#: ../e-util/e-error.c:450
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Error interno, solicitado un error desconocido «%s»"
 
-#: ../e-util/e-logger.c:156
+#: ../e-util/e-logger.c:161
 msgid "Component"
 msgstr "Componente"
 
-#: ../e-util/e-logger.c:157
+#: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
 msgstr "El nombre del componente que registrar"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
 #: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:689
+#: ../plugins/publish-calendar/publish-calendar.c:690
 msgid "Enabled"
 msgstr "Activado"
 
@@ -11214,7 +11256,7 @@ msgstr "¿Sobreescribir archivo?"
 msgid "_Overwrite"
 msgstr "_Sobreescribir"
 
-#: ../e-util/e-util.c:97
+#: ../e-util/e-util.c:96
 msgid "Could not display help for Evolution."
 msgstr "No se pudo mostrar la ayuda de Evolution."
 
@@ -11275,120 +11317,120 @@ msgstr "Error de GConf: %s"
 msgid "All further errors shown only on terminal."
 msgstr "En adelante todos los errores sólo se mostrarán en el terminal."
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "hace un segundo"
 msgstr[1] "hace %d segundos"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "dentro de un segundo"
 msgstr[1] "dentro de %d segundos"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "hace un minuto"
 msgstr[1] "hace %d minutos"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "dentro de un minuto"
 msgstr[1] "dentro de %d minutos"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "hace una hora"
 msgstr[1] "hace %d horas"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "dentro de una hora"
 msgstr[1] "dentro de %d horas"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "hace un día"
 msgstr[1] "hace %d días"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "dentro de un día"
 msgstr[1] "dentro de %d días"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "hace una semana"
 msgstr[1] "hace %d semanas"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "dentro de una semana"
 msgstr[1] "dentro de %d semanas"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "hace un mes"
 msgstr[1] "hace %d meses"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "dentro de un mes"
 msgstr[1] "dentro de %d meses"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "hace un año"
 msgstr[1] "hace %d años"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "dentro de un años"
 msgstr[1] "dentro de %d años"
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<pulse aquí para seleccionar una fecha>"
 
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "ahora"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:298
 msgid "%d-%b-%Y"
 msgstr "%e/%b/%Y"
 
 # Aquí time se refiere a fecha
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:452
 msgid "Select a time to compare against"
 msgstr "Seleccione una fecha con la que comparar"
 
@@ -11401,56 +11443,56 @@ msgstr "Elija un archivo"
 msgid "Test"
 msgstr "Prueba"
 
-#: ../filter/filter-rule.c:852
+#: ../filter/filter-rule.c:853
 msgid "R_ule name:"
 msgstr "Nombre de la _regla:"
 
-#: ../filter/filter-rule.c:880
+#: ../filter/filter-rule.c:881
 msgid "Find items that meet the following criteria"
 msgstr "Buscar elementos que cumplen con estos criterios"
 
-#: ../filter/filter-rule.c:914
+#: ../filter/filter-rule.c:915
 msgid "A_dd Filter Criteria"
 msgstr "_Añadir regla de filtrado"
 
-#: ../filter/filter-rule.c:920
+#: ../filter/filter-rule.c:921
 msgid "If all criteria are met"
 msgstr "Si se cumplen todos los criterios"
 
-#: ../filter/filter-rule.c:920
+#: ../filter/filter-rule.c:921
 msgid "If any criteria are met"
 msgstr "Si se cumple algún criterio"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:923
 msgid "_Find items:"
 msgstr "_Buscar elementos:"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "All related"
 msgstr "Todas las relacionadas"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies"
 msgstr "Respuestas"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies and parents"
 msgstr "Respuestas y antecesores"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "No reply or parent"
 msgstr "Sin respuesta o antecesor"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/filter-rule.c:947
 msgid "I_nclude threads"
 msgstr "I_ncluir conversaciones"
 
-#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Saliente"
 
@@ -11550,7 +11592,7 @@ msgstr "en el futuro"
 msgid "months"
 msgstr "meses"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:197
 msgid "seconds"
 msgstr "segundos"
 
@@ -11573,15 +11615,15 @@ msgstr "semanas"
 msgid "years"
 msgstr "años"
 
-#: ../filter/rule-editor.c:380
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr "Añadir regla"
 
-#: ../filter/rule-editor.c:459
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr "Editar regla"
 
-#: ../filter/rule-editor.c:786
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "Nombre de la regla"
 
@@ -11637,9 +11679,9 @@ msgid "Evolution Network configuration control"
 msgstr "Control de configuración de red de Evolution"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
-#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
-#: ../mail/mail-component.c:767
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
+#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
+#: ../mail/mail-component.c:762
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Correo"
@@ -11662,12 +11704,12 @@ msgstr "Preferencias de red"
 msgid "_Mail"
 msgstr "Co_rreo"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:386
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acuerdo de licencia %s"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:393
 #, c-format
 msgid ""
 "\n"
@@ -11680,64 +11722,64 @@ msgstr ""
 "para %s mostrado abajo\n"
 "y marque la casilla para aceptarlo.\n"
 
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:239
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
-#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
-#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
+#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
+#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:98
 msgid "Autogenerated"
 msgstr "Autogenerado"
 
-#: ../mail/em-account-editor.c:762
+#: ../mail/em-account-editor.c:761
 msgid "Ask for each message"
 msgstr "Preguntar por cada mensaje"
 
-#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identidad"
 
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Recepción de correo"
 
-#: ../mail/em-account-editor.c:2131
+#: ../mail/em-account-editor.c:2130
 msgid "Check for _new messages every"
 msgstr "Comprobar si hay correo _nuevo cada"
 
-#: ../mail/em-account-editor.c:2139
+#: ../mail/em-account-editor.c:2138
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "Envío de correo"
 
-#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Predeterminados"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:323
 msgid "Security"
 msgstr "Seguridad"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
 msgid "Receiving Options"
 msgstr "Opciones de recepción"
 
-#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Checking for New Messages"
 msgstr "Comprobando si hay mensajes nuevos"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor de cuentas"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
@@ -11798,259 +11840,275 @@ msgstr "-----Mensaje original-----"
 msgid "_Filter Rules"
 msgstr "Reglas de _filtrado"
 
+#.
+#. * 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)
+#.
 #. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
+#: ../mail/em-filter-i18n.h:18
 msgid "Adjust Score"
 msgstr "Ajustar puntuación"
 
-#: ../mail/em-filter-i18n.h:3
+#: ../mail/em-filter-i18n.h:19
 msgid "Assign Color"
 msgstr "Asignar color"
 
-#: ../mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:20
 msgid "Assign Score"
 msgstr "Asignar puntuación"
 
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:22
 msgid "BCC"
 msgstr "Cco"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:23
 msgid "Beep"
 msgstr "Pitar"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:24
 msgid "CC"
 msgstr "Cc"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:25
 msgid "Completed On"
 msgstr "Completado en"
 
-#: ../mail/em-filter-i18n.h:11
+#: ../mail/em-filter-i18n.h:27
 msgid "Copy to Folder"
 msgstr "Copiar a la carpeta"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:28
 msgid "Date received"
 msgstr "Fecha de recepción"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:29
 msgid "Date sent"
 msgstr "Fecha de envío"
 
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:767
+#: ../mail/em-filter-i18n.h:30
+#: ../plugins/groupwise-features/share-folder.c:768
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:31
 msgid "Deleted"
 msgstr "Borrado"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:33
 msgid "does not end with"
 msgstr "no acaba en"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:34
 msgid "does not exist"
 msgstr "no existe"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:35
 msgid "does not return"
 msgstr "no devuelve"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:36
 msgid "does not sound like"
 msgstr "no suena como"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:37
 msgid "does not start with"
 msgstr "no comienza por"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:39
 msgid "Draft"
 msgstr "Borrador"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:40
 msgid "ends with"
 msgstr "acaba en"
 
-#: ../mail/em-filter-i18n.h:26
+#: ../mail/em-filter-i18n.h:42
 msgid "exists"
 msgstr "existe"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:43
 msgid "Expression"
 msgstr "Expresión"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:44
 msgid "Follow Up"
 msgstr "Seguimiento"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:45 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Importante"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:47
 msgid "is after"
 msgstr "es posterior a"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:48
 msgid "is before"
 msgstr "es anterior a"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:49
 msgid "is Flagged"
 msgstr "está marcado"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:53
 msgid "is not Flagged"
 msgstr "no está marcado"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:54
 msgid "is not set"
 msgstr "no está establecida"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:55
 msgid "is set"
 msgstr "está establecida"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
+#: ../mail/em-filter-i18n.h:56 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "SPAM"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:57
 msgid "Junk Test"
 msgstr "Detección de SPAM"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:58 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Etiqueta"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:59
 msgid "Mailing list"
 msgstr "Lista de correo"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:60
 msgid "Match All"
 msgstr "Coincidir con todo"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:61
 msgid "Message Body"
 msgstr "Cuerpo del mensaje"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:62
 msgid "Message Header"
 msgstr "Cabecera del mensaje"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:63
 msgid "Message is Junk"
 msgstr "El mensaje es SPAM"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:64
 msgid "Message is not Junk"
 msgstr "El mensaje no es SPAM"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:65
 msgid "Move to Folder"
 msgstr "Mover a la carpeta"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:66
 msgid "Pipe to Program"
 msgstr "Encauzar al programa"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:67
 msgid "Play Sound"
 msgstr "Reproducir un sonido"
 
 #. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:69 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Leído"
 
-#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:71
 msgid "Regex Match"
 msgstr "Coincide con la expresión regular"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:72
 msgid "Replied to"
 msgstr "Respondió a"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:73
 msgid "returns"
 msgstr "devuelve"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:74
 msgid "returns greater than"
 msgstr "devuelve mayor que"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:75
 msgid "returns less than"
 msgstr "devuelve menor que"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:76
 msgid "Run Program"
 msgstr "Ejecutar programa"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Puntuación"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:78 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Remitente"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:79
 msgid "Set Label"
 msgstr "Establecer etiqueta"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:80
 msgid "Set Status"
 msgstr "Poner estado"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:81
 msgid "Size (kB)"
 msgstr "Tamaño (Kib)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:82
 msgid "sounds like"
 msgstr "suena como"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:83
 msgid "Source Account"
 msgstr "Cuenta de origen"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:84
 msgid "Specific header"
 msgstr "Cabecera específica"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:85
 msgid "starts with"
 msgstr "comienza por"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:87
 msgid "Stop Processing"
 msgstr "Parar de procesar"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
+#: ../mail/em-filter-i18n.h:88 ../mail/em-format-quote.c:342
 #: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
 #: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1132
+#: ../smime/lib/e-cert.c:1115
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:89
 msgid "Unset Status"
 msgstr "Quitar estado"
 
@@ -12063,51 +12121,51 @@ msgstr "Luego"
 msgid "Add Ac_tion"
 msgstr "Añadir a_cción"
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:192
 msgid "C_reate Search Folder From Search..."
 msgstr "C_rear una carpeta de búsqueda desde la búsqueda…"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:217
 msgid "All Messages"
 msgstr "Todos los mensajes"
 
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:218
 msgid "Unread Messages"
 msgstr "Mensajes no leídos"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:220
 msgid "No Label"
 msgstr "Sin etiqueta"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:227
 msgid "Read Messages"
 msgstr "Mensajes leídos"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:228
 msgid "Recent Messages"
 msgstr "Mensajes recientes"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:229
 msgid "Last 5 Days' Messages"
 msgstr "Mensajes de los últimos 5 días"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:230
 msgid "Messages with Attachments"
 msgstr "Mensajes con adjuntos"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:231
 msgid "Important Messages"
 msgstr "Mensajes importantes"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:232
 msgid "Messages Not Junk"
 msgstr "Mensajes que no son SPAM"
 
-#: ../mail/em-folder-browser.c:1171
+#: ../mail/em-folder-browser.c:1173
 msgid "Account Search"
 msgstr "Búsqueda en la cuenta"
 
-#: ../mail/em-folder-browser.c:1224
+#: ../mail/em-folder-browser.c:1226
 msgid "All Account Search"
 msgstr "Búsqueda en todas las cuentas"
 
@@ -12138,9 +12196,9 @@ msgstr "Uso de cuota"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-properties.c:358 ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
-#: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:159
+#: ../mail/mail-component.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "Bandeja de entrada"
@@ -12162,9 +12220,9 @@ msgstr "C_rear"
 msgid "Folder _name:"
 msgstr "_Nombre de la carpeta:"
 
-#. load store to mail component at the end, when everything is loaded
+#. load store to mail component
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Carpetas de búsqueda"
 
@@ -12173,15 +12231,15 @@ msgstr "Carpetas de búsqueda"
 msgid "UNMATCHED"
 msgstr "NO COINCIDENTE"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:160
 msgid "Drafts"
 msgstr "Borradores"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:161
 msgid "Outbox"
 msgstr "Bandeja de salida"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:162
 msgid "Sent"
 msgstr "Correo enviado"
 
@@ -12224,12 +12282,12 @@ msgstr "Moviendo la carpeta %s"
 msgid "Copying folder %s"
 msgstr "Copiando la carpeta %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2015
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2017
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando los mensajes a la carpeta %s"
@@ -12246,7 +12304,7 @@ msgstr "_Copiar a la carpeta"
 msgid "_Move to Folder"
 msgstr "_Mover a la carpeta"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en «%s»"
@@ -12287,7 +12345,7 @@ msgstr "Copiando «%s» a «%s»"
 
 #: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1186
 #: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
@@ -12295,20 +12353,20 @@ msgstr "Seleccionar carpeta"
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/em-folder-utils.c:585
+#: ../mail/em-folder-utils.c:532
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando carpeta «%s»"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Crear carpeta"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
@@ -12381,7 +12439,7 @@ msgstr "_Etiqueta"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:480
 msgid "_None"
 msgstr "_Ninguna"
 
@@ -12484,33 +12542,33 @@ msgid "Click to hide/unhide addresses"
 msgstr "Pulse para ocultar/mostrar las direcciones"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:470
+#: ../mail/em-format-html-display.c:471
 #, c-format
 msgid "Matches: %d"
 msgstr "Coincide con: %d"
 
-#: ../mail/em-format-html-display.c:614
+#: ../mail/em-format-html-display.c:615
 msgid "Fin_d:"
 msgstr "_Buscar:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:639
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../mail/em-format-html-display.c:643
+#: ../mail/em-format-html-display.c:644
 msgid "_Next"
 msgstr "_Siguiente"
 
-#: ../mail/em-format-html-display.c:648
+#: ../mail/em-format-html-display.c:649
 msgid "M_atch case"
 msgstr "_Coincidir con capitalización"
 
-#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "No firmado"
 
-#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12518,11 +12576,11 @@ msgstr ""
 "Este mensaje no está firmado. No hay garantía de que el mensaje sea "
 "auténtico."
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Firma válida"
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12530,11 +12588,11 @@ msgstr ""
 "Este mensaje está firmado y es válido, lo que significa que es muy probable "
 "que el mensaje sea auténtico."
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Firma no válida"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12542,11 +12600,11 @@ msgstr ""
 "La firma de este mensaje no se puede verificar, pudo haber sido alterada en "
 "tránsito."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Firma válida, pero no se puede verificar el remitente"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12554,11 +12612,11 @@ msgstr ""
 "Este mensaje está firmado con una firma válida, pero el remitente del "
 "mensaje no se pudo verificar."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "La firma existe pero se necesita la clave pública"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12566,11 +12624,11 @@ msgstr ""
 "Este mensaje está firmado con una firma pero no existe una clave pública "
 "correspondiente."
 
-#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Descifrado"
 
-#: ../mail/em-format-html-display.c:958
+#: ../mail/em-format-html-display.c:959
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12578,11 +12636,11 @@ msgstr ""
 "Este mensaje no está cifrado. Su contenido puede verse en tránsito a través "
 "de Internet."
 
-#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Cifrado, débil"
 
-#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html-display.c:960
 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 "
@@ -12592,11 +12650,11 @@ msgstr ""
 "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:960 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:961
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12604,11 +12662,11 @@ 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:961 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Cifrado, fuerte"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:962
 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 "
@@ -12618,87 +12676,87 @@ msgstr ""
 "difícil que un espía vea el contenido de este mensaje en empleando un tiempo "
 "razonable."
 
-#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1063 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: ../mail/em-format-html-display.c:1077
+#: ../mail/em-format-html-display.c:1078
 msgid "This certificate is not viewable"
 msgstr "Certificado no es visible"
 
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1377
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Terminado el %e de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1379
+#: ../mail/em-format-html-display.c:1385
 msgid "Overdue:"
 msgstr "Atrasado:"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1388
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "antes del %e de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1466
 msgid "_View Inline"
 msgstr "_Ver incluido"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1467
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1468
 msgid "_Fit to Width"
 msgstr "_Ajustar al ancho"
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1469
 msgid "Show _Original Size"
 msgstr "Mostrar tamaño _original"
 
-#: ../mail/em-format-html-display.c:1983
+#: ../mail/em-format-html-display.c:1989
 msgid "Save attachment as"
 msgstr "Guarda los adjuntos como"
 
-#: ../mail/em-format-html-display.c:1987
+#: ../mail/em-format-html-display.c:1993
 msgid "Select folder to save all attachments"
 msgstr "Seleccione la carpeta donde guardar todos los adjuntos"
 
-#: ../mail/em-format-html-display.c:2038
+#: ../mail/em-format-html-display.c:2044
 msgid "_Save Selected..."
 msgstr "_Guardar seleccionados…"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2105
+#: ../mail/em-format-html-display.c:2111
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d a_djunto"
 msgstr[1] "%d a_djuntos"
 
-#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
+#: ../mail/em-format-html-display.c:2118 ../mail/em-format-html-display.c:2207
 msgid "S_ave"
 msgstr "_Guardar"
 
-#: ../mail/em-format-html-display.c:2123
+#: ../mail/em-format-html-display.c:2129
 msgid "S_ave All"
 msgstr "Guardar _todo"
 
-#: ../mail/em-format-html-display.c:2197
+#: ../mail/em-format-html-display.c:2203
 msgid "No Attachment"
 msgstr "Sin adjunto"
 
-#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2344 ../mail/em-format-html-display.c:2383
 msgid "View _Unformatted"
 msgstr "Ver _sin formato"
 
-#: ../mail/em-format-html-display.c:2340
+#: ../mail/em-format-html-display.c:2346
 msgid "Hide _Unformatted"
 msgstr "Ocultar _sin formato"
 
-#: ../mail/em-format-html-display.c:2397
+#: ../mail/em-format-html-display.c:2403
 msgid "O_pen With"
 msgstr "Abrir _con"
 
-#: ../mail/em-format-html-display.c:2473
+#: ../mail/em-format-html-display.c:2479
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12771,7 +12829,7 @@ msgstr "Cco"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1450
+#: ../mail/em-mailer-prefs.c:1451
 msgid "Mailer"
 msgstr "Transporte"
 
@@ -12805,8 +12863,8 @@ msgid "Reply-To"
 msgstr "Responder a"
 
 #: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
-#: ../widgets/misc/e-dateedit.c:353
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:327
+#: ../widgets/misc/e-dateedit.c:349
 msgid "Date"
 msgstr "Fecha"
 
@@ -12814,106 +12872,111 @@ msgstr "Fecha"
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "Cara"
+
+#: ../mail/em-format.c:1158
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1200
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "No es posible interpretar el mensaje S/MIME: Error desconocido"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No es posible analizar el mensaje MIME. Mostrando la fuente."
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1345
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de cifrado no soportado para multipart/encrypted"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message"
 msgstr "No es posible interpretar el mensaje PGP/MIME"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "No es posible interpretar el mensaje PGP/MIME: Error desconocido"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1512
 msgid "Unsupported signature format"
 msgstr "Formato de firma no soportado"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
 msgid "Error verifying signature"
 msgstr "Error al verificar la firma"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
 msgid "Unknown error verifying signature"
 msgstr "Error desconocido al verificar la firma"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1663
 msgid "Could not parse PGP message"
 msgstr "No es posible interpretar el mensaje PGP"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1663
 msgid "Could not parse PGP message: Unknown error"
 msgstr "No es posible interpretar el mensaje PGP: Error desconocido"
 
-#: ../mail/em-mailer-prefs.c:93
+#: ../mail/em-mailer-prefs.c:94
 msgid "Every time"
 msgstr "Cada vez"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per day"
 msgstr "Una vez por día"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per week"
 msgstr "Una vez por semana"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per month"
 msgstr "Una vez por mes"
 
-#: ../mail/em-mailer-prefs.c:326
+#: ../mail/em-mailer-prefs.c:327
 msgid "Add Custom Junk Header"
 msgstr "Añadir cabecera de SPAM personalizada"
 
-#: ../mail/em-mailer-prefs.c:330
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Name:"
 msgstr "Nombre de la cabecera:"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:332
 msgid "Header Value Contains:"
 msgstr "El valor de cabecera contiene:"
 
-#: ../mail/em-mailer-prefs.c:436
+#: ../mail/em-mailer-prefs.c:437
 msgid "Contains Value"
 msgstr "Contiene el valor"
 
-#: ../mail/em-mailer-prefs.c:458
+#: ../mail/em-mailer-prefs.c:459
 msgid "Color"
 msgstr "Color"
 
-#: ../mail/em-mailer-prefs.c:461
+#: ../mail/em-mailer-prefs.c:462
 msgid "Tag"
 msgstr "Etiqueta"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
+#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "El complemento %s está disponible y el binario está instalado."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
+#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "El complemento %s no está disponible. Compruebe si el paquete está instalado."
 
-#: ../mail/em-mailer-prefs.c:1107
+#: ../mail/em-mailer-prefs.c:1108
 msgid "No Junk plugin available"
 msgstr "No hay complemento para SPAM disponible"
 
@@ -12975,8 +13038,9 @@ msgid "Failed to create local mail storage `%s': %s"
 msgstr "No es posible crear el almacén de correo local «%s»: %s"
 
 #: ../mail/em-migrate.c:2898
+#, fuzzy
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"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..."
@@ -13009,34 +13073,34 @@ msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
 #. make it first item
-#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:853
 msgid "_Add to Address Book"
 msgstr "_Añadir a la libreta de direcciones"
 
-#: ../mail/em-subscribe-editor.c:583
+#: ../mail/em-subscribe-editor.c:582
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Este almacén no soporta suscripciones, o no están activadas."
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:615
 msgid "Subscribed"
 msgstr "Suscrito"
 
-#: ../mail/em-subscribe-editor.c:620
+#: ../mail/em-subscribe-editor.c:619
 msgid "Folder"
 msgstr "Carpeta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:822
+#: ../mail/em-subscribe-editor.c:821
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: ../mail/em-subscribe-editor.c:843
+#: ../mail/em-subscribe-editor.c:842
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ningún servidor"
 
 #. Check buttons
 #: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:127
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "_No mostrar otra vez este mensaje."
 
@@ -13083,7 +13147,8 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Anchura de la ventana «Enviar y recibir correo»"
 
 #: ../mail/evolution-mail.schemas.in.h:4
-msgid "Allows evolution to display text part of limited size"
+#, fuzzy
+msgid "Allows Evolution to display text part of limited size"
 msgstr "Permite a Evolution mostrar la parte de texto de tamaño limitado"
 
 #: ../mail/evolution-mail.schemas.in.h:5
@@ -13373,10 +13438,11 @@ msgstr ""
 "lateral en vez de verticalmente."
 
 #: ../mail/evolution-mail.schemas.in.h:61
+#, fuzzy
 msgid ""
-"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
-"any mime-types appearing in this list which map to a bonobo-component viewer "
-"in GNOME's mime-type database may be used for displaying content."
+"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 no hay un visor integrado para un tipo mime particular dentro de "
 "Evolution, cualquier tipo mime que aparezca en esta lista que se mapee a un "
@@ -13452,14 +13518,18 @@ msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas y sus colores asociados"
 
 #: ../mail/evolution-mail.schemas.in.h:72
+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:73
 msgid "List of accepted licenses"
 msgstr "Lista de licencias aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of accounts"
 msgstr "Lista de cuentas"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13468,16 +13538,16 @@ msgstr ""
 "lista contiene cadenas nombrando subdirectorios relativos a /apps/evolution/"
 "mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 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:76
+#: ../mail/evolution-mail.schemas.in.h:77
 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:77
+#: ../mail/evolution-mail.schemas.in.h:78
 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."
@@ -13486,21 +13556,18 @@ msgstr ""
 "lista contiene cadenas con el nombre:color donde color usa la codificación "
 "hex HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:78
-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:79
 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:80
-msgid "Load images for HTML messages over http"
-msgstr "Cargar imágenes para mensajes HTML sobre http"
+msgid "Load images for HTML messages over HTTP"
+msgstr "Cargar imágenes para mensajes HTML sobre HTTP"
 
 #: ../mail/evolution-mail.schemas.in.h:81
+#, fuzzy
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"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 ""
@@ -13754,9 +13821,10 @@ msgstr ""
 "para mensajes de depuración."
 
 #: ../mail/evolution-mail.schemas.in.h:141
+#, fuzzy
 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 interms of KB."
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
 "Esto decide el tamaño máximo de la parte de texto que se puede formatear "
 "bajo Evolution. Lo predeterminado son 4 Mib/4096 KiB y está especificado en "
@@ -13983,45 +14051,45 @@ msgstr "Importador de Elm de Evolution"
 msgid "Import mail from Elm."
 msgstr "Importar correo de Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:80
+#: ../mail/importers/evolution-mbox-importer.c:79
 msgid "Destination folder:"
 msgstr "Carpeta de destino:"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder to import into"
 msgstr "Seleccione la carpeta en la que importar"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Buzón Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:221
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de carpetas en formato buzón de Berkeley"
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "Importando buzón de correo"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
+#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando «%s»"
 
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "Analizando %s"
 
-#: ../mail/importers/pine-importer.c:227
+#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr "Importando datos de Pine"
 
-#: ../mail/importers/pine-importer.c:426
+#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "Importador de Pine de Evolution"
 
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
 msgstr "Importar correo de Pine."
 
@@ -14049,150 +14117,150 @@ msgstr "Lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "Añadir regla de filtrado"
 
-#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
-#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../mail/mail-component.c:163 ../plugins/templates/templates.c:519
+#: ../plugins/templates/templates.c:689 ../plugins/templates/templates.c:724
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "Plantillas"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:545
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionado, "
 msgstr[1] "%d seleccionados, "
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:549
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d borrado"
 msgstr[1] "%d borrados"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:556
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d SPAM"
 msgstr[1] "%d SPAM"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviados"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:563
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d sin enviar"
 msgstr[1] "%d sin enviar"
 
-#: ../mail/mail-component.c:574
+#: ../mail/mail-component.c:569
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d no leído, "
 msgstr[1] "%d no leídos, "
 
-#: ../mail/mail-component.c:575
+#: ../mail/mail-component.c:570
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:922
 msgid "New Mail Message"
 msgstr "Mensaje de correo nuevo"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:923
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:924
 msgid "Compose a new mail message"
 msgstr "Redacta un mensaje de correo nuevo"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:930
 msgid "New Mail Folder"
 msgstr "Carpeta de correo nueva"
 
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:931
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Carpeta de correo"
 
-#: ../mail/mail-component.c:933
+#: ../mail/mail-component.c:932
 msgid "Create a new mail folder"
 msgstr "Crea una carpeta de correo nueva"
 
-#: ../mail/mail-component.c:1080
+#: ../mail/mail-component.c:1079
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Falló al actualizar la configuración de correo o carpetas."
 
-#: ../mail/mail-component.c:1596
+#: ../mail/mail-component.c:1595
 msgid "Error"
 msgstr "Error"
 
-#: ../mail/mail-component.c:1596
+#: ../mail/mail-component.c:1595
 msgid "Errors"
 msgstr "Errores"
 
-#: ../mail/mail-component.c:1597
+#: ../mail/mail-component.c:1596
 msgid "Warnings and Errors"
 msgstr "Avisos y errores"
 
-#: ../mail/mail-component.c:1598
+#: ../mail/mail-component.c:1597
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../mail/mail-component.c:1598
+#: ../mail/mail-component.c:1597
 msgid "Error, Warnings and Debug messages"
 msgstr "Mensajes de error, avisos y depuración"
 
-#: ../mail/mail-component.c:1725
+#: ../mail/mail-component.c:1724
 msgid "Debug Logs"
 msgstr "Depuración de sucesos"
 
-#: ../mail/mail-component.c:1739
+#: ../mail/mail-component.c:1738
 msgid "Show _errors in the status bar for"
 msgstr "Mostrar _errores en la barra de estado para"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1755
+#: ../mail/mail-component.c:1754
 msgid "second(s)."
 msgstr "segundo(s)."
 
-#: ../mail/mail-component.c:1761
+#: ../mail/mail-component.c:1760
 msgid "Log Messages:"
 msgstr "Mensajes de sucesos:"
 
-#: ../mail/mail-component.c:1802
+#: ../mail/mail-component.c:1801
 msgid "Log Level"
 msgstr "Nivel de sucesos"
 
-#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1810 ../widgets/misc/e-dateedit.c:391
 msgid "Time"
 msgstr "Hora"
 
-#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
+#: ../mail/mail-component.c:1820 ../mail/message-list.c:2516
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensajes"
 
-#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1829 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Cierra esta ventana"
@@ -14676,66 +14744,74 @@ msgid "S_tandard Font:"
 msgstr "Tipografía _estándar:"
 
 #: ../mail/mail-config.glade.h:132
+msgid "Select Drafts Folder"
+msgstr "Seleccionar la carpeta de borradores"
+
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font"
 msgstr "Selecciona letra de anchura fija para HTML"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecciona letra de anchura fija en HTML para imprimir"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font"
 msgstr "Selecciona letra de anchura variable en HTML"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font for printing"
 msgstr "Selecciona letra de anchura variable en HTML para imprimir"
 
 #: ../mail/mail-config.glade.h:137
+msgid "Select Sent Folder"
+msgstr "Seleccionar la carpeta de enviados"
+
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "Envío de correo"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "Carpeta de _mensajes enviados:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requiere autenticación"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:142
 msgid "Server _Type: "
 msgstr "_Tipo de servidor: "
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "Certificado de _firma:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "_Firma:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "Firmas"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "Tabla de firmas"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "Ortografía"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "Comenzar a _escribir en la parte final al responder"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
 msgid "T_ype: "
 msgstr "_Tipo: "
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14743,7 +14819,7 @@ msgstr ""
 "La lista de idiomas de aquí refleja únicamente los idiomas para los cuáles "
 "hay instalado un diccionario."
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14753,7 +14829,7 @@ msgstr ""
 "firma. El nombre que especifique se usará\n"
 "únicamente para mostrarlo por pantalla. "
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:154
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14761,26 +14837,26 @@ msgstr ""
 " Teclee el nombre por el que quiere identificar a esta cuenta.\n"
 " Por ejemplo: «Trabajo» o «Personal»"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:156
 msgid "Us_ername:"
 msgstr "_Usuario:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:157
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticación"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
+#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:284
 #: ../plugins/google-account-setup/google-source.c:625
 #: ../plugins/google-account-setup/google-contacts-source.c:278
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "_Usuario:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:159
 msgid "V_ariable-width:"
 msgstr "An_chura variable:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:160
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14790,126 +14866,126 @@ msgstr ""
 "\n"
 "Pulse «Adelante» para comenzar. "
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:163
 msgid "_Add Signature"
 msgstr "_Añadir firma"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:164
 msgid "_Always load images from the Internet"
 msgstr "_Siempre cargar las imágenes desde Internet"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:165
 msgid "_Automatic proxy configuration URL:"
 msgstr "URL para la configuración _automática del proxy:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:166
 msgid "_Default junk plugin:"
 msgstr "Complemento SPAM pre_determinado:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:167
 msgid "_Direct connection to the Internet"
 msgstr "Conexión _directa a Internet"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:168
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 "No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:170
 msgid "_Forward style:"
 msgstr "_Estilo de reenvío:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:171
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Mantener la firma por encima del mensaje original al responder"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:172
 msgid "_Load images in messages from contacts"
 msgstr "_Cargar imágenes en los correo de mis contactos"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:173
 msgid "_Lookup in local address book only"
 msgstr "_Buscar sólo en la libreta de direcciones local"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:174
 msgid "_Make this my default account"
 msgstr "_Hacer que ésta sea mi cuenta predeterminada"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:175
 msgid "_Manual proxy configuration:"
 msgstr "Configuración _manual del proxy:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:176
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensajes como leídos tras"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:178
 msgid "_Never load images from the Internet"
 msgstr "_Nunca cargar imágenes desde Internet"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:179
 msgid "_Path:"
 msgstr "R_uta:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:180
 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.glade.h:179
+#: ../mail/mail-config.glade.h:181
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pr_eguntar al enviar mensajes con el asunto vacío"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:182
 msgid "_Reply style:"
 msgstr "Estilo de _respuesta:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:183
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:184
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _seguro:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:185
 msgid "_Select..."
 msgstr "_Seleccionar…"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:188
 msgid "_Show image animations"
 msgstr "_Mostrar animaciones"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:189
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Mostrar la foto del remitente en la vista previa del correo-e"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:190
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Reducir las cabeceras Para / Cc / Cco a "
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:191
 msgid "_Use Secure Connection:"
 msgstr "_Usar conexión segura:"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:192
 msgid "_Use system defaults"
 msgstr "_Usar los valores predeterminados del sistema"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:193
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar las mismas tipografías que en otras aplicaciones"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "direcciones"
 
 # Esta traducción debe mantenerse así
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr " "
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "descripción"
 
@@ -15009,26 +15085,26 @@ msgstr "_Marca:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Marque esto para aceptar el acuerdo de licencia"
 
-#: ../mail/mail-folder-cache.c:845
+#: ../mail/mail-folder-cache.c:833
 #, c-format
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:106
 msgid "Filtering Selected Messages"
 msgstr "Filtrado de mensajes seleccionados"
 
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
+#: ../mail/mail-ops.c:561
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "No se pudieron aplicar los filtros al correo saliente: %s"
 
-#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15037,123 +15113,123 @@ msgstr ""
 "No es posible anexar a %s: %s\n"
 "Se anexará a la carpeta local «Correo enviado» en su lugar."
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "No es posible anexar a la carpeta local «Correo enviado»: %s"
 
-#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:725
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Falló al enviar %d de %d mensajes"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:698
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:700
 msgid "Complete."
 msgstr "Completado."
 
-#: ../mail/mail-ops.c:871
+#: ../mail/mail-ops.c:872
 msgid "Saving message to folder"
 msgstr "Guardando mensaje en la carpeta"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: ../mail/mail-ops.c:1166
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "Mensajes reenviados"
 
-#: ../mail/mail-ops.c:1207
+#: ../mail/mail-ops.c:1208
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: ../mail/mail-ops.c:1272
+#: ../mail/mail-ops.c:1273
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Obteniendo la información de la cuota para la carpeta %s"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo almacén %s"
 
-#: ../mail/mail-ops.c:1412
+#: ../mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: ../mail/mail-ops.c:1501
+#: ../mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta «%s»"
 
-#: ../mail/mail-ops.c:1564
+#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando y almacenando cuenta «%s»"
 
-#: ../mail/mail-ops.c:1565
+#: ../mail/mail-ops.c:1595
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando cuenta «%s»"
 
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1649
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
+#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
 msgid "Expunging folder"
 msgstr "Compactando carpeta"
 
-#: ../mail/mail-ops.c:1706
+#: ../mail/mail-ops.c:1736
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vaciando papelera en «%s»"
 
-#: ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1737
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
-#: ../mail/mail-ops.c:1788
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: ../mail/mail-ops.c:1895
+#: ../mail/mail-ops.c:1925
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Descargando %d mensaje"
 msgstr[1] "Descargando %d mensajes"
 
-#: ../mail/mail-ops.c:1980
+#: ../mail/mail-ops.c:2010
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Guardando %d mensaje"
 msgstr[1] "Guardando %d mensajes"
 
-#: ../mail/mail-ops.c:2058
+#: ../mail/mail-ops.c:2088
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15162,11 +15238,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2130
+#: ../mail/mail-ops.c:2160
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
+#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15175,27 +15251,27 @@ msgstr ""
 "No es posible crear el archivo de salida: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2171
+#: ../mail/mail-ops.c:2201
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No es posible escribir datos: %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
 
-#: ../mail/mail-ops.c:2413
+#: ../mail/mail-ops.c:2443
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando la cuenta «%s» para desconexión"
 
-#: ../mail/mail-ops.c:2499
+#: ../mail/mail-ops.c:2529
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
@@ -15211,39 +15287,39 @@ msgstr "Enviar y recibir correo"
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:502
 msgid "Updating..."
 msgstr "Actualizando…"
 
-#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
+#: ../mail/mail-send-recv.c:502 ../mail/mail-send-recv.c:578
 msgid "Waiting..."
 msgstr "Esperando…"
 
-#: ../mail/mail-send-recv.c:799
+#: ../mail/mail-send-recv.c:804
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando correo nuevo"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduzca la contraseña para %s"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:211
 msgid "Enter Passphrase"
 msgstr "Introduzca la contraseña"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 #: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseña para %s"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:216
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: ../mail/mail-session.c:256
+#: ../mail/mail-session.c:258
 msgid "User canceled operation."
 msgstr "El usuario canceló la operación."
 
@@ -15566,7 +15642,7 @@ msgstr "Error al efectuar operación."
 
 #: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
-msgstr "Error al {0}."
+msgstr "Error mientras estaba {0}."
 
 #: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
@@ -15924,79 +16000,79 @@ msgstr "C_ompactar"
 msgid "_Open Messages"
 msgstr "_Abrir mensajes"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Seen"
 msgstr "Visto"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Answered"
 msgstr "Contestado"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Forwarded"
 msgstr "Reenviado"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1057
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1058
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1062
 msgid "Lowest"
 msgstr "La más baja"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1063
 msgid "Lower"
 msgstr "Más baja"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1067
 msgid "Higher"
 msgstr "Más alta"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1068
 msgid "Highest"
 msgstr "La más alta"
 
-#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1657 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1664 ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1673 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1685 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %e %l:%M %p"
 
-#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1695 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%e %b %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3916 ../mail/message-list.c:4376
+#: ../mail/message-list.c:3978 ../mail/message-list.c:4438
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
-#: ../mail/message-list.c:4224
+#: ../mail/message-list.c:4286
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -16004,7 +16080,7 @@ 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:4226
+#: ../mail/message-list.c:4288
 msgid "There are no messages in this folder."
 msgstr "No hay mensajes en esta carpeta."
 
@@ -16037,6 +16113,11 @@ msgstr "Mensajes enviados"
 msgid "Size"
 msgstr "Tamaño"
 
+#: ../mail/message-list.etspec.h:19
+#, fuzzy
+msgid "Subject - Trimmed"
+msgstr "Campo A_sunto"
+
 #: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Llamar"
@@ -16125,8 +16206,8 @@ 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:474
-#: ../plugins/templates/templates.c:394
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/templates/templates.c:392
 msgid "Keywords"
 msgstr "Palabras clave"
 
@@ -16160,9 +16241,10 @@ msgid "_Edit Message"
 msgstr "_Editar mensaje"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+#, fuzzy
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
+"play them directly from Evolution."
 msgstr ""
 "Un complemento de formato que muestra los adjuntos de sonido en línea y "
 "permite reproducirlos directamente desde evolution."
@@ -16394,40 +16476,40 @@ msgstr "R_estaurar ajustes…"
 msgid "_Backup Settings..."
 msgstr "_Respaldar ajustes…"
 
-#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactos automáticos"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:567
+#: ../plugins/bbdb/bbdb.c:639
 msgid "_Auto-create address book entries when replying to messages"
 msgstr ""
 "Crear entradas _automáticamente en la libreta de direcciones al responder "
 "correos"
 
-#: ../plugins/bbdb/bbdb.c:573
+#: ../plugins/bbdb/bbdb.c:645
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccione la libreta para contactos automáticos"
 
-#: ../plugins/bbdb/bbdb.c:588
+#: ../plugins/bbdb/bbdb.c:660
 msgid "Instant Messaging Contacts"
 msgstr "Contactos de mensajería instantánea"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:603
+#: ../plugins/bbdb/bbdb.c:675
 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:609
+#: ../plugins/bbdb/bbdb.c:681
 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:620
+#: ../plugins/bbdb/bbdb.c:692
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar con la lista de _contactos de MI ahora"
 
@@ -16671,16 +16753,16 @@ msgstr ""
 "Proporciona funcionalidad para marcar un calendario o una libreta de "
 "direcciones como el o la predeterminada."
 
-#: ../plugins/email-custom-header/email-custom-header.c:558
+#: ../plugins/email-custom-header/email-custom-header.c:560
 msgid "_Custom Header"
 msgstr "_Cabeceras personalizadas"
 
-#: ../plugins/email-custom-header/email-custom-header.c:879
+#: ../plugins/email-custom-header/email-custom-header.c:881
 msgid "Key"
 msgstr "Clave"
 
-#: ../plugins/email-custom-header/email-custom-header.c:890
-#: ../plugins/templates/templates.c:400
+#: ../plugins/email-custom-header/email-custom-header.c:892
+#: ../plugins/templates/templates.c:398
 msgid "Values"
 msgstr "Valores"
 
@@ -16739,12 +16821,12 @@ msgid "_User:"
 msgstr "_Usuario:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:61
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
 msgid "Secure Password"
 msgstr "Contraseña segura"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:64
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -16752,11 +16834,11 @@ msgstr ""
 "Esta opción conectará con el servidor Exchange usando autenticación con "
 "contraseña segura (NTLM)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "Contraseña en texto simple"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -16764,11 +16846,11 @@ msgstr ""
 "Esta opción conectará con el servidor Exchange usando autenticación con "
 "contraseña estándar de texto simple."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:263
 msgid "Out Of Office"
 msgstr "Fuera de la oficina"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:270
 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."
@@ -16776,88 +16858,88 @@ msgstr ""
 "El mensaje especificado abajo se enviará automáticamente a cada\n"
 "persona que le envíe correo mientras está fuera de la oficina."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:282
+#: ../plugins/exchange-operations/exchange-account-setup.c:287
 msgid "I am out of the office"
 msgstr "Ahora estoy fuera de la oficina"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/exchange-operations/exchange-account-setup.c:286
 msgid "I am in the office"
 msgstr "Ahora estoy en la oficina"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:334
 msgid "Change the password for Exchange account"
 msgstr "Cambie la contraseña para la cuenta de Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:336
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:341
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Gestione los ajustes de delegaciones para la cuenta Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
 msgid "Delegation Assistant"
 msgstr "Asistente de delegaciones"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:355
 msgid "Miscelleneous"
 msgstr "Misceláneo"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:365
 msgid "View the size of all Exchange folders"
 msgstr "Vea el tamaño de todas las carpetas Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:367
 msgid "Folders Size"
 msgstr "Tamaño de las carpetas"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Configuración de Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
+#: ../plugins/exchange-operations/exchange-account-setup.c:696
 msgid "_OWA URL:"
 msgstr "URL _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
+#: ../plugins/exchange-operations/exchange-account-setup.c:722
 msgid "A_uthenticate"
 msgstr "A_utenticar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#: ../plugins/exchange-operations/exchange-account-setup.c:743
 msgid "_Mailbox:"
 msgstr "_Buzón:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:944
 msgid "_Authentication Type"
 msgstr "Tipo de _autenticación"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
+#: ../plugins/exchange-operations/exchange-account-setup.c:958
 msgid "Ch_eck for Supported Types"
 msgstr "_Comprobar tipos soportados "
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1062
-#: ../plugins/exchange-operations/exchange-contacts.c:212
+#: ../plugins/exchange-operations/exchange-account-setup.c:1073
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KiB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1064
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-account-setup.c:1075
+#: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KiB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#: ../plugins/exchange-operations/exchange-calendar.c:196
+#: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -16902,32 +16984,32 @@ msgstr "Su contraseña actual ha caducado. Cambie su contraseña ahora."
 msgid "Your password will expire in the next %d days"
 msgstr "Su contraseña caducará en los siguientes %d días"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-delegates-user.c:154
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates-user.c:184
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Editor (lectura, creación, edición)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates-user.c:188
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Autor (lectura, creación)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Revisor (sólo lectura)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Permisos de delegados"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-delegates-user.c:253
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
@@ -16936,7 +17018,7 @@ msgstr "Permisos para %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:341
+#: ../plugins/exchange-operations/exchange-delegates-user.c:343
 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."
@@ -16946,25 +17028,25 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
 msgid "You have been given the following permissions on my folders:"
 msgstr "Se le han otorgado los siguientes permisos sobre mis carpetas:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:364
+#: ../plugins/exchange-operations/exchange-delegates-user.c:366
 msgid "You are also permitted to see my private items."
 msgstr "También se le permite ver mis elementos privados."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
 msgid "However you are not permitted to see my private items."
 msgstr "No obstante no se le permite ver mis elementos privados."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Ha sido designado como delegado para %s"
@@ -17167,8 +17249,8 @@ msgstr "Añadir usuario:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:934
-#: ../plugins/groupwise-features/share-folder.c:715
+#: ../plugins/groupwise-features/proxy.c:937
+#: ../plugins/groupwise-features/share-folder.c:716
 msgid "Add User"
 msgstr "Añadir usuario"
 
@@ -17286,11 +17368,11 @@ msgstr "_Sensibilidad: "
 msgid "_User"
 msgstr "_Usuario"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:138
+#: ../plugins/exchange-operations/exchange-user-dialog.c:136
 msgid "Select User"
 msgstr "Seleccionar usuario"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+#: ../plugins/exchange-operations/exchange-user-dialog.c:174
 msgid "Address Book..."
 msgstr "Libreta de direcciones…"
 
@@ -17745,10 +17827,6 @@ msgstr ""
 "almacenada en ~/.evolution/faces Ésta opción se usará en los correos que se "
 "envíen a partir de ahora."
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "Cara"
-
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -17810,7 +17888,7 @@ msgid "<b>Server</b>"
 msgstr "<b>Servidor</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar and contacts."
+msgid "A plugin to setup Google Calendar and Contacts."
 msgstr ""
 "Un complemento para configurar el calendario y los contactos de Google."
 
@@ -17823,16 +17901,16 @@ msgid "Checklist"
 msgstr "Lista de comprobación"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
+msgid "A plugin to setup GroupWise calendar and contacts sources."
 msgstr ""
 "Un complemento para configurar fuentes de calendarios y contactos para "
-"trabajo en grupo."
+"GroupWise."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
-msgstr "Configuración de la cuenta Groupwise"
+msgid "GroupWise Account Setup"
+msgstr "Configuración de la cuenta GroupWise"
 
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17857,11 +17935,11 @@ msgstr ""
 "Pulse «Reenviar» para instalar la carpeta compartida\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:225
 msgid "Install the shared folder"
 msgstr "Instalar la carpeta compartida"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:227
 msgid "Shared Folder Installation"
 msgstr "Instalación de carpeta compartida"
 
@@ -17887,7 +17965,7 @@ msgid "Email:"
 msgstr "Correo-e:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "_Desactivar"
 
@@ -17920,16 +17998,16 @@ msgid "Retract Mail"
 msgstr "Retractar correo"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to groupwise messages"
-msgstr "Añadir opciones de envío a los mensajes de Groupwise"
+msgid "Add Send Options to GroupWise messages"
+msgstr "Añadir opciones de envío a los mensajes de GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
-msgstr "Un complemento para las características en las cuentas Groupwise."
+msgid "A plugin for the features in GroupWise accounts."
+msgstr "Un complemento para las características en las cuentas GroupWise."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
-msgstr "Características Groupwise"
+msgid "GroupWise Features"
+msgstr "Características de GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
 msgid "Message retract failed"
@@ -17945,20 +18023,23 @@ msgstr "El servidor no permitió que se retractase el mensaje seleccionado."
 msgid "Invalid user"
 msgstr "Usuario no válido"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#. 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-errors.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "No se puede dar acceso proxy al usuario «{0}»"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
 msgid "Specify User"
 msgstr "Especificar usuario"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#. 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-errors.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "Ya ha otorgado permisos proxy a este usuario."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+#. 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-errors.xml.h:8
 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 "
@@ -17984,23 +18065,24 @@ msgstr ""
 msgid "This is a recurring meeting"
 msgstr "Esta es una cita repetitiva"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 msgid "Would you like to accept it?"
 msgstr "¿Quiere aceptarlo?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "Would you like to decline it?"
 msgstr "¿Quiere rechazarlo?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 msgstr ""
-"No puede compartir la carpeta con el usuario especificado &quot;{0}&quot;"
+"No puede compartir la carpeta con el usuario &quot;{0}&quot; especificado"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
-msgid "You have to specify a user name whom you want to add to the list"
-msgstr ""
-"Tiene que especificar el nombre de usuario que quiere añadir a la lista"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+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"
 
 #: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
@@ -18100,10 +18182,10 @@ msgstr "<b>Nombre de la cuenta</b>"
 msgid "Proxy Login"
 msgstr "Sesión proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
 #: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:83
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s Introduzca la contraseña para %s (usuario %s)"
@@ -18111,22 +18193,28 @@ msgstr "%s Introduzca la contraseña para %s (usuario %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:509
+#: ../plugins/groupwise-features/proxy-login.c:510
 msgid "_Proxy Login..."
 msgstr "Sesión _proxy…"
 
-#: ../plugins/groupwise-features/proxy.c:691
+#. 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:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "La solapa del Proxy estará disponible sólo cuando la cuenta esté conectada."
 
-#: ../plugins/groupwise-features/proxy.c:696
+#. 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:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "La solapa del Proxy estará disponible sólo cuando la cuenta esté activada."
 
+#: ../plugins/groupwise-features/send-options.c:215
+msgid "Advanced send options"
+msgstr "Opciones de envío avanzadas"
+
 #: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:750
+#: ../plugins/groupwise-features/share-folder.c:751
 msgid "Users"
 msgstr "Usuarios"
 
@@ -18142,68 +18230,68 @@ msgstr "Carpeta compartida _nueva…"
 msgid "Sharing"
 msgstr "Compartir"
 
-#: ../plugins/groupwise-features/share-folder.c:533
+#: ../plugins/groupwise-features/share-folder.c:534
 msgid "Custom Notification"
 msgstr "Notificación personalizada"
 
-#: ../plugins/groupwise-features/share-folder.c:755
+#: ../plugins/groupwise-features/share-folder.c:756
 msgid "Add   "
 msgstr "Añadir   "
 
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:762
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../plugins/groupwise-features/status-track.c:105
+#: ../plugins/groupwise-features/status-track.c:107
 msgid "Message Status"
 msgstr "Estado del mensaje"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:119
+#: ../plugins/groupwise-features/status-track.c:121
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: ../plugins/groupwise-features/status-track.c:133
+#: ../plugins/groupwise-features/status-track.c:135
 msgid "From:"
 msgstr "De:"
 
-#: ../plugins/groupwise-features/status-track.c:148
+#: ../plugins/groupwise-features/status-track.c:150
 msgid "Creation date:"
 msgstr "Fecha de creación:"
 
-#: ../plugins/groupwise-features/status-track.c:187
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:196
 msgid "Delivered: "
 msgstr "Entregado: "
 
-#: ../plugins/groupwise-features/status-track.c:200
+#: ../plugins/groupwise-features/status-track.c:202
 msgid "Opened: "
 msgstr "Abierto: "
 
-#: ../plugins/groupwise-features/status-track.c:205
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Accepted: "
 msgstr "Aceptado: "
 
-#: ../plugins/groupwise-features/status-track.c:210
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Deleted: "
 msgstr "Borrado: "
 
-#: ../plugins/groupwise-features/status-track.c:215
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Declined: "
 msgstr "Rechazado: "
 
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:222
 msgid "Completed: "
 msgstr "Completado: "
 
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:227
 msgid "Undelivered: "
 msgstr "Sin entregar: "
 
-#: ../plugins/groupwise-features/status-track.c:249
+#: ../plugins/groupwise-features/status-track.c:251
 msgid "Track Message Status..."
 msgstr "Seguir el estado del mensaje…"
 
@@ -18307,11 +18395,11 @@ msgstr "Importar al calendario"
 msgid "Imports ICS attachments to calendar."
 msgstr "Importa adjuntos ICS al calendario."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "La capa de abstracción de hardware (HAL) no está cargada"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -18320,11 +18408,11 @@ msgstr ""
 "el servicio y vuelva a este programa o contacte con el administrador de su "
 "sistema."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
 msgid "Search for an iPod failed"
 msgstr "Falló la búsqueda de un iPod"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
 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."
@@ -18332,8 +18420,8 @@ msgstr ""
 "Evolution no pudo encontrar un iPod con el que sincronizarse. O no está "
 "conectado al sistema o no está encendido."
 
-#: ../plugins/ipod-sync/ical-format.c:118
-#: ../plugins/save-calendar/ical-format.c:163
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
 msgid "iCalendar format (.ics)"
 msgstr "Formato iCalendar (.ics)"
 
@@ -18351,130 +18439,130 @@ msgstr "Sincronizar con iPod"
 msgid "iPod Synchronization"
 msgstr "Sincronización con iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:443
-#: ../plugins/itip-formatter/itip-formatter.c:568
+#: ../plugins/itip-formatter/itip-formatter.c:481
+#: ../plugins/itip-formatter/itip-formatter.c:606
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "No es posible cargar el calendario «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:588
+#: ../plugins/itip-formatter/itip-formatter.c:626
 #, 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:614
+#: ../plugins/itip-formatter/itip-formatter.c:652
 #, 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:690
+#: ../plugins/itip-formatter/itip-formatter.c:738
 msgid "Unable to find any calendars"
 msgstr "No se puede encontrar ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:745
 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:701
+#: ../plugins/itip-formatter/itip-formatter.c:749
 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:705
+#: ../plugins/itip-formatter/itip-formatter.c:753
 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:776
+#: ../plugins/itip-formatter/itip-formatter.c:824
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando una versión existente de esta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:945
+#: ../plugins/itip-formatter/itip-formatter.c:993
 msgid "Unable to parse item"
 msgstr "No es posible interpretar el elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1003
+#: ../plugins/itip-formatter/itip-formatter.c:1051
 #, 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:1015
+#: ../plugins/itip-formatter/itip-formatter.c:1063
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado al calendario «%s» como aceptado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1067
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado al calendario «%s» como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1072
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado al calendario «%s» como rehusado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1077
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado al calendario «%s» como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1171
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "El organizador ha quitado al delegado %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1178
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviar una notificación de cancelación al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1180
 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:1218
+#: ../plugins/itip-formatter/itip-formatter.c:1266
 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:1245
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "No es posible actualizar la asistencia. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1297
 msgid "Attendee status updated"
 msgstr "Estado de asistencia actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1323
 msgid "Meeting information sent"
 msgstr "Información de reunión enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1326
 msgid "Task information sent"
 msgstr "Información de la tarea enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1329
 msgid "Memo information sent"
 msgstr "Información de la nota enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1338
 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:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1341
 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:1296
+#: ../plugins/itip-formatter/itip-formatter.c:1344
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "No se puede enviar la información de la nota, la nota no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1365
-#: ../plugins/itip-formatter/itip-formatter.c:1376
+#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1424
 msgid "The calendar attached is not valid"
 msgstr "El calendario adjunto no es válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1414
+#: ../plugins/itip-formatter/itip-formatter.c:1425
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18482,15 +18570,15 @@ msgstr ""
 "El mensaje dice contener un calendario, pero el calendario no es un "
 "iCalendar válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
-#: ../plugins/itip-formatter/itip-formatter.c:1435
-#: ../plugins/itip-formatter/itip-formatter.c:1517
+#: ../plugins/itip-formatter/itip-formatter.c:1465
+#: ../plugins/itip-formatter/itip-formatter.c:1493
+#: ../plugins/itip-formatter/itip-formatter.c:1575
 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:1418
-#: ../plugins/itip-formatter/itip-formatter.c:1436
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1466
+#: ../plugins/itip-formatter/itip-formatter.c:1494
+#: ../plugins/itip-formatter/itip-formatter.c:1576
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18498,11 +18586,11 @@ msgstr ""
 "El mensaje contiene un calendario, pero el calendario no contiene ningún "
 "acontecimiento, tarea o información de disponibilidad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1447
+#: ../plugins/itip-formatter/itip-formatter.c:1505
 msgid "The calendar attached contains multiple items"
 msgstr "El calendario adjunto contiene elementos múltiples"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1506
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18510,31 +18598,31 @@ msgstr ""
 "Para procesar todos estos elementos, el archivo debería guardarse y el "
 "calendario importarse"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2213
 msgid "This meeting recurs"
 msgstr "Esta reunión se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2216
 msgid "This task recurs"
 msgstr "Esta tarea se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2219
 msgid "This memo recurs"
 msgstr "Esta nota se repite"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2455
 msgid "_Delete message after acting"
 msgstr "_Borrar el mensaje después de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2465
+#: ../plugins/itip-formatter/itip-formatter.c:2497
 msgid "Conflict Search"
 msgstr "Búsqueda de conflictos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2480
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione los calendario en los que buscar conflictos entre reuniones"
 
@@ -19006,11 +19094,11 @@ msgstr "_Aplicar a todas las instancias"
 msgid "Show time as _free"
 msgstr "Mostrar hora como _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1870
 msgid "_Tasks :"
 msgstr "_Tareas:"
 
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1872
 msgid "Memos :"
 msgstr "Notas:"
 
@@ -19037,7 +19125,7 @@ msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "Esta respuesta no es de un asistente. ¿Desea añadirlo como asistente?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr "_Cerrar sesión proxy"
 
@@ -19126,20 +19214,20 @@ msgstr ""
 "Indica si se deben notificar sólo los mensajes en la carpeta bandeja de "
 "entrada."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "Generar un mensaje _D-Bus"
 
-#: ../plugins/mail-notification/mail-notification.c:377
+#: ../plugins/mail-notification/mail-notification.c:378
 msgid "Evolution's Mail Notification"
 msgstr "Notificación de correo de Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:399
 msgid "Mail Notification Properties"
 msgstr "Propiedades de la notificación de correo"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19154,55 +19242,55 @@ msgstr[1] ""
 "Ha recibido %d mensajes nuevos\n"
 "en %s."
 
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../plugins/mail-notification/mail-notification.c:463
 #, 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:479
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:480
+#: ../plugins/mail-notification/mail-notification.c:485
 msgid "New email"
 msgstr "Nuevo correo-e"
 
-#: ../plugins/mail-notification/mail-notification.c:541
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "Show icon in _notification area"
 msgstr "Mostrar icono en el área de _notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:547
 msgid "B_link icon in notification area"
 msgstr "Icono pa_rpadeante en el área de notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:549
 msgid "Popup _message together with the icon"
 msgstr "_Mensaje emergente junto con el icono"
 
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:730
 msgid "_Play sound when new messages arrive"
 msgstr "Re_producir un sonido cuando llegue correo nuevo"
 
-#: ../plugins/mail-notification/mail-notification.c:733
+#: ../plugins/mail-notification/mail-notification.c:736
 msgid "_Beep"
 msgstr "_Pitar"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:737
 msgid "Play _sound file"
 msgstr "Reproducir archivo de _sonido"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Specify _filename:"
 msgstr "Especificar nombre de a_rchivo:"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:749
 msgid "Select sound file"
 msgstr "Seleccione un arhivo de sonido"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:750
 msgid "Pl_ay"
 msgstr "Reprod_ucir"
 
-#: ../plugins/mail-notification/mail-notification.c:804
+#: ../plugins/mail-notification/mail-notification.c:807
 msgid "Notify new messages for _Inbox only"
 msgstr "Notificar nuevos mensajes sólo para la _bandeja de entrada"
 
@@ -19473,22 +19561,6 @@ msgstr "Marcar los mensajes como _leídos"
 msgid "Used for marking all the messages under a folder as read"
 msgstr "Se usa para marcar todos los mensajes bajo una carpeta como leídos"
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "Marcar calendario como desconectado"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "Marcar el calendario seleccionado para verlo desconectado."
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make available for offline use"
-msgstr "_No hacer esto disponible sin conexión"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Make available for offline use"
-msgstr "_Hacer esto disponible para su uso desconectado"
-
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
 msgstr "Un complemento que implementa complementos en mono."
@@ -19599,9 +19671,9 @@ msgstr "Lugares"
 msgid "_Publish Calendar Information"
 msgstr "_Publicar información del calendario"
 
-#: ../plugins/publish-calendar/publish-calendar.c:595
-msgid "Are you sure you want to remove this URL?"
-msgstr "¿Seguro que quiere eliminar esta URL?"
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "Are you sure you want to remove this location?"
+msgstr "¿Seguro que quiere eliminar este lugar?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
@@ -19639,7 +19711,7 @@ msgstr "_Frecuencia de publicación:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
 msgid ""
-"SSH\n"
+"Secure FTP (SSH)\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -19647,7 +19719,7 @@ msgid ""
 "Secure WebDAV (HTTPS)\n"
 "Custom Location"
 msgstr ""
-"SSH\n"
+"FTP seguro (SSH)\n"
 "FTP público\n"
 "FTP (con autorización)\n"
 "Compartición Windows\n"
@@ -19704,59 +19776,59 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Probar el complemento para el cargador Python EPlugin."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using python."
+msgid "A plugin which loads other plugins written using Python."
 msgstr "Un complemento que carga otros complementos escritos en Python."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
 msgstr "Cargador de Python"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (integrado)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "No se encontró SpamAssasin, código: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Falló al crear la tubería: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Error después de bifurcar: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "El proceso hijo de SpamAssasin no está respondiendo, matándolo..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
 #, c-format
-msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr ""
 "Espere a que el proceso hijo de SpamAssasin se interrumpa, terminando..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Falló la tubería hacia SpamAssasin, código de error: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "SpamAssasin no está disponible."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Esto hará que SpamAssasin sea más exacto, pero más lento"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 msgid "I_nclude remote tests"
 msgstr "I_ncluir tests remotos"
 
@@ -19769,12 +19841,12 @@ msgstr ""
 "instale SpamAssassin."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "Complemento de filtro de SPAM SpamAssassin"
+msgid "SpamAssassin Options"
+msgstr "Opciones de SpamAssasin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "Opciones de SpamAssasin"
+msgid "SpamAssassin junk plugin"
+msgstr "Complemento de filtro de SPAM SpamAssassin"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -19784,7 +19856,7 @@ msgstr ""
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:314
+#: ../plugins/save-attachments/save-attachments.c:315
 msgid "Save attachments"
 msgstr "Guarda los adjuntos"
 
@@ -19796,15 +19868,15 @@ msgstr "Guardar adjuntos…"
 msgid "Save all attachments"
 msgstr "Guarda todos los adjuntos"
 
-#: ../plugins/save-attachments/save-attachments.c:320
+#: ../plugins/save-attachments/save-attachments.c:321
 msgid "Select save base name"
 msgstr "Seleccione el nombre base para guardar"
 
-#: ../plugins/save-attachments/save-attachments.c:339
+#: ../plugins/save-attachments/save-attachments.c:340
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:347
+#: ../plugins/save-attachments/save-attachments.c:348
 msgid "Save"
 msgstr "Guardar"
 
@@ -19812,79 +19884,79 @@ msgstr "Guardar"
 #. * 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:162
+#: ../plugins/save-calendar/csv-format.c:163
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "Lista de descripción"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "Lista de categorías"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "Lista de comentarios"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "Creado"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "Lista de contactos"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "Empieza"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "Termina"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "porcentaje terminado"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "Lista de participantes"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../plugins/save-calendar/csv-format.c:531
+#: ../plugins/save-calendar/csv-format.c:532
 msgid "Advanced options for the CSV format"
 msgstr "Opciones avanzadas para el formato CSV"
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Prepend a header"
 msgstr "Anteponer una cabecera"
 
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:548
 msgid "Value delimiter:"
 msgstr "Delimitador de valor:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:554
 msgid "Record delimiter:"
 msgstr "Delimitador de registro:"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "Encapsulate values with:"
 msgstr "Encapsular valores con:"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "Formato de valores separados por comas (.csv)"
 
@@ -19905,15 +19977,15 @@ msgstr "_Guardar al disco"
 #. * 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:149
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:376
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:160
+#: ../plugins/save-calendar/save-calendar.c:161
 msgid "Select destination file"
 msgstr "Seleccione el archivo de destino"
 
@@ -19945,15 +20017,15 @@ msgstr "Le guía a través de su configuración inicial de cuenta."
 msgid "Setup Assistant"
 msgstr "Asistente de configuración"
 
-#: ../plugins/startup-wizard/startup-wizard.c:83
+#: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "Asistente de configuración de Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:86
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "Bienvenido"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -19966,28 +20038,28 @@ msgstr ""
 "\n"
 "Por favor pulse el botón «Adelante» para continuar. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:133
+#: ../plugins/startup-wizard/startup-wizard.c:135
 msgid "Importing files"
 msgstr "Importando archivos"
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:137
 #: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccione la información que quiera importar:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../plugins/startup-wizard/startup-wizard.c:152
 #: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:232
 #: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Importando datos."
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:234
 #: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Por favor espere"
@@ -20019,15 +20091,15 @@ msgstr ""
 "Lista de pares de palabras clave y valores para que el complemento de "
 "plantillas sustituya en el cuerpo del mensaje."
 
-#: ../plugins/templates/templates.c:615
+#: ../plugins/templates/templates.c:613
 msgid "No title"
 msgstr "Sin título"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:741
 msgid "Save as _Template"
 msgstr "Guardar como plan_tilla"
 
-#: ../plugins/templates/templates.c:745
+#: ../plugins/templates/templates.c:743
 msgid "Save as Template"
 msgstr "Guardar como plantilla"
 
@@ -20036,8 +20108,8 @@ msgid "Drafts based template plugin"
 msgstr "Borradores basados en el complemento de plantillas"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses ytnef to decode tnef attachments."
-msgstr "Un complemento sencillo que usa ytnef para decodificar adjuntos TNEF."
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+msgstr "Un complemento sencillo que usa yTNEF para decodificar adjuntos TNEF."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Attachment decoder"
@@ -20062,7 +20134,7 @@ msgid "URL:"
 msgstr "URL:"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
-msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Evitar IfMatch (necesario en Apache < 2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -20450,7 +20522,7 @@ msgstr "No es posible ejecutar Bug Buddy."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:729
+#: ../shell/e-shell-window-commands.c:942
 msgid "translator-credits"
 msgstr ""
 "Jorge González <jorgegonz@svn.gnome.org>, 2007-2008\n"
@@ -20461,23 +20533,23 @@ msgstr ""
 "Eneko Lacunza <enlar@iname.com>, 2001-2002\n"
 "Carlos Perelló Marín <carlos@gnome-db.org>, 2000-2001"
 
-#: ../shell/e-shell-window-commands.c:740
+#: ../shell/e-shell-window-commands.c:953
 msgid "Evolution Website"
 msgstr "Página web de Evolution"
 
-#: ../shell/e-shell-window-commands.c:758
+#: ../shell/e-shell-window-commands.c:971
 msgid "Error opening the FAQ webpage."
 msgstr "Error al abrir la página web de P+F."
 
-#: ../shell/e-shell-window-commands.c:955
+#: ../shell/e-shell-window-commands.c:1168
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1181 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Trabajar desconectado"
 
-#: ../shell/e-shell-window-commands.c:981
+#: ../shell/e-shell-window-commands.c:1194
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
@@ -20683,18 +20755,22 @@ 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 start Evolution"
+msgstr "No se pudo iniciar Evolution"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "¿Seguro que quiere borrar los datos antiguos de la versión {0}?"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "Evolution no se pudo iniciar."
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:6
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -20702,15 +20778,15 @@ msgstr ""
 "Olvidar sus contraseñas borrará todas las contraseñas recordadas. Se le "
 "volverá a preguntar la próxima vez que se necesiten."
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "Espacio de disco insuficiente para la actualización."
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "¿Seguro que quiere borrar los datos antiguos?"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -20732,9 +20808,10 @@ msgstr ""
 "Una vez borrados, no podrá desactualizarse a la versión anterior de "
 "Evolution sin intervención manual.\n"
 
-#: ../shell/shell.error.xml.h:15
+#: ../shell/shell.error.xml.h:16
+#, fuzzy
 msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+"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 "
@@ -20748,11 +20825,11 @@ msgstr ""
 "se eliminará permanentemente. Si elije conservar estos datos, entonces puede "
 "eliminar manualmente el contenido de «evolution» a su conveniencia.\n"
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "La actualización desde la versión anterior ha fallado: {0}"
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:21
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -20766,7 +20843,7 @@ msgstr ""
 "Necesitará hacer más espacio libre en su carpeta personal antes de que pueda "
 "continuar."
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -20776,7 +20853,7 @@ msgstr ""
 "\n"
 "Pulse en ayuda para más detalles"
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -20791,19 +20868,19 @@ msgstr ""
 "\n"
 "Pulse en la ayuda para los detalles."
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "_Olvidar"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "_Conservar los datos"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "_Recordármelo más tarde"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
@@ -20873,7 +20950,7 @@ msgid "Purposes"
 msgstr "Propósito"
 
 #: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:570
+#: ../smime/lib/e-cert.c:553
 msgid "Serial Number"
 msgstr "Número de serie"
 
@@ -20991,7 +21068,7 @@ msgstr ""
 "Antes de confiar en esta AC para cualquier propósito, debería examinar su "
 "certificado y su directiva y procedimientos (si están disponibles)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
 msgid "Certificate"
 msgstr "Certificado"
 
@@ -21067,11 +21144,11 @@ msgstr "Unidad organizativa (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Huella SHA1"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
 msgstr "Certificado de cliente SSL"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "Certificado de servidor SSL"
 
@@ -21119,182 +21196,182 @@ msgid "_Edit CA Trust"
 msgstr "_Editar confianza en la AC"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:672
+#: ../smime/lib/e-cert-db.c:656
 msgid "Certificate already exists"
 msgstr "El certificado ya existe"
 
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%e/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:408
 msgid "Sign"
 msgstr "Firma"
 
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:409
 msgid "Encrypt"
 msgstr "Cifrado"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:514
 msgid "Version"
 msgstr "Versión"
 
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:529
 msgid "Version 1"
 msgstr "Versión 1"
 
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:532
 msgid "Version 2"
 msgstr "Versión 2"
 
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:535
 msgid "Version 3"
 msgstr "Versión 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:617
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:620
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:623
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:650
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 cifrado RSA"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:653
 msgid "Certificate Key Usage"
 msgstr "Uso de la clave del certificado"
 
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:656
 msgid "Netscape Certificate Type"
 msgstr "Tipo de certificado Netscape"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:659
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador de la clave de la autoridad del certificado"
 
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:671
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador del objeto (%s)"
 
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "Identificador del algoritmo"
 
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "Parámetros del algoritmo"
 
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr "Información del propósito de la clave pública"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr "Propósito del algoritmo de clave pública"
 
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr "Clave pública del propósito"
 
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
 msgid "Error: Unable to process extension"
 msgstr "Erro: No es posible procesar la extensión"
 
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr "Firmante del objeto"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "Autoridad certificadora SSL"
 
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr "Autoridad certificadora de correo"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:850
 msgid "Signing"
 msgstr "Firma"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:854
 msgid "Non-repudiation"
 msgstr "No repudio"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:858
 msgid "Key Encipherment"
 msgstr "Cifrado de la clave"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:862
 msgid "Data Encipherment"
 msgstr "Cifrado de datos"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:866
 msgid "Key Agreement"
 msgstr "Acuerdo de claves"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:870
 msgid "Certificate Signer"
 msgstr "Firmante del certificado"
 
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:874
 msgid "CRL Signer"
 msgstr "Firmante de la LRC"
 
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:922
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
 msgid "Not Critical"
 msgstr "No crítico"
 
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:948
 msgid "Extensions"
 msgstr "Extensiones"
 
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1019
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmo de firma del certificado"
 
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1084
 msgid "Issuer"
 msgstr "Emisor"
 
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1138
 msgid "Issuer Unique ID"
 msgstr "ID único del emisor"
 
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1157
 msgid "Subject Unique ID"
 msgstr "ID único del propósito"
 
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1200
 msgid "Certificate Signature Value"
 msgstr "Valor de la firma del certificado"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "Contraseña del archivo PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "Enter password for PKCS12 file:"
 msgstr "Introduzca la contraseña para el archivo PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:343
+#: ../smime/lib/e-pkcs12.c:348
 msgid "Imported Certificate"
 msgstr "Certificado importado"
 
@@ -21564,7 +21641,7 @@ msgid "Month"
 msgstr "Mes"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:196
+#: ../widgets/misc/e-calendar.c:195
 msgid "Next"
 msgstr "Siguiente"
 
@@ -21573,7 +21650,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Previsualiza el calendario a imprimir"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:172
+#: ../widgets/misc/e-calendar.c:171
 msgid "Previous"
 msgstr "Anterior"
 
@@ -22758,17 +22835,17 @@ msgid "Define Views for \"%s\""
 msgstr "Definir vistas para «%s»"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1922
+#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
-#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Tabla"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
 msgid "Instance"
 msgstr "Instancia"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Guardar vista actual"
 
@@ -22844,13 +22921,13 @@ msgstr "Tipo de vista:"
 msgid "Attachment Bar"
 msgstr "Barra de adjuntos"
 
-#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "No es posible adjuntar el archivo %s: %s"
 
-#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "No es posible adjuntar el archivo %s: no es un archivo normal"
@@ -22876,67 +22953,67 @@ msgstr "Sugerir mostrar adjuntos automáticamente"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:221
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "Calendario mensual"
 
-#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3643
 #: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "Color de relleno"
 
-#: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3650
 #: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
 #: ../widgets/text/e-text.c:3659
 msgid "GDK fill color"
 msgstr "Color de relleno GDK"
 
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3665
 #: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "Punteo de relleno"
 
-#: ../widgets/misc/e-canvas-background.c:481
 #: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:488
 #: ../widgets/misc/e-canvas-background.c:489
+#: ../widgets/misc/e-canvas-background.c:490
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:495
 #: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:497
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:502
 #: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:504
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
 #: ../widgets/table/e-table-group-container.c:999
 #: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3074
+#: ../widgets/table/e-table-item.c:3070
 msgid "Minimum width"
 msgstr "Ancho mínimo"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
 #: ../widgets/table/e-table-group-container.c:1000
 #: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3075
+#: ../widgets/table/e-table-item.c:3071
 msgid "Minimum Width"
 msgstr "Ancho mínimo"
 
 #: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:204
+#: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "Espaciado"
 
@@ -22949,7 +23026,7 @@ msgstr "Ahora"
 msgid "The time must be in the format: %s"
 msgstr "La fecha debe estar en el formato: %s"
 
-#: ../widgets/misc/e-cell-percent.c:79
+#: ../widgets/misc/e-cell-percent.c:78
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor del porcentaje debe estar entre 0 y 100, inclusive"
 
@@ -23048,55 +23125,55 @@ msgstr "Otro…"
 msgid "Ch_aracter Encoding"
 msgstr "C_odificación de caracteres"
 
-#: ../widgets/misc/e-dateedit.c:309
+#: ../widgets/misc/e-dateedit.c:305
 msgid "Date and Time"
 msgstr "Fecha y hora"
 
-#: ../widgets/misc/e-dateedit.c:330
+#: ../widgets/misc/e-dateedit.c:326
 msgid "Text entry to input date"
 msgstr "Entrada de texto para introducir la fecha"
 
-#: ../widgets/misc/e-dateedit.c:352
+#: ../widgets/misc/e-dateedit.c:348
 msgid "Click this button to show a calendar"
 msgstr "Pulse este botón para mostrar un calendario"
 
-#: ../widgets/misc/e-dateedit.c:394
+#: ../widgets/misc/e-dateedit.c:390
 msgid "Drop-down combination box to select time"
 msgstr "Caja combo desplegable para seleccionar la hora"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:466
 msgid "No_w"
 msgstr "_Ahora"
 
-#: ../widgets/misc/e-dateedit.c:476
+#: ../widgets/misc/e-dateedit.c:472
 msgid "_Today"
 msgstr "_Hoy"
 
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1637
 msgid "Invalid Date Value"
 msgstr "Valor de fecha inválido"
 
-#: ../widgets/misc/e-dateedit.c:1670
+#: ../widgets/misc/e-dateedit.c:1666
 msgid "Invalid Time Value"
 msgstr "Valor de hora inválido"
 
-#: ../widgets/misc/e-expander.c:180
+#: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "Expandido"
 
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:183
 msgid "Whether or not the expander is expanded"
 msgstr "Indica si el expansor está o no expandido"
 
-#: ../widgets/misc/e-expander.c:189
+#: ../widgets/misc/e-expander.c:191
 msgid "Text of the expander's label"
 msgstr "Texto de la etiqueta del expansor"
 
-#: ../widgets/misc/e-expander.c:196
+#: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr "Usar subrayado"
 
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:199
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -23104,31 +23181,31 @@ msgstr ""
 "Si se establece, un subrayado en el texto indica que el siguiente carácter "
 "debería usarse para la combinación de teclas mnemotécnica"
 
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
 msgstr "Espacio para poner entre la etiqueta y el descendiente"
 
-#: ../widgets/misc/e-expander.c:214
+#: ../widgets/misc/e-expander.c:216
 msgid "Label widget"
 msgstr "Etiqueta del widget"
 
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:217
 msgid "A widget to display in place of the usual expander label"
 msgstr "Un widget para mostrar en lugar de la etiqueta usual del expansor"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "Tamaño del expansor"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "Tamaño de la flecha del expansor"
 
-#: ../widgets/misc/e-expander.c:230
+#: ../widgets/misc/e-expander.c:232
 msgid "Indicator Spacing"
 msgstr "Indicador de espacio"
 
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:233
 msgid "Spacing around expander arrow"
 msgstr "Espaciado alrededor de la flecha del expansor"
 
@@ -23196,11 +23273,11 @@ msgstr ""
 "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:109
+#: ../widgets/misc/e-online-button.c:106
 msgid "Online"
 msgstr "En línea"
 
-#: ../widgets/misc/e-online-button.c:110
+#: ../widgets/misc/e-online-button.c:107
 msgid "The button state is online"
 msgstr "El botón de estado está en línea"
 
@@ -23216,47 +23293,47 @@ msgstr "Sincr. registros privados:"
 msgid "Sync Categories:"
 msgstr "Sincr. categorías:"
 
-#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
 msgid "Empty message"
 msgstr "Mensaje vacío"
 
-#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
 msgid "Reflow model"
 msgstr "Modelo de reflujo"
 
-#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
 msgid "Column width"
 msgstr "Anchura de columna"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Search"
 msgstr "Buscar"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Click here to change the search type"
 msgstr "Pulse aquí para cambiar el tipo de búsqueda"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Search"
 msgstr "_Buscar"
 
 # En conflicto con _Buscar del menu principal
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:609
 msgid "_Find Now"
 msgstr "B_uscar ahora"
 
 # Conflicto con _Ver del menú principal
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Clear"
 msgstr "Vacia_r"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Item ID"
 msgstr "ID de elemento"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Texto"
@@ -23264,29 +23341,29 @@ msgstr "Texto"
 # #En conflicto con _Mensaje
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1006
+#: ../widgets/misc/e-search-bar.c:1003
 msgid "Sho_w: "
 msgstr "M_ostrar: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1023
+#: ../widgets/misc/e-search-bar.c:1020
 msgid "Sear_ch: "
 msgstr "_Buscar: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1032
 msgid " i_n "
 msgstr " e_n "
 
 #: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:807
+#: ../widgets/table/e-tree-selection-model.c:806
 msgid "Cursor Row"
 msgstr "Cursor de fila"
 
 #: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:814
+#: ../widgets/table/e-tree-selection-model.c:813
 msgid "Cursor Column"
 msgstr "Cursor de columna"
 
@@ -23484,23 +23561,23 @@ msgstr "Columna enfocada"
 msgid "Unselected Column"
 msgstr "Columna deseleccionada"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Strikeout Column"
 msgstr "Tachar columna"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1814
 msgid "Underline Column"
 msgstr "Subrayar columna"
 
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1821
 msgid "Bold Column"
 msgstr "Columna en negrita"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1828
 msgid "Color Column"
 msgstr "Color de la columna"
 
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1842
 msgid "BG Color Column"
 msgstr "Color de fondo de la columna"
 
@@ -23538,7 +23615,7 @@ msgid "A_vailable Fields:"
 msgstr "Campos _disponibles:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -23551,7 +23628,7 @@ msgid "Clear _All"
 msgstr "Quitar _todo"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Descending"
 msgstr "Descendente"
 
@@ -23612,16 +23689,16 @@ msgid "_Sort..."
 msgstr "_Ordenar…"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:634
-#: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1887
+#: ../widgets/table/e-table-field-chooser-item.c:633
+#: ../widgets/table/e-table-field-chooser.c:66
+#: ../widgets/table/e-table-header-item.c:1886
 msgid "DnD code"
 msgstr "Código DnD"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:641
-#: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1901
+#: ../widgets/table/e-table-field-chooser-item.c:640
+#: ../widgets/table/e-table-field-chooser.c:73
+#: ../widgets/table/e-table-header-item.c:1900
 msgid "Full Header"
 msgstr "Cabecera completa"
 
@@ -23659,7 +23736,7 @@ msgstr[1] "%s (%d elementos)"
 #: ../widgets/table/e-table-group-container.c:923
 #: ../widgets/table/e-table-group-leaf.c:581
 #: ../widgets/table/e-table-group-leaf.c:582
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 msgid "Alternating Row Colors"
 msgstr "Alternar colores de las filas"
 
@@ -23667,8 +23744,8 @@ msgstr "Alternar colores de las filas"
 #: ../widgets/table/e-table-group-container.c:930
 #: ../widgets/table/e-table-group-leaf.c:588
 #: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
-#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr "Dibujar rejilla horizontal"
 
@@ -23676,8 +23753,8 @@ msgstr "Dibujar rejilla horizontal"
 #: ../widgets/table/e-table-group-container.c:937
 #: ../widgets/table/e-table-group-leaf.c:595
 #: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
-#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr "Dibujar rejilla vertical"
 
@@ -23685,8 +23762,8 @@ msgstr "Dibujar rejilla vertical"
 #: ../widgets/table/e-table-group-container.c:944
 #: ../widgets/table/e-table-group-leaf.c:602
 #: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
-#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
+#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
+#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr "Dibujar el foco"
 
@@ -23694,7 +23771,7 @@ msgstr "Dibujar el foco"
 #: ../widgets/table/e-table-group-container.c:951
 #: ../widgets/table/e-table-group-leaf.c:609
 #: ../widgets/table/e-table-group-leaf.c:610
-#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
+#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
 msgid "Cursor mode"
 msgstr "Modo del cursor"
 
@@ -23702,7 +23779,7 @@ msgstr "Modo del cursor"
 #: ../widgets/table/e-table-group-container.c:958
 #: ../widgets/table/e-table-group-leaf.c:623
 #: ../widgets/table/e-table-group-leaf.c:624
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
 msgid "Selection model"
 msgstr "Modelo de selección"
 
@@ -23710,9 +23787,9 @@ msgstr "Modelo de selección"
 #: ../widgets/table/e-table-group-container.c:965
 #: ../widgets/table/e-table-group-leaf.c:616
 #: ../widgets/table/e-table-group-leaf.c:617
-#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
-#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3338
-#: ../widgets/table/e-tree.c:3339
+#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
+#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-tree.c:3338
 msgid "Length Threshold"
 msgstr "Umbral de longitud"
 
@@ -23720,9 +23797,9 @@ msgstr "Umbral de longitud"
 #: ../widgets/table/e-table-group-container.c:972
 #: ../widgets/table/e-table-group-leaf.c:658
 #: ../widgets/table/e-table-group-leaf.c:659
-#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
-#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3370
-#: ../widgets/table/e-tree.c:3371
+#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
+#: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-tree.c:3370
 msgid "Uniform row height"
 msgstr "Altura uniforme de la fila"
 
@@ -23733,108 +23810,108 @@ msgstr "Altura uniforme de la fila"
 msgid "Frozen"
 msgstr "Congelado"
 
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
 msgid "Customize Current View"
 msgstr "Personalizar vista actual"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "Sort _Ascending"
 msgstr "Ordenar _ascendentemente"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Descending"
 msgstr "Ordenar _descendentemente"
 
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "_Unsort"
 msgstr "_Desordenar"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Group By This _Field"
 msgstr "Agrupar por _este campo"
 
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By _Box"
 msgstr "Agrupar por _caja"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "Remove This _Column"
 msgstr "Quitar esta c_olumna"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Add a C_olumn..."
 msgstr "Añadir una c_olumna…"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1482
 msgid "A_lignment"
 msgstr "A_lineación"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "B_est Fit"
 msgstr "Ajust_e automático"
 
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Format Column_s..."
 msgstr "Formatear columna_s…"
 
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Custo_mize Current View..."
 msgstr "Perso_nalizar vista actual…"
 
-#: ../widgets/table/e-table-header-item.c:1543
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "_Sort By"
 msgstr "_Ordenar por"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1561
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "_Custom"
 msgstr "_Personalizado"
 
-#: ../widgets/table/e-table-header-item.c:1894
+#: ../widgets/table/e-table-header-item.c:1893
 msgid "Font Description"
 msgstr "Descripción de la tipografía"
 
-#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-header-item.c:1914
 #: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "Ordenar información"
 
-#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-table-header-item.c:1928
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "�rbol"
 
-#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
 msgid "Table header"
 msgstr "Cabecera de la tabla"
 
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
 msgid "Table model"
 msgstr "Modelo de la tabla"
 
-#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
 msgid "Cursor row"
 msgstr "Fila del cursor"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
-#: ../widgets/table/e-tree.c:3378
+#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-tree.c:3377
 msgid "Always search"
 msgstr "Buscar siempre"
 
-#: ../widgets/table/e-table.c:3346
+#: ../widgets/table/e-table.c:3347
 msgid "Use click to add"
 msgstr "Pulsar para añadir"
 
-#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
+#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
 msgid "ETree table adapter"
 msgstr "Adaptador de tabla Etree"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3383
 msgid "Retro Look"
 msgstr "Apariencia retro"
 
-#: ../widgets/table/e-tree.c:3385
+#: ../widgets/table/e-tree.c:3384
 msgid "Draw lines and +/- expanders."
 msgstr "Dibujar líneas y expansores +/−."
 
@@ -23942,6 +24019,12 @@ msgstr "Contexto IM"
 msgid "Handle Popup"
 msgstr "Tirador emergente"
 
+#~ msgid "Mark calendar offline"
+#~ msgstr "Marcar calendario como desconectado"
+
+#~ msgid "Marks the selected calendar for offline viewing."
+#~ msgstr "Marcar el calendario seleccionado para verlo desconectado."
+
 #~ msgid "Recent Docu_ments"
 #~ msgstr "Docu_mentos recientes"
 
diff --git a/po/et.po b/po/et.po
index 7cf97ba152..14d3577055 100644
--- a/po/et.po
+++ b/po/et.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: Evolution HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-30 08:01+0000\n"
-"PO-Revision-Date: 2008-10-01 08:34+0300\n"
+"PO-Revision-Date: 2008-10-12 14:06+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -398,11 +398,11 @@ msgid ""
 "Please use some other GroupWise mail client once, to get your GroupWise "
 "Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
-"Käesolevaga on sul Evolutioniga võimalik ligi pääseda ainult Groupwise "
-"süsteemsetele aadressiraamatutele (GroupWise System Address Book). Groupwise "
-"sagedaste kontaktide (GroupWise Frequent Contacts) ja isiklike (Groupwise "
+"Käesolevaga on sul Evolutioniga võimalik ligi pääseda ainult GroupWise "
+"süsteemsetele aadressiraamatutele (GroupWise System Address Book). GroupWise "
+"sagedaste kontaktide (GroupWise Frequent Contacts) ja isiklike (GroupWise "
 "Personal Contacts) kontaktide kaustadele ligipääskuks kasuta korraks mõnda "
-"muud Groupwise postiklienti."
+"muud GroupWise postiklienti."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
@@ -622,11 +622,11 @@ msgstr "Evolutioni aadressiraamatu aadressi hüpikaken"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book address viewer"
-msgstr "Evolutioni aadressiraamatu aadressivaatur"
+msgstr "Evolutioni aadressiraamatu aadressinäitaja"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Address Book card viewer"
-msgstr "Evolutioni aadressiraamatu kaardivaatur"
+msgstr "Evolutioni aadressiraamatu kaardinäitaja"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Address Book component"
@@ -1161,7 +1161,6 @@ msgstr ""
 "otsingupõhjast ühe taseme võrra allapoole."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
-#, fuzzy
 msgid ""
 "This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1176,15 +1175,14 @@ msgstr ""
 "määramine aeglustab aadressiraamatu tööd."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
-#, fuzzy
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 msgstr ""
-"Siin määrataks, mil viisil Evolution tõendab serverile kasutajat.  Märkus: "
-"seades selle väärtuseks \"E-posti aadress\", peab valitud LDAP-serveri "
-"toetama anonüümset ligipääsu."
+"Siin määrataks meetod, mille abil Evolution tõendab serverile kasutajat.  "
+"Väärtuse \"E-posti aadress\" korral peab valitud LDAP-server toetama "
+"anonüümset ligipääsu."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
@@ -1363,7 +1361,7 @@ msgstr "H_üüdnimi:"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell GroupWise"
-msgstr "Novell Groupwise"
+msgstr "Novell GroupWise"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Novell Groupwise"
@@ -2569,7 +2567,7 @@ msgstr "MSN"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:181
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
-msgstr "Groupwise"
+msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Source Book"
@@ -4616,7 +4614,7 @@ msgstr "Evolutioni kalendri seadistuste juhtimine"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolutioni kalendri ajastussõnumi vaatur"
+msgstr "Evolutioni kalendri ajastussõnumi näitaja"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar/Task editor"
@@ -5641,7 +5639,7 @@ msgstr "Tarnijad"
 #: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
 #: ../calendar/gui/tasktypes.xml.h:43
 msgid "Time &amp; Expenses"
-msgstr ""
+msgstr "Aeg ja kulutused"
 
 #: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
 #: ../calendar/gui/tasktypes.xml.h:45
@@ -10989,12 +10987,11 @@ msgstr ""
 "taastamine võimaldab sul jätkata sealt, kus sa pooleli jäid."
 
 #: ../composer/mail-composer.error.xml.h:17
-#, fuzzy
 msgid ""
 "Send options available only for Novell GroupWise and Microsoft Exchange "
 "accounts."
 msgstr ""
-"Saatmisvalikud on saadaval ainult Novell Groupwise ja Microsoft Exchange "
+"Saatmisvalikud on saadaval ainult Novell GroupWise ja Microsoft Exchange "
 "kontodele."
 
 #: ../composer/mail-composer.error.xml.h:18
@@ -12938,7 +12935,6 @@ msgid "Failed to create local mail storage `%s': %s"
 msgstr "Tõrge kohaliku postisalvesti `%s' loomisel: %s"
 
 #: ../mail/em-migrate.c:2898
-#, fuzzy
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -12946,7 +12942,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 "Evolutioni postikaustade kokkuvõtted on alates Evolutioni versioonist 2.24 "
-"sqlite vormingus.\n"
+"SQLite vormingus.\n"
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
@@ -13047,7 +13043,6 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "\"Posti saatmise ja vastuvõtmise\" akna laius"
 
 #: ../mail/evolution-mail.schemas.in.h:4
-#, fuzzy
 msgid "Allows Evolution to display text part of limited size"
 msgstr "Piiratud suurusega tekstiosa kuvamise lubamine"
 
@@ -13108,6 +13103,9 @@ msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
 msgstr ""
+"Kohalike muudatuste sünkroniseerimise sagedus võrgus asuvate "
+"postiserveritega. Sünkroniseerimiste vahe peab olema vähemalt 30-sekundi "
+"pikkune."
 
 #: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
@@ -13319,15 +13317,14 @@ msgstr ""
 "vaate asemel külg-külje kõrval."
 
 #: ../mail/evolution-mail.schemas.in.h:61
-#, fuzzy
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
 "in GNOME's MIME type database may be used for displaying content."
 msgstr ""
-"Kui Evolutionil pole konkreetse mime-tüübi jaoks sisseehitatud vaaturit, "
-"siis iga selles nimekirjas olev mime tüüp seotakse GNOME mime-tüüpide "
-"andmebaasis kirjeldatud bonobo-vaaturkomponendiga ja seda vaaturit "
+"Kui Evolutionil pole konkreetse MIME-tüübi jaoks sisseehitatud näitajat, "
+"siis iga selles nimekirjas olev MIME-tüüp seotakse GNOME MIME-tüüpide "
+"andmebaasis kirjeldatud bonobo-komponendinäitajaga ja seda näitajat "
 "kasutatakse sisu kuvamiseks."
 
 #: ../mail/evolution-mail.schemas.in.h:62
@@ -13399,9 +13396,8 @@ msgid "List of Labels and their associated colors"
 msgstr "Siltide ja nende värvuste loend"
 
 #: ../mail/evolution-mail.schemas.in.h:72
-#, fuzzy
 msgid "List of MIME types to check for Bonobo component viewers"
-msgstr "Mime-tüüpide loend bonobo komponendivaaturi kontrolliks"
+msgstr "MIME-tüüpide loetelu bonobo komponendivaaturi kontrolliks"
 
 #: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accepted licenses"
@@ -13426,6 +13422,7 @@ msgstr "Kohandatud päiste ja nende lubamise tingimuste loend."
 #: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
+"Õigekirjakontrolli jaoks kasutatavate sõnaraamatukeelte koodide loetelu"
 
 #: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
@@ -13701,14 +13698,13 @@ msgid ""
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:141
-#, fuzzy
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
-"Selle alusel otsustatakse Evolution'i abil vormindatava sõnumi tekstiosa "
-"suurim suurus. Vaikimisi väärtus on 4MB / 4096 KB, väärtus määratakse "
-"kilobaitides."
+"Selle alusel otsustatakse Evolutioni abil vormindatava sõnumi tekstiosa "
+"suurim suurus. Väärtus määratakse kilobaitides ja vaikimisi on selleks 4MB / "
+"4096 KB."
 
 #: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
@@ -14806,7 +14802,7 @@ msgstr "_Skript:"
 
 #: ../mail/mail-config.glade.h:184
 msgid "_Secure HTTP Proxy:"
-msgstr ""
+msgstr "_Turvalise HTTP proksi:"
 
 #: ../mail/mail-config.glade.h:185
 msgid "_Select..."
@@ -16085,7 +16081,6 @@ msgid "_Edit Message"
 msgstr "_Redigeeri sõnumit"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-#, fuzzy
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
 "play them directly from Evolution."
@@ -16095,7 +16090,7 @@ msgstr ""
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
-msgstr ""
+msgstr "Audioesitamise plugin"
 
 #: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
@@ -17706,9 +17701,8 @@ msgid "<b>Server</b>"
 msgstr "<b>Server</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-#, fuzzy
 msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "Plugin google kalendri ja kontaktide seadistamiseks."
+msgstr "Plugin Google kalendri ja kontaktide seadistamiseks."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
@@ -17719,13 +17713,12 @@ msgid "Checklist"
 msgstr "Kontroll-loend"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-#, fuzzy
 msgid "A plugin to setup GroupWise calendar and contacts sources."
-msgstr "Plugin groupwise kalendri- ja kontaktiallikate seadistamiseks."
+msgstr "Plugin GroupWise kalendri- ja kontaktiallikate seadistamiseks."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "GroupWise Account Setup"
-msgstr "Groupwise'i konto sätted"
+msgstr "GroupWise'i konto sätted"
 
 #: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
@@ -17813,18 +17806,16 @@ msgid "Retract Mail"
 msgstr "E-posti tagasivõtmine"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-#, fuzzy
 msgid "Add Send Options to GroupWise messages"
-msgstr "Groupwise'i sõnumitele saatmisvalikute lisamine"
+msgstr "Saatmisvalikute lisamine GroupWise'i sõnumitele"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-#, fuzzy
 msgid "A plugin for the features in GroupWise accounts."
-msgstr "Plugin Groupwise kontode võimaluste jaoks."
+msgstr "Plugin GroupWise kontode võimaluste jaoks."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
-msgstr "Groupwise'i võimalused"
+msgstr "GroupWise'i võimalused"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
 msgid "Message retract failed"
@@ -17888,13 +17879,12 @@ msgid "Would you like to decline it?"
 msgstr "Kas lükkad selle tagasi?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
-#, fuzzy
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "Sul pole võimalik kausta määratud kasutajaga &quot;{0}&quot; jagada"
+msgstr "Sul pole võimalik kausta määratud kasutajale &quot;{0}&quot; jagada"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
 msgid "You have to specify a user name which you want to add to the list"
-msgstr ""
+msgstr "Sa pead määrama nimekirja lisatava kasutaja nime"
 
 #: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
@@ -19458,9 +19448,8 @@ msgid "_Publish Calendar Information"
 msgstr "_Publitseeri kalendri andmed"
 
 #: ../plugins/publish-calendar/publish-calendar.c:595
-#, fuzzy
 msgid "Are you sure you want to remove this location?"
-msgstr "Oled sa kindel, et soovid eemaldada seda URL-i?"
+msgstr "Oled sa kindel, et soovid seda asukohta eemaldada?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
@@ -19497,7 +19486,6 @@ msgid "Publishing _Frequency:"
 msgstr "Avalikustamise sa_gedus"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
-#, fuzzy
 msgid ""
 "Secure FTP (SSH)\n"
 "Public FTP\n"
@@ -19507,7 +19495,7 @@ msgid ""
 "Secure WebDAV (HTTPS)\n"
 "Custom Location"
 msgstr ""
-"SSH\n"
+"Turvaline FTP (SSH)\n"
 "Avalik FTP\n"
 "FTP (sisselogimisega)\n"
 "Windowsi jagatud kataloog\n"
@@ -19549,7 +19537,7 @@ msgstr ""
 
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
-msgstr ""
+msgstr "Tere Python"
 
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
 msgid "Python Plugin Loader tests"
@@ -19564,9 +19552,8 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Pythoni EPlugini laaduri testplugin."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-#, fuzzy
 msgid "A plugin which loads other plugins written using Python."
-msgstr "Plugin, mis laadib teisi pythonis kirjutatud pluginaid."
+msgstr "Plugin, mis laadib teisi Pythonis kirjutatud pluginaid."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
@@ -19598,9 +19585,9 @@ msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassin'i lapsprotsess ei vasta ja seetõttu kõrvaldatakse..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:245
-#, fuzzy, c-format
+#, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr "SpamAssassin'i lapsprotsess ei vasta ja seetõttu kõrvaldatakse..."
+msgstr "SpamAssassini lapsprotsessi lõpetamise ootamine, katkestatakse..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:254
 #, c-format
@@ -19891,9 +19878,8 @@ msgid "Drafts based template plugin"
 msgstr "Mallipluginal põhinevad mustandid"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-#, fuzzy
 msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
-msgstr "Lihtne ytnef'i kasutav plugin, mis kodeerib TNEF-manuseid lahti."
+msgstr "Lihtne yTNEF'i kasutav plugin, TNEF-manuste lahtikodeerimiseks."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Attachment decoder"
@@ -19939,7 +19925,7 @@ msgstr "Evolutioni testkomponent"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
-msgstr ""
+msgstr "Proksi-serveri ühenduste autentimine"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Automatic proxy configuration URL"
@@ -20569,7 +20555,6 @@ msgstr ""
 "Evolutioni vanemat versiooni kasutada.\n"
 
 #: ../shell/shell.error.xml.h:16
-#, fuzzy
 msgid ""
 "The previous version of Evolution stored its data in a different location.\n"
 "\n"
@@ -20582,8 +20567,8 @@ msgstr ""
 "\n"
 "Kui sa valid andmete eemaldamise, siis eemaldatakse kogu &quot;"
 "evolution&quot; kataloogi jäädavalt. Kui sa valid andmete säilitamise, siis "
-"võid sa hiljem omal vabal valikul käsitsi eemaldada kataloogi &quot;"
-"evolution&quot;.\n"
+"võid hiljem omal vabal valikul kataloogi &quot;evolution&quot; käsitsi "
+"eemaldada.\n"
 
 #: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
diff --git a/po/fi.po b/po/fi.po
index ee196b9ac5..16ccb0e43e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-18 13:33+0300\n"
+"POT-Creation-Date: 2008-10-04 16:56+0300\n"
 "PO-Revision-Date: 2008-09-18 13:30+0300\n"
 "Last-Translator: Ilkka Tuohela <hile@iki.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
@@ -24,21 +24,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution address book"
 msgstr "evolutionin osoitekirja"
 
-#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../a11y/addressbook/ea-minicard-view.c:33
 #: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "Uusi yhteystieto"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../a11y/addressbook/ea-minicard-view.c:34
 #: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "Uusi yhteystietoluettelo"
 
-#: ../a11y/addressbook/ea-minicard-view.c:161
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -167,7 +167,7 @@ msgstr "%A %d. %Bta %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
 #: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1583
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1577
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -199,14 +199,14 @@ msgstr "%d. %Bta %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
 #: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1599
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1593
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:766
+#: ../calendar/importers/icalendar-importer.c:768
 msgid "Gnome Calendar"
 msgstr "Gnome kalenteri"
 
@@ -270,19 +270,19 @@ msgstr "vaihtele"
 msgid "toggle the cell"
 msgstr "Vaihtele solun näkyvyyttä"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "laajenna"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
 msgid "expands the row in the ETree containing this cell"
 msgstr "laajentaa tämän solun sisältävän rivin ETreessä"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr "piilota"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
 msgid "collapses the row in the ETree containing this cell"
 msgstr "piilota tämän solun sisältävä ETreen rivi"
 
@@ -418,7 +418,7 @@ msgstr "LDAP-palvelimelle tunnistautuminen epäonnistui."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1735
 msgid "Failed to delete contact"
 msgstr "Yhteystiedon poisto epäonnistui"
 
@@ -431,6 +431,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP palvelin ei vastannut kelvollisella skeematiedolla."
 
 #: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:50
 msgid "Server Version"
 msgstr "Palvelimen versio"
 
@@ -603,9 +604,9 @@ msgstr "Määrittele automaattinen täydennys"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../addressbook/gui/component/addressbook-view.c:1325
 #: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "Yhteystiedot"
@@ -651,8 +652,8 @@ msgstr "Hallitse S/Mime-varmenteita"
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
 #: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
-#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1457
+#: ../mail/mail-component.c:311 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1518
 msgid "On This Computer"
 msgstr "Tällä tietokoneella"
 
@@ -663,7 +664,7 @@ msgstr "Tällä tietokoneella"
 #. orange
 #: ../addressbook/gui/component/addressbook-component.c:151
 #: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
 #: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
@@ -698,7 +699,7 @@ msgid "Create a new contact list"
 msgstr "Luo uusi yhteystietoluettelo"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1207
+#: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
@@ -715,61 +716,61 @@ msgstr "Luo uusi osoitekirja"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Osoitekirjan asetusten tai kansioiden päivitys epäonnistui."
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:332
 msgid "Base"
 msgstr "Kanta"
 
-#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../addressbook/gui/component/addressbook-config.c:533
 #: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_Tyyppi:"
 
-#: ../addressbook/gui/component/addressbook-config.c:619
+#: ../addressbook/gui/component/addressbook-config.c:635
 msgid "Copy _book content locally for offline operation"
 msgstr "Kopioi _kirjan sisältö yhteydettömään käyttöön"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/component/addressbook-config.c:998
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/dialogs/calendar-setup.c:378
 #: ../calendar/gui/dialogs/calendar-setup.c:389
 #: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2367
+#: ../plugins/itip-formatter/itip-formatter.c:2372
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Yleiset"
 
-#: ../addressbook/gui/component/addressbook-config.c:983
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-config.c:987
+#: ../addressbook/gui/component/addressbook-config.c:1003
 msgid "Server Information"
 msgstr "Palvelimen tiedot"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:1005
 msgid "Authentication"
 msgstr "Kirjautuminen"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/addressbook-config.c:1008
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Yksityiskohtaiset"
 
-#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../addressbook/gui/component/addressbook-config.c:1009
 #: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Etsitään"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
+#: ../addressbook/gui/component/addressbook-config.c:1011
 msgid "Downloading"
 msgstr "Haetaan"
 
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-config.c:1221
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Osoitekirjan ominaisuudet"
@@ -836,35 +837,35 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti kun Evolution muuntaa Pilotin synkronointitietojasi..."
 
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:501
+#: ../addressbook/gui/component/addressbook-view.c:424
+#: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeä \"%s\" uudestaan: "
 
-#: ../addressbook/gui/component/addressbook-view.c:428
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:427
+#: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
 msgstr "Nimeä kansio uudestaan"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:509
+#: ../addressbook/gui/component/addressbook-view.c:432
+#: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
 msgstr "Kansion nimi ei voi sisältää merkkiä '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:941
 msgid "_New Address Book"
 msgstr "_Uusi osoitekirja"
 
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "Save As vCard..."
 msgstr "Tallenna vCard-muodossa..."
 
-#: ../addressbook/gui/component/addressbook-view.c:946
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
 #: ../calendar/gui/calendar-component.c:619
 #: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-calendar-view.c:1692 ../calendar/gui/e-memo-table.c:940
 #: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
 #: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
@@ -873,16 +874,16 @@ msgstr "Tallenna vCard-muodossa..."
 msgid "_Delete"
 msgstr "_Poista"
 
-#: ../addressbook/gui/component/addressbook-view.c:949
+#: ../addressbook/gui/component/addressbook-view.c:948
 #: ../calendar/gui/calendar-component.c:622
 #: ../calendar/gui/dialogs/comp-editor.c:2035
 #: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1044 ../mail/em-folder-tree.c:2120
+#: ../composer/e-msg-composer.c:1041 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Ominaisuudet..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1336
 msgid "Contact Source Selector"
 msgstr "Yhteystietojen lähdevalinta"
 
@@ -904,7 +905,7 @@ msgstr "Syötä salasana palvelulle %s (käyttäjä %s)"
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
 #: ../plugins/google-account-setup/google-source.c:444
-#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../plugins/publish-calendar/publish-calendar.c:191
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Syötä salasana"
@@ -930,10 +931,14 @@ msgstr ""
 "esikatselupaneelin välissä."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "Näytä Esikatselupaneeli"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -941,20 +946,26 @@ msgstr ""
 "Kuinka monta merkkiä tulee kirjoittaa ennen kuin evolution yrittää "
 "automaattista täydennystä"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Viimeksi nimien valinta-ikkunassa valitun kansion URI"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 msgid "URI for the folder last used in the select names dialog."
 msgstr "Viimeksi nimien valinta-ikkunassa valitun kansion URI"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
 msgstr "Vaakapaneelin sijainti"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
 msgid "Whether to show the preview pane."
 msgstr "Näytetäänkö esikatselupaneeli."
 
@@ -1152,8 +1163,9 @@ msgstr ""
 "hakupohjastasi alaspäin."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "LDAP-palvelimesi koko nimi, esimerkiksi \"ldap.mycompany.com\"."
 
@@ -1166,9 +1178,10 @@ msgstr ""
 "asettaminen liian suureksi hidastaa osoitekirjaasi."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
+#, fuzzy
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 msgstr ""
 "Tämä on menetelmä, jota Evolution käyttää tunnistamiseesi. Huomaa, että tämä "
@@ -1223,7 +1236,7 @@ msgstr "_Kirjautumismenetelmä:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:177
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1238,7 +1251,7 @@ msgid "_Search scope:"
 msgstr "_Hakualue:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:186
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Palvelin: "
@@ -1303,7 +1316,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Työ</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1315,16 +1328,16 @@ msgid "Ca_tegories..."
 msgstr "Ry_hmät..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/widgets/e-minicard.c:199
 msgid "Contact"
 msgstr "Yhteystieto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2421
 msgid "Contact Editor"
 msgstr "Yhteystietojen muokkain"
 
@@ -1351,132 +1364,136 @@ msgstr "_Lempinimi:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+msgid "Novell GroupWise"
+msgstr "Novell GroupWise"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Personal Information"
 msgstr "Henkilökohtaiset tiedot"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "Puhelin"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
 #: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Työ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Osoite:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "_Vuosipäivä:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "_Apulainen:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "_Syntymäpäivä:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:787
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../calendar/gui/dialogs/event-page.c:791
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1868
 msgid "_Calendar:"
 msgstr "_Kalenteri:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_Kaupunki:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Yritys:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_Maa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Osasto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_Näytä nimellä:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_Vapaa/varattu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "K_otisivu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Esimies:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Huomioita:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Toimisto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_Postilokero:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Ammatti:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "_Puoliso:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Osavaltio/lääni:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titteli:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Videokeskustelu:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "Haluaa sähköpostit _HTML-muodossa"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Web-lokin osoite:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Missä: "
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_Postinumero:"
 
@@ -1489,16 +1506,16 @@ msgstr "Osoite"
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:292
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-label.c:165
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
 #: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../addressbook/gui/widgets/e-minicard.c:192
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3687
 #: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "Muokattava"
@@ -2476,7 +2493,7 @@ msgstr "Zimbabwe"
 #: ../plugins/exchange-operations/exchange-delegates.c:954
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
 #: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:350
+#: ../plugins/save-attachments/save-attachments.c:351
 #: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:63
@@ -2488,7 +2505,7 @@ msgid "AOL Instant Messenger"
 msgstr "AOL pikaviestin"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
@@ -2502,7 +2519,7 @@ msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu -pikaviestin"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
@@ -2514,7 +2531,7 @@ msgstr "Palvelu"
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
 #: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/publish-calendar/publish-calendar.c:694
 #: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Sijainti"
@@ -2524,77 +2541,77 @@ msgid "Username"
 msgstr "Käyttäjätunnus"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Koti"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Muut"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "Groupwise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Source Book"
 msgstr "Lähdekirja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Target Book"
 msgstr "Kohdekirja"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
 msgid "Is New Contact"
 msgstr "Uusi yhteystieto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Writable Fields"
 msgstr "Muokattavat kentät"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Required Fields"
 msgstr "Vaaditut kentät"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Muutettu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2416
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Yhteystietojen muokkain - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "Please select an image for this contact"
 msgstr "Valitse kuva tälle henkilölle"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "_No image"
 msgstr "_Ei kuvaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2602,43 +2619,43 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3090
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' sisältää virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' sisältää virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' on tyhjä"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3138
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "Contact Quick-Add"
 msgstr "Yhteystiedon pikalisäys"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
 msgid "_Edit Full"
 msgstr "Muokkaa _kaikkia tietoja"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:402
 msgid "_Full name"
 msgstr "_Koko nimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:413
 msgid "E_mail"
 msgstr "Sähkö_posti"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:424
 msgid "_Select Address Book"
 msgstr "_Valitse osoitekirja"
 
@@ -2777,7 +2794,7 @@ msgstr "_Pikaviestipalvelu:"
 #: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:243
-#: ../plugins/exchange-operations/exchange-contacts.c:234
+#: ../plugins/exchange-operations/exchange-contacts.c:235
 msgid "_Location:"
 msgstr "_Sijainti:"
 
@@ -2816,9 +2833,9 @@ msgid "_Members"
 msgstr "_Jäsenet"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:298
+#: ../addressbook/gui/widgets/e-addressbook-model.c:311
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
 #: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
@@ -2880,19 +2897,19 @@ msgstr "Yhdistä yhteystieto"
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
 #: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Sähköposti"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
-#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:3
 #: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Mikä tahansa kenttä sisältää"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "Sähköposti alkaa"
 
@@ -2900,33 +2917,33 @@ msgstr "Sähköposti alkaa"
 msgid "Name contains"
 msgstr "Nimi sisältää"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "Ei yhteystietoja"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d yhteystieto"
 msgstr[1] "%d yhteystietoa"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-model.c:318
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
 #: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Kysely"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "Virhe haettaessa kirjanäkymää"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
 #: ../widgets/table/e-table-click-to-add.c:509
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3353
+#: ../widgets/table/e-table.c:3354
 #: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
@@ -2936,15 +2953,15 @@ msgstr "Malli"
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Name begins with"
 msgstr "Nimi alkaa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "Lähde"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-meeting-list-view.c:508
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
@@ -2952,87 +2969,87 @@ msgstr "Lähde"
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1954
 msgid "Save as vCard..."
 msgstr "Tallenna vCard-muodossa..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 #: ../calendar/gui/dialogs/comp-editor.c:2033
 #: ../calendar/gui/e-calendar-table.c:1573
-#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:923
+#: ../calendar/gui/e-calendar-view.c:1670 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Avaa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "_Uusi yhteystieto..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "Uusi yhteystieto_luettelo..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "_Tallenna vCard-muodossa..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "_Välitä yhteystieto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "_Välitä yhteystiedot"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "Lähetä _viesti henkilölle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "Lähetä _viesti listalle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "Lähetä _viesti henkilöille"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "_Kopioi osoitekirjaan..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "_Siirrä osoitekirjaan..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "_Leikkaa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 #: ../calendar/gui/dialogs/comp-editor.c:480
 #: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:931
-#: ../composer/e-msg-composer.c:2055 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
+#: ../composer/e-msg-composer.c:2052 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2106
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "L_iitä"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
-#: ../calendar/gui/cal-search-bar.c:625 ../calendar/gui/cal-search-bar.c:668
-#: ../calendar/gui/cal-search-bar.c:687
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1525
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Any Category"
 msgstr "Mikä tahansa luokka"
 
@@ -3205,24 +3222,24 @@ msgstr "Yksikkö"
 msgid "Web Site"
 msgstr "Kotisivu"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../addressbook/gui/widgets/e-minicard-label.c:116
+#: ../addressbook/gui/widgets/e-minicard.c:155
 #: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
 #: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
 #: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-col.c:99
+#: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-field-chooser-item.c:654
 #: ../widgets/table/e-table-group-container.c:992
 #: ../widgets/table/e-table-group-container.c:993
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
+#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
 #: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Leveys"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../addressbook/gui/widgets/e-minicard-label.c:123
+#: ../addressbook/gui/widgets/e-minicard.c:162
 #: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
 #: ../widgets/table/e-table-click-to-add.c:530
@@ -3231,29 +3248,29 @@ msgstr "Leveys"
 #: ../widgets/table/e-table-group-container.c:986
 #: ../widgets/table/e-table-group-leaf.c:630
 #: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
+#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
 #: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Korkeus"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
+#: ../addressbook/gui/widgets/e-minicard-label.c:130
+#: ../addressbook/gui/widgets/e-minicard.c:170
 msgid "Has Focus"
 msgstr "On kohdistettu"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:137
 msgid "Field"
 msgstr "Kenttä"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:144
 msgid "Field Name"
 msgstr "Kentän nimi"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:151
 msgid "Text Model"
 msgstr "Tekstimalli"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:158
 msgid "Max field name length"
 msgstr "Kentän maksimipituus"
 
@@ -3323,24 +3340,24 @@ msgstr ""
 msgid "Adapter"
 msgstr "Sovitin"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "Työsähköposti"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "Henkilökohtainen sähköposti"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:830
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:831
 msgid "Other Email"
 msgstr "Muu sähköposti"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
+#: ../addressbook/gui/widgets/e-minicard.c:178
 msgid "Selected"
 msgstr "Valittu"
 
-#: ../addressbook/gui/widgets/e-minicard.c:184
+#: ../addressbook/gui/widgets/e-minicard.c:185
 msgid "Has Cursor"
 msgstr "On kohdistin"
 
@@ -3399,7 +3416,7 @@ msgstr "Videokeskustelu"
 #: ../calendar/gui/calendar-commands.c:92
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../calendar/gui/gnome-cal.c:2451
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
@@ -3434,13 +3451,13 @@ msgid "Web Log"
 msgstr "Web-loki"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2342
 #: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2343
 #: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Vuosipäivä"
@@ -3458,56 +3475,56 @@ msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "Onnistui"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "Taustajärjestelmä käytössä"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "Lähde poissa käytöstä"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "Osoitekirjaa ei ole olemassa"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
 msgstr "Omaa yhteystietoa ei ole määritelty"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Lupa evätty"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "Yhteystietoa ei löytynyt"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "Yhteystiedon tunniste on jo olemassa"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "Protokolla ei ole tuettu"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:364
@@ -3518,53 +3535,53 @@ msgid "Canceled"
 msgstr "Peruutettu"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "Ei voi perua"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 #: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Failed"
 msgstr "Todennus epäonnistui"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Authentication Required"
 msgstr "Todennus vaaditaan"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "TLS ei ole käytettävissä"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "Lähdettä ei ole olemassa"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
 msgstr "Ei käytettävissä yhteydettömässä tilassa"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Other error"
 msgstr "Muu virhe"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
 msgstr "Virheellinen palvelimen versio"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 msgid "Unsupported authentication method"
 msgstr "Tunnistautumistapa ei ole tuettu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:109
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "We were unable to open this address book. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3574,7 +3591,7 @@ msgstr ""
 "yhteydettömään käyttöön tai sitä ei ole vielä haettu yhteydettömään tilaan. "
 "Lataa osoitekirja kerran yhteydellisessä tilassa hakeaksesi sen sisällön."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:118
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
 msgid ""
 "We were unable to open this address book.  Please check that the path %s "
@@ -3583,7 +3600,7 @@ msgstr ""
 "Tätä osoitekirjaa ei voitu avata. Tarkista että polku %s on olemassa ja että "
 "sinulla on oikeudet käyttää sitä."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:127
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid ""
 "We were unable to open this address book.  This either means you have "
 "entered an incorrect URI, or the LDAP server is unreachable."
@@ -3591,7 +3608,7 @@ msgstr ""
 "Tätä osoitekirjaa ei voitu avata. Olet joko syöttänyt virheellisen URI:n tai "
 "LDAP-palvelinta ei tavoiteta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:133
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3600,7 +3617,7 @@ msgstr ""
 "Tässä Evolutionin versiossa ei ole LDAP-tukea käytettävissä. Jos haluat LDAP-"
 "tuen Evolutioniin, asenna versio joka on käännetty LDAP-tuen kanssa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:141
 msgid ""
 "We were unable to open this address book.  This either means you have "
 "entered an incorrect URI, or the server is unreachable."
@@ -3608,11 +3625,11 @@ msgstr ""
 "Tätä osoitekirjaa ei voitu avata. Syötit joko virheellisen URIn tai "
 "palvelinta ei voi tavoittaa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
 msgid "Detailed error:"
 msgstr "Yksityiskohtainen virhe:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3624,7 +3641,7 @@ msgstr ""
 "Tarkenna hakuasi tai muuta tulosten määrän rajaa tämän\n"
 "osoitekirjan hakemistopalvelimen asetuksissa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this address book.  Please make your search\n"
@@ -3636,46 +3653,46 @@ msgstr ""
 "hakuasi tai pidennä palvelimen aikarajoitusta tämän osoitekirjan\n"
 "hakemistopalvelimen asetuksissa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "The backend for this address book was unable to parse this query."
 msgstr "Tämän osoitekirjan taustajärjestelmä ei ymmärtänyt tätä kyselyä."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
 msgid "The backend for this address book refused to perform this query."
 msgstr ""
 "Tämän osoitekirjan taustajärjestelmä ei suostunut suorittamaan tätä kyselyä."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:190
 msgid "This query did not complete successfully."
 msgstr "Kyselyä ei voitu suorittaa onnistuneesti."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error adding list"
 msgstr "Virhe lisättäessä listalle"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:688
 msgid "Error adding contact"
 msgstr "Virhe lisättäessä yhteystietoa"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying list"
 msgstr "Virhe muokattaessa listaa"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying contact"
 msgstr "Virhe muokattaessa yhteystietoa"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
 msgid "Error removing list"
 msgstr "Virhe poistettaessa listaa"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:638
 msgid "Error removing contact"
 msgstr "Virhe poistettaessa yhteystietoa"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
+#: ../addressbook/gui/widgets/eab-gui-util.c:317
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3690,16 +3707,16 @@ msgstr[1] ""
 "%d yhteystiedon avaaminen avaa myös %d uutta ikkunaa.\n"
 "Haluatko varmasti näyttää kaikki nämä yhteystiedot?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "_Don't Display"
 msgstr "Ä_lä näytä"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
+#: ../addressbook/gui/widgets/eab-gui-util.c:326
 msgid "Display _All Contacts"
 msgstr "Näytä k_aikki yhteystiedot"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
+#: ../addressbook/gui/widgets/eab-gui-util.c:352
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3708,65 +3725,65 @@ msgstr ""
 "%s on jo olemassa\n"
 "Haluatko ylikirjoittaa?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:356
 msgid "Overwrite"
 msgstr "Kirjoita yli"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
+#: ../addressbook/gui/widgets/eab-gui-util.c:400
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "Yhteystieto"
 msgstr[1] "Yhteystiedot"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "card.vcf"
 msgstr "kortti.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Select Address Book"
 msgstr "Valitse osoitekirja"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:597
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:749
 msgid "Move contact to"
 msgstr "Siirry yhteystieto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Copy contact to"
 msgstr "Kopioi yhteystieto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:754
 msgid "Move contacts to"
 msgstr "Siirrä yhteystiedot"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Copy contacts to"
 msgstr "Kopioi yhteystiedot"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:900
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
 msgid "Multiple vCards"
 msgstr "Useita vCard-tiedostoja"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:907
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:919
-#: ../addressbook/gui/widgets/eab-gui-util.c:945
+#: ../addressbook/gui/widgets/eab-gui-util.c:921
+#: ../addressbook/gui/widgets/eab-gui-util.c:947
 #, c-format
 msgid "Contact information"
 msgstr "Yhteystiedot"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:947
+#: ../addressbook/gui/widgets/eab-gui-util.c:949
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s yhteystiedot"
@@ -3775,23 +3792,23 @@ msgstr "%s yhteystiedot"
 msgid "Querying Address Book..."
 msgstr "Etsitään osoitekirjasta..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Yksi muu yhteystieto."
 msgstr[1] "%d muuta yhteystietoa."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Show Full vCard"
 msgstr "Näytä koko vCardin"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 msgid "Show Compact vCard"
 msgstr "Näytä tiivistetty vCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
 msgid "Save in address book"
 msgstr "Tallenna osoitekirjaan"
 
@@ -3800,10 +3817,10 @@ msgid "Card View"
 msgstr "Korttinäkymä"
 
 #: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:498
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:306
-#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../calendar/importers/icalendar-importer.c:308
+#: ../calendar/importers/icalendar-importer.c:673 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Tuodaan..."
 
@@ -3831,19 +3848,19 @@ msgstr "Evolutionin CSV tai Tab (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolutionin CSV- ja Tab-tuoja"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:665
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP-tiedostonvaihtomuoto (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:681
 msgid "Evolution LDIF importer"
 msgstr "Evolutionin LDIF-tuoja"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:550
 msgid "Evolution vCard Importer"
 msgstr "Evolutionin vCard-tuoja"
 
@@ -3995,9 +4012,9 @@ msgstr "Varjostus"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1069
+#: ../plugins/exchange-operations/exchange-account-setup.c:1071
 #: ../plugins/exchange-operations/exchange-calendar.c:232
-#: ../plugins/exchange-operations/exchange-contacts.c:217
+#: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
 msgstr "Koko:"
 
@@ -4061,31 +4078,31 @@ msgstr "Luetteloa osoitekirjoista ei löytynyt"
 msgid "failed to open book"
 msgstr "Kirjaa ei voi avata"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:48
 msgid "Specify the output file instead of standard output"
 msgstr "Määrittele tulostiedosto oletusulostulon sijaan"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:50
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "OUTPUTFILE"
 msgstr "TULOSTIEDOSTO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "List local address book folders"
 msgstr "Näytä paikalliset osoitelistakansiot"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "Show cards as vcard or csv file"
 msgstr "Nämä kortit vcard- tai cvs-tiedostoina"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "[vcard|csv]"
 msgstr "[vcard|cvs]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Export in asynchronous mode"
 msgstr "Vie asynkronisesti"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -4093,29 +4110,29 @@ msgstr ""
 "Yhden tulostiedoston sisältämien korttien lukumäärä käytettäessä "
 "asynkronista tilaa. Oletusarvo on 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "NUMBER"
 msgstr "NUMERO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:102
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Virhe komentoriviparametreissa, käytä optiota --help nähdäksesi käyttöohjeet."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "Vain cvs ja vcard ovat tuettuja muotoja."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "Asynkronisessa tilassa ulostulon täytyy olla tiedosto."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "Normaalitilassa kokoa ei pitäisi tarvita antaa."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:164
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "Käsittelemätön virhe"
 
@@ -4219,19 +4236,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Haluatko varmasti poistaa tämän tapaamisen?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:178
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Haluatko varmasti poistaa tämän tapaamisen?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:184
+#: ../calendar/gui/dialogs/delete-comp.c:188
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Haluatko varmasti poistaa tämän muistilapun?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:181
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "haluatko varmasti poistaa tämän tehtävän?"
@@ -4334,6 +4351,18 @@ msgstr ""
 "tehtävä on peruttu."
 
 #: ../calendar/calendar.error.xml.h:45
+msgid "Save Appointment"
+msgstr "Tallenna tapaaminen"
+
+#: ../calendar/calendar.error.xml.h:46
+msgid "Save Memo"
+msgstr "Tallenna muistilappu"
+
+#: ../calendar/calendar.error.xml.h:47
+msgid "Save Task"
+msgstr "Tallenna tehtävä"
+
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4341,7 +4370,7 @@ msgstr ""
 "Päivitettyjen tietojen lähettäminen antaa muille mahdollisuuden pitää "
 "kalenterinsa ajan tasalla."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4349,7 +4378,7 @@ msgstr ""
 "Päivitettyjen tehtävätietojen lähettäminen antaa muille mahdollisuuden pitää "
 "tehtävälistansa ajan tasalla."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4357,7 +4386,7 @@ msgstr ""
 " Joidenkin liitteiden lataus on vielä kesken. Tapaamisen tallentaminen nyt "
 "aiheuttaa tapaamisen tallentamisen ilman näitä hakemattomia liitteitä."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4365,85 +4394,85 @@ msgstr ""
 " Joidenkin liitteiden lataus on vielä kesken. Tehtävän tallentaminen nyt "
 "aiheuttaa tehtävän tallentamisen ilman näitä hakemattomia liitteitä."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:53
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Jotkut toiminnot eivät välttämättä toimi oikein nykyisellä palvelimella."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolutionin kalenteri sulkeutui odottamatta."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolutionin muistilappuosa sulkeutui odottamatta."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolutionin tehtäväkomponentti on sulkeutunut odottamatta."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalenteri ei ole merkitty käytettäväksi yhteydettömässä tilassa."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:58
 msgid "The memo list is not marked for offline usage."
 msgstr ""
 "Muistilappulistaa ei ole merkitty käytettäväksi yhteydettömässä tilassa."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:59
 msgid "The task list is not marked for offline usage."
 msgstr "Tehtävälista ei ole merkitty käytettäväksi yhteydettömässä tilassa."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:60
 msgid "This calendar will be removed permanently."
 msgstr "Tämä kalenteri poistetaan pysyvästi."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:61
 msgid "This memo list will be removed permanently."
 msgstr "Tämä muistilappulista poistetaan pysyvästi."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:62
 msgid "This task list will be removed permanently."
 msgstr "Tämä tehtävälista poistetaan pysyvästi."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Haluatko tallentaa muutokset tähän tapaamiseen?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "Haluatko tallentaa muutoksesi tähän muistioon?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "Haluatko tallentaa muutoksesi tähän tehtävään?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Haluatko lähettää perumisilmoituksen tälle muistilapulle?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Haluatko lähettää perumisilmoituksen kaikille osanottajille?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Haluatko lähettää kokouskutsuja osallistujille?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "Haluatko lähettää tämän tehtävän osanottajille?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Haluatko lähettää päivitetyt kokouksen tiedot osanottajille?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr "Halutako lähettää päivitetyn tehtävätiedon osanottajille?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:72
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4453,61 +4482,61 @@ msgstr ""
 "kohdata ongelmia Evolutionin käytössä. Parhaiden tulosten saamiseksi tulisi "
 "palvelin päivittää tuettuun versioon."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Olet muuttanut tätä tapaamista, mutta et ole vielä tallentanut sitä."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "Olet muuttanut tätä tehtävää, mutta et ole vielä tallentanut sitä."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Olet muuttanut tätä muistiota, mutta et ole vielä tallentanut sitä."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Kalenterisi eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
 "uudestaan."
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Muistilaput eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
 "uudestaan."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Tehtävät eivät ole käytettävissä ennen kuin Evolution on käynnistetty "
 "uudestaan."
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:79
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Hylkää muutokset"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "_Tallenna muutokset"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:82
 #: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Lähetä"
 
 # calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16 #: calendar/calendar-errors.xml.h:26
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "_Lähetä huomautus"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:84
 msgid "{0}."
 msgstr "{0}."
 
@@ -4554,7 +4583,7 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Pilotin tehtävälistan ohjelmalohkoa ei voi kirjoittaa"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2363
 msgid "Calendar and Tasks"
 msgstr "Kalenteri ja tehtävät"
 
@@ -4614,9 +4643,9 @@ msgstr "Muistilaput"
 #: ../calendar/gui/tasks-component.c:539
 #: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
 #: ../calendar/gui/tasks-control.c:508
-#: ../calendar/importers/icalendar-importer.c:74
-#: ../calendar/importers/icalendar-importer.c:735
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:737
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:588
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
@@ -4667,8 +4696,8 @@ msgstr "Tapaamiset"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1603
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1609
 #: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
@@ -4681,7 +4710,7 @@ msgstr "Torkkumisaika:"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/comp-editor.c:1332
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:169
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
@@ -4699,32 +4728,32 @@ msgstr "_Torku"
 msgid "location of appointment"
 msgstr "tapaamisen sijainti"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1461
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
 msgid "No summary available."
 msgstr "Ei yhteenvetoa saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
 msgid "No description available."
 msgstr "Ei kuvausta saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1480
 msgid "No location information available."
 msgstr "Ei sijaintitietoja saatavilla"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1525
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sinulla on %d hälytystä"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
+#: ../mail/mail-component.c:1596
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1691
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4736,7 +4765,7 @@ msgstr ""
 "lähettämään sähköpostia. Evolution näyttää sen sijaan\n"
 "tavallisen huomautusikkunan."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1721
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4753,7 +4782,7 @@ msgstr ""
 "\n"
 "Haluatko varmasti suorittaa tämän ohjelman?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
 msgid "Do not ask me about this program again."
 msgstr "Älä kysy tästä ohjelmasta enää uudestaan"
 
@@ -4773,7 +4802,7 @@ msgid "invalid time"
 msgstr "epäkelpo aika"
 
 #. 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:404
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -4782,7 +4811,7 @@ msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
 #. 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:410
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -4793,7 +4822,7 @@ msgstr[1] "%d minuuttia"
 #. 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:416
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -5092,7 +5121,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "Viimeisimmän hälytyksen suoritusaika, time_t yksikkönä"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:107
+#: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
@@ -5228,56 +5257,56 @@ msgstr "Työpäivän alkamisminuutti"
 msgid "daylight savings time"
 msgstr "kesäaika"
 
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "Yhteenveto sisältää"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "Kuvaus sisältää"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "Luokka on"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "Kommentti sisältää"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
 msgid "Location contains"
 msgstr "Sijainti sisältää"
 
-#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
+#: ../calendar/gui/cal-search-bar.c:633 ../calendar/gui/cal-search-bar.c:676
+#: ../calendar/gui/cal-search-bar.c:695
 msgid "Unmatched"
 msgstr "Täsmäämättömät"
 
-#: ../calendar/gui/cal-search-bar.c:637
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Next 7 Days' Tasks"
 msgstr "Seuraavien 7 päivän tehtävät"
 
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Active Tasks"
 msgstr "Aktiiviset tehtävät"
 
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Overdue Tasks"
 msgstr "Vanhentuneet tehtävät"
 
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Completed Tasks"
 msgstr "Valmistuneet tehtävät"
 
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:657
 msgid "Tasks with Attachments"
 msgstr "Tehtävät, joissa on liitteitä"
 
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Active Appointments"
 msgstr "Aktiiviset tapaamiset"
 
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:707
 msgid "Next 7 Days' Appointments"
 msgstr "Seuraavien 7 päivän tapaamiset"
 
@@ -5433,7 +5462,7 @@ msgid "Any Field"
 msgstr "Mikä tahansa kenttä"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:21
 msgid "Attachments"
 msgstr "Liitteet"
 
@@ -5482,12 +5511,12 @@ msgid "Description Contains"
 msgstr "Kuvaus sisältää"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:38
 msgid "Do Not Exist"
 msgstr "Ei ole olemassa"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:41
 msgid "Exist"
 msgstr "On olemassa"
 
@@ -5578,7 +5607,7 @@ msgstr "Toistuvuus"
 #: ../calendar/gui/e-meeting-list-view.c:545
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
-#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+#: ../mail/em-filter-i18n.h:86 ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Tila"
 
@@ -5622,22 +5651,22 @@ msgid "Waiting"
 msgstr "Odottaa"
 
 #: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
-#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:26
 msgid "contains"
 msgstr "sisältää"
 
 #: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
-#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:32
 msgid "does not contain"
 msgstr "ei sisällä"
 
 #: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
-#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:46
 msgid "is"
 msgstr "on"
 
 #: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:52
 msgid "is not"
 msgstr "ei ole"
 
@@ -5690,17 +5719,17 @@ msgid "Mes_sage:"
 msgstr "_Viesti:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Soita ääni"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Ponnahdusikkuna hälytykselle"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Suorita ohjelma"
 
@@ -5713,7 +5742,7 @@ msgid "Send To:"
 msgstr "Lähetä:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Lähetä sähköpostia"
 
@@ -5791,7 +5820,7 @@ msgstr "_Ehdota liitteen automaattista näyttämistä"
 msgid "Attach file(s)"
 msgstr "Liitä tiedosto(t)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:484
 msgid "Selected Calendars for Alarms"
 msgstr "Valitse kalenterit hälytyksille"
 
@@ -5856,7 +5885,7 @@ msgid "Display"
 msgstr "Näytä"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Perjantai"
@@ -5872,7 +5901,7 @@ msgstr ""
 "päivää"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Maanantai"
@@ -5906,7 +5935,7 @@ msgid "S_un"
 msgstr "_Su"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Lauantai"
@@ -5924,7 +5953,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Näytä _viikkonumerot"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Sunnuntai"
@@ -5943,7 +5972,7 @@ msgid "Template:"
 msgstr "Pohja:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Torstai"
@@ -5958,13 +5987,13 @@ msgid "Time format:"
 msgstr "Ajan muoto:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Tiistai"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Keskiviikko"
@@ -6167,22 +6196,22 @@ msgstr "Liitetty viesti - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1769
-#: ../composer/e-msg-composer.c:1988
+#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1766
+#: ../composer/e-msg-composer.c:1985
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Liitetty viesti"
 msgstr[1] "%d liitettyä viestiä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2056
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2053
 #: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2107
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2058
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2055
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2109
 msgid "Cancel _Drag"
 msgstr "Peruuta _raahaus"
 
@@ -6396,8 +6425,8 @@ msgid "Show Attachment _Bar"
 msgstr "Näytä _liitepalkki"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/event-page.c:1871
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1043
+#: ../calendar/gui/dialogs/event-page.c:1875
+#: ../calendar/gui/dialogs/task-page.c:1197 ../composer/e-msg-composer.c:1040
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
@@ -6405,7 +6434,7 @@ msgid "_Remove"
 msgstr "_Poista"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1046
+#: ../composer/e-msg-composer.c:1043
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Lisää liite..."
@@ -6441,7 +6470,7 @@ msgstr "Kohdetta ei voi avata"
 msgid "Destination is read only"
 msgstr "Kohde on vain luettavissa"
 
-#: ../calendar/gui/dialogs/delete-comp.c:201
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Poistetaanko tämä kohta kaikkien muiden vastaanottajien kansioista?"
 
@@ -6525,6 +6554,7 @@ msgstr "Muuta tämä tapahtuma toistuvaksi"
 
 #: ../calendar/gui/dialogs/event-editor.c:210
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:213
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "Lähetysasetukset"
@@ -6562,125 +6592,125 @@ msgstr "Kysy vapaa/varattu-tietoja osanottajilta"
 msgid "Appoint_ment"
 msgstr "Tapaa_minen"
 
-#: ../calendar/gui/dialogs/event-page.c:731
-#: ../calendar/gui/dialogs/event-page.c:2714
+#: ../calendar/gui/dialogs/event-page.c:735
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "Tapahtumassa on hälytyksiä"
 
-#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.c:798
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "_Järjestäjä:"
 
-#: ../calendar/gui/dialogs/event-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:844
 msgid "_Delegatees"
 msgstr "_Valtuutetut"
 
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:846
 msgid "Atte_ndees"
 msgstr "_Osanottajat"
 
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no start date"
 msgstr "Tapahtuma ilman alkupäivämäärää"
 
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1033
 msgid "Event with no end date"
 msgstr "Tapahtuma ilman päättymispäivää"
 
-#: ../calendar/gui/dialogs/event-page.c:1198
-#: ../calendar/gui/dialogs/memo-page.c:636
-#: ../calendar/gui/dialogs/task-page.c:808
+#: ../calendar/gui/dialogs/event-page.c:1202
+#: ../calendar/gui/dialogs/memo-page.c:640
+#: ../calendar/gui/dialogs/task-page.c:812
 msgid "Start date is wrong"
 msgstr "Aloituspäiväys on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1212
 msgid "End date is wrong"
 msgstr "Lopetuspäiväys on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1235
 msgid "Start time is wrong"
 msgstr "Alkamisaika on väärin"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1242
 msgid "End time is wrong"
 msgstr "Lopetusaika on virheellinen"
 
-#: ../calendar/gui/dialogs/event-page.c:1401
-#: ../calendar/gui/dialogs/memo-page.c:677
-#: ../calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/event-page.c:1405
+#: ../calendar/gui/dialogs/memo-page.c:681
+#: ../calendar/gui/dialogs/task-page.c:872
 msgid "The organizer selected no longer has an account."
 msgstr "Valitulla järjestäjällä ei enää ole käyttäjätiliä"
 
-#: ../calendar/gui/dialogs/event-page.c:1407
-#: ../calendar/gui/dialogs/memo-page.c:683
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1411
+#: ../calendar/gui/dialogs/memo-page.c:687
+#: ../calendar/gui/dialogs/task-page.c:878
 msgid "An organizer is required."
 msgstr "Järjestäjä vaaditaan."
 
-#: ../calendar/gui/dialogs/event-page.c:1432
-#: ../calendar/gui/dialogs/task-page.c:898
+#: ../calendar/gui/dialogs/event-page.c:1436
+#: ../calendar/gui/dialogs/task-page.c:902
 msgid "At least one attendee is required."
 msgstr "Vähintään yksi läsnäolija vaaditaan."
 
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1194
+#: ../calendar/gui/dialogs/event-page.c:1876
+#: ../calendar/gui/dialogs/task-page.c:1198
 msgid "_Add "
 msgstr "_Lisää "
 
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2594
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalenteria \"%s\" ei voi avata"
 
-#: ../calendar/gui/dialogs/event-page.c:2634
-#: ../calendar/gui/dialogs/memo-page.c:886
-#: ../calendar/gui/dialogs/task-page.c:1793
+#: ../calendar/gui/dialogs/event-page.c:2638
+#: ../calendar/gui/dialogs/memo-page.c:890
+#: ../calendar/gui/dialogs/task-page.c:1797
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Toimit henkilön %s puolesta"
 
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2918
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d päivä ennen tapaamista"
 msgstr[1] "%d päivää ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d tunti ennen tapaamista"
 msgstr[1] "%d tuntia ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuutti ennen tapaamista"
 msgstr[1] "%d minuuttia ennen tapaamista"
 
-#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/event-page.c:2943
 msgid "Customize"
 msgstr "Muokkaa"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2944
+#: ../calendar/gui/dialogs/event-page.c:2948
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:945
 #: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
 #: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
+#: ../plugins/exchange-operations/exchange-delegates-user.c:195
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
 #: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1513
+#: ../widgets/misc/e-dateedit.c:1727
 #: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "Määrittelemätön"
@@ -6764,15 +6794,15 @@ msgstr "Järjestäjä:"
 msgid "Memo"
 msgstr "Muistilappu"
 
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:851
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Muistilappuja kohteesta '%s' ei voi avata."
 
-#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../calendar/gui/dialogs/memo-page.c:1006 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Vastaanottaja"
 
@@ -6786,7 +6816,7 @@ msgid "T_o:"
 msgstr "Vastaan_ottajat:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:360
+#: ../calendar/gui/dialogs/task-page.c:364
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Ryhmä:"
@@ -6827,18 +6857,18 @@ msgstr "Tätä ja tulevia kertoja"
 msgid "All Instances"
 msgstr "Kaikki kerrat"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:562
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Tämä tapaaminen sisältää toistuvuuksia, joita Evolution ei voi muokata."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "Toistuvuuden päiväys on virheellinen"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:930
 msgid "on"
 msgstr " "
 
@@ -6846,7 +6876,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:992
+#: ../calendar/gui/dialogs/recurrence-page.c:994
 msgid "first"
 msgstr "ensimmäinen"
 
@@ -6855,7 +6885,7 @@ msgstr "ensimmäinen"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1000
 msgid "second"
 msgstr "toinen"
 
@@ -6863,7 +6893,7 @@ msgstr "toinen"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:1005
 msgid "third"
 msgstr "kolmas"
 
@@ -6871,7 +6901,7 @@ msgstr "kolmas"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1008
+#: ../calendar/gui/dialogs/recurrence-page.c:1010
 msgid "fourth"
 msgstr "neljäs"
 
@@ -6879,13 +6909,13 @@ msgstr "neljäs"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 msgid "last"
 msgstr "viimeinen"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "Other Date"
 msgstr "Toinen päiväys"
 
@@ -6893,7 +6923,7 @@ msgstr "Toinen päiväys"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 msgid "1st to 10th"
 msgstr "1. - 10."
 
@@ -6901,7 +6931,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:1053
+#: ../calendar/gui/dialogs/recurrence-page.c:1055
 msgid "11th to 20th"
 msgstr "11. - 20."
 
@@ -6909,45 +6939,45 @@ 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:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1061
 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:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 msgid "day"
 msgstr "päivä"
 
 #. 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:1208
+#: ../calendar/gui/dialogs/recurrence-page.c:1210
 msgid "on the"
 msgstr "  "
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1384
+#: ../calendar/gui/dialogs/recurrence-page.c:1386
 msgid "occurrences"
 msgstr "tapahtumiskertaa"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2087
+#: ../calendar/gui/dialogs/recurrence-page.c:2089
 msgid "Add exception"
 msgstr "Lisää poikkeus"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2130
 msgid "Could not get a selection to modify."
 msgstr "Valintaa ei voi hakea muokattavaksi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2134
+#: ../calendar/gui/dialogs/recurrence-page.c:2136
 msgid "Modify exception"
 msgstr "Muokkaa poikkeusta"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2178
+#: ../calendar/gui/dialogs/recurrence-page.c:2180
 msgid "Could not get a selection to delete."
 msgstr "Valintaa ei voitu hakea poistettavaksi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2304
 msgid "Date/Time"
 msgstr "Päiväys/aika"
 
@@ -7032,7 +7062,7 @@ msgstr "Valmis"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:272
 #: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "High"
 msgstr "Korkea"
 
@@ -7049,14 +7079,14 @@ msgstr "Työn alla"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:276
 #: ../calendar/gui/e-calendar-table.c:568 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1063
+#: ../mail/message-list.c:1064
 msgid "Low"
 msgstr "Matala"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:274
 #: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:567
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1065
 msgid "Normal"
 msgstr "Tavallinen"
 
@@ -7117,16 +7147,16 @@ msgstr "_Tehtävä"
 msgid "Task Details"
 msgstr "Tehtävän yksityiskohdat"
 
-#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.c:372
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "_Järjestäjä:"
 
-#: ../calendar/gui/dialogs/task-page.c:781
+#: ../calendar/gui/dialogs/task-page.c:785
 msgid "Due date is wrong"
 msgstr "Eräpäivä on virheellinen"
 
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1754
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Tehtäviä kohteesta '%s' ei voi avata."
@@ -7148,7 +7178,7 @@ msgid "Time zone:"
 msgstr "Aikavyöhyke:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:392
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -7156,69 +7186,69 @@ msgstr[0] "%d päivä"
 msgstr[1] "%d päivää"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:398
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d viikko"
 msgstr[1] "%d viikkoa"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Tuntematon suoritettava tehtävä"
 
 #. 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:474
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s ennen tapaamisen alkua"
 
 #. 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:479
+#: ../calendar/gui/e-alarm-list.c:481
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s tapaamisen alun jälkeen"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:486
+#: ../calendar/gui/e-alarm-list.c:488
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s tapaamisen alussa"
 
 #. 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:497
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s ennen tapaamisen loppumista"
 
 #. 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:502
+#: ../calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s tapaamisen päättymisen jälkeen"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:509
+#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s tapaamisen lopussa"
 
 #. 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:533
+#: ../calendar/gui/e-alarm-list.c:535
 #, 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:541
+#: ../calendar/gui/e-alarm-list.c:543
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s tuntemattomalle liipasintyypille"
@@ -7230,7 +7260,7 @@ msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "Nimetön"
 
@@ -7267,7 +7297,7 @@ msgstr "Eräpäivä:"
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:246
 #: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
+#: ../plugins/exchange-operations/exchange-account-setup.c:269
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Tila:"
@@ -7360,7 +7390,7 @@ msgid "untitled_image.%s"
 msgstr "nimetön_kuva.%s"
 
 #: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1575
-#: ../calendar/gui/e-calendar-view.c:1672 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:925
 #: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "Tallenna _nimellä..."
@@ -7374,7 +7404,7 @@ msgstr "Aseta _taustaksi"
 msgid "_Save Selected"
 msgstr "Tallenna _valitut"
 
-#: ../calendar/gui/e-cal-popup.c:429 ../mail/em-popup.c:831
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:832
 #, c-format
 msgid "Open in %s..."
 msgstr "Avaa ohjelmassa %s..."
@@ -7385,7 +7415,7 @@ msgstr "* Ei yhteenvetoa *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:2215
+#: ../calendar/gui/e-calendar-view.c:2214
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Järjestäjä: %s <%s>"
@@ -7393,7 +7423,7 @@ msgstr "Järjestäjä: %s <%s>"
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
 #: ../calendar/gui/e-calendar-table.c:376
-#: ../calendar/gui/e-calendar-view.c:2219
+#: ../calendar/gui/e-calendar-view.c:2218
 #, c-format
 msgid "Organizer: %s"
 msgstr "Järjestäjä: %s"
@@ -7451,23 +7481,23 @@ msgid "100%"
 msgstr "100%"
 
 #: ../calendar/gui/e-calendar-table.c:878
-#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:438
+#: ../calendar/gui/e-calendar-view.c:664 ../calendar/gui/e-memo-table.c:438
 msgid "Deleting selected objects"
 msgstr "Poistetaan valitut kohteet"
 
 #: ../calendar/gui/e-calendar-table.c:1162
-#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:644
+#: ../calendar/gui/e-calendar-view.c:794 ../calendar/gui/e-memo-table.c:644
 msgid "Updating objects"
 msgstr "Päivitetään olioita"
 
 #: ../calendar/gui/e-calendar-table.c:1347
-#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:820
+#: ../calendar/gui/e-calendar-view.c:1220 ../calendar/gui/e-memo-table.c:820
 #: ../composer/e-composer-actions.c:277
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
 #: ../calendar/gui/e-calendar-table.c:1570
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Task"
 msgstr "Uusi _tehtävä"
 
@@ -7476,20 +7506,20 @@ msgid "Open _Web Page"
 msgstr "_Avaa www-sivu"
 
 #: ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:926
+#: ../calendar/gui/e-calendar-view.c:1656 ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "T_ulosta..."
 
 #: ../calendar/gui/e-calendar-table.c:1580
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:930
+#: ../calendar/gui/e-calendar-view.c:1676 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "L_eikkaa"
 
 #: ../calendar/gui/e-calendar-table.c:1582
-#: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:932
+#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
@@ -7556,93 +7586,93 @@ msgstr "Prioriteetti"
 msgid "Start date"
 msgstr "Aloituspäivä"
 
-#: ../calendar/gui/e-calendar-view.c:1340
+#: ../calendar/gui/e-calendar-view.c:1339
 msgid "Moving items"
 msgstr "Siirretään kohteita"
 
-#: ../calendar/gui/e-calendar-view.c:1342
+#: ../calendar/gui/e-calendar-view.c:1341
 msgid "Copying items"
 msgstr "Kopioidaan kohteita"
 
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1650
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New All Day _Event"
 msgstr "Uusi koko pä_ivän tapahtuma"
 
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New _Meeting"
 msgstr "Uusi _kokous"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1663
 msgid "_Current View"
 msgstr "_Nykyinen näkymä"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1665
 msgid "Select T_oday"
 msgstr "Valitse _tämä päivä"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "_Select Date..."
 msgstr "_Valitse päiväys..."
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1672
 msgid "Pri_nt..."
 msgstr "T_ulosta..."
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Cop_y to Calendar..."
 msgstr "_Kopioi kalenteriin..."
 
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Mo_ve to Calendar..."
 msgstr "_Siirrä kalenteriin..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "_Delegate Meeting..."
 msgstr "_Delegoi kokous..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Schedule Meeting..."
 msgstr "_Järjestä kokous..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Forward as iCalendar..."
 msgstr "_Välitä iCalendar-muodossa..."
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../calendar/gui/e-calendar-view.c:1689 ../mail/em-folder-view.c:1330
+#: ../calendar/gui/e-calendar-view.c:1688 ../mail/em-folder-view.c:1330
 #: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "Make this Occurrence _Movable"
 msgstr "Muuta tämä kerta _siirrettäväksi"
 
-#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1694 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "Delete _All Occurrences"
 msgstr "Poista _kaikki tapahtumakerrat"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2510
+#: ../calendar/gui/e-calendar-view.c:2234 ../calendar/gui/print.c:2510
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2268
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
@@ -7681,19 +7711,19 @@ msgstr "%02i minuutin välein"
 #. 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:852 ../calendar/gui/e-day-view.c:1566
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1560
 #: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1674
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:806 ../calendar/gui/e-week-view.c:542
+#: ../calendar/gui/e-day-view.c:800 ../calendar/gui/e-week-view.c:540
 #: ../calendar/gui/print.c:831
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:809 ../calendar/gui/e-week-view.c:545
+#: ../calendar/gui/e-day-view.c:803 ../calendar/gui/e-week-view.c:543
 #: ../calendar/gui/print.c:833
 msgid "pm"
 msgstr "pm"
@@ -8968,49 +8998,49 @@ msgstr "Peruttu"
 msgid "In progress"
 msgstr "Kesken"
 
-#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:50
 msgid "is greater than"
 msgstr "on suurempi kuin"
 
-#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:51
 msgid "is less than"
 msgstr "on vähemmän kuin"
 
-#: ../calendar/importers/icalendar-importer.c:73
+#: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
 msgstr "Tapaamiset ja kokoukset"
 
-#: ../calendar/importers/icalendar-importer.c:331
-#: ../calendar/importers/icalendar-importer.c:614
+#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:616
 #: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "Avataan kalenteria"
 
-#: ../calendar/importers/icalendar-importer.c:438
+#: ../calendar/importers/icalendar-importer.c:440
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar tiedostot (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:441
 msgid "Evolution iCalendar importer"
 msgstr "Evolutionin iCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:515
+#: ../calendar/importers/icalendar-importer.c:517
 msgid "Reminder!"
 msgstr "Muistutus!"
 
-#: ../calendar/importers/icalendar-importer.c:567
+#: ../calendar/importers/icalendar-importer.c:569
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar tiedostot (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:568
+#: ../calendar/importers/icalendar-importer.c:570
 msgid "Evolution vCalendar importer"
 msgstr "Evolutionin vCalendar-tuoja"
 
-#: ../calendar/importers/icalendar-importer.c:730
+#: ../calendar/importers/icalendar-importer.c:732
 msgid "Calendar Events"
 msgstr "Kalenteritapahtumat"
 
-#: ../calendar/importers/icalendar-importer.c:767
+#: ../calendar/importers/icalendar-importer.c:769
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution kalenterin älykäs tuoja"
 
@@ -10825,18 +10855,18 @@ msgstr "Valitse kansio johon viesti postitetaan:"
 msgid "Click here to select folders to post to"
 msgstr "Valitse tästä kansiot, joihin postituksia lähetetään"
 
-#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1556
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1553
 msgid "Show _Attachment Bar"
 msgstr "Näytä _liitepalkki"
 
-#: ../composer/e-msg-composer.c:870
+#: ../composer/e-msg-composer.c:867
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Lähtevää viestiä ei voi allekirjoittaa: allekirjoitusvarmennetta ei ole "
 "asetettu tälle tilille"
 
-#: ../composer/e-msg-composer.c:877
+#: ../composer/e-msg-composer.c:874
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10844,7 +10874,7 @@ msgstr ""
 "Lähtevää viestiä ei voi salata: Salausvarmennetta ei ole asetettu tälle "
 "tilille"
 
-#: ../composer/e-msg-composer.c:1498 ../mail/em-format-html-display.c:1919
+#: ../composer/e-msg-composer.c:1495 ../mail/em-format-html-display.c:1919
 #: ../mail/em-format-html-display.c:2411 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
@@ -10852,15 +10882,15 @@ msgid_plural "Attachments"
 msgstr[0] "Liite"
 msgstr[1] "Liitteet"
 
-#: ../composer/e-msg-composer.c:1554
+#: ../composer/e-msg-composer.c:1551
 msgid "Hide _Attachment Bar"
 msgstr "Piilota _liitepalkki"
 
-#: ../composer/e-msg-composer.c:1571 ../composer/e-msg-composer.c:2778
+#: ../composer/e-msg-composer.c:1568 ../composer/e-msg-composer.c:2775
 msgid "Compose Message"
 msgstr "Uusi viesti"
 
-#: ../composer/e-msg-composer.c:4053
+#: ../composer/e-msg-composer.c:4050
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10950,8 +10980,9 @@ msgstr ""
 "Viestin palautuksen avulla voit jatkaa siitä, mihin jäit."
 
 #: ../composer/mail-composer.error.xml.h:17
+#, fuzzy
 msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
+"Send options available only for Novell GroupWise and Microsoft Exchange "
 "accounts."
 msgstr ""
 "Lähetysasetukset ovat käytettävissä vain Novell Groupwise- ja Microsoft "
@@ -11064,18 +11095,18 @@ msgstr "Evolutionin kysely"
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Sisäinen virhe, tuntematonta virhettä \"%s\" haettiin"
 
-#: ../e-util/e-logger.c:156
+#: ../e-util/e-logger.c:161
 msgid "Component"
 msgstr "Komponentti"
 
-#: ../e-util/e-logger.c:157
+#: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
 msgstr "Lokitettavan komponentin nimi"
 
 #: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
 #: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:689
+#: ../plugins/publish-calendar/publish-calendar.c:690
 msgid "Enabled"
 msgstr "käytössä"
 
@@ -11124,7 +11155,7 @@ msgstr "Kirjoita tiedoston yli?"
 msgid "_Overwrite"
 msgstr "_Ylikirjoita"
 
-#: ../e-util/e-util.c:97
+#: ../e-util/e-util.c:96
 msgid "Could not display help for Evolution."
 msgstr "Evolutionin ohjetta ei voitu näyttää."
 
@@ -11185,119 +11216,119 @@ msgstr "GConf-virhe: %s"
 msgid "All further errors shown only on terminal."
 msgstr "Kaikki virheet tästä eteenpäin näkyvät vain päätteessä."
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekunti sitten"
 msgstr[1] "%d sekuntia sitten"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 sekunti tulevaisuudessa"
 msgstr[1] "%d sekuntia tulevaisuudessa"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minuutti sitten"
 msgstr[1] "%d minuuttia sitten"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "yhden minuutin päässä"
 msgstr[1] "%d minuutin päässä"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 tunti sitten"
 msgstr[1] "%d tuntia sitten"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 tunti tulevaisuudessa"
 msgstr[1] "%d tuntia tulevaisuudessa"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 päivä sitten"
 msgstr[1] "%d päivää sitten"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "yhden päivän päässä"
 msgstr[1] "%d päivän päässä"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 viikko sitten"
 msgstr[1] "%d viikkoa sitten"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 viikko tulevaisuudessa"
 msgstr[1] "%d viikkoa tulevaisuudessa"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 kuukausi sitten"
 msgstr[1] "%d kuukautta sitten"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "yhden kuukauden päässä"
 msgstr[1] "%d kuukauden päässä"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 vuosi sitten"
 msgstr[1] "%d vuotta sitten"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "yhden vuoden päässä"
 msgstr[1] "%d vuoden päässä"
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<napsauta valitaksesi päiväys>"
 
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "nyt"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:298
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:452
 msgid "Select a time to compare against"
 msgstr "Valitse aika johon verrataan"
 
@@ -11310,56 +11341,56 @@ msgstr "Valitse tiedosto"
 msgid "Test"
 msgstr "Testi"
 
-#: ../filter/filter-rule.c:852
+#: ../filter/filter-rule.c:853
 msgid "R_ule name:"
 msgstr "_Säännön nimi:"
 
-#: ../filter/filter-rule.c:880
+#: ../filter/filter-rule.c:881
 msgid "Find items that meet the following criteria"
 msgstr "Etsi kohdat, jotka vastaavat seuraavaa ehtoa"
 
-#: ../filter/filter-rule.c:914
+#: ../filter/filter-rule.c:915
 msgid "A_dd Filter Criteria"
 msgstr "Lisää _suodatussääntö"
 
-#: ../filter/filter-rule.c:920
+#: ../filter/filter-rule.c:921
 msgid "If all criteria are met"
 msgstr "jos kaikki ehdot täytetään"
 
-#: ../filter/filter-rule.c:920
+#: ../filter/filter-rule.c:921
 msgid "If any criteria are met"
 msgstr "jos joku ehdoista täyttyy"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:923
 msgid "_Find items:"
 msgstr "_Etsi kohteita:"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "All related"
 msgstr "Kaikki tähän liittyvät"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies"
 msgstr "Vastaukset"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies and parents"
 msgstr "Vastaukset ja vanhemmat"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "No reply or parent"
 msgstr "Ei vastasta tai vanhempaa"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/filter-rule.c:947
 msgid "I_nclude threads"
 msgstr "O_ta myös säikeet mukaan"
 
-#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Tulevat"
 
-#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Lähtevät"
 
@@ -11460,7 +11491,7 @@ msgstr "tulevaisuudessa"
 msgid "months"
 msgstr "kuukautta"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:197
 msgid "seconds"
 msgstr "sekuntia"
 
@@ -11549,8 +11580,8 @@ msgstr "Evolutionin verkkoyhteyden asetukset"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:593 ../mail/mail-component.c:594
-#: ../mail/mail-component.c:763
+#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
+#: ../mail/mail-component.c:762
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Sähköposti"
@@ -11621,7 +11652,7 @@ msgstr "T_arkista uudet viestit joka"
 msgid "minu_tes"
 msgstr "minuutti"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "Lähetys"
 
@@ -11631,7 +11662,7 @@ msgstr "Oletusasetukset"
 
 #. Security settings
 #: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Turvallisuus"
 
@@ -11709,251 +11740,267 @@ msgstr "-----Alkuperäinen viesti-----"
 msgid "_Filter Rules"
 msgstr "_Suodatinsäännöt"
 
+#.
+#. * 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)
+#.
 #. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
+#: ../mail/em-filter-i18n.h:18
 msgid "Adjust Score"
 msgstr "Muuta pisteytystä"
 
-#: ../mail/em-filter-i18n.h:3
+#: ../mail/em-filter-i18n.h:19
 msgid "Assign Color"
 msgstr "Aseta väri"
 
-#: ../mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:20
 msgid "Assign Score"
 msgstr "Aseta pistemäärä"
 
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:22
 msgid "BCC"
 msgstr "BCC"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:23
 msgid "Beep"
 msgstr "Piippaa"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:24
 msgid "CC"
 msgstr "CC"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:25
 msgid "Completed On"
 msgstr "Valmistui"
 
-#: ../mail/em-filter-i18n.h:11
+#: ../mail/em-filter-i18n.h:27
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:28
 msgid "Date received"
 msgstr "Otettu vastaan"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:29
 msgid "Date sent"
 msgstr "Lähetetty"
 
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:767
+#: ../mail/em-filter-i18n.h:30
+#: ../plugins/groupwise-features/share-folder.c:768
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Poista"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:31
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:33
 msgid "does not end with"
 msgstr "ei pääty"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:34
 msgid "does not exist"
 msgstr "ei ole olemassa"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:35
 msgid "does not return"
 msgstr "ei palauta"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:36
 msgid "does not sound like"
 msgstr "ei kuulosta samalta kuin"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:37
 msgid "does not start with"
 msgstr "ei ala"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:39
 msgid "Draft"
 msgstr "Luonnos"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:40
 msgid "ends with"
 msgstr "päättyy"
 
-#: ../mail/em-filter-i18n.h:26
+#: ../mail/em-filter-i18n.h:42
 msgid "exists"
 msgstr "on olemassa"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:43
 msgid "Expression"
 msgstr "Lauseke"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:44
 msgid "Follow Up"
 msgstr "Lähetä edelleen"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:45 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Tärkeä"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:47
 msgid "is after"
 msgstr "on jälkeen"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:48
 msgid "is before"
 msgstr "on ennen"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:49
 msgid "is Flagged"
 msgstr "on merkitty"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:53
 msgid "is not Flagged"
 msgstr "ei ole merkitty"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:54
 msgid "is not set"
 msgstr "ei ole asetettu"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:55
 msgid "is set"
 msgstr "on asetettu"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
+#: ../mail/em-filter-i18n.h:56 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Roskaposti"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:57
 msgid "Junk Test"
 msgstr "Roskapostitesti"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:58 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Merkintä"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:59
 msgid "Mailing list"
 msgstr "Postituslista"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:60
 msgid "Match All"
 msgstr "Kaikki käyvät"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:61
 msgid "Message Body"
 msgstr "Viestin runko"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:62
 msgid "Message Header"
 msgstr "Viestin otsakkeet"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:63
 msgid "Message is Junk"
 msgstr "Viesti on roskapostia"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:64
 msgid "Message is not Junk"
 msgstr "Viesti ei ole roskapostia"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:65
 msgid "Move to Folder"
 msgstr "Siirrä kansioon"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:66
 msgid "Pipe to Program"
 msgstr "Välitä putkessa ohjelmalle"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:67
 msgid "Play Sound"
 msgstr "Soita ääni"
 
 #. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:69 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Lue"
 
-#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Vastaanottajat"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:71
 msgid "Regex Match"
 msgstr "Regex-osuma"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:72
 msgid "Replied to"
 msgstr "Vastaus viestiin"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:73
 msgid "returns"
 msgstr "palauttaa"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:74
 msgid "returns greater than"
 msgstr "palauttaa enemmän kuin"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:75
 msgid "returns less than"
 msgstr "palauttaa vähemmän kuin"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:76
 msgid "Run Program"
 msgstr "Suorita ohjelma"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Pistemäärä"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:78 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Lähettäjä"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:79
 msgid "Set Label"
 msgstr "Aseta merkintä"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:80
 msgid "Set Status"
 msgstr "Aseta tila"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:81
 msgid "Size (kB)"
 msgstr "Koko (kB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:82
 msgid "sounds like"
 msgstr "kuulostaa samalta kuin"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:83
 msgid "Source Account"
 msgstr "Lähteen yhteystieto"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:84
 msgid "Specific header"
 msgstr "Annettu otsake"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:85
 msgid "starts with"
 msgstr "alkaa"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:87
 msgid "Stop Processing"
 msgstr "Pysäytä käsittely"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
+#: ../mail/em-filter-i18n.h:88 ../mail/em-format-quote.c:342
 #: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
 #: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
 #: ../plugins/groupwise-features/properties.glade.h:7
@@ -11961,7 +12008,7 @@ msgstr "Pysäytä käsittely"
 msgid "Subject"
 msgstr "Aihe"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:89
 msgid "Unset Status"
 msgstr "Poista tilan asetus"
 
@@ -12049,9 +12096,9 @@ msgstr "Levytilan käyttö"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-properties.c:358 ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
-#: ../mail/mail-component.c:581
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:159
+#: ../mail/mail-component.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "Saapuneet"
@@ -12084,15 +12131,15 @@ msgstr "Hakunäkymät"
 msgid "UNMATCHED"
 msgstr "EI VASTAAVAA"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:160
 msgid "Drafts"
 msgstr "Luonnokset"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:161
 msgid "Outbox"
 msgstr "Lähtevät"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:162
 msgid "Sent"
 msgstr "Lähetetyt"
 
@@ -12135,12 +12182,12 @@ msgstr "Siirretään kansiota %s"
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2015
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kansioon %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2017
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
@@ -12157,7 +12204,7 @@ msgstr "_Kopioi kansioon"
 msgid "_Move to Folder"
 msgstr "_Siirrä kansioon"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Etsitään kansioita kohteessa \"%s\""
@@ -12206,20 +12253,20 @@ msgstr "Valitse kansio"
 msgid "C_opy"
 msgstr "_Kopioi"
 
-#: ../mail/em-folder-utils.c:585
+#: ../mail/em-folder-utils.c:532
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Luodaan kansiota %s"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Luo uusi kansio"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Määrittele mihin kansio luodaan:"
@@ -12292,7 +12339,7 @@ msgstr "_Merkintä"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:480
 msgid "_None"
 msgstr "_Ei mitään"
 
@@ -12718,8 +12765,8 @@ msgid "Reply-To"
 msgstr "Vastausosoite"
 
 #: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
-#: ../widgets/misc/e-dateedit.c:353
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:327
+#: ../widgets/misc/e-dateedit.c:349
 msgid "Date"
 msgstr "Päiväys"
 
@@ -12893,8 +12940,9 @@ msgid "Failed to create local mail storage `%s': %s"
 msgstr "Paikallista sähköpostitilaa '%s' ei voi luoda: %s"
 
 #: ../mail/em-migrate.c:2898
+#, fuzzy
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"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..."
@@ -12927,7 +12975,7 @@ msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
 #. make it first item
-#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:853
 msgid "_Add to Address Book"
 msgstr "_Lisää osoitekirjaan"
 
@@ -12954,7 +13002,7 @@ msgstr "Ei palvelinta valittuna"
 
 #. Check buttons
 #: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:127
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "Älä _näytä tätä viestiä uudestaan."
 
@@ -13001,8 +13049,8 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "\"Lähetä ja vastaanota\" -ikkunan leveys"
 
 #: ../mail/evolution-mail.schemas.in.h:4
-msgid "Allows evolution to display text part of limited size"
-msgstr "Sallii evolution näyttää rajoitetun kokoiset tekstiosat"
+msgid "Allows Evolution to display text part of limited size"
+msgstr "Sallii evolutionin näyttää rajoitetun kokoiset tekstiosat"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
@@ -13285,10 +13333,11 @@ msgstr ""
 "vieressä eikä alapuolella."
 
 #: ../mail/evolution-mail.schemas.in.h:61
+#, fuzzy
 msgid ""
-"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
-"any mime-types appearing in this list which map to a bonobo-component viewer "
-"in GNOME's mime-type database may be used for displaying content."
+"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 ""
 "Jos jollekin MIME-tyypille ei ole sisäänrakennettu katselinta Evolutionissa, "
 "voidaan käyttää mitä tahansa Gnomen MIME-tyyppientietokannassa määriteltyä "
@@ -13361,14 +13410,18 @@ msgid "List of Labels and their associated colors"
 msgstr "Merkinnät ja niihin liittyvät värit"
 
 #: ../mail/evolution-mail.schemas.in.h:72
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr "Luettelo MIME-tyypeistä, joista etsitään bonobo-komponenttikatselimia"
+
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accepted licenses"
 msgstr "Hyväksytyt lisenssit"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of accounts"
 msgstr "Luettelo tileistä"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13377,15 +13430,15 @@ msgstr ""
 "merkkijonoja, jotka nimeävät alihakemistoja hakemiston/apps/evolution/mail/"
 "accounts alla."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of custom headers and whether they are enabled."
 msgstr "Luettelo omista otsakkeista ja tieto siitä ovatko ne käytössä."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Luettelo oikoluvun käyttämistä sanaston kielikoodeista."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 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."
@@ -13393,21 +13446,18 @@ msgstr ""
 "Evolutionin sähköpostiosan tuntemat etiketit. Luettelo sisältää nimi:väri "
 "pareja, joissa väri on määritelty HTML-värien heksadesimaalisessa muodossa."
 
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of mime types to check for bonobo component viewers"
-msgstr "Luettelo MIME-tyypeistä, joille etsitään bonobo komponenttikatselimia"
-
 #: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Luettelo protokollista, joiden lisenssi on hyväksytty."
 
 #: ../mail/evolution-mail.schemas.in.h:80
-msgid "Load images for HTML messages over http"
-msgstr "Hae HTML-viestien kuvat käyttäen HTTP:ta"
+msgid "Load images for HTML messages over HTTP"
+msgstr "Lataa HTML-viestien kuvat käyttäen HTTP:ta"
 
 #: ../mail/evolution-mail.schemas.in.h:81
+#, fuzzy
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"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 ""
@@ -13661,9 +13711,10 @@ msgstr ""
 "\" (varoitukset) tai \"2\" (vianetsintäviestit)."
 
 #: ../mail/evolution-mail.schemas.in.h:141
+#, fuzzy
 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 interms of KB."
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
 "Tämä määrittää maksimikoon viestin tekstiosalle, joka voidaan esittää "
 "evolutionissa. Oletusarvo on 4096kt ja arvo määritellää kilotavuina."
@@ -13896,16 +13947,16 @@ msgstr "Berkeley Mailbox (mbox)"
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Berkeley Mailbox-muotoisten kansioiden tuoja"
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "Tuodaan kansiota"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
+#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Tuodaan '%s'"
 
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "Tutkitaan %s"
@@ -13946,150 +13997,150 @@ msgstr "%s postilista"
 msgid "Add Filter Rule"
 msgstr "Lisää suodatussääntö"
 
-#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:519
+#: ../mail/mail-component.c:163 ../plugins/templates/templates.c:519
 #: ../plugins/templates/templates.c:689 ../plugins/templates/templates.c:724
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "Pohjat"
 
-#: ../mail/mail-component.c:546
+#: ../mail/mail-component.c:545
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valittu, "
 msgstr[1] "%d valittua, "
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:549
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d poistettu"
 msgstr[1] "%d poistettua"
 
-#: ../mail/mail-component.c:557
+#: ../mail/mail-component.c:556
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d roskaposti"
 msgstr[1] "%d roskapostia"
 
-#: ../mail/mail-component.c:560
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d luonnos"
 msgstr[1] "%d luonnosta"
 
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d lähetetty"
 msgstr[1] "%d lähetettyä"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:563
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d lähettämätön"
 msgstr[1] "%d lähettämätöntä"
 
-#: ../mail/mail-component.c:570
+#: ../mail/mail-component.c:569
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d lukematon, "
 msgstr[1] "%d lukematonta, "
 
-#: ../mail/mail-component.c:571
+#: ../mail/mail-component.c:570
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d viesti"
 msgstr[1] "%d viestiä"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:922
 msgid "New Mail Message"
 msgstr "Uusi viesti"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:923
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Sähköpostiviesti"
 
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:924
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:930
 msgid "New Mail Folder"
 msgstr "Uusi sähköpostikansio"
 
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:931
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Sähköposti_kansio"
 
-#: ../mail/mail-component.c:933
+#: ../mail/mail-component.c:932
 msgid "Create a new mail folder"
 msgstr "Luo uusi sähköpostikansio"
 
-#: ../mail/mail-component.c:1080
+#: ../mail/mail-component.c:1079
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Sähköpostin asetusten tai kansioiden päivitys epäonnistui."
 
-#: ../mail/mail-component.c:1596
+#: ../mail/mail-component.c:1595
 msgid "Error"
 msgstr "Virhe"
 
-#: ../mail/mail-component.c:1596
+#: ../mail/mail-component.c:1595
 msgid "Errors"
 msgstr "Virheet"
 
-#: ../mail/mail-component.c:1597
+#: ../mail/mail-component.c:1596
 msgid "Warnings and Errors"
 msgstr "Varoitukset ja virheet"
 
-#: ../mail/mail-component.c:1598
+#: ../mail/mail-component.c:1597
 msgid "Debug"
 msgstr "Vianetsintä"
 
-#: ../mail/mail-component.c:1598
+#: ../mail/mail-component.c:1597
 msgid "Error, Warnings and Debug messages"
 msgstr "Virheet, varoitukset ja vianetsintäviestit"
 
-#: ../mail/mail-component.c:1725
+#: ../mail/mail-component.c:1724
 msgid "Debug Logs"
 msgstr "Vianetsintäloki"
 
-#: ../mail/mail-component.c:1739
+#: ../mail/mail-component.c:1738
 msgid "Show _errors in the status bar for"
 msgstr "Näytä _virheet tilarivillä "
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1755
+#: ../mail/mail-component.c:1754
 msgid "second(s)."
 msgstr "sekunnin ajan."
 
-#: ../mail/mail-component.c:1761
+#: ../mail/mail-component.c:1760
 msgid "Log Messages:"
 msgstr "Lokiviestit:"
 
-#: ../mail/mail-component.c:1802
+#: ../mail/mail-component.c:1801
 msgid "Log Level"
 msgstr "Lokitustaso"
 
-#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1810 ../widgets/misc/e-dateedit.c:391
 msgid "Time"
 msgstr "Aika"
 
-#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
+#: ../mail/mail-component.c:1820 ../mail/message-list.c:2516
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Viestit"
 
-#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1829 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
@@ -14570,66 +14621,74 @@ msgid "S_tandard Font:"
 msgstr "_Oletuskirjaisin:"
 
 #: ../mail/mail-config.glade.h:132
+msgid "Select Drafts Folder"
+msgstr "Valitse luonnosten kansio"
+
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font for printing"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin tulostusta varten"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font"
 msgstr "Valitse HTML-viestin vaihtuvalevyinen kirjasin"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font for printing"
 msgstr "Valitse HTML-viestin vaihtuvalevyinen kirjasin tulostusta varten"
 
 #: ../mail/mail-config.glade.h:137
+msgid "Select Sent Folder"
+msgstr "Valitse lähetettyjen kansio"
+
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "Lähtevä posti"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "Lähetettyjen _viestien kansio:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:142
 msgid "Server _Type: "
 msgstr "Palvelintyyppi: "
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "_Allekirjoitusvarmenne:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "_Allekirjoitus:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "Allekirjoitukset"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "Allekirjoitusten taulu"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "Oikoluku"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "Aloita _kirjoittaminen lopusta vastattaessa"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
 msgid "T_ype: "
 msgstr "_Tyyppi:"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14637,7 +14696,7 @@ msgstr ""
 "Luettelo käytettävissä olevista kielistä riippuu ainoastaan siitä, mille "
 "kielille sinulla on sanastoja asennettuna."
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14647,7 +14706,7 @@ msgstr ""
 "Valitsemasi nimi on käytössä ainoastaan tässä listassa\n"
 "näytettäessä."
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:154
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14655,26 +14714,26 @@ msgstr ""
 "Anna nimi jolla haluaisit kutsua tätä sähköpostitiliä.\n"
 "Esimerkiksi \"Työ\" tai \"Henkilökohtaista\""
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:156
 msgid "Us_ername:"
 msgstr "Käyttäjät_unnus:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:157
 msgid "Use Authe_ntication"
 msgstr "Käytä _tunnistautumista"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
+#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:284
 #: ../plugins/google-account-setup/google-source.c:625
 #: ../plugins/google-account-setup/google-contacts-source.c:278
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "Käyttäjät_unnus:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:159
 msgid "V_ariable-width:"
 msgstr "_Vaihtuva leveys:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:160
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14684,124 +14743,124 @@ msgstr ""
 "\n"
 "Valitse \"Eteenpäin\" aloittaaksesi."
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:163
 msgid "_Add Signature"
 msgstr "_Lisää allekirjoitus:"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:164
 msgid "_Always load images from the Internet"
 msgstr "Lataa _aina kuvat verkosta"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:165
 msgid "_Automatic proxy configuration URL:"
 msgstr "_Automaattisten välipalvelinasetusten URL:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:166
 msgid "_Default junk plugin:"
 msgstr "_Roskapostin oletusliitännäinen"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:167
 msgid "_Direct connection to the Internet"
 msgstr "_Suora yhteys Internettiin"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:168
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Älä allekirjoita kokouskutsuja (Outlook-yhteensopivuus)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:170
 msgid "_Forward style:"
 msgstr "_Välitä tyyli:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:171
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Pidä allekirjoitus alkuperäisen viestin yllä vastattaessa"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:172
 msgid "_Load images in messages from contacts"
 msgstr "_Hae viestin kuvat, jos yhteystieto on osoitekirjassa"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:173
 msgid "_Lookup in local address book only"
 msgstr "_Etsi vain paikallisesta osoitekirjasta"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:174
 msgid "_Make this my default account"
 msgstr "Tee tästä _oletustilini"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:175
 msgid "_Manual proxy configuration:"
 msgstr "_Välipalvelimen käsin asettaminen:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:176
 msgid "_Mark messages as read after"
 msgstr "_Merkitse viestit luetuiksi kun on kulunut"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:178
 msgid "_Never load images from the Internet"
 msgstr "_Älä koskaan lataa kuvia verkosta"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:179
 msgid "_Path:"
 msgstr "_Polku:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:180
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Kysy vahvistus HTML-viesteistä henkilöille, jotka eivät niitä halua"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:181
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Kysy vahvistus lähetettäessä viestejä tyhjällä Aihe-otsakkella"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:182
 msgid "_Reply style:"
 msgstr "_Vastaustyyli:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:183
 msgid "_Script:"
 msgstr "_Skripti:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:184
 msgid "_Secure HTTP Proxy:"
 msgstr "_HTTPS-välipalvelin:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:185
 msgid "_Select..."
 msgstr "_Valitse..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:188
 msgid "_Show image animations"
 msgstr "Näytä kuvien animaatiot"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:189
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Näytä lähettäjän valokuva sähköpostin esikatselussa"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:190
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Rajaa To-, Cc- ja Bcc-otsakkeet lukumäärään "
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:191
 msgid "_Use Secure Connection:"
 msgstr "_Käytä salattua yhteyttä:"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:192
 msgid "_Use system defaults"
 msgstr "Käytä järjestelmän olet_uksia"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:193
 msgid "_Use the same fonts as other applications"
 msgstr "Käytä samoja _kirjasimia kuin muut ohjelmat"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "osoitteet"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr " väri"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "kuvaus"
 
@@ -14901,26 +14960,26 @@ msgstr "_Merkki:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Laita tähän rasti, jos hyväksyt lisenssiehdot"
 
-#: ../mail/mail-folder-cache.c:832
+#: ../mail/mail-folder-cache.c:833
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingataan %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:106
 msgid "Filtering Selected Messages"
 msgstr "Suodatetaan valittuja viestejä"
 
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Haetaan viestejä"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
+#: ../mail/mail-ops.c:561
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Virhe käytettäessä lähtevän postin suodattimia: %s"
 
-#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14929,123 +14988,123 @@ msgstr ""
 "Lisäys '%s':ään epäonnistui: %s\n"
 "Lisätään paikalliseen 'Lähetetyt' kansioon."
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Viestin lisäys paikalliseen 'Lähetetyt'-kansioon epäonnistui: %s"
 
-#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:725
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d viestin %d:stä epäonnistui"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:698
 msgid "Canceled."
 msgstr "Peruttu."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:700
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../mail/mail-ops.c:871
+#: ../mail/mail-ops.c:872
 msgid "Saving message to folder"
 msgstr "Tallennetaan viestiä kansioon"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Siirretään viestejä kohteeseen %s"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopioidaan viestejä kohteeseen %s"
 
-#: ../mail/mail-ops.c:1166
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "Välitetyt viestit"
 
-#: ../mail/mail-ops.c:1207
+#: ../mail/mail-ops.c:1208
 #, c-format
 msgid "Opening folder %s"
 msgstr "Avataan kansiota %s"
 
-#: ../mail/mail-ops.c:1272
+#: ../mail/mail-ops.c:1273
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Noudetaan kansion %s levytilatietoja"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Opening store %s"
 msgstr "Avataan tallennustilaa %s"
 
-#: ../mail/mail-ops.c:1412
+#: ../mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Poistetaan kansiota %s"
 
-#: ../mail/mail-ops.c:1501
+#: ../mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Tallennetaan kansiota %s"
 
-#: ../mail/mail-ops.c:1564
+#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Siivotaan ja tallennetaan tiliä '%s'"
 
-#: ../mail/mail-ops.c:1565
+#: ../mail/mail-ops.c:1595
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Tallennetaan tiliä %s"
 
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1649
 msgid "Refreshing folder"
 msgstr "Virkistetään kansiota"
 
-#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
+#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
 msgid "Expunging folder"
 msgstr "Poistetaan poistettuja kansiosta"
 
-#: ../mail/mail-ops.c:1706
+#: ../mail/mail-ops.c:1736
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tyhjennetään roskakoria '%s'"
 
-#: ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1737
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
-#: ../mail/mail-ops.c:1788
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viestiä %s"
 
-#: ../mail/mail-ops.c:1895
+#: ../mail/mail-ops.c:1925
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Haetaan %d viesti"
 msgstr[1] "Haetaan %d viestiä"
 
-#: ../mail/mail-ops.c:1980
+#: ../mail/mail-ops.c:2010
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Tallennetaan %d viesti"
 msgstr[1] "Tallennetaan %d viestiä"
 
-#: ../mail/mail-ops.c:2058
+#: ../mail/mail-ops.c:2088
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15054,11 +15113,11 @@ msgstr ""
 "Virhe tallennettaessa viestejä: %s:\n"
 "%s"
 
-#: ../mail/mail-ops.c:2130
+#: ../mail/mail-ops.c:2160
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
+#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15067,27 +15126,27 @@ msgstr ""
 "Tulostiedostoa ei voi luoda: %s:\n"
 "%s"
 
-#: ../mail/mail-ops.c:2171
+#: ../mail/mail-ops.c:2201
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tietoa ei voi kirjoittaa: %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Yhteyttä %s katkaistaan"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Otetaan uudestaan yhteyttä kohteeseen %s"
 
-#: ../mail/mail-ops.c:2413
+#: ../mail/mail-ops.c:2443
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Valmistellaan tiliä \"%s\" yhteydettömään tilaan"
 
-#: ../mail/mail-ops.c:2499
+#: ../mail/mail-ops.c:2529
 msgid "Checking Service"
 msgstr "Tarkistetaan palvelua"
 
@@ -15103,15 +15162,15 @@ msgstr "Lähetä ja vastaanota postia"
 msgid "Cancel _All"
 msgstr "_Peruuta kaikki"
 
-#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:502
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
+#: ../mail/mail-send-recv.c:502 ../mail/mail-send-recv.c:578
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: ../mail/mail-send-recv.c:799
+#: ../mail/mail-send-recv.c:804
 #, c-format
 msgid "Checking for new mail"
 msgstr "Tarkistetaan onko uusia viestejä"
@@ -15812,79 +15871,79 @@ msgstr "_Poista pysyvästi"
 msgid "_Open Messages"
 msgstr "_Avaa viestit"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Unseen"
 msgstr "Nähty"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Answered"
 msgstr "Vastattu"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Forwarded"
 msgstr "Välitetty"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1057
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1058
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1062
 msgid "Lowest"
 msgstr "Matalin"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1063
 msgid "Lower"
 msgstr "Matalampi"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1067
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1068
 msgid "Highest"
 msgstr "Korkein"
 
-#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1657 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1664 ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Tänään %l.%M %p"
 
-#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1673 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l.%M %p"
 
-#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1685 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %p"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l.%M %p"
 
-#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1695 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3916 ../mail/message-list.c:4376
+#: ../mail/message-list.c:3978 ../mail/message-list.c:4438
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
-#: ../mail/message-list.c:4224
+#: ../mail/message-list.c:4286
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15892,7 +15951,7 @@ msgstr ""
 "Mikään viesti ei vastaa hakuehtojasi. Tyhjennä hakukenttä valikon kohdasta "
 "Haku -> Tyhjennä tai muuta hakua."
 
-#: ../mail/message-list.c:4226
+#: ../mail/message-list.c:4288
 msgid "There are no messages in this folder."
 msgstr "Tässä kansiossa ei ole viestejä."
 
@@ -15925,6 +15984,10 @@ msgstr "Lähetetyt viestit"
 msgid "Size"
 msgstr "Koko"
 
+#: ../mail/message-list.etspec.h:19
+msgid "Subject - Trimmed"
+msgstr "Otsikko - rajattu"
+
 #: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Soita"
@@ -16009,7 +16072,7 @@ msgid ""
 "body."
 msgstr "Luettelo vihjeistä, joita liitemuistuttaja etsii viestin rungosta."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
 #: ../plugins/templates/templates.c:392
 msgid "Keywords"
 msgstr "Avainsanat"
@@ -16044,9 +16107,10 @@ msgid "_Edit Message"
 msgstr "_Muokkaa viestiä"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+#, fuzzy
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
+"play them directly from Evolution."
 msgstr ""
 "Muotoiluliitännäinen, joka esittää ääniliitteet sisäkkäisesti ja sallii "
 "niiden soittamisen suoraan Evolutionista."
@@ -16274,35 +16338,35 @@ msgstr "_Palauta asetukset..."
 msgid "_Backup Settings..."
 msgstr "_Varmuuskopioi asetukset..."
 
-#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automaattiset yhteystiedot"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:567
+#: ../plugins/bbdb/bbdb.c:639
 msgid "_Auto-create address book entries when replying to messages"
 msgstr "Lisää lähettäjä _automaattisesti osoitekirjaan vastattaessa viestiin"
 
-#: ../plugins/bbdb/bbdb.c:573
+#: ../plugins/bbdb/bbdb.c:645
 msgid "Select Address book for Automatic Contacts"
 msgstr "Valitse osoitekirja automaattisille yhteystiedoille"
 
-#: ../plugins/bbdb/bbdb.c:588
+#: ../plugins/bbdb/bbdb.c:660
 msgid "Instant Messaging Contacts"
 msgstr "Pikaviestinnän yhteystiedot"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:603
+#: ../plugins/bbdb/bbdb.c:675
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "Yhdistä yhteystiedot ja kuvat pidginin tuttavalistasta"
 
-#: ../plugins/bbdb/bbdb.c:609
+#: ../plugins/bbdb/bbdb.c:681
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Valitse osoitekirja Pigdinin tuttavalistalle"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:620
+#: ../plugins/bbdb/bbdb.c:692
 msgid "Synchronize with _buddy list now"
 msgstr "Yhdistä tiedot _tuttavalistasta"
 
@@ -16608,33 +16672,33 @@ msgid "_User:"
 msgstr "_Käyttäjä:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:61
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
 msgid "Secure Password"
 msgstr "Turvallinen salasana"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:64
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr "Yhdistä Exchange-palvelimelle käyttäen turvallista salasanaa (NTLM)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "Selväkielinen salasana"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr ""
 "Yhdistä Exchange-palvelimelle käyttäen tavallista selväkielistä salasanaa."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:257
 msgid "Out Of Office"
 msgstr "Poissa konttorilta"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:264
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16642,88 +16706,88 @@ msgstr ""
 "Alla määritelty viesti lähetään automaattisesti jokaiselle \n"
 "henkilölle, joka lähettää sähköpostia sinulle kun et ole tavoitettavissa."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:281
 msgid "I am out of the office"
 msgstr "En ole tavoitettavissa"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:280
 msgid "I am in the office"
 msgstr "Olen tavoitettavissa"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 msgid "Change the password for Exchange account"
 msgstr "Syötä Exchange-tilin salasana"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:330
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Muokkaa Exchange-tilin valtuutusasetuksia"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:337
 msgid "Delegation Assistant"
 msgstr "Valtuutuksen apulainen"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Miscelleneous"
 msgstr "Sekalaiset"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "View the size of all Exchange folders"
 msgstr "Näytä kaikkien Exchange-kansioiden koko"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Folders Size"
 msgstr "Kansioiden koko"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:368
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchangen asetukset"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
+#: ../plugins/exchange-operations/exchange-account-setup.c:690
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
+#: ../plugins/exchange-operations/exchange-account-setup.c:716
 msgid "A_uthenticate"
 msgstr "K_irjautuminen"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#: ../plugins/exchange-operations/exchange-account-setup.c:737
 msgid "_Mailbox:"
 msgstr "_Sähköpostikansio:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:938
 msgid "_Authentication Type"
 msgstr "_Tunnistautumistapa"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
+#: ../plugins/exchange-operations/exchange-account-setup.c:952
 msgid "Ch_eck for Supported Types"
 msgstr "Tar_kista tuetut tyypit"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1062
-#: ../plugins/exchange-operations/exchange-contacts.c:212
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
+#: ../plugins/exchange-operations/exchange-contacts.c:213
 #, c-format
 msgid "%s KB"
 msgstr "%s kt"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1064
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-account-setup.c:1066
+#: ../plugins/exchange-operations/exchange-contacts.c:215
 #, c-format
 msgid "0 KB"
 msgstr "0 kt"
 
 #: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#: ../plugins/exchange-operations/exchange-contacts.c:166
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -16767,32 +16831,32 @@ msgstr "Salasanasi on vanhentunut. Ole hyvä ja vaihda salasanasi nyt."
 msgid "Your password will expire in the next %d days"
 msgstr "Salasanasi vanhenee seuraavan %d päivän kuluessa"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-delegates-user.c:154
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Oma näkymä"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates-user.c:184
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Muokkaaja (kirjoita, luo, muokkaa)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates-user.c:188
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Kirjoittaja (lue, luo)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Tarkastaja (vain luku)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Valtuutettujen oikeudet"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-delegates-user.c:253
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
@@ -16801,7 +16865,7 @@ msgstr "Oikeudet käyttäjälle %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:341
+#: ../plugins/exchange-operations/exchange-delegates-user.c:343
 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."
@@ -16811,25 +16875,25 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
 msgid "You have been given the following permissions on my folders:"
 msgstr "Sinulle on annettu seuraavat oikeudet kansioihini:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:364
+#: ../plugins/exchange-operations/exchange-delegates-user.c:366
 msgid "You are also permitted to see my private items."
 msgstr "Sinulla on myös lupa katsoa yksityisiä tietojani."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
 msgid "However you are not permitted to see my private items."
 msgstr "Sinulla ei kuitenkaan ole lupaa katsoa yksityisiä tietojani."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Sinut on nimetty käyttäjän %s valtuutetuksi"
@@ -17033,8 +17097,8 @@ msgstr "Lisää käyttäjä:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:934
-#: ../plugins/groupwise-features/share-folder.c:715
+#: ../plugins/groupwise-features/proxy.c:937
+#: ../plugins/groupwise-features/share-folder.c:716
 msgid "Add User"
 msgstr "Lisää käyttäjä"
 
@@ -17667,7 +17731,7 @@ msgid "<b>Server</b>"
 msgstr "<b>Palvelin</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar and contacts."
+msgid "A plugin to setup Google Calendar and Contacts."
 msgstr "Google-kalenterin ja yhteystietojen liitännäinen."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -17679,15 +17743,14 @@ msgid "Checklist"
 msgstr "Muistilista"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
-msgstr ""
-"Groupwise-kalenterien ja yhteystietolähteiden määrittelyn liitännäinen."
+msgid "A plugin to setup GroupWise calendar and contacts sources."
+msgstr "Groupwise-kalenterien ja yhteystietolähteiden liitännäinen."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
-msgstr "Groupwise-tilin asetukset"
+msgid "GroupWise Account Setup"
+msgstr "Groupwise-tilin määrittely"
 
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17711,11 +17774,11 @@ msgstr ""
 "\n"
 "Asenna jaettu kansio napsauttamalla \"Välitä\"\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:225
 msgid "Install the shared folder"
 msgstr "Asenna jaettu kansio"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:227
 msgid "Shared Folder Installation"
 msgstr "Jaetun kansion asennus"
 
@@ -17741,7 +17804,7 @@ msgid "Email:"
 msgstr "Sähköposti:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "Älä _käytä"
 
@@ -17774,15 +17837,15 @@ msgid "Retract Mail"
 msgstr "Peru viesti"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to groupwise messages"
-msgstr "Lisää lähetysasetuksia groupwise-viesteille"
+msgid "Add Send Options to GroupWise messages"
+msgstr "Lisää lähetysvalintoja groupwise-viesteihin"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
+msgid "A plugin for the features in GroupWise accounts."
 msgstr "Liitännäinen GroupWise-tilien ominaisuuksille."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
+msgid "GroupWise Features"
 msgstr "Groupwisen ominaisuudet"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
@@ -17799,20 +17862,23 @@ msgstr "Palvelin ei sallinut valitun viestin perumista."
 msgid "Invalid user"
 msgstr "Epäkelpo käyttäjä"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#. 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-errors.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "Välipalvelinyhteyttä ei voi avata käyttäjälle &quot;{0}&quot;"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
 msgid "Specify User"
 msgstr "Valitse käyttäjä"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#. 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-errors.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "Tälle käyttäjälle on jo annettu välipalvelinasetukset."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+#. 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-errors.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr ""
 "Välipalvelinoikeuksien määrittely vaatii kelvollisen käyttäjätunnuksen."
@@ -17837,20 +17903,22 @@ msgstr ""
 msgid "This is a recurring meeting"
 msgstr "Tämä on toistuva tapaaminen"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 msgid "Would you like to accept it?"
 msgstr "Haluatko hyväksyä tämän?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "Would you like to decline it?"
 msgstr "Haluatko estää tämän?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
-msgstr "Et voi jakaa kansiota käyttäjän &quot;{0}&quot; kanssa"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "Et voi jakaa tätä kansiota annetun käyttäjän &quot;{0}&quot; kanssa"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
-msgid "You have to specify a user name whom you want to add to the list"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+msgid "You have to specify a user name which you want to add to the list"
 msgstr "Sinun täytyy määrittää käyttäjä, jonka haluat lisätä luetteloon"
 
 #: ../plugins/groupwise-features/process-meeting.c:52
@@ -17951,8 +18019,8 @@ msgstr "<b>Tilin nimi</b>"
 msgid "Proxy Login"
 msgstr "Välimuistiin kirjautuminen"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
 #: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:85
 #, c-format
@@ -17962,22 +18030,28 @@ msgstr "%sSyötä salasana palvelulle %s (käyttäjä %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:509
+#: ../plugins/groupwise-features/proxy-login.c:510
 msgid "_Proxy Login..."
 msgstr "Välimuistin kirjautuminen..."
 
-#: ../plugins/groupwise-features/proxy.c:691
+#. 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:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "Välimuistin välilehti on käytettävissä vain jos tili on yhteydellisessä "
 "tilassa."
 
-#: ../plugins/groupwise-features/proxy.c:696
+#. 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:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Välimuisti on käytettävissä vain jos tili on käytössä."
 
+#: ../plugins/groupwise-features/send-options.c:215
+msgid "Advanced send options"
+msgstr "Lähetyksen lisäasetukset"
+
 #: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:750
+#: ../plugins/groupwise-features/share-folder.c:751
 msgid "Users"
 msgstr "Käyttäjät"
 
@@ -17993,68 +18067,68 @@ msgstr "Uusi _jaettu kansio..."
 msgid "Sharing"
 msgstr "Jakaminen"
 
-#: ../plugins/groupwise-features/share-folder.c:533
+#: ../plugins/groupwise-features/share-folder.c:534
 msgid "Custom Notification"
 msgstr "Oma huomautus"
 
-#: ../plugins/groupwise-features/share-folder.c:755
+#: ../plugins/groupwise-features/share-folder.c:756
 msgid "Add   "
 msgstr "Lisää "
 
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:762
 msgid "Modify"
 msgstr "Muokkaa"
 
-#: ../plugins/groupwise-features/status-track.c:105
+#: ../plugins/groupwise-features/status-track.c:107
 msgid "Message Status"
 msgstr "Viestin tila"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:119
+#: ../plugins/groupwise-features/status-track.c:121
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: ../plugins/groupwise-features/status-track.c:133
+#: ../plugins/groupwise-features/status-track.c:135
 msgid "From:"
 msgstr "Lähettäjä:"
 
-#: ../plugins/groupwise-features/status-track.c:148
+#: ../plugins/groupwise-features/status-track.c:150
 msgid "Creation date:"
 msgstr "Luontipäivä:"
 
-#: ../plugins/groupwise-features/status-track.c:187
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Recipient: "
 msgstr "Vastaanottaja: "
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:196
 msgid "Delivered: "
 msgstr "Toimitettu: "
 
-#: ../plugins/groupwise-features/status-track.c:200
+#: ../plugins/groupwise-features/status-track.c:202
 msgid "Opened: "
 msgstr "Avattu: "
 
-#: ../plugins/groupwise-features/status-track.c:205
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Accepted: "
 msgstr "Hyväksytty: "
 
-#: ../plugins/groupwise-features/status-track.c:210
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Deleted: "
 msgstr "Poistettu: "
 
-#: ../plugins/groupwise-features/status-track.c:215
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Declined: "
 msgstr "Hylätty: "
 
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:222
 msgid "Completed: "
 msgstr "Valmistunut: "
 
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:227
 msgid "Undelivered: "
 msgstr "Ei lähetetty: "
 
-#: ../plugins/groupwise-features/status-track.c:249
+#: ../plugins/groupwise-features/status-track.c:251
 msgid "Track Message Status..."
 msgstr "Seuraa viestin tilaa..."
 
@@ -18158,11 +18232,11 @@ msgstr "Tuo kalenteriin"
 msgid "Imports ICS attachments to calendar."
 msgstr "Tuo ICS-liitteitä kalenteriin."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "Laitteistorajapinta HAL ei ole ladattu"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -18170,11 +18244,11 @@ msgstr ""
 "Palvelu \"hald\" vaaditaan, mutta se ei ole päällä. Ota palvelu käyttöön ja "
 "aja ohjelma uudestaan, tai ota yhteyttä ylläpitäjääsi."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
 msgid "Search for an iPod failed"
 msgstr "iPodia ei löytynyt"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
 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."
@@ -18375,17 +18449,17 @@ msgstr "Muistilappu on toistuva"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2388
 msgid "_Delete message after acting"
 msgstr "_Poista viesti, kun toimenpide on suoritettu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2398
+#: ../plugins/itip-formatter/itip-formatter.c:2430
 msgid "Conflict Search"
 msgstr "Ristiriitaisuuksien haku"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2413
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Valitse kalenterit, joista etsitään päällekkäisiä kokouksia"
 
@@ -18846,11 +18920,11 @@ msgstr "Toteuta _kaikkiin tapahtumakertoihin"
 msgid "Show time as _free"
 msgstr "Näytä aika _vapaana"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1870
 msgid "_Tasks :"
 msgstr "_Tehtävät :"
 
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1872
 msgid "Memos :"
 msgstr "Muistilaput :"
 
@@ -18880,7 +18954,7 @@ msgid ""
 msgstr ""
 "Vastaus ei ole olemassaolevalta läsnäolijalta. Lisätäänkö läsnäolijaksi?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr "Kirjaudu _pois välimuistista"
 
@@ -19427,9 +19501,9 @@ msgstr "Sijainnit"
 msgid "_Publish Calendar Information"
 msgstr "Julkaise kalenteritietoja"
 
-#: ../plugins/publish-calendar/publish-calendar.c:595
-msgid "Are you sure you want to remove this URL?"
-msgstr "Haluatko varmasti poistaa tämän URLin?"
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "Are you sure you want to remove this location?"
+msgstr "Haluatko varmasti poistaa tämän sijainnin?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
@@ -19467,7 +19541,7 @@ msgstr "Julkaisutiheys:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
 msgid ""
-"SSH\n"
+"Secure FTP (SSH)\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -19475,7 +19549,7 @@ msgid ""
 "Secure WebDAV (HTTPS)\n"
 "Custom Location"
 msgstr ""
-"SSH\n"
+"Suojattu FTP (SSH)\n"
 "Julkinen FTP\n"
 "FTP (vaatii kirjautumisen)\n"
 "Windows-jako\n"
@@ -19532,58 +19606,58 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Testiliitännäinen pythonin EPlugin-lataimelle."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using python."
-msgstr "Latain, joka lataa muita pythonilla tehtyjä liitännäisiä."
+msgid "A plugin which loads other plugins written using Python."
+msgstr "Muita pythonilla tehtyjä liitännäisiä lataava liitännäinen."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
 msgstr "Python-latain"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 msgid "SpamAssassin (built-in)"
 msgstr "Spamassassin (sisäänrakennettu)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "Spamassassinia ei löytynyt, paluukoodi: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Putken luonti epäonnistui: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Virhe forkkauksen jälkeen: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassinin lapsiprosessi ei vastaa, tapetaan..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
-#, c-format
-msgid "Wait for Spamassassin child process interrupted, terminating..."
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
+#, fuzzy, c-format
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Spamassassinin lapsiprosessin odotus keskeytettiin, lopetetaan..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Putki spamassassinille epäonnnistui, virhekoodi: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "Spamassassin ei ole saatavilla."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Tämä tekee Spamassassinista luotettavamman, mutta hitaamman"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 msgid "I_nclude remote tests"
 msgstr "Lisää myös etätestit"
 
@@ -19596,12 +19670,12 @@ msgstr ""
 "että spamassassin on asennettu."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "Spamassassin-roskapostiliitännäinen"
+msgid "SpamAssassin Options"
+msgstr "Spamassassin-valitsimet"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "Spamassassin-asetukset"
+msgid "SpamAssassin junk plugin"
+msgstr "Spamassassin-roskapostiliitännäinen"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -19609,7 +19683,7 @@ msgstr "Liitännäinen kaikkien liitteiden tallentamiseen kerralla."
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:314
+#: ../plugins/save-attachments/save-attachments.c:315
 msgid "Save attachments"
 msgstr "Tallenna liitteet"
 
@@ -19621,15 +19695,15 @@ msgstr "Tallenna liitteet..."
 msgid "Save all attachments"
 msgstr "Tallenna kaikki liitteet"
 
-#: ../plugins/save-attachments/save-attachments.c:320
+#: ../plugins/save-attachments/save-attachments.c:321
 msgid "Select save base name"
 msgstr "Valitse tallennuspaikan nimi"
 
-#: ../plugins/save-attachments/save-attachments.c:339
+#: ../plugins/save-attachments/save-attachments.c:340
 msgid "MIME Type"
 msgstr "MIME-tyyppi"
 
-#: ../plugins/save-attachments/save-attachments.c:347
+#: ../plugins/save-attachments/save-attachments.c:348
 msgid "Save"
 msgstr "Tallenna"
 
@@ -19770,15 +19844,15 @@ msgstr "Ohjaa tilin asetusten määrittelyssä ensikäynnistyksellä."
 msgid "Setup Assistant"
 msgstr "Asetusapulainen"
 
-#: ../plugins/startup-wizard/startup-wizard.c:83
+#: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "Evolutionin asetusapulainen"
 
-#: ../plugins/startup-wizard/startup-wizard.c:86
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "Tervetuloa"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -19790,28 +19864,28 @@ msgstr ""
 "\n"
 "Valitse \"Eteenpäin\" jatkaaksesi. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:133
+#: ../plugins/startup-wizard/startup-wizard.c:135
 msgid "Importing files"
 msgstr "Tiedostojen tuonti"
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:137
 #: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Valitse tieto jota haluaisit tuoda:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../plugins/startup-wizard/startup-wizard.c:152
 #: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "Ohjelmasta %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:232
 #: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Tuodaan tietoja."
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:234
 #: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Odota, ole hyvä"
@@ -19858,8 +19932,8 @@ msgid "Drafts based template plugin"
 msgstr "Pohjiin perustuva malliliitännäinen"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses ytnef to decode tnef attachments."
-msgstr "Liitännäinen, joka avaa tnef-liitteitä ohjelman ytnef avulla."
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+msgstr "Liitännäinen, joka voita avata TNEF-liitteitä ytnef-ohjelman avulla."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Attachment decoder"
@@ -19884,7 +19958,8 @@ msgid "URL:"
 msgstr "URL:"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
-msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+#, fuzzy
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Vältä IfMatch-komento (vaaditaan apache-versiolle < 2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -20500,18 +20575,22 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Haluatko varmasti unohtaa kaikki muistetut salasanat?"
 
 #: ../shell/shell.error.xml.h:2
+msgid "Cannot start Evolution"
+msgstr "Evolutionia ei voitu käynnistää"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Jatka"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "Poistetaanko vanhat tiedot versiosta {0}"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "Evolution ei käynnisty."
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:6
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -20519,15 +20598,15 @@ msgstr ""
 "Salasanojen unohtaminen tyhjentää kaikki tallennetut salasanat. Salasanaa "
 "kysytään uudestaan, kun sitä seuraavan kerran tarvitaan."
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "Levytila ei riitä päivitykseen."
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "Poistetaanko vanhat tiedot varmasti?"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -20548,9 +20627,10 @@ msgstr ""
 "Kun vanhat tiedot on poistettu, et voi vaihtaa helposti takaisin vanhaan "
 "versioon ja saada tietojasi näkyviin ilman käsityötä.\n"
 
-#: ../shell/shell.error.xml.h:15
+#: ../shell/shell.error.xml.h:16
+#, fuzzy
 msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+"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 "
@@ -20563,11 +20643,11 @@ msgstr ""
 "sisältöineen pysyvästi. Jos päätät pitää nämä tiedot, voit itse poistaa "
 "hakemiston &quot;evolution&quot; halutessasi.\n"
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "Päivitys edellisestä versiosta epäonnistui: {0}"
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:21
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -20580,14 +20660,14 @@ msgstr ""
 "Sinun täytyy vapauttaa enemmän tilaa kotihakemistostasi ennen kuin voit "
 "jatkaa."
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
 "Click help for details"
 msgstr "Valitse Ohje saadaksesi lisätietoja"
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -20601,19 +20681,19 @@ msgstr ""
 "\n"
 "Valitse Ohje saadaksesi lisätietoja"
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "_Unohda"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "_Säilytä tiedot"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "_Muistuta minua myöhemmin"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
@@ -22652,13 +22732,13 @@ msgstr "Näkymän tyyppi:"
 msgid "Attachment Bar"
 msgstr "Liitepalkki"
 
-#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Tiedoston %s liittäminen epäonnistui: %s"
 
-#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Tiedoston %s liittäminen epäonnistui: epätavallinen tiedosto"
@@ -22688,63 +22768,63 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "Kuukausikalenteri"
 
-#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3643
 #: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "Täytön väri"
 
-#: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3650
 #: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
 #: ../widgets/text/e-text.c:3659
 msgid "GDK fill color"
 msgstr "GDK:n täyttöväri"
 
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3665
 #: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "Täytön kuviopeite"
 
-#: ../widgets/misc/e-canvas-background.c:481
 #: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:488
 #: ../widgets/misc/e-canvas-background.c:489
+#: ../widgets/misc/e-canvas-background.c:490
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:495
 #: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:497
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:502
 #: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:504
 msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1426
 #: ../widgets/table/e-table-group-container.c:999
 #: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3074
+#: ../widgets/table/e-table-item.c:3070
 msgid "Minimum width"
 msgstr "Minimileveys"
 
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1427
 #: ../widgets/table/e-table-group-container.c:1000
 #: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3075
+#: ../widgets/table/e-table-item.c:3071
 msgid "Minimum Width"
 msgstr "Minimileveys"
 
 #: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:204
+#: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "Välistys"
 
@@ -22856,55 +22936,55 @@ msgstr "Muut..."
 msgid "Ch_aracter Encoding"
 msgstr "Merkistön _koodaus"
 
-#: ../widgets/misc/e-dateedit.c:309
+#: ../widgets/misc/e-dateedit.c:305
 msgid "Date and Time"
 msgstr "Päiväys ja aika"
 
-#: ../widgets/misc/e-dateedit.c:330
+#: ../widgets/misc/e-dateedit.c:326
 msgid "Text entry to input date"
 msgstr "Tekstikenttä päiväyksen syöttöön"
 
-#: ../widgets/misc/e-dateedit.c:352
+#: ../widgets/misc/e-dateedit.c:348
 msgid "Click this button to show a calendar"
 msgstr "Paina tästä näyttääksesi kalenterin"
 
-#: ../widgets/misc/e-dateedit.c:394
+#: ../widgets/misc/e-dateedit.c:390
 msgid "Drop-down combination box to select time"
 msgstr "Yhdistelmävalitsin ajan valitsemiseen"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:466
 msgid "No_w"
 msgstr "N_yt"
 
-#: ../widgets/misc/e-dateedit.c:476
+#: ../widgets/misc/e-dateedit.c:472
 msgid "_Today"
 msgstr "_Tänään"
 
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1637
 msgid "Invalid Date Value"
 msgstr "Virheellinen päivämäärä"
 
-#: ../widgets/misc/e-dateedit.c:1670
+#: ../widgets/misc/e-dateedit.c:1666
 msgid "Invalid Time Value"
 msgstr "Virheellinen ajan kuvaus"
 
-#: ../widgets/misc/e-expander.c:180
+#: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "Laajennettu"
 
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:183
 msgid "Whether or not the expander is expanded"
 msgstr "Onko laajennin laajennettu"
 
-#: ../widgets/misc/e-expander.c:189
+#: ../widgets/misc/e-expander.c:191
 msgid "Text of the expander's label"
 msgstr "Laajentimen otsikon teksti"
 
-#: ../widgets/misc/e-expander.c:196
+#: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr "Käytä alleviivausta"
 
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:199
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -22912,31 +22992,31 @@ msgstr ""
 "Jos asetettu, tarkoittaa alleviivaus tekstissä, että seuraavaa merkkiä "
 "käytetään pikanäppäimenä"
 
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
 msgstr "Otsikon ja lapsen väliin laitettava tila"
 
-#: ../widgets/misc/e-expander.c:214
+#: ../widgets/misc/e-expander.c:216
 msgid "Label widget"
 msgstr "Merkintä-elementti"
 
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:217
 msgid "A widget to display in place of the usual expander label"
 msgstr "Tavallisen laajennin-otsikin tilalla näytettävä elementti"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3390
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "Laajentimen koko"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "Laajennusnuolen koko"
 
-#: ../widgets/misc/e-expander.c:230
+#: ../widgets/misc/e-expander.c:232
 msgid "Indicator Spacing"
 msgstr "Indikaattioen välistys"
 
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:233
 msgid "Spacing around expander arrow"
 msgstr "Laajennusnuolen ympärillä oleva tila"
 
@@ -23035,52 +23115,52 @@ msgstr "Uudelleenvirtauksen malli"
 msgid "Column width"
 msgstr "Sarakkeen leveys"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Search"
 msgstr "Etsi"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Click here to change the search type"
 msgstr "Muuta hakutyyppiä napsauttamalla tästä"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Search"
 msgstr "Et_si"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:609
 msgid "_Find Now"
 msgstr "_Etsi nyt"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Clear"
 msgstr "_Tyhjennä"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Item ID"
 msgstr "Kohteen ID"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Teksti"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1006
+#: ../widgets/misc/e-search-bar.c:1003
 msgid "Sho_w: "
 msgstr "Nä_ytä: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1023
+#: ../widgets/misc/e-search-bar.c:1020
 msgid "Sear_ch: "
 msgstr "_Etsi: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1032
 msgid " i_n "
 msgstr " lä_hteestä "
 
@@ -23288,23 +23368,23 @@ msgstr "Kohdistettu sarake"
 msgid "Unselected Column"
 msgstr "Valitsematon sarake"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Strikeout Column"
 msgstr "Yliviivattu sarake"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1814
 msgid "Underline Column"
 msgstr "Alleviivaa sarake"
 
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1821
 msgid "Bold Column"
 msgstr "Vahva sarake"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1828
 msgid "Color Column"
 msgstr "Värillinen sarake"
 
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1842
 msgid "BG Color Column"
 msgstr "Taustan värinen sarake"
 
@@ -23463,7 +23543,7 @@ msgstr[1] "%s (%d kohtaa)"
 #: ../widgets/table/e-table-group-container.c:923
 #: ../widgets/table/e-table-group-leaf.c:581
 #: ../widgets/table/e-table-group-leaf.c:582
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 msgid "Alternating Row Colors"
 msgstr "Vaihtelevat rivien värit"
 
@@ -23471,7 +23551,7 @@ msgstr "Vaihtelevat rivien värit"
 #: ../widgets/table/e-table-group-container.c:930
 #: ../widgets/table/e-table-group-leaf.c:588
 #: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 #: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr "Vaakasuuntainen piirtoristikko"
@@ -23480,7 +23560,7 @@ msgstr "Vaakasuuntainen piirtoristikko"
 #: ../widgets/table/e-table-group-container.c:937
 #: ../widgets/table/e-table-group-leaf.c:595
 #: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
 #: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr "Pystysuuntainen piirtoristikko"
@@ -23489,7 +23569,7 @@ msgstr "Pystysuuntainen piirtoristikko"
 #: ../widgets/table/e-table-group-container.c:944
 #: ../widgets/table/e-table-group-leaf.c:602
 #: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
 #: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr "Piirron kohdistin"
@@ -23498,7 +23578,7 @@ msgstr "Piirron kohdistin"
 #: ../widgets/table/e-table-group-container.c:951
 #: ../widgets/table/e-table-group-leaf.c:609
 #: ../widgets/table/e-table-group-leaf.c:610
-#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
+#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
 msgid "Cursor mode"
 msgstr "Kursorin tila"
 
@@ -23506,7 +23586,7 @@ msgstr "Kursorin tila"
 #: ../widgets/table/e-table-group-container.c:958
 #: ../widgets/table/e-table-group-leaf.c:623
 #: ../widgets/table/e-table-group-leaf.c:624
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
 msgid "Selection model"
 msgstr "Valintamalli"
 
@@ -23514,8 +23594,8 @@ msgstr "Valintamalli"
 #: ../widgets/table/e-table-group-container.c:965
 #: ../widgets/table/e-table-group-leaf.c:616
 #: ../widgets/table/e-table-group-leaf.c:617
-#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
-#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
+#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
 #: ../widgets/table/e-tree.c:3338
 msgid "Length Threshold"
 msgstr "Pituuden raja-arvo"
@@ -23524,8 +23604,8 @@ msgstr "Pituuden raja-arvo"
 #: ../widgets/table/e-table-group-container.c:972
 #: ../widgets/table/e-table-group-leaf.c:658
 #: ../widgets/table/e-table-group-leaf.c:659
-#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
-#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
+#: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369
 #: ../widgets/table/e-tree.c:3370
 msgid "Uniform row height"
 msgstr "Yhtenäinen rivinkorkeus"
@@ -23609,24 +23689,24 @@ msgstr "Tietoja järjestyksestä"
 msgid "Tree"
 msgstr "Puu"
 
-#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
 msgid "Table header"
 msgstr "Taulukon otsikko"
 
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
 msgid "Table model"
 msgstr "Taulumalli"
 
-#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
 msgid "Cursor row"
 msgstr "Kohdistimen rivi"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
 #: ../widgets/table/e-tree.c:3377
 msgid "Always search"
 msgstr "Hae aina"
 
-#: ../widgets/table/e-table.c:3346
+#: ../widgets/table/e-table.c:3347
 msgid "Use click to add"
 msgstr "Lisää napsauttamalla"
 
diff --git a/po/gl.po b/po/gl.po
index d7317bbacd..47e3292d90 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -28,33 +28,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-31 16:53+0200\n"
-"PO-Revision-Date: 2008-08-31 16:54+0200\n"
+"POT-Creation-Date: 2008-10-04 21:24+0200\n"
+"PO-Revision-Date: 2008-10-04 21:35+0200\n"
 "Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
 "Language-Team: Galego <proxecto@trasno.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type:  text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution address book"
 msgstr "axenda de enderezos do Evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "Novo contacto"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "Nova lista de contactos"
 
-#: ../a11y/addressbook/ea-minicard-view.c:161
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -77,63 +77,63 @@ msgstr "Contacto: "
 msgid "evolution minicard"
 msgstr "minicartón do Evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
 msgstr "Posúe alarmas."
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has recurrences."
 msgstr "Posúe recorrencias."
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "É unha reunión."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:277
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Evento de calendario: o resumo é %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:280
+#: ../a11y/calendar/ea-cal-view-event.c:279
 msgid "Calendar Event: It has no summary."
 msgstr "Evento de calendario: non ten resumo."
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "visualización de eventos de calendario"
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "Obter o foco"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "Nova cita"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "Novo evento de día completo"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "Nova reunión"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "Ir a hoxe"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "Ir á data"
 
 #: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:301
+#: ../a11y/calendar/ea-week-view-main-item.c:298
 msgid "a table to view and select the current time range"
 msgstr "unha táboa para ver e seleccionar o intervalo de tempo actual"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -142,14 +142,14 @@ msgstr[1] "Ten %d eventos."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:155 ../a11y/calendar/ea-week-view.c:152
+#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
 msgid "It has no events."
 msgstr "Non ten eventos."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:162
+#: ../a11y/calendar/ea-day-view.c:159
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Visualización de semana laboral: %s. %s"
@@ -157,16 +157,16 @@ msgstr "Visualización de 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."
-#: ../a11y/calendar/ea-day-view.c:168
+#: ../a11y/calendar/ea-day-view.c:165
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Visualización diaria: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "visualización de calendario para unha semana laboral"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "visualización de calendario para un ou máis días"
 
@@ -183,8 +183,8 @@ msgstr "%A, %d de %b de %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
 #: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1568
-#: ../calendar/gui/e-week-view-main-item.c:340
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1577
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a, %d de %b"
 
@@ -215,14 +215,14 @@ msgstr "%d de %b de %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
 #: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1584
-#: ../calendar/gui/e-week-view-main-item.c:354
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d de %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:766
+#: ../calendar/importers/icalendar-importer.c:768
 msgid "Gnome Calendar"
 msgstr "Calendario do Gnome"
 
@@ -242,77 +242,77 @@ msgstr "Botón de salto"
 msgid "Click here, you can find more events."
 msgstr "Prema aquí para localizar máis eventos."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Visualización mensual: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Visualización semanal: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "Visualización de calendario para un mes"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "visualización de calendario para unha ou máis semanas"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "emerxente"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
 msgid "popup a child"
 msgstr "emerxer un fillo"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
 msgid "edit"
 msgstr "editar"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
 msgid "begin editing this cell"
 msgstr "comezar a editar esta cela"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "conmutar"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
 msgid "toggle the cell"
 msgstr "conmutar a cela"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "expandir"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
 msgid "expands the row in the ETree containing this cell"
 msgstr "expande a fila no ETree que contén esta cela"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr "contraer"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
 msgid "collapses the row in the ETree containing this cell"
 msgstr "contrae a fila no ETree que contén esta cela"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "Cela da táboa"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:581
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
+#: ../widgets/table/e-table-click-to-add.c:580
 msgid "click to add"
 msgstr "prema para engadir"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
 msgid "click"
 msgstr "prema"
 
@@ -320,17 +320,17 @@ msgstr "prema"
 msgid "sort"
 msgstr "ordenar"
 
-#: ../a11y/widgets/ea-calendar-item.c:298
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:295
+#: ../a11y/widgets/ea-calendar-item.c:301
 msgid "%d %B %Y"
 msgstr "%d de %B de %Y"
 
-#: ../a11y/widgets/ea-calendar-item.c:306
+#: ../a11y/widgets/ea-calendar-item.c:303
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Calendario: desde %s até %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "elemento de calendario do Evolution"
 
@@ -435,7 +435,7 @@ msgstr "Fallo ao autenticarse co servidor LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1735
 msgid "Failed to delete contact"
 msgstr "Fallo ao eliminar o contacto"
 
@@ -448,6 +448,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "O servidor LDAP non respondeu cunha información válida do esquema."
 
 #: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:50
 msgid "Server Version"
 msgstr "Versión do servidor"
 
@@ -556,7 +557,7 @@ msgstr ""
 "Os seus contactos para {0} non estarán dispoñibles até que o Evolution se "
 "reinicie."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:512
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:18
@@ -622,10 +623,10 @@ msgstr "Configurar aquí o completado automático"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../addressbook/gui/component/addressbook-view.c:1325
 #: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -663,15 +664,15 @@ msgstr "Xestione os seus certificados S/MIME aquí"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../addressbook/gui/component/addressbook-component.c:143
+#: ../addressbook/gui/component/addressbook-migrate.c:500
 #: ../calendar/gui/calendar-component.c:236
 #: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
 #: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
-#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1457
+#: ../mail/mail-component.c:311 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1518
 msgid "On This Computer"
 msgstr "Neste computador"
 
@@ -680,9 +681,9 @@ msgstr "Neste computador"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/component/addressbook-component.c:151
+#: ../addressbook/gui/component/addressbook-migrate.c:508
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
 #: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
@@ -693,129 +694,129 @@ msgid "Personal"
 msgstr "Persoal"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:163
-#: ../addressbook/gui/component/addressbook-migrate.c:517
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "En servidores LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ../addressbook/gui/component/addressbook-component.c:231
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "Crear un novo contacto"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_Lista de contactos"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "Crear unha lista de contactos nova"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "Nova axenda de enderezos"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Ax_enda de enderezos"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "Crear unha axenda de enderezos nova"
 
-#: ../addressbook/gui/component/addressbook-component.c:410
+#: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 "Fallo ao actualizar a configuración da axenda de enderezos ou os cartafoles."
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:332
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:517
-#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../addressbook/gui/component/addressbook-config.c:619
+#: ../addressbook/gui/component/addressbook-config.c:635
 msgid "Copy _book content locally for offline operation"
 msgstr ""
 "Copiar o contido da a_xenda de enderezos localmente para unha operación sen "
 "conexión"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/addressbook-config.c:998
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:366
-#: ../calendar/gui/dialogs/calendar-setup.c:377
-#: ../calendar/gui/dialogs/calendar-setup.c:388
-#: ../mail/em-folder-properties.c:282 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2367
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2372
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Xeral"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
-#: ../mail/importers/pine-importer.c:385
+#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:1003
 msgid "Server Information"
 msgstr "Información do servidor"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:1005
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:1008
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalles"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/addressbook-config.c:1009
 #: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Buscando"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:1011
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1221
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Propiedades da axenda de enderezos"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../addressbook/gui/component/addressbook-migrate.c:74
 #: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Migrando..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../addressbook/gui/component/addressbook-migrate.c:126
 #: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Migrando '%s':"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:645
+#: ../addressbook/gui/component/addressbook-migrate.c:646
 msgid "LDAP Servers"
 msgstr "Servidores LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:760
+#: ../addressbook/gui/component/addressbook-migrate.c:761
 msgid "Autocompletion Settings"
 msgstr "Configuración do completado automático"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -827,7 +828,7 @@ msgstr ""
 "\n"
 "Sexa paciente mentres o Evolution migra os seus cartafoles..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
+#: ../addressbook/gui/component/addressbook-migrate.c:1151
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -837,7 +838,7 @@ msgstr ""
 "\n"
 "Sexa paciente mentres o Evolution migra os seus cartafoles..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
+#: ../addressbook/gui/component/addressbook-migrate.c:1160
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -848,7 +849,7 @@ msgstr ""
 "\n"
 "Sexa paciente mentres o Evolution migra os seus cartafoles..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
+#: ../addressbook/gui/component/addressbook-migrate.c:1170
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -859,35 +860,35 @@ msgstr ""
 "\n"
 "Sexa paciente mentres o Evolution migra os seus datos Pilot Sync..."
 
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:502
+#: ../addressbook/gui/component/addressbook-view.c:424
+#: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear o cartafol \"%s\" como:"
 
-#: ../addressbook/gui/component/addressbook-view.c:428
-#: ../mail/em-folder-utils.c:504
+#: ../addressbook/gui/component/addressbook-view.c:427
+#: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
 msgstr "Renomear o cartafol"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:510
+#: ../addressbook/gui/component/addressbook-view.c:432
+#: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
 msgstr "Os nomes dos cartafoles non poden conter o carácter '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:941
 msgid "_New Address Book"
 msgstr "_Nova axenda de enderezos"
 
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "Save As vCard..."
 msgstr "Gardar como vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:946
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
 #: ../calendar/gui/calendar-component.c:619
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1692 ../calendar/gui/e-memo-table.c:940
 #: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
 #: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
@@ -896,16 +897,16 @@ msgstr "Gardar como vCard..."
 msgid "_Delete"
 msgstr "E_liminar"
 
-#: ../addressbook/gui/component/addressbook-view.c:949
+#: ../addressbook/gui/component/addressbook-view.c:948
 #: ../calendar/gui/calendar-component.c:622
 #: ../calendar/gui/dialogs/comp-editor.c:2035
 #: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1046 ../mail/em-folder-tree.c:2120
+#: ../composer/e-msg-composer.c:1041 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1336
 msgid "Contact Source Selector"
 msgstr "Selector de orixe de contactos"
 
@@ -914,12 +915,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Accedendo anonimamente ao servidor LDAP"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
 msgid "Failed to authenticate.\n"
 msgstr "Fallou ao autenticarse.\n"
 
 #: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduza o contrasinal para %s (usuario %s)"
@@ -927,8 +928,8 @@ msgstr "Introduza o contrasinal para %s (usuario %s)"
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
 #: ../plugins/google-account-setup/google-source.c:444
-#: ../plugins/publish-calendar/publish-calendar.c:190
-#: ../smime/gui/component.c:50
+#: ../plugins/publish-calendar/publish-calendar.c:191
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Introduza o contrasinal"
 
@@ -953,10 +954,14 @@ msgstr ""
 "panel de previsualización, en píxeles."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr "Mostrar o nome completado automaticamente cun enderezo"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "Mostrar o panel de previsualización"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -964,22 +969,28 @@ msgstr ""
 "O número de caracteres que deben teclearse antes de que o Evolution tente "
 "completar automaticamente."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 "URI para o cartafol usado por última vez no diálogo de selección de nomes"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 msgid "URI for the folder last used in the select names dialog."
 msgstr ""
 "URI para o cartafol usado por última vez no diálogo de selección de nomes."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
 msgstr "Posición vertical do panel"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
 msgid "Whether to show the preview pane."
 msgstr "Indica se se mostra o panel de previsualización."
 
@@ -1024,7 +1035,7 @@ msgid "Add Address Book"
 msgstr "Engadir axenda de enderezos"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:760
 msgid "Always"
 msgstr "Sempre"
 
@@ -1064,14 +1075,14 @@ msgid "Lo_gin:"
 msgstr "_Inicio de sesión:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:759
 msgid "Never"
 msgstr "Nunca"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:288
+#: ../mail/em-account-editor.c:287
 msgid "No encryption"
 msgstr "Sen cifrado"
 
@@ -1083,7 +1094,7 @@ msgstr "Un"
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:296
+#: ../mail/em-account-editor.c:295
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
@@ -1151,7 +1162,7 @@ msgstr "Bases de busca soportadas"
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:292
+#: ../mail/em-account-editor.c:291
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
@@ -1179,7 +1190,7 @@ msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Este é o nome completo do seu servidor LDAP. Por exemplo, \"ldap.mycompany."
@@ -1196,7 +1207,7 @@ msgstr ""
 #: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 msgstr ""
 "Este é o método que empregará o Evolution para autenticalo a vostede. Repare "
@@ -1250,8 +1261,8 @@ msgid "_Login method:"
 msgstr "Método de _inicio de sesión:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:226
-#: ../mail/mail-config.glade.h:175
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:177
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1266,7 +1277,7 @@ msgid "_Search scope:"
 msgstr "�mbito da bu_sca:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:186
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Servidor:"
@@ -1331,7 +1342,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Traballo</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1343,16 +1354,16 @@ msgid "Ca_tegories..."
 msgstr "Ca_tegorías..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:199
 msgid "Contact"
 msgstr "Contacto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2421
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -1365,7 +1376,7 @@ msgid "Image"
 msgstr "Imaxe"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -1378,1251 +1389,1255 @@ msgid "Nic_kname:"
 msgstr "_Alcume:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+msgid "Novell GroupWise"
+msgstr "Novell GroupWise"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Personal Information"
 msgstr "Datos persoais"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "Teléfono"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
 #: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Traballo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Enderezo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "_Aniversario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "_Asistente:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "_Aniversario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:787
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../calendar/gui/dialogs/event-page.c:791
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1868
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Compañía:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_País:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_Arquivar como:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_Dispoñibilidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "Páxina _de inicio:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Xefe:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Notas:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_Apdo. de correos:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Profesión:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "_Cónxuxe:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Videoconferencia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_Quere recibir correo en HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "Rexistro _web:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Onde:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_Código Postal:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
 #: ../addressbook/gui/widgets/eab-contact-display.c:640
 #: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "Enderezo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:544
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:292
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
+#: ../addressbook/gui/widgets/e-minicard-label.c:165
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../widgets/menus/gal-define-views-model.c:178
+#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3687
 #: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "Editable"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "Estados Unidos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "Afganistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "Albania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "Alxeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "Samoa Americana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "Antártida"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Antigua And Barbuda"
 msgstr "Antiga e Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "Arxentina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "Armenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "Australia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "Austria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "Acerbaixán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "Bielorrusia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "Bélxica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "Belice"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "Bermudas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "Bután"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia e Hercegovina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "Botsuana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "Illa Bouvet"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "British Indian Ocean Territory"
 msgstr "Territorio Británico do Océano �ndico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
 msgstr "Sultanato de Brunei"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "Cambodia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "Camerún"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "Canadá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "Cabo Verde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "Illas Caimán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Central African Republic"
 msgstr "República Centroafricana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "Chad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "Chile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "China"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "Kiritimati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Cocos (Keeling) Islands"
 msgstr "Illas Cocos (Keeling)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "Colombia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "Comores"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "Congo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Congo, A república democrática do"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "Illas Cook"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "Costa de Marfil"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "Croacia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "Cuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "Chipre"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "República Checa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "Xibutí"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "República Dominicana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "Exipto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "Guinea Ecuatorial"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "Estonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "Etiopía"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "Illas Malvinas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "Illas Feroe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "Fixi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "Francia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "Güiana Francesa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "Polinesia Francesa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "French Southern Territories"
 msgstr "Territorios Franceses do Sur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "Gabón"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "Gambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "Xeorxia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "Alemaña"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "Gana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "Xibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "Grecia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "Groenlandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "Granada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "Guadalupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "Güiana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "Haití"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Heard And McDonald Islands"
 msgstr "Illas Heard e McDonald"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "Santa Sé"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "Hungría"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "Islandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "India"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "Irán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "Iraq"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Isle of Man"
 msgstr "Illa de Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Israel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "Italia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "Xamaica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "Xapón"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "Xordania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "Kazakhstán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Corea, República democrática popular de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Korea, Republic Of"
 msgstr "Corea, República de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "Kirguizistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "Letonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "Líbano"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "Liberia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "Libia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "Lituania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "Malaisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "Maldivas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "Malí"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "Illas Marshall"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "Martinica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "Mauricio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "México"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Moldova, Republic Of"
 msgstr "Moldavia, República de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "Mónaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "Marrocos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "Namibia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "Países Baixos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "Antillas Holandesas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "Nova Caledonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "Nova Zelandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "Níxer"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "Nixeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "Illa Norfolk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Northern Mariana Islands"
 msgstr "Illas Marianas do Norte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "Omán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "Paquistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "Palestina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "Panamá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Papua New Guinea"
 msgstr "Papúa Nova Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "Paraguai"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "Perú"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
 msgstr "Porto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "Qatar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "Reunión"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "Romanía"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "Federación Rusa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Kitts And Nevis"
 msgstr "San Cristófer-Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "Santa Lucía"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Saint Vincent And The Grenadines"
 msgstr "San Vicente e as Granadinas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
 msgstr "San Marino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Sao Tome And Principe"
 msgstr "São Tomé e Príncipe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "Arabia Saudí"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Serbia And Montenegro"
 msgstr "Serbia e Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "Seixeles"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
 msgstr "Serra Leona"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "Eslovenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "Illas Salomón"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "Somalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "Sudáfrica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Xeorxia do Sur e Illas Sandwich do Sur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "España"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "Santa Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre e Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "Sudán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Illas Svalbard e Jan Mayen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "Suazilandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "Suecia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "Suíza"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "Siria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "Taiwán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "Taxikistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzania, República Unida de"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "Tailandia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "Timor Leste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Trinidad And Tobago"
 msgstr "Trinidad e Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "Turquía"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "Turkmenistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Turks And Caicos Islands"
 msgstr "Illas Turk e Caicos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "Ucraína"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Arab Emirates"
 msgstr "Emiratos �rabes Unidos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "United States Minor Outlying Islands"
 msgstr "Illas Exteriores Menores dos EEUU"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "Uzbekistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, British"
 msgstr "Illas Virxes, británicas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Virgin Islands, U.S."
 msgstr "Illas Virxes, estadounidenses"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Wallis And Futuna Islands"
 msgstr "Illas Wallis e Futuna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "Sáhara Occidental"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "Iemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "Zambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "Cimbabue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:466
-#: ../plugins/exchange-operations/exchange-delegates.c:952
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
-#: ../plugins/plugin-manager/plugin-manager.c:41
-#: ../plugins/save-attachments/save-attachments.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:467
+#: ../plugins/exchange-operations/exchange-delegates.c:954
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/save-attachments/save-attachments.c:351
 #: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Nome"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "AOL Instant Messenger"
 msgstr "Messenger instantáneo AOL"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Yahoo Messenger"
 msgstr "Messenger Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "Messenger Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:111
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
 msgid "Service"
 msgstr "Servizo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:120
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
 #: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:693
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/publish-calendar/publish-calendar.c:694
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Localización"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "Nome do usuario"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Enderezo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Outros"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Source Book"
 msgstr "Axenda de enderezos de orixe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Target Book"
 msgstr "Axenda de enderezos de destino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
 msgid "Is New Contact"
 msgstr "É un contacto novo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Writable Fields"
 msgstr "Campos que se poden escribir"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Required Fields"
 msgstr "Campos requiridos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Modificado"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2416
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de Contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "Please select an image for this contact"
 msgstr "Escolla unha imaxe para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "_No image"
 msgstr "_Sen imaxe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2630,47 +2645,47 @@ msgstr ""
 "Os datos de contacto non son válidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3090
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ten un formato non válido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ten un formato non válido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' está baleiro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3138
 msgid "Invalid contact."
 msgstr "Contacto non válido."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "Contact Quick-Add"
 msgstr "Adición rápida de contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
 msgid "_Edit Full"
 msgstr "_Editar Completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:402
 msgid "_Full name"
 msgstr "Nome _completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:413
 msgid "E_mail"
 msgstr "Correo _electrónico"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:424
 msgid "_Select Address Book"
 msgstr "_Seleccione a axenda de enderezos"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2679,7 +2694,7 @@ msgstr ""
 "Está seguro de que quere\n"
 "eliminar a lista de contactos (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:324
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2687,7 +2702,7 @@ msgstr ""
 "Está seguro de que quere\n"
 "eliminar estas listas de contactos?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2696,7 +2711,7 @@ msgstr ""
 "Está seguro de que quere\n"
 "eliminar o contacto (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:332
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2804,8 +2819,8 @@ msgstr "Servizo M_I:"
 #: ../addressbook/gui/contact-editor/im.glade.h:4
 #: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:242
-#: ../plugins/exchange-operations/exchange-contacts.c:234
+#: ../plugins/exchange-operations/exchange-calendar.c:243
+#: ../plugins/exchange-operations/exchange-contacts.c:235
 msgid "_Location:"
 msgstr "Localización:"
 
@@ -2814,7 +2829,7 @@ msgid "<b>Members</b>"
 msgstr "<b>Membros</b>"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
 msgid "Contact List Editor"
 msgstr "Editor da lista de contactos"
 
@@ -2835,25 +2850,25 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "_Escriba un enderezo de correo ou arrastre un contacto á lista de abaixo:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
 msgid "Contact List Members"
 msgstr "Membros da lista de contactos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
 msgid "_Members"
 msgstr "_Integrantes"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
-#: ../addressbook/gui/widgets/e-addressbook-model.c:298
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:212
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:530
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:311
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "Axenda de enderezos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
 msgid "Is New List"
 msgstr "É unha lista nova"
 
@@ -2895,33 +2910,33 @@ msgstr ""
 "cartafol. Quere engadilo de todas as formas?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:200
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr "_Combinar"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:185
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
 msgid "Merge Contact"
 msgstr "Combinar contacto"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:253
+#: ../addressbook/gui/merging/eab-contact-merging.c:267
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
 #: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Correo Electrónico"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
-#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:3
 #: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Calquera campo contén"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "O correo comeza por"
 
@@ -2929,51 +2944,51 @@ msgstr "O correo comeza por"
 msgid "Name contains"
 msgstr "O nome contén"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "Sen contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contacto"
 msgstr[1] "%d contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:226
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:537
+#: ../addressbook/gui/widgets/e-addressbook-model.c:318
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Consulta"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "Erro ao obter a visualización da axenda de enderezos"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
-#: ../widgets/table/e-table-click-to-add.c:510
-#: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3353
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
+#: ../widgets/table/e-table-click-to-add.c:509
+#: ../widgets/table/e-table-selection-model.c:302
+#: ../widgets/table/e-table.c:3354
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "Modelo"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Erro ao modificar o cartón"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Name begins with"
 msgstr "O nome comeza por"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "Fonte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-meeting-list-view.c:508
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
@@ -2981,96 +2996,90 @@ msgstr "Fonte"
 msgid "Type"
 msgstr "Tipo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1954
 msgid "Save as vCard..."
 msgstr "Gardar como vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 #: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/e-calendar-table.c:1574
-#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-table.c:1573
+#: ../calendar/gui/e-calendar-view.c:1670 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "_Novo contacto..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "Nova _lista de contactos..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "_Gardar como vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "_Reenviar contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "_Reenviar contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "Enviar unha _mensaxe ao contacto"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "Enviar unha _mensaxe á lista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "Enviar unha _mensaxe aos contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "Im_primir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "Co_piar á axenda de enderezos..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "Mo_ver á axenda de enderezos..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 #: ../calendar/gui/dialogs/comp-editor.c:480
-#: ../calendar/gui/e-calendar-table.c:1582
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2057 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
+#: ../composer/e-msg-composer.c:2052 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2106
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "_Pegar"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
-#: ../calendar/gui/cal-search-bar.c:625 ../calendar/gui/cal-search-bar.c:668
-#: ../calendar/gui/cal-search-bar.c:687
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1525
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Any Category"
 msgstr "Calquera categoría"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
-msgid "Other error"
-msgstr "Outro erro"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
@@ -3205,7 +3214,7 @@ msgstr "Radio"
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:713
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "Rol"
 
@@ -3240,63 +3249,63 @@ msgstr "Unidade"
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
+#: ../addressbook/gui/widgets/e-minicard-label.c:116
+#: ../addressbook/gui/widgets/e-minicard.c:155
+#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
 #: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
-#: ../widgets/table/e-table-click-to-add.c:524
-#: ../widgets/table/e-table-col.c:99
-#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../widgets/table/e-table-click-to-add.c:523
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-field-chooser-item.c:654
+#: ../widgets/table/e-table-group-container.c:992
 #: ../widgets/table/e-table-group-container.c:993
-#: ../widgets/table/e-table-group-container.c:994
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
+#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
 #: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Largura"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
+#: ../addressbook/gui/widgets/e-minicard-label.c:123
+#: ../addressbook/gui/widgets/e-minicard.c:162
+#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
-#: ../widgets/table/e-table-click-to-add.c:531
-#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../widgets/table/e-table-click-to-add.c:530
+#: ../widgets/table/e-table-field-chooser-item.c:661
+#: ../widgets/table/e-table-group-container.c:985
 #: ../widgets/table/e-table-group-container.c:986
-#: ../widgets/table/e-table-group-container.c:987
 #: ../widgets/table/e-table-group-leaf.c:630
 #: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
+#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
 #: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Altura"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
+#: ../addressbook/gui/widgets/e-minicard-label.c:130
+#: ../addressbook/gui/widgets/e-minicard.c:170
 msgid "Has Focus"
 msgstr "Ten foco"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:137
 msgid "Field"
 msgstr "Campo"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:144
 msgid "Field Name"
 msgstr "Nome do campo"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:151
 msgid "Text Model"
 msgstr "Modelo de texto"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:158
 msgid "Max field name length"
 msgstr "Lonxitude máxima do campo"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "Largura da columna"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:178
 msgid ""
 "\n"
 "\n"
@@ -3306,7 +3315,7 @@ msgstr ""
 "\n"
 "A buscar os contactos..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3320,7 +3329,7 @@ msgstr ""
 "\n"
 "ou prema dúas veces aquí para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3334,7 +3343,7 @@ msgstr ""
 "\n"
 "Prema aquí dúas veces para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3344,7 +3353,7 @@ msgstr ""
 "\n"
 "Buscar o contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3354,28 +3363,28 @@ msgstr ""
 "\n"
 "Non hai elementos para mostrar nesta visualización."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:523
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "Adaptador"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "Correo electrónico do traballo"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "Correo electrónico particular"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:830
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:831
 msgid "Other Email"
 msgstr "Outro correo electrónico"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
+#: ../addressbook/gui/widgets/e-minicard.c:178
 msgid "Selected"
 msgstr "Seleccionado"
 
-#: ../addressbook/gui/widgets/e-minicard.c:184
+#: ../addressbook/gui/widgets/e-minicard.c:185
 msgid "Has Cursor"
 msgstr "Posúe cursor"
 
@@ -3432,22 +3441,22 @@ msgstr "Videoconferencia"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../calendar/gui/gnome-cal.c:2451
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:574
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
-#: ../plugins/hula-account-setup/camel-hula-listener.c:378
-#: ../plugins/hula-account-setup/camel-hula-listener.c:407
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:576
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
+#: ../plugins/hula-account-setup/camel-hula-listener.c:377
+#: ../plugins/hula-account-setup/camel-hula-listener.c:406
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Calendario"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:113
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "Dispoñibilidade"
 
@@ -3469,13 +3478,13 @@ msgid "Web Log"
 msgstr "Blogue"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2342
 #: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Aniversario"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2343
 #: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Aniversario"
@@ -3493,108 +3502,113 @@ msgid "Blog"
 msgstr "Blogue"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "Éxito"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "Backend ocupado"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "A axenda de enderezos non existe"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
 msgstr "Ningún contacto propio definido"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "Contacto non encontrado"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "O ID de contacto xa existe"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "Non se soprota o protocolo"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:240
-#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
+#: ../calendar/gui/e-cal-model-tasks.c:364
+#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-calendar-table.c:239
+#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/print.c:2557
 msgid "Canceled"
 msgstr "Cancelado"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "Non se puido cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../calendar/gui/comp-editor-factory.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Failed"
 msgstr "Fallou a autenticación"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Authentication Required"
 msgstr "Autenticación requirida"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "TLS non dispoñible"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "Non existe esa orixe"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
 msgstr "Non dispoñible en modo sen conexión"
 
-#. E_BOOK_ERROR_INVALID_SERVER_VERSION
+#. E_BOOK_ERROR_OTHER_ERROR
 #: ../addressbook/gui/widgets/eab-gui-util.c:78
+msgid "Other error"
+msgstr "Outro erro"
+
+#. E_BOOK_ERROR_INVALID_SERVER_VERSION
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
 msgstr "Versión do servidor non válida"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 msgid "Unsupported authentication method"
 msgstr "Método de autenticación non soportado"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:102
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "We were unable to open this address book. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3605,7 +3619,7 @@ msgstr ""
 "o uso sen conexión. Cargue a axenda de enderezos unha vez en modo con "
 "conexión para descargar os seus contidos"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:111
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
 msgid ""
 "We were unable to open this address book.  Please check that the path %s "
@@ -3614,7 +3628,7 @@ msgstr ""
 "Non foi posible abrir esta axenda de enderezos. Verifique que o camiño %s "
 "existe e que ten permisos para acceder a el."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:120
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid ""
 "We were unable to open this address book.  This either means you have "
 "entered an incorrect URI, or the LDAP server is unreachable."
@@ -3622,7 +3636,7 @@ msgstr ""
 "Non foi posible abrir esta axenda de enderezos.  Isto significa que "
 "introduciu un URI incorrecto ou que o servidor LDAP está fóra de servizo."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3631,7 +3645,7 @@ msgstr ""
 "Esta versión do Evolution non ten soporte LDAP compilado nela. Se quere usar "
 "LDAP no Evolution, debe instalar un paquete do Evolution co LDAP activado."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:132
+#: ../addressbook/gui/widgets/eab-gui-util.c:141
 msgid ""
 "We were unable to open this address book.  This either means you have "
 "entered an incorrect URI, or the server is unreachable."
@@ -3639,11 +3653,11 @@ msgstr ""
 "Non foi posible abrir esta axenda de enderezos.  Isto significa que "
 "introduciu un URI incorrecto ou que o servidor é inaccesible."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:138
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
 msgid "Detailed error:"
 msgstr "Erro detallado:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:161
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3656,7 +3670,7 @@ msgstr ""
 "aumente o límite de resultados nas preferencias do servidor\n"
 "de directorios para esta axenda de enderezos."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this address book.  Please make your search\n"
@@ -3668,47 +3682,47 @@ msgstr ""
 "especifique máis a súa busca ou aumente o límite de tempo nas \n"
 "preferencias do servidor de directorio para esta axenda de enderezos."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:173
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "The backend for this address book was unable to parse this query."
 msgstr ""
 "O backend para esta axenda de enderezos non puido analizar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:176
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
 msgid "The backend for this address book refused to perform this query."
 msgstr ""
 "O backend para esta axenda de enderezos rexeitou efectuar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:179
+#: ../addressbook/gui/widgets/eab-gui-util.c:190
 msgid "This query did not complete successfully."
 msgstr "Esta consulta non terminou con éxito."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:201
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error adding list"
 msgstr "Erro ao engadir a lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:201
-#: ../addressbook/gui/widgets/eab-gui-util.c:677
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:688
 msgid "Error adding contact"
 msgstr "Erro ao engadir o contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying list"
 msgstr "Erro ao modificar a lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying contact"
 msgstr "Erro ao modificar o contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
 msgid "Error removing list"
 msgstr "Erro ao eliminar a lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:224
-#: ../addressbook/gui/widgets/eab-gui-util.c:627
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:638
 msgid "Error removing contact"
 msgstr "Erro ao eliminar o contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:317
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3723,16 +3737,16 @@ msgstr[1] ""
 "Ao abrir %d contactos abrirá %d novas ventás tamén.\n"
 "Está seguro de que quere mostrar este contacto?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:314
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "_Don't Display"
 msgstr "_Non mostrar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:315
+#: ../addressbook/gui/widgets/eab-gui-util.c:326
 msgid "Display _All Contacts"
 msgstr "Mostrar _todos os contactos"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:341
+#: ../addressbook/gui/widgets/eab-gui-util.c:352
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3741,142 +3755,142 @@ msgstr ""
 "%s xa existe\n"
 "Quere sobrescribilo?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:345
+#: ../addressbook/gui/widgets/eab-gui-util.c:356
 msgid "Overwrite"
 msgstr "Sobrescribir"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:386
-#: ../addressbook/gui/widgets/eab-gui-util.c:389
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
+#: ../addressbook/gui/widgets/eab-gui-util.c:400
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contacto"
 msgstr[1] "contactos"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:435
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "card.vcf"
 msgstr "cartón.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:472
+#: ../addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Select Address Book"
 msgstr "Seleccione a axenda de enderezos"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:586
+#: ../addressbook/gui/widgets/eab-gui-util.c:597
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:749
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:740
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:743
+#: ../addressbook/gui/widgets/eab-gui-util.c:754
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:745
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
 msgid "Multiple vCards"
 msgstr "Varias vCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:897
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard para %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:909
-#: ../addressbook/gui/widgets/eab-gui-util.c:935
+#: ../addressbook/gui/widgets/eab-gui-util.c:921
+#: ../addressbook/gui/widgets/eab-gui-util.c:947
 #, c-format
 msgid "Contact information"
 msgstr "Información de contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:937
+#: ../addressbook/gui/widgets/eab-gui-util.c:949
 #, c-format
 msgid "Contact information for %s"
 msgstr "Información de contacto de %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:301
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr "Consultando a axenda de enderezos..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Hai outro contacto máis."
 msgstr[1] "Hai outros %d contactos."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Show Full vCard"
 msgstr "Mostrar vCard completa"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 msgid "Show Compact vCard"
 msgstr "Mostrar vCard compacta"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
 msgid "Save in address book"
 msgstr "Gardar na axenda de enderezos"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Visualización de cartón"
 
-#: ../addressbook/importers/evolution-csv-importer.c:658
-#: ../addressbook/importers/evolution-ldif-importer.c:498
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:306
-#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:661
+#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../calendar/importers/icalendar-importer.c:308
+#: ../calendar/importers/icalendar-importer.c:673 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Importando..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:860
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:861
+#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:869
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:870
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:878
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:879
+#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:665
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de intercambio de datos LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:681
 msgid "Evolution LDIF importer"
 msgstr "Importador de LDIF do Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:550
 msgid "Evolution vCard Importer"
 msgstr "Importador de vCard do Evolution"
 
@@ -3921,12 +3935,12 @@ msgid "Format"
 msgstr "Formato"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:648
-#: ../widgets/table/e-table-field-chooser.c:81
+#: ../widgets/table/e-table-field-chooser-item.c:647
+#: ../widgets/table/e-table-field-chooser.c:80
 #: ../widgets/table/e-table-header-item.c:1908
-#: ../widgets/table/e-table-selection-model.c:310
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Cabeceira"
 
@@ -4028,9 +4042,9 @@ msgstr "Sombreado"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1069
-#: ../plugins/exchange-operations/exchange-calendar.c:231
-#: ../plugins/exchange-operations/exchange-contacts.c:217
+#: ../plugins/exchange-operations/exchange-account-setup.c:1071
+#: ../plugins/exchange-operations/exchange-calendar.c:232
+#: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
 msgstr "Tamaño:"
 
@@ -4047,7 +4061,7 @@ msgid "Top:"
 msgstr "Superior:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:153
+#: ../calendar/gui/dialogs/calendar-setup.c:154
 msgid "Type:"
 msgstr "Tipo:"
 
@@ -4059,30 +4073,30 @@ msgstr "Largura:"
 msgid "_Font..."
 msgstr "_Tipo de letra..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:54
 msgid "Contact Print Style Editor Test"
 msgstr "Proba do editor de estilos de impresión de contactos"
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:44
+#: ../addressbook/printing/test-contact-print-style-editor.c:55
+#: ../addressbook/printing/test-print.c:45
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Dereitos de autor (C) 2000, Ximian, Inc."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:56
+#: ../addressbook/printing/test-contact-print-style-editor.c:57
 msgid "This should test the contact print style editor widget"
 msgstr ""
 "Isto debería probar o widget do editor de estilo de impresión de contactos"
 
-#: ../addressbook/printing/test-print.c:43
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "Proba de impresión de contactos"
 
-#: ../addressbook/printing/test-print.c:46
+#: ../addressbook/printing/test-print.c:47
 msgid "This should test the contact print code"
 msgstr "Isto debería probar o código de impresión dos contactos"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "Non se puido abrir o ficheiro"
@@ -4095,31 +4109,31 @@ msgstr "Non se puido obter unha lista de axendas de enderezos"
 msgid "failed to open book"
 msgstr "fallou ao abrir a axenda de enderezos"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:48
 msgid "Specify the output file instead of standard output"
 msgstr "Especifique o ficheiro de saída en vez da saída estándar"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:50
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "OUTPUTFILE"
 msgstr "FICHEIRO DE SA�DA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "List local address book folders"
 msgstr "Listar os cartafoles de axendas de enderezos locais"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "Show cards as vcard or csv file"
 msgstr "Mostrar cartóns como un ficheiro vcard ou csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Export in asynchronous mode"
 msgstr "Exportar en modo asíncrono"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -4127,29 +4141,29 @@ msgstr ""
 "O número de cartóns nun ficheiro de saída en modo asíncrono, o tamaño "
 "predeterminado é 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "NUMBER"
 msgstr "NÚMERO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:102
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Erro nos argumentos da liña de comandos; use a opción --axuda para ver o uso."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "Só soporta os formatos csv ou vcard."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "En modo asíncrono, a saída debe ser un ficheiro."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "En modo normal, non é necesaria a opción de tamaño."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:164
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "Erro non soportado"
 
@@ -4262,19 +4276,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Está seguro de que quere eliminar esta cita?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:178
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Está seguro de que quere eliminar esta reunión?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:184
+#: ../calendar/gui/dialogs/delete-comp.c:188
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Está seguro de que quere eliminar esta nota?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:181
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Está seguro de que quere eliminar esta tarefa?"
@@ -4379,6 +4393,18 @@ msgstr ""
 "quizais non saiban que se eliminou a tarefa."
 
 #: ../calendar/calendar.error.xml.h:45
+msgid "Save Appointment"
+msgstr "Gardar cita"
+
+#: ../calendar/calendar.error.xml.h:46
+msgid "Save Memo"
+msgstr "Gardar nota"
+
+#: ../calendar/calendar.error.xml.h:47
+msgid "Save Task"
+msgstr "Gardar tarefa"
+
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4386,7 +4412,7 @@ msgstr ""
 "Ao enviar información actualizada permite que outros participantes manteñan "
 "os seus calendarios ao día."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4394,7 +4420,7 @@ msgstr ""
 "Ao enviar información actualizada permítese que outros participantes "
 "manteñan a súa lista de tarefas ao día."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4402,7 +4428,7 @@ msgstr ""
 "Estanse descargando algúns anexos. Gardar a cita fará que se perdan eses "
 "anexos."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4410,86 +4436,86 @@ msgstr ""
 "Estanse descargando algúns anexos. Gardar a tarefa fará que se perdan eses "
 "anexos."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:53
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Pode que algunhas características non funcionen apropiadamente co servidor "
 "actual."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "O calendario do Evolution saíu inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "As notas do Evolution saíron inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "As tarefas do Evolution saíron inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 msgid "The calendar is not marked for offline usage."
 msgstr "O calendario non está marcado para o uso sen conexión."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:58
 msgid "The memo list is not marked for offline usage."
 msgstr "A lista de notas non está marcada para o uso sen conexión."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:59
 msgid "The task list is not marked for offline usage."
 msgstr "A lista de tarefas non está marcada para o uso sen conexión."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:60
 msgid "This calendar will be removed permanently."
 msgstr "Este calendario eliminarase permanentemente."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:61
 msgid "This memo list will be removed permanently."
 msgstr "Esta lista de notas vaise eliminar permanentemente."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:62
 msgid "This task list will be removed permanently."
 msgstr "Esta lista de tarefas vaise eliminar permanentemente."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Quere gardar as modificacións feitas nesta cita?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "Quere gardar as modificacións feitas nesta nota?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "Quere gardar as modificacións feitas nesta tarefa?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Quere enviar unha notificación de cancelación para nota?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr ""
 "Quere enviar a todos os participantes unha notificación de cancelación?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Quere enviar convites para a reunión aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "Quere enviar esta tarefa aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Quere enviar información actualizada da reunión aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr "Quere enviar información actualizada das tarefas aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:72
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4499,55 +4525,55 @@ msgstr ""
 "problemas ao usar o Evolution. Para uns mellores resultados, o servidor "
 "debería actualizarse a unha versión soportada."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Modificou esta cita, mais aínda non a gardou."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "Modificou esta tarefa, mais aínda non a gardou."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Realizou modificacións nesta nota, mais aínda non as gardou."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Os seus calendarios non estarán dispoñibles até que o Evolution se reinicie."
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "As súas notas non estarán dispoñibles até que reinicie o Evolution."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "As súas tarefas non estarán dispoñibles até que reinicie o Evolution."
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:79
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Rexeitar as modificacións"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_Gardar"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "_Gardar modificacións"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:82
 #: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "_Enviar notificación"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:84
 msgid "{0}."
 msgstr "{0}."
 
@@ -4594,7 +4620,7 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Non se puido escribir o bloque de aplicación ToDo do pilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2363
 msgid "Calendar and Tasks"
 msgstr "Calendario e tarefas"
 
@@ -4641,7 +4667,7 @@ msgid "Memo_s"
 msgstr "Nota_s"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/e-memo-table.c:279 ../calendar/gui/e-memos.c:1120
 #: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:548
 #: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:354
 #: ../calendar/gui/memos-control.c:370
@@ -4649,17 +4675,17 @@ msgid "Memos"
 msgstr "Notas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1982
+#: ../calendar/gui/e-calendar-table.c:703 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1984
 #: ../calendar/gui/tasks-component.c:539
 #: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
 #: ../calendar/gui/tasks-control.c:508
-#: ../calendar/importers/icalendar-importer.c:74
-#: ../calendar/importers/icalendar-importer.c:735
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:586
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:737
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:588
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tarefas"
@@ -4677,13 +4703,13 @@ msgstr "_Tarefas"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servizo de notificación por alarma do Calendario do Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:119
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
@@ -4696,7 +4722,7 @@ msgid_plural "hours"
 msgstr[0] "horas"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "Hora de comezo"
 
@@ -4707,8 +4733,8 @@ msgstr "Citas"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1603
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1609
 #: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
@@ -4721,7 +4747,7 @@ msgstr "_Pospor o aviso:"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/comp-editor.c:1332
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:169
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
@@ -4739,32 +4765,32 @@ msgstr "_Pospor"
 msgid "location of appointment"
 msgstr "localización da cita"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1461
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
 msgid "No summary available."
 msgstr "Non hai resumo dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
 msgid "No description available."
 msgstr "Non hai descrición dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1480
 msgid "No location information available."
 msgstr "Non hai información da localización dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1525
 #, c-format
 msgid "You have %d alarms"
 msgstr "Posúe %d alarmas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
+#: ../mail/mail-component.c:1596
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1691
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4776,7 +4802,7 @@ msgstr ""
 "configurado para enviar unha mensaxe de correo electrónico. No seu lugar\n"
 "Evolution vai mostrar un diálogo de aviso normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1721
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4793,15 +4819,15 @@ msgstr ""
 "\n"
 "Está seguro de que quere executar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
 msgid "Do not ask me about this program again."
 msgstr "Non volver preguntar sobre este programa."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:138
+#: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
 msgstr "Non se puido iniciar o Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:154
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4809,13 +4835,13 @@ msgstr ""
 "Non se puido crear a factoría do servizo de notificación de alarma, pode que "
 "xa esté en execución..."
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "hora non válida"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4823,8 +4849,8 @@ msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4834,8 +4860,8 @@ 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")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:416
-#: ../calendar/gui/misc.c:123
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -5144,7 +5170,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "A hora na que se executou a última alarma, en time_t."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:107
+#: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Fuso horario"
 
@@ -5289,56 +5315,56 @@ msgstr "Minuto de comezo da xornada laboral"
 msgid "daylight savings time"
 msgstr "horario de verán"
 
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "O resumo contén"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "A descrición contén"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "A categoría é"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "O comentario contén"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
 msgid "Location contains"
 msgstr "A localización contén"
 
-#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
+#: ../calendar/gui/cal-search-bar.c:633 ../calendar/gui/cal-search-bar.c:676
+#: ../calendar/gui/cal-search-bar.c:695
 msgid "Unmatched"
 msgstr "Sen equivalencia"
 
-#: ../calendar/gui/cal-search-bar.c:637
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Next 7 Days' Tasks"
 msgstr "Tarefas dos seguintes sete días"
 
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Active Tasks"
 msgstr "Tarefas activas"
 
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Overdue Tasks"
 msgstr "Tarefas pendentes"
 
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Completed Tasks"
 msgstr "Tarefas terminadas"
 
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:657
 msgid "Tasks with Attachments"
 msgstr "Tarefas con anexos"
 
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:707
 msgid "Next 7 Days' Appointments"
 msgstr "Citas dos seguintes sete días"
 
@@ -5472,19 +5498,19 @@ msgstr "Cale_ndario"
 msgid "Create a new calendar"
 msgstr "Crear un novo calendario"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Visualización diaria"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "Visualización de semana laboral"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "Visualización semanal"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "Visualización mensual"
 
@@ -5494,7 +5520,7 @@ msgid "Any Field"
 msgstr "Calquera campo"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:21
 msgid "Attachments"
 msgstr "Anexos"
 
@@ -5524,15 +5550,15 @@ msgstr "Clasificación"
 msgid "Competition"
 msgstr "Competición"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:333 ../calendar/gui/e-calendar-table.c:547
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:250
+#: ../calendar/gui/e-cal-model.c:348 ../calendar/gui/e-calendar-table.c:546
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Confidential"
 msgstr "Confidencial"
 
 #: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
 #: ../calendar/gui/tasktypes.xml.h:14
-#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../plugins/plugin-manager/plugin-manager.c:59
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Descrición"
@@ -5543,12 +5569,12 @@ msgid "Description Contains"
 msgstr "A descrición contén"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:38
 msgid "Do Not Exist"
 msgstr "Non existe"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:41
 msgid "Exist"
 msgstr "Existe"
 
@@ -5617,20 +5643,20 @@ msgstr "Organizador"
 msgid "Phone Calls"
 msgstr "Chamadas de teléfono"
 
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:346 ../calendar/gui/e-calendar-table.c:545
 #: ../calendar/gui/memotypes.xml.h:29
 msgid "Private"
 msgstr "Privado"
 
-#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
-#: ../calendar/gui/e-cal-model.c:322 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-cal-model.c:344
+#: ../calendar/gui/e-calendar-table.c:544 ../calendar/gui/memotypes.xml.h:30
 msgid "Public"
 msgstr "Público"
 
 #: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:297
+#: ../calendar/gui/dialogs/event-editor.c:299
 msgid "Recurrence"
 msgstr "Recorrencia"
 
@@ -5639,7 +5665,7 @@ msgstr "Recorrencia"
 #: ../calendar/gui/e-meeting-list-view.c:545
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
-#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+#: ../mail/em-filter-i18n.h:86 ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Estado"
 
@@ -5653,7 +5679,7 @@ msgstr "Estratexias"
 #: ../calendar/gui/e-calendar-table.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
 #: ../calendar/gui/tasktypes.xml.h:40
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "Resumo"
 
@@ -5683,38 +5709,38 @@ msgid "Waiting"
 msgstr "Esperando"
 
 #: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
-#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:26
 msgid "contains"
 msgstr "contén"
 
 #: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
-#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:32
 msgid "does not contain"
 msgstr "non contén"
 
 #: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
-#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:46
 msgid "is"
 msgstr "é"
 
 #: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:52
 msgid "is not"
 msgstr "non é"
 
-#: ../calendar/gui/comp-editor-factory.c:405
+#: ../calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Erro ao abrir o calendario"
 
-#: ../calendar/gui/comp-editor-factory.c:411
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Method not supported when opening the calendar"
 msgstr "Método non soportado ao abrir o calendario"
 
-#: ../calendar/gui/comp-editor-factory.c:417
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Permission denied to open the calendar"
 msgstr "Permiso denegado para abrir o calendario"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
+#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
@@ -5751,17 +5777,17 @@ msgid "Mes_sage:"
 msgstr "Mensa_xes:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Reproducir un son"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Emerxer unha alerta"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Executar un programa"
 
@@ -5774,7 +5800,7 @@ msgid "Send To:"
 msgstr "Enviar a:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Enviar un correo"
 
@@ -5829,7 +5855,7 @@ msgstr "minuto(s)"
 msgid "start of appointment"
 msgstr "comezo da cita"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Acción/Activador"
 
@@ -5852,7 +5878,7 @@ msgstr "_Suxerir mostrar o anexo automaticamente"
 msgid "Attach file(s)"
 msgstr "Anexar ficheiro(s)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:484
 msgid "Selected Calendars for Alarms"
 msgstr "Seleccionar calendario para alarmas"
 
@@ -5919,7 +5945,7 @@ msgid "Display"
 msgstr "Mostrar"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Venres"
@@ -5935,7 +5961,7 @@ msgstr ""
 "Días"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Luns"
@@ -5969,7 +5995,7 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Sábado"
@@ -5987,7 +6013,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Mostrar os _números das semanas no navegador de datas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Domingo"
@@ -6006,7 +6032,7 @@ msgid "Template:"
 msgstr "Modelo:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Xoves"
@@ -6021,13 +6047,13 @@ msgid "Time format:"
 msgstr "Formato da hora:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Martes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Mércores"
@@ -6107,103 +6133,103 @@ msgstr "Mé_r"
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:269
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 "Cop_iar localmente os contidos do calendario para unha operación sen conexión"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "Cop_iar localmente os contidos da lista de tarefas para unha operación sen "
 "conexión"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 "Copia_r localmente os contidos da lista de notas para unha operación sen "
 "conexión"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "Co_r:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Propiedades do calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "Novo calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "Propiedades de lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "Nova lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:586
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "Propiedades de lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:586
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "Nova lista de notas"
 
-#: ../calendar/gui/dialogs/changed-comp.c:56
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Eliminouse este evento."
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Eliminouse esta tarefa."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This memo has been deleted."
 msgstr "Eliminouse esta nota."
 
-#: ../calendar/gui/dialogs/changed-comp.c:73
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s Realizou modificacións. Quere esquecer estas modificacións e pechar o "
 "editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Non realizou modificacións, quere pechar o editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Este evento foi modificado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Modificouse esta tarefa."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This memo has been changed."
 msgstr "Esta nota foi modificado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:97
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Realizou modificacións. Quere esquecer estas modificacións e actualizar "
 "o editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Non realizou modificacións, quere actualizar o editor?"
@@ -6213,23 +6239,23 @@ msgstr "%s  Non realizou modificacións, quere actualizar o editor?"
 msgid "Validation error: %s"
 msgstr "Erro de validación: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2358
 msgid " to "
 msgstr " para "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2362
 msgid " (Completed "
 msgstr " (Terminada "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2364
 msgid "Completed "
 msgstr "Terminada "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2369
 msgid " (Due "
 msgstr " (Pendente "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2371
 msgid "Due "
 msgstr "Pendente "
 
@@ -6240,28 +6266,28 @@ msgstr "Mensaxe anexa - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1771
-#: ../composer/e-msg-composer.c:1990
+#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1766
+#: ../composer/e-msg-composer.c:1985
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Mensaxe anexa"
 msgstr[1] "%d mensaxes anexas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:365
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2053
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2107
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2055
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2109
 msgid "Cancel _Drag"
 msgstr "Cancelar o _arrastre"
 
 #: ../calendar/gui/dialogs/comp-editor.c:616
 #: ../calendar/gui/dialogs/comp-editor.c:3249 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "anexo"
@@ -6362,7 +6388,7 @@ msgid "_View"
 msgstr "_Ver"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:472
+#: ../composer/e-composer-actions.c:471
 msgid "_Attachment..."
 msgstr "_Anexo..."
 
@@ -6443,12 +6469,12 @@ msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Alterna entre se se mostra o campo Tipo de participante ou non"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1766
-#: ../widgets/misc/e-attachment-bar.c:1381
-msgid "Recent Docu_ments"
-msgstr "Docu_mentos recentes"
+#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent _Documents"
+msgstr "_Documentos recentes"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1785
-#: ../composer/e-composer-actions.c:700
+#: ../composer/e-composer-actions.c:699
 msgid "Attach"
 msgstr "Anexar"
 
@@ -6469,8 +6495,8 @@ msgid "Show Attachment _Bar"
 msgstr "Mostrar a _barra de anexos"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/event-page.c:1871
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1045
+#: ../calendar/gui/dialogs/event-page.c:1875
+#: ../calendar/gui/dialogs/task-page.c:1197 ../composer/e-msg-composer.c:1040
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
@@ -6478,13 +6504,13 @@ msgid "_Remove"
 msgstr "E_liminar"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1048
+#: ../composer/e-msg-composer.c:1043
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Engadir anexo..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:2245
-#: ../mail/em-format-html-display.c:2195
+#: ../mail/em-format-html-display.c:2201
 msgid "Show Attachments"
 msgstr "Mostrar anexos"
 
@@ -6504,69 +6530,69 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "Non é posible usar a versión actual!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:60
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 msgid "Could not open source"
 msgstr "Non se puido abrir a orixe"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:68
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
 msgstr "Non se puido abrir o destino"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:77
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr "O destino é só de lectura"
 
-#: ../calendar/gui/dialogs/delete-comp.c:201
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "E_liminar este elemento das caixas de correo de todos os outros "
 "destinatarios?"
 
-#: ../calendar/gui/dialogs/delete-error.c:52
+#: ../calendar/gui/dialogs/delete-error.c:56
 msgid "The event could not be deleted due to a corba error"
 msgstr "O evento non se puido eliminar debido a un erro de Corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:59
 msgid "The task could not be deleted due to a corba error"
 msgstr "A tarefa non se puido eliminar debido a un erro de Corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
+#: ../calendar/gui/dialogs/delete-error.c:62
 msgid "The memo could not be deleted due to a corba error"
 msgstr "A nota non se puido eliminar debido a un erro de Corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:65
 msgid "The item could not be deleted due to a corba error"
 msgstr "O elemento non se puido eliminar debido a un erro de Corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:72
 msgid "The event could not be deleted because permission was denied"
 msgstr "O evento non se puido eliminar porque se denegou o permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The task could not be deleted because permission was denied"
 msgstr "A tarefa non se puido eliminar porque se denegou o permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The memo could not be deleted because permission was denied"
 msgstr "A nota non se puido eliminar porque se denegou o permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The item could not be deleted because permission was denied"
 msgstr "O elemento non se puido eliminar porque se denegou o permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:88
 msgid "The event could not be deleted due to an error"
 msgstr "O evento non se puido eliminar debido a un erro"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
+#: ../calendar/gui/dialogs/delete-error.c:91
 msgid "The task could not be deleted due to an error"
 msgstr "A tarefa non se puido eliminar debido a un erro"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
+#: ../calendar/gui/dialogs/delete-error.c:94
 msgid "The memo could not be deleted due to an error"
 msgstr "A nota non se puido eliminar debido a un erro"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:97
 msgid "The item could not be deleted due to an error"
 msgstr "O elemento non se puido eliminar debido a un erro"
 
@@ -6575,7 +6601,7 @@ msgid "Contacts..."
 msgstr "Contactos..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:415
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To:"
 msgstr "Delegar en:"
 
@@ -6583,181 +6609,182 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Introducir delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:194
+#: ../calendar/gui/dialogs/event-editor.c:196
 msgid "_Alarms"
 msgstr "_Alarmas"
 
-#: ../calendar/gui/dialogs/event-editor.c:196
+#: ../calendar/gui/dialogs/event-editor.c:198
 msgid "Click here to set or unset alarms for this event"
 msgstr ""
 "Prema aquí para configurar ou desconfigurar as alarmas para este evento"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "_Recurrence"
 msgstr "_Recorrencia"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "Make this a recurring event"
 msgstr "Converter en evento recorrente"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:210
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:213
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "Opcións de envío"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
-#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "Inserir opcións avanzadas de envío"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/event-editor.c:220
 msgid "All _Day Event"
 msgstr "Evento de _día completo"
 
-#: ../calendar/gui/dialogs/event-editor.c:220
+#: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Toggles whether to have All Day Event"
 msgstr "Alterna entre se se ten un evento de día completo ou non"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Show Time as _Busy"
 msgstr "Mostrar hora como _ocupada"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:230
 msgid "Toggles whether to show time as busy"
 msgstr "Alterna entre se se mostran as horas como ocupadas ou non"
 
-#: ../calendar/gui/dialogs/event-editor.c:237
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "_Free/Busy"
 msgstr "_Dispoñibilidade"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:241
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar información de dispoñibilidade para os participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "_Cita"
 
-#: ../calendar/gui/dialogs/event-page.c:731
-#: ../calendar/gui/dialogs/event-page.c:2714
+#: ../calendar/gui/dialogs/event-page.c:735
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "Este evento posúe alarmas"
 
-#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.c:798
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:844
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:846
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no start date"
 msgstr "Evento sen data de comezo"
 
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1033
 msgid "Event with no end date"
 msgstr "Evento sen data de finalización"
 
-#: ../calendar/gui/dialogs/event-page.c:1198
-#: ../calendar/gui/dialogs/memo-page.c:636
-#: ../calendar/gui/dialogs/task-page.c:808
+#: ../calendar/gui/dialogs/event-page.c:1202
+#: ../calendar/gui/dialogs/memo-page.c:640
+#: ../calendar/gui/dialogs/task-page.c:812
 msgid "Start date is wrong"
 msgstr "A data de comezo é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1212
 msgid "End date is wrong"
 msgstr "A data de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1235
 msgid "Start time is wrong"
 msgstr "A hora de comezo é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1242
 msgid "End time is wrong"
 msgstr "A hora de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1401
-#: ../calendar/gui/dialogs/memo-page.c:677
-#: ../calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/event-page.c:1405
+#: ../calendar/gui/dialogs/memo-page.c:681
+#: ../calendar/gui/dialogs/task-page.c:872
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador seleccionado xa non ten unha conta."
 
-#: ../calendar/gui/dialogs/event-page.c:1407
-#: ../calendar/gui/dialogs/memo-page.c:683
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1411
+#: ../calendar/gui/dialogs/memo-page.c:687
+#: ../calendar/gui/dialogs/task-page.c:878
 msgid "An organizer is required."
 msgstr "Requírese un organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1432
-#: ../calendar/gui/dialogs/task-page.c:898
+#: ../calendar/gui/dialogs/event-page.c:1436
+#: ../calendar/gui/dialogs/task-page.c:902
 msgid "At least one attendee is required."
 msgstr "Requírese polo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1194
+#: ../calendar/gui/dialogs/event-page.c:1876
+#: ../calendar/gui/dialogs/task-page.c:1198
 msgid "_Add "
 msgstr "_Engadir "
 
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2594
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Non foi posible abrir o calendario '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2634
-#: ../calendar/gui/dialogs/memo-page.c:886
-#: ../calendar/gui/dialogs/task-page.c:1793
+#: ../calendar/gui/dialogs/event-page.c:2638
+#: ../calendar/gui/dialogs/memo-page.c:890
+#: ../calendar/gui/dialogs/task-page.c:1797
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Está actuando en nome de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2918
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d día antes da cita"
 msgstr[1] "%d días antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora antes da cita"
 msgstr[1] "%d horas antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antes da cita"
 msgstr[1] "%d minutos antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/event-page.c:2943
 msgid "Customize"
 msgstr "Personalizar"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2944
+#: ../calendar/gui/dialogs/event-page.c:2948
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
-#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:945
+#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
 #: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
+#: ../plugins/exchange-operations/exchange-delegates-user.c:195
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
 #: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1513
+#: ../widgets/misc/e-dateedit.c:1727
 #: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "Ningún"
@@ -6837,19 +6864,19 @@ msgstr "Co_ntactos..."
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2478
 msgid "Memo"
 msgstr "Nota"
 
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:851
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Non é posible abrir as notas en '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../calendar/gui/dialogs/memo-page.c:1006 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Para"
 
@@ -6863,58 +6890,58 @@ msgid "T_o:"
 msgstr "_Para:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:360
+#: ../calendar/gui/dialogs/task-page.c:364
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:50
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Está modificando un evento recorrente. Que quere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Está delegando un evento recorrente. Que quere delegar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Está modificando unha tarefa recorrente. Que quere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Está modificando unha nota recorrente. Que quere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:85
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This Instance Only"
 msgstr "Unicamente esta instancia "
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:93
 msgid "This and Prior Instances"
 msgstr "Esta instancia e as anteriores"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:99
 msgid "This and Future Instances"
 msgstr "Esta instancia e as futuras"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:104
 msgid "All Instances"
 msgstr "Todas as instancias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:562
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita contén recorrencias que o Evolution non pode editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "A data da recorrencia non é válida"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:930
 msgid "on"
 msgstr "en"
 
@@ -6922,7 +6949,7 @@ msgstr "en"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:994
 msgid "first"
 msgstr "primeiro"
 
@@ -6931,7 +6958,7 @@ msgstr "primeiro"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1000
 msgid "second"
 msgstr "segundo"
 
@@ -6939,7 +6966,7 @@ msgstr "segundo"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:1005
 msgid "third"
 msgstr "terceiro"
 
@@ -6947,7 +6974,7 @@ msgstr "terceiro"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1008
+#: ../calendar/gui/dialogs/recurrence-page.c:1010
 msgid "fourth"
 msgstr "cuarto"
 
@@ -6955,13 +6982,13 @@ msgstr "cuarto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 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:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "Other Date"
 msgstr "Outra data"
 
@@ -6969,7 +6996,7 @@ msgstr "Outra data"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 msgid "1st to 10th"
 msgstr "Do 1º ao 10º"
 
@@ -6977,7 +7004,7 @@ msgstr "Do 1º ao 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:1053
+#: ../calendar/gui/dialogs/recurrence-page.c:1055
 msgid "11th to 20th"
 msgstr "do 11º ao 20º"
 
@@ -6985,45 +7012,45 @@ msgstr "do 11º ao 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:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1061
 msgid "21st to 31st"
 msgstr "Do 21º ao 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:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 msgid "day"
 msgstr "día"
 
 #. 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:1208
+#: ../calendar/gui/dialogs/recurrence-page.c:1210
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1384
+#: ../calendar/gui/dialogs/recurrence-page.c:1386
 msgid "occurrences"
 msgstr "ocorrencias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2087
+#: ../calendar/gui/dialogs/recurrence-page.c:2089
 msgid "Add exception"
 msgstr "Engadir excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2130
 msgid "Could not get a selection to modify."
 msgstr "Non se puido obter unha selección para modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2134
+#: ../calendar/gui/dialogs/recurrence-page.c:2136
 msgid "Modify exception"
 msgstr "Modificar excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2178
+#: ../calendar/gui/dialogs/recurrence-page.c:2180
 msgid "Could not get a selection to delete."
 msgstr "Non se puido obter unha selección para eliminar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2304
 msgid "Date/Time"
 msgstr "Data e hora"
 
@@ -7074,12 +7101,12 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:373
-#: ../calendar/gui/dialogs/task-details-page.c:393
+#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "A data de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/task-details-page.c:478
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "Páxina web"
 
@@ -7095,53 +7122,53 @@ msgstr "<span weight=\"bold\">Estado</span>"
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
 #: ../calendar/gui/e-cal-component-preview.c:253
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-cal-model-tasks.c:362
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/e-itip-control.c:946
 #: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/print.c:2554 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Terminada"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1065
+#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1066
 msgid "High"
 msgstr "Alto"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:356
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-cal-model-tasks.c:754
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2551
 msgid "In Progress"
 msgstr "En progreso"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1063
+#: ../calendar/gui/e-calendar-table.c:568 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1064
 msgid "Low"
 msgstr "Baixo"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:970 ../calendar/gui/e-calendar-table.c:568
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1065
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
 #: ../calendar/gui/e-cal-component-preview.c:260
-#: ../calendar/gui/e-cal-model-tasks.c:354
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:639 ../calendar/gui/print.c:2548
 #: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Non Iniciada"
@@ -7155,7 +7182,7 @@ msgid "Stat_us:"
 msgstr "Esta_do:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Indefinida"
 
@@ -7172,37 +7199,37 @@ msgstr "_Prioridade:"
 msgid "_Web Page:"
 msgstr "Páxina _Web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:111
+#: ../calendar/gui/dialogs/task-editor.c:113
 msgid "_Status Details"
 msgstr "Detalles do e_stado"
 
-#: ../calendar/gui/dialogs/task-editor.c:113
+#: ../calendar/gui/dialogs/task-editor.c:115
 msgid "Click to change or view the status details of the task"
 msgstr "Prema para modificar ou ver os detalles do estado da tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:121
-#: ../composer/e-composer-actions.c:528
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:527
 msgid "_Send Options"
 msgstr "Opción_s de envío"
 
-#: ../calendar/gui/dialogs/task-editor.c:316
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:319
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
 msgstr "Detalles da tarefa"
 
-#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.c:372
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:781
+#: ../calendar/gui/dialogs/task-page.c:785
 msgid "Due date is wrong"
 msgstr "A data de vencemento é incorrecta"
 
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1754
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Non é posible abrir as tarefas en '%s'."
@@ -7224,7 +7251,7 @@ msgid "Time zone:"
 msgstr "Fuso horario:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:392
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -7232,69 +7259,69 @@ 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:398
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Acción descoñecida para realizar "
 
 #. 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:474
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s antes do comezo da 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:479
+#: ../calendar/gui/e-alarm-list.c:481
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s despois do comezo da cita"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:486
+#: ../calendar/gui/e-alarm-list.c:488
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ao comezo da 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:497
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s antes de finalizar a 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:502
+#: ../calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s despois de finalizar a cita"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:509
+#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ao finalizar a 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:533
+#: ../calendar/gui/e-alarm-list.c:535
 #, 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:541
+#: ../calendar/gui/e-alarm-list.c:543
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de activador descoñecido"
@@ -7306,7 +7333,7 @@ msgid "Click to open %s"
 msgstr "Prema para abrir %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "Sen título"
 
@@ -7343,7 +7370,7 @@ msgstr "Data de vencemento:"
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:246
 #: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
+#: ../plugins/exchange-operations/exchange-account-setup.c:269
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Estado:"
@@ -7361,18 +7388,18 @@ msgstr "Data final"
 msgid "Start Date"
 msgstr "Data de inicio"
 
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:618
 msgid "Free"
 msgstr "Libre"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:620
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:396
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../calendar/gui/e-cal-model-tasks.c:623
+#: ../calendar/gui/e-cal-model-tasks.c:627
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7382,7 +7409,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:976
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
 #: ../calendar/gui/e-meeting-store.c:746
@@ -7390,7 +7417,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Si"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:976
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
 #: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:165
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -7398,209 +7425,209 @@ msgid "No"
 msgstr "Non"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:335 ../calendar/gui/e-cal-popup.c:105
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
 #: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
 #: ../calendar/gui/e-meeting-list-view.c:167
 #: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
-#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:987
+#: ../calendar/gui/print.c:1004 ../mail/em-utils.c:1340
 #: ../plugins/itip-formatter/itip-formatter.c:409
 #: ../plugins/itip-formatter/itip-formatter.c:2046
-#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
-#: ../widgets/misc/e-charset-picker.c:55
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model.c:987
 msgid "Recurring"
 msgstr "Recorrencia"
 
-#: ../calendar/gui/e-cal-model.c:974
+#: ../calendar/gui/e-cal-model.c:989
 msgid "Assigned"
 msgstr "Asignada"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Gardar como..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2035
 msgid "Select folder to save selected attachments..."
 msgstr "Seleccione o cartafol para gardar os anexos seleccionados..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "imaxe_sen_título.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1672 ../calendar/gui/e-memo-table.c:926
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1575
+#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:925
 #: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "_Gardar como..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:562
 #: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "Definir como _fondo"
 
-#: ../calendar/gui/e-cal-popup.c:287
+#: ../calendar/gui/e-cal-popup.c:288
 msgid "_Save Selected"
 msgstr "_Gardar os seleccionados"
 
-#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:832
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: ../calendar/gui/e-calendar-table.c:338
+#: ../calendar/gui/e-calendar-table.c:337
 msgid "* No Summary *"
 msgstr "* Sen resumo *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2215
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2214
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:377
-#: ../calendar/gui/e-calendar-view.c:2219
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:2218
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "Start: "
 msgstr "Comeza: "
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "Due: "
 msgstr "Vence: "
 
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:588
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:592
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:593
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:594
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:595
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:596
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:597
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:598
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:878
+#: ../calendar/gui/e-calendar-view.c:664 ../calendar/gui/e-memo-table.c:438
 msgid "Deleting selected objects"
 msgstr "Eliminar os obxectos seleccionados"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1162
+#: ../calendar/gui/e-calendar-view.c:794 ../calendar/gui/e-memo-table.c:644
 msgid "Updating objects"
 msgstr "Actualizando obxectos"
 
-#: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:278
+#: ../calendar/gui/e-calendar-table.c:1347
+#: ../calendar/gui/e-calendar-view.c:1220 ../calendar/gui/e-memo-table.c:820
+#: ../composer/e-composer-actions.c:277
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-table.c:1570
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Task"
 msgstr "Nova _Tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1574 ../calendar/gui/e-memo-table.c:924
 msgid "Open _Web Page"
 msgstr "Abrir páxina _web"
 
-#: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-view.c:1656 ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "Imp_rimir..."
 
-#: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1580
+#: ../calendar/gui/e-calendar-view.c:1676 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_rtar"
 
-#: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1586 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Asignar Tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1587 ../calendar/gui/e-memo-table.c:936
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Remitir como iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1588
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminada"
 
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar as tarefas seleccionadas como terminadas"
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark as Incomplete"
 msgstr "_Marcar como non terminada"
 
-#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Marcar as tarefas seleccionadas como non terminadas"
 
-#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-table.c:1596
 msgid "_Delete Selected Tasks"
 msgstr "E_liminar as tarefas seleccionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1834
+#: ../calendar/gui/e-calendar-table.c:1833
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Prema para engadir unha tarefa"
@@ -7624,7 +7651,7 @@ msgstr "Data de vencemento"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
 #: ../calendar/gui/tasktypes.xml.h:37
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "Prioridade"
 
@@ -7632,108 +7659,108 @@ msgstr "Prioridade"
 msgid "Start date"
 msgstr "Data de inicio"
 
-#: ../calendar/gui/e-calendar-view.c:1340
+#: ../calendar/gui/e-calendar-view.c:1339
 msgid "Moving items"
 msgstr "Movendo elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1342
+#: ../calendar/gui/e-calendar-view.c:1341
 msgid "Copying items"
 msgstr "Copiando elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1650
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New All Day _Event"
 msgstr "Novo _evento de día completo"
 
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New _Meeting"
 msgstr "Nova _reunión"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1663
 msgid "_Current View"
 msgstr "_Visualización actual"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1665
 msgid "Select T_oday"
 msgstr "Seleccionar _hoxe"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "_Select Date..."
 msgstr "_Seleccionar data..."
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1672
 msgid "Pri_nt..."
 msgstr "_Imprimir..."
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar a un calendario..."
 
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver ao calendario..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "_Delegate Meeting..."
 msgstr "_Delegar reunión..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Schedule Meeting..."
 msgstr "_Programar reunión..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Forward as iCalendar..."
 msgstr "_Remitir como iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1689 ../mail/em-folder-view.c:1330
+#: ../calendar/gui/e-calendar-view.c:1688 ../mail/em-folder-view.c:1330
 #: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta ocorrencia _movible"
 
-#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1694 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Eliminar esta _ocorrencia"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "Delete _All Occurrences"
 msgstr "Eliminar _todas as ocorrencias"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2234 ../calendar/gui/print.c:2510
 #, c-format
 msgid "Location: %s"
 msgstr "Localización: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2268
 #, 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:116
+#: ../calendar/gui/e-cell-date-edit-text.c:111
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:119
+#: ../calendar/gui/e-cell-date-edit-text.c:114
 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:127
+#: ../calendar/gui/e-cell-date-edit-text.c:122
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7746,7 +7773,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:589
+#: ../calendar/gui/e-day-view-time-item.c:583
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisións de minuto"
@@ -7757,20 +7784,20 @@ msgstr "%02i divisións de minuto"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1672
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1560
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1674
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
-#: ../calendar/gui/print.c:829
+#: ../calendar/gui/e-day-view.c:800 ../calendar/gui/e-week-view.c:540
+#: ../calendar/gui/print.c:831
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:803 ../calendar/gui/e-week-view.c:543
+#: ../calendar/gui/print.c:833
 msgid "pm"
 msgstr "pm"
 
@@ -7851,7 +7878,7 @@ msgid "Ends"
 msgstr "Finaliza"
 
 #: ../calendar/gui/e-itip-control.c:961
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "Vence"
 
@@ -8222,49 +8249,49 @@ msgstr "Participantes"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:983
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
 #: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/print.c:984 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/print.c:985
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/print.c:986
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:998
+#: ../calendar/gui/print.c:1000
 msgid "Chair"
 msgstr "Presidente"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
 #: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:1001
 msgid "Required Participant"
 msgstr "Participante requirido"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/print.c:1002
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:1001
+#: ../calendar/gui/print.c:1003
 msgid "Non-Participant"
 msgstr "Non-participante"
 
@@ -8276,7 +8303,7 @@ msgstr "Necesita acción"
 
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-time-sel.c:397
+#: ../calendar/gui/e-meeting-time-sel.c:395
 msgid "Tentative"
 msgstr "Provisional"
 
@@ -8304,8 +8331,8 @@ msgstr "En progreso"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:473
-#: ../calendar/gui/e-meeting-time-sel.c:2122
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2120
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -8313,78 +8340,78 @@ msgstr "%A, %d de %B de %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:477
-#: ../calendar/gui/e-meeting-time-sel.c:2153
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2151
 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:481
+#: ../calendar/gui/e-meeting-time-sel-item.c:475
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Out of Office"
 msgstr "Fóra da oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "No Information"
 msgstr "Sen información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "A_ttendees..."
 msgstr "Par_ticipantes..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:434
 msgid "O_ptions"
 msgstr "O_pcións"
 
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:451
 msgid "Show _only working hours"
 msgstr "Mostrar _só as horas de traballo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _zoomed out"
 msgstr "Mostrar _reducido"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:476
 msgid "_Update free/busy"
 msgstr "_Actualizar dispoñibilidade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:509
 msgid "_Autopick"
 msgstr "Seleccionar _automaticamente"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:524
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:541
 msgid "_All people and resources"
 msgstr "_Todas as persoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "All _people and one resource"
 msgstr "Todas as _persoas e un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:559
 msgid "_Required people"
 msgstr "Persoas _requiridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:568
 msgid "Required people and _one resource"
 msgstr "Persoas requiridas e _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:604
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:631
 msgid "_End time:"
 msgstr "Hora de _finalización:"
 
@@ -8412,11 +8439,11 @@ msgstr "Lingua"
 msgid "Member"
 msgstr "Integrante"
 
-#: ../calendar/gui/e-memo-table.c:942
+#: ../calendar/gui/e-memo-table.c:941
 msgid "_Delete Selected Memos"
 msgstr "E_liminar as notas seleccionadas"
 
-#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Prema para engadir unha nota"
 
@@ -8460,14 +8487,14 @@ msgstr "Finalizando tarefas..."
 msgid "Expunging"
 msgstr "Expurgando"
 
-#: ../calendar/gui/e-timezone-entry.c:129
+#: ../calendar/gui/e-timezone-entry.c:128
 msgid "Select Timezone"
 msgstr "Seleccionar fuso horario"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:348 ../calendar/gui/print.c:1653
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1655
 msgid "%d %B"
 msgstr "%d de %b"
 
@@ -8744,208 +8771,208 @@ msgid "Unable to migrate tasks `%s'"
 msgstr "Non se puido migrar as tarefas `%s'"
 
 #: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
 msgid "Notes"
 msgstr "Notas"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:523
 msgid "31st"
 msgstr "31"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Su"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Mo"
 msgstr "Lu"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Tu"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "We"
 msgstr "Mé"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Th"
 msgstr "Xo"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Fr"
 msgstr "Ve"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Sa"
 msgstr "Sá"
 
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2474
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2476
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/gui/print.c:2499
+#: ../calendar/gui/print.c:2501
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2524
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2562
+#: ../calendar/gui/print.c:2564
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2579
+#: ../calendar/gui/print.c:2581
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2593
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada: %i"
 
-#: ../calendar/gui/print.c:2603
+#: ../calendar/gui/print.c:2605
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2616
+#: ../calendar/gui/print.c:2618
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:2629
 msgid "Contacts: "
 msgstr "Contactos: "
 
@@ -9050,49 +9077,49 @@ msgstr "Cancelado"
 msgid "In progress"
 msgstr "En progreso"
 
-#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:50
 msgid "is greater than"
 msgstr "é maior que"
 
-#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:51
 msgid "is less than"
 msgstr "é menor que"
 
-#: ../calendar/importers/icalendar-importer.c:73
+#: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
 msgstr "Citas e reunións"
 
-#: ../calendar/importers/icalendar-importer.c:331
-#: ../calendar/importers/icalendar-importer.c:614
+#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:616
 #: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "Abrir calendario"
 
-#: ../calendar/importers/icalendar-importer.c:438
+#: ../calendar/importers/icalendar-importer.c:440
 msgid "iCalendar files (.ics)"
 msgstr "Ficheiros iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:441
 msgid "Evolution iCalendar importer"
 msgstr "Importador de iCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:515
+#: ../calendar/importers/icalendar-importer.c:517
 msgid "Reminder!"
 msgstr "Aviso!"
 
-#: ../calendar/importers/icalendar-importer.c:567
+#: ../calendar/importers/icalendar-importer.c:569
 msgid "vCalendar files (.vcf)"
 msgstr "Ficheiros vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:568
+#: ../calendar/importers/icalendar-importer.c:570
 msgid "Evolution vCalendar importer"
 msgstr "Importador de vCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:730
+#: ../calendar/importers/icalendar-importer.c:732
 msgid "Calendar Events"
 msgstr "Eventos de calendario"
 
-#: ../calendar/importers/icalendar-importer.c:767
+#: ../calendar/importers/icalendar-importer.c:769
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador intelixente do calendario do Evolution"
 
@@ -10661,185 +10688,185 @@ msgstr "Inserir anexo"
 msgid "A_ttach"
 msgstr "A_nexar"
 
-#: ../composer/e-composer-actions.c:143
+#: ../composer/e-composer-actions.c:142
 msgid "Untitled Message"
 msgstr "Mensaxe sen título"
 
-#: ../composer/e-composer-actions.c:474
+#: ../composer/e-composer-actions.c:473
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
-#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ../composer/e-composer-actions.c:481
+#: ../composer/e-composer-actions.c:480
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1337
+#: ../composer/e-composer-actions.c:485 ../mail/em-folder-view.c:1337
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:492 ../ui/evolution-addressbook.xml.h:27
 #: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Pre_visualización da impresión"
 
-#: ../composer/e-composer-actions.c:502
+#: ../composer/e-composer-actions.c:501
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:507
+#: ../composer/e-composer-actions.c:506
 msgid "Save _As..."
 msgstr "Gardar _como..."
 
-#: ../composer/e-composer-actions.c:509
+#: ../composer/e-composer-actions.c:508
 msgid "Save the current file with a different name"
 msgstr "Gardar o ficheiro actual cun nome diferente"
 
-#: ../composer/e-composer-actions.c:514
+#: ../composer/e-composer-actions.c:513
 msgid "Save _Draft"
 msgstr "Gardar _borrador"
 
-#: ../composer/e-composer-actions.c:516
+#: ../composer/e-composer-actions.c:515
 msgid "Save as draft"
 msgstr "Gardar como borrador"
 
-#: ../composer/e-composer-actions.c:521
+#: ../composer/e-composer-actions.c:520
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:523
+#: ../composer/e-composer-actions.c:522
 msgid "Send this message"
 msgstr "Enviar esta mensaxe"
 
-#: ../composer/e-composer-actions.c:530
+#: ../composer/e-composer-actions.c:529
 msgid "Insert Send options"
 msgstr "Introducir opcións de envío"
 
-#: ../composer/e-composer-actions.c:535
+#: ../composer/e-composer-actions.c:534
 msgid "New _Message"
 msgstr "Nova _mensaxe"
 
-#: ../composer/e-composer-actions.c:537
+#: ../composer/e-composer-actions.c:536
 msgid "Open New Message window"
 msgstr "Abrir unha ventá de nova mensaxe"
 
-#: ../composer/e-composer-actions.c:544
+#: ../composer/e-composer-actions.c:543
 msgid "Character _Encoding"
 msgstr "_Codificación dos caracteres"
 
-#: ../composer/e-composer-actions.c:551
+#: ../composer/e-composer-actions.c:550
 msgid "_Security"
 msgstr "_Seguridade"
 
-#: ../composer/e-composer-actions.c:561
+#: ../composer/e-composer-actions.c:560
 msgid "PGP _Encrypt"
 msgstr "C_ifrar con PGP"
 
-#: ../composer/e-composer-actions.c:563
+#: ../composer/e-composer-actions.c:562
 msgid "Encrypt this message with PGP"
 msgstr "Cifrar esta mensaxe con PGP"
 
-#: ../composer/e-composer-actions.c:569
+#: ../composer/e-composer-actions.c:568
 msgid "PGP _Sign"
 msgstr "A_sinar con PGP"
 
-#: ../composer/e-composer-actions.c:571
+#: ../composer/e-composer-actions.c:570
 msgid "Sign this message with your PGP key"
 msgstr "Asinar esta mensaxe coa súa chave PGP"
 
-#: ../composer/e-composer-actions.c:577
+#: ../composer/e-composer-actions.c:576
 msgid "_Prioritize Message"
 msgstr "_Mensaxe prioritaria"
 
-#: ../composer/e-composer-actions.c:579
+#: ../composer/e-composer-actions.c:578
 msgid "Set the message priority to high"
 msgstr "Definir a prioridade da mensaxe como alta"
 
-#: ../composer/e-composer-actions.c:585
+#: ../composer/e-composer-actions.c:584
 msgid "Re_quest Read Receipt"
 msgstr "Re_quirir confirmación de lectura"
 
-#: ../composer/e-composer-actions.c:587
+#: ../composer/e-composer-actions.c:586
 msgid "Get delivery notification when your message is read"
 msgstr "Obter unha notificación de entrega cando se lea a súa mensaxe"
 
-#: ../composer/e-composer-actions.c:593
+#: ../composer/e-composer-actions.c:592
 msgid "S/MIME En_crypt"
 msgstr "_Cifrar con S/MIME"
 
-#: ../composer/e-composer-actions.c:595
+#: ../composer/e-composer-actions.c:594
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Cifrar esta mensaxe co seu certificado de cifrado S/MIME"
 
-#: ../composer/e-composer-actions.c:601
+#: ../composer/e-composer-actions.c:600
 msgid "S/MIME Sig_n"
 msgstr "Si_natura S/MIME"
 
-#: ../composer/e-composer-actions.c:603
+#: ../composer/e-composer-actions.c:602
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Asinar esta mensaxe co seu certificado de sinatura S/MIME"
 
-#: ../composer/e-composer-actions.c:609
+#: ../composer/e-composer-actions.c:608
 msgid "_Bcc Field"
 msgstr "Campo _Cco"
 
-#: ../composer/e-composer-actions.c:611
+#: ../composer/e-composer-actions.c:610
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo CCO"
 
-#: ../composer/e-composer-actions.c:617
+#: ../composer/e-composer-actions.c:616
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ../composer/e-composer-actions.c:619
+#: ../composer/e-composer-actions.c:618
 msgid "Toggles whether the CC field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo CC"
 
-#: ../composer/e-composer-actions.c:625
+#: ../composer/e-composer-actions.c:624
 msgid "_From Field"
 msgstr "Campo _Desde"
 
-#: ../composer/e-composer-actions.c:627
+#: ../composer/e-composer-actions.c:626
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Alterna entre se se mostra ou non o selector do campo De"
 
-#: ../composer/e-composer-actions.c:633
+#: ../composer/e-composer-actions.c:632
 msgid "_Post-To Field"
 msgstr "Campo _Publicar-en"
 
-#: ../composer/e-composer-actions.c:635
+#: ../composer/e-composer-actions.c:634
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo Publicar en"
 
-#: ../composer/e-composer-actions.c:641
+#: ../composer/e-composer-actions.c:640
 msgid "_Reply-To Field"
 msgstr "Campo _Responder a"
 
-#: ../composer/e-composer-actions.c:643
+#: ../composer/e-composer-actions.c:642
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo Responder a"
 
-#: ../composer/e-composer-actions.c:649
+#: ../composer/e-composer-actions.c:648
 msgid "_Subject Field"
 msgstr "Campo _Asunto"
 
-#: ../composer/e-composer-actions.c:651
+#: ../composer/e-composer-actions.c:650
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Alterna entre se se mostra o campo Asunto ou non"
 
-#: ../composer/e-composer-actions.c:657
+#: ../composer/e-composer-actions.c:656
 msgid "_To Field"
 msgstr "Campo _Para"
 
-#: ../composer/e-composer-actions.c:659
+#: ../composer/e-composer-actions.c:658
 msgid "Toggles whether the To field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo Para"
 
@@ -10907,22 +10934,18 @@ msgstr "Escolla os cartafoles nos que publicar a mensaxe."
 msgid "Click here to select folders to post to"
 msgstr "Prema aquí para seleccionar os cartafoles nos que publicar"
 
-#: ../composer/e-composer-private.c:65
-msgid "Recent _Documents"
-msgstr "_Documentos recentes"
-
-#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1553
 msgid "Show _Attachment Bar"
 msgstr "Mostrar a _barra de anexos"
 
-#: ../composer/e-msg-composer.c:872
+#: ../composer/e-msg-composer.c:867
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Non se pode asinar a mensaxe saínte: non hai un certificado de sinatura "
 "definido para esta conta"
 
-#: ../composer/e-msg-composer.c:879
+#: ../composer/e-msg-composer.c:874
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10930,23 +10953,23 @@ msgstr ""
 "Non se pode cifrar a mensaxe saínte: non hai un certificado de cifrado "
 "definido para esta conta"
 
-#: ../composer/e-msg-composer.c:1500 ../mail/em-format-html-display.c:1913
-#: ../mail/em-format-html-display.c:2405 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1495 ../mail/em-format-html-display.c:1919
+#: ../mail/em-format-html-display.c:2411 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Anexo"
 msgstr[1] "Anexos"
 
-#: ../composer/e-msg-composer.c:1556
+#: ../composer/e-msg-composer.c:1551
 msgid "Hide _Attachment Bar"
 msgstr "Ocultar a _barra de anexos"
 
-#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
+#: ../composer/e-msg-composer.c:1568 ../composer/e-msg-composer.c:2775
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:4055
+#: ../composer/e-msg-composer.c:4050
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11040,7 +11063,7 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
+"Send options available only for Novell GroupWise and Microsoft Exchange "
 "accounts."
 msgstr ""
 "As opcións de envío están dispoñibles só para contas Novell Groupwise e "
@@ -11114,7 +11137,7 @@ msgstr "_Gardar borrador"
 msgid "Evolution Mail and Calendar"
 msgstr "Correo e calendario do Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
 msgid "Groupware Suite"
 msgstr "Suite de Groupware"
 
@@ -11130,40 +11153,40 @@ msgstr "cartón de enderezo"
 msgid "calendar information"
 msgstr "información de calendario"
 
-#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Erro do Evolution"
 
-#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Aviso do Evolution"
 
-#: ../e-util/e-error.c:117
+#: ../e-util/e-error.c:118
 msgid "Evolution Information"
 msgstr "Información do Evolution"
 
-#: ../e-util/e-error.c:119
+#: ../e-util/e-error.c:120
 msgid "Evolution Query"
 msgstr "Consulta do Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:449
+#: ../e-util/e-error.c:450
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Erro interno: requirido un erro descoñecido '%s'"
 
-#: ../e-util/e-logger.c:156
+#: ../e-util/e-logger.c:161
 msgid "Component"
 msgstr "Compoñente"
 
-#: ../e-util/e-logger.c:157
+#: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
 msgstr "O nome da compoñente que rexistrar"
 
 #: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
 #: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
-#: ../plugins/plugin-manager/plugin-manager.c:339
-#: ../plugins/publish-calendar/publish-calendar.c:689
+#: ../plugins/plugin-manager/plugin-manager.c:355
+#: ../plugins/publish-calendar/publish-calendar.c:690
 msgid "Enabled"
 msgstr "Activado"
 
@@ -11213,7 +11236,7 @@ msgstr "Sobrescribir o ficheiro?"
 msgid "_Overwrite"
 msgstr "S_obrescribir"
 
-#: ../e-util/e-util.c:97
+#: ../e-util/e-util.c:96
 msgid "Could not display help for Evolution."
 msgstr "Non se puido mostrar a axuda de Evolution."
 
@@ -11273,119 +11296,119 @@ msgstr "Erro de GConf: %s"
 msgid "All further errors shown only on terminal."
 msgstr "De agora en adiante, todos os erros amosaranse só no terminal."
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "hai un segundo"
 msgstr[1] "hai %d segundos"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "dentro de 1 segundo"
 msgstr[1] "dentro de %d segundos"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "hai 1 minuto"
 msgstr[1] "hai %d minutos"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "dentro de 1 minuto"
 msgstr[1] "dentro de %d minutos"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "hai 1 hora"
 msgstr[1] "hai %d horas"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "dentro de 1 hora"
 msgstr[1] "dentro de %d horas"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "hai 1 día"
 msgstr[1] "hai %d días"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "dentro de 1 día"
 msgstr[1] "dentro de %d días"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "hai 1 semana"
 msgstr[1] "hai %d semanas"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "dentro de 1 semana"
 msgstr[1] "dentro de %d semanas"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "hai 1 mes"
 msgstr[1] "hai %d meses"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "dentro de 1 mes"
 msgstr[1] "dentro de %d meses"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "hai 1 ano"
 msgstr[1] "hai %d anos"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "dentro de 1 ano"
 msgstr[1] "dentro de %d anos"
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<prema aquí para seleccionar unha data>"
 
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "agora"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:298
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:452
 msgid "Select a time to compare against"
 msgstr "Seleccione unha hora coa que comparar"
 
@@ -11398,56 +11421,56 @@ msgstr "Seleccione un ficheiro"
 msgid "Test"
 msgstr "Proba"
 
-#: ../filter/filter-rule.c:852
+#: ../filter/filter-rule.c:853
 msgid "R_ule name:"
 msgstr "Nome da r_egra"
 
-#: ../filter/filter-rule.c:880
+#: ../filter/filter-rule.c:881
 msgid "Find items that meet the following criteria"
 msgstr "Buscar os elementos que cumpran cos seguintes criterios"
 
-#: ../filter/filter-rule.c:914
+#: ../filter/filter-rule.c:915
 msgid "A_dd Filter Criteria"
 msgstr "En_gadir regra de filtraxe"
 
-#: ../filter/filter-rule.c:920
+#: ../filter/filter-rule.c:921
 msgid "If all criteria are met"
 msgstr "Se se cumpren todos os criterios"
 
-#: ../filter/filter-rule.c:920
+#: ../filter/filter-rule.c:921
 msgid "If any criteria are met"
 msgstr "Se se cumpre algún criterio"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:923
 msgid "_Find items:"
 msgstr "_Buscar elementos:"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "All related"
 msgstr "Todos os relacionados"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies"
 msgstr "Respostas"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies and parents"
 msgstr "Respostas e pais"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "No reply or parent"
 msgstr "Sen resposta nin pai"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/filter-rule.c:947
 msgid "I_nclude threads"
 msgstr "I_ncluír fíos"
 
-#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Saínte"
 
@@ -11547,7 +11570,7 @@ msgstr "dentro de"
 msgid "months"
 msgstr "meses"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:197
 msgid "seconds"
 msgstr "segundos"
 
@@ -11636,9 +11659,9 @@ msgid "Evolution Network configuration control"
 msgstr "Control de configuración de rede de Evolution"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
-#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
-#: ../mail/mail-component.c:767
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
+#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
+#: ../mail/mail-component.c:762
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Correo"
@@ -11661,12 +11684,12 @@ msgstr "Preferencias da rede"
 msgid "_Mail"
 msgstr "_Correo"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:386
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acordo de licenza %s"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:393
 #, c-format
 msgid ""
 "\n"
@@ -11679,64 +11702,64 @@ msgstr ""
 "para %s que se mostre abaixo\n"
 "e marque a caixa de verificación para aceptalo.\n"
 
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Seleccionar cartafol"
 
-#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
-#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
+#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
+#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:98
 msgid "Autogenerated"
 msgstr "Xerado automaticamente"
 
-#: ../mail/em-account-editor.c:762
+#: ../mail/em-account-editor.c:761
 msgid "Ask for each message"
 msgstr "Preguntar por cada mensaxe"
 
-#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Recibindo correo"
 
-#: ../mail/em-account-editor.c:2131
+#: ../mail/em-account-editor.c:2130
 msgid "Check for _new messages every"
 msgstr "Verificar automaticamente se hai mensaxes _novas cada"
 
-#: ../mail/em-account-editor.c:2139
+#: ../mail/em-account-editor.c:2138
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Predeterminados"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Seguranza"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
 msgid "Receiving Options"
 msgstr "Opcións de recepción"
 
-#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Checking for New Messages"
 msgstr "Comprobando se hai mensaxes novas"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor de contas"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Asistente de contas do Evolution"
 
@@ -11770,18 +11793,18 @@ msgstr "Engadir script de sinatura"
 msgid "Signature(s)"
 msgstr "Sinatura(s)"
 
-#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensaxe reenviada --------"
 
-#: ../mail/em-composer-utils.c:1960
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "un remitente descoñecido"
 
 #. 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:2007
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11789,7 +11812,7 @@ msgstr ""
 "O ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} ás ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribiu:"
 
-#: ../mail/em-composer-utils.c:2150
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "-----Mensaxe orixinal-----"
 
@@ -11797,251 +11820,267 @@ msgstr "-----Mensaxe orixinal-----"
 msgid "_Filter Rules"
 msgstr "_Regras de filtro"
 
+#.
+#. * 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)
+#.
 #. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
+#: ../mail/em-filter-i18n.h:18
 msgid "Adjust Score"
 msgstr "Axustar a puntuación"
 
-#: ../mail/em-filter-i18n.h:3
+#: ../mail/em-filter-i18n.h:19
 msgid "Assign Color"
 msgstr "Asignar cor"
 
-#: ../mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:20
 msgid "Assign Score"
 msgstr "Asignar puntuación"
 
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:22
 msgid "BCC"
 msgstr "Cco"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:23
 msgid "Beep"
 msgstr "Ton de aviso"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:24
 msgid "CC"
 msgstr "Cc"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:25
 msgid "Completed On"
 msgstr "Completado en"
 
-#: ../mail/em-filter-i18n.h:11
+#: ../mail/em-filter-i18n.h:27
 msgid "Copy to Folder"
 msgstr "Copiar ao cartafol"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:28
 msgid "Date received"
 msgstr "Data de recepción"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:29
 msgid "Date sent"
 msgstr "Data de envío"
 
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:767
+#: ../mail/em-filter-i18n.h:30
+#: ../plugins/groupwise-features/share-folder.c:768
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:31
 msgid "Deleted"
 msgstr "Eliminada"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:33
 msgid "does not end with"
 msgstr "non finaliza en"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:34
 msgid "does not exist"
 msgstr "non existe"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:35
 msgid "does not return"
 msgstr "non retorna"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:36
 msgid "does not sound like"
 msgstr "non soa como"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:37
 msgid "does not start with"
 msgstr "non comeza por"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:39
 msgid "Draft"
 msgstr "Borrador"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:40
 msgid "ends with"
 msgstr "termina en"
 
-#: ../mail/em-filter-i18n.h:26
+#: ../mail/em-filter-i18n.h:42
 msgid "exists"
 msgstr "existe"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:43
 msgid "Expression"
 msgstr "Expresión"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:44
 msgid "Follow Up"
 msgstr "Seguimento"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:45 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Importante"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:47
 msgid "is after"
 msgstr "é posterior a"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:48
 msgid "is before"
 msgstr "é anterior a"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:49
 msgid "is Flagged"
 msgstr "está marcado"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:53
 msgid "is not Flagged"
 msgstr "non está marcado"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:54
 msgid "is not set"
 msgstr "non está establecida"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:55
 msgid "is set"
 msgstr "está establecida"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
+#: ../mail/em-filter-i18n.h:56 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Correo non desexado"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:57
 msgid "Junk Test"
 msgstr "Proba de correo non desexado"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:58 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Etiqueta"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:59
 msgid "Mailing list"
 msgstr "Lista de correo"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:60
 msgid "Match All"
 msgstr "Coincidir todos"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:61
 msgid "Message Body"
 msgstr "Corpo da mensaxe"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:62
 msgid "Message Header"
 msgstr "Cabeceira da mensaxe"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:63
 msgid "Message is Junk"
 msgstr "A mensaxe é un correo non desexado"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:64
 msgid "Message is not Junk"
 msgstr "A mensaxe non é un correo non desexado"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:65
 msgid "Move to Folder"
 msgstr "Mover ao cartafol"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:66
 msgid "Pipe to Program"
 msgstr "Canalizar para o programa"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:67
 msgid "Play Sound"
 msgstr "Reproducir son"
 
 #. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:69 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Ler"
 
-#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:71
 msgid "Regex Match"
 msgstr "Coincidir coa expresión normal"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:72
 msgid "Replied to"
 msgstr "Contestado a"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:73
 msgid "returns"
 msgstr "retorna"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:74
 msgid "returns greater than"
 msgstr "retorna maior que"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:75
 msgid "returns less than"
 msgstr "retorna menor que"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:76
 msgid "Run Program"
 msgstr "Executar o programa"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Puntuación"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:78 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Remitente"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:79
 msgid "Set Label"
 msgstr "Establecer etiqueta"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:80
 msgid "Set Status"
 msgstr "Definir estado"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:81
 msgid "Size (kB)"
 msgstr "Tamaño (KB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:82
 msgid "sounds like"
 msgstr "soa como"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:83
 msgid "Source Account"
 msgstr "Conta orixe"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:84
 msgid "Specific header"
 msgstr "Cabeceira específica"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:85
 msgid "starts with"
 msgstr "comeza por"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:87
 msgid "Stop Processing"
 msgstr "Deter o procesamento"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
+#: ../mail/em-filter-i18n.h:88 ../mail/em-format-quote.c:342
 #: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
 #: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
 #: ../plugins/groupwise-features/properties.glade.h:7
@@ -12049,16 +12088,16 @@ msgstr "Deter o procesamento"
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:89
 msgid "Unset Status"
 msgstr "Desfacer a definición de estado"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "Entón"
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "Engadir a_cción"
 
@@ -12111,7 +12150,7 @@ msgid "All Account Search"
 msgstr "Busca en todas as contas"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:173
+#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Mensaxe non lida:"
@@ -12119,32 +12158,32 @@ msgstr[1] "Mensaxes non lidas:"
 
 #. 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:177
+#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Mensaxes totais:"
 msgstr[1] "Mensaxes totais:"
 
-#: ../mail/em-folder-properties.c:195
+#: ../mail/em-folder-properties.c:196
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Uso da cota (%s):"
 
-#: ../mail/em-folder-properties.c:197
+#: ../mail/em-folder-properties.c:198
 #, c-format
 msgid "Quota usage"
 msgstr "Uso da cota"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:357 ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
-#: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../mail/em-folder-properties.c:358 ../mail/em-folder-tree-model.c:507
+#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:159
+#: ../mail/mail-component.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: ../mail/em-folder-properties.c:388
+#: ../mail/em-folder-properties.c:389
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Propiedades do cartafol"
@@ -12161,9 +12200,9 @@ msgstr "C_rear"
 msgid "Folder _name:"
 msgstr "_Nome do cartafol:"
 
-#. load store to mail component at the end, when everything is loaded
+#. load store to mail component
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Cartafoles de busca"
 
@@ -12172,15 +12211,15 @@ msgstr "Cartafoles de busca"
 msgid "UNMATCHED"
 msgstr "NON EQUIVALENCIA"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:160
 msgid "Drafts"
 msgstr "Borradores"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:161
 msgid "Outbox"
 msgstr "Caixa de saída"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:162
 msgid "Sent"
 msgstr "Enviado"
 
@@ -12223,12 +12262,12 @@ msgstr "Movendo o cartafol %s"
 msgid "Copying folder %s"
 msgstr "Copiando cartafol %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2015
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2017
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensaxes ao cartafol %s"
@@ -12246,7 +12285,7 @@ msgstr "_Copiar ao cartafol"
 msgid "_Move to Folder"
 msgstr "_Mover ao cartafol"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
@@ -12280,35 +12319,35 @@ msgstr "Lim_par a caixa de saída"
 msgid "_Empty Trash"
 msgstr "_Baleirar o lixo"
 
-#: ../mail/em-folder-utils.c:102
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Copiando `%s' a `%s'"
 
-#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1186
 #: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/em-folder-utils.c:586
+#: ../mail/em-folder-utils.c:532
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando o cartafol `%s'"
 
-#: ../mail/em-folder-utils.c:744
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Crear cartafol"
 
-#: ../mail/em-folder-utils.c:744
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Especifica onde crear o cartafol:"
@@ -12381,7 +12420,7 @@ msgstr "_Etiqueta"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:480
 msgid "_None"
 msgstr "_Ningún"
 
@@ -12484,33 +12523,33 @@ msgid "Click to hide/unhide addresses"
 msgstr "Prema para ocultar ou mostrar os enderezos"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:470
+#: ../mail/em-format-html-display.c:471
 #, c-format
 msgid "Matches: %d"
 msgstr "Equivalencias: %d"
 
-#: ../mail/em-format-html-display.c:614
+#: ../mail/em-format-html-display.c:615
 msgid "Fin_d:"
 msgstr "_Buscar:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:639
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../mail/em-format-html-display.c:643
+#: ../mail/em-format-html-display.c:644
 msgid "_Next"
 msgstr "_Seguinte"
 
-#: ../mail/em-format-html-display.c:648
+#: ../mail/em-format-html-display.c:649
 msgid "M_atch case"
 msgstr "_Diferenciar maiúsculas e minúsculas"
 
-#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Non asinado"
 
-#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12518,11 +12557,11 @@ msgstr ""
 "Esta mensaxe non está asinada. Non hai garantía de que a mensaxe sexa "
 "auténtica."
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Sinatura válida"
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:949
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12530,11 +12569,11 @@ msgstr ""
 "Esta mensaxe está asinada e é válida, o que significa que é moi probable que "
 "a mensaxe sexa auténtica."
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Sinatura non válida"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12542,11 +12581,11 @@ msgstr ""
 "A sinatura desta mensaxe non se pode verificar, puido ser alterada en "
 "tránsito."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Sinatura válida, mais non se pode verificar o remitente"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12554,11 +12593,11 @@ msgstr ""
 "Esta mensaxe está asinada cunha sinatura válida, mais non se puido verificar "
 "o remitente da mensaxe."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "A sinatura existe pero se necesita a chave pública"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12566,11 +12605,11 @@ msgstr ""
 "Esta mensaxe está asinada cunha sinatura, mais non hai unha chave pública "
 "correspondente."
 
-#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Non cifrado"
 
-#: ../mail/em-format-html-display.c:958
+#: ../mail/em-format-html-display.c:959
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12578,11 +12617,11 @@ msgstr ""
 "Esta mensaxe non está cifrada. O seu contido pode verse en tránsito a través "
 "de Internet."
 
-#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Cifrado, débil"
 
-#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html-display.c:960
 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 "
@@ -12592,11 +12631,11 @@ msgstr ""
 "difícil, mais non imposible para un intruso ver o contido desta mensaxe "
 "dentro dun período de tempo útil."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:961
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12604,11 +12643,11 @@ msgstr ""
 "Esta mensaxe está cifrada. Sería difícil para un intruso ver o contido desta "
 "mensaxe."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Cifrado, forte"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:962
 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 "
@@ -12617,87 +12656,87 @@ msgstr ""
 "Esta mensaxe está cifrada cun algoritmo de cifrado forte. Sería moi difícil "
 "para un intruso ver o contido desta mensaxe dentro dun período de tempo útil."
 
-#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1063 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ver o certificado"
 
-#: ../mail/em-format-html-display.c:1077
+#: ../mail/em-format-html-display.c:1078
 msgid "This certificate is not viewable"
 msgstr "Este certificado non é visible"
 
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1377
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Terminado o %d de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1379
+#: ../mail/em-format-html-display.c:1385
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1388
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "antes do %d de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1466
 msgid "_View Inline"
 msgstr "_Ver en liña"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1467
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1468
 msgid "_Fit to Width"
 msgstr "_Axustar á largura"
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1469
 msgid "Show _Original Size"
 msgstr "Mostrar tamaño _orixinal"
 
-#: ../mail/em-format-html-display.c:1983
+#: ../mail/em-format-html-display.c:1989
 msgid "Save attachment as"
 msgstr "Gardar anexo como"
 
-#: ../mail/em-format-html-display.c:1987
+#: ../mail/em-format-html-display.c:1993
 msgid "Select folder to save all attachments"
 msgstr "Seleccione o cartafol onde gardar todos os anexos"
 
-#: ../mail/em-format-html-display.c:2038
+#: ../mail/em-format-html-display.c:2044
 msgid "_Save Selected..."
 msgstr "_Gardar os seleccionados..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2105
+#: ../mail/em-format-html-display.c:2111
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d an_exo"
 msgstr[1] "%d an_exos"
 
-#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
+#: ../mail/em-format-html-display.c:2118 ../mail/em-format-html-display.c:2207
 msgid "S_ave"
 msgstr "G_ardar"
 
-#: ../mail/em-format-html-display.c:2123
+#: ../mail/em-format-html-display.c:2129
 msgid "S_ave All"
 msgstr "G_ardar todo"
 
-#: ../mail/em-format-html-display.c:2197
+#: ../mail/em-format-html-display.c:2203
 msgid "No Attachment"
 msgstr "Sen anexo"
 
-#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2344 ../mail/em-format-html-display.c:2383
 msgid "View _Unformatted"
 msgstr "Ver sen _formato"
 
-#: ../mail/em-format-html-display.c:2340
+#: ../mail/em-format-html-display.c:2346
 msgid "Hide _Unformatted"
 msgstr "Ocultar sen _formato"
 
-#: ../mail/em-format-html-display.c:2397
+#: ../mail/em-format-html-display.c:2403
 msgid "O_pen With"
 msgstr "A_brir con"
 
-#: ../mail/em-format-html-display.c:2468
+#: ../mail/em-format-html-display.c:2479
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12770,7 +12809,7 @@ msgstr "Cco"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1450
+#: ../mail/em-mailer-prefs.c:1451
 msgid "Mailer"
 msgstr "Aplicación de correo"
 
@@ -12804,8 +12843,8 @@ msgid "Reply-To"
 msgstr "Responder a"
 
 #: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
-#: ../widgets/misc/e-dateedit.c:353
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:327
+#: ../widgets/misc/e-dateedit.c:349
 msgid "Date"
 msgstr "Data"
 
@@ -12813,106 +12852,111 @@ msgstr "Data"
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "Cara"
+
+#: ../mail/em-format.c:1158
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1200
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Non se puido analizar a mensaxe S/MIME: erro descoñecido"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido analizar a mensaxe MIME. Mostrando como orixe."
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1345
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de cifrado non soportado para multipart/encrypted"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message"
 msgstr "Non se puido analizar a mensaxe PGP/MIME"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Non se puido analizar a mensaxe PGP/MIME: Erro descoñecido"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1512
 msgid "Unsupported signature format"
 msgstr "Formato de sinatura non soportado"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
 msgid "Error verifying signature"
 msgstr "Erro ao verificar a sinatura"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
 msgid "Unknown error verifying signature"
 msgstr "Erro descoñecido ao verificar a sinatura"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1663
 msgid "Could not parse PGP message"
 msgstr "Non se puido analizar a mensaxe PGP"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1663
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Non se puido analizar a mensaxe PGP: Erro descoñecido"
 
-#: ../mail/em-mailer-prefs.c:93
+#: ../mail/em-mailer-prefs.c:94
 msgid "Every time"
 msgstr "Cada vez"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per day"
 msgstr "Unha vez ao día"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per week"
 msgstr "Unha vez á semana"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per month"
 msgstr "Unha vez ao mes"
 
-#: ../mail/em-mailer-prefs.c:326
+#: ../mail/em-mailer-prefs.c:327
 msgid "Add Custom Junk Header"
 msgstr "Engadir cabeceira de correo non desexado personalizada"
 
-#: ../mail/em-mailer-prefs.c:330
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Name:"
 msgstr "Nome da cabeceira:"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:332
 msgid "Header Value Contains:"
 msgstr "O valor da cabeceira contén:"
 
-#: ../mail/em-mailer-prefs.c:436
+#: ../mail/em-mailer-prefs.c:437
 msgid "Contains Value"
 msgstr "O valor contén"
 
-#: ../mail/em-mailer-prefs.c:458
+#: ../mail/em-mailer-prefs.c:459
 msgid "Color"
 msgstr "Cor"
 
-#: ../mail/em-mailer-prefs.c:461
+#: ../mail/em-mailer-prefs.c:462
 msgid "Tag"
 msgstr "Etiqueta"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
+#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "O plugin %s está dispoñible e o binario está instalado."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
+#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "O plugin %s non está dispoñible. Verifique se o paquete está instalado."
 
-#: ../mail/em-mailer-prefs.c:1107
+#: ../mail/em-mailer-prefs.c:1108
 msgid "No Junk plugin available"
 msgstr "Non hai dispoñible un plugin de correo non desexado"
 
@@ -12975,13 +13019,13 @@ msgstr "Fallo ao crear o almacenamento de correo local `%s': %s"
 
 #: ../mail/em-migrate.c:2898
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"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 ""
-"O formato de resumo dos cartafoles de correo de Evolution cambiouse a "
-"sqlitedesde o Evolution 2.24.\n"
+"O formato de resumo dos cartafoles de correo de Evolution cambiouse a SQLite "
+"desde o Evolution 2.24.\n"
 "\n"
 "Agarde mentres o Evolution migra os seus cartafoles..."
 
@@ -13008,34 +13052,34 @@ msgid "Reply to _List"
 msgstr "Responder á _lista"
 
 #. make it first item
-#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:853
 msgid "_Add to Address Book"
 msgstr "_Engadir á axenda de enderezos"
 
-#: ../mail/em-subscribe-editor.c:583
+#: ../mail/em-subscribe-editor.c:582
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Este almacenamento non soporta subscricións ou non están activadas."
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:615
 msgid "Subscribed"
 msgstr "Subscrito"
 
-#: ../mail/em-subscribe-editor.c:620
+#: ../mail/em-subscribe-editor.c:619
 msgid "Folder"
 msgstr "Cartafol"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:822
+#: ../mail/em-subscribe-editor.c:821
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: ../mail/em-subscribe-editor.c:843
+#: ../mail/em-subscribe-editor.c:842
 msgid "No server has been selected"
 msgstr "Non se seleccionou ningún servidor"
 
 #. Check buttons
 #: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:127
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "_Non mostrar esta mensaxe outra vez."
 
@@ -13065,7 +13109,7 @@ msgstr "Mensaxes de %s"
 msgid "Search _Folders"
 msgstr "_Cartafoles de busca"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "Orixe do cartafol de busca"
 
@@ -13082,7 +13126,7 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Anchura da ventá \"Enviar e recibir correo\""
 
 #: ../mail/evolution-mail.schemas.in.h:4
-msgid "Allows evolution to display text part of limited size"
+msgid "Allows Evolution to display text part of limited size"
 msgstr "Permite que o Evolution mostre parte do texto de tamaño limitado"
 
 #: ../mail/evolution-mail.schemas.in.h:5
@@ -13374,14 +13418,14 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:61
 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."
+"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 ""
-"Se non hai un visualizador integrado para un tipo mime particular dentro do "
-"Evolution, calquera tipo mime que apareza nesta lista que se mapee a un "
-"visualizador de compoñentes Bonobo na base de datos do Gnome pode empregarse "
-"para mostrar o contido."
+"Se non hai un visualizador integrado para un tipo MIME particular dentro do "
+"Evolution, calquera tipo MIME que apareza nesta lista que se mapee a un "
+"visualizador de compoñentes Bonobo na base de datos de tipo MIME do Gnome "
+"pode empregarse para mostrar o contido."
 
 #: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
@@ -13452,14 +13496,19 @@ msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas e as súas cores asociadas"
 
 #: ../mail/evolution-mail.schemas.in.h:72
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr ""
+"Lista de tipos MIME de verificación de visualizadores de compoñentes Bonobo"
+
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accepted licenses"
 msgstr "Lista de licenzas aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of accounts"
 msgstr "Lista de contas"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13468,15 +13517,15 @@ msgstr ""
 "contén cadeas que nomean subdirectorios relativos a /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeceiras personalizadas e se están activadas."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Lista de códigos de idioma de diccionarios usados para a corrección."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 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."
@@ -13485,26 +13534,21 @@ msgstr ""
 "lista contén cadeas que conteñen o nome: cor onde cor usa a codificación "
 "hexadecimal HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of mime types to check for bonobo component viewers"
-msgstr ""
-"Lista de tipos mime de verificación de visualizadores de compoñentes Bonobo"
-
 #: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nomes de protocolos coa se aceptou a licenza."
 
 #: ../mail/evolution-mail.schemas.in.h:80
-msgid "Load images for HTML messages over http"
-msgstr "Cargar imaxes para mensaxes HTML sobre http"
+msgid "Load images for HTML messages over HTTP"
+msgstr "Cargar imaxes para mensaxes HTML sobre HTTP"
 
 #: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"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 imaxes de mensaxes HTML sobre http(s). Os valores posibles son: 0 - "
+"Cargar imaxes de mensaxes HTML sobre HTTP(s). Os valores posibles son: 0 - "
 "nunca cargar as imaxes desde a rede, 1 - cargar as imaxes se o remitente "
 "está na axenda de enderezos, 2 - cargar sempre as imaxes desde a rede."
 
@@ -13760,10 +13804,10 @@ msgstr ""
 #: ../mail/evolution-mail.schemas.in.h:141
 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 interms of KB."
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
 "Isto decide o tamaño máximo da parte de texto que se pode formatar no "
-"Evolution. O predeterminado é 4MB / 4096 e está especificado en KB."
+"Evolution. O predeterminado é 4MB / 4096 KB e está especificado en KB."
 
 #: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
@@ -13981,216 +14025,216 @@ msgstr "Importador do Elm do Evolution"
 msgid "Import mail from Elm."
 msgstr "Importar correo desde o Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:80
+#: ../mail/importers/evolution-mbox-importer.c:79
 msgid "Destination folder:"
 msgstr "Cartafol de destino:"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder to import into"
 msgstr "Seleccionar cartafol para o que importar"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Caixa de correo Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:221
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de cartafoles no formato caixa de correo de Berkeley"
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "Importando caixa de correo"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
+#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando `%s'"
 
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "Examinando %s"
 
-#: ../mail/importers/pine-importer.c:227
+#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr "Importando datos do Pine"
 
-#: ../mail/importers/pine-importer.c:426
+#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "Importador do Pine do Evolution"
 
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
 msgstr "Importar correo do Pine."
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "Enviar a %s"
 
-#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:278
 #, c-format
 msgid "Mail from %s"
 msgstr "Correo de %s"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "O asunto é %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
 msgstr "Engadir regra de filtraxe"
 
-#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
-#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../mail/mail-component.c:163 ../plugins/templates/templates.c:519
+#: ../plugins/templates/templates.c:689 ../plugins/templates/templates.c:724
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "Modelos"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:545
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionado, "
 msgstr[1] "%d seleccionado, "
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:549
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d eliminado"
 msgstr[1] "%d eliminado"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:556
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d correo non desexado"
 msgstr[1] "%d correo non desexado"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviado"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:563
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d non enviado"
 msgstr[1] "%d non enviado"
 
-#: ../mail/mail-component.c:574
+#: ../mail/mail-component.c:569
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d sen ler, "
 msgstr[1] "%d sen ler, "
 
-#: ../mail/mail-component.c:575
+#: ../mail/mail-component.c:570
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:922
 msgid "New Mail Message"
 msgstr "Nova mensaxe de correo"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:923
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensaxe de correo"
 
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:924
 msgid "Compose a new mail message"
 msgstr "Compor unha mensaxe de correo nova"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:930
 msgid "New Mail Folder"
 msgstr "Novo cartafol de correo"
 
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:931
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Cartafol de correo"
 
-#: ../mail/mail-component.c:933
+#: ../mail/mail-component.c:932
 msgid "Create a new mail folder"
 msgstr "Crear un cartafol de correo novo"
 
-#: ../mail/mail-component.c:1080
+#: ../mail/mail-component.c:1079
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Fallou ao actualizar a configuración do correo ou os cartafoles."
 
-#: ../mail/mail-component.c:1596
+#: ../mail/mail-component.c:1595
 msgid "Error"
 msgstr "Erro"
 
-#: ../mail/mail-component.c:1596
+#: ../mail/mail-component.c:1595
 msgid "Errors"
 msgstr "Erros"
 
-#: ../mail/mail-component.c:1597
+#: ../mail/mail-component.c:1596
 msgid "Warnings and Errors"
 msgstr "Avisos e erros"
 
-#: ../mail/mail-component.c:1598
+#: ../mail/mail-component.c:1597
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../mail/mail-component.c:1598
+#: ../mail/mail-component.c:1597
 msgid "Error, Warnings and Debug messages"
 msgstr "Erro, avisos e mensaxes de depuración"
 
-#: ../mail/mail-component.c:1725
+#: ../mail/mail-component.c:1724
 msgid "Debug Logs"
 msgstr "Rexistros de depuración"
 
-#: ../mail/mail-component.c:1739
+#: ../mail/mail-component.c:1738
 msgid "Show _errors in the status bar for"
 msgstr "Mostrar _erros na barra de estado"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1755
+#: ../mail/mail-component.c:1754
 msgid "second(s)."
 msgstr "segundo(s)."
 
-#: ../mail/mail-component.c:1761
+#: ../mail/mail-component.c:1760
 msgid "Log Messages:"
 msgstr "Mensaxes de rexistro:"
 
-#: ../mail/mail-component.c:1802
+#: ../mail/mail-component.c:1801
 msgid "Log Level"
 msgstr "Nivel de rexistro"
 
-#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1810 ../widgets/misc/e-dateedit.c:391
 msgid "Time"
 msgstr "Hora"
 
-#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
+#: ../mail/mail-component.c:1820 ../mail/message-list.c:2516
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensaxes"
 
-#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1829 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Pechar esta ventá"
@@ -14675,66 +14719,74 @@ msgid "S_tandard Font:"
 msgstr "Tipo de letra e_stándar:"
 
 #: ../mail/mail-config.glade.h:132
+msgid "Select Drafts Folder"
+msgstr "Seleccionar cartafol de borradores"
+
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font"
 msgstr "Seleccione tipo de letra de largura fixa para HTML"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font for printing"
 msgstr "Seleccione tipo de letra de largura fixa en HTML para imprimir"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font"
 msgstr "Seleccione tipo de letra de largura variable en HTML"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font for printing"
 msgstr "Seleccione tipo de letra de largura variable en HTML para imprimir"
 
 #: ../mail/mail-config.glade.h:137
+msgid "Select Sent Folder"
+msgstr "Seleccionar cartafol de envío"
+
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "Enviando correo"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "Cartafol de _mensaxes enviadas:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "O ser_vidor require autenticación"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:142
 msgid "Server _Type: "
 msgstr "_Tipo de servidor: "
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "Certificado de _sinatura:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "Sinat_ura:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "Táboa de sinaturas"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "Verificación da ortografía"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "Comezar a _escribir pola parte de abaixo ao responder"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
 msgid "T_ype: "
 msgstr "_Tipo: "
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14742,7 +14794,7 @@ msgstr ""
 "Esta lista de idiomas reflicte unicamente os idiomas para os cales hai "
 "instalado un dicionario."
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14752,7 +14804,7 @@ msgstr ""
 "sinatura. O nome que especifique usarase\n"
 "só para a visualización. "
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:154
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14760,26 +14812,26 @@ msgstr ""
 "Teclee o nome polo que quere identificar a esta conta.\n"
 "Por exemplo: \"Traballo\" ou \"Persoal\""
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:156
 msgid "Us_ername:"
 msgstr "_Nome de usuario:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:157
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticación"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
+#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:284
 #: ../plugins/google-account-setup/google-source.c:625
 #: ../plugins/google-account-setup/google-contacts-source.c:278
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "_Nome de usuario:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:159
 msgid "V_ariable-width:"
 msgstr "Largura v_ariable:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:160
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14789,125 +14841,125 @@ msgstr ""
 "\n"
 "Prema en \"Adiante\" para comezar. "
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:163
 msgid "_Add Signature"
 msgstr "_Engadir sinatura"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:164
 msgid "_Always load images from the Internet"
 msgstr "Cargar _sempre as imaxes desde Internet"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:165
 msgid "_Automatic proxy configuration URL:"
 msgstr "_URL para a configuración automática do proxy:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:166
 msgid "_Default junk plugin:"
 msgstr "Plugin por _defecto de correo non desexado:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:167
 msgid "_Direct connection to the Internet"
 msgstr "Conexión _directa a Internet"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:168
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Non a_sinar as peticións de reunión (para compatibilidade con Outlook)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:170
 msgid "_Forward style:"
 msgstr "_Estilo de reenvío:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:171
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Manter a firma por debaixo da mensaxe orixinal ao respostar"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:172
 msgid "_Load images in messages from contacts"
 msgstr "_Cargar imaxes no correo dos contactos"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:173
 msgid "_Lookup in local address book only"
 msgstr "_Buscar soamente na axenda de enderezos local"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:174
 msgid "_Make this my default account"
 msgstr "_Facer esta a miña conta predeterminada"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:175
 msgid "_Manual proxy configuration:"
 msgstr "Configuración do proxy _manual:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:176
 msgid "_Mark messages as read after"
 msgstr "_Marcar as mensaxes como lidas despois de"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:178
 msgid "_Never load images from the Internet"
 msgstr "_Nunca cargar as imaxes desde Internet"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:179
 msgid "_Path:"
 msgstr "_Camiño:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:180
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Preguntar cando se envíen correos HTML a contactos que non as queren"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:181
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Preguntar cando se envíen mensaxes cun asunto baleiro"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:182
 msgid "_Reply style:"
 msgstr "Estilo da _resposta:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:183
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:184
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _seguro:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:185
 msgid "_Select..."
 msgstr "S_eleccionar..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:188
 msgid "_Show image animations"
 msgstr "_Mostrar animacións de imaxes"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:189
 msgid "_Show the photograph of sender in the message preview"
 msgstr ""
 "Mo_strar a fotografía do remitente na previsualización do correo electrónico"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:190
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Reducir as cabeceiras Para / Cc / Cco "
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:191
 msgid "_Use Secure Connection:"
 msgstr "_Usar unha conexión segura:"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:192
 msgid "_Use system defaults"
 msgstr "Usar _predeterminado do sistema"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:193
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar os mesmos tipos de letra que noutras aplicacións"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "enderezos"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "descrición"
 
@@ -15007,26 +15059,26 @@ msgstr "_Marca:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Marque isto para aceptar o acordo de licenza"
 
-#: ../mail/mail-folder-cache.c:832
+#: ../mail/mail-folder-cache.c:833
 #, c-format
 msgid "Pinging %s"
 msgstr "Facendo ping a %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:106
 msgid "Filtering Selected Messages"
 msgstr "Filtrando as mensaxes seleccionadas"
 
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Recibindo correo"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
+#: ../mail/mail-ops.c:561
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Fallo ao aplicar os filtros ao correo saínte: %s"
 
-#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15035,123 +15087,123 @@ msgstr ""
 "Fallo ao anexar a %s: %s\n"
 "anexando ao cartafol local `Enviado' no seu lugar."
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Fallo ao anexar ao cartafol local `Enviado': %s"
 
-#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:725
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Fallo ao enviar %d de %d mensaxes"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:698
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:700
 msgid "Complete."
 msgstr "Terminado."
 
-#: ../mail/mail-ops.c:871
+#: ../mail/mail-ops.c:872
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: ../mail/mail-ops.c:1166
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "Mensaxes remitidas"
 
-#: ../mail/mail-ops.c:1207
+#: ../mail/mail-ops.c:1208
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: ../mail/mail-ops.c:1272
+#: ../mail/mail-ops.c:1273
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Obtendo a información de cota para o cartafol %s"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo almacenamento %s"
 
-#: ../mail/mail-ops.c:1412
+#: ../mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: ../mail/mail-ops.c:1501
+#: ../mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Almacenando cartafol '%s'"
 
-#: ../mail/mail-ops.c:1564
+#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando e almacenando conta '%s'"
 
-#: ../mail/mail-ops.c:1565
+#: ../mail/mail-ops.c:1595
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando conta '%s'"
 
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1649
 msgid "Refreshing folder"
 msgstr "Actualizando o cartafol"
 
-#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
+#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
 msgid "Expunging folder"
 msgstr "Expurgando o cartafol"
 
-#: ../mail/mail-ops.c:1706
+#: ../mail/mail-ops.c:1736
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Baleirando o lixo en '%s'"
 
-#: ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1737
 msgid "Local Folders"
 msgstr "Cartafoles locais"
 
-#: ../mail/mail-ops.c:1788
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recuperando a mensaxe %s"
 
-#: ../mail/mail-ops.c:1895
+#: ../mail/mail-ops.c:1925
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Recuperando %d mensaxe"
 msgstr[1] "Recuperando %d mensaxes"
 
-#: ../mail/mail-ops.c:1980
+#: ../mail/mail-ops.c:2010
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Gardando %d mensaxe"
 msgstr[1] "Gardando %d mensaxes"
 
-#: ../mail/mail-ops.c:2058
+#: ../mail/mail-ops.c:2088
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15160,11 +15212,11 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2130
+#: ../mail/mail-ops.c:2160
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
+#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15173,27 +15225,27 @@ msgstr ""
 "Non se pode crear o ficheiro de saída: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2171
+#: ../mail/mail-ops.c:2201
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non se poden escribir os datos: %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Conectando novamente a %s"
 
-#: ../mail/mail-ops.c:2413
+#: ../mail/mail-ops.c:2443
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando a conta '%s' para o modo sen conexión"
 
-#: ../mail/mail-ops.c:2499
+#: ../mail/mail-ops.c:2529
 msgid "Checking Service"
 msgstr "Verificando servizo"
 
@@ -15209,39 +15261,39 @@ msgstr "Enviar e recibir correo"
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:502
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
+#: ../mail/mail-send-recv.c:502 ../mail/mail-send-recv.c:578
 msgid "Waiting..."
 msgstr "En espera..."
 
-#: ../mail/mail-send-recv.c:799
+#: ../mail/mail-send-recv.c:804
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando o correo novo"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduza a frase de paso para %s"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "Introduza a frase de paso"
 
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:212
+#: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "Introduza o seu contrasinal"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operación."
 
@@ -15928,79 +15980,79 @@ msgstr "_Expurgar"
 msgid "_Open Messages"
 msgstr "_Abrir mensaxes"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Unseen"
 msgstr "Non vista"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Seen"
 msgstr "Vista"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Forwarded"
 msgstr "Reenviada"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1057
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensaxes non vistas"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1058
 msgid "Multiple Messages"
 msgstr "Múltiples mensaxes"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1062
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1063
 msgid "Lower"
 msgstr "Inferior"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1067
 msgid "Higher"
 msgstr "Superior"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1068
 msgid "Highest"
 msgstr "A máis alta"
 
-#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1657 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1664 ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %l:%M %p"
 
-#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1673 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %l:%M %p"
 
-#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1685 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "O %A ás %k:%M"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1695 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3916 ../mail/message-list.c:4373
+#: ../mail/message-list.c:3978 ../mail/message-list.c:4438
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
-#: ../mail/message-list.c:4223
+#: ../mail/message-list.c:4286
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -16008,7 +16060,7 @@ msgstr ""
 "Non hai mensaxes que coincidan cos seus criterios de busca. Probe a limpar a "
 "busca co elemento Limpar do menú Buscar ou cámbiea."
 
-#: ../mail/message-list.c:4225
+#: ../mail/message-list.c:4288
 msgid "There are no messages in this folder."
 msgstr "Non hai mensaxes para amosar neste cartafol."
 
@@ -16041,6 +16093,11 @@ msgstr "Mensaxes enviadas"
 msgid "Size"
 msgstr "Tamaño"
 
+#: ../mail/message-list.etspec.h:19
+#, fuzzy
+msgid "Subject - Trimmed"
+msgstr "Campo _Asunto"
+
 #: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Chamar"
@@ -16129,8 +16186,8 @@ msgstr ""
 "Lista de pistas para que o plugin de recordatorio de anexos busque no corpo "
 "dunha mensaxe."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:474
-#: ../plugins/templates/templates.c:394
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/templates/templates.c:392
 msgid "Keywords"
 msgstr "Palabras clave"
 
@@ -16166,10 +16223,10 @@ msgstr "_Editar a mensaxe"
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
+"play them directly from Evolution."
 msgstr ""
 "Un plugin de formato que mostra os anexos de son en liña e permite "
-"reproducilos directamente desde o evolution."
+"reproducilos directamente desde o Evolution."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
@@ -16403,39 +16460,39 @@ msgstr "Configuracións de r_estauración..."
 msgid "_Backup Settings..."
 msgstr "_Configuracións de copia de seguranza..."
 
-#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactos automáticos"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:567
+#: ../plugins/bbdb/bbdb.c:639
 msgid "_Auto-create address book entries when replying to messages"
 msgstr ""
 "Crear entradas _automaticamente na axenda de enderezos ao responder a "
 "mensaxes"
 
-#: ../plugins/bbdb/bbdb.c:573
+#: ../plugins/bbdb/bbdb.c:645
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccione a axenda de enderezos para contactos automáticos"
 
-#: ../plugins/bbdb/bbdb.c:588
+#: ../plugins/bbdb/bbdb.c:660
 msgid "Instant Messaging Contacts"
 msgstr "Mensaxe instantánea de contactos"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:603
+#: ../plugins/bbdb/bbdb.c:675
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Sincronizar información e as imaxes de contacto desde a lista de amigos do "
 "Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:609
+#: ../plugins/bbdb/bbdb.c:681
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Seleccione a axenda de enderezos para a lista de amigos do Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:620
+#: ../plugins/bbdb/bbdb.c:692
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar coa lista de _amigos agora"
 
@@ -16652,19 +16709,19 @@ msgstr ""
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:81
+#: ../plugins/default-source/default-source.c:82
 msgid "Mark as _default address book"
 msgstr "Marcar como axenda de enderezos _predeterminado"
 
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default calendar"
 msgstr "Marcar como calendario _predeterminado"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:104
 msgid "Mark as _default task list"
 msgstr "Marcar como lista de tarefas _predeterminada"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default memo list"
 msgstr "Marcar como lista de notas _predeterminada"
 
@@ -16680,16 +16737,16 @@ msgstr ""
 "Proporciona funcionalidade para marcar calendarios ou axendas de enderezos "
 "como opción predeterminada."
 
-#: ../plugins/email-custom-header/email-custom-header.c:558
+#: ../plugins/email-custom-header/email-custom-header.c:560
 msgid "_Custom Header"
 msgstr "_Cabeceira personalizada"
 
-#: ../plugins/email-custom-header/email-custom-header.c:879
+#: ../plugins/email-custom-header/email-custom-header.c:881
 msgid "Key"
 msgstr "Chave"
 
-#: ../plugins/email-custom-header/email-custom-header.c:890
-#: ../plugins/templates/templates.c:400
+#: ../plugins/email-custom-header/email-custom-header.c:892
+#: ../plugins/templates/templates.c:398
 msgid "Values"
 msgstr "Valores"
 
@@ -16748,12 +16805,12 @@ msgid "_User:"
 msgstr "_Usuario:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:61
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
 msgid "Secure Password"
 msgstr "Contrasinal seguro"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:64
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -16761,11 +16818,11 @@ msgstr ""
 "Esta opción conectará co servidor Exchange usando unha autenticación de "
 "contrasinal segura (NTLM)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "Contrasinal de texto plano"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -16773,11 +16830,11 @@ msgstr ""
 "Esta opción conectará co servidor Exchange usando unha autenticación "
 "estándar de texto plano."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:257
 msgid "Out Of Office"
 msgstr "Fóra da oficina"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:264
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16785,88 +16842,88 @@ msgstr ""
 "A mensaxe especificada abaixo enviarase automaticamente a cada\n"
 "persoa que lle envíe correo mentres está fóra da oficina."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:281
 msgid "I am out of the office"
 msgstr "Estou fóra da oficina"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:280
 msgid "I am in the office"
 msgstr "Estou na oficina"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 msgid "Change the password for Exchange account"
 msgstr "Modificar o contrasinal para a conta do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:330
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Cambiar contrasinal"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Xestione a configuración dos delegados para a conta Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:337
 msgid "Delegation Assistant"
 msgstr "Asistente de delegacións"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Miscelleneous"
 msgstr "Varios"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "View the size of all Exchange folders"
 msgstr "Ver o tamaño de todos os cartafoles Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Folders Size"
 msgstr "Tamaño dos cartafoles"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:368
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Configuración do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
+#: ../plugins/exchange-operations/exchange-account-setup.c:690
 msgid "_OWA URL:"
 msgstr "URL _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
+#: ../plugins/exchange-operations/exchange-account-setup.c:716
 msgid "A_uthenticate"
 msgstr "A_utenticar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#: ../plugins/exchange-operations/exchange-account-setup.c:737
 msgid "_Mailbox:"
 msgstr "_Caixa de correo:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:938
 msgid "_Authentication Type"
 msgstr "Tipo de _autenticación"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
+#: ../plugins/exchange-operations/exchange-account-setup.c:952
 msgid "Ch_eck for Supported Types"
 msgstr "_Verificar tipos soportados"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1062
-#: ../plugins/exchange-operations/exchange-contacts.c:212
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
+#: ../plugins/exchange-operations/exchange-contacts.c:213
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1064
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-account-setup.c:1066
+#: ../plugins/exchange-operations/exchange-contacts.c:215
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#: ../plugins/exchange-operations/exchange-calendar.c:192
+#: ../plugins/exchange-operations/exchange-contacts.c:166
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -16906,38 +16963,38 @@ msgstr "Novo contrasinal:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "O seu contrasinal actual caducou. Cambie o seu contrasinal agora."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:660
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "O contrasinal caducará nos seguintes %d días"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:152
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
+#: ../plugins/exchange-operations/exchange-delegates-user.c:154
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates-user.c:184
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Editor (ler, crear, editar)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates-user.c:188
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Autor (ler, crear)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Revisor (só de lectura)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Delegar permisos"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:251
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
+#: ../plugins/exchange-operations/exchange-delegates-user.c:253
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "Permisos para %s"
@@ -16945,7 +17002,7 @@ msgstr "Permisos para %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:341
+#: ../plugins/exchange-operations/exchange-delegates-user.c:343
 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."
@@ -16955,66 +17012,66 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
 msgid "You have been given the following permissions on my folders:"
 msgstr "Fóronlle concedidos os seguintes permisos nos meus cartafoles:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:364
+#: ../plugins/exchange-operations/exchange-delegates-user.c:366
 msgid "You are also permitted to see my private items."
 msgstr "Vostede tamén pode ver os meus elementos privados."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
 msgid "However you are not permitted to see my private items."
 msgstr "Sen embargo non lle está permitido ver os meus elementos privados."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Foi designado como delegado para %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:415
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "Delegar en"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:580
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Eliminar o delegado %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:698
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "Non se puido acceder ao Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:710
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr "Non puido localizarse a si mesmo no Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:723
+#: ../plugins/exchange-operations/exchange-delegates.c:725
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Non se puido localizar o delegado %s no Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:735
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Non se puido eliminar o delegado %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "Non se puido actualizar a lista de delegados."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:813
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Non se puido engadir o delegado %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:981
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
 msgstr "Erro ao ler a lista de delegados."
 
@@ -17067,11 +17124,11 @@ msgstr "_Tarefas:"
 msgid "Permissions..."
 msgstr "Permisos..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "Nome do cartafol"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "Tamaño do cartafol"
 
@@ -17089,20 +17146,20 @@ msgstr "Subscribirse ao cartafol doutro usuario"
 msgid "Exchange Folder Tree"
 msgstr "�rbore de cartafol do Exchange"
 
-#: ../plugins/exchange-operations/exchange-folder.c:65
-#: ../plugins/exchange-operations/exchange-folder.c:234
-#: ../plugins/exchange-operations/exchange-folder.c:244
+#: ../plugins/exchange-operations/exchange-folder.c:67
+#: ../plugins/exchange-operations/exchange-folder.c:236
+#: ../plugins/exchange-operations/exchange-folder.c:246
 msgid "Unsubscribe Folder..."
 msgstr "Eliminar subscrición do cartafol..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:519
+#: ../plugins/exchange-operations/exchange-folder.c:466
+#: ../plugins/exchange-operations/exchange-folder.c:521
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Está seguro de que quere eliminar subscrición do cartafol \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:531
+#: ../plugins/exchange-operations/exchange-folder.c:478
+#: ../plugins/exchange-operations/exchange-folder.c:533
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Eliminar subscrición de \"%s\""
@@ -17167,18 +17224,18 @@ msgstr "O seu contrasinal caducará en 7 días..."
 msgid "_Change Password"
 msgstr "_Cambiar contrasinal"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(Permiso denegado.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "Engadir usuario:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
-#: ../plugins/exchange-operations/exchange-send-options.c:408
-#: ../plugins/groupwise-features/proxy.c:934
-#: ../plugins/groupwise-features/share-folder.c:715
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-send-options.c:410
+#: ../plugins/groupwise-features/proxy.c:937
+#: ../plugins/groupwise-features/share-folder.c:716
 msgid "Add User"
 msgstr "Engadir usuario"
 
@@ -17296,11 +17353,11 @@ msgstr "_Sensibilidade: "
 msgid "_User"
 msgstr "_Usuario"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:138
+#: ../plugins/exchange-operations/exchange-user-dialog.c:136
 msgid "Select User"
 msgstr "Seleccionar usuario"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+#: ../plugins/exchange-operations/exchange-user-dialog.c:174
 msgid "Address Book..."
 msgstr "Axenda de enderezos..."
 
@@ -17756,10 +17813,6 @@ msgstr ""
 "gardarase en ~/.evolution/faces. A imaxe usarase nas mensaxes que se envíen "
 "a partir dese momento."
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "Cara"
-
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -17821,28 +17874,28 @@ msgid "<b>Server</b>"
 msgstr "<b>Servidor</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar and contacts."
+msgid "A plugin to setup Google Calendar and Contacts."
 msgstr "Un plugin para configurar o calendario e contactos de Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Fontes de Google"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "Lista de verificación"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
+msgid "A plugin to setup GroupWise calendar and contacts sources."
 msgstr ""
 "Un complemento para configurar as fontes de calendario e contactos do "
 "Groupwise."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
-msgstr "Configuración da conta Groupwise"
+msgid "GroupWise Account Setup"
+msgstr "Configuración da conta GroupWise"
 
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17867,24 +17920,24 @@ msgstr ""
 "Prema en 'adiante' para instalar o cartafol compartido\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:225
 msgid "Install the shared folder"
 msgstr "Instalar o cartafol compartido"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:227
 msgid "Shared Folder Installation"
 msgstr "Instalación de cartafol compartido"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "Configuración de correo non desexado"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-mail-settings.c:93
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 msgid "Junk Mail Settings"
 msgstr "Configuración de correo non desexado"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "Configuración do correo non desexado..."
 
@@ -17897,7 +17950,7 @@ msgid "Email:"
 msgstr "Correo electrónico:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "_Desactivar"
 
@@ -17930,16 +17983,16 @@ msgid "Retract Mail"
 msgstr "Anular correo"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to groupwise messages"
-msgstr "Engadir opcións de envío ás mensaxes de Groupwise"
+msgid "Add Send Options to GroupWise messages"
+msgstr "Engadir opcións de envío ás mensaxes de GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
-msgstr "Un plugin para as características nas contas Groupwise."
+msgid "A plugin for the features in GroupWise accounts."
+msgstr "Un plugin para as características nas contas GroupWise."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
-msgstr "Características do Groupwise"
+msgid "GroupWise Features"
+msgstr "Características do GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
 msgid "Message retract failed"
@@ -17955,20 +18008,23 @@ msgstr "O servidor non permite que se anule a mensaxe seleccionada."
 msgid "Invalid user"
 msgstr "Usuario non válido"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#. 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-errors.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "Non se pode dar acceso ao Proxy ao usuario &quot;{0}&quot;"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
 msgid "Specify User"
 msgstr "Especificar usuario"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#. 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-errors.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "Xa lle dera permisos a este usuario para acceder ao proxy."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+#. 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-errors.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr ""
 "Ten que especificar un nome de usuario válido para darlle acceso ao proxy."
@@ -17993,20 +18049,22 @@ msgstr ""
 msgid "This is a recurring meeting"
 msgstr "Este é un evento recorrente"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 msgid "Would you like to accept it?"
 msgstr "Quere aceptalo?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "Would you like to decline it?"
 msgstr "Quere descartalo?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 msgstr "Non pode compartir o cartafol co usuario especificado &quot;{0}&quot;"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
-msgid "You have to specify a user name whom you want to add to the list"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+msgid "You have to specify a user name which you want to add to the list"
 msgstr "Ten que especificar o nome do usuario que quere engadir á lista"
 
 #: ../plugins/groupwise-features/process-meeting.c:52
@@ -18026,7 +18084,7 @@ msgid "Con_tacts..."
 msgstr "Con_tactos..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/table/e-table-click-to-add.c:516
 msgid "Message"
 msgstr "Mensaxe"
 
@@ -18107,10 +18165,10 @@ msgstr "<b>Nome da conta</b>"
 msgid "Proxy Login"
 msgstr "Iniciar sesión no proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
 #: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:83
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s Introduza o seu contrasinal para %s (usuario %s)"
@@ -18118,21 +18176,27 @@ msgstr "%s Introduza o seu contrasinal para %s (usuario %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:509
+#: ../plugins/groupwise-features/proxy-login.c:510
 msgid "_Proxy Login..."
 msgstr "Iniciar sesión no _proxy..."
 
-#: ../plugins/groupwise-features/proxy.c:691
+#. 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:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "O separador do proxy estará dispoñible só cando a conta estea en liña."
 
-#: ../plugins/groupwise-features/proxy.c:696
+#. 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:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "O separador do proxy estará dispoñible só cando a conta estea activada."
 
+#: ../plugins/groupwise-features/send-options.c:215
+msgid "Advanced send options"
+msgstr "Opcións avanzadas de envío"
+
 #: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:750
+#: ../plugins/groupwise-features/share-folder.c:751
 msgid "Users"
 msgstr "Usuarios"
 
@@ -18148,68 +18212,68 @@ msgstr "Novo cartafol _compartido..."
 msgid "Sharing"
 msgstr "Compartir"
 
-#: ../plugins/groupwise-features/share-folder.c:533
+#: ../plugins/groupwise-features/share-folder.c:534
 msgid "Custom Notification"
 msgstr "Notificación personalizada"
 
-#: ../plugins/groupwise-features/share-folder.c:755
+#: ../plugins/groupwise-features/share-folder.c:756
 msgid "Add   "
 msgstr "Engadir   "
 
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:762
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../plugins/groupwise-features/status-track.c:105
+#: ../plugins/groupwise-features/status-track.c:107
 msgid "Message Status"
 msgstr "Estado da mensaxe"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:119
+#: ../plugins/groupwise-features/status-track.c:121
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: ../plugins/groupwise-features/status-track.c:133
+#: ../plugins/groupwise-features/status-track.c:135
 msgid "From:"
 msgstr "De:"
 
-#: ../plugins/groupwise-features/status-track.c:148
+#: ../plugins/groupwise-features/status-track.c:150
 msgid "Creation date:"
 msgstr "Data de creación:"
 
-#: ../plugins/groupwise-features/status-track.c:187
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:196
 msgid "Delivered: "
 msgstr "Entregado: "
 
-#: ../plugins/groupwise-features/status-track.c:200
+#: ../plugins/groupwise-features/status-track.c:202
 msgid "Opened: "
 msgstr "Aberto: "
 
-#: ../plugins/groupwise-features/status-track.c:205
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Accepted: "
 msgstr "Aceptado: "
 
-#: ../plugins/groupwise-features/status-track.c:210
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Deleted: "
 msgstr "Eliminada: "
 
-#: ../plugins/groupwise-features/status-track.c:215
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Declined: "
 msgstr "Rexeitada: "
 
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:222
 msgid "Completed: "
 msgstr "Terminado: "
 
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:227
 msgid "Undelivered: "
 msgstr "Non entregado: "
 
-#: ../plugins/groupwise-features/status-track.c:249
+#: ../plugins/groupwise-features/status-track.c:251
 msgid "Track Message Status..."
 msgstr "Seguir o estado da mensaxe..."
 
@@ -18279,27 +18343,27 @@ msgstr "Un plugin para as características nas contas IMAP."
 msgid "IMAP Features"
 msgstr "Características IMAP"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:77
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "_Importar ao calendario"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "_Importar ás tarefas"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:200
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "Importar ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:223
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "Seleccionar lista de tarefas"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:227
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "Seleccionar calendario"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../plugins/import-ics-attachments/icsimporter.c:260
 #: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "_Importar"
@@ -18313,11 +18377,11 @@ msgstr "Importar ao calendario"
 msgid "Imports ICS attachments to calendar."
 msgstr "Importa anexos ICS ao calendario."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "Non se cargou a capa de abstracción de hardware"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -18326,11 +18390,11 @@ msgstr ""
 "servizo e volva a executar este programa ou contacte co seu administrador do "
 "sistema."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
 msgid "Search for an iPod failed"
 msgstr "Fallou a busca dun iPod"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
 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."
@@ -18338,8 +18402,8 @@ msgstr ""
 "O Evolution non puido encontrar un iPod co que sincronizarse. Ou o iPod non "
 "está conectado ao sistema ou non está encendido."
 
-#: ../plugins/ipod-sync/ical-format.c:118
-#: ../plugins/save-calendar/ical-format.c:163
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
 msgid "iCalendar format (.ics)"
 msgstr "Formato iCalendar (.ics)"
 
@@ -18531,23 +18595,23 @@ msgstr "Esta nota repítese"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2388
 msgid "_Delete message after acting"
 msgstr "E_liminar a mensaxe despois de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2398
+#: ../plugins/itip-formatter/itip-formatter.c:2430
 msgid "Conflict Search"
 msgstr "Buscar conflito"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2413
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione os calendarios nos que buscar conflitos entre reunións"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:299
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "Hoxe"
 
@@ -19007,11 +19071,11 @@ msgstr "_Aplicar a todas as instancias"
 msgid "Show time as _free"
 msgstr "Mostrar hora como _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1870
 msgid "_Tasks :"
 msgstr "_Tarefas :"
 
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1872
 msgid "Memos :"
 msgstr "Notas :"
 
@@ -19041,7 +19105,7 @@ msgstr ""
 "Esta resposta non é dun participante actual. Quere engadir o remitente como "
 "un participante?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr "_Terminar a sesión proxy"
 
@@ -19128,20 +19192,20 @@ msgstr ""
 "Indica se se deben notificar só as mensaxes no cartafol da bandeixa de "
 "entrada."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "Xerar unha mensaxe _D-Bus"
 
-#: ../plugins/mail-notification/mail-notification.c:377
+#: ../plugins/mail-notification/mail-notification.c:378
 msgid "Evolution's Mail Notification"
 msgstr "Notificación de correo de Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:399
 msgid "Mail Notification Properties"
 msgstr "Propiedades da notificación de correo"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19156,55 +19220,55 @@ msgstr[1] ""
 "Recibiu %d mensaxes novas\n"
 "en %s."
 
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../plugins/mail-notification/mail-notification.c:463
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Recibiu %d mensaxe nova."
 msgstr[1] "Recibiu %d mensaxes novas."
 
-#: ../plugins/mail-notification/mail-notification.c:479
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:480
+#: ../plugins/mail-notification/mail-notification.c:485
 msgid "New email"
 msgstr "Novo correo"
 
-#: ../plugins/mail-notification/mail-notification.c:541
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "Show icon in _notification area"
 msgstr "Mostrar icona na área de _notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:547
 msgid "B_link icon in notification area"
 msgstr "_Facer intermitencia a icona na área de notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:549
 msgid "Popup _message together with the icon"
 msgstr "_Mensaxe emerxente xunto coa icona"
 
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:730
 msgid "_Play sound when new messages arrive"
 msgstr "Reproducir un ficheiro de son ao  _chegar correo novo"
 
-#: ../plugins/mail-notification/mail-notification.c:733
+#: ../plugins/mail-notification/mail-notification.c:736
 msgid "_Beep"
 msgstr "_Ton de aviso"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:737
 msgid "Play _sound file"
 msgstr "Reproducir un ficheiro de _son"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Specify _filename:"
 msgstr "Especificar o nome de _ficheiro:"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:749
 msgid "Select sound file"
 msgstr "Seleccionar un ficheiro de son"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:750
 msgid "Pl_ay"
 msgstr "_Reproducir"
 
-#: ../plugins/mail-notification/mail-notification.c:804
+#: ../plugins/mail-notification/mail-notification.c:807
 msgid "Notify new messages for _Inbox only"
 msgstr "Notificar novas mensaxes só para a _bandexa de entrada"
 
@@ -19502,7 +19566,7 @@ msgstr "Plugin para xestionar que plugins están activados ou desactivados."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:236
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "Xestor de plugin"
 
@@ -19514,24 +19578,24 @@ msgstr "Activar e desactivar plugins"
 msgid "_Plugins"
 msgstr "_Plugins"
 
-#: ../plugins/plugin-manager/plugin-manager.c:42
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "Autor(es)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:130
+#: ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "Configuración"
 
-#: ../plugins/plugin-manager/plugin-manager.c:249
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Nota: algunhas modificacións non serán efectivas até que reinicie"
 
-#: ../plugins/plugin-manager/plugin-manager.c:275
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "Vista xeral"
 
-#: ../plugins/plugin-manager/plugin-manager.c:346
-#: ../plugins/plugin-manager/plugin-manager.c:408
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -19556,19 +19620,19 @@ msgstr "Modo de texto plano"
 msgid "Prefer plain-text"
 msgstr "Preferir texto plano"
 
-#: ../plugins/prefer-plain/prefer-plain.c:174
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "Mostrar HTML se está presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:175
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "Preferir PLANO"
 
-#: ../plugins/prefer-plain/prefer-plain.c:176
+#: ../plugins/prefer-plain/prefer-plain.c:193
 msgid "Only ever show PLAIN"
 msgstr "Mostrar só PLANO"
 
-#: ../plugins/prefer-plain/prefer-plain.c:219
+#: ../plugins/prefer-plain/prefer-plain.c:236
 msgid "HTML _Mode"
 msgstr "Modo _HTML"
 
@@ -19596,9 +19660,9 @@ msgstr "Localizacións"
 msgid "_Publish Calendar Information"
 msgstr "_Publicar información do calendario"
 
-#: ../plugins/publish-calendar/publish-calendar.c:595
-msgid "Are you sure you want to remove this URL?"
-msgstr "Está seguro de que quere eliminar este URL?"
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "Are you sure you want to remove this location?"
+msgstr "Está seguro de que quere eliminar esta localización?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
@@ -19635,8 +19699,9 @@ msgid "Publishing _Frequency:"
 msgstr "_Frecuencia da publicación:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
+#, fuzzy
 msgid ""
-"SSH\n"
+"Secure FTP (SSH)\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -19701,59 +19766,59 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Probar o complemento para o cargador Python EPlugin."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using python."
+msgid "A plugin which loads other plugins written using Python."
 msgstr "Un complemento que carga outros complementos escritos en Python."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
 msgstr "Cargador de Python"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (integrado)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "Non se atopou SpamAssassin, código: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Fallo ao crear a canalización: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Erro despois de bifurcar: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "O proceso fillo de SpamAssasin non está respondendo, matándoo..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
 #, c-format
-msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr ""
-"Espere a que o proceso fillo de SpamAssasin se interrompa, rematanado..."
+"Espere a que o proceso fillo de SpamAssasin se interrompa, rematando..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Fallou a tubería cara SpamAssasin, código de erro: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "SpamAssassin non está dispoñible."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Isto fará que o SpamAssasin sexa máis fiable, aínda que máis lento"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 msgid "I_nclude remote tests"
 msgstr "I_ncluír probas remotas"
 
@@ -19766,12 +19831,12 @@ msgstr ""
 "require que se instale o SpamAssassin."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "Plugin de correo non desexado SpamAssassin"
+msgid "SpamAssassin Options"
+msgstr "Opcións de SpamAssassin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "Opcións de SpamAssassin"
+msgid "SpamAssassin junk plugin"
+msgstr "Plugin de correo non desexado SpamAssassin"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -19780,7 +19845,7 @@ msgstr ""
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:314
+#: ../plugins/save-attachments/save-attachments.c:315
 msgid "Save attachments"
 msgstr "Gardar anexos"
 
@@ -19792,15 +19857,15 @@ msgstr "Gardar anexos..."
 msgid "Save all attachments"
 msgstr "Gardar todos os anexos"
 
-#: ../plugins/save-attachments/save-attachments.c:320
+#: ../plugins/save-attachments/save-attachments.c:321
 msgid "Select save base name"
 msgstr "Seleccionar un nome base para gardar"
 
-#: ../plugins/save-attachments/save-attachments.c:339
+#: ../plugins/save-attachments/save-attachments.c:340
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:347
+#: ../plugins/save-attachments/save-attachments.c:348
 msgid "Save"
 msgstr "Gardar"
 
@@ -19808,79 +19873,79 @@ msgstr "Gardar"
 #. * 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:162
+#: ../plugins/save-calendar/csv-format.c:163
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "Lista de descrición"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "Lista de categorías"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "Lista de comentarios"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "Creado"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "Lista de contactos"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "Comezar"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "Finalizar"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "porcentaxe feita"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "Lista de participantes"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../plugins/save-calendar/csv-format.c:531
+#: ../plugins/save-calendar/csv-format.c:532
 msgid "Advanced options for the CSV format"
 msgstr "Opcións avanzadas para o formato CSV"
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Prepend a header"
 msgstr "Antepor unha cabeceira"
 
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:548
 msgid "Value delimiter:"
 msgstr "Delimitador de valor:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:554
 msgid "Record delimiter:"
 msgstr "Delimitador de rexistro:"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "Encapsulate values with:"
 msgstr "Encapsular valores con:"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "Formato de valores separados por comas (.csv)"
 
@@ -19901,15 +19966,15 @@ msgstr "Gardar no _disco"
 #. * 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:149
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:376
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:160
+#: ../plugins/save-calendar/save-calendar.c:161
 msgid "Select destination file"
 msgstr "Seleccione ficheiro de destino"
 
@@ -19941,15 +20006,15 @@ msgstr "Guíalle pola súa configuración da conta inicial."
 msgid "Setup Assistant"
 msgstr "Asistente de configuración"
 
-#: ../plugins/startup-wizard/startup-wizard.c:83
+#: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "Asistente de configuración do Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:86
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "Benvido"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -19962,28 +20027,28 @@ msgstr ""
 "\n"
 "Prema o botón \"Adiante\" para continuar. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:133
+#: ../plugins/startup-wizard/startup-wizard.c:135
 msgid "Importing files"
 msgstr "Importar ficheiros"
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:137
 #: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccione a información que quere importar:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../plugins/startup-wizard/startup-wizard.c:152
 #: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "De: %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:232
 #: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Importando datos."
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:234
 #: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Espere"
@@ -20013,15 +20078,15 @@ msgstr ""
 "Lista de pares de palabras chave e valores para o plugin de Modelos para "
 "substituír no corpo dunha mensaxe."
 
-#: ../plugins/templates/templates.c:614
+#: ../plugins/templates/templates.c:613
 msgid "No title"
 msgstr "Sen título"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:741
 msgid "Save as _Template"
 msgstr "Gardar como _modelo"
 
-#: ../plugins/templates/templates.c:745
+#: ../plugins/templates/templates.c:743
 msgid "Save as Template"
 msgstr "Gardar como modelo"
 
@@ -20030,12 +20095,12 @@ msgid "Drafts based template plugin"
 msgstr "Borradores baseados no plugin de modelos"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses ytnef to decode tnef attachments."
-msgstr "Un complemento sinxelo que usa ytnef para decodificar adxuntos TNEF."
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+msgstr "Un complemento sinxelo que usa yTNEF para decodificar anexos TNEF."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Attachment decoder"
-msgstr "Decodificador de adxuntos TNEF"
+msgstr "Decodificador de anexos TNEF"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
 msgid "A plugin to setup WebDAV contacts."
@@ -20056,7 +20121,7 @@ msgid "URL:"
 msgstr "URL:"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
-msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Evitar IfMatch (necesario en apache < 2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -20410,7 +20475,7 @@ msgstr "Importar datos e configuración de programas _antigos"
 msgid "Import a _single file"
 msgstr "Importar un úni_co ficheiro"
 
-#: ../shell/e-shell-settings-dialog.c:314
+#: ../shell/e-shell-settings-dialog.c:313
 msgid "Evolution Preferences"
 msgstr "Preferencias do Evolution"
 
@@ -20442,29 +20507,29 @@ msgstr "Non foi posible executar o Bug buddy."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:729
+#: ../shell/e-shell-window-commands.c:942
 msgid "translator-credits"
 msgstr ""
 "Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
 "Proxecto Trasno"
 
-#: ../shell/e-shell-window-commands.c:740
+#: ../shell/e-shell-window-commands.c:953
 msgid "Evolution Website"
 msgstr "Sitio web do Evolution"
 
-#: ../shell/e-shell-window-commands.c:758
+#: ../shell/e-shell-window-commands.c:971
 msgid "Error opening the FAQ webpage."
 msgstr "Erro ao abrir a páxina web coas FAQ."
 
-#: ../shell/e-shell-window-commands.c:955
+#: ../shell/e-shell-window-commands.c:1168
 msgid "_Work Online"
 msgstr "_Traballar con conexión"
 
-#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1181 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Traballar sen conexión"
 
-#: ../shell/e-shell-window-commands.c:981
+#: ../shell/e-shell-window-commands.c:1194
 msgid "Work Offline"
 msgstr "Traballar sen conexión"
 
@@ -20502,7 +20567,7 @@ msgstr "Erro de sistema descoñecido."
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:315
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "Aceptar"
 
@@ -20672,18 +20737,22 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Está seguro de que quere esquecer todos os contrasinais memorizados?"
 
 #: ../shell/shell.error.xml.h:2
+msgid "Cannot start Evolution"
+msgstr "Non se pode iniciar Evolution"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "Eliminar os datos antigos da versión {0}?"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "O Evolution non pode iniciar."
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:6
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -20691,15 +20760,15 @@ msgstr ""
 "Ao esquecer os seus contrasinais memorizados eliminará todos os contrasinais "
 "gardados. Volveránselle preguntar a próxima vez que sexan necesarios."
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "Espazo en disco insuficiente para a actualización."
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "Está seguro de que quere eliminar os datos antigos?"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -20721,9 +20790,9 @@ msgstr ""
 "Unha vez eliminados, non poderá desactualizarse á versión anterior do "
 "Evolution sen intervención manual.\n"
 
-#: ../shell/shell.error.xml.h:15
+#: ../shell/shell.error.xml.h:16
 msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+"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 "
@@ -20738,11 +20807,11 @@ msgstr ""
 "despois pode eliminar manualmente o contido de &quot;evolution&quot; á súa "
 "conveniencia.\n"
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "A actualización desde a versión anterior fallou: {0}"
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:21
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -20756,7 +20825,7 @@ msgstr ""
 "Necesitará facer máis espazo dispoñible no seu cartafol persoal antes de que "
 "poida continuar."
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -20766,7 +20835,7 @@ msgstr ""
 "\n"
 "Prema en axuda para máis detalles"
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -20780,19 +20849,19 @@ msgstr ""
 "\n"
 "Prema na axuda para máis detalles."
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "_Esquecer"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "_Conservar os datos"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "_Avisarme máis tarde"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
@@ -20883,22 +20952,22 @@ msgstr "Enderezo de correo electrónico"
 msgid "All CA certificate files"
 msgstr "Todos os ficheiros CA de certificación de correo"
 
-#: ../smime/gui/certificate-viewer.c:339
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualizador de certificados: %s"
 
-#: ../smime/gui/component.c:47
+#: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Introduza o seu contrasinal para `%s'"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:69
 msgid "Enter new password for certificate database"
 msgstr "Introduza o seu contrasinal para a base de datos de certificados"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "Introduza un contrasinal novo"
 
@@ -21276,15 +21345,15 @@ msgstr "ID único do asunto"
 msgid "Certificate Signature Value"
 msgstr "Valor da sinatura do certificado"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "PKCS12 File Password"
 msgstr "Contrasinal para o ficheiro PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "Enter password for PKCS12 file:"
 msgstr "Introduza un contrasinal para o ficheiro PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:343
 msgid "Imported Certificate"
 msgstr "Certificado importado"
 
@@ -21554,7 +21623,7 @@ msgid "Month"
 msgstr "Mes"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:196
+#: ../widgets/misc/e-calendar.c:195
 msgid "Next"
 msgstr "Seguinte"
 
@@ -21563,7 +21632,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Previsualiza o calendario que se vai imprimir"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:172
+#: ../widgets/misc/e-calendar.c:171
 msgid "Previous"
 msgstr "Anterior"
 
@@ -22730,7 +22799,7 @@ msgstr ""
 "Use o botón dereito para reducir."
 
 #: ../widgets/menus/gal-define-views-dialog.c:76
-#: ../widgets/menus/gal-define-views-model.c:186
+#: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "Colección"
 
@@ -22752,16 +22821,16 @@ msgstr "Definir visualizacións para \"%s\""
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
 #: ../widgets/table/e-table-header-item.c:1922
+#: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
-#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Táboa"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
 msgid "Instance"
 msgstr "Instancia"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Gardar visualización actual"
 
@@ -22775,7 +22844,7 @@ msgstr "_Substituír visualización existente"
 
 #. bonobo displays this string so it must be in locale
 #: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:354
+#: ../widgets/menus/gal-view-menus.c:368
 msgid "Custom View"
 msgstr "Visualización personalizada"
 
@@ -22784,32 +22853,32 @@ msgid "Save Custom View"
 msgstr "Gardar visualización personalizada"
 
 #: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:392
 msgid "Define Views..."
 msgstr "Definir visualizacións..."
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "Visualización act_ual"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
 msgstr "Seleccionar visualización: %s"
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:373
 msgid "Current view is a customized view"
 msgstr "A visualización actual é unha visualización personalizada"
 
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Save Custom View..."
 msgstr "Gardar visualización personalizada..."
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
 msgstr "Gardar a visualización personalizada actual"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
 msgstr "Crear ou editar visualizacións"
 
@@ -22837,13 +22906,13 @@ msgstr "Tipo de visualización:"
 msgid "Attachment Bar"
 msgstr "Barra de anexos"
 
-#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Non se pode anexar o ficheiro %s: %s"
 
-#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Non se pode anexar o ficheiro %s: non é un ficheiro normal"
@@ -22865,231 +22934,231 @@ msgid "Suggest automatic display of attachment"
 msgstr "Suxerir que se mostre o anexo automaticamente"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1273
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%B de %Y"
 
-#: ../widgets/misc/e-calendar.c:221
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "Calendario mensual"
 
-#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3643
 #: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "Encher con cor"
 
-#: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3650
 #: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
 #: ../widgets/text/e-text.c:3659
 msgid "GDK fill color"
 msgstr "Encher con cor GDK"
 
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3665
 #: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "Encher con liña punteada"
 
-#: ../widgets/misc/e-canvas-background.c:481
 #: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:488
 #: ../widgets/misc/e-canvas-background.c:489
+#: ../widgets/misc/e-canvas-background.c:490
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:495
 #: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:497
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:502
 #: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:504
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/table/e-table-group-container.c:999
 #: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3074
+#: ../widgets/table/e-table-item.c:3070
 msgid "Minimum width"
 msgstr "Largura mínima"
 
-#: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/table/e-table-group-container.c:1000
 #: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3075
+#: ../widgets/table/e-table-item.c:3071
 msgid "Minimum Width"
 msgstr "Largura mínima"
 
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:204
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "Espazamento"
 
-#: ../widgets/misc/e-cell-date-edit.c:291
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "Agora"
 
-#: ../widgets/misc/e-cell-date-edit.c:848
+#: ../widgets/misc/e-cell-date-edit.c:847
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A data ten que ser introducida no formato: %s"
 
-#: ../widgets/misc/e-cell-percent.c:79
+#: ../widgets/misc/e-cell-percent.c:78
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "A porcentaxe ten que ser un valor entre 0 e 100, incluídos"
 
-#: ../widgets/misc/e-charset-picker.c:56
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
 msgstr "�rabe"
 
-#: ../widgets/misc/e-charset-picker.c:57
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Báltico"
 
-#: ../widgets/misc/e-charset-picker.c:58
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Centroeuropeo"
 
-#: ../widgets/misc/e-charset-picker.c:59
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Chinés"
 
-#: ../widgets/misc/e-charset-picker.c:60
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: ../widgets/misc/e-charset-picker.c:61
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Grego"
 
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "Xaponés"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "Tailandés"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "Europeo occidental"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "Europeo occidental, novo"
 
-#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
-#: ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "Tradicional"
 
-#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
-#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
 msgid "Simplified"
 msgstr "Simplificado"
 
-#: ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "Ucraíno"
 
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "Visual"
 
-#: ../widgets/misc/e-charset-picker.c:169
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Conxunto de caracteres descoñecido: %s"
 
-#: ../widgets/misc/e-charset-picker.c:214
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "Codificación dos caracteres"
 
-#: ../widgets/misc/e-charset-picker.c:229
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "Introduza o conxunto de caracteres que se vai usar"
 
-#: ../widgets/misc/e-charset-picker.c:336
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "Outro..."
 
-#: ../widgets/misc/e-charset-picker.c:598
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "Codificación dos car_acteres"
 
-#: ../widgets/misc/e-dateedit.c:309
+#: ../widgets/misc/e-dateedit.c:305
 msgid "Date and Time"
 msgstr "Data e hora"
 
-#: ../widgets/misc/e-dateedit.c:330
+#: ../widgets/misc/e-dateedit.c:326
 msgid "Text entry to input date"
 msgstr "Entrada de texto para introducir a data"
 
-#: ../widgets/misc/e-dateedit.c:352
+#: ../widgets/misc/e-dateedit.c:348
 msgid "Click this button to show a calendar"
 msgstr "Prema este botón para mostrar un calendario"
 
-#: ../widgets/misc/e-dateedit.c:394
+#: ../widgets/misc/e-dateedit.c:390
 msgid "Drop-down combination box to select time"
 msgstr "Caixa de combinación para seleccionar a hora"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:466
 msgid "No_w"
 msgstr "A_gora"
 
-#: ../widgets/misc/e-dateedit.c:476
+#: ../widgets/misc/e-dateedit.c:472
 msgid "_Today"
 msgstr "_Hoxe"
 
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1637
 msgid "Invalid Date Value"
 msgstr "O valor da data non é válido"
 
-#: ../widgets/misc/e-dateedit.c:1670
+#: ../widgets/misc/e-dateedit.c:1666
 msgid "Invalid Time Value"
 msgstr "O valor da hora non é válido"
 
-#: ../widgets/misc/e-expander.c:180
+#: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "Expandido"
 
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:183
 msgid "Whether or not the expander is expanded"
 msgstr "Se o expansor está expandido ou non"
 
-#: ../widgets/misc/e-expander.c:189
+#: ../widgets/misc/e-expander.c:191
 msgid "Text of the expander's label"
 msgstr "Texto da etiqueta do expansor"
 
-#: ../widgets/misc/e-expander.c:196
+#: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr "Usar subliñado"
 
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:199
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -23097,90 +23166,90 @@ msgstr ""
 "Se se define, un subliñado no texto indica que o seguinte carácter debería "
 "usarse para a tecla rápida mnemónica"
 
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
 msgstr "Espazo para pór entre a etiqueta e o fillo"
 
-#: ../widgets/misc/e-expander.c:214
+#: ../widgets/misc/e-expander.c:216
 msgid "Label widget"
 msgstr "Widget etiqueta"
 
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:217
 msgid "A widget to display in place of the usual expander label"
 msgstr "Un widget para mostrar en lugar da etiqueta habitual do expansor"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "Tamaño do expansor"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "Tamaño da frecha do expansor"
 
-#: ../widgets/misc/e-expander.c:230
+#: ../widgets/misc/e-expander.c:232
 msgid "Indicator Spacing"
 msgstr "Espazamento do indicador"
 
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:233
 msgid "Spacing around expander arrow"
 msgstr "Espazamento ao redor da frecha do expansor"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
-#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
+#: ../widgets/misc/e-filter-bar.c:126 ../widgets/misc/e-filter-bar.c:179
+#: ../widgets/misc/e-filter-bar.c:307 ../widgets/misc/e-filter-bar.c:749
 msgid "Advanced Search"
 msgstr "Busca avanzada"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "Gardar a busca"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "_Buscas"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "Buscas"
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
 msgid "_Save Search..."
 msgstr "_Gardar a busca..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
 msgid "_Edit Saved Searches..."
 msgstr "_Editar as buscas gardadas..."
 
-#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
+#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
 msgid "_Advanced Search..."
 msgstr "Busca _avanzada..."
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "Todas as contas"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "Conta actual"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "Cartafol actual"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "Mensaxe actual"
 
-#: ../widgets/misc/e-image-chooser.c:167
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "Seleccione unha imaxe"
 
-#: ../widgets/misc/e-map.c:625
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Mapa do mundo"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:629
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -23189,23 +23258,23 @@ msgstr ""
 "Os usuarios que só dispoñan de teclado poden, no seu lugar, seleccionar o "
 "fuso horario desde a caixa de combinación de máis abaixo."
 
-#: ../widgets/misc/e-online-button.c:109
+#: ../widgets/misc/e-online-button.c:106
 msgid "Online"
 msgstr "En liña"
 
-#: ../widgets/misc/e-online-button.c:110
+#: ../widgets/misc/e-online-button.c:107
 msgid "The button state is online"
 msgstr "O estado do botón é conectado"
 
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "Sincronizar con:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "Sincronizar rexistros privados:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "Sincronizar categorías:"
 
@@ -23221,78 +23290,78 @@ msgstr "Modelo de refluxo"
 msgid "Column width"
 msgstr "Largura de columna"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Search"
 msgstr "Buscar"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Click here to change the search type"
 msgstr "Prema aquí para cambiar o tipo de busca"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:609
 msgid "_Find Now"
 msgstr "_Buscar agora"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Item ID"
 msgstr "ID de elemento"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Texto"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1006
+#: ../widgets/misc/e-search-bar.c:1003
 msgid "Sho_w: "
 msgstr "Mos_trar: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1023
+#: ../widgets/misc/e-search-bar.c:1020
 msgid "Sear_ch: "
 msgstr "Busca_r: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1032
 msgid " i_n "
 msgstr " e_n "
 
 #: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:807
+#: ../widgets/table/e-tree-selection-model.c:806
 msgid "Cursor Row"
 msgstr "Fila de cursor"
 
 #: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:814
+#: ../widgets/table/e-tree-selection-model.c:813
 msgid "Cursor Column"
 msgstr "Columna de cursor"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "Clasificador"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "Modo de selección"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "Modo do cursor"
 
-#: ../widgets/misc/e-send-options.c:518
+#: ../widgets/misc/e-send-options.c:522
 msgid "When de_leted:"
 msgstr "Ao e_liminar:"
 
@@ -23454,7 +23523,7 @@ msgstr "_Categorías dispoñibles:"
 msgid "categories"
 msgstr "categorías"
 
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "lista emerxente"
 
@@ -23474,23 +23543,23 @@ msgstr "Columna enfocada"
 msgid "Unselected Column"
 msgstr "Columna non seleccionada"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Strikeout Column"
 msgstr "Riscar columna"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1814
 msgid "Underline Column"
 msgstr "Subliñar columna"
 
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1821
 msgid "Bold Column"
 msgstr "Columna en negra"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1828
 msgid "Color Column"
 msgstr "Cor da columna"
 
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1842
 msgid "BG Color Column"
 msgstr "Cor de fondo da columna"
 
@@ -23602,15 +23671,15 @@ msgid "_Sort..."
 msgstr "_Ordenar..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:634
-#: ../widgets/table/e-table-field-chooser.c:67
+#: ../widgets/table/e-table-field-chooser-item.c:633
+#: ../widgets/table/e-table-field-chooser.c:66
 #: ../widgets/table/e-table-header-item.c:1887
 msgid "DnD code"
 msgstr "Código DnD"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:641
-#: ../widgets/table/e-table-field-chooser.c:74
+#: ../widgets/table/e-table-field-chooser-item.c:640
+#: ../widgets/table/e-table-field-chooser.c:73
 #: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "Cabeceira completa"
@@ -23631,93 +23700,93 @@ msgstr ""
 "Para engadir unha columna á súa táboa, arrástrea á\n"
 "localización na que quere que apareza."
 
-#: ../widgets/table/e-table-group-container.c:345
+#: ../widgets/table/e-table-group-container.c:344
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (%d elemento)"
 msgstr[1] "%s : %s (%d elementos)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:350
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d elemento)"
 msgstr[1] "%s (%d elementos)"
 
+#: ../widgets/table/e-table-group-container.c:922
 #: ../widgets/table/e-table-group-container.c:923
-#: ../widgets/table/e-table-group-container.c:924
 #: ../widgets/table/e-table-group-leaf.c:581
 #: ../widgets/table/e-table-group-leaf.c:582
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 msgid "Alternating Row Colors"
 msgstr "Alternar as cores das filas"
 
+#: ../widgets/table/e-table-group-container.c:929
 #: ../widgets/table/e-table-group-container.c:930
-#: ../widgets/table/e-table-group-container.c:931
 #: ../widgets/table/e-table-group-leaf.c:588
 #: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
-#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr "Debuxar a grade horizontal"
 
+#: ../widgets/table/e-table-group-container.c:936
 #: ../widgets/table/e-table-group-container.c:937
-#: ../widgets/table/e-table-group-container.c:938
 #: ../widgets/table/e-table-group-leaf.c:595
 #: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
-#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr "Debuxar a grade vertical"
 
+#: ../widgets/table/e-table-group-container.c:943
 #: ../widgets/table/e-table-group-container.c:944
-#: ../widgets/table/e-table-group-container.c:945
 #: ../widgets/table/e-table-group-leaf.c:602
 #: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
-#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
+#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
+#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr "Debuxar o foco"
 
+#: ../widgets/table/e-table-group-container.c:950
 #: ../widgets/table/e-table-group-container.c:951
-#: ../widgets/table/e-table-group-container.c:952
 #: ../widgets/table/e-table-group-leaf.c:609
 #: ../widgets/table/e-table-group-leaf.c:610
-#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
+#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
 msgid "Cursor mode"
 msgstr "Modo do cursor"
 
+#: ../widgets/table/e-table-group-container.c:957
 #: ../widgets/table/e-table-group-container.c:958
-#: ../widgets/table/e-table-group-container.c:959
 #: ../widgets/table/e-table-group-leaf.c:623
 #: ../widgets/table/e-table-group-leaf.c:624
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
 msgid "Selection model"
 msgstr "Modelo de selección"
 
+#: ../widgets/table/e-table-group-container.c:964
 #: ../widgets/table/e-table-group-container.c:965
-#: ../widgets/table/e-table-group-container.c:966
 #: ../widgets/table/e-table-group-leaf.c:616
 #: ../widgets/table/e-table-group-leaf.c:617
-#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
-#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3338
-#: ../widgets/table/e-tree.c:3339
+#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
+#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-tree.c:3338
 msgid "Length Threshold"
 msgstr "Límite de lonxitude"
 
+#: ../widgets/table/e-table-group-container.c:971
 #: ../widgets/table/e-table-group-container.c:972
-#: ../widgets/table/e-table-group-container.c:973
 #: ../widgets/table/e-table-group-leaf.c:658
 #: ../widgets/table/e-table-group-leaf.c:659
-#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
-#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3370
-#: ../widgets/table/e-tree.c:3371
+#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
+#: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-tree.c:3370
 msgid "Uniform row height"
 msgstr "Altura uniforme da fila"
 
+#: ../widgets/table/e-table-group-container.c:978
 #: ../widgets/table/e-table-group-container.c:979
-#: ../widgets/table/e-table-group-container.c:980
 #: ../widgets/table/e-table-group-leaf.c:651
 #: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
@@ -23785,7 +23854,7 @@ msgid "Font Description"
 msgstr "Descrición do tipo de letra"
 
 #: ../widgets/table/e-table-header-item.c:1915
-#: ../widgets/table/e-table-sorter.c:173
+#: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "Ordenar a información"
 
@@ -23795,36 +23864,36 @@ msgstr "Ordenar a información"
 msgid "Tree"
 msgstr "�rbore"
 
-#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
 msgid "Table header"
 msgstr "Cabeceira da táboa"
 
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
 msgid "Table model"
 msgstr "Modelo da táboa"
 
-#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
 msgid "Cursor row"
 msgstr "Fila do cursor"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
-#: ../widgets/table/e-tree.c:3378
+#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-tree.c:3377
 msgid "Always search"
 msgstr "Buscar sempre"
 
-#: ../widgets/table/e-table.c:3346
+#: ../widgets/table/e-table.c:3347
 msgid "Use click to add"
 msgstr "Premer para engadir"
 
-#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
+#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
 msgid "ETree table adapter"
 msgstr "Adaptador de táboa Etree"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3383
 msgid "Retro Look"
 msgstr "Aparencia retro"
 
-#: ../widgets/table/e-tree.c:3385
+#: ../widgets/table/e-tree.c:3384
 msgid "Draw lines and +/- expanders."
 msgstr "Debuxar liñas e expansores +/-."
 
@@ -23932,6 +24001,9 @@ msgstr "Contexto MI"
 msgid "Handle Popup"
 msgstr "Tirador emerxente"
 
+#~ msgid "Recent Docu_ments"
+#~ msgstr "Docu_mentos recentes"
+
 #~ msgid "Upcoming Appointments"
 #~ msgstr "Citas próximas"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 982abded62..3379d500ac 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,12 +11,11 @@
 # Fabrício Godoy <skarllot@gmail.com>, 2008
 # Og Maciel <ogmaciel@gnome.org>, 2008.
 #
-#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-01 10:51-0400\n"
+"POT-Creation-Date: 2008-10-01 10:50-0400\n"
 "PO-Revision-Date: 2008-10-01 10:51-0400\n"
 "Last-Translator: Og Maciel <ogmaciel@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
@@ -662,7 +661,7 @@ msgstr "Gerencie aqui os seus certificados S/MIME"
 #: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
 #: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
 #: ../mail/mail-component.c:311 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1518
+#: ../mail/message-list.c:1457
 msgid "On This Computer"
 msgstr "Neste computador"
 
@@ -673,7 +672,7 @@ msgstr "Neste computador"
 #. orange
 #: ../addressbook/gui/component/addressbook-component.c:151
 #: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
 #: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
@@ -732,7 +731,7 @@ msgstr ""
 #: ../calendar/gui/dialogs/calendar-setup.c:378
 #: ../calendar/gui/dialogs/calendar-setup.c:389
 #: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2372
+#: ../plugins/itip-formatter/itip-formatter.c:2367
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Geral"
@@ -928,14 +927,10 @@ msgstr ""
 "de visualização, em pixels."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
-msgid "Show autocompleted name with an address"
-msgstr ""
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "Mostrar o painel de visualização"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -943,26 +938,20 @@ msgstr ""
 "O número de caracteres que deve ser digitado antes que o Evolution tente "
 "completar automaticamente."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI para a última pasta a ser usada no diálogo selecionar nomes"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog."
 msgstr "URI para a última pasta usada no diálogo selecionar nomes."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
 msgstr "Posição do painel vertical"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr ""
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
 msgid "Whether to show the preview pane."
 msgstr "Mostrar o painel de visualização."
 
@@ -1162,9 +1151,8 @@ msgstr ""
 "sua base."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
-#, fuzzy
 msgid ""
-"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Este é o nome completo do seu servidor LDAP. Por exemplo, \"ldap."
@@ -1179,10 +1167,9 @@ msgstr ""
 "grande a este número diminuirá a velocidade de seu catálogo de endereços."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
-#, fuzzy
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 "Este é o método que o Evolution usará para autenticá-lo. Note que a opção "
@@ -1364,24 +1351,19 @@ msgstr "_Apelido:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
-#, fuzzy
-msgid "Novell GroupWise"
-msgstr "Novell Groupwise"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "Informação pessoal"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "Telefone"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
@@ -1390,111 +1372,111 @@ msgstr "Telefone"
 msgid "Work"
 msgstr "Trabalho"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Endereço:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "Bod_as:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "_Assistente:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "Aniver_sário:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: ../calendar/gui/dialogs/event-page.c:791
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1868
 msgid "_Calendar:"
 msgstr "Agen_da:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Company:"
 msgstr "Em_presa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Country:"
 msgstr "_País:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_File under:"
 msgstr "A_rquivar em:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Free/Busy:"
 msgstr "Disponibi_lidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home Page:"
 msgstr "_Página web:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Manager:"
 msgstr "_Gerente:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Notes:"
 msgstr "_Notas:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Office:"
 msgstr "Escritóri_o:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "Caixa _postal:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Profession:"
 msgstr "_Profissão:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Spouse:"
 msgstr "Côn_juge:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "E_stado/Província:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Tratamento:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Video Chat:"
 msgstr "Bate-papo com _vídeo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Wants to receive HTML mail"
 msgstr "Dese_ja receber correio HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Web Log:"
 msgstr "_Web log:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "On_de:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 msgid "_Zip/Postal Code:"
 msgstr "CEP/Códi_go postal:"
 
@@ -3037,7 +3019,7 @@ msgstr "Recor_tar"
 #: ../calendar/gui/e-calendar-table.c:1581
 #: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../composer/e-msg-composer.c:2052 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2106
+#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
@@ -4606,7 +4588,7 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Não foi possível gravar os dados do aplicativo de tarefas do PDA"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2363
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "Agenda e tarefas"
 
@@ -6219,12 +6201,12 @@ msgstr[1] "%d mensagens anexas"
 
 #: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2053
 #: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2107
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "_Mover"
 
 #: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2055
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2109
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "Cancelar _arraste"
 
@@ -6818,7 +6800,7 @@ msgstr "Não é possível abrir memorandos em \"%s\"."
 #: ../calendar/gui/dialogs/memo-page.c:1006 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "Para"
 
@@ -7080,7 +7062,7 @@ msgstr "Concluída"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:272
 #: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "High"
 msgstr "Alta"
 
@@ -7097,14 +7079,14 @@ msgstr "Em Progresso"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:276
 #: ../calendar/gui/e-calendar-table.c:568 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1064
+#: ../mail/message-list.c:1063
 msgid "Low"
 msgstr "Baixa"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:274
 #: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:567
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1065
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
 msgid "Normal"
 msgstr "Normal"
 
@@ -7422,7 +7404,7 @@ msgstr "Usar como Imagem de _Fundo"
 msgid "_Save Selected"
 msgstr "_Salvar Selecionado"
 
-#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:832
+#: ../calendar/gui/e-cal-popup.c:429 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir com %s..."
@@ -10985,9 +10967,8 @@ msgstr ""
 "parou."
 
 #: ../composer/mail-composer.error.xml.h:17
-#, fuzzy
 msgid ""
-"Send options available only for Novell GroupWise and Microsoft Exchange "
+"Send options available only for Novell Groupwise and Microsoft Exchange "
 "accounts."
 msgstr ""
 "Opções de envio só estão disponíveis para contas do Novell GroupWise e do "
@@ -12168,12 +12149,12 @@ msgstr "Movendo pasta %s"
 msgid "Copying folder %s"
 msgstr "Copiando pasta %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2015
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensagens para pasta %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2017
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensagens para pasta %s"
@@ -12928,9 +12909,8 @@ msgid "Failed to create local mail storage `%s': %s"
 msgstr "Falha ao criar repositório local de correio \"%s\": %s"
 
 #: ../mail/em-migrate.c:2898
-#, fuzzy
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"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..."
@@ -12963,7 +12943,7 @@ msgid "Reply to _List"
 msgstr "Responder à _Lista"
 
 #. make it first item
-#: ../mail/em-popup.c:629 ../mail/em-popup.c:853
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "_Adicionar ao Catálogo de Endereços"
 
@@ -13037,8 +13017,7 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Largura da janela \"Enviar e receber correio\""
 
 #: ../mail/evolution-mail.schemas.in.h:4
-#, fuzzy
-msgid "Allows Evolution to display text part of limited size"
+msgid "Allows evolution to display text part of limited size"
 msgstr "Permite que o Evolution exiba uma parte do texto de tamanho limitado"
 
 #: ../mail/evolution-mail.schemas.in.h:5
@@ -13319,11 +13298,10 @@ msgstr ""
 "verticalmente."
 
 #: ../mail/evolution-mail.schemas.in.h:61
-#, fuzzy
 msgid ""
-"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
-"any MIME types appearing in this list which map to a Bonobo component viewer "
-"in GNOME's MIME type database may be used for displaying content."
+"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 ""
 "Se não existir um visualizador embutido no Evolution para um certo tipo "
 "MIME, quaisquer tipos MIME que apareçam nesta lista e que mapeiam para um "
@@ -13399,20 +13377,14 @@ msgid "List of Labels and their associated colors"
 msgstr "Lista de rótulos e suas respectivas cores"
 
 #: ../mail/evolution-mail.schemas.in.h:72
-#, fuzzy
-msgid "List of MIME types to check for Bonobo component viewers"
-msgstr ""
-"Lista de tipos MIME onde procurar os componentes de visualização bonobo"
-
-#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accepted licenses"
 msgstr "Lista de licenças aceitas"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Lista de contas"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13421,17 +13393,17 @@ msgstr ""
 "contém strings com nomes de subdiretórios relativos a /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeçalhos personalizados e se eles estão habilitados."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Lista dos códigos de idiomas de dicionários usados para verificação "
 "ortográfica."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:77
 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."
@@ -13440,19 +13412,22 @@ msgstr ""
 "contém strings contendo nome:cor, onde cor usa a codificação hexadecimal "
 "HTML."
 
+#: ../mail/evolution-mail.schemas.in.h:78
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+"Lista de tipos MIME onde procurar os componentes de visualização bonobo"
+
 #: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nomes de protocolos para os quais a licença foi aceita."
 
 #: ../mail/evolution-mail.schemas.in.h:80
-#, fuzzy
-msgid "Load images for HTML messages over HTTP"
+msgid "Load images for HTML messages over http"
 msgstr "Carregar imagens em mensagens HTML usando HTTP"
 
 #: ../mail/evolution-mail.schemas.in.h:81
-#, fuzzy
 msgid ""
-"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
+"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 ""
@@ -13711,10 +13686,9 @@ msgstr ""
 "\" para mensagens de depuração."
 
 #: ../mail/evolution-mail.schemas.in.h:141
-#, fuzzy
 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."
+"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
 msgstr ""
 "Isto decide o tamanho máximo da parte do texto que pode ser formatada sob o "
 "Evolution. O padrão é 4MB / 4096KB e é especificado em KB."
@@ -14124,7 +14098,7 @@ msgstr "Nível do Log"
 msgid "Time"
 msgstr "Hora:"
 
-#: ../mail/mail-component.c:1820 ../mail/message-list.c:2516
+#: ../mail/mail-component.c:1820 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensagens"
@@ -15002,11 +14976,11 @@ msgstr "Enviando mensagem %d de %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Falha ao enviar %d de %d mensagens"
 
-#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:698
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "Cancelada."
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Concluída."
 
@@ -15157,15 +15131,15 @@ msgstr "Enviar e Receber Correio"
 msgid "Cancel _All"
 msgstr "Cancelar _Tudo"
 
-#: ../mail/mail-send-recv.c:502
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: ../mail/mail-send-recv.c:502 ../mail/mail-send-recv.c:578
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: ../mail/mail-send-recv.c:804
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "Verificando novas mensagens"
@@ -15173,11 +15147,11 @@ msgstr "Verificando novas mensagens"
 #: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
-msgstr "Digite a senha para %s"
+msgstr "Digite a frase secreta para %s"
 
 #: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
-msgstr "Digite a senha"
+msgstr "Digite a frase secreta"
 
 #: ../mail/mail-session.c:212
 #: ../plugins/exchange-operations/exchange-config-listener.c:708
@@ -15880,79 +15854,79 @@ msgstr "_Excluir Permanentemente"
 msgid "_Open Messages"
 msgstr "A_brir Mensagens"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "Não Lida"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Lida"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Forwarded"
 msgstr "Encaminhado"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Várias Mensagens Não Lidas"
 
-#: ../mail/message-list.c:1058
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "Várias Mensagens"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr "Mínima"
 
-#: ../mail/message-list.c:1063
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr "Menor"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "Maior"
 
-#: ../mail/message-list.c:1068
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr "Máxima"
 
-#: ../mail/message-list.c:1657 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1664 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Hoje %k:%M"
 
-#: ../mail/message-list.c:1673 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %k:%M"
 
-#: ../mail/message-list.c:1685 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: ../mail/message-list.c:1695 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3978 ../mail/message-list.c:4438
+#: ../mail/message-list.c:3916 ../mail/message-list.c:4376
 msgid "Generating message list"
 msgstr "Gerando lista de mensagens"
 
-#: ../mail/message-list.c:4286
+#: ../mail/message-list.c:4224
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15960,7 +15934,7 @@ msgstr ""
 "Nenhuma mensagem satisfaz o seu critério de pesquisa. Limpe a pesquisa com o "
 "item de menu Pesquisar->Limpar ou altere-a."
 
-#: ../mail/message-list.c:4288
+#: ../mail/message-list.c:4226
 msgid "There are no messages in this folder."
 msgstr "Não há mensagens nesta pasta."
 
@@ -15993,11 +15967,6 @@ msgstr "Mensagens Enviadas"
 msgid "Size"
 msgstr "Tamanho"
 
-#: ../mail/message-list.etspec.h:19
-#, fuzzy
-msgid "Subject - Trimmed"
-msgstr "Campo a_ssunto"
-
 #: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Ligar"
@@ -16120,10 +16089,9 @@ msgid "_Edit Message"
 msgstr "_Editar mensagem"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-#, fuzzy
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from Evolution."
+"play them directly from evolution."
 msgstr ""
 "Um plug-in de formatação que exibe anexos de áudio embutidos e permite que "
 "você os execute diretamente a partir do Evolution."
@@ -17776,8 +17744,7 @@ msgid "<b>Server</b>"
 msgstr "<b>Servidor</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-#, fuzzy
-msgid "A plugin to setup Google Calendar and Contacts."
+msgid "A plugin to setup google calendar and contacts."
 msgstr "Um plug-in para configurar o calendário e os contatos do Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -17789,13 +17756,11 @@ msgid "Checklist"
 msgstr "Lista de Tarefas"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-#, fuzzy
-msgid "A plugin to setup GroupWise calendar and contacts sources."
+msgid "A plugin to setup groupwise calendar and contacts sources."
 msgstr "Um plug-in que configura fontes de agendas e de contatos do GroupWise."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-#, fuzzy
-msgid "GroupWise Account Setup"
+msgid "Groupwise Account Setup"
 msgstr "Configurações de Conta GroupWise"
 
 #: ../plugins/groupwise-features/install-shared.c:220
@@ -17886,18 +17851,15 @@ msgid "Retract Mail"
 msgstr "Obtendo Correio"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-#, fuzzy
-msgid "Add Send Options to GroupWise messages"
+msgid "Add Send Options to groupwise messages"
 msgstr "Adicionar Opções de Envio para mensagens GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-#, fuzzy
-msgid "A plugin for the features in GroupWise accounts."
+msgid "A plugin for the features in Groupwise accounts."
 msgstr "Um plug-in para os recursos das contas GroupWise."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-#, fuzzy
-msgid "GroupWise Features"
+msgid "Groupwise Features"
 msgstr "Ferramentas do GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
@@ -17917,7 +17879,8 @@ msgstr "Usuário inválido"
 #. 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-errors.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "O acesso ao proxy não pode ser concedido ao usuário &quot;{0}&quot;."
+msgstr ""
+"Não é possível conceder acesso de representante ao usuário &quot;{0}&quot;."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
@@ -17927,14 +17890,14 @@ msgstr "Especificar usuário"
 #. 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-errors.xml.h:6
 msgid "You have already given proxy permissions to this user."
-msgstr "Você já concedeu as permissões de proxy a este usuário."
+msgstr "Você já concedeu as permissões de representante a este usuário."
 
 #. 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-errors.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr ""
 "Você tem que especificar um nome de usuário válido para conceder direitos de "
-"proxy."
+"representante."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
@@ -17951,32 +17914,28 @@ msgid ""
 "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
 "address and try again."
 msgstr ""
-"O login de proxy como &quot;{0}&quot; não foi bem-sucedido. Por favor "
-"verifique o seu endereço de e-mail e teste novamente."
+"O login de representante como &quot;{0}&quot; não foi bem-sucedido. Por "
+"favor verifique o seu endereço de e-mail e teste novamente."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 msgid "This is a recurring meeting"
 msgstr "Este é um evento recorrente"
 
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
 msgid "Would you like to accept it?"
 msgstr "Você gostaria de aceitá-la?"
 
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 msgid "Would you like to decline it?"
 msgstr "Você gostaria de recusá-la?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
-#, fuzzy
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
 msgstr ""
 "Você não pode compartilhar pasta com o usuário especificado &quot;{0}&quot;"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
-#, fuzzy
-msgid "You have to specify a user name which you want to add to the list"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+msgid "You have to specify a user name whom you want to add to the list"
 msgstr "Você tem que especificar um nome de usuário que quer adicionar à lista"
 
 #: ../plugins/groupwise-features/process-meeting.c:52
@@ -18067,7 +18026,7 @@ msgstr "_Lida"
 
 #: ../plugins/groupwise-features/proxy-listing.glade.h:1
 msgid "Proxy"
-msgstr "Proxy"
+msgstr "Representante"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
 msgid "<b>Account Name</b>"
@@ -18075,7 +18034,7 @@ msgstr "<b>Nome da Conta</b>"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
 msgid "Proxy Login"
-msgstr "Login do Proxy"
+msgstr "Login de representante"
 
 #: ../plugins/groupwise-features/proxy-login.c:208
 #: ../plugins/groupwise-features/proxy-login.c:250
@@ -18090,19 +18049,21 @@ msgstr "%sDigite a senha para %s (usuário %s)"
 #. * without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/proxy-login.c:512
 msgid "_Proxy Login..."
-msgstr "Login do _Proxy..."
+msgstr "Login de _Representante..."
 
 #. 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:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
-"A aba do Proxy estará disponível somente quando a conta estiver conectada."
+"A aba Representante estará disponível somente quando a conta estiver "
+"conectada."
 
 #. 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:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
-"A aba do Proxy estará disponível somente quando a conta estiver habilitada."
+"A aba Representante estará disponível somente quando a conta estiver "
+"habilitada."
 
 #: ../plugins/groupwise-features/send-options.c:215
 msgid "Advanced send options"
@@ -18510,17 +18471,17 @@ msgstr "Este memorando se repete"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2388
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "E_xcluir mensagem depois da ação"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2398
-#: ../plugins/itip-formatter/itip-formatter.c:2430
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "Pesquisa de Conflitos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2413
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Selecione a agenda para pesquisar por conflitos de reunião"
 
@@ -19021,7 +18982,7 @@ msgstr ""
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
 msgid "Proxy _Logout"
-msgstr "_Logout do Proxy"
+msgstr "_Logout de representante"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
 msgid "Allows disabling of accounts."
@@ -19575,8 +19536,7 @@ msgid "_Publish Calendar Information"
 msgstr "_Publicar Informação de Agenda"
 
 #: ../plugins/publish-calendar/publish-calendar.c:595
-#, fuzzy
-msgid "Are you sure you want to remove this location?"
+msgid "Are you sure you want to remove this URL?"
 msgstr "Você tem certeza de que deseja excluir esta URL?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
@@ -19614,9 +19574,8 @@ msgid "Publishing _Frequency:"
 msgstr "_Freqüência de Publicação:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
-#, fuzzy
 msgid ""
-"Secure FTP (SSH)\n"
+"SSH\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -19681,8 +19640,7 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Plug-in de teste para carregador Python EPlugin."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-#, fuzzy
-msgid "A plugin which loads other plugins written using Python."
+msgid "A plugin which loads other plugins written using python."
 msgstr "Um plug-in que carrega outros plug-ins escritos usando python."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
@@ -19715,8 +19673,8 @@ msgid "SpamAssassin child process does not respond, killing..."
 msgstr "O processo filho de SpamAssassin não responde, matando..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:245
-#, fuzzy, c-format
-msgid "Wait for SpamAssassin child process interrupted, terminating..."
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
 msgstr "Espera pelo processo filho de Spamassassin interrompida, terminando..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:254
@@ -19746,14 +19704,13 @@ msgstr ""
 "instalado."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-#, fuzzy
-msgid "SpamAssassin Options"
-msgstr "Opções do SpamAssassin"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
 msgid "SpamAssassin junk plugin"
 msgstr "Plug-in SpamAssassin"
 
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+msgid "Spamassassin Options"
+msgstr "Opções do SpamAssassin"
+
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
 msgstr "Salva todos os anexos ou partes de uma mensagem de uma vez."
@@ -20010,8 +19967,7 @@ msgid "Drafts based template plugin"
 msgstr "Plug-in de modelo baseado em rascunho"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-#, fuzzy
-msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr "Um plug-in simples que usa ytnef para decodificar anexos tnef."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
@@ -20037,8 +19993,7 @@ msgid "URL:"
 msgstr "URL:"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
-#, fuzzy
-msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
+msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
 msgstr "_Evitar IfMatch (necessário no apache <2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -20144,7 +20099,7 @@ msgstr "Senha a fornecer como autenticação ao usar o proxy HTTP."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
-msgstr "Modo de configuração de proxy"
+msgstr "Modo de configuração de representante"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
@@ -20169,10 +20124,10 @@ msgid ""
 "configuration\" and \"use proxy configuration provided in the autoconfig url"
 "\" respectively."
 msgstr ""
-"Selecione o modo de configuração de proxy. Os valores com suporte são 0, 1, "
-"2, e 3 representando \"usar as configurações do sistema\", \"sem proxy\", "
-"\"usar as configurações de proxy manuais\" and \"usar configurações de proxy "
-"fornecidas pela url de configuração automática\" respectivamente."
+"Selecione o modo de configuração de representante. Os valores com suporte "
+"são 0, 1, 2, e 3 representando \"usar as configurações do sistema\", \"sem "
+"proxy\", \"usar as configurações de proxy manuais\" and \"usar configurações "
+"de proxy fornecidas pela url de configuração automática\" respectivamente."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
@@ -20706,9 +20661,8 @@ msgstr ""
 "Evolution sem intervenção manual.\n"
 
 #: ../shell/shell.error.xml.h:16
-#, fuzzy
 msgid ""
-"The previous version of Evolution stored its data in a different location.\n"
+"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 "
@@ -22220,7 +22174,7 @@ msgstr "Não I_mportante"
 
 #: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
-msgstr "A_fastar"
+msgstr "_Reduzir"
 
 #: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
@@ -22317,7 +22271,7 @@ msgstr "_Zoom"
 
 #: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
-msgstr "_Aproximar"
+msgstr "_Ampliar"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:1
 msgid "Close"
@@ -22710,9 +22664,9 @@ msgid ""
 "zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
-"Use o botão esquerdo do mouse para se aproximar de uma área do mapa e "
-"selecionar um fuso horário.\n"
-"Use o botão direito do mouse para se distanciar do mapa."
+"Use o botão esquerdo do mouse para ampliar uma área do mapa e selecionar um "
+"fuso horário.\n"
+"Use o botão direito do mouse para reduzi-la."
 
 #: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:185
diff --git a/po/sk.po b/po/sk.po
index 0553d1c8ec..8dea038120 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,18 +1,19 @@
 # translation of evolution.HEAD.sk.po to Slovak
 # translation of sk.po to Slovak
 # evolution Slovak translation.
-# Copyright (C) 2001, 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2007, 2008 Free Software Foundation, Inc.
 # Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>, 2001-2002,2003.
 # Stanislav Visnovsky <visnovsky@kde.org>, 2003.
 # Lukas Lipka <lukas@pmad.net>, 2005.
-# Marcel Telka <marcel@telka.sk>, 2005, 2007.
+# Marcel Telka <marcel@telka.sk>, 2005, 2007, 2008.
 #
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-16 00:47+0100\n"
-"PO-Revision-Date: 2007-11-16 00:49+0100\n"
+"POT-Creation-Date: 2008-10-17 22:00+0200\n"
+"PO-Revision-Date: 2008-10-17 22:01+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +24,7 @@ msgstr ""
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
 #: ../a11y/addressbook/ea-minicard-view.c:179
-msgid "evolution addressbook"
+msgid "evolution address book"
 msgstr "adresár evolution"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
@@ -37,15 +38,14 @@ msgid "New Contact List"
 msgstr "Nový zoznam kontaktov"
 
 #: ../a11y/addressbook/ea-minicard-view.c:162
-#, fuzzy, c-format
+#, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "aktuálny prie�inok adresára má %d kariet"
-msgstr[1] "aktuálny prie�inok adresára má %d kartu"
-msgstr[2] "aktuálny prie�inok adresára má %d karty"
+msgstr[0] "aktuálny prie�inok adresára %s má %d kariet"
+msgstr[1] "aktuálny prie�inok adresára %s má %d kartu"
+msgstr[2] "aktuálny prie�inok adresára %s má %d karty"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Otvoriť"
 
@@ -62,63 +62,63 @@ msgstr "Kontakt: "
 msgid "evolution minicard"
 msgstr "_Okno Evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has recurrences."
 msgstr "Má opakovania."
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "Je to stretnutie."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:277
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Udalosť v kalendári: Súhrn je %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:280
+#: ../a11y/calendar/ea-cal-view-event.c:279
 msgid "Calendar Event: It has no summary."
 msgstr "Udalosti v kalendári: Nemá súhrn."
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "udalosti pohľadu kalendára"
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "Získať ohnisko"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "Nová schôdzka"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "Nová celodenná udalosť"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "Nové stretnutie"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "Prejsť na dnešný dátum"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "Prejsť na dátum"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:303
-#: ../a11y/calendar/ea-week-view-main-item.c:301
+#: ../a11y/calendar/ea-day-view-main-item.c:301
+#: ../a11y/calendar/ea-week-view-main-item.c:298
 msgid "a table to view and select the current time range"
 msgstr "tabuľka na zobrazenie a výber aktuálne rozsahu �asu"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -128,14 +128,14 @@ msgstr[2] "Obsahuje %d udalosti."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:155 ../a11y/calendar/ea-week-view.c:152
+#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
 msgid "It has no events."
 msgstr "Nemá udalosti."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:162
+#: ../a11y/calendar/ea-day-view.c:159
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Pohľad na pracovný týždeň: %s. %s"
@@ -143,21 +143,21 @@ msgstr "Pohľad na pracovný týždeň: %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."
-#: ../a11y/calendar/ea-day-view.c:168
+#: ../a11y/calendar/ea-day-view.c:165
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Pohľad na deň: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "pohľad na kalendár pre pracovný týždeň"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "pohľad na kalendár pre jeden alebo viac dní"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:743
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:784
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -167,32 +167,30 @@ msgstr "%A %d %b %Y"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:746
-#: ../calendar/gui/e-day-view-top-item.c:1358
-#: ../calendar/gui/e-day-view.c:2188
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../a11y/calendar/ea-gnome-calendar.c:189
+#: ../calendar/gui/calendar-component.c:787
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1577
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:193
+#: ../a11y/calendar/ea-gnome-calendar.c:191
+#: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:748
-#: ../calendar/gui/calendar-component.c:753
-#: ../calendar/gui/calendar-component.c:755
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:217
-#: ../a11y/calendar/ea-gnome-calendar.c:223
+#: ../a11y/calendar/ea-gnome-calendar.c:215
+#: ../a11y/calendar/ea-gnome-calendar.c:221
+#: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:767
-#: ../calendar/gui/calendar-component.c:774
-#: ../calendar/gui/calendar-component.c:780
-#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:815
+#: ../calendar/gui/calendar-component.c:821
+#: ../calendar/gui/calendar-component.c:823
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -201,138 +199,136 @@ msgstr "%d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:772
-#: ../calendar/gui/e-day-view-top-item.c:1362
-#: ../calendar/gui/e-day-view.c:2204
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../a11y/calendar/ea-gnome-calendar.c:219
+#: ../calendar/gui/calendar-component.c:813
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:772
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
+#: ../calendar/importers/icalendar-importer.c:768
 msgid "Gnome Calendar"
 msgstr "Kalendár Gnome"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "oblasť hľadania"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "oblasť hľadania kalendára evolution"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "Tla�idlo skoku"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "Kliknutím sem môžete nájsť viac udalostí."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Pohľad na mesiac: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Pohľad na týždeň: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "pohľad na kalendár pre mesiac"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "pohľad na kalendár pre jeden alebo viac týždňov"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "prekryť"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
 msgid "popup a child"
 msgstr "prekryť potomka"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
 msgid "edit"
 msgstr "upraviť"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
 msgid "begin editing this cell"
 msgstr "za�ať úpravu tejto bunky"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "prepnúť"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
 msgid "toggle the cell"
 msgstr "prepnúť bunku"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "rozbaliť"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
 msgid "expands the row in the ETree containing this cell"
 msgstr "rozbaliť riadok v ETree obsahujúci túto bunku"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr "zbaliť"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
 msgid "collapses the row in the ETree containing this cell"
 msgstr "zbaliť riadok v ETree obsahujúci túto bunku"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "Bunka tabuľky"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:581
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
+#: ../widgets/table/e-table-click-to-add.c:580
 msgid "click to add"
 msgstr "pridať kliknutím"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
 msgid "click"
 msgstr "kliknúť"
 
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
 msgid "sort"
 msgstr "triediť"
 
-#: ../a11y/widgets/ea-calendar-item.c:298
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:295
+#: ../a11y/widgets/ea-calendar-item.c:301
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../a11y/widgets/ea-calendar-item.c:306
+#: ../a11y/widgets/ea-calendar-item.c:303
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Kalendár: od %s do %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "položka kalendára evolution"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr ""
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "Aktivovať štandardné"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Vyskakovacie menu"
 
@@ -342,11 +338,17 @@ msgid "Toggle Attachment Bar"
 msgstr "Príloha"
 
 #: ../a11y/widgets/ea-expander.c:50
-#, fuzzy
 msgid "activate"
-msgstr "Súkromný"
+msgstr "aktivovať"
 
-#: ../addressbook/addressbook.error.xml.h:1
+#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:2
+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 ""
+
+#: ../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?"
@@ -354,213 +356,219 @@ msgstr ""
 "Kontakt s touto adresou už existuje. Chcete aj napriek tomu pridať novú "
 "kartu s takou istou adresou?"
 
-#: ../addressbook/addressbook.error.xml.h:2
+#: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
 msgstr "Adresa '{0}' už existuje."
 
-#: ../addressbook/addressbook.error.xml.h:3
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Cannot add new contact"
+msgstr "Nepodarilo sa pridať nový kontakt"
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Cannot move contact."
 msgstr "Nepodarilo sa presunúť kontakt."
 
-#: ../addressbook/addressbook.error.xml.h:4
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Category editor not available."
 msgstr "Editor kategórií nie je k dispozícii."
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:8
 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:6
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
 msgstr "Nepodarilo sa získať informácie o schéme pre LDAP server."
 
-#: ../addressbook/addressbook.error.xml.h:7
-msgid "Could not remove addressbook."
+#: ../addressbook/addressbook.error.xml.h:10
+msgid "Could not remove address book."
 msgstr "Nepodarilo sa odstrániť adresár."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:11
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "Odstrániť adresár '{0}'?"
 
-#: ../addressbook/addressbook.error.xml.h:10
-msgid "Error loading addressbook."
+#: ../addressbook/addressbook.error.xml.h:13
+msgid "Error loading address book."
 msgstr "Chyba pri na�ítavaní adresára."
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Chyba pri ukladaní {0} do {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "Nepodarilo sa overiť totožnosť na LDAP serveri"
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1705
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
-msgstr "Odstrániť vybrané kontakty"
+msgstr "Odstránenie kontaktov zlyhalo"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:17
 #, fuzzy
 msgid "GroupWise Address book creation:"
 msgstr "Komponent Adresár Evolution"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP server neodpovedal platnou informáciou o schéme."
 
-#: ../addressbook/addressbook.error.xml.h:16
-#, fuzzy
-msgid "Permission Denied."
-msgstr "Prístup zamietnutý"
-
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:50
 msgid "Server Version"
 msgstr "Verzia servera"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:19
-msgid "The Evolution addressbook has quit unexpectedly."
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "Adresár Evolution skon�il neo�akávane."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:23
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:22
-msgid "This address book will be removed permanently."
-msgstr "Tento adresár bude odstránený trvale."
-
-#: ../addressbook/addressbook.error.xml.h:23
-msgid "This addressbook could not be opened."
+#: ../addressbook/addressbook.error.xml.h:24
+msgid "This address book could not be opened."
 msgstr "Tento adresár nemohol byť otvorený."
 
-#: ../addressbook/addressbook.error.xml.h:24
-msgid "This addressbook server does not have any suggested search bases."
+#: ../addressbook/addressbook.error.xml.h:25
+msgid "This address book server does not have any suggested search bases."
 msgstr "Tento adresárový server nemá žiadne navrhované databázy hľadania."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
+#, fuzzy
 msgid ""
-"This addressbook server might be unreachable or the server name may be "
+"This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
 "Tento adresárový server môže byť nedosiahnuteľný, názov servera môže byť "
 "nesprávne zadané, alebo môže byť vaše sieťové pripojenie rozpojené."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "Tento adresár bude odstránený trvale."
+
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Tento server nepodporuje informácie schém LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:27
-msgid "Unable to open addressbook"
+#: ../addressbook/addressbook.error.xml.h:29
+msgid "Unable to open address book"
 msgstr "Nepodarilo sa otvoriť adresár"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "Nepodarilo sa vykonať vyhľadanie."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "Nepodarilo sa uložiť {0}."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "Chcete uložiť vaše zmeny?"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:33
+#, fuzzy
 msgid ""
-"You are attempting to move a contact from one addressbook to another but it "
+"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 ""
 "Pokúšate sa presunúť kontakt z jedného adresára do druhého, ale tento "
 "kontakt nemohol byť odstránený zo zdroja. Chcete namiesto toho uložiť kópiu?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:34
 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:33
+#: ../addressbook/addressbook.error.xml.h:35
+#, fuzzy
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "Naozaj chcete zrušiť a odstrániť túto položku denníka?"
+
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "Vaše kontakty pre {0} nebudú dostupné kým nereštartujete Evolution."
 
-#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:512
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:18
 msgid "_Add"
 msgstr "_Pridať"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
 msgstr "_Zahodiť"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Do not save"
-msgstr ""
+msgstr "_Neuložiť"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:41
 #, fuzzy
 msgid "_Resize"
 msgstr "Belize"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "_Use as it is"
-msgstr ""
+msgstr "_Použiť tak ako je"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:41
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:43
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:300
 msgid "Default Sync Address:"
 msgstr "Štandardná adresa pre synchronizáciu:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
-#: ../addressbook/conduit/address-conduit.c:1320
-msgid "Could not load addressbook"
+#: ../addressbook/conduit/address-conduit.c:1321
+#: ../addressbook/conduit/address-conduit.c:1322
+msgid "Could not load address book"
 msgstr "Nepodarilo sa na�ítať adresár"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1399
+#: ../addressbook/conduit/address-conduit.c:1402
 msgid "Could not read pilot's Address application block"
 msgstr "Nie je možné pre�ítať blok aplikácie Adresa z pilota"
 
@@ -582,30 +590,26 @@ msgstr "Tu nastaviť automatické dopĺňanie"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1336
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:402
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1325
+#: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "Kontakty"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
 msgid "Evolution Address Book"
 msgstr "Adresár Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Address Book address pop-up"
-msgstr "Okno adries adresára Evolution"
+msgid "Evolution Address Book address popup"
+msgstr ""
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
 msgid "Evolution Address Book address viewer"
 msgstr "Prehliada� adries adresára Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
 msgid "Evolution Address Book card viewer"
 msgstr "Prehliada� kariet adresára Evolution"
 
@@ -616,7 +620,7 @@ msgstr "Komponent Adresár Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 #, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
+msgid "Evolution S/MIME Certificate Management Control"
 msgstr "Ovládací prvok nastavenia pošty Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
@@ -629,14 +633,15 @@ msgstr "Tu spravovať vaše S/MIME certifikáty"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:497
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:481
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1095
-#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:302
-#: ../mail/mail-vfolder.c:223
+#: ../addressbook/gui/component/addressbook-component.c:143
+#: ../addressbook/gui/component/addressbook-migrate.c:500
+#: ../calendar/gui/calendar-component.c:236
+#: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
+#: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
+#: ../mail/mail-component.c:311 ../mail/mail-vfolder.c:223
+#: ../mail/message-list.c:1518
 msgid "On This Computer"
 msgstr "Na tomto po�íta�i"
 
@@ -645,49 +650,37 @@ msgstr "Na tomto po�íta�i"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:505
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:491
-#: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1103
-#: ../calendar/gui/tasks-component.c:205 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:106
+#: ../addressbook/gui/component/addressbook-component.c:151
+#: ../addressbook/gui/component/addressbook-migrate.c:508
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
+#: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
+#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
+#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:204
+#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Osobný"
 
 #. Create the LDAP source group
 #: ../addressbook/gui/component/addressbook-component.c:162
-#: ../addressbook/gui/component/addressbook-migrate.c:515
+#: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "Na LDAP serveroch"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
-msgid "_Contact"
-msgstr "_Kontakt"
-
 #: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "Vytvoriť nový kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgid "Contact _List"
-msgstr "_Zoznam kontaktov"
-
 #: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "Vytvoriť nový zoznam kontaktov"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "Nový adresár"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgid "Address _Book"
-msgstr "_Adresár"
-
 #: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "Vytvoriť nový adresár"
@@ -697,86 +690,87 @@ msgstr "Vytvoriť nový adresár"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Zlyhala aktualizácia nastavení alebo prie�inkov Adresára."
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:332
 msgid "Base"
 msgstr "Základ"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_Typ:"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
-msgid "Copy book content locally for offline operation"
+#: ../addressbook/gui/component/addressbook-config.c:635
+#, fuzzy
+msgid "Copy _book content locally for offline operation"
 msgstr "Kopírovať obsah adresára lokálne pre prácu bez pripojenia"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/addressbook-config.c:998
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
-#: ../plugins/itip-formatter/itip-formatter.c:2315
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2441
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Všeobecné"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:392
+#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Adresár"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:1003
 msgid "Server Information"
 msgstr "Informácie o serveri"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:1005
 msgid "Authentication"
 msgstr "Overenie totožnosti"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:1008
 #: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detaily"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:862
+#: ../addressbook/gui/component/addressbook-config.c:1009
+#: ../mail/em-folder-browser.c:985
 msgid "Searching"
 msgstr "Hľadám"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:1011
 msgid "Downloading"
 msgstr "SÅ¥ahujem"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1221
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Vlastnosti adresára"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1202
+#: ../addressbook/gui/component/addressbook-migrate.c:74
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 #, fuzzy
 msgid "Migrating..."
 msgstr "Čakám..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1243
+#: ../addressbook/gui/component/addressbook-migrate.c:126
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, fuzzy, c-format
-msgid "Migrating `%s':"
+msgid "Migrating '%s':"
 msgstr "Prehľadávam %s"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:643
+#: ../addressbook/gui/component/addressbook-migrate.c:646
 msgid "LDAP Servers"
 msgstr "LDAP servery"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:758
+#: ../addressbook/gui/component/addressbook-migrate.c:761
 msgid "Autocompletion Settings"
 msgstr "Nastavenia automatického dopĺňania"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1134
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -784,93 +778,100 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1148
+#: ../addressbook/gui/component/addressbook-migrate.c:1151
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1160
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1167
+#: ../addressbook/gui/component/addressbook-migrate.c:1170
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:504
+#: ../addressbook/gui/component/addressbook-view.c:424
+#: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
-msgstr ""
+msgstr "Premenovať prie�inok \"%s\" na:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:506
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-view.c:427
+#: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
-msgstr "Vytvoriť nový prie�inok"
+msgstr "Premenovať prie�inok"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:512
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-view.c:432
+#: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
-msgstr "Meno prie�inku nesmie obsahovať znak \"/\"."
+msgstr "Názvy prie�inkov nemôžu obsahovať '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-view.c:941
 msgid "_New Address Book"
-msgstr "Nový adresár"
+msgstr "_Nový adresár"
+
+#: ../addressbook/gui/component/addressbook-view.c:942
+msgid "Save As vCard..."
+msgstr "Uložiť ako vCard..."
 
-#. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:955
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:607
-#: ../calendar/gui/e-calendar-table.c:1347
-#: ../calendar/gui/e-calendar-view.c:1696 ../calendar/gui/e-memo-table.c:937
-#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
-#: ../mail/em-folder-tree.c:2122 ../mail/em-folder-view.c:1290
+#: ../addressbook/gui/component/addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/calendar-component.c:644
+#: ../calendar/gui/e-calendar-table.c:1598
+#: ../calendar/gui/e-calendar-view.c:1692 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/memos-component.c:493 ../calendar/gui/tasks-component.c:484
+#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Odstrániť"
 
-#: ../addressbook/gui/component/addressbook-view.c:957
-#, fuzzy
-msgid "Save As Vcard..."
-msgstr "Uložiť ako VCard..."
-
-#: ../addressbook/gui/component/addressbook-view.c:959
-#, fuzzy
-msgid "_Properties..."
-msgstr "Vlastnosti..."
+#: ../addressbook/gui/component/addressbook-view.c:948
+#: ../calendar/gui/calendar-component.c:649
+#: ../calendar/gui/dialogs/comp-editor.c:2039
+#: ../calendar/gui/memos-component.c:498 ../calendar/gui/tasks-component.c:489
+#: ../composer/e-msg-composer.c:1041 ../mail/em-folder-tree.c:2120
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Vlastnosti"
 
-#: ../addressbook/gui/component/addressbook-view.c:1347
+#: ../addressbook/gui/component/addressbook-view.c:1336
 msgid "Contact Source Selector"
 msgstr "Výber zdroja kontaktov"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "Používam server LDAP anonymne"
 
-#: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
 msgid "Failed to authenticate.\n"
 msgstr "Nepodarilo sa prihlásiť.\n"
 
-#: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../addressbook/gui/component/addressbook.c:214
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Zadajte heslo pre %s (používateľ %s)"
 
+#: ../addressbook/gui/component/addressbook.c:222
+#: ../calendar/common/authentication.c:51
+#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/publish-calendar/publish-calendar.c:191
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "Zadajte heslo"
+
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
 msgstr "Dĺžka automatického dopĺňania"
@@ -890,29 +891,39 @@ msgid ""
 msgstr ""
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "Zobraziť panel náhľadu"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr ""
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 msgid "URI for the folder last used in the select names dialog."
 msgstr ""
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
 msgstr "Vertikálna poloha panelu"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
 msgid "Whether to show the preview pane."
 msgstr "Či zobraziť panel náhľadu."
 
@@ -941,38 +952,35 @@ msgid "<b>Authentication</b>"
 msgstr "<b>Overenie totožnosti</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>Displej</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>SÅ¥ahovanie</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>Hľadám</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>Informácie o serveri</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>Typ:</b> "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "Pridať adresár"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:777
+#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../mail/em-account-editor.c:760
 msgid "Always"
 msgstr "Vždy"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "Anonymne"
 
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+msgid "B_rowse this book until limit reached"
+msgstr ""
+
 #: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "Základné"
@@ -1003,17 +1011,16 @@ msgid "Lo_gin:"
 msgstr "Pri_hlásenie:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../mail/em-account-editor.c:759
 msgid "Never"
 msgstr "Nikdy"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:304
-#, fuzzy
+#: ../mail/em-account-editor.c:287
 msgid "No encryption"
-msgstr "Popis"
+msgstr "Bez Å¡ifrovania"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
@@ -1023,10 +1030,9 @@ msgstr "Jeden"
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:312
-#, fuzzy
+#: ../mail/em-account-editor.c:295
 msgid "SSL encryption"
-msgstr "popis"
+msgstr "Å¡ifrovanie SSL"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
@@ -1095,10 +1101,9 @@ msgstr "Podporované databáze hľadania"
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:308
-#, fuzzy
+#: ../mail/em-account-editor.c:291
 msgid "TLS encryption"
-msgstr "Popis:"
+msgstr "Å¡ifrovanie TLS"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
@@ -1126,8 +1131,9 @@ msgstr ""
 "pod vašim základnom hľadania.\n"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Toto je plné meno vášho serveru LDAP. Napríklad \"ldap.mojafirma.sk\"."
 
@@ -1143,7 +1149,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 msgstr ""
 "Toto je metóda, ktorú Evolution použije pre prihlásenie. Uvedmte si, že "
@@ -1199,8 +1205,9 @@ msgid "_Login method:"
 msgstr "Spôsob _prihlásenia:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:171
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:177
+#: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Meno:"
@@ -1214,7 +1221,7 @@ msgid "_Search scope:"
 msgstr "_Rozsah hľadania:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:186
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Server:"
@@ -1235,10 +1242,10 @@ msgstr "karty"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../mail/em-account-editor.c:2064
-#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:380
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "minút"
 
@@ -1279,1300 +1286,1306 @@ msgid "<b>Work</b>"
 msgstr "<b>Práca</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "Ka_tegórie..."
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:199
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2421
 msgid "Contact Editor"
 msgstr "Editor kontaktov"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "_Celé meno..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Obrázok"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Poslať správu"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Poštová adresa"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Ni_ckname:"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "Nic_kname:"
 msgstr "Pre_zývka:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+msgid "Novell GroupWise"
+msgstr "Novell GroupWise"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Personal Information"
 msgstr "Osobné informácie"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "Telefón"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:158
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Práca"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "_Výro�ie:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "_Asistent:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "Dátum na_rodenia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:901
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1840
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../calendar/gui/dialogs/event-page.c:791
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../plugins/itip-formatter/itip-view.c:1868
 msgid "_Calendar:"
 msgstr "_Kalendár:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#, fuzzy
-msgid "_Categories..."
-msgstr "Ka_tegórie..."
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_Mesto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Firma:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_Krajina:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Oddelenie:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_Súbor pod:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_Voľno/Zaneprázdnený:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "_Domovská stránka:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Manažér:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Poznámky:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Kancelária:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_PO Box:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Povolanie:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "Ma_nžel(ka):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Štát/Provincia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titul:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_Chce prijímať HTML poštu"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 #, fuzzy
 msgid "_Web Log:"
 msgstr "Adresa _WWW stránky:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Kde:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_PSČ:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "Adresa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
-#: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1832 ../widgets/text/e-text.c:3679
-#: ../widgets/text/e-text.c:3680
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:292
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
+#: ../addressbook/gui/widgets/e-minicard-label.c:165
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
+#: ../addressbook/gui/widgets/e-minicard-view.c:545
+#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../widgets/menus/gal-define-views-model.c:178
+#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
 msgid "Editable"
 msgstr "Upraviteľný"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "Spojené štáty"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "Afgánistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "Albánsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "Alžírsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "Americká Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "Angola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "Antarktída"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Antigua And Barbuda"
 msgstr "Antigua a Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "Argentína"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "Arménsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "Austrália"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "Rakúsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "Azerbajdžansko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "Bahamy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "Bahrajn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "Bangladéš"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "Bielorusko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "Belgicko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "Bermudy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "Bútán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "Bolívia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bosnia And Herzegowina"
 msgstr "Bosna a Herzegovina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "Botswana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "Bouvet Island"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "Brazília"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "British Indian Ocean Territory"
 msgstr "Britské teritórium v Indickom oceáne"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "Bulharsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "Kambodža"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "Cape Verde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "Kajmanské ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Central African Republic"
 msgstr "Stredoafrická republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "ÄŒad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "Chile"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "Čína"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "Viano�né ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokosové ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "Kolumbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "Komory"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "Kongo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Kongo, Demokratická republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "Cookove ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "Pobrežie slonoviny"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "Chorvátsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "Kuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "Cyprus"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "Česká republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "Dánsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "Džibuti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "Dominikánska republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "Dominikánska republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "Ekvádor"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "Egypt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "Salvádor"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "Rovníková Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "Estónsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "Etiópia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "Falklandské ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "Farejské ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "Fidži"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "Fínsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "Francúzsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "Francúzska Guajana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "Francúzska Polynézia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "French Southern Territories"
 msgstr "Francúzske južné teritóriá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "Gabon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "Gambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "Gruzínsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "Nemecko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "Grécko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "Grónsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "Granada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#, fuzzy
+msgid "Guinea-Bissau"
 msgstr "Guinea-bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "Guajana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "Haiti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Heard And McDonald Islands"
 msgstr "Heardove a McDonaldove ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "Svätá stolica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
 msgstr "Hongkong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "Ma�arsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "Island"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "India"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "Indonézia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "Irán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "Irak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "�rsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Isle of Man"
 msgstr "Ostrov Man"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "Taliansko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "Jamajka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "Japonsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "Jordánsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "Kazachstán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "Keňa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Kórejská ľudovodemokratická republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Korea, Republic Of"
 msgstr "Kórejská republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "Kuvajt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "Kirgizstán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "Lotyšsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "Libéria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "Líbya"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "Lichtenštajnsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "Litva"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "Luxembursko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "Macedónsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "Malajzia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "Maledivy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "Mali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "Marshallove ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "Martinik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "Mauretánia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "Maurícius"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "Mikronézia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Moldova, Republic Of"
 msgstr "Moldavská republika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "Monako"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "Mongolsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "Maroko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "Mozambik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "Namíbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "Nepál"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "Holandsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "Holandské Antily"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "Nová Kaledónia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "Nový Zéland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "Niger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "Nigéria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "Ostrov Norfolk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Northern Mariana Islands"
 msgstr "Severné Mariánske ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "Nórsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "Omán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "Palestínske územia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "Panama"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Papua New Guinea"
 msgstr "Papua Nová Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "Paraguaj"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "Peru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "Filipíny"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "Poľsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "Portugalsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
 msgstr "Portoriko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "Katar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "Reunion"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "Rumunsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "Ruská federácia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Kitts And Nevis"
 msgstr "Sv. Kitts a Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "Sv. Lucia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Saint Vincent And The Grenadines"
 msgstr "Sv. Vincent a Grenadíny"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
 msgstr "San Marino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome a Principe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "Saudská Arábia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Serbia And Montenegro"
 msgstr "Srbsko a ÄŒierna hora"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "Seychelly"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "Slovensko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "Slovinsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "Solomon Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "Somálsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "Južná Afrika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Južná Georgia a Južné Sandwich ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "Å panielsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "Srí Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "Sv. Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "Sv. Pierre a Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "Sudán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "Surinam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard a Jan Mayenove ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "Svazijsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "Švédsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "Švaj�iarsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "Sýria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "Tadžíkistán"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tanzania, United Republic Of"
 msgstr "Spojená republika Tanzánia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "Thajsko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Trinidad And Tobago"
 msgstr "Trinidad a Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "Tunis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "Turecko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "Turkménistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Turks And Caicos Islands"
 msgstr "Turecké a Caicoské ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "Ukrajina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Arab Emirates"
 msgstr "Spojené Arabské Emiráty"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "Spojené kráľovstvo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "Uruguaj"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, British"
 msgstr "Britské panenské ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Virgin Islands, U.S."
 msgstr "Americké paneské ostrovy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis And Futuna Islands"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "Západná Sahara"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "Jemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "Zambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:54
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:467
+#: ../plugins/exchange-operations/exchange-delegates.c:954
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/save-attachments/save-attachments.c:351
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Meno"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "AOL Instant Messenger"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Yahoo Messenger"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 #, fuzzy
 msgid "Gadu-Gadu Messenger"
 msgstr "_Poslať správu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
 msgid "Service"
 msgstr "Služba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
-#: ../plugins/publish-calendar/publish-calendar.c:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../calendar/gui/caltypes.xml.h:25
+#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:694
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Umiestnenie"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "Meno používateľa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Domov"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Iné"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Source Book"
 msgstr "Zdrojová kniha"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Target Book"
 msgstr "Cieľová kniha"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
 msgid "Is New Contact"
 msgstr "Je nový kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Writable Fields"
 msgstr "Zapisovateľné polia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Required Fields"
 msgstr "Vyžadované polia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Zmenené"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
-#, fuzzy, c-format
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2416
+#, c-format
 msgid "Contact Editor - %s"
-msgstr "Editor kontaktov"
+msgstr "Editor kontaktov - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "Please select an image for this contact"
 msgstr "Prosím, vyberte si obrázok pre tento kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "_No image"
-msgstr "Bez obrázka"
+msgstr "_Bez obrázka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3088
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2580,59 +2593,56 @@ msgstr ""
 "Údaje kontaku sú neplatné:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3092
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3090
 #, c-format
 msgid "'%s' has an invalid format"
-msgstr ""
+msgstr "'%s' má neplatný tvar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
 #, c-format
 msgid "%s'%s' has an invalid format"
-msgstr ""
+msgstr "%s'%s' má neplatný tvar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3114
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3125
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
 #, c-format
 msgid "%s'%s' is empty"
-msgstr ""
+msgstr "%s'%s' je prázdny"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3140
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3138
 msgid "Invalid contact."
 msgstr "Neplatný kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:298
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "Contact Quick-Add"
 msgstr "Rýchly kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
 msgid "_Edit Full"
 msgstr "_Upraviť celé"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:402
 msgid "_Full name"
-msgstr "_Celé meno:"
+msgstr "_Celé meno"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:413
 msgid "E_mail"
-msgstr "E-mail"
+msgstr "E_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:369
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:424
 msgid "_Select Address Book"
-msgstr "Nový adresár"
+msgstr "_Vybrať adresár"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
-#, fuzzy, c-format
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
+#, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact list (%s)?"
 msgstr ""
 "Ste si istý, že chcete\n"
-"odstrániť zoznam kontaktov (%s) ?"
+"odstrániť zoznam kontaktov (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2640,16 +2650,16 @@ msgstr ""
 "Ste si istý, že chcete\n"
 "odstrániť tieto zoznamy kontaktov?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
-#, fuzzy, c-format
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
+#, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact (%s)?"
 msgstr ""
 "Ste si istý, že chcete\n"
-"odstrániť kontakt (%s) ?"
+"odstrániť kontakt (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2758,73 +2768,58 @@ msgstr "Služba _IM:"
 #: ../addressbook/gui/contact-editor/im.glade.h:4
 #: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:242
-#: ../plugins/exchange-operations/exchange-contacts.c:234
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
 msgid "_Location:"
 msgstr "_Umiestnenie:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-msgid "Add an email to the List"
-msgstr "Pridať email do zoznamu"
+msgid "<b>Members</b>"
+msgstr "<b>ÄŒlenovia</b>"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:943
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
 msgid "Contact List Editor"
 msgstr "Editor zoznamu kontaktov"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-msgid "Insert email addresses from Address Book"
-msgstr "Pridať email adresu z adresára"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-msgid "Members"
-msgstr "ÄŒlenovia"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "Remove an email address from the List"
-msgstr "Odstrániť email adresu zo zoznamu"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Select..."
+msgstr "Vybrať..."
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Skryť adresy pri posielaní pošty do tohto zoznamu"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_List name:"
 msgstr "Meno _zoznamu:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
-msgid "_Select"
-msgstr "_Vybrať"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Za_dajte emailovú adresu, alebo do zoznamu pretiahnite kontakt myšou:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
-#: ../addressbook/gui/widgets/e-addressbook-model.c:298
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:383
-#: ../addressbook/gui/widgets/e-addressbook-view.c:217
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
+msgid "Contact List Members"
+msgstr "ÄŒlenovia zoznamu kontaktov"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
+msgid "_Members"
+msgstr "ÄŒle_novia"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:311
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "Kniha"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
 msgid "Is New List"
 msgstr "Je nový zoznam"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:764
-msgid "_Members"
-msgstr "ÄŒle_novia"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:767
-msgid "Contact List Members"
-msgstr "ÄŒlenovia zoznamu kontaktov"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Zmenený kontakt:"
@@ -2863,47 +2858,46 @@ msgstr ""
 "Meno alebo e-mail pre tento kontakt už v tomto prie�inku\n"
 "existuje. Chcete ho aj tak pridať?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-#, fuzzy
-msgid "Merge Contact"
-msgstr "Nový kontakt"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
-#, fuzzy
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
-msgstr "_Správa"
+msgstr "_Zlú�iť"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
+msgid "Merge Contact"
+msgstr "Zlú�iť kontakt"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/merging/eab-contact-merging.c:267
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "E-mail"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
-#: ../calendar/gui/cal-search-bar.c:78 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Ľubovoľné pole obsahuje"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "E-mail za�ína na"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Meno za�ína na"
+msgid "Name contains"
+msgstr "Meno obsahuje"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "Bez kontaktov"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -2911,149 +2905,136 @@ msgstr[0] "%d kontaktov"
 msgstr[1] "%d kontakt"
 msgstr[2] "%d kontakty"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-addressbook-model.c:318
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Dotaz"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "Chyba pri vytváraní pohľadu na adresár"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
-#: ../widgets/table/e-table-click-to-add.c:510
-#: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3543
-#: ../widgets/text/e-text.c:3544
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
+#: ../widgets/table/e-table-click-to-add.c:509
+#: ../widgets/table/e-table-selection-model.c:302
+#: ../widgets/table/e-table.c:3354
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3553
 msgid "Model"
 msgstr "Model"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:104
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Chyba pri zmene karty"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+msgid "Name begins with"
+msgstr "Meno za�ína na"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "Zdroj"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:500
+#: ../calendar/gui/e-meeting-list-view.c:508
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Typ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1924
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "Uložiť ako VCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+msgid "Save as vCard..."
+msgstr "Uložiť ako vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-#: ../calendar/gui/e-calendar-table.c:1325
-#: ../calendar/gui/e-calendar-view.c:1674 ../calendar/gui/e-memo-table.c:920
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-view.c:1670 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Otvoriť"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
-msgstr "Nový kontakt..."
+msgstr "_Nový kontakt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
-msgstr "Nový zoznam kontaktov..."
+msgstr "Nový zoznam _kontaktov..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "_Save as VCard..."
-msgstr "_Uložiť ako vKartu..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+msgid "_Save as vCard..."
+msgstr "_Uložiť ako vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 #, fuzzy
 msgid "_Forward Contact"
 msgstr "Predať �alej kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 #, fuzzy
 msgid "_Forward Contacts"
 msgstr "Predať �alej kontakty"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 #, fuzzy
 msgid "Send _Message to Contact"
 msgstr "Poslať správu kontaktu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
-msgstr "Poslať správu do zoznamu"
+msgstr "Poslať _správu do zoznamu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
-msgstr "Poslať správu kontaktom"
+msgstr "Poslať _správu kontaktom"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
-msgstr "Tla�iť"
+msgstr "_Tla�iť"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
-msgstr "Kopírovať do adresára..."
+msgstr "K_opírovať do adresára..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
-msgstr "Presunúť do adresára..."
+msgstr "Pre_sunúť do adresára..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "Vy_strihnúť"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1333
-#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:928
-#: ../composer/e-msg-composer.c:3209 ../mail/em-folder-tree.c:1001
-#: ../mail/em-folder-view.c:1275 ../mail/message-list.c:1969
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:484
+#: ../calendar/gui/e-calendar-table.c:1584
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
+#: ../composer/e-msg-composer.c:2052 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2106
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopírovať"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
-msgstr "Vložiť"
+msgstr "Vl_ožiť"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
-#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
-#: ../calendar/gui/cal-search-bar.c:681
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Any Category"
 msgstr "Ľubovoľná kategória"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1705
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-msgid "Other error"
-msgstr "Iná chyba"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
 msgstr "Asistent"
 
@@ -3083,7 +3064,7 @@ msgstr "Telefón v aute"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:169
+#: ../calendar/gui/e-cal-component-memo-preview.c:144
 #: ../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
@@ -3091,10 +3072,9 @@ msgid "Categories"
 msgstr "Kategórie"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Company"
-msgstr "_Firma:"
+msgstr "Firma"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 msgid "Company Phone"
@@ -3117,9 +3097,8 @@ msgid "File As"
 msgstr "Uložiť ako"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-#, fuzzy
 msgid "Given Name"
-msgstr "Meno poľa"
+msgstr "Krstné meno"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
@@ -3142,22 +3121,22 @@ msgid "Journal"
 msgstr "Žurnál"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
 msgid "Manager"
 msgstr "Manažér"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "Mobile Phone"
 msgstr "Mobilný telefón"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Nickname"
 msgstr "Prezývka"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:604
+#: ../addressbook/gui/widgets/eab-contact-display.c:667
 msgid "Note"
 msgstr "Poznámka"
 
@@ -3186,14 +3165,14 @@ msgid "Radio"
 msgstr "Rádio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:511
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "Rola"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Spouse"
 msgstr "Manžel(ka)"
 
@@ -3223,63 +3202,73 @@ msgstr "Jednotka"
 msgid "Web Site"
 msgstr "WWW stránka"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
-#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
-#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
-#: ../widgets/table/e-table-click-to-add.c:524
-#: ../widgets/table/e-table-col.c:99
-#: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../addressbook/gui/widgets/e-minicard-label.c:116
+#: ../addressbook/gui/widgets/e-minicard.c:155
+#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
+#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
+#: ../widgets/table/e-table-click-to-add.c:523
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-field-chooser-item.c:654
+#: ../widgets/table/e-table-group-container.c:992
+#: ../widgets/table/e-table-group-container.c:993
+#: ../widgets/table/e-table-group-leaf.c:637
+#: ../widgets/table/e-table-group-leaf.c:638
+#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Width"
 msgstr "Šírka"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
-#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
-#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
-#: ../widgets/table/e-table-click-to-add.c:531
-#: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
-#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
+#: ../addressbook/gui/widgets/e-minicard-label.c:123
+#: ../addressbook/gui/widgets/e-minicard.c:162
+#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
+#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
+#: ../widgets/table/e-table-click-to-add.c:530
+#: ../widgets/table/e-table-field-chooser-item.c:661
+#: ../widgets/table/e-table-group-container.c:985
+#: ../widgets/table/e-table-group-container.c:986
+#: ../widgets/table/e-table-group-leaf.c:630
+#: ../widgets/table/e-table-group-leaf.c:631
+#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
+#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
 msgid "Height"
 msgstr "Výška"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard-label.c:130
+#: ../addressbook/gui/widgets/e-minicard.c:170
 msgid "Has Focus"
 msgstr "Je aktívny"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:137
 msgid "Field"
 msgstr "Pole"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:144
 msgid "Field Name"
 msgstr "Názov poľa"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:151
 msgid "Text Model"
 msgstr "Model textu"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:158
 msgid "Max field name length"
 msgstr "Maximálna dĺžka mena poľa"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "Šírka stĺpca"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:178
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"Hľadanie kontaktov..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3293,7 +3282,7 @@ msgstr ""
 "\n"
 "alebo dvojitým kliknutím vytvoríte nový kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3307,7 +3296,7 @@ msgstr ""
 "\n"
 "Dvojitým kliknutím vytvoríte nový kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3317,7 +3306,7 @@ msgstr ""
 "\n"
 "Vyhľadať kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3327,179 +3316,169 @@ msgstr ""
 "\n"
 "V tomto pohľade nie je �o ukázať."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "Adaptér"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#, fuzzy
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
-msgstr "E-mail"
+msgstr "Pracovný E-mail"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
-#, fuzzy
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
-msgstr "Domáci fax"
+msgstr "Domáci Email"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
-#, fuzzy
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:831
 msgid "Other Email"
-msgstr "Ďalší fax"
+msgstr "Ďalší Email"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:178
 msgid "Selected"
 msgstr "Výbrané"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:185
 msgid "Has Cursor"
 msgstr "Má kurzor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
-msgstr "Otvoriť odkaz v prehliada�i"
+msgstr "_Otvoriť odkaz v prehliada�i"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2671
-#, fuzzy
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
-msgstr "Kopírovať umiestnenie odkazu"
+msgstr "_Kopírovať umiestnenie odkazu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
-msgstr "Poslať _správu zoznamu..."
+msgstr "_Poslať novú správu pre..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:175
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-#, fuzzy
 msgid "Copy _Email Address"
-msgstr "_E-mailová adresa:"
+msgstr "Kopírovať _E-mailovú adresu"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:359
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+#: ../addressbook/gui/widgets/eab-contact-display.c:372
 msgid "(map)"
 msgstr ""
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/eab-contact-display.c:402
 msgid "map"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:456
-#: ../addressbook/gui/widgets/eab-contact-display.c:763
+#: ../addressbook/gui/widgets/eab-contact-display.c:487
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "Zoznam �lenov"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
 msgid "Department"
-msgstr "_Oddelenie:"
+msgstr "Oddelenie"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:568
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Profession"
-msgstr "_Povolanie:"
+msgstr "Povolanie"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
 msgid "Position"
 msgstr "Pozícia"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
 msgid "Video Chat"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:791
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2379
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
-#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
-#: ../plugins/hula-account-setup/camel-hula-listener.c:378
-#: ../plugins/hula-account-setup/camel-hula-listener.c:407
+#: ../addressbook/gui/widgets/eab-contact-display.c:636
+#: ../calendar/gui/calendar-commands.c:93
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/gnome-cal.c:2451
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:576
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
+#: ../plugins/hula-account-setup/camel-hula-listener.c:377
+#: ../plugins/hula-account-setup/camel-hula-listener.c:406
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Kalendár"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
-#, fuzzy
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
-msgstr "Voľno/zaneprázdnený URL:"
+msgstr "Voľný/zaneprázdnený"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
-#: ../addressbook/gui/widgets/eab-contact-display.c:590
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 msgid "Phone"
 msgstr "Telefón"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:639
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:587
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Home Page"
-msgstr "_Domovská stránka:"
+msgstr "Domovská stránka"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
 #, fuzzy
 msgid "Web Log"
 msgstr "Adresa _WWW stránky:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
-#: ../calendar/gui/e-calendar-view.c:2318
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2342
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
-msgstr "Dátum na_rodenia:"
+msgstr "Dátum narodenia"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
-#: ../calendar/gui/e-calendar-view.c:2319
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
-msgstr "_Výro�ie:"
+msgstr "Výro�ie"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 #, fuzzy
 msgid "Job Title"
 msgstr "Činnosť/po_zícia:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "Domovská stránka"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
-msgstr ""
+msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "Úspech"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "Sklad off-line"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "Adresár neexistuje"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Nový zoznam kontaktov"
@@ -3507,101 +3486,111 @@ msgstr "Nový zoznam kontaktov"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Prístup zamietnutý"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "Kontakt nenájdený"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "ID kontaktu už existuje"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "Protokol nepodporovaný"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
-#: ../calendar/gui/e-cal-model-tasks.c:350
-#: ../calendar/gui/e-cal-model-tasks.c:665
-#: ../calendar/gui/e-calendar-table.c:403 ../calendar/gui/print.c:2419
-#, fuzzy
+#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../calendar/gui/e-cal-model-tasks.c:364
+#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-calendar-table.c:239
+#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/print.c:2557
 msgid "Canceled"
-msgstr "Zrušený"
+msgstr "Zrušené"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "Nepodarilo sa zrušiť"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/comp-editor-factory.c:422
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Failed"
 msgstr "Overenie totožnosti zlyhalo"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Authentication Required"
 msgstr "Vyžadované overenie totožnosti"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "TLS nie je k dispozícii"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "Taký zdroj neexistuje"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
-msgstr "Spustiť v režime off-line"
+msgstr "Nie je dostupné v režime off-line"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
+msgid "Other error"
+msgstr "Iná chyba"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
-msgstr "Verzia servera"
+msgstr "Neplatná verzia servera"
+
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#, fuzzy
+msgid "Unsupported authentication method"
+msgstr "Používateľ zrušil operáciu."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:95
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
-"We were unable to open this addressbook. This either means this book is not "
+"We were unable to open this address book. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
-"load the addressbook once in online mode to download its contents"
+"load the address book once in online mode to download its contents"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:104
-#, c-format
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#, fuzzy, c-format
 msgid ""
-"We were unable to open this addressbook.  Please check that the path %s "
+"We were unable to open this address book.  Please check that the path %s "
 "exists and that you have permission to access it."
 msgstr ""
 "Nebolo možné otvoriť tento adresár. Prosím, overte, že cesta %sexistuje a že "
 "máte dostato�né práva na prístup k nej."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:113
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
+#, fuzzy
 msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
+"We were unable to open this address book.  This either means you have "
+"entered an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 "Nebolo možné otvoriť tento adresár. To bu� znamená, že ste zadali neplatné "
 "URI, alebo LDAP server je nedosiahnuteľný."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:118
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -3612,77 +3601,86 @@ msgstr ""
 "Ak chcete LDAP v Evolution používať, musíte ho prekompilovať\n"
 "z CVS po získaní OpenLDAP z tohto odkazu.\n"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
+#: ../addressbook/gui/widgets/eab-gui-util.c:141
 #, fuzzy
 msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
+"We were unable to open this address book.  This either means you have "
+"entered an incorrect URI, or the server is unreachable."
 msgstr ""
 "Nebolo možné otvoriť tento adresár. To bu� znamená, že ste\n"
 "zadali neplatné URI, alebo server nefunguje."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
+#, fuzzy
+msgid "Detailed error:"
+msgstr "Nezachytená chyba"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#, fuzzy
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
 "Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
+"the directory server preferences for this address book."
 msgstr ""
 "Vášmu dotazu odpovedá viac kariet, než dokáže server\n"
 "poslať alebo Evolution zobraziť. Prosím, upresnite svoj\n"
 "dotaz alebo zvýšte obmedzenie v nastavení adresárového\n"
 "serveru pre tento adresár."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#, fuzzy
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
+"you have 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 addressbook."
+"preferences for this address book."
 msgstr ""
 "Čas pre vykonanie tohto dotazu prekro�il limit nastavený na serveri\n"
 "alebo pre tento adresár. Prosím, upresnite hľadanie alebo zvýšte\n"
 "�asový limit v nastavení adresárového serveru pre tento adresár."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#, fuzzy
+msgid "The backend for this address book was unable to parse this query."
 msgstr "Podpora tohto adresára nedokázala spracovať tento dotaz."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:163
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#, fuzzy
+msgid "The backend for this address book refused to perform this query."
 msgstr "Podpora tohto adresára odmietla vykonať tento dotaz."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:190
 msgid "This query did not complete successfully."
 msgstr "Tento dotaz nebol dokon�ený úspešne."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error adding list"
 msgstr "Chyba pri pridávaní zoznamu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
-#: ../addressbook/gui/widgets/eab-gui-util.c:666
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:688
 msgid "Error adding contact"
 msgstr "Chyba pri pridávaní kontaktu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying list"
 msgstr "Chyba pri zmene zoznamu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying contact"
 msgstr "Chyba pri zmene kontaktu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
 msgid "Error removing list"
 msgstr "Chyba pri odstraňovaní zoznamu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:616
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:638
 msgid "Error removing contact"
 msgstr "Chyba pri odstraňovaní kontaktu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:293
+#: ../addressbook/gui/widgets/eab-gui-util.c:317
 #, fuzzy, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3697,18 +3695,18 @@ msgstr[1] ""
 "Požadujete, aby sa %d kariet otvorilo v %d nových oknách.\n"
 "Naozaj chcete zobraziť všetky tieto karty?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:301
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 #, fuzzy
 msgid "_Don't Display"
 msgstr "_Zobrazenie"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:302
+#: ../addressbook/gui/widgets/eab-gui-util.c:326
 #, fuzzy
 msgid "Display _All Contacts"
 msgstr "Vybrať všetky kontakty"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:328
+#: ../addressbook/gui/widgets/eab-gui-util.c:352
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3717,16 +3715,15 @@ msgstr ""
 "%s už existuje.\n"
 "Chcete ho prepísať?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:356
 msgid "Overwrite"
 msgstr "Prepísať"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:375
-#: ../addressbook/gui/widgets/eab-gui-util.c:378
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
+#: ../addressbook/gui/widgets/eab-gui-util.c:400
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontaktov"
@@ -3734,61 +3731,61 @@ msgstr[1] "kontakt"
 msgstr[2] "kontakty"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:424
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:461
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Select Address Book"
-msgstr "Nový adresár"
+msgstr "Vybrať adresár"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:575
+#: ../addressbook/gui/widgets/eab-gui-util.c:597
 msgid "list"
 msgstr "zoznam"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:727
+#: ../addressbook/gui/widgets/eab-gui-util.c:749
 msgid "Move contact to"
 msgstr "Presunúť kontakt do"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:729
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Copy contact to"
 msgstr "Kopírovať kontakt do"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:732
+#: ../addressbook/gui/widgets/eab-gui-util.c:754
 msgid "Move contacts to"
 msgstr "Presunúť kontakty do"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:734
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Copy contacts to"
 msgstr "Kopírovať kontakty do"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:960
-msgid "Multiple VCards"
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#, fuzzy
+msgid "Multiple vCards"
 msgstr "Viacero VKariet"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:963
-#, c-format
-msgid "VCard for %s"
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
+#, fuzzy, c-format
+msgid "vCard for %s"
 msgstr "VKarta pre %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1004
-#: ../addressbook/gui/widgets/eab-gui-util.c:1022
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:921
+#: ../addressbook/gui/widgets/eab-gui-util.c:947
+#, c-format
 msgid "Contact information"
-msgstr "Informácie o denníku"
+msgstr "Informácie o kontakte"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1024
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/eab-gui-util.c:949
+#, c-format
 msgid "Contact information for %s"
-msgstr "Informácie o denníku"
+msgstr "Informácie o kontakte %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 #, fuzzy
 msgid "Querying Address Book..."
 msgstr "Otázka pre adresár..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
@@ -3796,73 +3793,75 @@ msgstr[0] "Je %d iný kontaktov."
 msgstr[1] "Je jeden iný kontakt."
 msgstr[2] "Sú %d iné kontakty."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 #, fuzzy
-msgid "Show Full VCard"
+msgid "Show Full vCard"
 msgstr "Zobraziť ú_plné hlavi�ky"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 #, fuzzy
-msgid "Show Compact VCard"
+msgid "Show Compact vCard"
 msgstr "Uložiť kontakt ako VCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
+msgid "Save in address book"
 msgstr "Uložiť do adresára"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
+#, fuzzy
 msgid "Card View"
 msgstr "Karta"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:661
+#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../calendar/importers/icalendar-importer.c:308
+#: ../calendar/importers/icalendar-importer.c:673 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Importujem..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
-msgstr ""
+msgstr "Outlook CSV alebo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:864
 #, fuzzy
 msgid "Outlook CSV and Tab Importer"
 msgstr "Import VCard do Evolution"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
-msgstr ""
+msgstr "Mozilla CSV alebo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr ""
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
-msgstr ""
+msgstr "Evolution CSV alebo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:882
 #, fuzzy
 msgid "Evolution CSV and Tab Importer"
 msgstr "Import VCard do Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:681
 msgid "Evolution LDIF importer"
 msgstr "Import LDIF do Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
+#: ../addressbook/importers/evolution-vcard-importer.c:549
+msgid "vCard (.vcf, .gcrd)"
+msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
-msgid "Evolution VCard Importer"
+#: ../addressbook/importers/evolution-vcard-importer.c:550
+#, fuzzy
+msgid "Evolution vCard Importer"
 msgstr "Import VCard do Evolution"
 
 #: ../addressbook/printing/e-contact-print.glade.h:1
@@ -3906,12 +3905,12 @@ msgid "Format"
 msgstr "Formát"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:648
-#: ../widgets/table/e-table-field-chooser.c:81
+#: ../widgets/table/e-table-field-chooser-item.c:647
+#: ../widgets/table/e-table-field-chooser.c:80
 #: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-selection-model.c:310
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Hlavi�ka"
 
@@ -4013,9 +4012,9 @@ msgstr "Tieňovanie"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:964
-#: ../plugins/exchange-operations/exchange-calendar.c:231
-#: ../plugins/exchange-operations/exchange-contacts.c:217
+#: ../plugins/exchange-operations/exchange-account-setup.c:1080
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
 msgid "Size:"
 msgstr "Veľkosť:"
 
@@ -4032,7 +4031,7 @@ msgid "Top:"
 msgstr "Vrchný:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:154
 msgid "Type:"
 msgstr "Typ:"
 
@@ -4044,541 +4043,551 @@ msgstr "Šírka:"
 msgid "_Font..."
 msgstr "_Písmo..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:54
 #, fuzzy
 msgid "Contact Print Style Editor Test"
 msgstr "Editor zoznamu kontaktov"
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:44
+#: ../addressbook/printing/test-contact-print-style-editor.c:55
+#: ../addressbook/printing/test-print.c:45
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Autorské práva © 2000, Ximian, Inc."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:56
+#: ../addressbook/printing/test-contact-print-style-editor.c:57
 msgid "This should test the contact print style editor widget"
 msgstr ""
 
-#: ../addressbook/printing/test-print.c:43
-#, fuzzy
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
-msgstr "Zoznam _kontaktov"
+msgstr "Test tla�e kontaktov"
 
-#: ../addressbook/printing/test-print.c:46
+#: ../addressbook/printing/test-print.c:47
 msgid "This should test the contact print code"
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "Nie je možné otvoriť súbor"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
 #, fuzzy
-msgid "Couldn't get list of addressbooks"
+msgid "Couldn't get list of address books"
 msgstr "Nie je možné na�ítať %s: %s"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
 msgstr "Nie je možné otvoriť adresár"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:48
 msgid "Specify the output file instead of standard output"
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:50
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "OUTPUTFILE"
-msgstr ""
+msgstr "V�STUPN�SÚBOR"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 #, fuzzy
-msgid "List local addressbook folders"
+msgid "List local address book folders"
 msgstr "pre všetky lokálne a aktívne vzdialené prie�inky"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "Show cards as vcard or csv file"
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Export in asynchronous mode"
 msgstr "Export v asynchrónnom režime"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "NUMBER"
-msgstr ""
+msgstr "POÄŒET"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:102
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
-msgstr ""
+msgstr "V asynchrónnom režime musí byť výstupom súbor."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export.c:164
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "Nezachytená chyba"
 
-#: ../calendar/calendar.error.xml.h:1
+#. 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 ""
+
+#. 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 ""
+
+#: ../calendar/calendar.error.xml.h:5
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:2
+#: ../calendar/calendar.error.xml.h:6
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:3
+#: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:11
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:12
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:11
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "Naozaj chcete odstrániť úlohu `%s'?"
+msgstr "Naozaj chcete odstrániť úlohu `{0}'?"
 
-#: ../calendar/calendar.error.xml.h:12
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "Naozaj chcete odstrániť schôdzku `%s'?"
+msgstr "Naozaj chcete odstrániť schôdzku nazvanú `{0}'?"
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:17
 #, fuzzy
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "Naozaj chcete odstrániť úlohu `%s'?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:18
 #, fuzzy
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Naozaj chcete odstrániť schôdzku `%s'?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:19
 #, fuzzy
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Naozaj chcete odstrániť úlohu `%s'?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:20
 #, fuzzy
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Naozaj chcete odstrániť úlohu `%s'?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:21
 #, fuzzy
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Naozaj chcete odstrániť %d schôdzok?"
 
-#: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:183
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:182
+#, c-format
 msgid "Are you sure you want to delete this meeting?"
-msgstr "Naozaj chcete zrušiť a odstrániť toto stretnutie?"
+msgstr "Naozaj chcete odstrániť toto stretnutie?"
 
-#: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:189
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:188
+#, fuzzy, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Naozaj chcete zrušiť a odstrániť toto stretnutie?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:185
+#, fuzzy, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Naozaj chcete odstrániť %d úloh?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:25
 #, fuzzy
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:26
 #, fuzzy
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:27
 #, fuzzy
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
 
-#: ../calendar/calendar.error.xml.h:24
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
-msgstr "Vytvorí novú úlohu"
+msgstr "Nepodarilo sa vytvoriť novú udalosť"
 
-#: ../calendar/calendar.error.xml.h:25
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "Nepodarilo sa uložiť udalosť"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
-msgstr "Odstrániť \"%s\""
+msgstr "Odstrániť kalendár '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:31
 #, fuzzy
 msgid "Delete memo list '{0}'?"
-msgstr "Odstrániž tento zoznam"
+msgstr "Odstrániť tento zoznam"
 
-#: ../calendar/calendar.error.xml.h:27
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
-msgstr "Odstrániž tento zoznam"
+msgstr "Odstrániť zoznam úloh '{0}'"
 
-#: ../calendar/calendar.error.xml.h:28
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
-msgstr "Neodstraňovať"
+msgstr "_Neposielať"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:34
 #, fuzzy
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Naozaj chcete odstrániť %d schôdzok?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:36
 #, fuzzy
 msgid "Editor could not be loaded."
 msgstr "Tento adresár nemohol byť otvorený."
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:34
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
-msgstr "Chyba pri otváraní kalendára"
+msgstr "Chyba pri na�ítavaní kalendára"
 
-#: ../calendar/calendar.error.xml.h:35
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
-msgstr "Chyba pri pridávaní zoznamu"
+msgstr "Chyba pri na�ítavaní zoznamu poznámok"
 
-#: ../calendar/calendar.error.xml.h:36
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
-msgstr "Chyba pri pridávaní zoznamu"
+msgstr "Chyba pri na�ítavaní zoznamu úloh"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:43
 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:39
+#: ../calendar/calendar.error.xml.h:44
 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:40
+#: ../calendar/calendar.error.xml.h:45
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Nová schôdzka"
+
+#: ../calendar/calendar.error.xml.h:46
+#, fuzzy
+msgid "Save Memo"
+msgstr "_Nezdieľané"
+
+#: ../calendar/calendar.error.xml.h:47
+msgid "Save Task"
+msgstr "Uložiť úlohu"
+
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:53
 msgid "Some features may not work properly with your current server."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:54
 #, fuzzy
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Databáza pre lokálny kalendár Evolution"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:55
 #, fuzzy
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Databáza pre lokálny kalendár Evolution"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:57
 #, fuzzy
 msgid "The calendar is not marked for offline usage."
 msgstr "_Ozna�iť kalendár pre off-line použitie"
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "The memo list is not marked for offline usage"
-msgstr ""
+#: ../calendar/calendar.error.xml.h:58
+#, fuzzy
+msgid "The memo list is not marked for offline usage."
+msgstr "_Ozna�iť kalendár pre off-line použitie"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:59
 #, fuzzy
 msgid "The task list is not marked for offline usage."
 msgstr "_Ozna�iť kalendár pre off-line použitie"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:60
 msgid "This calendar will be removed permanently."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:61
 #, fuzzy
 msgid "This memo list will be removed permanently."
 msgstr "Tento adresár bude odstránený trvale."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:62
 msgid "This task list will be removed permanently."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:63
 #, fuzzy
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Chcete uložiť zmeny?"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:64
 #, fuzzy
 msgid "Would you like to save your changes to this memo?"
 msgstr "Chcete uložiť zmeny?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:65
 #, fuzzy
 msgid "Would you like to save your changes to this task?"
 msgstr "Chcete uložiť zmeny?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:66
 #, fuzzy
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Naozaj chcete zrušiť a odstrániť túto položku denníka?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:67
 #, fuzzy
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Naozaj chcete zrušiť a odstrániť túto položku denníka?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:72
 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:64
-msgid ""
-"You have a read-only calendar source selected. Change to Calendar View and "
-"highlight a calendar that can accept appointments."
-msgstr ""
-
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:73
 #, fuzzy
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "%s  Urobili ste zmeny. Zahodiť ich a aktualizovať editor?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:74
 #, fuzzy
 msgid "You have changed this task, but not yet saved it."
 msgstr "%s  Urobili ste zmeny. Zahodiť ich a aktualizovať editor?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:75
 #, fuzzy
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "%s  Urobili ste zmeny. Zahodiť ich a aktualizovať editor?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:77
 #, fuzzy
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Vaše kontakty pre {0} nebudú dostupné kým nereštartujete Evolution."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:79
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Zahodiť zmeny"
 
-#: ../calendar/calendar.error.xml.h:72 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_Uložiť"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:81
 #, fuzzy
 msgid "_Save Changes"
 msgstr "Lake Charles"
 
-#: ../calendar/calendar.error.xml.h:74
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:143
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:82
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 #, fuzzy
 msgid "_Send"
 msgstr "Poslať"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:83
 #, fuzzy
 msgid "_Send Notice"
 msgstr "Adresát:"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:84
 msgid "{0}."
 msgstr ""
 
-#: ../calendar/common/authentication.c:50
-#: ../plugins/publish-calendar/publish-calendar.c:93
-#: ../smime/gui/component.c:50
-#, fuzzy
-msgid "Enter password"
-msgstr "Zadajte heslo"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:258
 msgid "Split Multi-Day Events:"
 msgstr "Rozdeliť viacdňové udalosti:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1515
-#: ../calendar/conduits/calendar/calendar-conduit.c:1516
-#: ../calendar/conduits/memo/memo-conduit.c:816
-#: ../calendar/conduits/memo/memo-conduit.c:817
-#: ../calendar/conduits/todo/todo-conduit.c:1014
-#: ../calendar/conduits/todo/todo-conduit.c:1015
+#: ../calendar/conduits/calendar/calendar-conduit.c:1523
+#: ../calendar/conduits/calendar/calendar-conduit.c:1524
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/memo/memo-conduit.c:822
+#: ../calendar/conduits/todo/todo-conduit.c:1019
+#: ../calendar/conduits/todo/todo-conduit.c:1020
 #, fuzzy
 msgid "Could not start evolution-data-server"
 msgstr "Nie je možné spustiť server wombat"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1623
-#: ../calendar/conduits/calendar/calendar-conduit.c:1626
+#: ../calendar/conduits/calendar/calendar-conduit.c:1631
+#: ../calendar/conduits/calendar/calendar-conduit.c:1634
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nie je možné pre�ítať blok aplikácie Calendar pilota"
 
-#: ../calendar/conduits/memo/memo-conduit.c:910
-#: ../calendar/conduits/memo/memo-conduit.c:913
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 #, fuzzy
 msgid "Could not read pilot's Memo application block"
 msgstr "Nie je možné pre�ítať blok aplikácie ToDo pilota"
 
-#: ../calendar/conduits/memo/memo-conduit.c:957
-#: ../calendar/conduits/memo/memo-conduit.c:960
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 #, fuzzy
 msgid "Could not write pilot's Memo application block"
 msgstr "Nie je možné pre�ítať blok aplikácie ToDo pilota"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:241
 msgid "Default Priority:"
 msgstr "Štandardná priorita:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1098
-#: ../calendar/conduits/todo/todo-conduit.c:1101
+#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1106
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nie je možné pre�ítať blok aplikácie ToDo pilota"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1143
-#: ../calendar/conduits/todo/todo-conduit.c:1146
+#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1151
 #, fuzzy
 msgid "Could not write pilot's ToDo application block"
 msgstr "Nie je možné pre�ítať blok aplikácie ToDo pilota"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2306
+#: ../plugins/itip-formatter/itip-formatter.c:2432
 msgid "Calendar and Tasks"
 msgstr "Kalendár a úlohy"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1388
+#: ../calendar/gui/calendar-component.c:832
+#: ../calendar/gui/calendar-component.c:1429
 #, fuzzy
 msgid "Calendars"
 msgstr "Kalendár"
@@ -4624,26 +4633,26 @@ msgid "Memo_s"
 msgstr "ÄŒlenovia"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1162
-#: ../calendar/gui/gnome-cal.c:1697 ../calendar/gui/memos-component.c:544
-#: ../calendar/gui/memos-component.c:1096 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/e-memo-table.c:279 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:575
+#: ../calendar/gui/memos-component.c:1128 ../calendar/gui/memos-control.c:354
+#: ../calendar/gui/memos-control.c:370
 #, fuzzy
 msgid "Memos"
 msgstr "ÄŒlenovia"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/e-tasks.c:1430
-#: ../calendar/gui/gnome-cal.c:1569 ../calendar/gui/print.c:1875
-#: ../calendar/gui/tasks-component.c:535
-#: ../calendar/gui/tasks-component.c:1085 ../calendar/gui/tasks-control.c:494
-#: ../calendar/gui/tasks-control.c:510
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
-#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
+#: ../calendar/gui/e-calendar-table.c:703 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1984
+#: ../calendar/gui/tasks-component.c:566
+#: ../calendar/gui/tasks-component.c:1117 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-control.c:508
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:737
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:588
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Úlohy"
@@ -4662,31 +4671,30 @@ msgstr "Ú_lohy"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Služba pripomenutia kalendára Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
-#, fuzzy
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minút"
-msgstr[1] "minút"
+msgstr[1] "minúta"
+msgstr[2] "minúty"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:119
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:381
-#, fuzzy
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "hodín"
-msgstr[1] "hodín"
-msgstr[2] "hodín"
+msgstr[1] "hodina"
+msgstr[2] "hodiny"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
-#, fuzzy
 msgid "Start time"
-msgstr "Čas _za�iatku:"
+msgstr "Čas za�iatku"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
@@ -4696,10 +4704,10 @@ msgstr "Schôdzka"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1615
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1621
-#: ../calendar/gui/e-itip-control.c:1155
-#: ../plugins/itip-formatter/itip-view.c:1001
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1603
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1609
+#: ../calendar/gui/e-itip-control.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Umiestnenie:"
 
@@ -4709,17 +4717,15 @@ msgid "Snooze _time:"
 msgstr "Čas opakovania (minúty)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/comp-editor.c:1336
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:165
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:169
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:52
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:43 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Upraviť"
 
@@ -4733,33 +4739,34 @@ msgstr "O_pakovať"
 msgid "location of appointment"
 msgstr "za�iatok schôdzky"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1461
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
 #, fuzzy
 msgid "No summary available."
 msgstr "Popis nie je k dispozícii."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1483
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
 msgid "No description available."
 msgstr "Popis nie je k dispozícii."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1493
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1480
 #, fuzzy
 msgid "No location information available."
 msgstr "Popis nie je k dispozícii."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1537
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1525
 #, c-format
 msgid "You have %d alarms"
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
+#: ../mail/mail-component.c:1596
 msgid "Warning"
 msgstr "Upozornenie"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1691
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4770,7 +4777,7 @@ msgstr ""
 "pomocou e-mailu, ale toto upozornenie tak bolo nastavené.\n"
 "Evolution preto zobrazí normálny dialóg."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1721
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4787,53 +4794,56 @@ msgstr ""
 "\n"
 "Chcete tento program spustiť?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1747
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
 msgid "Do not ask me about this program again."
 msgstr "Pre tento program túto správu už nezobrazovať."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
 msgstr "Nie je možné inicializovať Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:154
 #, fuzzy
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
 msgstr "Nie je možné vytvoriť vytváracie rozhranie pre službu pripomínania"
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "neplatný �as"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
-#: ../calendar/gui/misc.c:113
-#, fuzzy, c-format
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/misc.c:116
+#, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hodín"
-msgstr[1] "%d hodín"
+msgstr[1] "%d hodina"
+msgstr[2] "%d hodiny"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
-#: ../calendar/gui/misc.c:119
-#, fuzzy, c-format
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/misc.c:122
+#, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minút"
-msgstr[1] "%d minút"
+msgstr[1] "%d minúta"
+msgstr[2] "%d minúty"
 
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
-#: ../calendar/gui/misc.c:123
-#, fuzzy, c-format
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/misc.c:126
+#, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekúnd"
-msgstr[1] "%d sekúnd"
+msgstr[1] "%d sekunda"
+msgstr[2] "%d sekundy"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 #, fuzzy
@@ -5074,12 +5084,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Zobraziť panel \"Náhľad\""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
@@ -5128,7 +5138,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:109
 #, fuzzy
 msgid "Timezone"
 msgstr "Časová zóna "
@@ -5271,73 +5281,73 @@ msgstr ""
 msgid "daylight savings time"
 msgstr ""
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "Súhrn obsahuje"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "Popis obsahuje"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "Kategória je"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "Komentár obsahuje"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:79
 #, fuzzy
 msgid "Location contains"
 msgstr "Popis obsahuje"
 
-#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
-#: ../calendar/gui/cal-search-bar.c:685
+#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
 msgid "Unmatched"
 msgstr "Nenájdené"
 
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Next 7 Days' Tasks"
 msgstr ""
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:644
 #, fuzzy
 msgid "Active Tasks"
 msgstr "Priradiť úlohu"
 
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:648
 #, fuzzy
 msgid "Overdue Tasks"
 msgstr "Úlohy _po termíne:"
 
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:652
 #, fuzzy
 msgid "Completed Tasks"
 msgstr "Dokon�ený "
 
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:656
 #, fuzzy
 msgid "Tasks with Attachments"
 msgstr "Prílohy"
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:702
 #, fuzzy
 msgid "Active Appointments"
 msgstr "Schôdzka"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:706
 #, fuzzy
 msgid "Next 7 Days' Appointments"
 msgstr "_Celodenná Schôdzka"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:93 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Tla�iť"
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../calendar/gui/calendar-commands.c:318
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -5349,17 +5359,18 @@ msgstr ""
 "\n"
 "Naozaj odstrániť tieto úlohy?"
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:324
 #, fuzzy
 msgid "Purge events older than"
 msgstr "vráti menej než"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/calendar-commands.c:329
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:290
+#: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:382
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../plugins/google-account-setup/google-source.c:664
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "dní"
 
@@ -5368,161 +5379,367 @@ msgstr "dní"
 #. Create the Webcal source group
 #. Create the LDAP source group
 #: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:511
-#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1122
+#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
+#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
 #: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:405
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Po�asie"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:640
 #, fuzzy
 msgid "_New Calendar"
 msgstr "Nová Kaledónia"
 
-#: ../calendar/gui/calendar-component.c:606
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2115
+#: ../calendar/gui/calendar-component.c:641
+#: ../calendar/gui/memos-component.c:490 ../calendar/gui/tasks-component.c:481
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Kopírovať..."
 
-#: ../calendar/gui/calendar-component.c:608
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/memos-component.c:467 ../calendar/gui/tasks-component.c:458
-#: ../composer/e-msg-composer.c:3740 ../mail/em-folder-tree.c:2129
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:35
+#: ../calendar/gui/calendar-component.c:645
+#: ../calendar/gui/memos-component.c:494 ../calendar/gui/tasks-component.c:485
 #, fuzzy
-msgid "_Properties"
-msgstr "Vlastnosti"
+msgid "_Make available for offline use"
+msgstr "_Ozna�iť kalendár pre off-line použitie"
 
-#: ../calendar/gui/calendar-component.c:935
+#: ../calendar/gui/calendar-component.c:646
+#: ../calendar/gui/memos-component.c:495 ../calendar/gui/tasks-component.c:486
+#, fuzzy
+msgid "_Do not make available for offline use"
+msgstr "_Nesprístupniť toto off-line"
+
+#: ../calendar/gui/calendar-component.c:976
 #, fuzzy
 msgid "Failed upgrading calendars."
 msgstr "Na�ítavam kalendár..."
 
-#: ../calendar/gui/calendar-component.c:1234
+#: ../calendar/gui/calendar-component.c:1275
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1250
+#: ../calendar/gui/calendar-component.c:1291
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1363
+#: ../calendar/gui/calendar-component.c:1404
 #, fuzzy
 msgid "Calendar Source Selector"
 msgstr "Informácie o kalendári"
 
-#: ../calendar/gui/calendar-component.c:1581
+#: ../calendar/gui/calendar-component.c:1623
 msgid "New appointment"
 msgstr "Nová schôdzka"
 
-#: ../calendar/gui/calendar-component.c:1582
-msgid "_Appointment"
-msgstr "S_chôdzka"
-
-#: ../calendar/gui/calendar-component.c:1583
+#: ../calendar/gui/calendar-component.c:1625
 msgid "Create a new appointment"
 msgstr "Vytvoriť novú schôdzku"
 
-#: ../calendar/gui/calendar-component.c:1589
+#: ../calendar/gui/calendar-component.c:1631
 msgid "New meeting"
 msgstr "Nové stretnutie"
 
-#: ../calendar/gui/calendar-component.c:1590
-msgid "M_eeting"
-msgstr "_Stretnutie"
-
-#: ../calendar/gui/calendar-component.c:1591
+#: ../calendar/gui/calendar-component.c:1633
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Vytvorí novú požiadavku na stretnutie"
 
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1639
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nová celodenná schôdzka"
 
-#: ../calendar/gui/calendar-component.c:1598
-#, fuzzy
-msgid "All Day A_ppointment"
-msgstr "_Celodenná Schôdzka"
-
-#: ../calendar/gui/calendar-component.c:1599
+#: ../calendar/gui/calendar-component.c:1641
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Vytvoriť novú schôdzku"
 
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1647
 #, fuzzy
 msgid "New calendar"
 msgstr "Nová Kaledónia"
 
-#: ../calendar/gui/calendar-component.c:1606
-#, fuzzy
-msgid "Cale_ndar"
-msgstr "Kalendár"
-
-#: ../calendar/gui/calendar-component.c:1607
+#: ../calendar/gui/calendar-component.c:1649
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Vytvoriť nový prie�inok"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Deň"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "Pracovný týždeň"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "Týždeň"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "Mesiac"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+#, fuzzy
+msgid "Any Field"
+msgstr "Pole"
+
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:21
+msgid "Attachments"
+msgstr "Prílohy"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "Ú�astník"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+#, fuzzy
+msgid "Business"
+msgstr "Pracovný fax"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+#, fuzzy
+msgid "Category"
+msgstr "Kategória je"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+#, fuzzy
+msgid "Classification"
+msgstr "K_lasifikácia"
+
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#, fuzzy
+msgid "Competition"
+msgstr "Dátum dokon�enia"
+
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:250
+#: ../calendar/gui/e-cal-model.c:348 ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "Tajný"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../widgets/table/e-table-config.glade.h:6
+msgid "Description"
+msgstr "Popis"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 #, fuzzy
 msgid "Description Contains"
 msgstr "Popis obsahuje"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:38
+msgid "Do Not Exist"
+msgstr "Neexistuje"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:41
+msgid "Exist"
+msgstr "Existuje"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+#, fuzzy
+msgid "Favourites"
+msgstr "Maurícius"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+#, fuzzy
+msgid "Holiday"
+msgstr "Dnes"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+#, fuzzy
+msgid "Hot Contacts"
+msgstr "Kontakty"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+#, fuzzy
+msgid "Ideas"
+msgstr "dní"
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+#, fuzzy
+msgid "International"
+msgstr "Tradi�ná"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+#, fuzzy
+msgid "Key Customer"
+msgstr "Uložiť vlastný pohľad..."
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+#, fuzzy
+msgid "Miscellaneous"
+msgstr "<b>Rôzne</b>"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:28
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
+#, fuzzy
+msgid "Organizer"
+msgstr "Organizátor:"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+#, fuzzy
+msgid "Phone Calls"
+msgstr "_Telefónny zoznam"
+
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:346 ../calendar/gui/e-calendar-table.c:545
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "Súkromný"
+
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-cal-model.c:344
+#: ../calendar/gui/e-calendar-table.c:544 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "Verejný"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:299
+msgid "Recurrence"
+msgstr "Opakovanie"
+
+#: ../calendar/gui/caltypes.xml.h:34
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:545
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
+#: ../mail/em-filter-i18n.h:86 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Stav"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+#, fuzzy
+msgid "Strategies"
+msgstr "Kategórie"
+
+#: ../calendar/gui/caltypes.xml.h:36
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
+#: ../calendar/gui/tasktypes.xml.h:40
+#: ../plugins/save-calendar/csv-format.c:362
+msgid "Summary"
+msgstr "Súhrn"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 #, fuzzy
 msgid "Summary Contains"
 msgstr "Súhrn obsahuje"
 
-#: ../calendar/gui/comp-editor-factory.c:404
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+#, fuzzy
+msgid "Suppliers"
+msgstr "Adresáti"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+#, fuzzy
+msgid "Waiting"
+msgstr "Čakám..."
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:26
+msgid "contains"
+msgstr "obsahuje"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:32
+msgid "does not contain"
+msgstr "neobsahuje"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:46
+msgid "is"
+msgstr "je"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:52
+msgid "is not"
+msgstr "nie je"
+
+#: ../calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Chyba pri otváraní kalendára"
 
-#: ../calendar/gui/comp-editor-factory.c:410
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Method not supported when opening the calendar"
 msgstr "Nepodporovaná metóda pri otváraní kalendára"
 
-#: ../calendar/gui/comp-editor-factory.c:416
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Permission denied to open the calendar"
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
-#: ../calendar/gui/comp-editor-factory.c:428 ../shell/e-shell.c:1285
+#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1272
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 #, fuzzy
 msgid "Edit Alarm"
 msgstr "Pridať pripomenutie"
@@ -5556,17 +5773,17 @@ msgid "Mes_sage:"
 msgstr "_Správa:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Prehrať zvuk"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Spustiť program"
 
@@ -5580,7 +5797,7 @@ msgid "Send To:"
 msgstr "Adresát:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Poslať e-mail"
 
@@ -5635,7 +5852,7 @@ msgstr "minút"
 msgid "start of appointment"
 msgstr "za�iatok schôdzky"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr ""
 
@@ -5646,21 +5863,20 @@ msgstr "_Pridať"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Pripomenutia"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-msg-composer-select-file.c:93
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
+#: ../composer/e-composer-actions.c:64
 #, fuzzy
 msgid "_Suggest automatic display of attachment"
 msgstr "Navrhnúť automatické zobrazovanie príloh"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "Priložiť súbor"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:484
 #, fuzzy
 msgid "Selected Calendars for Alarms"
 msgstr "Kalendáre pre beh pripomenutí pre"
@@ -5681,7 +5897,7 @@ msgid ""
 msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
@@ -5725,8 +5941,8 @@ msgid "Display"
 msgstr "_Zobrazenie"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Piatok"
 
@@ -5738,8 +5954,8 @@ msgid ""
 msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Pondelok"
 
@@ -5755,7 +5971,7 @@ msgid ""
 msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Vyberte farbu"
 
@@ -5765,8 +5981,8 @@ msgid "S_un"
 msgstr "_Ne"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Sobota"
 
@@ -5784,8 +6000,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Zobraziť �í_sla týždňov v navigárovi dátumov"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Nedeľa"
 
@@ -5804,13 +6020,13 @@ msgid "Template:"
 msgstr "Temple"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Å tvrtok"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "Časová _zóna:"
 
@@ -5819,14 +6035,14 @@ msgid "Time format:"
 msgstr "Formát �asu:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Utorok"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Streda"
 
@@ -5906,52 +6122,62 @@ msgstr "_Str"
 msgid "before every appointment"
 msgstr "pred každou schôdzkou"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 #, fuzzy
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Kopírovať obsah adresára lokálne pre prácu bez pripojenia"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 #, fuzzy
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Kopírovať obsah adresára lokálne pre prácu bez pripojenia"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:275
 #, fuzzy
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Kopírovať obsah adresára lokálne pre prácu bez pripojenia"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
+#: ../calendar/gui/dialogs/calendar-setup.c:345
 #, fuzzy
-msgid "C_olor:"
+msgid "Colo_r:"
 msgstr "_Farby"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 #, fuzzy
 msgid "Task List"
 msgstr "Zoznam úloh"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 #, fuzzy
 msgid "Memo List"
 msgstr "Zoznam správ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 #, fuzzy
 msgid "Calendar Properties"
 msgstr "Chyba iCalendar"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nová Kaledónia"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 #, fuzzy
 msgid "Task List Properties"
 msgstr "Zoznam úloh"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:532
+#, fuzzy
+msgid "New Task List"
+msgstr "Zoznam úloh"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:588
+#, fuzzy
+msgid "Memo List Properties"
+msgstr "Zoznam úloh"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 #, fuzzy
 msgid "New Memo List"
 msgstr "Zoznam úloh"
@@ -6002,232 +6228,397 @@ msgstr "%s  Urobili ste zmeny. Zahodiť ich a aktualizovať editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Neurobili ste žiadne zmeny. Aktualizovať editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Chyba validácie: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2247
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2358
 msgid " to "
 msgstr " do "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2251
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2362
 msgid " (Completed "
 msgstr " (Dokon�ený "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2253
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2364
 msgid "Completed "
 msgstr "Dokon�ený "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2258
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2369
 msgid " (Due "
 msgstr " (Termín do "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2260
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2371
 msgid "Due "
 msgstr "Termín do "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2956
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/comp-editor.c:236
+#, c-format
 msgid "Attached message - %s"
-msgstr "Predaná správa - %s"
+msgstr "Priložená správa - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2961
-#: ../composer/e-msg-composer.c:3146
-#, fuzzy, c-format
+#: ../calendar/gui/dialogs/comp-editor.c:241
+#: ../calendar/gui/dialogs/comp-editor.c:414 ../composer/e-msg-composer.c:1766
+#: ../composer/e-msg-composer.c:1985
+#, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
-msgstr[0] "Priložiť pôvodnú správu"
-msgstr[1] "Priložiť pôvodnú správu"
+msgstr[0] "%d priložených správ"
+msgstr[1] "Priložená správa"
+msgstr[2] "%d priložené správy"
 
-#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3210
-#: ../mail/em-folder-tree.c:1002 ../mail/em-folder-utils.c:369
-#: ../mail/em-folder-view.c:1171 ../mail/message-list.c:1970
-#, fuzzy
+#: ../calendar/gui/dialogs/comp-editor.c:485 ../composer/e-msg-composer.c:2053
+#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2107
 msgid "_Move"
-msgstr "Presunúť"
+msgstr "_Presunúť"
 
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3212
-#: ../mail/em-folder-tree.c:1004 ../mail/message-list.c:1972
+#: ../calendar/gui/dialogs/comp-editor.c:487 ../composer/e-msg-composer.c:2055
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2109
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Zrušiť úlohu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:824
+#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:372
+#: ../plugins/prefer-plain/prefer-plain.c:91
+#: ../widgets/misc/e-attachment-bar.c:453
+msgid "attachment"
+msgstr "príloha"
+
+#: ../calendar/gui/dialogs/comp-editor.c:846
 msgid "Could not update object"
 msgstr "Nepodarilo sa aktualizovať objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:974 ../composer/e-msg-composer.c:2573
+#: ../calendar/gui/dialogs/comp-editor.c:934
+msgid "Edit Appointment"
+msgstr "Upraviť schôdzku"
+
+#: ../calendar/gui/dialogs/comp-editor.c:941
+#, c-format
+msgid "Meeting - %s"
+msgstr "Stretnutie - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:943
+#, c-format
+msgid "Appointment - %s"
+msgstr "Schôdzka - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:949
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Priradená úloha - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Task - %s"
+msgstr "Úloha - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:956
 #, fuzzy, c-format
+msgid "Memo - %s"
+msgstr "Stretnutie"
+
+#: ../calendar/gui/dialogs/comp-editor.c:972
+#, fuzzy
+msgid "No Summary"
+msgstr "Žiadny súhrn"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1266
+#, fuzzy
+msgid "Click here to close the current window"
+msgstr "Zavrie aktuálny súbor"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1273
+msgid "Copy selected text to the clipboard"
+msgstr "Kopírovať vybraný text do schránky"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1280
+msgid "Cut selected text to the clipboard"
+msgstr "Vystrihnúť vybraný text do schránky"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1287
+#, fuzzy
+msgid "Click here to view help available"
+msgstr "<kliknutím vyberiete dátum>"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1294
+msgid "Paste text from the clipboard"
+msgstr "Vloží text zo schránky"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1315
+#, fuzzy
+msgid "Click here to save the current window"
+msgstr "Zavrie aktuálny súbor"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1322
+msgid "Select all text"
+msgstr "Vybrať celý text"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1329
+#, fuzzy
+msgid "_Classification"
+msgstr "K_lasifikácia"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../mail/mail-signature-editor.c:208
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+msgid "_File"
+msgstr "_Súbor"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1350
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "_Pomocník"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1357
+#, fuzzy
+msgid "_Insert"
+msgstr "_Vložiť"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1364
+#, fuzzy
+msgid "_Options"
+msgstr "Nastavenie"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1371 ../mail/em-folder-tree.c:2098
+#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
+#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:55
+msgid "_View"
+msgstr "_Pohľad"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1381
+#: ../composer/e-composer-actions.c:471
+msgid "_Attachment..."
+msgstr "_Príloha..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1383
+#, fuzzy
+msgid "Click here to attach a file"
+msgstr "<kliknutím vyberiete prie�inok>"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1391
+msgid "_Categories"
+msgstr "_Kategórie"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1393
+#, fuzzy
+msgid "Toggles whether to display categories"
+msgstr "Prepne, �i má byť zobrazené pole To"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1399
+#, fuzzy
+msgid "Time _Zone"
+msgstr "Časová _zóna:"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1401
+#, fuzzy
+msgid "Toggles whether the time zone is displayed"
+msgstr "Prepne, �i má byť zobrazené pole pre výber odosielateľa"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1410
+#, fuzzy
+msgid "Pu_blic"
+msgstr "Verejný"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1412
+msgid "Classify as public"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1417
+#, fuzzy
+msgid "_Private"
+msgstr "Súkromný"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1419
+#, fuzzy
+msgid "Classify as private"
+msgstr "Tajný"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1424
+#, fuzzy
+msgid "_Confidential"
+msgstr "Tajný"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1426
+#, fuzzy
+msgid "Classify as confidential"
+msgstr "Tajný"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1434
+#, fuzzy
+msgid "R_ole Field"
+msgstr "Pole _To"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1436
+#, fuzzy
+msgid "Toggles whether the Role field is displayed"
+msgstr "Prepne, �i má byť zobrazené pole To"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1442
+#, fuzzy
+msgid "_RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1444
+#, fuzzy
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Prepne, �i má byť zobrazené pole CC"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1450
+#, fuzzy
+msgid "_Status Field"
+msgstr "_Stav:"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1452
+#, fuzzy
+msgid "Toggles whether the Status field is displayed"
+msgstr "Prepne, �i má byť zobrazené pole To"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1458
+#, fuzzy
+msgid "_Type Field"
+msgstr "Pole _To"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1460
+#, fuzzy
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Prepne, �i má byť zobrazené pole To"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1770
+#: ../composer/e-composer-private.c:66 ../widgets/misc/e-attachment-bar.c:1381
+#, fuzzy
+msgid "Recent _Documents"
+msgstr "percet dokon�ených"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1789
+#: ../composer/e-composer-actions.c:699
+msgid "Attach"
+msgstr "Priložiť"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1884
+#, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "Príloha"
-msgstr[1] "Príloha"
-msgstr[2] "Príloha"
+msgstr[0] "<b>%d</b> príloh"
+msgstr[1] "<b>%d</b> príloha"
+msgstr[2] "<b>%d</b> prílohy"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1006
+#: ../calendar/gui/dialogs/comp-editor.c:1916
 #, fuzzy
 msgid "Hide Attachment _Bar"
 msgstr "Príloha"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1009
-#: ../calendar/gui/dialogs/comp-editor.c:1557
+#: ../calendar/gui/dialogs/comp-editor.c:1919
+#: ../calendar/gui/dialogs/comp-editor.c:2227
 #, fuzzy
 msgid "Show Attachment _Bar"
 msgstr "Príloha"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/dialogs/event-page.c:1969
-#: ../calendar/gui/dialogs/task-page.c:1255 ../composer/e-msg-composer.c:3739
+#: ../calendar/gui/dialogs/comp-editor.c:2038
+#: ../calendar/gui/dialogs/event-page.c:1875
+#: ../calendar/gui/dialogs/task-page.c:1197 ../composer/e-msg-composer.c:1040
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Odstrániť"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1131
-#: ../composer/e-msg-composer.c:3742
-#, fuzzy
+#: ../calendar/gui/dialogs/comp-editor.c:2041
+#: ../composer/e-msg-composer.c:1043
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
-msgstr "Pridať prílohu..."
+msgstr "Prid_ať prílohu..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1581
-#: ../mail/em-format-html-display.c:2320
-#, fuzzy
+#: ../calendar/gui/dialogs/comp-editor.c:2249
+#: ../mail/em-format-html-display.c:2201
 msgid "Show Attachments"
-msgstr "Príloha"
+msgstr "Zobraziť prílohy"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1582
+#: ../calendar/gui/dialogs/comp-editor.c:2250
 msgid "Press space key to toggle attachment bar"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2188
-#: ../calendar/gui/dialogs/comp-editor.c:2231
-msgid "Edit Appointment"
-msgstr "Upraviť schôdzku"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2194
-#: ../calendar/gui/dialogs/comp-editor.c:2237
-#, fuzzy, c-format
-msgid "Meeting - %s"
-msgstr "Stretnutie"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2196
-#: ../calendar/gui/dialogs/comp-editor.c:2239
-#, c-format
-msgid "Appointment - %s"
-msgstr "Schôdzka - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2200
-#: ../calendar/gui/dialogs/comp-editor.c:2243
-#, fuzzy, c-format
-msgid "Assigned Task - %s"
-msgstr "Priradiť úlohu"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2202
-#: ../calendar/gui/dialogs/comp-editor.c:2245
-#, c-format
-msgid "Task - %s"
-msgstr "Úloha - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2205
-#: ../calendar/gui/dialogs/comp-editor.c:2248
-#, fuzzy, c-format
-msgid "Memo - %s"
-msgstr "Stretnutie"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2216
-#: ../calendar/gui/dialogs/comp-editor.c:2258
-msgid "No summary"
-msgstr "Žiadny súhrn"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2820 ../mail/em-utils.c:370
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:360
-msgid "attachment"
-msgstr "príloha"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2909
-#: ../calendar/gui/dialogs/comp-editor.c:2963
-#: ../calendar/gui/dialogs/comp-editor.c:2987
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Zmeny tejto položky môžu byť zahodné v prípade, že príde aktualizácia"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3016
-#, fuzzy
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
-msgstr "Nepodarilo sa získať aktuálnu verziu!"
+msgstr "Nepodarilo sa použiť aktuálnu verziu!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 #, fuzzy
 msgid "Could not open source"
 msgstr "Nie je možné otvoriť zdieľaný prie�inok: %s."
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
-#, fuzzy
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
-msgstr "Zrušiť operáciu"
+msgstr ""
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:56
 msgid "The event could not be deleted due to a corba error"
 msgstr "Udalosť nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:59
 msgid "The task could not be deleted due to a corba error"
 msgstr "Úlohu nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:62
 #, fuzzy
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Položku nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:65
 msgid "The item could not be deleted due to a corba error"
 msgstr "Položku nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:72
 msgid "The event could not be deleted because permission was denied"
 msgstr "Udalosť nie je možné odstrániť kvôli nedostato�ným právam"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The task could not be deleted because permission was denied"
 msgstr "Úlohu nie je možné odstrániť kvôli nedostato�ným právam"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:78
 #, fuzzy
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Položku nie je možné odstrániť kvôli nedostato�ným právam"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The item could not be deleted because permission was denied"
 msgstr "Položku nie je možné odstrániť kvôli nedostato�ným právam"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:88
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Udalosť nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:91
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Úlohu nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:94
 #, fuzzy
 msgid "The memo could not be deleted due to an error"
 msgstr "Položku nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:97
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Položku nie je možné odstrániť kvôli chybe systému CORBA"
@@ -6238,7 +6629,7 @@ msgid "Contacts..."
 msgstr "Kontakty"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To:"
 msgstr "Delegovať na:"
 
@@ -6246,144 +6637,201 @@ msgstr "Delegovať na:"
 msgid "Enter Delegate"
 msgstr "Zadajte na koho delegovať"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:196
 #, fuzzy
-msgid "Appoint_ment"
-msgstr "Schôdzka"
+msgid "_Alarms"
+msgstr "Pripomenutia"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
+#: ../calendar/gui/dialogs/event-editor.c:198
+#, fuzzy
+msgid "Click here to set or unset alarms for this event"
+msgstr "<kliknutím vyberiete prie�inok>"
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+#, fuzzy
+msgid "_Recurrence"
 msgstr "Opakovanie"
 
-#: ../calendar/gui/dialogs/event-page.c:828
-#: ../calendar/gui/dialogs/event-page.c:2837
+#: ../calendar/gui/dialogs/event-editor.c:205
+#, fuzzy
+msgid "Make this a recurring event"
+msgstr "Nastaviť tento výskyt ako _presunuteľný"
+
+#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:213
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid "Send Options"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/task-editor.c:125
+#, fuzzy
+msgid "Insert advanced send options"
+msgstr "Používateľ zrušil operáciu."
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+#, fuzzy
+msgid "All _Day Event"
+msgstr "Nová celodenná udalosť"
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+#, fuzzy
+msgid "Toggles whether to have All Day Event"
+msgstr "Prepne, �i má byť zobrazené pole CC"
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+#, fuzzy
+msgid "Show Time as _Busy"
+msgstr "Zobraziť �as ako"
+
+#: ../calendar/gui/dialogs/event-editor.c:230
+#, fuzzy
+msgid "Toggles whether to show time as busy"
+msgstr "Prepne, �i má byť zobrazené pole To"
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+#, fuzzy
+msgid "_Free/Busy"
+msgstr "_Voľno/Zaneprázdnený:"
+
+#: ../calendar/gui/dialogs/event-editor.c:241
+#, fuzzy
+msgid "Query free / busy information for the attendees"
+msgstr "Publikovať informácie o voľnom �ase pre tento kalendár"
+
+#: ../calendar/gui/dialogs/event-editor.c:296
+#, fuzzy
+msgid "Appoint_ment"
+msgstr "Schôdzka"
+
+#: ../calendar/gui/dialogs/event-page.c:735
+#: ../calendar/gui/dialogs/event-page.c:2718
 #, fuzzy
 msgid "This event has alarms"
 msgstr "Táto udalosť bola zmenená."
 
-#: ../calendar/gui/dialogs/event-page.c:908
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:798
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:460
 #, fuzzy
 msgid "Or_ganizer:"
 msgstr "Organizátor:"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:844
 #, fuzzy
 msgid "_Delegatees"
 msgstr "Delegované"
 
-#: ../calendar/gui/dialogs/event-page.c:948
+#: ../calendar/gui/dialogs/event-page.c:846
 #, fuzzy
 msgid "Atte_ndees"
 msgstr "Ú�astník"
 
-#: ../calendar/gui/dialogs/event-page.c:1130
+#: ../calendar/gui/dialogs/event-page.c:1030
 #, fuzzy
 msgid "Event with no start date"
 msgstr "Koncový dátum je pred dátumom za�iatku."
 
-#: ../calendar/gui/dialogs/event-page.c:1133
+#: ../calendar/gui/dialogs/event-page.c:1033
 msgid "Event with no end date"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1305
-#: ../calendar/gui/dialogs/memo-page.c:703
-#: ../calendar/gui/dialogs/task-page.c:884
+#: ../calendar/gui/dialogs/event-page.c:1202
+#: ../calendar/gui/dialogs/memo-page.c:640
+#: ../calendar/gui/dialogs/task-page.c:812
 msgid "Start date is wrong"
 msgstr "Dátum za�iatku je neplatný"
 
-#: ../calendar/gui/dialogs/event-page.c:1315
+#: ../calendar/gui/dialogs/event-page.c:1212
 msgid "End date is wrong"
 msgstr "Dátum konca je neplatný"
 
-#: ../calendar/gui/dialogs/event-page.c:1338
+#: ../calendar/gui/dialogs/event-page.c:1235
 msgid "Start time is wrong"
 msgstr "Čas za�iatku je neplatný"
 
-#: ../calendar/gui/dialogs/event-page.c:1345
+#: ../calendar/gui/dialogs/event-page.c:1242
 msgid "End time is wrong"
 msgstr "Čas konca je neplatný"
 
-#: ../calendar/gui/dialogs/event-page.c:1507
-#: ../calendar/gui/dialogs/memo-page.c:742
-#: ../calendar/gui/dialogs/task-page.c:943
+#: ../calendar/gui/dialogs/event-page.c:1405
+#: ../calendar/gui/dialogs/memo-page.c:681
+#: ../calendar/gui/dialogs/task-page.c:872
 msgid "The organizer selected no longer has an account."
 msgstr "Vybraný organizér už nemá ú�et."
 
-#: ../calendar/gui/dialogs/event-page.c:1513
-#: ../calendar/gui/dialogs/memo-page.c:748
-#: ../calendar/gui/dialogs/task-page.c:949
+#: ../calendar/gui/dialogs/event-page.c:1411
+#: ../calendar/gui/dialogs/memo-page.c:687
+#: ../calendar/gui/dialogs/task-page.c:878
 msgid "An organizer is required."
 msgstr "Organizátor je vyžadovaný."
 
-#: ../calendar/gui/dialogs/event-page.c:1538
-#: ../calendar/gui/dialogs/task-page.c:973
+#: ../calendar/gui/dialogs/event-page.c:1436
+#: ../calendar/gui/dialogs/task-page.c:902
 msgid "At least one attendee is required."
 msgstr "Nutný je aspoň jeden ú�astník."
 
-#: ../calendar/gui/dialogs/event-page.c:1970
-#: ../calendar/gui/dialogs/task-page.c:1256
+#: ../calendar/gui/dialogs/event-page.c:1876
+#: ../calendar/gui/dialogs/task-page.c:1198
 #, fuzzy
 msgid "_Add "
 msgstr "_Pridať"
 
-#: ../calendar/gui/dialogs/event-page.c:2713
+#: ../calendar/gui/dialogs/event-page.c:2594
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
-#: ../calendar/gui/dialogs/event-page.c:2757
-#: ../calendar/gui/dialogs/memo-page.c:958
-#: ../calendar/gui/dialogs/task-page.c:1914
+#: ../calendar/gui/dialogs/event-page.c:2638
+#: ../calendar/gui/dialogs/memo-page.c:890
+#: ../calendar/gui/dialogs/task-page.c:1797
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:3056
+#: ../calendar/gui/dialogs/event-page.c:2918
 #, fuzzy, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "pred každou schôdzkou"
 msgstr[1] "pred každou schôdzkou"
 
-#: ../calendar/gui/dialogs/event-page.c:3062
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, fuzzy, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "koniec schôdzky"
 msgstr[1] "koniec schôdzky"
 
-#: ../calendar/gui/dialogs/event-page.c:3068
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, fuzzy, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "pred každou schôdzkou"
 msgstr[1] "pred každou schôdzkou"
 
-#: ../calendar/gui/dialogs/event-page.c:3081
+#: ../calendar/gui/dialogs/event-page.c:2943
 #, fuzzy
 msgid "Customize"
 msgstr "Uložiť vlastný pohľad..."
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3086
+#: ../calendar/gui/dialogs/event-page.c:2948
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-itip-control.c:1141 ../composer/e-msg-composer.c:2357
-#: ../filter/filter-rule.c:892 ../mail/em-account-editor.c:701
-#: ../mail/em-account-editor.c:1421 ../mail/em-account-prefs.c:478
-#: ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:945
+#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
+#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:200
+#: ../plugins/exchange-operations/exchange-delegates-user.c:195
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1995
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1728
+#: ../plugins/itip-formatter/itip-formatter.c:2088
+#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
+#: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "Žiadna"
 
@@ -6407,11 +6855,6 @@ msgstr "pred každou schôdzkou"
 msgid "Attendee_s..."
 msgstr "Ú�astník"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-msgid "Ca_tegories..."
-msgstr "Ka_tegórie..."
-
 #: ../calendar/gui/dialogs/event-page.glade.h:8
 #, fuzzy
 msgid "Custom Alarm:"
@@ -6419,24 +6862,25 @@ msgstr "Vlastný zvuk pripomenutia"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
 #, fuzzy
-msgid "D_escription:"
-msgstr "Popis:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-#, fuzzy
 msgid "Event Description"
 msgstr "Popis:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Súhrn:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "_Pripomenutie"
 
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+msgid "_Description:"
+msgstr "_Popis:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 #, fuzzy
 msgid "_Time:"
@@ -6467,40 +6911,33 @@ msgid "C_hange Organizer"
 msgstr "_Zmeniť organizátora"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
-#, fuzzy
 msgid "Co_ntacts..."
-msgstr "Kontakty"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#, fuzzy
-msgid "Organizer"
-msgstr "Organizátor:"
+msgstr "Ko_ntakty..."
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Organizátor:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2355
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2478
 #, fuzzy
 msgid "Memo"
 msgstr "Po"
 
-#: ../calendar/gui/dialogs/memo-page.c:920
+#: ../calendar/gui/dialogs/memo-page.c:851
 #, fuzzy, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Nie je možné otvoriť adresár"
 
-#: ../calendar/gui/dialogs/memo-page.c:1104 ../mail/em-format-html.c:1526
-#: ../mail/em-format-html.c:1584 ../mail/em-format-html.c:1610
-#: ../mail/em-format-quote.c:207 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:89 ../mail/message-list.etspec.h:18
+#: ../calendar/gui/dialogs/memo-page.c:1006 ../mail/em-format-html.c:1562
+#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Komu"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:3
 #: ../calendar/gui/dialogs/task-page.glade.h:5
-#, fuzzy
 msgid "Sta_rt date:"
 msgstr "_Po�iato�ný dátum:"
 
@@ -6509,73 +6946,67 @@ msgstr "_Po�iato�ný dátum:"
 msgid "T_o:"
 msgstr "Vrchný:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Popis:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:453
+#: ../calendar/gui/dialogs/task-page.c:364
 #: ../calendar/gui/dialogs/task-page.glade.h:9
-#, fuzzy
 msgid "_Group:"
-msgstr "Skupina"
+msgstr "_Skupina:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
-#, fuzzy
+#: ../calendar/gui/dialogs/recur-comp.c:54
+#, fuzzy, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Upravujete opakujúcu sa udalosť. Čo chcete zmeniť?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
-#, fuzzy
+#: ../calendar/gui/dialogs/recur-comp.c:56
+#, fuzzy, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Upravujete opakujúcu sa udalosť. Čo chcete zmeniť?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
-#, fuzzy
+#: ../calendar/gui/dialogs/recur-comp.c:60
+#, fuzzy, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Upravujete opakujúcu sa úlohu. Čo chcete zmeniť?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
-#, fuzzy
+#: ../calendar/gui/dialogs/recur-comp.c:64
+#, fuzzy, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Upravujete opakujúcu sa udalosť. Čo chcete zmeniť?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This Instance Only"
 msgstr "Iba tento výskyt"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
-#, fuzzy
+#: ../calendar/gui/dialogs/recur-comp.c:93
 msgid "This and Prior Instances"
-msgstr "Tento a budúce výskyty"
+msgstr "Tento a predchádzajúce výskyty"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:99
 msgid "This and Future Instances"
 msgstr "Tento a budúce výskyty"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:104
 msgid "All Instances"
 msgstr "Všetky výskyty"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:498
+#: ../calendar/gui/dialogs/recurrence-page.c:562
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Táto schôdzka obsahuje opakovanie, ktoré Evolution nedokáže upraviť."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:819
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "Dátum opakovania je neplatný"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:930
 msgid "on"
-msgstr "zapnutá"
+msgstr "v"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:996
+#: ../calendar/gui/dialogs/recurrence-page.c:994
 msgid "first"
 msgstr "prvý"
 
@@ -6584,15 +7015,15 @@ msgstr "prvý"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1002
+#: ../calendar/gui/dialogs/recurrence-page.c:1000
 msgid "second"
-msgstr "sekundy"
+msgstr "druhý"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1007
+#: ../calendar/gui/dialogs/recurrence-page.c:1005
 msgid "third"
 msgstr "tretí"
 
@@ -6600,7 +7031,7 @@ msgstr "tretí"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1012
+#: ../calendar/gui/dialogs/recurrence-page.c:1010
 msgid "fourth"
 msgstr "štvrtý"
 
@@ -6608,13 +7039,13 @@ msgstr "štvrtý"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 msgid "last"
 msgstr "posledný"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "Other Date"
 msgstr "Iný dátum"
 
@@ -6622,63 +7053,63 @@ msgstr "Iný dátum"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1051
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 msgid "1st to 10th"
-msgstr ""
+msgstr "1. až 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:1057
+#: ../calendar/gui/dialogs/recurrence-page.c:1055
 msgid "11th to 20th"
-msgstr ""
+msgstr "11. až 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:1063
+#: ../calendar/gui/dialogs/recurrence-page.c:1061
 msgid "21st to 31st"
-msgstr ""
+msgstr "21. až 31."
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 msgid "day"
 msgstr "deň"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1226
+#: ../calendar/gui/dialogs/recurrence-page.c:1210
 msgid "on the"
 msgstr " "
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../calendar/gui/dialogs/recurrence-page.c:1386
 msgid "occurrences"
 msgstr "výskytov"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2089
 #, fuzzy
 msgid "Add exception"
 msgstr "popis"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2130
 msgid "Could not get a selection to modify."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2136
 msgid "Modify exception"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2180
 #, fuzzy
 msgid "Could not get a selection to delete."
 msgstr "Nepodarilo sa aktualizovať objekt"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2304
 #, fuzzy
 msgid "Date/Time"
 msgstr "Dátum a �as:"
@@ -6689,15 +7120,14 @@ msgid "<b>Exceptions</b>"
 msgstr "Popis:"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:3
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Ukážka"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:3
-#, fuzzy
 msgid "<b>Recurrence</b>"
-msgstr "Opakovanie"
+msgstr "<b>Opakovanie</b>"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
@@ -6734,12 +7164,12 @@ msgstr "týždňov"
 msgid "year(s)"
 msgstr "rokov"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "Dátum dokon�enia je neplatný"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:482
 #, fuzzy
 msgid "Web Page"
 msgstr "Adresa _WWW stránky:"
@@ -6757,48 +7187,55 @@ msgstr "Zobrazené správy:"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:348
-#: ../calendar/gui/e-cal-model-tasks.c:663
-#: ../calendar/gui/e-calendar-table.c:402 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/print.c:2416 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-model-tasks.c:362
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/print.c:2554 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Dokon�ený"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:327 ../mail/message-list.c:1036
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1066
 msgid "High"
 msgstr "Vysoká"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
-#: ../calendar/gui/e-cal-model-tasks.c:346
-#: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-cal-model-tasks.c:736
-#: ../calendar/gui/e-calendar-table.c:401 ../calendar/gui/print.c:2413
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-cal-model-tasks.c:754
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2551
 msgid "In Progress"
 msgstr "Prebieha"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:329 ../mail/message-list.c:1034
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:568 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1064
 msgid "Low"
 msgstr "Nízka"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:965 ../calendar/gui/e-calendar-table.c:328
-#: ../mail/message-list.c:1035
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1065
 msgid "Normal"
 msgstr "Normálny"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
-#: ../calendar/gui/e-cal-model-tasks.c:344
-#: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:400 ../calendar/gui/print.c:2410
+#: ../calendar/gui/e-cal-component-preview.c:260
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:639 ../calendar/gui/print.c:2548
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Neza�al"
 
@@ -6808,12 +7245,11 @@ msgid "P_ercent complete:"
 msgstr "Dokon�ených percent: %i"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
-#, fuzzy
 msgid "Stat_us:"
-msgstr "Stav:"
+msgstr "St_av"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:330
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Nedefinovaná"
 
@@ -6823,7 +7259,7 @@ msgid "_Date completed:"
 msgstr "Dátum dokon�enia:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "_Priorita:"
 
@@ -6832,21 +7268,41 @@ msgstr "_Priorita:"
 msgid "_Web Page:"
 msgstr "Adresa _WWW stránky:"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1317
+#: ../calendar/gui/dialogs/task-editor.c:113
+#, fuzzy
+msgid "_Status Details"
+msgstr "Stav: %s"
+
+#: ../calendar/gui/dialogs/task-editor.c:115
+msgid "Click to change or view the status details of the task"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:527
+#, fuzzy
+msgid "_Send Options"
+msgstr "Popis:"
+
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "Ú_loha"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:321
 #, fuzzy
 msgid "Task Details"
 msgstr "Detaily"
 
-#: ../calendar/gui/dialogs/task-page.c:857
+#: ../calendar/gui/dialogs/task-page.c:372
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+#, fuzzy
+msgid "Organi_zer:"
+msgstr "Organizátor:"
+
+#: ../calendar/gui/dialogs/task-page.c:785
 msgid "Due date is wrong"
 msgstr "Termín je neplatný"
 
-#: ../calendar/gui/dialogs/task-page.c:1871
+#: ../calendar/gui/dialogs/task-page.c:1754
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nie je možné otvoriť adresár"
@@ -6863,172 +7319,145 @@ msgstr "Ka_tegórie..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
-msgid "De_scription:"
-msgstr "Popis:"
-
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-#, fuzzy
-msgid "Or_ganiser:"
-msgstr "Organizátor:"
+msgid "D_ue date:"
+msgstr "_Termín:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 #, fuzzy
 msgid "Time zone:"
 msgstr "Časová _zóna:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-#, fuzzy
-msgid "_Due date:"
-msgstr "_Termín:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
-#, fuzzy, c-format
+#: ../calendar/gui/e-alarm-list.c:394
+#, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dní"
-msgstr[1] "%d dní"
+msgstr[1] "%d deň"
+msgstr[2] "%d dni"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
-#, fuzzy, c-format
+#: ../calendar/gui/e-alarm-list.c:400
+#, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d týždňov"
-msgstr[1] "%d týždňov"
+msgstr[1] "%d týždeň"
+msgstr[2] "%d týždne"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Má sa vykonať neznáma akcia"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s pred za�iatkom schôdzky"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:483
+#: ../calendar/gui/e-alarm-list.c:481
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s po za�iatku schôdzky"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:490
+#: ../calendar/gui/e-alarm-list.c:488
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s na za�iatku schôdzky"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s pred koncom schôdzky"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:506
+#: ../calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s po konci schôdzky"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:513
+#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s na konci schôdzky"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:537
+#: ../calendar/gui/e-alarm-list.c:535
 #, c-format
 msgid "%s at %s"
 msgstr "%s o %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:545
+#: ../calendar/gui/e-alarm-list.c:543
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s pre neznámy typ spustenia"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3069
+#: ../calendar/gui/e-cal-component-memo-preview.c:75
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Kliknutím pridáte úlohu"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:160
-#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
-#: ../shell/e-shell-folder-title-bar.c:593
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "Bez mena"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:212
-#: ../calendar/gui/e-cal-component-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:211
-#, fuzzy
+#: ../calendar/gui/e-cal-component-memo-preview.c:187
+#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:228
 msgid "Start Date:"
-msgstr "_Po�iato�ný dátum:"
+msgstr "Po�iato�ný dátum:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:225
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-itip-control.c:1201
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:68
+#: ../calendar/gui/e-cal-component-memo-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-itip-control.c:1218
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Popis:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:261
-#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 #, fuzzy
 msgid "Web Page:"
 msgstr "Adresa _WWW stránky:"
 
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-cal-component-preview.c:210
+#: ../calendar/gui/e-itip-control.c:1162
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Súhrn:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
-#, fuzzy
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
-msgstr "_Termín:"
+msgstr "Termín:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:1026
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-itip-control.c:1186
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Stav:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
-#, fuzzy
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
-msgstr "_Priorita:"
-
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:317
-#: ../calendar/gui/e-cal-model.c:324 ../calendar/gui/e-calendar-table.c:305
-msgid "Public"
-msgstr "Verejný"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:326
-#: ../calendar/gui/e-calendar-table.c:306
-msgid "Private"
-msgstr "Súkromný"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:328
-#: ../calendar/gui/e-calendar-table.c:307
-msgid "Confidential"
-msgstr "Tajný"
+msgstr "Priorita:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
@@ -7039,25 +7468,18 @@ msgstr "Dátum konca"
 msgid "Start Date"
 msgstr "Dátum štartu"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:382
-msgid "Summary"
-msgstr "Súhrn"
-
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:379
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:618
 msgid "Free"
 msgstr "Voľný"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:380
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:396
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: ../calendar/gui/e-cal-model-tasks.c:611
+#: ../calendar/gui/e-cal-model-tasks.c:627
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7067,210 +7489,225 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1011 ../calendar/gui/e-cal-model.c:971
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:746
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "�no"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1011 ../calendar/gui/e-cal-model.c:971
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:165
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nie"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:330 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:212 ../mail/em-utils.c:1210
-#: ../plugins/itip-formatter/itip-formatter.c:395
-#: ../plugins/itip-formatter/itip-formatter.c:2020
-#: ../plugins/plugin-manager/plugin-manager.c:82
-#: ../widgets/misc/e-attachment-bar.c:722
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
+#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:987
+#: ../calendar/gui/print.c:1004 ../mail/em-utils.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:447
+#: ../plugins/itip-formatter/itip-formatter.c:2113
+#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: ../calendar/gui/e-cal-model.c:967
+#: ../calendar/gui/e-cal-model.c:987
 msgid "Recurring"
 msgstr "Opakovanie"
 
-#: ../calendar/gui/e-cal-model.c:969
+#: ../calendar/gui/e-cal-model.c:989
 msgid "Assigned"
 msgstr "Priradené"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
-#, fuzzy
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:416
 msgid "Save As..."
-msgstr "Uložiť _ako..."
+msgstr "Uložiť ako..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2165
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2035
 msgid "Select folder to save selected attachments..."
 msgstr ""
 
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:444
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Správa bez mena"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1327
-#: ../calendar/gui/e-calendar-view.c:1675 ../calendar/gui/e-memo-table.c:922
-#: ../mail/em-folder-view.c:1286 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1578
+#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:925
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "Uložiť _ako..."
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
-msgstr ""
+msgstr "Nastaviť ako _pozadie"
 
-#: ../calendar/gui/e-cal-popup.c:281
-#, fuzzy
+#: ../calendar/gui/e-cal-popup.c:288
 msgid "_Save Selected"
-msgstr "Uložiť vybrané"
+msgstr "Uložiť _vybrané"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:791
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:832
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvoriť v %s..."
 
-#: ../calendar/gui/e-calendar-table.c:349
+#: ../calendar/gui/e-calendar-table.c:337
+msgid "* No Summary *"
+msgstr "* Žiadny súhrn *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2214
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organizátor: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:2218
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organizátor: %s"
+
+#: ../calendar/gui/e-calendar-table.c:407
+msgid "Start: "
+msgstr "Å tart: "
+
+#: ../calendar/gui/e-calendar-table.c:419
+msgid "Due: "
+msgstr "Termín: "
+
+#: ../calendar/gui/e-calendar-table.c:588
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:350
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:351
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:352
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:353
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:354
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:355
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:356
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:357
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:358
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:359
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:635
-#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:878
+#: ../calendar/gui/e-calendar-view.c:664 ../calendar/gui/e-memo-table.c:438
 msgid "Deleting selected objects"
 msgstr "Odstráňujem vybrané objekty"
 
-#: ../calendar/gui/e-calendar-table.c:915
-#: ../calendar/gui/e-calendar-view.c:802 ../calendar/gui/e-memo-table.c:642
+#: ../calendar/gui/e-calendar-table.c:1162
+#: ../calendar/gui/e-calendar-view.c:794 ../calendar/gui/e-memo-table.c:644
 msgid "Updating objects"
 msgstr "Aktualizujem objekty"
 
-#: ../calendar/gui/e-calendar-table.c:1099
-#: ../calendar/gui/e-calendar-view.c:1224 ../calendar/gui/e-memo-table.c:817
-#: ../composer/e-msg-composer.c:1388
+#: ../calendar/gui/e-calendar-table.c:1350
+#: ../calendar/gui/e-calendar-view.c:1220 ../calendar/gui/e-memo-table.c:820
+#: ../composer/e-composer-actions.c:277
 msgid "Save as..."
 msgstr "Uložiť ako..."
 
-#: ../calendar/gui/e-calendar-table.c:1322
-#: ../calendar/gui/e-calendar-view.c:1657
-#, fuzzy
+#: ../calendar/gui/e-calendar-table.c:1573
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Task"
-msgstr "Nová úloha"
+msgstr "Nová ú_loha"
 
-#: ../calendar/gui/e-calendar-table.c:1326 ../calendar/gui/e-memo-table.c:921
-#, fuzzy
+#: ../calendar/gui/e-calendar-table.c:1577 ../calendar/gui/e-memo-table.c:924
 msgid "Open _Web Page"
-msgstr "_Otvoriť správu"
+msgstr "Otvoriť _www stránku"
 
-#: ../calendar/gui/e-calendar-table.c:1328
-#: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1676 ../calendar/gui/e-memo-table.c:923
-#: ../mail/em-folder-view.c:1287
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
+#: ../calendar/gui/e-calendar-table.c:1579
+#: ../calendar/gui/e-calendar-view.c:1656 ../calendar/gui/e-memo-table.c:926
+msgid "P_rint..."
 msgstr "_Tla�iť..."
 
-#: ../calendar/gui/e-calendar-table.c:1332
-#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1676 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Vystri_hnúť"
 
-#: ../calendar/gui/e-calendar-table.c:1334
-#: ../calendar/gui/e-calendar-view.c:1663
-#: ../calendar/gui/e-calendar-view.c:1682 ../calendar/gui/e-memo-table.c:929
+#: ../calendar/gui/e-calendar-table.c:1585
+#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Vložiť"
 
-#: ../calendar/gui/e-calendar-table.c:1338 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1589 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Priradiť úlohu"
 
-#: ../calendar/gui/e-calendar-table.c:1339 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1590 ../calendar/gui/e-memo-table.c:936
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "Poslať �alej ako i_Calendar"
 
-#: ../calendar/gui/e-calendar-table.c:1340
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Complete"
 msgstr "_Ozna�iť ako dokon�enú"
 
-#: ../calendar/gui/e-calendar-table.c:1341
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Ozna�iť úlohy ako dokon�ené"
 
-#: ../calendar/gui/e-calendar-table.c:1342
-#, fuzzy
+#: ../calendar/gui/e-calendar-table.c:1593
 msgid "_Mark as Incomplete"
-msgstr "_Ozna�iť ako dokon�enú"
+msgstr "_Ozna�iť ako nedokon�enú"
 
-#: ../calendar/gui/e-calendar-table.c:1343
-#, fuzzy
+#: ../calendar/gui/e-calendar-table.c:1594
 msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_Ozna�iť úlohy ako dokon�ené"
+msgstr "_Ozna�iť vybrané úlohy ako nedokon�ené"
 
-#: ../calendar/gui/e-calendar-table.c:1348
+#: ../calendar/gui/e-calendar-table.c:1599
 msgid "_Delete Selected Tasks"
 msgstr "O_dstrániť vybrané úlohy"
 
-#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-table.c:1836
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Kliknutím pridáte úlohu"
@@ -7285,168 +7722,143 @@ msgid "Complete"
 msgstr "Hotovo"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:6
-#, fuzzy
 msgid "Completion date"
 msgstr "Dátum dokon�enia"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:7
-#, fuzzy
 msgid "Due date"
 msgstr "Termín"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "Priorita"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
 msgid "Start date"
-msgstr "Dátum štartu"
+msgstr "Dátum za�iatku"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:534
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
-msgid "Status"
-msgstr "Stav"
-
-#: ../calendar/gui/e-calendar-view.c:1343
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1339
 msgid "Moving items"
-msgstr "Presúvam správy"
+msgstr "Presúvanie položiek"
 
-#: ../calendar/gui/e-calendar-view.c:1345
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1341
 msgid "Copying items"
-msgstr "Kopírujem správy"
+msgstr "Kopírovanie položiek"
 
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-view.c:1650
 msgid "New _Appointment..."
 msgstr "Nová _schôdzka..."
 
-#: ../calendar/gui/e-calendar-view.c:1655
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New All Day _Event"
 msgstr "Nová celodenná _udalosť"
 
-#: ../calendar/gui/e-calendar-view.c:1656
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New _Meeting"
-msgstr "Nové stretnutie"
+msgstr "Nové _stretnutie"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1663
 msgid "_Current View"
 msgstr "_Aktuálny pohľad"
 
-#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1665
 #, fuzzy
 msgid "Select T_oday"
 msgstr "Vybrať _vlákno"
 
-#: ../calendar/gui/e-calendar-view.c:1670
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "_Select Date..."
-msgstr "Odstrániť..."
+msgstr "_Vybrať dátum..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1672
+msgid "Pri_nt..."
+msgstr "_Tla�iť..."
+
+#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Cop_y to Calendar..."
-msgstr "Kopírovať do prie�inku..."
+msgstr "Kopír_ovať do kalendára..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Mo_ve to Calendar..."
-msgstr "Pre_sunúť do prie�inka..."
+msgstr "Pre_sunúť do kalendára..."
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1684
 #, fuzzy
 msgid "_Delegate Meeting..."
 msgstr "Naplánovať _stretnutie..."
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Schedule Meeting..."
 msgstr "Naplánovať _stretnutie..."
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Forward as iCalendar..."
 msgstr "Poslať �alej ako i_Calendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1691
-#, fuzzy
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Reply"
-msgstr "Odpovedať"
+msgstr "_Odpovedať"
 
-#: ../calendar/gui/e-calendar-view.c:1692 ../mail/em-folder-view.c:1280
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1688 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Odpovedať _všetkým"
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "Make this Occurrence _Movable"
 msgstr "Nastaviť tento výskyt ako _presunuteľný"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1694 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Odstrániť tento vý_skyt"
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "Delete _All Occurrences"
 msgstr "Odstrániť _všetky výskyty"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2196
-#, fuzzy, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organizátor:"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2200
-#, fuzzy, c-format
-msgid "Organizer: %s"
-msgstr "Organizátor:"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2216 ../calendar/gui/print.c:2384
-#, fuzzy, c-format
+#: ../calendar/gui/e-calendar-view.c:2234 ../calendar/gui/print.c:2510
+#, c-format
 msgid "Location: %s"
-msgstr "Umiestnenie:"
+msgstr "Miesto: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2247
-#, fuzzy, c-format
+#: ../calendar/gui/e-calendar-view.c:2268
+#, c-format
 msgid "Time: %s %s"
-msgstr "%s %s z "
+msgstr "ÄŒas: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:116
+#: ../calendar/gui/e-cell-date-edit-text.c:111
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:119
+#: ../calendar/gui/e-cell-date-edit-text.c:114
 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:127
-#, fuzzy, c-format
+#: ../calendar/gui/e-cell-date-edit-text.c:122
+#, c-format
 msgid ""
 "The date must be entered in the format: \n"
 "%s"
 msgstr ""
-"Dátum musí byť vo formáte:\n"
-"\n"
+"Dátum musí byť zadaný vo formáte: \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:807
+#: ../calendar/gui/e-day-view-time-item.c:583
 #, c-format
 msgid "%02i minute divisions"
-msgstr "%02i rozdelení minúty"
+msgstr "%02i minútové úseky"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
@@ -7454,148 +7866,121 @@ msgstr "%02i rozdelení minúty"
 #. 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:1354
-#: ../calendar/gui/e-day-view.c:2171
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1566
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1560
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1674
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:766 ../calendar/gui/e-day-view.c:1119
-#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:800 ../calendar/gui/e-week-view.c:540
+#: ../calendar/gui/print.c:831
 msgid "am"
 msgstr "dopoludnia"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:769 ../calendar/gui/e-day-view.c:1122
-#: ../calendar/gui/e-week-view.c:509 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:803 ../calendar/gui/e-week-view.c:543
+#: ../calendar/gui/print.c:833
 msgid "pm"
 msgstr "popoludní"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "�no. (Úplné opakovanie)"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
-#, fuzzy, c-format
+#: ../calendar/gui/e-itip-control.c:782
+#, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
-msgstr[0] "Každý deň"
+msgstr[0] "Každých %d dní"
 msgstr[1] "Každý deň"
+msgstr[2] "Každé %d dni"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
 #: ../calendar/gui/e-itip-control.c:795
-#, fuzzy, c-format
+#, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
-msgstr[0] "Každý týždeň"
+msgstr[0] "Každých %d týždňov"
 msgstr[1] "Každý týždeň"
+msgstr[2] "Každé %d týždne"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
-#, fuzzy, c-format
+#: ../calendar/gui/e-itip-control.c:802
+#, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
-msgstr[0] "Každý týždeň "
-msgstr[1] "Každý týždeň "
+msgstr[0] "Každých %d týždňov v "
+msgstr[1] "Každý týždeň v "
+msgstr[2] "Každé %d týždne v "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " a "
 
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "%s deň z "
 
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s z "
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:844
-#, fuzzy, c-format
+#: ../calendar/gui/e-itip-control.c:849
+#, c-format
 msgid "every month"
 msgid_plural "every %d months"
-msgstr[0] "každý mesiac"
+msgstr[0] "každých %d mesiacov"
 msgstr[1] "každý mesiac"
+msgstr[2] "každé %d mesiace"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
-#, fuzzy, c-format
+#: ../calendar/gui/e-itip-control.c:861
+#, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
-msgstr[0] "Každý rok"
+msgstr[0] "Každých %d rokov"
 msgstr[1] "Každý rok"
+msgstr[2] "Každé %d roky"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:866
-#, fuzzy, c-format
+#: ../calendar/gui/e-itip-control.c:874
+#, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
-msgstr[0] " celkom %d-krát"
-msgstr[1] " celkom %d-krát"
+msgstr[0] "celkom %d-krát"
+msgstr[1] "celkom raz"
+msgstr[2] "celkom %d-krát"
 
 #. 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:876
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", kon�iace na "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
-#, fuzzy
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
-msgstr "Stav"
+msgstr "Za�ína"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
-#, fuzzy
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
-msgstr "Enid"
+msgstr "Kon�í"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
-#, fuzzy
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
-msgstr "Termín do "
+msgstr "Termín"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "Informácie o iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "Chyba iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
-#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
+#: ../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:344
 #: ../plugins/itip-formatter/itip-view.c:345
 #: ../plugins/itip-formatter/itip-view.c:432
@@ -7606,298 +7991,297 @@ msgid "An unknown person"
 msgstr "Neznáma osoba"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1126
+#: ../calendar/gui/e-itip-control.c:1143
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Prosím, skontrolujte tieto informácie a potom vyberte z menu akciu."
 
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/itip-utils.c:730
-#: ../plugins/itip-formatter/itip-formatter.c:2008
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/itip-utils.c:664
+#: ../plugins/itip-formatter/itip-formatter.c:2101
 msgid "Accepted"
 msgstr "Akceptované"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:733
-#: ../plugins/itip-formatter/itip-formatter.c:2011
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
+#: ../plugins/itip-formatter/itip-formatter.c:2104
 msgid "Tentatively Accepted"
 msgstr "Predbežne akceptové"
 
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/itip-utils.c:736 ../calendar/gui/itip-utils.c:765
-#: ../plugins/itip-formatter/itip-formatter.c:2014
+#: ../calendar/gui/e-itip-control.c:1199
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
+#: ../plugins/itip-formatter/itip-formatter.c:2107
 msgid "Declined"
 msgstr "Odmietnuté"
 
-#: ../calendar/gui/e-itip-control.c:1266
+#: ../calendar/gui/e-itip-control.c:1283
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1268
+#: ../calendar/gui/e-itip-control.c:1285
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> poslal informácie o stretnutí."
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Informácie o stretnutí"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1370
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> požaduje ú�asť %s na stretnutí."
 
-#: ../calendar/gui/e-itip-control.c:1355
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> požaduje vašu ú�asť na stretnutí."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Návrh na stretnutie"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
-#, fuzzy, c-format
+#: ../calendar/gui/e-itip-control.c:1379
+#, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> si praje byť pridaný na existujúce stretnutie."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "Aktualizácia stretnutia"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> si praje dostať najnovšie informácie o stretnutí."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "Požiadavka na aktualizáciu stretnutia"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1392
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> odpovedal na požiadavku o stretnutí."
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Odpove� pre stretnutie"
 
-#: ../calendar/gui/e-itip-control.c:1383
-#, fuzzy, c-format
+#: ../calendar/gui/e-itip-control.c:1400
+#, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> zrušil stretnutie."
 
-#: ../calendar/gui/e-itip-control.c:1384
-#, fuzzy
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "Zrušenie stretnutia"
 
-#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1528
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> poslal nerozpoznateľnú správu."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Neplatná správa o stretnutí"
 
-#: ../calendar/gui/e-itip-control.c:1422
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> poslal informácie o úlohe."
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Informácia o úlohe"
 
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1447
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> požaduje, aby %s vykonal úlohu."
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> požaduje, aby ste vykonali úlohu."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "Návrh úlohy"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1456
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> si praje byť pridaný do existujúcej úlohy."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "Aktualizácia úlohy"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> si praje získať najnovšie informácie o úlohe."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "Požiadavka na aktualizáciu úlohy"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1469
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> odpovedal na priradenie úlohy."
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Odpove� pre úlohu"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, fuzzy, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> zrušil úlohu."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 #, fuzzy
 msgid "Task Cancelation"
 msgstr "Zrušenie úlohy"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Neplatná správa úlohy"
 
-#: ../calendar/gui/e-itip-control.c:1496
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publikoval informácie o voľnom �ase."
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Informácie o voľnom �ase"
 
-#: ../calendar/gui/e-itip-control.c:1501
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> požaduje informáciu o vašom voľnom �ase."
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "Požiadavka na informácie o voľnom �ase"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> odpovedal na požiadavku na informácie o voľnom �ase"
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Odpove� s informácio o voľnom �ase"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Neplatná správa o voľnom �ase"
 
-#: ../calendar/gui/e-itip-control.c:1588
+#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message does not appear to be properly formed"
 msgstr "Správa asi nie je správne formátovaná"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "Táto správa obsahuje iba nepodporované požiadavky."
 
-#: ../calendar/gui/e-itip-control.c:1680
+#: ../calendar/gui/e-itip-control.c:1697
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Príloha neobsahuje platnú správu kalendára"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "Príloha nemá žiadne zobraziteľné položky kalendára"
 
-#: ../calendar/gui/e-itip-control.c:1954
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "Aktualizácia dokon�ená\n"
 
-#: ../calendar/gui/e-itip-control.c:1988
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt nie je platný a nie je možné ho aktualizovať\n"
 
-#: ../calendar/gui/e-itip-control.c:2005
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Táto odpove� nie je od ú�astníka. Chcete ho ako ú�astníka pridať?"
 
-#: ../calendar/gui/e-itip-control.c:2023
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Stav ú�astníka nie je možné aktualizovať, pretože jeho stav nie je platný!\n"
 
-#: ../calendar/gui/e-itip-control.c:2047
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "Stav ú�astníka bol aktualizovaný\n"
 
-#: ../calendar/gui/e-itip-control.c:2054
-#: ../plugins/itip-formatter/itip-formatter.c:1230
+#: ../calendar/gui/e-itip-control.c:2080
+#: ../plugins/itip-formatter/itip-formatter.c:1301
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Stav ú�astníka nie je možné aktualizovať, pretože položka už neexistuje"
 
-#: ../calendar/gui/e-itip-control.c:2085 ../calendar/gui/e-itip-control.c:2142
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "Položka poslaná!\n"
 
-#: ../calendar/gui/e-itip-control.c:2091 ../calendar/gui/e-itip-control.c:2150
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "Položku nie je možné poslať!\n"
 
-#: ../calendar/gui/e-itip-control.c:2230
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Vyberte akciu:"
 
-#: ../calendar/gui/e-itip-control.c:2301
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "Aktualizovať"
 
-#: ../calendar/gui/e-itip-control.c:2329
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Akceptovať"
 
-#: ../calendar/gui/e-itip-control.c:2330
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Predbežne akceptovať"
 
-#: ../calendar/gui/e-itip-control.c:2331
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2357
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Odmietnuť"
 
-#: ../calendar/gui/e-itip-control.c:2360
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "Poslať informácie o voľnom �ase"
 
-#: ../calendar/gui/e-itip-control.c:2388
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "Aktualizovať stav respondenta"
 
-#: ../calendar/gui/e-itip-control.c:2416
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Poslať najnovšie informácie"
 
-#: ../calendar/gui/e-itip-control.c:2444 ../calendar/gui/itip-utils.c:753
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Zrušiť"
@@ -7926,108 +8310,113 @@ msgstr "Na�ítavam kalendár..."
 msgid "Server Message:"
 msgstr "Správa serveru:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Predsedovia"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "Vyžadovaní ú�astníci"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Nepovinní ú�astníci"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Zdroje"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 #, fuzzy
 msgid "Attendees"
 msgstr "Ú�astník"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/e-meeting-store.c:743
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:983
 msgid "Individual"
 msgstr "Individuálne"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:984 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Skupina"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:985
 msgid "Resource"
 msgstr "Zdroj"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
+#: ../calendar/gui/print.c:986
 msgid "Room"
 msgstr "Miestnosť"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/print.c:1000
 msgid "Chair"
 msgstr "Predseda"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/e-meeting-store.c:746
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:1001
 msgid "Required Participant"
 msgstr "Vyžadovaný ú�astník"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:1002
 msgid "Optional Participant"
 msgstr "Nepovinný ú�astník"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/print.c:1003
 msgid "Non-Participant"
 msgstr "Bez ú�asti"
 
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:756
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../calendar/gui/e-meeting-store.c:753
 msgid "Needs Action"
 msgstr "Potrebné úkony"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-time-sel.c:410
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../calendar/gui/e-meeting-time-sel.c:395
 msgid "Tentative"
 msgstr "Predbežný"
 
-#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/itip-utils.c:739
-#: ../plugins/itip-formatter/itip-formatter.c:2017
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/itip-utils.c:673
+#: ../plugins/itip-formatter/itip-formatter.c:2110
 msgid "Delegated"
 msgstr "Delegované"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:484
+#: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
 msgstr ""
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:523
+#: ../calendar/gui/e-meeting-list-view.c:533
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
 msgstr "Prebieha"
 
 #. 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:464
-#: ../calendar/gui/e-meeting-time-sel.c:2116
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2120
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -8035,94 +8424,90 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2149
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2151
 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:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:475
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Out of Office"
 msgstr "Mimo kancelárie"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "No Information"
 msgstr "Žiadna informácia"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:413
 #, fuzzy
 msgid "A_ttendees..."
 msgstr "Ú�astník"
 
-#: ../calendar/gui/e-meeting-time-sel.c:449
+#: ../calendar/gui/e-meeting-time-sel.c:434
 #, fuzzy
 msgid "O_ptions"
 msgstr "Nastavenie"
 
-#: ../calendar/gui/e-meeting-time-sel.c:466
+#: ../calendar/gui/e-meeting-time-sel.c:451
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Zobraziť _iba pracovné hodiny"
 
-#: ../calendar/gui/e-meeting-time-sel.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:461
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Ukázať z_menšené"
 
-#: ../calendar/gui/e-meeting-time-sel.c:491
+#: ../calendar/gui/e-meeting-time-sel.c:476
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "_Obnoviť voľno/zaneprázdnený"
 
-#: ../calendar/gui/e-meeting-time-sel.c:506
+#: ../calendar/gui/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:524
+#: ../calendar/gui/e-meeting-time-sel.c:509
 msgid "_Autopick"
 msgstr "_Autovýber"
 
-#: ../calendar/gui/e-meeting-time-sel.c:539
+#: ../calendar/gui/e-meeting-time-sel.c:524
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:556
+#: ../calendar/gui/e-meeting-time-sel.c:541
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_VÅ¡etky osoby a zdroje"
 
-#: ../calendar/gui/e-meeting-time-sel.c:565
+#: ../calendar/gui/e-meeting-time-sel.c:550
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "VÅ¡etky _osoby a jeden zdroj"
 
-#: ../calendar/gui/e-meeting-time-sel.c:574
+#: ../calendar/gui/e-meeting-time-sel.c:559
 #, fuzzy
 msgid "_Required people"
 msgstr "_Vyžadované osoby"
 
-#: ../calendar/gui/e-meeting-time-sel.c:583
+#: ../calendar/gui/e-meeting-time-sel.c:568
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Vyžadované osoby a _jeden zdroj"
 
-#: ../calendar/gui/e-meeting-time-sel.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:604
 msgid "_Start time:"
 msgstr "Čas _za�iatku:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:646
+#: ../calendar/gui/e-meeting-time-sel.c:631
 msgid "_End time:"
 msgstr "ÄŒas _konca:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Ú�astník"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Kliknutím pridáte ú�astníka"
@@ -8147,18 +8532,18 @@ msgstr "Jazyk"
 msgid "Member"
 msgstr "ÄŒlen"
 
-#: ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/e-memo-table.c:941
 #, fuzzy
 msgid "_Delete Selected Memos"
 msgstr "O_dstrániť vybrané úlohy"
 
-#: ../calendar/gui/e-memo-table.c:1089 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
 #, fuzzy
 msgid "Click to add a memo"
 msgstr "Kliknutím pridáte úlohu"
 
-#: ../calendar/gui/e-memos.c:801 ../calendar/gui/e-tasks.c:917
-#: ../calendar/gui/gnome-cal.c:2852
+#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8167,39 +8552,39 @@ msgstr ""
 "Chyba pre %s:\n"
 "%s"
 
-#: ../calendar/gui/e-memos.c:850
+#: ../calendar/gui/e-memos.c:809
 #, fuzzy
 msgid "Loading memos"
 msgstr "Nahrávanie obrázkov"
 
-#: ../calendar/gui/e-memos.c:931
+#: ../calendar/gui/e-memos.c:890
 #, fuzzy, c-format
 msgid "Opening memos at %s"
 msgstr "Otváram úlohy na %s"
 
-#: ../calendar/gui/e-memos.c:1104 ../calendar/gui/e-tasks.c:1322
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "Odstráňujem vybrané objekty..."
 
-#: ../calendar/gui/e-tasks.c:967
+#: ../calendar/gui/e-tasks.c:963
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Nahrávanie obrázkov"
 
-#: ../calendar/gui/e-tasks.c:1054
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otváram úlohy na %s"
 
-#: ../calendar/gui/e-tasks.c:1299
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "Dokon�ujem úlohy..."
 
-#: ../calendar/gui/e-tasks.c:1349
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "Čistím"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:128
 #, fuzzy
 msgid "Select Timezone"
 msgstr "Vyberte �asovú zónu"
@@ -8207,55 +8592,45 @@ msgstr "Vyberte �asovú zónu"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1547
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1655
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:826
-#, fuzzy
-msgid "Updating query"
-msgstr "Aktualizujem objekty"
-
-#: ../calendar/gui/gnome-cal.c:2504
-#, fuzzy
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
-msgstr "Vlastný pohľad"
+msgstr "_Vlastný pohľad"
 
-#: ../calendar/gui/gnome-cal.c:2505
-#, fuzzy
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
-msgstr "Uložiť vlastný pohľad..."
+msgstr "_Uložiť vlastný pohľad"
 
-#: ../calendar/gui/gnome-cal.c:2510
-#, fuzzy
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
-msgstr "Definovať pohľady..."
+msgstr "_Definovať pohľady..."
 
-#: ../calendar/gui/gnome-cal.c:2676
+#: ../calendar/gui/gnome-cal.c:2791
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Žiadne schôdzky."
 
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2806
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Nahrávanie obrázkov"
 
-#: ../calendar/gui/gnome-cal.c:2704
+#: ../calendar/gui/gnome-cal.c:2815
 #, fuzzy, c-format
 msgid "Loading memos at %s"
 msgstr "Nahrávanie obrázkov"
 
-#: ../calendar/gui/gnome-cal.c:2811
-#, fuzzy, c-format
+#: ../calendar/gui/gnome-cal.c:2920
+#, c-format
 msgid "Opening %s"
-msgstr "Otvoriť v %s..."
+msgstr "Otváranie %s"
 
-#: ../calendar/gui/gnome-cal.c:3768
-#, fuzzy
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
-msgstr "Turín"
+msgstr ""
 
 #: ../calendar/gui/goto-dialog.glade.h:1
 msgid "April"
@@ -8302,162 +8677,150 @@ msgid "October"
 msgstr "Október"
 
 #: ../calendar/gui/goto-dialog.glade.h:12
-#, fuzzy
 msgid "Select Date"
-msgstr "Výber mien"
+msgstr "Vybrať dátumu"
 
 #: ../calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "September"
 
 #: ../calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
 msgid "_Select Today"
-msgstr "Vybrať prie�inok"
+msgstr "_Vybrať dnešok"
 
-#: ../calendar/gui/itip-utils.c:451 ../calendar/gui/itip-utils.c:500
-#: ../calendar/gui/itip-utils.c:606
+#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
+#: ../calendar/gui/itip-utils.c:544
 msgid "An organizer must be set."
 msgstr "Organizátor musí byť nastavený."
 
-#: ../calendar/gui/itip-utils.c:487
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "Nutný je aspoň jeden ú�astník"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "informácie o udalosti"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "Informácie o úlohe"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:819
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 #, fuzzy
 msgid "Memo information"
 msgstr "Žiadna informácia"
 
-#: ../calendar/gui/itip-utils.c:698 ../calendar/gui/itip-utils.c:837
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "Informácie o voľnom �ase"
 
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Informácie o kalendári"
 
-#: ../calendar/gui/itip-utils.c:749
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "Aktualizované"
 
-#: ../calendar/gui/itip-utils.c:757
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "Aktualizovať"
 
-#: ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Protinávrh"
 
-#: ../calendar/gui/itip-utils.c:833
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informácie o voľnom �ase (%s do %s)"
 
-#: ../calendar/gui/itip-utils.c:843
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "Informácie iCalendar"
 
-#: ../calendar/gui/itip-utils.c:1010
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "Musíte byť ú�astníkom stretnutia."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:489
 #, fuzzy
 msgid "_New Memo List"
 msgstr "Zoznam úloh"
 
-#: ../calendar/gui/memos-component.c:540
-#, fuzzy, c-format
+#: ../calendar/gui/memos-component.c:571
+#, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
-msgstr[0] "%d minút"
-msgstr[1] "%d minút"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../calendar/gui/memos-component.c:542 ../calendar/gui/tasks-component.c:533
+#: ../calendar/gui/memos-component.c:573 ../calendar/gui/tasks-component.c:564
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d vybraných"
 msgstr[1] "%d vybraných"
 
-#: ../calendar/gui/memos-component.c:589
+#: ../calendar/gui/memos-component.c:620
 #, fuzzy
 msgid "Failed upgrading memos."
 msgstr "Nahrávanie obrázkov"
 
-#: ../calendar/gui/memos-component.c:949
+#: ../calendar/gui/memos-component.c:980
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/memos-component.c:962
+#: ../calendar/gui/memos-component.c:993
 msgid "There is no calendar available for creating memos"
 msgstr ""
 
-#: ../calendar/gui/memos-component.c:1071
+#: ../calendar/gui/memos-component.c:1103
 #, fuzzy
 msgid "Memo Source Selector"
 msgstr "Nebol vybraný žiadny server"
 
-#: ../calendar/gui/memos-component.c:1254
+#: ../calendar/gui/memos-component.c:1287
 #, fuzzy
 msgid "New memo"
 msgstr "Nové stretnutie"
 
-#: ../calendar/gui/memos-component.c:1255
-msgid "Mem_o"
-msgstr ""
-
-#: ../calendar/gui/memos-component.c:1256
+#: ../calendar/gui/memos-component.c:1289
 #, fuzzy
 msgid "Create a new memo"
 msgstr "Vytvoriť novú testovaciu položku"
 
-#: ../calendar/gui/memos-component.c:1262
+#: ../calendar/gui/memos-component.c:1295
 #, fuzzy
 msgid "New shared memo"
 msgstr "Nový _zdieľaný prie�inok..."
 
-#: ../calendar/gui/memos-component.c:1263
-#, fuzzy
-msgid "_Shared memo"
-msgstr "_Nezdieľané"
-
-#: ../calendar/gui/memos-component.c:1264
+#: ../calendar/gui/memos-component.c:1297
 #, fuzzy
 msgid "Create a shared new memo"
 msgstr "Vytvoriť novú testovaciu položku"
 
-#: ../calendar/gui/memos-component.c:1270
+#: ../calendar/gui/memos-component.c:1303
 #, fuzzy
 msgid "New memo list"
 msgstr "Zoznam úloh"
 
-#: ../calendar/gui/memos-component.c:1271
-#, fuzzy
-msgid "Memo li_st"
-msgstr "prekryť zoznam"
-
-#: ../calendar/gui/memos-component.c:1272
+#: ../calendar/gui/memos-component.c:1305
 #, fuzzy
 msgid "Create a new memo list"
 msgstr "Vytvorí novú úlohu"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 #, fuzzy
 msgid "Print Memos"
 msgstr "Tla�iť položku"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "Nasledujúcich 7 dní"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8465,7 +8828,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../calendar/gui/migration.c:168
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8474,301 +8837,284 @@ msgid ""
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:780 ../calendar/gui/migration.c:948
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:809
+#: ../calendar/gui/migration.c:804
 #, fuzzy, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:977
+#: ../calendar/gui/migration.c:972
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Nie je možné otvoriť adresár"
 
-#: ../calendar/gui/migration.c:1226
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
-#, fuzzy
+#: ../calendar/gui/migration.c:1227
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
 msgid "Notes"
-msgstr "Poznámka"
+msgstr "Poznámky"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:523
 msgid "31st"
 msgstr "31."
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Su"
 msgstr "Ne"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Mo"
 msgstr "Po"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Tu"
 msgstr "Ut"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "We"
 msgstr "St"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Th"
 msgstr "Å t"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Fr"
 msgstr "Pi"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Sa"
 msgstr "So"
 
-#: ../calendar/gui/print.c:2351
+#: ../calendar/gui/print.c:2474
 msgid "Appointment"
 msgstr "Schôdzka"
 
-#: ../calendar/gui/print.c:2353
+#: ../calendar/gui/print.c:2476
 msgid "Task"
 msgstr "Úloha"
 
-#: ../calendar/gui/print.c:2375
-#, fuzzy, c-format
+#: ../calendar/gui/print.c:2501
+#, c-format
 msgid "Summary: %s"
-msgstr "Súhrn:"
+msgstr "Súhrn: %s"
+
+#: ../calendar/gui/print.c:2524
+msgid "Attendees: "
+msgstr "Ú�astníci: "
 
-#: ../calendar/gui/print.c:2426
+#: ../calendar/gui/print.c:2564
 #, c-format
 msgid "Status: %s"
 msgstr "Stav: %s"
 
-#: ../calendar/gui/print.c:2443
+#: ../calendar/gui/print.c:2581
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorita: %s"
 
-#: ../calendar/gui/print.c:2455
+#: ../calendar/gui/print.c:2593
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Dokon�ených percent: %i"
 
-#: ../calendar/gui/print.c:2467
+#: ../calendar/gui/print.c:2605
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2480
+#: ../calendar/gui/print.c:2618
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategórie: %s"
 
-#: ../calendar/gui/print.c:2491
+#: ../calendar/gui/print.c:2629
 msgid "Contacts: "
 msgstr "Kontakty: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2592
-#, fuzzy
-msgid "Upcoming Appointments"
-msgstr "Otvoriť s_chôdzku"
-
-#: ../calendar/gui/tasks-component.c:455
-#, fuzzy
+#: ../calendar/gui/tasks-component.c:480
 msgid "_New Task List"
-msgstr "Zoznam úloh"
+msgstr "Zoznam _nových úloh"
 
-#: ../calendar/gui/tasks-component.c:531
-#, fuzzy, c-format
+#: ../calendar/gui/tasks-component.c:562
+#, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
-msgstr[0] "Žiadne úlohy"
-msgstr[1] "Žiadne úlohy"
+msgstr[0] "%d úloh"
+msgstr[1] "%d úloha"
+msgstr[2] "%d úlohy"
 
-#: ../calendar/gui/tasks-component.c:580
-#, fuzzy
+#: ../calendar/gui/tasks-component.c:611
 msgid "Failed upgrading tasks."
-msgstr "Nahrávanie obrázkov"
+msgstr ""
 
-#: ../calendar/gui/tasks-component.c:937
+#: ../calendar/gui/tasks-component.c:968
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:950
+#: ../calendar/gui/tasks-component.c:981
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1060
+#: ../calendar/gui/tasks-component.c:1092
 #, fuzzy
 msgid "Task Source Selector"
 msgstr "Nebol vybraný žiadny server"
 
-#: ../calendar/gui/tasks-component.c:1316
+#: ../calendar/gui/tasks-component.c:1352
 msgid "New task"
 msgstr "Nová úloha"
 
-#: ../calendar/gui/tasks-component.c:1318
+#: ../calendar/gui/tasks-component.c:1354
 msgid "Create a new task"
 msgstr "Vytvorí novú úlohu"
 
-#: ../calendar/gui/tasks-component.c:1324
-#, fuzzy
+#: ../calendar/gui/tasks-component.c:1360
 msgid "New assigned task"
-msgstr "Priradiť úlohu"
-
-#: ../calendar/gui/tasks-component.c:1325
-#, fuzzy
-msgid "Assigne_d Task"
-msgstr "Priradiť úlohu"
+msgstr "Nová priradená úloha"
 
-#: ../calendar/gui/tasks-component.c:1326
-#, fuzzy
+#: ../calendar/gui/tasks-component.c:1362
 msgid "Create a new assigned task"
-msgstr "Vytvorí novú úlohu"
+msgstr "Vytvoriť novú priradenú úlohu"
 
-#: ../calendar/gui/tasks-component.c:1332
-#, fuzzy
+#: ../calendar/gui/tasks-component.c:1368
 msgid "New task list"
-msgstr "Zoznam úloh"
+msgstr "Zoznam nových úloh"
 
-#: ../calendar/gui/tasks-component.c:1333
-#, fuzzy
-msgid "Tas_k list"
-msgstr "Zoznam úloh"
-
-#: ../calendar/gui/tasks-component.c:1334
-#, fuzzy
+#: ../calendar/gui/tasks-component.c:1370
 msgid "Create a new task list"
-msgstr "Vytvorí novú úlohu"
+msgstr "Vytvoriť zoznam nový úloh"
 
-#: ../calendar/gui/tasks-control.c:454
+#: ../calendar/gui/tasks-control.c:452
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8780,1761 +9126,1933 @@ msgstr ""
 "\n"
 "Naozaj odstrániť tieto úlohy?"
 
-#: ../calendar/gui/tasks-control.c:457 ../mail/em-folder-view.c:1111
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Túto správu už nezobrazovať."
 
-#: ../calendar/gui/tasks-control.c:494 ../calendar/gui/tasks-control.c:510
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "Tla�iť úlohy"
 
-#. The first letter of each day of the week starting with Sunday
-#: ../calendar/gui/weekday-picker.c:319
-msgid "SMTWTFS"
-msgstr "NPUSÅ PS"
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% hotových"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "Zrušené"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "Prebieha"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:50
+msgid "is greater than"
+msgstr "je viac než"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:51
+msgid "is less than"
+msgstr "je menej než"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/importers/icalendar-importer.c:75
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "Verejný prie�inok obsahujúci schôdzky a udalosti"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1558
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:616
+#: ../plugins/itip-formatter/itip-formatter.c:1635
 msgid "Opening calendar"
-msgstr "Nová Kaledónia"
+msgstr "Otváranie kalendára"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:440
 msgid "iCalendar files (.ics)"
 msgstr "Súbory iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:441
 msgid "Evolution iCalendar importer"
 msgstr "Import iCalendar pre Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:517
 #, fuzzy
 msgid "Reminder!"
 msgstr "Pripomenutie!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:569
 msgid "vCalendar files (.vcf)"
-msgstr "Súbory vCalendar (.ics)"
+msgstr "Súbory vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:570
 msgid "Evolution vCalendar importer"
 msgstr "Import vCalendar pre Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:732
 msgid "Calendar Events"
 msgstr "Udalosti kalendára"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:769
 msgid "Evolution Calendar intelligent importer"
 msgstr "Inteligentný import kalendára Evolution"
 
 #.
+#. *
+#. * 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:7
+#: ../calendar/zones.h:26
 msgid "Africa/Abidjan"
 msgstr "Afrika/Abidžan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "Afrika/Akra"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "Afrika/Addis_Abeba"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "Afrika/Alžír"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmera"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "Africa/Banjul"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "Africa/Bissau"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "Africa/Blantyre"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "Africa/Brazzaville"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "Africa/Bujumbura"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "Africa/Káhira"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "Africa/Casablanca"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "Africa/Ceuta"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "Africa/Conakry"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar_es_Salaam"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "Afrika/Džibuti"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "Afrika/Douala"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El_Aaiun"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "Afrika/Freetown"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaborone"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johannesburg"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "Afrika/Khartoum"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinshasa"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "Afrika/Libreville"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "Afrika/Lome"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Lubumbashi"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "Afrika/Lusaka"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "Afrika/Maputo"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "Afrika/Maseru"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "Afrika/Mogadishu"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovia"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "Afrika/Nairobi"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "Afrika/Ndjamena"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamey"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nouakchott"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Ouagadougou"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao_Tome"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timbuktu"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tripolis"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunis"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "Afrika/Windhoek"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "Amerika/Anchorage"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "Amerika/Anguilla"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "Amerika/Antigua"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "Amerika/Araguaina"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "Amerika/Asuncion"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "Amerika/Belize"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa_Vista"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "Amerika/Bogota"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "Amerika/Boise"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos_Aires"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Cambridge_Bay"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "Amerika/Cancun"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "Amerika/Caracas"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "Amerika/Catamarca"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "Amerika/Cayenne"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "Amerika/Cayman"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "Amerika/Chicago"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "Amerika/Chihuahua"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "Amerika/Cordoba"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "Amerika/Kostarika"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "Amerika/Cuiaba"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "Amerika/Curacao"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "Amerika/Danmarkshavn"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "Amerika/Dawson"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Dawson_Creek"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "Amerika/Dominica"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "Amerika/Eirunepe"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "Amerika/El_Salvador"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glace_Bay"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "Amerika/Godthab"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "Amerika/Goose_Bay"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "Amerika/Grand_Turk"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "Amerika/Guadeloupe"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "Amerika/Guatemala"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "Amerika/Guayaquil"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "Amerika/Guajana"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "Amerika/Halifax"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "Amerika/Havana"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "Amerika/Hermosillo"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerika/Indiana/Indianapolis"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indiana/Knox"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indiana/Marengo"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indiana/Vevay"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "Amerika/Indianapolis"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "Amerika/Inuvik"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "Amerika/Iqaluit"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "Amerika/Jamajka"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "Amerika/Jujuy"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "Amerika/Juneau"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentucky/Louisville"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentucky/Monticello"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "Amerika/La_Paz"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los_Angeles"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "Amerika/Louisville"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "Amerika/Maceio"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "Amerika/Managua"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "Amerika/Martinik"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "Amerika/Mazatlan"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "Amerika/Menominee"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "Amerika/Mexico_City"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "Amerika/Miquelon"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "Amerika/Monterrey"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "Amerika/Montserrat"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "Amerika/Nome"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "Amerika/Noronha"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "Amerika/North_Dakota/Center"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramaribo"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "Amerika/Phoenix"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Port-au-Prince"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port_of_Spain"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "Amerika/Porto_Velho"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Portoriko"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "Amerika/Rainy_River"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Rankin_Inlet"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "Amerika/Recife"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio_Branco"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "Amerika/Rosario"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "Amerika/Santiago"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "Amerika/Santo_Domingo"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sao_Paulo"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "Amerika/Scoresbysund"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "Amerika/Shiprock"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "Amerika/St_Johns"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "Amerika/St_Kitts"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "Amerika/St_Lucia"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "Amerika/St_Thomas"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "Amerika/St_Vincent"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "Amerika/Swift_Current"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegucigalpa"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "Amerika/Thule"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Thunder_Bay"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "Amerika/Tijuana"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "Amerika/Vancouver"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "Amerika/Whitehorse"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "Amerika/Winnipeg"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "Amerika/Yakutat"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "Amerika/Yellowknife"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "Antarktída/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antarktída/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktída/DumontDUrville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antarktída/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antarktída/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antarktída/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antarktída/Južný pól"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antarktída/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antarktída/Vostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Arktída/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "�zia/Aden"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "�zia/Almaty"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "�zia/Ammán"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "�zia/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "�zia/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "�zia/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "�zia/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "�zia/Bagdád"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "�zia/Bahrajn"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "�zia/Baku"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "�zia/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "�zia/Bejrút"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "�zia/Biškek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "�zia/Brunei"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "�zia/Kalkata"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "�zia/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "�zia/Chongqing"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "�zia/Colombo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "�zia/Damašok"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "�zia/Dháka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "�zia/Dilí"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "�zia/Dubai"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "�zia/Dušanbe"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "�zia/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "�zia/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "�zia/Hong_Kong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "�zia/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "�zia/Irkutsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "�zia/Istanbul"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "�zia/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "�zia/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "�zia/Jeruzalém"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "�zia/Kábul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "�zia/Kam�atka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "�zia/Kará�í"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "�zia/Kašgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "�zia/Katmandu"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "�zia/Krasnojarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "�zia/Kuala_Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "�zia/Kuching"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "�zia/Kuvajt"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "�zia/Makao"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "�zia/Macao"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "�zia/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "�zia/Makasar"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "�zia/Manila"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "�zia/Muscat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "�zia/Nikózia"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "�zia/Novosibirsk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "�zia/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "�zia/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "�zia/Phnom_Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "�zia/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "�zia/Pchjongjang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "�zia/Katar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "�zia/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "�zia/Rangoon"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "�zia/Riyád"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "�zia/Saigon"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "�zia/Sachalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "�zia/Samarkand"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "�zia/Soul"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "�zia/Šanghaj"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "�zia/Singapur"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "�zia/Taipei"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "�zia/Taškent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "�zia/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "�zia/Teherán"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "�zia/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "�zia/Tokio"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "�zia/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "�zia/Ulanbátár"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "�zia/Urumqi"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "�zia/Vientiane"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "�zia/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "�zia/Jakutsk"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "�zia/Jekaterinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "�zia/Jerevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azorské ostrovy"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermudy"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlantik/Kanárske ostrovy"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Kapverdy"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlantik/Faerské ostrovy"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantik/Jan_Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "Atlantik/Madeira"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantik/Rejkjavík"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantik/Južná_Georgia"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/Svätá Helena"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "Atlantik/Stanley"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "Austrália/Adelaide"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "Austrália/Brisbane"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "Austrália/Broken_Hill"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "Austrália/Darwin"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "Austrália/Hobart"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "Austrália/Lindeman"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "Austrália/Lord_Howe"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "Austrália/Melbourne"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "Austrália/Perth"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "Austrália/Sydney"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Európa/Amsterdam"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Európa/Andorra"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Európa/Atény"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Európa/Belfast"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Európa/Belehrad"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Európa/Berlín"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Európa/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Európa/Brusel"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Európa/Bukurešť"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Európa/Budapešť"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Európa/Chisinau"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Európa/Kodaň"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Európa/Dublin"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Európa/Gibraltar"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Európa/Helsinki"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Európa/Istanbul"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Európa/Kaliningrad"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Európa/Kyjev"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Európa/Lisabon"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
-msgstr "Európa/Lublaň"
+msgstr "Európa/Ľubľana"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Európa/Londýn"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Európa/Luxembourg"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Európa/Madrid"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Európa/Malta"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Európa/Minsk"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Európa/Monako"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Európa/Moskva"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Európa/Nikózia"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Európa/Oslo"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Európa/Paríž"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Európa/Praha"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Európa/Riga"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Európa/Rím"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Európa/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
-msgstr "Európa/San_Marino"
+msgstr "Európa/San_Maríno"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Európa/Sarajevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Európa/Simferopol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Európa/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Európa/Sofia"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
-msgstr "Európa/Stockholm"
+msgstr "Európa/Štokholm"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Európa/Talin"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Európa/Tirana"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Európa/Užhorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Európa/Vaduz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Európa/Vatikán"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Európa/Viedeň"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
-msgstr "Európa/Vilnius"
+msgstr "Európa/Vilňus"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Európa/Varšava"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Európa/Záhreb"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
-msgstr "Európa/Záporožné"
+msgstr "Európa/Záporožie"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Európa/Curych"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "Indický oceán/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "Indický oceán/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "Indický oceán/Viano�né ostrovy"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "Indický oceán/Kokosové ostrovy"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "Indický oceán/Komory"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "Indický oceán/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "Indický oceán/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "Indický oceán/Maledivy"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "Indický oceán/Maurícius"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "Indický oceán/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "Indický oceán/Reunion"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Tichý oceán/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Tichý oceán/Auklandy"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Tichý oceán/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
-msgstr "Tichý oceán/Velkono�né ostrovy"
+msgstr "Tichý oceán/Veľkono�né ostrovy"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Tichý oceán/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Tichý oceán/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Tichý oceán/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Tichý oceán/Fidži"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Tichý oceán/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Tichý oceán/Galapágy"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Tichý oceán/Gambier"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Tichý oceán/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Tichý oceán/Guam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Tichý oceán/Honolulu"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Tichý oceán/Johnston"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Tichý oceán/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Tichý oceán/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Tichý oceán/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Tichý oceán/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Tichý oceán/Marquesas"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Tichý oceán/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Tichý oceán/Nauru"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Tichý oceán/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Tichý oceán/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Tichý oceán/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Tichý oceán/Pago_Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Tichý oceán/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Tichý oceán/Pitcairn"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Tichý oceán/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Tichý oceán/Port_Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Tichý oceán/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Tichý oceán/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Tichý oceán/Tahiti"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Tichý oceán/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Tichý oceán/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Tichý oceán/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Tichý oceán/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Tichý oceán/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Tichý oceán/Yap"
 
-#: ../composer/e-msg-composer-hdrs.c:606
-msgid "Posting destination"
-msgstr "Cieľ posielania"
-
-#: ../composer/e-msg-composer-hdrs.c:607
+#: ../composer/e-composer-autosave.c:275
 #, fuzzy
-msgid "Choose folders to post the message to."
-msgstr "Priloží súbor k správe"
+msgid "Could not open autosave file"
+msgstr "Nie je možné otvoriť správu"
 
-#: ../composer/e-msg-composer-hdrs.c:638
-msgid "Click here for the address book"
-msgstr "Kliknutím zobrazíte adresár"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "Nie je možné získať správu z editora"
 
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: ../composer/e-msg-composer-hdrs.c:670
-#, fuzzy
-msgid "_Reply-To:"
-msgstr "Odpovedať komu:"
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "Vložiť prílohu"
 
-#.
-#. * From
-#.
-#: ../composer/e-msg-composer-hdrs.c:677
-#, fuzzy
-msgid "Fr_om:"
-msgstr "Od:"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "P_riložiť"
 
-#.
-#. * Subject
-#.
-#: ../composer/e-msg-composer-hdrs.c:684
+#: ../composer/e-composer-actions.c:142
+msgid "Untitled Message"
+msgstr "Správa bez mena"
+
+#: ../composer/e-composer-actions.c:473
+msgid "Attach a file"
+msgstr "Priložiť súbor"
+
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "_Zavrieť"
+
+#: ../composer/e-composer-actions.c:480
+msgid "Close the current file"
+msgstr "Zavrie aktuálny súbor"
+
+#: ../composer/e-composer-actions.c:485 ../mail/em-folder-view.c:1337
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "_Tla�iť..."
+
+#: ../composer/e-composer-actions.c:492 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "U_kážka pred tla�ou"
+
+#: ../composer/e-composer-actions.c:501
+msgid "Save the current file"
+msgstr "Uložiť aktuálny súbor"
+
+#: ../composer/e-composer-actions.c:506
+msgid "Save _As..."
+msgstr "Uložiť _ako..."
+
+#: ../composer/e-composer-actions.c:508
+msgid "Save the current file with a different name"
+msgstr "Uloží aktuálny súbor pod iným menom"
+
+#: ../composer/e-composer-actions.c:513
+msgid "Save _Draft"
+msgstr "Uložiť _koncept"
+
+#: ../composer/e-composer-actions.c:515
+msgid "Save as draft"
+msgstr "Uložiť ako koncept"
+
+#: ../composer/e-composer-actions.c:520
+msgid "S_end"
+msgstr "P_oslať"
+
+#: ../composer/e-composer-actions.c:522
+msgid "Send this message"
+msgstr "Poslať túto správu"
+
+#: ../composer/e-composer-actions.c:529
+msgid "Insert Send options"
+msgstr "Vložiť voľby odoslania"
+
+#: ../composer/e-composer-actions.c:534
+msgid "New _Message"
+msgstr "Nová _správa"
+
+#: ../composer/e-composer-actions.c:536
+msgid "Open New Message window"
+msgstr "Otvoriť okno novej správy"
+
+#: ../composer/e-composer-actions.c:543
+msgid "Character _Encoding"
+msgstr "Znaková _sada"
+
+#: ../composer/e-composer-actions.c:550
+msgid "_Security"
+msgstr "Za_bezpe�enie"
+
+#: ../composer/e-composer-actions.c:560
+msgid "PGP _Encrypt"
+msgstr "Å ifrovani_e PGP"
+
+#: ../composer/e-composer-actions.c:562
+msgid "Encrypt this message with PGP"
+msgstr "Zašifrovať túto správu pomocou PGP"
+
+#: ../composer/e-composer-actions.c:568
+msgid "PGP _Sign"
+msgstr "Podpi_s PGP"
+
+#: ../composer/e-composer-actions.c:570
+msgid "Sign this message with your PGP key"
+msgstr "Podpísať túto správu vašim PGP kľú�om"
+
+#: ../composer/e-composer-actions.c:576
 #, fuzzy
-msgid "S_ubject:"
-msgstr "Predmet:"
+msgid "_Prioritize Message"
+msgstr "Tla�iť správu"
 
-#: ../composer/e-msg-composer-hdrs.c:694
+#: ../composer/e-composer-actions.c:578
+msgid "Set the message priority to high"
+msgstr "Nastaviť vysokú prioritu správy"
+
+#: ../composer/e-composer-actions.c:584
 #, fuzzy
-msgid "_To:"
-msgstr "Komu:"
+msgid "Re_quest Read Receipt"
+msgstr "Správa o pre�ítaní"
+
+#: ../composer/e-composer-actions.c:586
+msgid "Get delivery notification when your message is read"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:592
+msgid "S/MIME En_crypt"
+msgstr "Å if_rovanie S/MIME"
+
+#: ../composer/e-composer-actions.c:594
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "Zašifrovať túto správu vaším šifrovacím certifikátom S/MIME"
 
-#: ../composer/e-msg-composer-hdrs.c:695
+#: ../composer/e-composer-actions.c:600
+msgid "S/MIME Sig_n"
+msgstr "Po_dpis S/MIME"
+
+#: ../composer/e-composer-actions.c:602
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Podpísať túto správu podpisovým certifikátor S/MIME"
+
+#: ../composer/e-composer-actions.c:608
+msgid "_Bcc Field"
+msgstr "Pole _Bcc"
+
+#: ../composer/e-composer-actions.c:610
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Prepne, �i má byť zobrazené pole BCC"
+
+#: ../composer/e-composer-actions.c:616
+msgid "_Cc Field"
+msgstr "Pole _Cc"
+
+#: ../composer/e-composer-actions.c:618
+msgid "Toggles whether the CC field is displayed"
+msgstr "Prepne, �i má byť zobrazené pole CC"
+
+#: ../composer/e-composer-actions.c:624
+msgid "_From Field"
+msgstr "Pole _Od"
+
+#: ../composer/e-composer-actions.c:626
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Prepne, �i má byť zobrazené pole pre výber odosielateľa"
+
+#: ../composer/e-composer-actions.c:632
+msgid "_Post-To Field"
+msgstr "Pole _Post-To"
+
+#: ../composer/e-composer-actions.c:634
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "Prepne, �i má byť zobrazené pole Post-To"
+
+#: ../composer/e-composer-actions.c:640
+msgid "_Reply-To Field"
+msgstr "Pole _Reply-To"
+
+#: ../composer/e-composer-actions.c:642
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Prepne, �i má byť zobrazené pole Reply-To"
+
+#: ../composer/e-composer-actions.c:648
+msgid "_Subject Field"
+msgstr "Pole _Predmet"
+
+#: ../composer/e-composer-actions.c:650
+msgid "Toggles whether the Subject field is displayed"
+msgstr "Prepne, �i má byť zobrazené pole Predmet"
+
+#: ../composer/e-composer-actions.c:656
+msgid "_To Field"
+msgstr "Pole _Pre"
+
+#: ../composer/e-composer-actions.c:658
+msgid "Toggles whether the To field is displayed"
+msgstr "Prepne, �i má byť zobrazené pole To"
+
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Zadajte adresátov správy"
 
-#: ../composer/e-msg-composer-hdrs.c:698
-#, fuzzy
-msgid "_Cc:"
-msgstr "Cc:"
-
-#: ../composer/e-msg-composer-hdrs.c:699
+#: ../composer/e-composer-header-table.c:68
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Zadajte adresy, ktoré dostanú kópiu správy"
 
-#: ../composer/e-msg-composer-hdrs.c:702
+#: ../composer/e-composer-header-table.c:71
 #, fuzzy
-msgid "_Bcc:"
-msgstr "Bcc:"
-
-#: ../composer/e-msg-composer-hdrs.c:703
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
+"appearing in the recipient list of the message"
 msgstr ""
 "Zadajte adresy, ktoré dostanú kópiu správy bez toho, aby boli v zozname "
 "adresátov správy."
 
-#.
-#. * Post-To
-#.
-#: ../composer/e-msg-composer-hdrs.c:710
-#, fuzzy
+#: ../composer/e-composer-header-table.c:645
+msgid "Fr_om:"
+msgstr "_Od:"
+
+#: ../composer/e-composer-header-table.c:654
+msgid "_Reply-To:"
+msgstr "Odpo_vedať komu:"
+
+#: ../composer/e-composer-header-table.c:658
+msgid "_To:"
+msgstr "_Pre:"
+
+#: ../composer/e-composer-header-table.c:663
+msgid "_Cc:"
+msgstr "_Kópia:"
+
+#: ../composer/e-composer-header-table.c:668
+msgid "_Bcc:"
+msgstr "_Skrytá kópia:"
+
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
-msgstr "Poslať do:"
+msgstr "_Poslať do:"
 
-#: ../composer/e-msg-composer-hdrs.c:715
-#, fuzzy
-msgid "Click here to select folders to post to"
-msgstr "<kliknutím vyberiete prie�inok>"
+#: ../composer/e-composer-header-table.c:677
+msgid "S_ubject:"
+msgstr "P_redmet:"
+
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "Podp_is:"
+
+#: ../composer/e-composer-name-header.c:115
+msgid "Click here for the address book"
+msgstr "Kliknutím zobrazíte adresár"
 
-#: ../composer/e-msg-composer-hdrs.c:720
-msgid "Post To:"
-msgstr "Poslať do:"
+#: ../composer/e-composer-post-header.c:137
+msgid "Posting destination"
+msgstr "Cieľ posielania"
 
-#: ../composer/e-msg-composer-select-file.c:77
+#: ../composer/e-composer-post-header.c:138
 #, fuzzy
-msgid "A_ttach"
-msgstr "Priložiť"
+msgid "Choose folders to post the message to."
+msgstr "Priloží súbor k správe"
 
-#: ../composer/e-msg-composer-select-file.c:196
+#: ../composer/e-composer-post-header.c:172
 #, fuzzy
-msgid "Insert Attachment"
-msgstr "Príloha"
+msgid "Click here to select folders to post to"
+msgstr "<kliknutím vyberiete prie�inok>"
+
+#: ../composer/e-composer-private.c:181 ../composer/e-msg-composer.c:1553
+msgid "Show _Attachment Bar"
+msgstr "Zobraziť lištu _príloh"
 
-#: ../composer/e-msg-composer.c:818
+#: ../composer/e-msg-composer.c:867
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "_Vždy podpisovať správy pri použití tohto ú�tu"
 
-#: ../composer/e-msg-composer.c:825
+#: ../composer/e-msg-composer.c:874
 #, fuzzy
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "_Vždy podpisovať správy pri použití tohto ú�tu"
 
-#: ../composer/e-msg-composer.c:1334 ../composer/e-msg-composer.c:2602
-#, fuzzy
-msgid "Hide _Attachment Bar"
-msgstr "Príloha"
-
-#: ../composer/e-msg-composer.c:1337 ../composer/e-msg-composer.c:2605
-#: ../composer/e-msg-composer.c:3985
-#, fuzzy
-msgid "Show _Attachment Bar"
-msgstr "Príloha"
-
-#: ../composer/e-msg-composer.c:1369 ../composer/e-msg-composer.c:1403
-msgid "Unknown reason"
-msgstr "Neznámy dôvod"
-
-#: ../composer/e-msg-composer.c:1441
-#, fuzzy
-msgid "Could not open file"
-msgstr "Nie je možné otvoriť správu"
-
-#: ../composer/e-msg-composer.c:1449
-msgid "Unable to retrieve message from editor"
-msgstr "Nie je možné získať správu z editora"
-
-#: ../composer/e-msg-composer.c:1736
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Správa bez mena)"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1772
-#, fuzzy
-msgid "Open File"
-msgstr "Otvoriť súbor"
-
-#: ../composer/e-msg-composer.c:2237 ../mail/em-account-editor.c:606
-#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
-msgid "Autogenerated"
-msgstr "Automaticky generované"
+#: ../composer/e-msg-composer.c:1495 ../mail/em-format-html-display.c:1919
+#: ../mail/em-format-html-display.c:2411 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Príloh"
+msgstr[1] "Príloha"
+msgstr[2] "Prílohy"
 
-#: ../composer/e-msg-composer.c:2340
-#, fuzzy
-msgid "Si_gnature:"
-msgstr "Podpis:"
+#: ../composer/e-msg-composer.c:1551
+msgid "Hide _Attachment Bar"
+msgstr "Skryť lištu _príloh"
 
-#: ../composer/e-msg-composer.c:2616 ../composer/e-msg-composer.c:3867
-#: ../composer/e-msg-composer.c:3870
-#, fuzzy
+#: ../composer/e-msg-composer.c:1568 ../composer/e-msg-composer.c:2775
 msgid "Compose Message"
-msgstr "Napísať správu"
+msgstr "Zostaviť správu"
 
-#: ../composer/e-msg-composer.c:5125
-#, fuzzy
+#: ../composer/e-msg-composer.c:4050
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
 msgstr ""
 "<b>(Editor správ obsahuje netextové telo správy, ktoré nie je možné upraviť.)"
-"<b>"
+"</b>"
 
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
@@ -10557,8 +11075,7 @@ msgstr "Naozaj chcete odstrániť túto schôdzku bez mena?"
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "Pretože &quot;{1}&quot;."
 
@@ -10597,9 +11114,8 @@ msgid "Directories can not be attached to Messages."
 msgstr "Prie�inky nie je možné pripojiť k správam."
 
 #: ../composer/mail-composer.error.xml.h:13
-#, fuzzy
 msgid "Do you want to recover unfinished messages?"
-msgstr "Chcete uložiť zmeny?"
+msgstr "Chcete obnoviť nedokon�ené správy?"
 
 #: ../composer/mail-composer.error.xml.h:14
 msgid "Download in progress. Do you want to send the mail?"
@@ -10618,7 +11134,7 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
+"Send options available only for Novell GroupWise and Microsoft Exchange "
 "accounts."
 msgstr ""
 
@@ -10658,9 +11174,8 @@ msgstr ""
 "Nepodarilo sa aktivovať ovládací prvok pre výber adresy."
 
 #: ../composer/mail-composer.error.xml.h:25
-#, fuzzy
 msgid "Unfinished messages found"
-msgstr "Nasledujúca _nepre�ítaná správa"
+msgstr "Našli sa nedokon�ené správy"
 
 #: ../composer/mail-composer.error.xml.h:26
 msgid "Warning: Modified Message"
@@ -10675,27 +11190,27 @@ msgstr "Priloží súbor k správe"
 msgid "You need to configure an account before you can compose mail."
 msgstr "Predtým, ako za�nete písať správu, musíte nastaviť ú�et."
 
-#: ../composer/mail-composer.error.xml.h:30
-#, fuzzy
-msgid "_Do not Recover"
-msgstr "Neimportovať"
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Pokra�ovaťi v úpravách"
 
 #: ../composer/mail-composer.error.xml.h:31
-#, fuzzy
-msgid "_Recover"
-msgstr "Odstrániť"
+msgid "_Do not Recover"
+msgstr "_Neobnoviť"
 
 #: ../composer/mail-composer.error.xml.h:32
-#, fuzzy
-msgid "_Save Message"
-msgstr "Uložiť správu ako..."
+msgid "_Recover"
+msgstr "_Obnoviť"
+
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "Uložiť _koncept"
 
 #: ../data/evolution.desktop.in.in.h:1
-#, fuzzy
 msgid "Evolution Mail and Calendar"
-msgstr "Poštový komponent Evolution"
+msgstr "Pošta a Kalendár Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:672
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Skupina"
@@ -10713,288 +11228,345 @@ msgstr "karta adresára"
 msgid "calendar information"
 msgstr "informácie o kalendári"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Chyba Evolution"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
-#, fuzzy
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
 msgid "Evolution Warning"
-msgstr "Pošta Evolution"
+msgstr "Upozornenie Evolution"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:118
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Informácie o stretnutí"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:120
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Súhrn Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:450
 #, fuzzy, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Odoslané a koncepty"
 
-#: ../e-util/e-print.c:138
-msgid "An error occurred while printing"
+#: ../e-util/e-logger.c:161
+#, fuzzy
+msgid "Component"
+msgstr "Hotovo"
+
+#: ../e-util/e-logger.c:162
+msgid "Name of the component being logged"
 msgstr ""
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
+#: ../plugins/plugin-manager/plugin-manager.c:355
+#: ../plugins/publish-calendar/publish-calendar.c:690
+msgid "Enabled"
+msgstr "Povolené"
+
+#: ../e-util/e-plugin.c:309
+#, fuzzy
+msgid "Whether the plugin is enabled"
+msgstr "Či má byť expander rozbalený"
+
+#: ../e-util/e-print.c:160
+msgid "An error occurred while printing"
+msgstr "Vyskytla sa chyba pri tla�i"
+
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
-msgstr ""
+msgstr "Tla�ový systém oznámil nasledujúce podrobnosti o chybe:"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:173
 msgid ""
 "The printing system did not report any additional details about the error."
-msgstr ""
+msgstr "Tla�ový systém neoznámil žiadni �alšie podrobnosti o chybe."
+
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr "Pretože \"{1}\"."
 
 #: ../e-util/e-system.error.xml.h:2
-#, fuzzy
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr ""
-"Nie je možné uložiť do %s\n"
-"  %s"
+msgid "Cannot open file \"{0}\"."
+msgstr "Nie je možné otvoriť súbor \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:3
-#, fuzzy
-msgid "Cannot save file &quot;{0}&quot;."
-msgstr ""
-"Nie je možné uložiť do %s\n"
-"  %s"
+msgid "Cannot save file \"{0}\"."
+msgstr "Nie je možné uložiť súbor \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:4
-#, fuzzy
 msgid "Do you wish to overwrite it?"
-msgstr ""
-"%s už existuje.\n"
-"Chcete ho prepísať?"
+msgstr "Chcete ho prepísať?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
-msgstr ""
+msgid "File exists \"{0}\"."
+msgstr "Súbor existuje \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Prepísať súbor?"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:142
-#, fuzzy
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
-msgstr "Prepísať"
+msgstr "_Prepísať"
+
+#: ../e-util/e-util.c:96
+msgid "Could not display help for Evolution."
+msgstr "Nepodarilo sa zobraziť pomocníka pre Evolution."
+
+#: ../e-util/e-util-labels.c:37
+msgid "I_mportant"
+msgstr "Dô_ležité"
+
+#. red
+#: ../e-util/e-util-labels.c:38
+msgid "_Work"
+msgstr "_Práca"
+
+#. orange
+#: ../e-util/e-util-labels.c:39
+msgid "_Personal"
+msgstr "_Osobné"
 
-#: ../filter/filter-datespec.c:80
+#. green
+#: ../e-util/e-util-labels.c:40
+msgid "_To Do"
+msgstr "_Urobiť"
+
+#. blue
+#: ../e-util/e-util-labels.c:41
+msgid "_Later"
+msgstr "_Neskôr"
+
+#: ../e-util/e-util-labels.c:309
+msgid "Label _Name:"
+msgstr "_Názov popisu:"
+
+#: ../e-util/e-util-labels.c:332
+msgid "Edit Label"
+msgstr "Upraviť popis"
+
+#: ../e-util/e-util-labels.c:332
+msgid "Add Label"
+msgstr "Pridať popis"
+
+#: ../e-util/e-util-labels.c:351
+msgid "Label name cannot be empty."
+msgstr ""
+
+#: ../e-util/e-util-labels.c:356
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
+msgstr ""
+
+#: ../e-util/gconf-bridge.c:1218
 #, fuzzy, c-format
+msgid "GConf error: %s"
+msgstr "Chyba validácie: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr ""
+
+#: ../filter/filter-datespec.c:81
+#, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
-msgstr[0] "pred 1 sekundou"
+msgstr[0] "pred %d sekundami"
 msgstr[1] "pred 1 sekundou"
+msgstr[2] "pred %d sekundami"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d sekúnd v budúcnosti"
+msgstr[1] "1 sekunda v budúcnosti"
+msgstr[2] "%d sekundy v budúcnosti"
 
-#: ../filter/filter-datespec.c:81
-#, fuzzy, c-format
+#: ../filter/filter-datespec.c:82
+#, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
-msgstr[0] "pred 1 minútou"
+msgstr[0] "pred %d minútami"
 msgstr[1] "pred 1 minútou"
+msgstr[2] "pred %d minútami"
 
-#: ../filter/filter-datespec.c:81
-#, fuzzy, c-format
+#: ../filter/filter-datespec.c:82
+#, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
-msgstr[0] "Som v kancelárii"
-msgstr[1] "Som v kancelárii"
-msgstr[2] "Som v kancelárii"
+msgstr[0] "%d minút v budúcnosti"
+msgstr[1] "1 minúta v budúcnosti"
+msgstr[2] "%d minúty v budúcnosti"
 
-#: ../filter/filter-datespec.c:82
-#, fuzzy, c-format
+#: ../filter/filter-datespec.c:83
+#, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
-msgstr[0] "pred 1 hodinou"
+msgstr[0] "pred %d hodinami"
 msgstr[1] "pred 1 hodinou"
+msgstr[2] "pred %d hodinami"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d hodín v budúcnosti"
+msgstr[1] "1 hodina v budúcnosti"
+msgstr[2] "%d hodiny v budúcnosti"
 
-#: ../filter/filter-datespec.c:83
-#, fuzzy, c-format
+#: ../filter/filter-datespec.c:84
+#, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
-msgstr[0] "v�era"
+msgstr[0] "pred %d dňami"
 msgstr[1] "v�era"
+msgstr[2] "pred %d dňami"
 
-#: ../filter/filter-datespec.c:83
-#, fuzzy, c-format
+#: ../filter/filter-datespec.c:84
+#, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
-msgstr[0] "Som v kancelárii"
-msgstr[1] "Som v kancelárii"
-msgstr[2] "Som v kancelárii"
+msgstr[0] "%d dní v budúcnosti"
+msgstr[1] "zajtra"
+msgstr[2] "%d dni v budúcnosti"
 
-#: ../filter/filter-datespec.c:84
-#, fuzzy, c-format
+#: ../filter/filter-datespec.c:85
+#, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
-msgstr[0] "pred týždňom"
+msgstr[0] "pred %d týždňami"
 msgstr[1] "pred týždňom"
+msgstr[2] "pred %d týždňami"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "o %d týždňov"
+msgstr[1] "o týždeň"
+msgstr[2] "o %d týždne"
 
-#: ../filter/filter-datespec.c:85
-#, fuzzy, c-format
+#: ../filter/filter-datespec.c:86
+#, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
-msgstr[0] "pred mesiacom"
+msgstr[0] "pred %d mesiacmi"
 msgstr[1] "pred mesiacom"
+msgstr[2] "pred %d mesiacmi"
 
-#: ../filter/filter-datespec.c:85
-#, fuzzy, c-format
+#: ../filter/filter-datespec.c:86
+#, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
-msgstr[0] "Som v kancelárii"
-msgstr[1] "Som v kancelárii"
-msgstr[2] "Som v kancelárii"
+msgstr[0] "o %d mesiacov"
+msgstr[1] "o mesiac"
+msgstr[2] "o %d mesiace"
 
-#: ../filter/filter-datespec.c:86
-#, fuzzy, c-format
+#: ../filter/filter-datespec.c:87
+#, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
-msgstr[0] "pred rokom"
+msgstr[0] "pred %d rokmi"
 msgstr[1] "pred rokom"
+msgstr[2] "pred %d rokmi"
 
-#: ../filter/filter-datespec.c:86
-#, fuzzy, c-format
+#: ../filter/filter-datespec.c:87
+#, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
-msgstr[0] "Som v kancelárii"
-msgstr[1] "Som v kancelárii"
-msgstr[2] "Som v kancelárii"
+msgstr[0] "o %d rokov"
+msgstr[1] "o rok"
+msgstr[2] "o %d roky"
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<kliknutím vyberiete dátum>"
 
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "teraz"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:298
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y"
 
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:452
 msgid "Select a time to compare against"
 msgstr "Vyberte �as, s ktorým sa má porovnávať"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Vyberte súbor"
 
-#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
-msgid "Important"
-msgstr "Dôležité"
-
-#. green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:150
-msgid "To Do"
-msgstr "Urobiť"
-
-#. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:97
-msgid "Later"
-msgstr "Neskôr"
-
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:800
-#, fuzzy
-msgid "_Search name:"
-msgstr "_Oblasť hľadania:"
-
-#: ../filter/filter-rule.c:828
-msgid "Find items that meet the following criteria"
-msgstr ""
+#: ../filter/filter-rule.c:853
+msgid "R_ule name:"
+msgstr "Názov prav_idla:"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:881
 #, fuzzy
-msgid "A_dd Filter Criteria"
-msgstr "Pridať pravidlo filtra"
+msgid "Find items that meet the following conditions"
+msgstr "Prosím, vyberte si z týchto možností"
 
-#: ../filter/filter-rule.c:868
-#, fuzzy
-msgid "If all criteria are met"
-msgstr "ak odpovedajú všetky kritériá"
+#: ../filter/filter-rule.c:915
+msgid "A_dd Condition"
+msgstr "Pri_dať podmienku"
 
-#: ../filter/filter-rule.c:868
-#, fuzzy
-msgid "If any criteria are met"
-msgstr "ak zodpovedá niektoré kritérium"
+#: ../filter/filter-rule.c:921
+msgid "If all conditions are met"
+msgstr "Ak sú všetky podmienky splnené"
 
-#: ../filter/filter-rule.c:870
-#, fuzzy
+#: ../filter/filter-rule.c:921
+msgid "If any conditions are met"
+msgstr "Ak sú niektoré podmienky splnené"
+
+#: ../filter/filter-rule.c:923
 msgid "_Find items:"
-msgstr "Presúvam správy"
+msgstr "_Nájsť položky:"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:945
 #, fuzzy
 msgid "All related"
 msgstr "Delegované"
 
-#: ../filter/filter-rule.c:892
-#, fuzzy
+#: ../filter/filter-rule.c:945
 msgid "Replies"
-msgstr "Adresáti"
+msgstr "Odpovede"
 
-#: ../filter/filter-rule.c:892
-#, fuzzy
+#: ../filter/filter-rule.c:945
 msgid "Replies and parents"
-msgstr "Odpovedaná"
+msgstr "Odpovede a rodi�ia"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:945
 msgid "No reply or parent"
 msgstr ""
 
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:947
 #, fuzzy
 msgid "I_nclude threads"
 msgstr "Vložiť:"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:307
+#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Prijatá"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:310
 msgid "Outgoing"
-msgstr "Odoslaná"
+msgstr "Odchádzajúca"
 
 #: ../filter/filter.error.xml.h:1
 #, fuzzy
@@ -11018,14 +11590,12 @@ msgid "Missing date."
 msgstr "Aktualizácia stretnutia"
 
 #: ../filter/filter.error.xml.h:5
-#, fuzzy
 msgid "Missing file name."
-msgstr "_Známe meno:"
+msgstr "Chýba názov súboru."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
-#, fuzzy
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
-msgstr "Priradenie"
+msgstr "Chýba názov."
 
 #: ../filter/filter.error.xml.h:7
 msgid "Name &quot;{0}&quot; already used."
@@ -11033,7 +11603,7 @@ msgstr ""
 
 #: ../filter/filter.error.xml.h:8
 msgid "Please choose another name."
-msgstr ""
+msgstr "Prosím, vyberte iný názov."
 
 #: ../filter/filter.error.xml.h:9
 msgid "You must choose a date."
@@ -11048,18 +11618,16 @@ msgid "You must specify a file name."
 msgstr "Musíte zadať meno súboru."
 
 #: ../filter/filter.glade.h:1
-#, fuzzy
 msgid "<b>_Filter Rules</b>"
-msgstr "Pravidlá filtra"
+msgstr "<b>Pravidlá _filtra</b>"
 
 #: ../filter/filter.glade.h:2
 msgid "Compare against"
 msgstr "Porovnať s"
 
 #: ../filter/filter.glade.h:4
-#, fuzzy
 msgid "Show filters for mail:"
-msgstr "Spŕšky malých krúp"
+msgstr "Zobraziť filtre pre poštu:"
 
 #: ../filter/filter.glade.h:5
 msgid ""
@@ -11102,7 +11670,7 @@ msgstr ""
 msgid "months"
 msgstr "mesiacov"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:188
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:197
 msgid "seconds"
 msgstr "sekúnd"
 
@@ -11114,9 +11682,10 @@ msgstr "aktuálny tento"
 msgid "the time you specify"
 msgstr "zadaný �as"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:383
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "týždňov"
 
@@ -11124,15 +11693,15 @@ msgstr "týždňov"
 msgid "years"
 msgstr "rokov"
 
-#: ../filter/rule-editor.c:380
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr "Pridať pravidlo"
 
-#: ../filter/rule-editor.c:459
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr "Upraviť pravidlo"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "Meno pravidla"
 
@@ -11154,58 +11723,72 @@ msgid "Configure your email accounts here"
 msgstr "Nastavenie emailových ú�tov"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Configure your network connection settings here"
+msgstr "Nastavenie emailových ú�tov"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Pošta Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
 msgstr "Ovládací prvok pre nastavenie poštových ú�tov Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Poštový komponent Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Editor správ Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr "Ovládací prvok pre nastavenie editora správ Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "Ovládací prvok nastavenia pošty Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:606
-#: ../mail/importers/elm-importer.c:333 ../mail/importers/pine-importer.c:387
-#: ../mail/mail-component.c:563 ../mail/mail-component.c:564
-#: ../mail/mail-component.c:728
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Network configuration control"
+msgstr "Ovládací prvok pre nastavenie kalendára Evolution"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
+#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
+#: ../mail/mail-component.c:762
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Pošta"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:535
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "Poštové ú�ty"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:100
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "Nastavenie pošty"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
 #, fuzzy
+msgid "Network Preferences"
+msgstr "Nastavenie editora správ"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
-msgstr "_Pošta:"
+msgstr "_Pošta"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:386
 #, c-format
 msgid "%s License Agreement"
 msgstr ""
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:393
 #, c-format
 msgid ""
 "\n"
@@ -11214,1103 +11797,1043 @@ msgid ""
 "and tick the check box for accepting it\n"
 msgstr ""
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Vybrať prie�inok"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
+#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:98
+msgid "Autogenerated"
+msgstr "Automaticky generované"
+
+#: ../mail/em-account-editor.c:761
 #, fuzzy
 msgid "Ask for each message"
 msgstr "Priložiť pôvodnú správu"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identita"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:119
+#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Príjem pošty"
 
-#: ../mail/em-account-editor.c:2056
-#, fuzzy
+#: ../mail/em-account-editor.c:2130
 msgid "Check for _new messages every"
-msgstr "_Automaticky kontrolovať novú poštu každých"
+msgstr "Kontrolovať _nové správy každých"
 
-#: ../mail/em-account-editor.c:2237 ../mail/mail-config.glade.h:134
+#: ../mail/em-account-editor.c:2138
+msgid "minu_tes"
+msgstr "minú_t"
+
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "Posielanie pošty"
 
-#: ../mail/em-account-editor.c:2296 ../mail/mail-config.glade.h:66
+#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Defaults"
 msgstr "Š_tandardné"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2362 ../mail/mail-config.glade.h:126
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:323
 #, fuzzy
 msgid "Security"
 msgstr "Za_bezpe�enie"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2399 ../mail/em-account-editor.c:2490
+#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Nastavenie _príjmu"
 
-#: ../mail/em-account-editor.c:2400 ../mail/em-account-editor.c:2491
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 #, fuzzy
 msgid "Checking for New Messages"
 msgstr "Kontrolujem novú poštu"
 
-#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor ú�tu"
 
-#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Sprievodca ú�tom Evolution"
 
-#: ../mail/em-account-prefs.c:334 ../mail/em-account-prefs.c:379
-#: ../mail/em-account-prefs.c:412
-#, fuzzy
-msgid "Di_sable"
-msgstr "Zakázať"
-
-#: ../mail/em-account-prefs.c:334 ../mail/em-account-prefs.c:379
-#: ../mail/em-account-prefs.c:414 ../mail/mail-config.glade.h:74
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "_Povoliť"
-
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:469
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
-msgstr "{Štandardný]"
-
-#: ../mail/em-account-prefs.c:522 ../mail/em-composer-prefs.c:943
-#: ../plugins/plugin-manager/plugin-manager.c:291
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "Povolené"
+msgstr "[Štandardný]"
 
-#: ../mail/em-account-prefs.c:528
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
-msgstr "Meno ú�tu"
+msgstr "Názov ú�tu"
 
-#: ../mail/em-account-prefs.c:530
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:181 ../mail/mail-config.c:1036
+#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
+#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
-msgstr "Bezmena"
+msgstr "Nepomenované"
 
-#: ../mail/em-composer-prefs.c:949
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
-msgstr "Jazyky"
+msgstr "Jazyk(y)"
 
-#: ../mail/em-composer-prefs.c:992
+#: ../mail/em-composer-prefs.c:1041
 #, fuzzy
 msgid "Add signature script"
 msgstr "_Pridať podpis"
 
-#: ../mail/em-composer-prefs.c:1012
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
-msgstr "Podpisy"
+msgstr "Podpis(y)"
 
-#: ../mail/em-composer-utils.c:897 ../mail/em-format-quote.c:399
-#, fuzzy
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
-msgstr "Predaná správa"
+msgstr "-------- Preposlaná správa --------"
 
-#: ../mail/em-composer-utils.c:1696
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "neznámy odosielateľ"
 
 #. 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:1743
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
+"V ${WeekdayName}, ${ Day}. ${MonthName} ${Year} o ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} napísal(a):"
 
-#: ../mail/em-composer-utils.c:1884
-#, fuzzy
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
-msgstr "Predaná správa"
+msgstr "-----Pôvodná správa-----"
 
-#: ../mail/em-filter-editor.c:155
-#, fuzzy
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
-msgstr "Pravidlá filtra"
+msgstr "Pravidlá _filtra"
 
+#.
+#. * 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)
+#.
 #. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
+#: ../mail/em-filter-i18n.h:18
 msgid "Adjust Score"
 msgstr "Upraviť skóre"
 
-#: ../mail/em-filter-i18n.h:3
+#: ../mail/em-filter-i18n.h:19
 msgid "Assign Color"
 msgstr "Priradiť farbu"
 
-#: ../mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:20
 msgid "Assign Score"
 msgstr "Priradiť skóre"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Prílohy"
+#: ../mail/em-filter-i18n.h:22
+msgid "BCC"
+msgstr ""
 
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:23
 msgid "Beep"
 msgstr "Pípnuť"
 
-#: ../mail/em-filter-i18n.h:7
-msgid "contains"
-msgstr "obsahuje"
+#: ../mail/em-filter-i18n.h:24
+msgid "CC"
+msgstr ""
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:25
+#, fuzzy
+msgid "Completed On"
+msgstr "Dokon�ený "
+
+#: ../mail/em-filter-i18n.h:27
 msgid "Copy to Folder"
 msgstr "Kopírovať do prie�inku"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:28
 msgid "Date received"
 msgstr "Dátum prijatia"
 
-#: ../mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:29
 msgid "Date sent"
 msgstr "Dátum odoslania"
 
-#: ../mail/em-filter-i18n.h:11
-#: ../plugins/groupwise-features/share-folder.c:777
+#: ../mail/em-filter-i18n.h:30
+#: ../plugins/groupwise-features/share-folder.c:768
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:31
 msgid "Deleted"
 msgstr "Odstránené"
 
-#: ../mail/em-filter-i18n.h:13
-msgid "does not contain"
-msgstr "neobsahuje"
-
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:33
 msgid "does not end with"
 msgstr "nekon�í na"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:34
 msgid "does not exist"
 msgstr "neexistuje"
 
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:35
 msgid "does not return"
 msgstr "nevrátiť"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:36
 msgid "does not sound like"
 msgstr "nevyzerá ako"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:37
 msgid "does not start with"
 msgstr "neza�ína na"
 
-#: ../mail/em-filter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Neexistuje"
-
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:39
 msgid "Draft"
 msgstr "Návrh"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:40
 msgid "ends with"
 msgstr "kon�í na"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Exist"
-msgstr "Existuje"
-
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:42
 msgid "exists"
 msgstr "existuje"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:43
 msgid "Expression"
 msgstr "Výraz"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:44
 msgid "Follow Up"
 msgstr "Follow Up"
 
-#: ../mail/em-filter-i18n.h:27
-msgid "is"
-msgstr "je"
+#: ../mail/em-filter-i18n.h:45 ../mail/em-migrate.c:1056
+msgid "Important"
+msgstr "Dôležité"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:47
 msgid "is after"
 msgstr "je po"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:48
 msgid "is before"
 msgstr "bolo pred"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:49
 msgid "is Flagged"
 msgstr "je ozna�ený"
 
-#: ../mail/em-filter-i18n.h:31
-msgid "is greater than"
-msgstr "je viac než"
-
-#: ../mail/em-filter-i18n.h:32
-msgid "is less than"
-msgstr "je menej než"
-
-#: ../mail/em-filter-i18n.h:33
-msgid "is not"
-msgstr "nie je"
-
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:53
 msgid "is not Flagged"
 msgstr "nie je ozna�ený"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
+#: ../mail/em-filter-i18n.h:54
+msgid "is not set"
+msgstr "nie je nastavené"
+
+#: ../mail/em-filter-i18n.h:55
+msgid "is set"
+msgstr "je nastavené"
+
+#: ../mail/em-filter-i18n.h:56 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
-#, fuzzy
 msgid "Junk"
-msgstr "Jún"
+msgstr ""
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:57
 #, fuzzy
 msgid "Junk Test"
 msgstr "Jún"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:58 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Popis"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:59
 msgid "Mailing list"
 msgstr "Konferencia"
 
-#: ../mail/em-filter-i18n.h:39
-#, fuzzy
+#: ../mail/em-filter-i18n.h:60
 msgid "Match All"
-msgstr "Mitchell"
+msgstr ""
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:61
 msgid "Message Body"
 msgstr "Telo správy"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:62
 msgid "Message Header"
 msgstr "Hlavi�ka správy"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:63
 #, fuzzy
 msgid "Message is Junk"
 msgstr "Správy"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:64
 #, fuzzy
 msgid "Message is not Junk"
 msgstr "Ozna�iť ako _dôležitú"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:65
 msgid "Move to Folder"
 msgstr "Presunúť do prie�inku"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:66
 #, fuzzy
 msgid "Pipe to Program"
 msgstr "Ukon�í program"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:67
 msgid "Play Sound"
 msgstr "Zahrať zvuk"
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
+#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
+#. Translators: "Read" as in "has been read" (message-tag-followup.c)
+#: ../mail/em-filter-i18n.h:69 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Pre�ítaná"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Adresáti"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:71
 msgid "Regex Match"
 msgstr "Regul. výraz"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:72
 msgid "Replied to"
 msgstr "Odpovedaná"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:73
 msgid "returns"
 msgstr "vráti"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:74
 msgid "returns greater than"
 msgstr "vráti viac než"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:75
 msgid "returns less than"
 msgstr "vráti menej než"
 
-#: ../mail/em-filter-i18n.h:54
-#, fuzzy
+#: ../mail/em-filter-i18n.h:76
 msgid "Run Program"
-msgstr "Spustiť program:"
+msgstr "Spustiť program"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Skóre"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:78 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Odosielateľ"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:79
+msgid "Set Label"
+msgstr "Nastaviť popis"
+
+#: ../mail/em-filter-i18n.h:80
 msgid "Set Status"
 msgstr "Nastaviť stav"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:81
 msgid "Size (kB)"
 msgstr "Veľkosť (kB)"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:82
 msgid "sounds like"
 msgstr "vyzerá ako"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:83
 msgid "Source Account"
 msgstr "Zdrojový ú�et"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:84
 msgid "Specific header"
 msgstr "Špecifická hlavi�ka"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:85
 msgid "starts with"
 msgstr "za�ína na"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:87
 msgid "Stop Processing"
 msgstr "Zastaviť spracovanie"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1683
-#: ../mail/em-format-quote.c:320 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:17
-#: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
-#: ../smime/lib/e-cert.c:1132
+#: ../mail/em-filter-i18n.h:88 ../mail/em-format-quote.c:342
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
+#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../smime/lib/e-cert.c:1115
 msgid "Subject"
 msgstr "Predmet"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:89
 msgid "Unset Status"
 msgstr "Zrušiť nastavenie stavu"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
-#, fuzzy
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
-msgstr "Potom podľa"
+msgstr "Potom"
 
-#: ../mail/em-filter-rule.c:517
-#, fuzzy
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
-msgstr "Potrebné úkony"
+msgstr "Pridať ak_ciu"
 
-#: ../mail/em-folder-browser.c:184
-#, fuzzy
+#: ../mail/em-folder-browser.c:192
 msgid "C_reate Search Folder From Search..."
-msgstr "Vytvoriť _virtuálny prie�inok z hľadania..."
+msgstr "Vytvo_riť vyhľadávací prie�inok z hľadania..."
 
-#: ../mail/em-folder-browser.c:206
-#, fuzzy
+#: ../mail/em-folder-browser.c:217
 msgid "All Messages"
-msgstr "_Správy"
+msgstr "Všetky správy"
 
-#: ../mail/em-folder-browser.c:207
-#, fuzzy
+#: ../mail/em-folder-browser.c:218
 msgid "Unread Messages"
-msgstr "Nasledujúca _nepre�ítaná správa"
+msgstr "Nepre�ítané správy"
 
-#: ../mail/em-folder-browser.c:209
-#, fuzzy
+#: ../mail/em-folder-browser.c:220
 msgid "No Label"
-msgstr "Popis"
+msgstr "Bez popisu"
 
-#: ../mail/em-folder-browser.c:216
-#, fuzzy
+#: ../mail/em-folder-browser.c:227
 msgid "Read Messages"
-msgstr "Skryť p_re�ítané správy"
+msgstr "Pre�ítané správy"
 
-#: ../mail/em-folder-browser.c:217
-#, fuzzy
+#: ../mail/em-folder-browser.c:228
 msgid "Recent Messages"
-msgstr "_Otvoriť správy"
+msgstr "Nedávné správy"
 
-#: ../mail/em-folder-browser.c:218
-#, fuzzy
+#: ../mail/em-folder-browser.c:229
 msgid "Last 5 Days' Messages"
-msgstr "Neplatná správa úlohy"
+msgstr "Správy za posledných 5 dní"
 
-#: ../mail/em-folder-browser.c:219
-#, fuzzy
+#: ../mail/em-folder-browser.c:230
 msgid "Messages with Attachments"
-msgstr "Uložiť prílohy"
+msgstr "Správy s prílohami"
 
-#: ../mail/em-folder-browser.c:220
-#, fuzzy
+#: ../mail/em-folder-browser.c:231
 msgid "Important Messages"
-msgstr "Nasledujúca _dôležitá správa"
+msgstr "Dôležité správy"
 
-#: ../mail/em-folder-browser.c:221
+#: ../mail/em-folder-browser.c:232
 #, fuzzy
 msgid "Messages Not Junk"
 msgstr "Ozna�iť ako _dôležitú"
 
-#: ../mail/em-folder-browser.c:1038
+#: ../mail/em-folder-browser.c:1173
 #, fuzzy
 msgid "Account Search"
 msgstr "Meno ú�tu"
 
-#: ../mail/em-folder-browser.c:1082
+#: ../mail/em-folder-browser.c:1226
 #, fuzzy
 msgid "All Account Search"
 msgstr "Meno ú�tu"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
-#, fuzzy
+#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
-msgstr[0] "Nasledujúca _nepre�ítaná správa"
-msgstr[1] "Nasledujúca _nepre�ítaná správa"
+msgstr[0] "Nepre�ítaných správ:"
+msgstr[1] "Nepre�ítaných správ:"
+msgstr[2] "Nepre�ítaných správ:"
 
 #. 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:163
-#, fuzzy
+#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
-msgstr[0] "Správa pomocníka"
-msgstr[1] "Správa pomocníka"
+msgstr[0] "Spolu správ:"
+msgstr[1] "Spolu správ:"
+msgstr[2] "Spolu správ:"
 
-#: ../mail/em-folder-properties.c:323
-#: ../plugins/groupwise-features/properties.glade.h:2
-#, fuzzy
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr ""
+
+#: ../mail/em-folder-properties.c:198
+#, c-format
+msgid "Quota usage"
+msgstr ""
+
+#. translators: standard local mailbox names
+#: ../mail/em-folder-properties.c:358 ../mail/em-folder-tree-model.c:507
+#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:159
+#: ../mail/mail-component.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "Doru�ená pošta"
+
+#: ../mail/em-folder-properties.c:389
+#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
-msgstr "Vlastnosti písma"
+msgstr "Vlastnosti prie�inka"
 
-#: ../mail/em-folder-selection-button.c:123
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<kliknutím vyberiete prie�inok>"
 
-#: ../mail/em-folder-selector.c:262
-#, fuzzy
-msgid "Create"
-msgstr "Crestview"
+#: ../mail/em-folder-selector.c:254
+msgid "C_reate"
+msgstr "Vytvo_riť"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
-msgstr "_Meno prie�inku:"
+msgstr "_Názov prie�inka:"
 
+#. load store to mail component
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:934 ../mail/mail-vfolder.c:1007
-#, fuzzy
+#: ../mail/mail-vfolder.c:975 ../mail/mail-vfolder.c:1042
 msgid "Search Folders"
-msgstr "Prehľadať pr_ie�inky"
+msgstr "Vyhľadávacie prie�inky"
 
 #. UNMATCHED is always last
 #: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
 msgid "UNMATCHED"
 msgstr ""
 
-#: ../mail/em-folder-tree-model.c:467 ../mail/mail-component.c:154
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:160
 #, fuzzy
 msgid "Drafts"
 msgstr "Návrh"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:470 ../mail/em-folder-tree.c:2565
-#: ../mail/mail-component.c:153
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "Doru�ená pošta"
-
-#: ../mail/em-folder-tree-model.c:473 ../mail/mail-component.c:155
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:161
 msgid "Outbox"
 msgstr "Pošta na odoslanie"
 
-#: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:156
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:162
 msgid "Sent"
 msgstr "Odoslaná pošta"
 
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree-model.c:804
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Na�ítavam..."
 
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
-#. *
-#. * Most languages should translate this as "%s (%u)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:373
-#, c-format
-msgid "folder-display|%s (%u)"
-msgstr ""
-
-#: ../mail/em-folder-tree.c:734
-#, fuzzy
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
-msgstr "Poštové filtre"
+msgstr "Strom poštových prie�inkov"
 
-#: ../mail/em-folder-tree.c:894
-#, fuzzy, c-format
+#: ../mail/em-folder-tree.c:900
+#, c-format
 msgid "Moving folder %s"
-msgstr "Odstraňujem prie�inok %s"
+msgstr "Presúvanie prie�inka %s"
 
-#: ../mail/em-folder-tree.c:896
-#, fuzzy, c-format
+#: ../mail/em-folder-tree.c:902
+#, c-format
 msgid "Copying folder %s"
-msgstr "Otváram prie�inok %s"
+msgstr "Kopírovanie prie�inka %s"
 
-#: ../mail/em-folder-tree.c:903 ../mail/message-list.c:1874
-#, fuzzy, c-format
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2015
+#, c-format
 msgid "Moving messages into folder %s"
-msgstr "Presúvam správy do %s"
+msgstr "Presúvanie správ do prie�inka %s"
 
-#: ../mail/em-folder-tree.c:905 ../mail/message-list.c:1876
-#, fuzzy, c-format
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2017
+#, c-format
 msgid "Copying messages into folder %s"
-msgstr "Kopírujem správy do %s"
+msgstr "Kopírovanie správ do prie�inka %s"
 
-#: ../mail/em-folder-tree.c:921
+#: ../mail/em-folder-tree.c:926
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Nepodarilo sa skopírovať alebo presunúť správu do virtuálneho prie�inku"
 
-#: ../mail/em-folder-tree.c:999 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
-msgstr "_Kopírovať do prie�inku"
+msgstr "_Kopírovať do prie�inka"
 
-#: ../mail/em-folder-tree.c:1000 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
 msgid "_Move to Folder"
-msgstr "_Presunúť do prie�inku"
+msgstr "_Presunúť do prie�inka"
 
-#: ../mail/em-folder-tree.c:1710 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Prechádzam prie�inky v \"%s\""
 
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:32
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:55
-msgid "_View"
-msgstr "_Pohľad"
-
-#: ../mail/em-folder-tree.c:2111
-#, fuzzy
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
-msgstr "Otvoriť v novom okne"
-
-#: ../mail/em-folder-tree.c:2116
-msgid "_Move..."
-msgstr "_Presunúť..."
+msgstr "Otvoriť v _novom okne"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2120
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "Nový _prie�inok..."
 
-#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:36
+#: ../mail/em-folder-tree.c:2107
+msgid "_Move..."
+msgstr "_Presunúť..."
+
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Premenovať..."
 
-#: ../mail/em-folder-tree.c:2124
-#, fuzzy
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
-msgstr "Aktualizovať"
+msgstr "Ak_tualizovať"
 
-#: ../mail/em-folder-tree.c:2125
+#: ../mail/em-folder-tree.c:2116
 #, fuzzy
 msgid "Fl_ush Outbox"
 msgstr "Pošta na odoslanie"
 
-#: ../mail/em-folder-tree.c:2131 ../mail/mail.error.xml.h:139
-#, fuzzy
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "Vyprázdniť _Odpadky"
 
-#: ../mail/em-folder-utils.c:105
-#, fuzzy, c-format
+#: ../mail/em-folder-utils.c:101
+#, c-format
 msgid "Copying `%s' to `%s'"
-msgstr "Kopírujem správy do %s"
+msgstr "Kopírovanie `%s' do `%s'"
 
-#: ../mail/em-folder-utils.c:369 ../mail/em-folder-view.c:1171
-#: ../mail/em-folder-view.c:1186
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "Vybrať prie�inok"
 
-#: ../mail/em-folder-utils.c:369 ../mail/em-folder-view.c:1186
-#, fuzzy
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
 msgid "C_opy"
-msgstr "Kopírovať"
+msgstr "K_opírovať"
 
-#: ../mail/em-folder-utils.c:590
+#: ../mail/em-folder-utils.c:532
 #: ../plugins/groupwise-features/share-folder-common.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "Creating folder `%s'"
-msgstr "Ukladám prie�inok '%s'"
+msgstr "Vytváranie prie�inka '%s'"
 
-#: ../mail/em-folder-utils.c:750
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
-#, fuzzy
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
-msgstr "Vytvoriť nový prie�inok"
+msgstr "Vytvoriť prie�inok"
 
-#: ../mail/em-folder-utils.c:750
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Zadajte, kde vytvoriť prie�inok"
 
-#: ../mail/em-folder-view.c:1074 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
-msgstr ""
+msgstr "Odstránenie pošty zlyhalo"
 
-#: ../mail/em-folder-view.c:1075 ../mail/mail.error.xml.h:127
-#, fuzzy
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
-msgstr "Naozaj chcete zrušiť a odstrániť túto položku denníka?"
+msgstr "Nemáte dostato�né práva na odstránenie tejto pošty."
 
-#: ../mail/em-folder-view.c:1279 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: ../mail/em-folder-view.c:1281 ../mail/em-popup.c:578 ../mail/em-popup.c:589
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "Poslať �_alej"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1285 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "_Upraviť ako novú správu..."
 
-#: ../mail/em-folder-view.c:1291
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "Obnoviť _zmazané"
 
-#: ../mail/em-folder-view.c:1292
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "Pre_sunúť do prie�inka..."
 
-#: ../mail/em-folder-view.c:1293
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
-msgstr "_Kopírovať do prie�inku..."
+msgstr "_Kopírovať do prie�inka..."
 
-#: ../mail/em-folder-view.c:1296
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Ozna�iť ako _pre�ítanú"
 
-#: ../mail/em-folder-view.c:1297
-#, fuzzy
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
-msgstr "Ozna�iť ako _nepre�ítanú"
+msgstr "Ozna�iť ako _nepre�ítané"
 
-#: ../mail/em-folder-view.c:1298
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
-msgstr "Ozna�iť ako _dôležitú"
+msgstr "Ozna�iť ako _dôležité"
 
-#: ../mail/em-folder-view.c:1299
-#, fuzzy
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
-msgstr "Ozna�iť ako nedô_ležitú"
+msgstr "Ozna�iť ako nedô_ležité"
 
-#: ../mail/em-folder-view.c:1300
+#: ../mail/em-folder-view.c:1350
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Ozna�iť ako _nepre�ítanú"
 
-#: ../mail/em-folder-view.c:1301
+#: ../mail/em-folder-view.c:1351
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Ozna�iť ako _dôležitú"
 
-#: ../mail/em-folder-view.c:1302
+#: ../mail/em-folder-view.c:1352
 #, fuzzy
 msgid "Mark for Follo_w Up..."
-msgstr "_Odpove�..."
+msgstr "Ozna�iť na odpovedanie..."
 
-#: ../mail/em-folder-view.c:1304
-#, fuzzy
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
-msgstr "Popis"
+msgstr "_Popis"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1305 ../widgets/misc/e-dateedit.c:496
-#, fuzzy
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:478
 msgid "_None"
-msgstr "Žiadna"
+msgstr "Žiad_ny"
+
+#: ../mail/em-folder-view.c:1358
+msgid "_New Label"
+msgstr "_Nový popis"
 
-#: ../mail/em-folder-view.c:1310
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Ozna�iť ako _Dokon�ený"
 
-#: ../mail/em-folder-view.c:1311
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "Vy�istiť _zna�ku"
 
-#: ../mail/em-folder-view.c:1314
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "Vytvoriť pra_vidlo zo správy"
 
-#: ../mail/em-folder-view.c:1315
-#, fuzzy
-msgid "Search Folder from _Subject"
-msgstr "Vprie�inok na _predmet"
+#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
+#: ../mail/em-folder-view.c:1368
+msgid "Search Folder based on _Subject"
+msgstr "Vyhľadávací prie�inok podľa _Predmetu"
 
-#: ../mail/em-folder-view.c:1316
-#, fuzzy
-msgid "Search Folder from Se_nder"
-msgstr "Vprie�inok na _odosielateľa"
+#: ../mail/em-folder-view.c:1369
+msgid "Search Folder based on Se_nder"
+msgstr "Vyhľadávací prie�inok podľa _Odosielateľa"
 
-#: ../mail/em-folder-view.c:1317
-#, fuzzy
-msgid "Search Folder from _Recipients"
-msgstr "Vprie�inok na _adresátov"
+#: ../mail/em-folder-view.c:1370
+msgid "Search Folder based on _Recipients"
+msgstr "Vyhľadávací prie�inok podľa Ad_resátov"
 
-#: ../mail/em-folder-view.c:1318
-#, fuzzy
-msgid "Search Folder from Mailing _List"
-msgstr "VPrie�inok na _konferenciu"
+#: ../mail/em-folder-view.c:1371
+msgid "Search Folder based on Mailing _List"
+msgstr "Vyhľadávací prie�inok podľa Kon_ferencie"
 
-#: ../mail/em-folder-view.c:1322
-msgid "Filter on Sub_ject"
-msgstr "Filter na _predmet"
+#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
+#: ../mail/em-folder-view.c:1376
+msgid "Filter based on Sub_ject"
+msgstr "Filter podľa _Predmetu"
 
-#: ../mail/em-folder-view.c:1323
-msgid "Filter on Sen_der"
-msgstr "Filter na o_dosielateľovi"
+#: ../mail/em-folder-view.c:1377
+msgid "Filter based on Sen_der"
+msgstr "Filter podľa O_dosielateľa"
 
-#: ../mail/em-folder-view.c:1324
-msgid "Filter on Re_cipients"
-msgstr "Filter na _adresátoch"
+#: ../mail/em-folder-view.c:1378
+msgid "Filter based on Re_cipients"
+msgstr "Filter podľa _Adresátov"
 
-#: ../mail/em-folder-view.c:1325
-msgid "Filter on _Mailing List"
-msgstr "Filter na _konferenciu"
+#: ../mail/em-folder-view.c:1379
+msgid "Filter based on _Mailing List"
+msgstr "Filter podľa _konferencie"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2161 ../mail/em-folder-view.c:2205
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/em-folder-view.c:2255 ../mail/em-folder-view.c:2298
+#: ../plugins/google-account-setup/google-source.c:251
+#: ../plugins/google-account-setup/google-source.c:532
+#: ../plugins/google-account-setup/google-source.c:718
 msgid "Default"
 msgstr "Å tandard"
 
-#: ../mail/em-folder-view.c:2423
+#: ../mail/em-folder-view.c:2516
 #, fuzzy
 msgid "Unable to retrieve message"
 msgstr "Nie je možné získať správu z editora"
 
-#: ../mail/em-folder-view.c:2442
-#, fuzzy
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
-msgstr "Získavam správu %s"
+msgstr "Získavanie správy..."
 
-#: ../mail/em-folder-view.c:2670
+#: ../mail/em-folder-view.c:2794
 #, fuzzy
 msgid "C_all To..."
 msgstr "_Delegovať na..."
 
-#: ../mail/em-folder-view.c:2673
-#, fuzzy
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
-msgstr "Vytvoriť nový prie�inok"
+msgstr "Vytvoriť _vyhľadávací prie�inok"
 
-#: ../mail/em-folder-view.c:2674
-#, fuzzy
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
-msgstr "_E-mailová adresa:"
+msgstr "_Z tejto adresy"
 
-#: ../mail/em-folder-view.c:2675
-#, fuzzy
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
-msgstr "_Adresa:"
+msgstr "_Pre túto adresu"
 
-#: ../mail/em-folder-view.c:3050
+#: ../mail/em-folder-view.c:3296
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Kliknutím pridáte úlohu"
 
-#: ../mail/em-folder-view.c:3062
+#: ../mail/em-folder-view.c:3308
 #, fuzzy, c-format
 msgid "Click to call %s"
 msgstr "Kliknutím pridáte úlohu"
 
-#: ../mail/em-folder-view.c:3067
+#: ../mail/em-folder-view.c:3313
 msgid "Click to hide/unhide addresses"
 msgstr ""
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:514
+#: ../mail/em-format-html-display.c:471
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Odpovedá:"
 
-#: ../mail/em-format-html-display.c:657
-#, fuzzy
-msgid "Fi_nd:"
-msgstr "Hľadať:"
+#: ../mail/em-format-html-display.c:615
+msgid "Fin_d:"
+msgstr "Hľa_dať:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:681
-#, fuzzy
+#: ../mail/em-format-html-display.c:639
 msgid "_Previous"
-msgstr "Predchádzajúca"
+msgstr "_Predchádzajúca"
 
-#: ../mail/em-format-html-display.c:686
-#, fuzzy
+#: ../mail/em-format-html-display.c:644
 msgid "_Next"
-msgstr "Nasledujúca"
+msgstr "_Nasledujúca"
 
-#: ../mail/em-format-html-display.c:691
-#, fuzzy
+#: ../mail/em-format-html-display.c:649
 msgid "M_atch case"
-msgstr "Mitchell"
+msgstr "Zhod_a veľkosti písmen"
 
-#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:635
-#, fuzzy
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
 msgid "Unsigned"
-msgstr "Priradené"
+msgstr "Nepodpísané"
 
-#: ../mail/em-format-html-display.c:938
-#, fuzzy
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
-msgstr "Táto správa je digitálne podpísaná ale podpis nie je platný."
+msgstr ""
+"Táto správa nie je podpísaná. Nie je záruka, že táto správa je autentická."
 
-#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:636
-#, fuzzy
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
 msgid "Valid signature"
-msgstr "Upraviť podpis"
+msgstr "Platný podpis"
 
-#: ../mail/em-format-html-display.c:939
+#: ../mail/em-format-html-display.c:949
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "Táto správa je digitálne podpísaná ale podpis nie je platný."
 
-#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:637
-#, fuzzy
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
 msgid "Invalid signature"
-msgstr "Upraviť podpis"
+msgstr "Neplatný podpis"
 
-#: ../mail/em-format-html-display.c:940
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:941 ../mail/em-format-html.c:638
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
-msgstr ""
+msgstr "Platný popis, ale nie je možné overiť odosielateľa"
 
-#: ../mail/em-format-html-display.c:941
+#: ../mail/em-format-html-display.c:951
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "input_token obsahuje neplatný podpis alebo podpis nie je možné overiť."
 
-#: ../mail/em-format-html-display.c:942 ../mail/em-format-html.c:639
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:942
+#: ../mail/em-format-html-display.c:952
 #, fuzzy
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "input_token obsahuje neplatný podpis alebo podpis nie je možné overiť."
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:645
-#, fuzzy
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
 msgid "Unencrypted"
-msgstr "Prerušené"
+msgstr "Nezašifrované"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:959
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
+"Táto správa nie je zašifrované. Jej obsah môže byť pre�ítaný po�as prenosu "
+"po internete."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:646
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
-msgstr ""
+msgstr "Zašifrované, slabo"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:960
 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:951 ../mail/em-format-html.c:647
-#, fuzzy
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
 msgid "Encrypted"
-msgstr "Å ifrovanie PGP"
+msgstr "Zašifrované"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:961
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
+"Táto správa je zašifrovaná. Bude náro�né pre nezasvätenca pre�ítať obsah "
+"tejto správy."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
-msgstr ""
+msgstr "Zašifrované, dobre"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:962
 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:1053 ../smime/gui/smime-ui.glade.h:48
-#, fuzzy
+#: ../mail/em-format-html-display.c:1063 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
-msgstr "ID _certifikátu:"
+msgstr "Zobraziť _certifikát"
 
-#: ../mail/em-format-html-display.c:1068
+#: ../mail/em-format-html-display.c:1078
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Certifikát ešte nie je platný"
 
-#: ../mail/em-format-html-display.c:1387
+#: ../mail/em-format-html-display.c:1377
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1395
+#: ../mail/em-format-html-display.c:1385
 msgid "Overdue:"
 msgstr "Po termíne:"
 
-#: ../mail/em-format-html-display.c:1398
+#: ../mail/em-format-html-display.c:1388
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1458
+#: ../mail/em-format-html-display.c:1466
 #, fuzzy
 msgid "_View Inline"
 msgstr "Zobraziť v texte"
 
-#: ../mail/em-format-html-display.c:1459
-#, fuzzy
+#: ../mail/em-format-html-display.c:1467
 msgid "_Hide"
-msgstr "Skryť"
+msgstr "_Skryť"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1468
 #, fuzzy
 msgid "_Fit to Width"
 msgstr "Šírka orezania"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1469
 msgid "Show _Original Size"
-msgstr ""
+msgstr "Zobraziť pôv_odnú veľkosť"
 
-#: ../mail/em-format-html-display.c:1905 ../mail/em-format-html-display.c:2518
-#: ../mail/mail-config.glade.h:44 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Príloha"
-
-#: ../mail/em-format-html-display.c:2119
+#: ../mail/em-format-html-display.c:1989
 #, fuzzy
 msgid "Save attachment as"
 msgstr "Uložiť prílohy"
 
-#: ../mail/em-format-html-display.c:2123
+#: ../mail/em-format-html-display.c:1993
 #, fuzzy
 msgid "Select folder to save all attachments"
 msgstr "Uložiť všetky prílohy"
 
-#: ../mail/em-format-html-display.c:2174
+#: ../mail/em-format-html-display.c:2044
 #, fuzzy
 msgid "_Save Selected..."
 msgstr "Uložiť vybrané"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2241
-#, fuzzy, c-format
+#: ../mail/em-format-html-display.c:2111
+#, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
-msgstr[0] "Príloha"
-msgstr[1] "Príloha"
-msgstr[2] "Príloha"
+msgstr[0] "%d príloh"
+msgstr[1] "%d príloha"
+msgstr[2] "%d prílohy"
 
-#: ../mail/em-format-html-display.c:2248 ../mail/em-format-html-display.c:2326
-#, fuzzy
+#: ../mail/em-format-html-display.c:2118 ../mail/em-format-html-display.c:2207
 msgid "S_ave"
-msgstr "Uložiť"
+msgstr "_Uložiť"
 
-#: ../mail/em-format-html-display.c:2259
-#, fuzzy
+#: ../mail/em-format-html-display.c:2129
 msgid "S_ave All"
-msgstr "Uložiť ako"
+msgstr "_Uložiť všetko"
 
-#: ../mail/em-format-html-display.c:2322
-#, fuzzy
+#: ../mail/em-format-html-display.c:2203
 msgid "No Attachment"
-msgstr "Príloha"
+msgstr "Bez prílohy"
 
-#: ../mail/em-format-html-display.c:2453 ../mail/em-format-html-display.c:2491
-#, fuzzy
+#: ../mail/em-format-html-display.c:2344 ../mail/em-format-html-display.c:2383
 msgid "View _Unformatted"
-msgstr "Formát �asu:"
+msgstr "Zobraziť nef_ormátované"
 
-#: ../mail/em-format-html-display.c:2455
-#, fuzzy
+#: ../mail/em-format-html-display.c:2346
 msgid "Hide _Unformatted"
-msgstr "Formát �asu:"
+msgstr "Skryť nef_ormátované"
 
-#: ../mail/em-format-html-display.c:2510
-#, fuzzy
+#: ../mail/em-format-html-display.c:2403
 msgid "O_pen With"
-msgstr "kon�í na"
+msgstr "O_tvoriť pomocou"
 
-#: ../mail/em-format-html-display.c:2581
+#: ../mail/em-format-html-display.c:2479
 msgid ""
-"Evolution cannot render this email as it is too large to handle. You can "
+"Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
 
@@ -12319,490 +12842,637 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "Stránka %d z %d"
 
-#: ../mail/em-format-html.c:489 ../mail/em-format-html.c:498
-#, fuzzy, c-format
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
+#, c-format
 msgid "Retrieving `%s'"
-msgstr "Získavam správu %s"
+msgstr "Získavanie `%s'"
 
-#: ../mail/em-format-html.c:910
+#: ../mail/em-format-html.c:925
 #, fuzzy
 msgid "Unknown external-body part."
 msgstr "Nesprávna �asť externého tela."
 
-#: ../mail/em-format-html.c:918
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "Nesprávna �asť externého tela."
 
-#: ../mail/em-format-html.c:948
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: ../mail/em-format-html.c:959
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Odkaz na lokálny súbor (%s) platný na serveri \"%s\""
 
-#: ../mail/em-format-html.c:961
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lokálny súbor (%s)"
 
-#: ../mail/em-format-html.c:982
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Odkaz na vzdialené dáta (%s)"
 
-#: ../mail/em-format-html.c:993
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
 
-#: ../mail/em-format-html.c:1220
+#: ../mail/em-format-html.c:1236
 #, fuzzy
 msgid "Formatting message"
 msgstr "Presúvam správy"
 
-#: ../mail/em-format-html.c:1388
+#: ../mail/em-format-html.c:1410
 #, fuzzy
 msgid "Formatting Message..."
 msgstr "Presúvam správy"
 
-#: ../mail/em-format-html.c:1527 ../mail/em-format-html.c:1591
-#: ../mail/em-format-html.c:1613 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
+#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:210
+#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
-msgstr "Cc"
+msgstr "Kópia"
 
-#: ../mail/em-format-html.c:1528 ../mail/em-format-html.c:1597
-#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:210
+#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
-msgstr "Bcc"
+msgstr "Skrytá kópia"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1687 ../mail/em-format-quote.c:329
-#: ../mail/em-mailer-prefs.c:1198
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1451
 msgid "Mailer"
 msgstr "Poštový klient"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1714
+#: ../mail/em-format-html.c:1771
 #, fuzzy
 msgid " (%a, %R %Z)"
 msgstr "%a %d %Y"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1719
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr ""
 
-#: ../mail/em-format-html.c:1731 ../mail/em-format-quote.c:336
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:93
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:344
-#: ../widgets/misc/e-dateedit.c:366
-msgid "Date"
-msgstr "Dátum"
-
-#: ../mail/em-format-html.c:1754 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:94
-msgid "Newsgroups"
-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:1844
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr ""
 
-#: ../mail/em-format-quote.c:207 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:332
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:884
+#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:308
 msgid "From"
 msgstr "Od"
 
-#: ../mail/em-format-quote.c:207 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:88
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
+#: ../widgets/misc/e-dateedit.c:347
+msgid "Date"
+msgstr "Dátum"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr ""
+
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "Tvár"
+
+#: ../mail/em-format.c:1158
 #, c-format
 msgid "%s attachment"
 msgstr "%s príloha"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1200
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1345
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1355
 #, fuzzy
 msgid "Could not parse PGP/MIME message"
 msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1355
 #, fuzzy
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1512
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Nepodporovaná schéma"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Nepodarilo sa overiť listový podpis"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Nepodarilo sa overiť listový podpis"
 
-#: ../mail/em-format.c:1658
+#: ../mail/em-format.c:1663
 #, fuzzy
 msgid "Could not parse PGP message"
 msgstr "Nepodarilo sa vytvoriť správu."
 
-#: ../mail/em-format.c:1658
+#: ../mail/em-format.c:1663
 #, fuzzy
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
 
-#: ../mail/em-mailer-prefs.c:105
-#, fuzzy
+#: ../mail/em-mailer-prefs.c:94
 msgid "Every time"
-msgstr "Každý rok"
+msgstr "Stále"
 
-#: ../mail/em-mailer-prefs.c:106
-#, fuzzy
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per day"
-msgstr "_Jeden deň"
+msgstr "Raz za deň"
 
-#: ../mail/em-mailer-prefs.c:107
-#, fuzzy
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per week"
-msgstr "Jeden _týždeň"
+msgstr "Raz za týždeň"
 
-#: ../mail/em-mailer-prefs.c:108
-#, fuzzy
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per month"
-msgstr "Jeden _mesiac"
+msgstr "Raz za mesiac"
+
+#: ../mail/em-mailer-prefs.c:327
+#, fuzzy
+msgid "Add Custom Junk Header"
+msgstr "Vlastná _správa"
+
+#: ../mail/em-mailer-prefs.c:331
+#, fuzzy
+msgid "Header Name:"
+msgstr "_Meno prie�inku:"
+
+#: ../mail/em-mailer-prefs.c:332
+#, fuzzy
+msgid "Header Value Contains:"
+msgstr "Odosielateľ obsahuje"
+
+#: ../mail/em-mailer-prefs.c:437
+msgid "Contains Value"
+msgstr "Obsahuje hodnotu"
+
+#: ../mail/em-mailer-prefs.c:459
+msgid "Color"
+msgstr "Farba"
+
+#: ../mail/em-mailer-prefs.c:462
+msgid "Tag"
+msgstr ""
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:789 ../mail/em-mailer-prefs.c:843
+#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr ""
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:797 ../mail/em-mailer-prefs.c:852
+#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:818
+#: ../mail/em-mailer-prefs.c:1108
 #, fuzzy
 msgid "No Junk plugin available"
 msgstr "Popis nie je k dispozícii."
 
-#: ../mail/em-migrate.c:1210
-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 ""
+#. green
+#: ../mail/em-migrate.c:1059
+msgid "To Do"
+msgstr "Urobiť"
 
-#: ../mail/em-migrate.c:1649
-#, fuzzy, c-format
+#. blue
+#: ../mail/em-migrate.c:1060
+msgid "Later"
+msgstr "Neskôr"
+
+#: ../mail/em-migrate.c:1652
+#, c-format
 msgid "Unable to create new folder `%s': %s"
-msgstr "Nie je možné získať prie�inok: %s: %s"
+msgstr "Nie je možné vytvoriť nový prie�inok `%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1678
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Nepodarilo sa skopírovať deskriptor súboru: %s\n"
 "%s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1863
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:1868
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../mail/em-migrate.c:2069
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Nepodarilo sa prihlásiť na POP server %s: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2083
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Nepodarilo sa vytvoriť rúru do '%s': %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Nepodarilo sa vytvoriť rúru do '%s': %s"
 
-#: ../mail/em-migrate.c:2742
+#: ../mail/em-migrate.c:2898
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../mail/em-migrate.c:2963
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: ../mail/em-migrate.c:2761
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Odpovedať _zoznamu"
 
-#: ../mail/em-popup.c:639
-#, fuzzy
+#. make it first item
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:853
 msgid "_Add to Address Book"
-msgstr "Pridať odosielateľa do adresára"
+msgstr "_Pridať do adresára"
 
-#: ../mail/em-subscribe-editor.c:601
+#: ../mail/em-subscribe-editor.c:582
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Tento server nepodporuje informácie schém LDAPv3"
 
-#: ../mail/em-subscribe-editor.c:634
+#: ../mail/em-subscribe-editor.c:615
 #, fuzzy
 msgid "Subscribed"
 msgstr "Prihlásiť si"
 
-#: ../mail/em-subscribe-editor.c:638
+#: ../mail/em-subscribe-editor.c:619
 msgid "Folder"
 msgstr "Prie�inok"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:840
+#: ../mail/em-subscribe-editor.c:821
 msgid "Please select a server."
 msgstr "Prosím, vyberte server."
 
-#: ../mail/em-subscribe-editor.c:861
+#: ../mail/em-subscribe-editor.c:842
 msgid "No server has been selected"
 msgstr "Nebol vybraný žiadny server"
 
-#: ../mail/em-utils.c:120
+#. Check buttons
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 #, fuzzy
-msgid "Do not show this message again."
+msgid "_Do not show this message again."
 msgstr "Túto správu už nezobrazovať."
 
-#: ../mail/em-utils.c:315
+#: ../mail/em-utils.c:317
 #, fuzzy
 msgid "Message Filters"
 msgstr "F_iltre správ"
 
-#: ../mail/em-utils.c:368
+#: ../mail/em-utils.c:370
 #, fuzzy
 msgid "message"
 msgstr "Správa"
 
-#: ../mail/em-utils.c:563
+#: ../mail/em-utils.c:654
 #, fuzzy
 msgid "Save Message..."
 msgstr "Uložiť správu ako..."
 
-#: ../mail/em-utils.c:612
+#: ../mail/em-utils.c:704
 #, fuzzy
 msgid "Add address"
 msgstr "Adresa"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1096
-#, fuzzy, c-format
+#: ../mail/em-utils.c:1225
+#, c-format
 msgid "Messages from %s"
-msgstr "Pošta od %s"
+msgstr "Správy od %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 #, fuzzy
 msgid "Search _Folders"
 msgstr "Prehľadať pr_ie�inky"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 #, fuzzy
 msgid "Search Folder source"
 msgstr "Prehľadať pr_ie�inky"
 
 #: ../mail/evolution-mail.schemas.in.h:1
-msgid "Allows evolution to display text part of limited size"
-msgstr ""
+#, fuzzy
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Príjem a odoslanie pošty"
 
 #: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:3
+#, fuzzy
+msgid "\"Send and Receive Mail\" window width"
+msgstr "Príjem a odoslanie pošty"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+#, fuzzy
+msgid "Allows Evolution to display text part of limited size"
+msgstr "Nie je možné získať správu z editora"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+#, fuzzy
+msgid "Always request read receipt"
+msgstr "Vždy poslať späť správu o pre�ítaní"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:7
 #, fuzzy
 msgid "Automatic emoticon recognition"
 msgstr "Pridať do kontaktov"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:14
+msgid "Composer load/attach directory"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid "Custom headers to use while checking for junk."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:20
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Štandardný predmet pre správu."
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:21
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Štandardný predmet pre správu."
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:22
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Hľadá v texte zobrazenej správy"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:23
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Hľadá v texte zobrazenej správy"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:24
 #, fuzzy
 msgid "Default forward style"
 msgstr "Štýl _preposielania:"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:25
 #, fuzzy
-msgid "Default height of the Composer Window"
+msgid "Default height of the Composer Window."
 msgstr "Štandardný predmet pre správu."
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:26
 #, fuzzy
-msgid "Default height of the Message Window"
+msgid "Default height of the message window."
 msgstr "Štandardný predmet pre správu."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:27
 #, fuzzy
-msgid "Default height of the Subscribe dialog"
+msgid "Default height of the subscribe dialog."
 msgstr "Štandardný predmet pre správu."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:28
 #, fuzzy
 msgid "Default reply style"
 msgstr "Š_týl odpovede:"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:29
 #, fuzzy
 msgid "Default value for thread expand state"
 msgstr "Štandardný predmet pre správu."
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:30
 #, fuzzy
-msgid "Default width of the Composer Window"
+msgid "Default width of the Composer Window."
 msgstr "Prepne, �i sa má zobrazovať panel prie�inkov"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:31
 #, fuzzy
-msgid "Default width of the Message Window"
+msgid "Default width of the message window."
 msgstr "Prepne, �i sa má zobrazovať panel prie�inkov"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:32
 #, fuzzy
-msgid "Default width of the Subscribe dialog"
+msgid "Default width of the subscribe dialog."
 msgstr "Prepne, �i sa má zobrazovať panel prie�inkov"
 
-#: ../mail/evolution-mail.schemas.in.h:24
-msgid "Directory for saving mail component files"
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Determines whether to lookup in address book for sender email"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:35
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:36
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:37
+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:38
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:39
+msgid "Directory for loading/attaching files to composer."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Directory for saving mail component files."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid "Disable or enable ellipsizing of folder names in folder tree"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:43
 #, fuzzy
 msgid "Empty Junk folders on exit"
 msgstr "Vyprázdniť O_dpadky pri ukon�ení"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:44
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "Vyprázdniť O_dpadky pri ukon�ení"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:45
 #, fuzzy
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Vyprázdniť O_dpadky pri ukon�ení"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:46
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vyprázdniť O_dpadky pri ukon�ení"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:48
+#, fuzzy
+msgid "Enable or disable magic space bar"
+msgstr "Povoliť alebo zakázať zásuvné moduly"
+
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:50
+#, fuzzy
+msgid "Enable search folders"
+msgstr "Prehľadať pr_ie�inky"
+
+#: ../mail/evolution-mail.schemas.in.h:51
+msgid "Enable search folders on startup."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:52
 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 "
@@ -12810,231 +13480,258 @@ msgid ""
 "that folder."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:53
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:54
 #, fuzzy
 msgid "Enable to render message text part of limited size."
 msgstr "Nie je možné získať správu z editora"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:61
 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."
+"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:41
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
-"It disables the feature where repeated prompts to ask if delete messages "
-"from search folder."
+"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:42
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
-"It disables the feature where repeated prompts to ask if offline sync is "
-"required."
+"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:43
+#: ../mail/evolution-mail.schemas.in.h:64
+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:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid ""
+"It disables/enables the repeated prompts to ask if offline sync is required "
+"before going into offline mode."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:67
+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:68
 msgid "Last time empty junk was run"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Level beyond which the message should be logged."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:72
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:73
 #, fuzzy
 msgid "List of accepted licenses"
 msgstr "Poštové ú�ty"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:74
 #, fuzzy
 msgid "List of accounts"
 msgstr "Poštové ú�ty"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "List of dictionary language codes used for spell checking."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:52
-msgid "List of mime types to check for bonobo component viewers"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:54
-msgid "Load images for HTML messages over http"
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:80
+#, fuzzy
+msgid "Load images for HTML messages over HTTP"
+msgstr "Poslať správu kontaktu"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:81
 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"
+"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 ""
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:82
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Spustiť akcie"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:90
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Štandardná priorita:"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:71
-#, fuzzy
-msgid "New Mail Notify sound file"
-msgstr "Upozornenie na novú poštu"
-
-#: ../mail/evolution-mail.schemas.in.h:72
-#, fuzzy
-msgid "New Mail Notify type"
-msgstr "Upozornenie na novú poštu"
-
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:102
 #, fuzzy
 msgid "Prompt when deleting messages in search folder"
 msgstr "Pýtať sa pri posielaní správ be_z predmetu"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:105
 #, fuzzy
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Pýtať sa pri posielaní správ s adresátmi iba v _Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:106
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
@@ -13042,163 +13739,176 @@ msgid ""
 msgstr ""
 "_Pýtať sa pri posielaní HTML správ kontaktom, ktoré nechcú tento formát"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:107
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Pýtať sa pri posielaní správ s adresátmi iba v _Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:88
-msgid "Run junk test on incoming mail"
+#: ../mail/evolution-mail.schemas.in.h:112
+msgid "Run junk test on incoming mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:113
 #, fuzzy
 msgid "Save directory"
 msgstr "_Presmerovať"
 
-#: ../mail/evolution-mail.schemas.in.h:90
-msgid "Search for the sender photo in local addressbooks"
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Search for the sender photo in local address books"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:115
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "Poslať poštu HTML?"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:116
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "Poslať poštu HTML?"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:117
+#, fuzzy
+msgid "Sender email-address column in the message list"
+msgstr "Zobraziť správu normálne"
+
+#: ../mail/evolution-mail.schemas.in.h:118
+#, fuzzy
+msgid "Server synchronization interval"
+msgstr "Voľby _synchronizácie..."
+
+#: ../mail/evolution-mail.schemas.in.h:119
 #, fuzzy
 msgid "Show Animations"
 msgstr "Zobraziť _animované obrázky"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:120
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Zobraziť _animované obrázky"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:122
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Zobraziť správu normálne"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:126
 #, fuzzy
 msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
+"Show the email-address of the sender in a separate column in the message "
+"list."
 msgstr "Zobraziť správu normálne"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:128
 #, fuzzy
-msgid "Show the sender email in the messages column in the message list"
-msgstr "Zobraziť správu normálne"
+msgid "Spell check inline"
+msgstr "Kontrola _pravopisu"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:129
 #, fuzzy
-msgid "Sound file to play when new mail arrives."
-msgstr "_Zahrať zvuk pri príchode novej správy"
-
-#: ../mail/evolution-mail.schemas.in.h:104
-msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr ""
+msgid "Spell checking color"
+msgstr "Kontrola _pravopisu"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:130
 #, fuzzy
-msgid "Spell check inline"
+msgid "Spell checking languages"
 msgstr "Kontrola _pravopisu"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:131
 #, fuzzy
 msgid "Subscribe dialog default height"
 msgstr "Štandardná priorita:"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:133
 #, fuzzy
 msgid "Terminal font"
 msgstr "Písmo _terminálu:"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:134
 #, fuzzy
 msgid "Text message part limit"
 msgstr "_Poslať správu do zoznamu"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:113
-msgid "The terminal font for mail display"
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:138
+#, fuzzy
+msgid "The terminal font for mail display."
+msgstr "Vyberte písmo premenlivej šírky pre tla� HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:139
 #, fuzzy
-msgid "The variable width font for mail display"
+msgid "The variable width font for mail display."
 msgstr "Vyberte písmo premenlivej šírky pre tla� HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid ""
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:141
 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 interms of KB."
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:142
 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:117
+#: ../mail/evolution-mail.schemas.in.h:143
 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."
+"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:118
+#: ../mail/evolution-mail.schemas.in.h:144
 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;"
@@ -13206,387 +13916,437 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:145
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:147
 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:121
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart"
+"collapsed state by default. Evolution requires a restart."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:149
 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:123
+#: ../mail/evolution-mail.schemas.in.h:150
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Zoznam vlákien"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:151
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Zoznam vlákien"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:126
-msgid "Timeout for marking message as Seen"
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:153
+#, fuzzy
+msgid "Timeout for marking message as seen"
+msgstr "Ozna�í všetky viditeľné správy ako už pre�ítané"
 
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid "Timeout for marking message as Seen."
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid "Timeout for marking message as seen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:155
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Použiť ako š_tandardný ú�et"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:130
-msgid "Use SpamAssassin daemon and client (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:132
-msgid "Use custom fonts for displaying mail"
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:160
+#, fuzzy
+msgid "Use custom fonts for displaying mail."
+msgstr "Meno súboru zobrazené v správe."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:164
 #, fuzzy
 msgid "Variable width font"
 msgstr "_Premenlivá šírka:"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:175
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Whether disable ellipsizing feature of folder names in folder tree."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:177
 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:148
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:179
 #, fuzzy
 msgid "Width of the message-list pane"
 msgstr "Zoznam vlákien"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:180
 #, fuzzy
 msgid "Width of the message-list pane."
 msgstr "Zoznam vlákien"
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 #, fuzzy
 msgid "Importing Elm data"
 msgstr "Importujem súbory"
 
-#: ../mail/importers/elm-importer.c:373
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Import Elm pre Evolution"
 
-#: ../mail/importers/elm-importer.c:374
+#: ../mail/importers/elm-importer.c:368
 #, fuzzy
 msgid "Import mail from Elm."
 msgstr "Importujem súbory"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:79
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Odstrániť tento prie�inok"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:82
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Vyberte nástroj pre import"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr ""
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr ""
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Importujem súbory"
 
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importujem"
 
-#: ../mail/importers/mail-importer.c:376
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "Prehľadávam %s"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:225
 #, fuzzy
 msgid "Importing Pine data"
 msgstr "Importujem súbory"
 
-#: ../mail/importers/pine-importer.c:433
+#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "Import z Pine pre Evolution"
 
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:425
 #, fuzzy
 msgid "Import mail from Pine."
 msgstr "Importovať jeden súbor"
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "Pošta pre %s"
 
-#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:278
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "Predmet je %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "%s konferencia"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
 msgstr "Pridať pravidlo filtra"
 
-#: ../mail/mail-component.c:524
+#: ../mail/mail-component.c:163
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#, fuzzy
+msgid "Templates"
+msgstr "Temple"
+
+#: ../mail/mail-component.c:545
 #, fuzzy, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d vybraných"
 msgstr[1] "%d vybraných"
 
-#: ../mail/mail-component.c:528
+#: ../mail/mail-component.c:549
 #, fuzzy, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d vybraných"
 msgstr[1] "%d vybraných"
 
-#: ../mail/mail-component.c:530
+#: ../mail/mail-component.c:556
 #, fuzzy, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d neposlaných"
 msgstr[1] "%d neposlaných"
 
-#: ../mail/mail-component.c:533
+#: ../mail/mail-component.c:559
 #, fuzzy, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "Koncepty"
 msgstr[1] "Koncepty"
 
-#: ../mail/mail-component.c:535
+#: ../mail/mail-component.c:561
 #, fuzzy, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d poslaných"
 msgstr[1] "%d poslaných"
 
-#: ../mail/mail-component.c:537
+#: ../mail/mail-component.c:563
 #, fuzzy, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d neposlaných"
 msgstr[1] "%d neposlaných"
 
-#: ../mail/mail-component.c:543
+#: ../mail/mail-component.c:569
 #, fuzzy, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d neposlaných"
 msgstr[1] "%d neposlaných"
 
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:570
 #, fuzzy, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "celkovo %d"
 msgstr[1] "celkovo %d"
 
-#: ../mail/mail-component.c:881
+#: ../mail/mail-component.c:922
 msgid "New Mail Message"
 msgstr "Nová správa"
 
-#: ../mail/mail-component.c:882
-msgid "_Mail Message"
-msgstr "_Poslať správu"
-
-#: ../mail/mail-component.c:883
+#: ../mail/mail-component.c:924
 msgid "Compose a new mail message"
 msgstr "Napísať novú správu"
 
-#: ../mail/mail-component.c:889
+#: ../mail/mail-component.c:930
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Nový vPrie�inok"
 
-#: ../mail/mail-component.c:890
-#, fuzzy
-msgid "Mail _Folder"
-msgstr "Poštové filtre"
-
-#: ../mail/mail-component.c:891
+#: ../mail/mail-component.c:932
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Vytvoriť nový prie�inok"
 
-#: ../mail/mail-component.c:1038
+#: ../mail/mail-component.c:1079
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: ../mail/mail-config.c:81
+#: ../mail/mail-component.c:1595
+msgid "Error"
+msgstr ""
+
+#: ../mail/mail-component.c:1595
+msgid "Errors"
+msgstr ""
+
+#: ../mail/mail-component.c:1596
+msgid "Warnings and Errors"
+msgstr ""
+
+#: ../mail/mail-component.c:1597
+msgid "Debug"
+msgstr ""
+
+#: ../mail/mail-component.c:1597
+msgid "Error, Warnings and Debug messages"
+msgstr ""
+
+#: ../mail/mail-component.c:1724
 #, fuzzy
-msgid "I_mportant"
-msgstr "Dôležité"
+msgid "Debug Logs"
+msgstr "Adresa _WWW stránky:"
 
-#. red
-#: ../mail/mail-config.c:82
+#: ../mail/mail-component.c:1738
+msgid "Show _errors in the status bar for"
+msgstr ""
+
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1754
 #, fuzzy
-msgid "_Work"
-msgstr "Práca"
+msgid "second(s)."
+msgstr "sekúnd"
 
-#. orange
-#: ../mail/mail-config.c:83
+#: ../mail/mail-component.c:1760
 #, fuzzy
-msgid "_Personal"
-msgstr "Osobný"
+msgid "Log Messages:"
+msgstr "_Správy"
 
-#. green
-#: ../mail/mail-config.c:84
+#: ../mail/mail-component.c:1801
+msgid "Log Level"
+msgstr ""
+
+#: ../mail/mail-component.c:1810 ../widgets/misc/e-dateedit.c:389
 #, fuzzy
-msgid "_To Do"
-msgstr "Urobiť"
+msgid "Time"
+msgstr "Časová zóna "
 
-#. blue
-#: ../mail/mail-config.c:85
+#: ../mail/mail-component.c:1820 ../mail/message-list.c:2516
+#: ../mail/message-list.etspec.h:10
 #, fuzzy
-msgid "_Later"
-msgstr "Neskôr"
+msgid "Messages"
+msgstr "_Správy"
+
+#: ../mail/mail-component.c:1829 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Zavrie toto okno"
 
 #: ../mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "Kontrolovať _podporované typy"
 
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
+msgid "(Note: Requires restart of the application)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "(Táto verzia Evolution nepodporuje SSL)"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
 #, fuzzy
-msgid "<b>Sender  Photograph</b>"
+msgid "<b>Sender Photograph</b>"
 msgstr "Popis:"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>Sig_natures</b>"
 msgstr "<b>Stav:</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>Stav:</b>"
 
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Authentication Type</span>"
-msgstr ""
-
 #: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
@@ -13613,8 +14373,9 @@ msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
 msgstr "Zobrazené správy:"
 
 #: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr ""
+#, fuzzy
+msgid "<span weight=\"bold\">Labels</span>"
+msgstr "Zobrazené správy:"
 
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
@@ -13635,28 +14396,28 @@ msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "Zobrazené správy:"
 
 #: ../mail/mail-config.glade.h:23
-#, fuzzy
-msgid "<span weight=\"bold\">New Message Notification</span>"
-msgstr "Upozornenie na novú poštu"
-
-#: ../mail/mail-config.glade.h:24
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
+#: ../mail/mail-config.glade.h:27
+#, fuzzy
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "Zobrazené správy:"
+
 #: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
@@ -13678,113 +14439,119 @@ msgstr "Odoslané a koncepty"
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:33
+#, fuzzy
+msgid "<span weight=\"bold\">_Authentication Type</span>"
+msgstr "Zobrazené správy:"
+
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Správa ú�tu"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Pridať nový podpis..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 #, fuzzy
 msgid "Add _Script"
 msgstr "Pridať _skript"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Vždy podpisovať správy pri použití tohto ú�tu"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "_Vždy šifrovať kópiu sebe pri posielaní šifrovanej správy"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Vždy poslať _kópiu (Cc):"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Vždy poslať _slepú kópiu (Bcc):"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Vždy _dôverovať kľú�om v mojom keyringu pri šifrovaní"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "_Vždy šifrovať kópiu sebe pri posielaní šifrovanej správy"
 
-#: ../mail/mail-config.glade.h:43
-msgid "Attach original message"
-msgstr "Priložiť pôvodnú správu"
+#: ../mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Always request rea_d receipt"
+msgstr "Vždy poslať späť správu o pre�ítaní"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Automatically insert _emoticon images"
 msgstr "_Automaticky vložiť smajlíky"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltská (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltská (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid "C_haracter set:"
 msgstr "_Znaková sada:"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr "Kontrolovať _podporované typy"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 #, fuzzy
-msgid "Check in_coming messages for junk"
+msgid "Check cu_stom headers for junk"
 msgstr "Kontrolujem novú poštu"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Check incoming _messages for junk"
+msgstr "Kontrolujem novú poštu"
+
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Kontrolovať pravopis _priebežne"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Cle_ar"
 msgstr "Vymazať"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Clea_r"
 msgstr "Vymazať"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "Farba pre ne_správne slová:"
 
-#: ../mail/mail-config.glade.h:56
-#, fuzzy
-msgid "Colors"
-msgstr "_Farby"
-
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "_Potvrdenie pri �istení prie�inku"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13800,162 +14567,199 @@ msgstr ""
 "\n"
 "Kliknutím na \"Použiť\" uložíte vaše nastavenie."
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "Š_tandardné"
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Štandardná _znaková sada:"
 
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.glade.h:68
 msgid "Delete junk messages on e_xit"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 #, fuzzy
-msgid "Digitally _sign outgoing messages (by default)"
+msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Vždy podpisovať správy pri použití tohto ú�tu"
 
-#: ../mail/mail-config.glade.h:70
-msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr ""
-
 #: ../mail/mail-config.glade.h:71
-msgid "Do not quote original message"
-msgstr "Necitovať pôvodnú správu"
+msgid "Do not format messages when text si_ze exceeds"
+msgstr ""
 
 #: ../mail/mail-config.glade.h:72
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Do not quote"
+msgstr "Obnoviť _zmazané"
+
+#: ../mail/mail-config.glade.h:74
 msgid "Done"
 msgstr "Hotovo"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "Prie�inok _konceptov:"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email Accounts"
 msgstr "E-mailové ú�ty"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Email _Address:"
 msgstr "_E-mailová adresa:"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "Vyprázdniť O_dpadky pri ukon�ení"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
+msgid "Enable Magic S_pacebar "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:80
+#, fuzzy
+msgid "Enable Sea_rch Folders"
+msgstr "Prehľadať pr_ie�inky"
+
+#: ../mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID _certifikátu:"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Vždy podpisovať správy pri použití tohto ú�tu"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Pe_vná šírka:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:85
 #, fuzzy
 msgid "Fix_ed width Font:"
 msgstr "Pe_vná šírka:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:86
 msgid "Font Properties"
 msgstr "Vlastnosti písma"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:87
 msgid "Format messages in _HTML"
 msgstr "Písať správy v _HTML"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Full Nam_e:"
 msgstr "_Celé meno:"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:90
 #, fuzzy
 msgid "HTML Messages"
 msgstr "_Správy"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:91
+#, fuzzy
+msgid "H_TTP Proxy:"
+msgstr "_PO Box:"
+
+#: ../mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Headers"
 msgstr "Hlavi�ka"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "_Zvýrazniť citácie pomocou"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "v texte"
 
-#: ../mail/mail-config.glade.h:93
-msgid "Inline original message (Outlook style)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:98
 msgid "KB"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Labels"
+msgstr "Popis"
+
+#: ../mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Languages Table"
 msgstr "Jazyk"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "Nastavenie pošty"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Mail Headers Table"
 msgstr "Poštové filtre"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "Umiestnenie poštovej schránky"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "Písanie správ"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:106
+msgid "No _Proxy for:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:107
+msgid ""
+"Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Poznámka: Kým sa prvýkrát nepripojíte, nebudete musieť heslo zadávať."
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "Or_ganizácia:"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "ID PGP/GPG _kľú�a:"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:112
 #, fuzzy
-msgid "Play sound file when new messages arri_ve"
-msgstr "_Zahrať zvuk pri príchode novej správy"
+msgid "Pass_word:"
+msgstr "Heslo"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:114
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:116
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13964,7 +14768,7 @@ msgstr ""
 "ktorý typ serveru použiť, kontaktujte vášho administrátora alebo "
 "poskytovateľa pripojenia na Internet."
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:117
 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 "
@@ -13973,143 +14777,138 @@ msgstr ""
 "Prosím, zadajte vaše meno a e-mailovú adresu. \"Nepovinné\" informácie\n"
 "nemusíte zadať, iba ak chcete, aby boli posielané vo vašich správach."
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Prosím, vyberte si z týchto možností"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Port:"
+msgstr "_Port:"
+
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Pýtať sa pri posielaní správ s adresátmi iba v _Bcc"
 
-#: ../mail/mail-config.glade.h:115
-msgid "Quote original message"
-msgstr "Citovať pôvodnú správu"
-
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Citovať"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Re_member password"
 msgstr "Uložiť toto heslo"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "Komu o_dpovedať:"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:125
 #, fuzzy
 msgid "Remember _password"
 msgstr "Uložiť toto heslo"
 
-#: ../mail/mail-config.glade.h:121
-msgid "S_earch for sender photograph only in local addressbooks"
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:127
+msgid "S_earch for sender photograph only in local address books"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:128
 #, fuzzy
 msgid "S_elect..."
 msgstr "Odstrániť..."
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:129
 #, fuzzy
 msgid "S_end message receipts:"
 msgstr "Posielam správu"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:130
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "Š_tandardné písmo:"
 
-#: ../mail/mail-config.glade.h:125
-#, fuzzy
-msgid "Se_lect..."
-msgstr "Odstrániť..."
-
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:132
 #, fuzzy
 msgid "Select Drafts Folder"
 msgstr "Vybrať prie�inok"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font"
 msgstr "Vyberte písmo pevnej širky pre HTML"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font for printing"
 msgstr "Vyberte písmo pevnej širky pre tla� HTML"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font"
 msgstr "Vyberte písmo premenlivej širky pre HTML"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font for printing"
 msgstr "Vyberte písmo premenlivej šírky pre tla� HTML"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Select Sent Folder"
 msgstr "Vybrať prie�inok"
 
-#: ../mail/mail-config.glade.h:133
-#, fuzzy
-msgid "Select sound file"
-msgstr "Vybrať súbor"
-
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "Posielanie pošty"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Prie�inok pre _odoslané správy:"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "Server vyžaduje _prihlásenie"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:142
 msgid "Server _Type: "
 msgstr "_Typ serveru:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:143
 #, fuzzy
 msgid "Sig_ning certificate:"
 msgstr "Samopodpísaný certifikát v reťazci"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:144
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Podpis:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:145
 #, fuzzy
 msgid "Signatures"
 msgstr "_Podpisy"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:146
 #, fuzzy
 msgid "Signatures Table"
 msgstr "_Podpisy"
 
-#: ../mail/mail-config.glade.h:143
-msgid "Specify _filename:"
-msgstr "Zadajte _meno súboru:"
-
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:147
 #, fuzzy
 msgid "Spell Checking"
 msgstr "Kontrola _pravopisu"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:148
+msgid "Start _typing at the bottom on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:149
 #, fuzzy
 msgid "T_ype: "
 msgstr "Typ:"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:150
 #, fuzzy
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
@@ -14118,7 +14917,7 @@ msgstr ""
 "Táto �asť umožňuje nastviť chovanie a jazyk pre kontrolu pravopisu. Zoznam "
 "jazykov obsahuje iba tie, pre ktoré máte nainštalované slovníky."
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14127,7 +14926,7 @@ msgstr ""
 "Výstup tohto skriptu sa použije ako vaša signatúra.\n"
 "Zadané meno sa použije iba pre zobrazenie."
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:154
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14135,16 +14934,28 @@ msgstr ""
 "Zadajte meno, ako chcete tento ú�et ozna�ovať.\n"
 "Napríklad \"Pracovný\" alebo \"Osobný\"."
 
-#: ../mail/mail-config.glade.h:153 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:343
+#: ../mail/mail-config.glade.h:156
+#, fuzzy
+msgid "Us_ername:"
+msgstr "Po_užívateľ:"
+
+#: ../mail/mail-config.glade.h:157
+#, fuzzy
+msgid "Use Authe_ntication"
+msgstr "Overenie totožnosti"
+
+#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:284
+#: ../plugins/google-account-setup/google-source.c:625
+#: ../plugins/google-account-setup/google-contacts-source.c:278
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "Po_užívateľ:"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:159
 msgid "V_ariable-width:"
 msgstr "_Premenlivá šírka:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:160
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14154,117 +14965,140 @@ msgstr ""
 "\n"
 "Kliknutím \"Nasledujúci\" za�nete."
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:163
 msgid "_Add Signature"
 msgstr "_Pridať podpis"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "_Vždy na�ítavať obrázky zo siete"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:165
 #, fuzzy
-msgid "_Beep when new messages arrive"
-msgstr "Píp_nuť pri príchode novej správy"
+msgid "_Automatic proxy configuration URL:"
+msgstr "Pridať do kontaktov"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:166
 msgid "_Default junk plugin:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Do not notify me when new messages arrive"
-msgstr "_Neuprozorňovať na príchod novej správy"
+#: ../mail/mail-config.glade.h:167
+msgid "_Direct connection to the Internet"
+msgstr ""
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 "Nepodpisovať požiadavky na _stretnutie (pre kompatibilitu s klientom Outlook)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:170
 msgid "_Forward style:"
 msgstr "Štýl _preposielania:"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:171
 msgid "_Keep Signature above the original message on replying"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Load images in messages from contacts"
 msgstr "Poslať správu kontaktu"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Lookup in local address book only"
+msgstr "pre všetky lokálne a aktívne vzdialené prie�inky"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Make this my default account"
 msgstr "Použiť ako š_tandardný ú�et"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Manual proxy configuration:"
+msgstr "Nastavenie pošty"
+
+#: ../mail/mail-config.glade.h:176
 msgid "_Mark messages as read after"
 msgstr "_Ozna�iť správy ako pre�ítané po"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "_Nikdy nena�ítať obrázky zo siete"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:179
 msgid "_Path:"
 msgstr "_Cesta:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:180
 #, fuzzy
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 "_Pýtať sa pri posielaní HTML správ kontaktom, ktoré nechcú tento formát"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:181
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pýtať sa pri posielaní správ be_z predmetu"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:182
 msgid "_Reply style:"
 msgstr "Š_týl odpovede:"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:183
 msgid "_Script:"
 msgstr "_Skript:"
 
+#: ../mail/mail-config.glade.h:184
+msgid "_Secure HTTP Proxy:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:185
+#, fuzzy
+msgid "_Select..."
+msgstr "Odstrániť..."
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:188
 #, fuzzy
 msgid "_Show image animations"
 msgstr "Zobraziť _animované obrázky"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:189
 #, fuzzy
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Zobraziť zdrojový poštový formát v správe"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:190
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr ""
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:191
 #, fuzzy
 msgid "_Use Secure Connection:"
 msgstr "Použiť _bezpe�né pripojenie (SSL):"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:192
+#, fuzzy
+msgid "_Use system defaults"
+msgstr "Å tandard"
+
+#: ../mail/mail-config.glade.h:193
 msgid "_Use the same fonts as other applications"
 msgstr "_Použiť rovnaké písma ako ostatné aplikácie"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:194
 #, fuzzy
 msgid "addresses"
 msgstr "Adresa"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "farba"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "popis"
 
@@ -14311,46 +15145,46 @@ msgstr "Rozlišovať veľkosť písmen"
 msgid "Co_mpleted"
 msgstr "Dokon�ený"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 #, fuzzy
 msgid "F_ind:"
 msgstr "Hľadať:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Nájsť v správe"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "Zna�ka pre Follow Up"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Prihlásené prie�inky"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Žiadne vybrané"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "S_erver:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 #, fuzzy
 msgid "Security Information"
 msgstr "Informácia o ú�te"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 #, fuzzy
 msgid "Specific folders"
 msgstr "iba špecifické prie�inky"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:19
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14358,46 +15192,46 @@ msgstr ""
 "Správy, ktoré ste ozna�ili ako nasledujúce, sú uvedené dole.\n"
 "Prosím, vyberte akciu follow up z menu \"Zna�ka\"."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 #, fuzzy
 msgid "_Accept License"
 msgstr "Akceptované"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 #, fuzzy
 msgid "_Due By:"
 msgstr "_Termín:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Zna�ka:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 #, fuzzy
 msgid "_Tick this to accept the license agreement"
 msgstr "Poštové ú�ty"
 
-#: ../mail/mail-folder-cache.c:888
+#: ../mail/mail-folder-cache.c:833
 #, c-format
 msgid "Pinging %s"
 msgstr "Prehľadávam %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:106
 #, fuzzy
 msgid "Filtering Selected Messages"
 msgstr "Skryť zvol_ené správy"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Prijímam poštu"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:561
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nepodarilo sa použiť filtre pre odosielanú poštu : %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14406,115 +15240,125 @@ msgstr ""
 "Nepodarilo sa pridať do %s: %s\n"
 "Namiesto toho sa pridá do prie�inka `Odoslané'."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nepodarilo sa pridať do lokálneho prie�inku \"Odoslené\": %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:725
+#, fuzzy
+msgid "Sending message"
+msgstr "_Odoslať správu"
+
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Posielam správu %d z %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Nepodarilo sa dekódovať správu."
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:698
 #, fuzzy
 msgid "Canceled."
 msgstr "Zrušené."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:700
 msgid "Complete."
 msgstr "Dokon�ené."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:872
 msgid "Saving message to folder"
 msgstr "Ukladám správu do prie�inku"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Presúvam správy do %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopírujem správy do %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "Správy predané �alej"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1208
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otváram prie�inok %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1273
+#, fuzzy, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "Informácie o denníku"
+
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Opening store %s"
 msgstr "Otváram sklad %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstraňujem prie�inok %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ukladám prie�inok '%s'"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1595
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Ukladám prie�inok '%s'"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1649
 msgid "Refreshing folder"
 msgstr "Aktualizujem prie�inok"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
 msgid "Expunging folder"
 msgstr "Čistím prie�inok"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1736
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vyprázdňujem kôš v '%s'"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1737
 msgid "Local Folders"
 msgstr "Lokálne prie�inky"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Získavam správu %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1925
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Získavam %d správ"
 msgstr[1] "Získavam %d správ"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:2010
 #, fuzzy, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
+msgid_plural "Saving %d messages"
 msgstr[0] "Ukladám %d správ"
 msgstr[1] "Ukladám %d správ"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:2088
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14523,11 +15367,11 @@ msgstr ""
 "Chyba pri ukladaní správ do `%s':\n"
 "%s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2160
 msgid "Saving attachment"
 msgstr "Ukladám prílohu"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14536,92 +15380,94 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2201
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojujem sa od %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znovu sa pripojujem na %s"
 
-#: ../mail/mail-ops.c:2361
+#: ../mail/mail-ops.c:2443
 #, fuzzy, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Ukladám prie�inok '%s'"
 
-#: ../mail/mail-ops.c:2444
+#: ../mail/mail-ops.c:2529
 msgid "Checking Service"
 msgstr "Kontrolujem službu"
 
-#: ../mail/mail-send-recv.c:188
+#: ../mail/mail-send-recv.c:181
 #, fuzzy
 msgid "Canceling..."
 msgstr "Ruším..."
 
-#: ../mail/mail-send-recv.c:391
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Príjem a odoslanie pošty"
 
-#: ../mail/mail-send-recv.c:398
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "Zrušiť _všetko"
 
-#: ../mail/mail-send-recv.c:506
+#: ../mail/mail-send-recv.c:502
 msgid "Updating..."
 msgstr "Obnovujem..."
 
-#: ../mail/mail-send-recv.c:506 ../mail/mail-send-recv.c:579
+#: ../mail/mail-send-recv.c:502 ../mail/mail-send-recv.c:578
 msgid "Waiting..."
 msgstr "Čakám..."
 
-#: ../mail/mail-send-recv.c:788
-#, fuzzy
+#: ../mail/mail-send-recv.c:804
+#, fuzzy, c-format
 msgid "Checking for new mail"
 msgstr "Kontrolujem novú poštu"
 
-#: ../mail/mail-session.c:202
+#: ../mail/mail-session.c:209
 #, fuzzy, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Zadajte vaše heslo pre %s"
 
-#: ../mail/mail-session.c:204
+#: ../mail/mail-session.c:211
 #, fuzzy
 msgid "Enter Passphrase"
 msgstr "Zadajte heslo"
 
-#: ../mail/mail-session.c:207
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:214
+#: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Zadajte vaše heslo pre %s"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:216
 msgid "Enter Password"
 msgstr "Zadajte heslo"
 
-#: ../mail/mail-session.c:251
+#: ../mail/mail-session.c:258
 msgid "User canceled operation."
 msgstr "Používateľ zrušil operáciu."
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "Upraviť podpis"
+#: ../mail/mail-signature-editor.c:201
+#, fuzzy
+msgid "_Save and Close"
+msgstr "Uložiť a zavrieť"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "Zadajte meno pre tento podpis."
+#: ../mail/mail-signature-editor.c:355
+#, fuzzy
+msgid "Edit Signature"
+msgstr "Upraviť podpis"
 
-#: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
-msgid "Name:"
-msgstr "Meno:"
+#: ../mail/mail-signature-editor.c:370
+#, fuzzy
+msgid "_Signature Name:"
+msgstr "_Podpisy"
 
 #: ../mail/mail-tools.c:120
 #, fuzzy, c-format
@@ -14649,7 +15495,7 @@ msgstr "Predaná správa"
 msgid "Invalid folder: `%s'"
 msgstr "Otváram prie�inok %s"
 
-#: ../mail/mail-vfolder.c:91
+#: ../mail/mail-vfolder.c:89
 #, fuzzy, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Nastavujem vprie�inok: '%s'"
@@ -14664,31 +15510,27 @@ msgstr "Aktualizujem vprie�inky pre uri: %s"
 msgid "Updating Search Folders for '%s'"
 msgstr "Aktualizujem vprie�inky pre uri: %s"
 
-#: ../mail/mail-vfolder.c:1046
-#, fuzzy
+#: ../mail/mail-vfolder.c:1081
 msgid "Edit Search Folder"
-msgstr "Prehľadať pr_ie�inky"
+msgstr "Upraviť vyhľadávací prie�inok"
 
-#: ../mail/mail-vfolder.c:1130
-#, fuzzy
+#: ../mail/mail-vfolder.c:1170
 msgid "New Search Folder"
-msgstr "Prehľadať pr_ie�inky"
+msgstr "Nový vyhľadávací prie�inok"
 
 #: ../mail/mail.error.xml.h:1
 #, fuzzy
-msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Prie�inok \"%s\" už existuje. Prosím, zadajte iné meno."
 
 #: ../mail/mail.error.xml.h:2
 #, fuzzy
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Prie�inok \"%s\" už existuje. Prosím, zadajte iné meno."
 
 #: ../mail/mail.error.xml.h:3
 msgid ""
-"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"A non-empty folder at \"{1}\" already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
@@ -14696,15 +15538,15 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:7
 #, fuzzy
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
 msgstr "Prie�inok \"%s\" už existuje. Prosím, zadajte iné meno."
 
 #: ../mail/mail.error.xml.h:8
@@ -14744,8 +15586,8 @@ msgstr "Trvalo odstrániť všetky zmazané správy zo všetkých prie�inkov"
 #, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
-msgstr "Naozaj chcete otvoriť všetkých %d správ v samostatných oknách?"
+"folder \"{0}\"?"
+msgstr "Trvalo odstrániť všetky zmazané správy zo všetkých prie�inkov"
 
 #: ../mail/mail.error.xml.h:15
 #, fuzzy
@@ -14763,34 +15605,28 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
+msgid "Because \"{0}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
+msgid "Because \"{2}\"."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:21
-#, fuzzy
 msgid "Blank Signature"
-msgstr "_Podpisy"
+msgstr "Prázdny podpis"
 
 #: ../mail/mail.error.xml.h:22
-#, fuzzy
-msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr ""
-"Nie je možné odstrániť prie�inok:\n"
-"%s"
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "Nie je možné pridať vyhľadávací prie�inok \"{0}\"."
 
 #: ../mail/mail.error.xml.h:23
-#, fuzzy
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Nie je možné skopírovať prie�inok: %s"
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Nie je možné skopírovať prie�inok \"{0}\" do \"{1}\"."
 
 #: ../mail/mail.error.xml.h:24
-#, fuzzy
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "Nie je možné získať prie�inok: %s: %s"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Nie je možné vytvoriť prie�inok \"{0}\"."
 
 #: ../mail/mail.error.xml.h:25
 #, fuzzy
@@ -14799,7 +15635,7 @@ msgstr "Nie je možné vytvoriť do�asný prie�inok: %s"
 
 #: ../mail/mail.error.xml.h:26
 #, fuzzy
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
 "Nie je možné vytvoriť prie�inok\n"
 "%s\n"
@@ -14807,56 +15643,52 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:27
 #, fuzzy
-msgid "Cannot delete folder &quot;{0}&quot;."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
 "Nie je možné odstrániť prie�inok:\n"
 "%s"
 
 #: ../mail/mail.error.xml.h:28
-#, fuzzy
-msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "Nie je možné odstrániť prie�inok: %s: Prie�inok neexistuje"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Nie je možné odstrániť systémový prie�inok \"{0}\"."
 
 #: ../mail/mail.error.xml.h:29
-#, fuzzy
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "Prie�inok `%s' neexistuje."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "Nie je možné upraviť vyhľadávací prie�inok \"{0}\" pretože neexistuje."
 
 #: ../mail/mail.error.xml.h:30
-#, fuzzy
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "Nie je možné presunúť prie�inok: %s"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Nie je možné presunúť prie�inok \"{0}\" do \"{1}\"."
 
 #: ../mail/mail.error.xml.h:31
 #, fuzzy
-msgid "Cannot open source &quot;{1}&quot;"
+msgid "Cannot open source \"{1}\""
 msgstr "Nie je možné otvoriť zdieľaný prie�inok: %s."
 
 #: ../mail/mail.error.xml.h:32
 #, fuzzy
-msgid "Cannot open source &quot;{2}&quot;."
+msgid "Cannot open source \"{2}\"."
 msgstr "Nie je možné otvoriť zdieľaný prie�inok: %s."
 
 #: ../mail/mail.error.xml.h:33
 #, fuzzy
-msgid "Cannot open target &quot;{2}&quot;."
+msgid "Cannot open target \"{2}\"."
 msgstr "Nie je možné otvoriť správu"
 
 #: ../mail/mail.error.xml.h:34
 msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
-"license."
+"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 ""
 
 #: ../mail/mail.error.xml.h:35
 #, fuzzy
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Nie je možné presunúť prie�inok: %s"
 
 #: ../mail/mail.error.xml.h:36
 #, fuzzy
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
+msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Nie je možné premenovať prie�inok: %s: Prie�inok neexistuje"
 
 #: ../mail/mail.error.xml.h:37
@@ -14866,78 +15698,71 @@ msgstr "a jedna iná karta."
 
 #: ../mail/mail.error.xml.h:38
 #, fuzzy
-msgid "Cannot save to directory &quot;{0}&quot;."
+msgid "Cannot save to directory \"{0}\"."
 msgstr "Nie je možné vytvoriť prie�inok %s: %s"
 
 #: ../mail/mail.error.xml.h:39
 #, fuzzy
-msgid "Cannot save to file &quot;{0}&quot;."
+msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "Nie je možné uložiť do %s\n"
 "  %s"
 
 #: ../mail/mail.error.xml.h:40
 #, fuzzy
-msgid "Cannot set signature script &quot;{0}&quot;."
+msgid "Cannot set signature script \"{0}\"."
 msgstr "_Pridať podpis"
 
 #: ../mail/mail.error.xml.h:41
+msgid "Check Junk Failed"
+msgstr ""
+
+#: ../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 ""
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 #, fuzzy
 msgid "Could not save signature file."
 msgstr "Nepodarilo sa uložiť súbor podpisu: %s"
 
-#: ../mail/mail.error.xml.h:43
-#, fuzzy
-msgid "Delete &quot;{0}&quot;?"
-msgstr "Odstrániť \"%s\""
-
 #: ../mail/mail.error.xml.h:44
 #, fuzzy
-msgid "Delete account?"
-msgstr "Odstrániť vybrané kontakty"
+msgid "Delete \"{0}\"?"
+msgstr "Odstránené"
 
 #: ../mail/mail.error.xml.h:45
 #, fuzzy
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr ""
-"Nie je možné odstrániť prie�inok:\n"
-"%s"
+msgid "Delete account?"
+msgstr "Odstrániť vybrané kontakty"
 
 #: ../mail/mail.error.xml.h:46
-#, fuzzy
-msgid "Delete messages in Search Folder?"
-msgstr "Kopírovať vybrané správy do iného prie�inka"
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "Odstrániť správy z vyhľadávacieho prie�inka \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:47
-#, fuzzy
-msgid "Discard changes?"
-msgstr "_Zahodiť zmeny"
+msgid "Delete messages in Search Folder?"
+msgstr "Odstrániť správy z vyhľadávacieho prie�inka?"
 
 #: ../mail/mail.error.xml.h:48
-#, fuzzy
-msgid "Do not d_elete"
-msgstr "Obnoviť _zmazané"
+msgid "Discard changes?"
+msgstr "Zahodiť zmeny?"
 
 #: ../mail/mail.error.xml.h:49
-#, fuzzy
-msgid "Do not delete"
-msgstr "Obnoviť _zmazané"
+msgid "Do not d_elete"
+msgstr ""
 
 #: ../mail/mail.error.xml.h:50
+msgid "Do not delete"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:51
 #, fuzzy
 msgid "Do not disable"
 msgstr "Zakázať"
 
-#: ../mail/mail.error.xml.h:51
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr ""
-
 #: ../mail/mail.error.xml.h:52
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
@@ -14955,9 +15780,8 @@ msgid "Do you wish to save your changes?"
 msgstr "Chcete uložiť zmeny?"
 
 #: ../mail/mail.error.xml.h:55
-#, fuzzy
 msgid "Enter password."
-msgstr "Zadajte heslo"
+msgstr "Zadajte heslo."
 
 #: ../mail/mail.error.xml.h:56
 #, fuzzy
@@ -15048,115 +15872,113 @@ msgstr "Ozna�í všetky viditeľné správy ako už pre�ítané"
 
 #: ../mail/mail.error.xml.h:74
 #, fuzzy
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "_Ozna�iť správy ako pre�ítané po"
-
-#: ../mail/mail.error.xml.h:75
-#, fuzzy
 msgid "Missing folder."
 msgstr "Odstraňujem prie�inok %s"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 #, fuzzy
 msgid "No sources selected."
 msgstr "Nebol vybraný žiadny server"
 
-#: ../mail/mail.error.xml.h:78
-#, fuzzy
-msgid "Only on _Current Folder"
-msgstr "Ako prie�inok odo_slaných"
-
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:80
 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:83
+#: ../mail/mail.error.xml.h:81
 #, fuzzy
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
-"{0}\n"
-"Send anyway?"
+"{0}"
 msgstr ""
 "Posielate správu formátovanú ako HTML, ale nasledujúci adresáti nechcú\n"
 "dostávať takto formátovanú poštu:\n"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:83
 #, fuzzy
 msgid "Please provide an unique name to identify this signature."
 msgstr "Zadajte meno pre tento podpis."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:84
 #, fuzzy
 msgid "Please wait."
 msgstr "Prosím, �akajte"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:87
 #, fuzzy
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Požadované šifrovanie pre požadovaný spôsob overenia"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:88
 #, fuzzy
 msgid "Read receipt requested."
 msgstr "Š_týl odpovede:"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:89
 #, fuzzy
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Naozaj odstrániť prie�inok \"%s\"?"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:90
+#, fuzzy
+msgid "Report Junk Failed"
+msgstr "Importovať súbor"
+
+#: ../mail/mail.error.xml.h:91
+msgid "Report Not Junk Failed"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 #, fuzzy
 msgid "Send Receipt"
 msgstr "Správa o pre�ítaní"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:94
 #, fuzzy
 msgid "Signature Already Exists"
 msgstr "Certifikát už existuje"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:95
 msgid "Synchronize"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:96
 msgid "Synchronize folders locally for offline usage?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:97
 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:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -15166,13 +15988,13 @@ msgid ""
 "recipient. "
 msgstr ""
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:101
 #, fuzzy
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 "Tieto vprie�inky:\n"
@@ -15180,13 +16002,13 @@ msgstr ""
 "    '%s'\n"
 "A boli aktualizované."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:106
 #, fuzzy
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 "Tieto vprie�inky:\n"
@@ -15194,35 +16016,35 @@ msgstr ""
 "    '%s'\n"
 "A boli aktualizované."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:116
 #, fuzzy
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "Požadovaný spôsob overenia %s nie je podporovaný SMTP serverom %s."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:117
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15230,19 +16052,19 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:118
 #, fuzzy
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "_Ozna�iť správy ako pre�ítané po"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:119
 #, fuzzy
 msgid "Unable to connect to the GroupWise server."
 msgstr "Nepodarilo sa pripojiť k serveru LDAP"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:120
 #, fuzzy
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
@@ -15251,160 +16073,169 @@ msgstr ""
 "Nei je možné otvoriť prie�inok na koncepty pre tento ú�et.\n"
 "Chcete použiť štandardný prie�inok na koncepty?"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:121
 #, fuzzy
 msgid "Unable to read license file."
 msgstr ""
 "Nepodarilo sa hľadať v súbore: %s\n"
 "%s"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:122
 #, fuzzy
 msgid "Use _Default"
 msgstr "Å tandard"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:123
 #, fuzzy
 msgid "Use default drafts folder?"
 msgstr "Otváram štandardný prie�inok úloh"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:124
 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 ""
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "Nevyplnili ste všetky povinné informácie."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Máte neodoslané správy. Chcete skon�iť aj tak?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
 msgstr "Nemôžete vytvoriť dva ú�ty s rovnakým menom."
 
-#: ../mail/mail.error.xml.h:131
-#, fuzzy
+#: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
-msgstr "Musíte tento vprie�inok pomenovať."
+msgstr "Musíte tento vyhľadávací prie�inok pomenovať."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:131
 msgid "You must specify a folder."
 msgstr "Musíte zadať meno prie�inku."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:135
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+#: ../mail/mail.error.xml.h:134
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:135
 msgid "_Append"
 msgstr "_Pripojiť"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "_Zahodiť zmeny"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:137
 msgid "_Do not Synchronize"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:139
 #, fuzzy
 msgid "_Expunge"
 msgstr "_Vy�istiť"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:140
 msgid "_Open Messages"
 msgstr "_Otvoriť správy"
 
-#: ../mail/mail.error.xml.h:144
-#, fuzzy
-msgid "on Current Folder and _Subfolders"
-msgstr "Vytvoriť nový prie�inok"
-
-#: ../mail/message-list.c:1024
+#: ../mail/message-list.c:1053
 msgid "Unseen"
 msgstr "Nevidené"
 
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1054
 msgid "Seen"
 msgstr "Videné"
 
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1055
 msgid "Answered"
 msgstr "Odpovedané"
 
-#: ../mail/message-list.c:1027
+#: ../mail/message-list.c:1056
+#, fuzzy
+msgid "Forwarded"
+msgstr "Poslať �alej"
+
+#: ../mail/message-list.c:1057
 msgid "Multiple Unseen Messages"
 msgstr "Viacero nepre�ítaných správ"
 
-#: ../mail/message-list.c:1028
+#: ../mail/message-list.c:1058
 msgid "Multiple Messages"
 msgstr "Viacero správ"
 
-#: ../mail/message-list.c:1032
+#: ../mail/message-list.c:1062
 msgid "Lowest"
 msgstr "Najnižšia"
 
-#: ../mail/message-list.c:1033
+#: ../mail/message-list.c:1063
 msgid "Lower"
 msgstr "Nižšia"
 
-#: ../mail/message-list.c:1037
+#: ../mail/message-list.c:1067
 msgid "Higher"
 msgstr "Vyššia"
 
-#: ../mail/message-list.c:1038
+#: ../mail/message-list.c:1068
 msgid "Highest"
 msgstr "Najvyššia"
 
-#: ../mail/message-list.c:1515 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1657 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1522 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1664 ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Dnes %l:%M %p"
 
-#: ../mail/message-list.c:1531 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1673 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "V�era %l:%M %p"
 
-#: ../mail/message-list.c:1543 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1685 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1551 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1553 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1695 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2310 ../mail/message-list.etspec.h:9
-#, fuzzy
-msgid "Messages"
-msgstr "_Správy"
-
-#: ../mail/message-list.c:3752
+#. there is some info why the message list is empty, let it be something useful
+#: ../mail/message-list.c:3978 ../mail/message-list.c:4438
 msgid "Generating message list"
 msgstr "Generujem zoznam správ"
 
+#: ../mail/message-list.c:4286
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4288
+#, fuzzy
+msgid "There are no messages in this folder."
+msgstr ""
+"\n"
+"\n"
+"V tomto pohľade nie je �o ukázať."
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Termín do "
@@ -15421,53 +16252,58 @@ msgstr "Vyzna�ené"
 msgid "Follow Up Flag"
 msgstr "Zna�ka Follow up"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:11
 msgid "Received"
 msgstr "Prijaté"
 
-#: ../mail/message-list.etspec.h:14
+#: ../mail/message-list.etspec.h:15
 #, fuzzy
 msgid "Sent Messages"
 msgstr "_Otvoriť správy"
 
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Veľkosť"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-list.etspec.h:19
+#, fuzzy
+msgid "Subject - Trimmed"
+msgstr "Vlákna podľa predmetu"
+
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Volať"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "Nepreposielať"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "Follow Up"
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "Pre vašu informáciu"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Poslať �alej"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "Odpove� nie je nutná"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Odpovedať všetkým"
 
-#: ../mail/message-tag-followup.c:84
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Revízia"
 
@@ -15493,6 +16329,11 @@ msgstr "Predmet obsahuje"
 
 #: ../mail/searchtypes.xml.h:6
 #, fuzzy
+msgid "Subject or Recipients contains"
+msgstr "Predmet obsahuje"
+
+#: ../mail/searchtypes.xml.h:7
+#, fuzzy
 msgid "Subject or Sender contains"
 msgstr "Predmet obsahuje"
 
@@ -15506,30 +16347,22 @@ msgid "Provides core functionality for local address books."
 msgstr ""
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-#, fuzzy
-msgid "Enable attachment reminder plugin"
-msgstr "Povoliť alebo zakázať zásuvné moduly"
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
-"body"
+"body."
 msgstr ""
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:453
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/templates/templates.c:390
 msgid "Keywords"
 msgstr ""
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:502
-#, fuzzy
-msgid "Attachment Reminder Preferences"
-msgstr "Vlastnosti prílohy"
-
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-#, fuzzy
-msgid "Remind _missing attachments"
-msgstr "Ukladám prílohu"
-
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
 #, fuzzy
@@ -15553,151 +16386,177 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "Uložiť všetky prílohy"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 #, fuzzy
-msgid "_Continue Editing"
-msgstr "Pokra�ovať"
+msgid "_Edit Message"
+msgstr "_Upraviť správu"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
+"play them directly from Evolution."
 msgstr ""
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:179
 msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:238
+#: ../plugins/backup-restore/backup-restore.c:278
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. \n"
 "It also restores all your personal settings, mail filters etc."
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:284
 #, fuzzy
 msgid "_Restore Evolution from the backup file"
 msgstr "Import LDIF do Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:294
 #, fuzzy
 msgid "Choose a file to restore"
 msgstr "Vyberte súbor"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:66
 #, fuzzy
 msgid "Backup Evolution directory"
 msgstr "Chyba Evolution"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:68
 #, fuzzy
 msgid "Restore Evolution directory"
 msgstr "Import LDIF do Evolution"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:70
 #, fuzzy
 msgid "Check Evolution Backup"
 msgstr "Sada groupvérových nástrojov Evolution"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:72
 #, fuzzy
 msgid "Restart Evolution"
 msgstr "Nie je možné inicializovať shell Ximian Evolution."
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:67
-#: ../plugins/backup-restore/backup.c:107
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 #, fuzzy
 msgid "Shutting down Evolution"
 msgstr "Vypínam %s (%s)\n"
 
-#: ../plugins/backup-restore/backup.c:72
+#: ../plugins/backup-restore/backup.c:132
 #, fuzzy
 msgid "Backing Evolution accounts and settings"
 msgstr "Zmeniť nastavenie Evolution"
 
-#: ../plugins/backup-restore/backup.c:77
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:87
+#: ../plugins/backup-restore/backup.c:147
 #, fuzzy
 msgid "Backup complete"
 msgstr "Aktualizácia dokon�ená\n"
 
-#: ../plugins/backup-restore/backup.c:92
-#: ../plugins/backup-restore/backup.c:133
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 #, fuzzy
 msgid "Restarting Evolution"
 msgstr "Nie je možné inicializovať shell Ximian Evolution."
 
-#: ../plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:262
 #, fuzzy
 msgid "Backup current Evolution data"
 msgstr "Chyba Evolution"
 
-#: ../plugins/backup-restore/backup.c:116
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:122
+#: ../plugins/backup-restore/backup.c:274
 #, fuzzy
 msgid "Loading Evolution settings"
 msgstr "Zmeniť nastavenie Evolution"
 
-#: ../plugins/backup-restore/backup.c:126
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:244
+#: ../plugins/backup-restore/backup.c:285
+msgid "Ensuring local sources"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:455
 #, fuzzy, c-format
 msgid "Backing up to the folder %s"
 msgstr "Nastavujem vprie�inok: '%s'"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:460
 #, fuzzy, c-format
 msgid "Restoring from the folder %s"
 msgstr "Odstraňujem prie�inok %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:264
+#: ../plugins/backup-restore/backup.c:479
 #, fuzzy
 msgid "Evolution Backup"
 msgstr "Pošta Evolution"
 
-#: ../plugins/backup-restore/backup.c:264
+#: ../plugins/backup-restore/backup.c:479
 #, fuzzy
 msgid "Evolution Restore"
 msgstr "Test Evolution"
 
+#: ../plugins/backup-restore/backup.c:514
+#, fuzzy
+msgid "Backing up Evolution Data"
+msgstr "Chyba Evolution"
+
+#: ../plugins/backup-restore/backup.c:515
+msgid "Please wait while Evolution is backing up your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:517
+#, fuzzy
+msgid "Restoring Evolution Data"
+msgstr "Nie je možné inicializovať shell Ximian Evolution."
+
+#: ../plugins/backup-restore/backup.c:518
+msgid "Please wait while Evolution is restoring your data."
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:536
+msgid "This may take a while depending on the amount of data in your account."
+msgstr ""
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 #, fuzzy
 msgid "A plugin for backing up and restore Evolution data and settings."
@@ -15730,15 +16589,25 @@ msgstr ""
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 #, fuzzy
+msgid "Insufficient Permissions"
+msgstr "Delegované"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#, fuzzy
 msgid "Invalid Evolution backup file"
 msgstr "Pošta Evolution"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 #, fuzzy
 msgid "Please select a valid backup file to restore."
 msgstr "Prosím, vyberte server."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#, fuzzy
+msgid "The selected folder is not writable."
+msgstr "Kopírovať vybraný prie�inok do iného prie�inka"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 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 "
@@ -15762,46 +16631,43 @@ msgstr "Obnoviť nastavenia..."
 msgid "_Backup Settings..."
 msgstr "Nastavenia zálohovania..."
 
-#: ../plugins/bbdb/bbdb.c:533 ../plugins/bbdb/bbdb.c:542
+#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatické kontakty"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:557
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
+#: ../plugins/bbdb/bbdb.c:639
+msgid "_Auto-create address book entries when replying to messages"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:563
+#: ../plugins/bbdb/bbdb.c:645
 #, fuzzy
 msgid "Select Address book for Automatic Contacts"
 msgstr "Automatické kontakty"
 
-#: ../plugins/bbdb/bbdb.c:578
+#: ../plugins/bbdb/bbdb.c:660
 #, fuzzy
 msgid "Instant Messaging Contacts"
 msgstr "<b>Priama komunikácia</b>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:593
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+#: ../plugins/bbdb/bbdb.c:675
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:599
+#: ../plugins/bbdb/bbdb.c:681
 msgid "Select Address book for Pidgin buddy list"
 msgstr ""
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:610
+#: ../plugins/bbdb/bbdb.c:692
 msgid "Synchronize with _buddy list now"
 msgstr ""
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid ""
-"Automatically fills your addressbook with names and email addresses as you "
+"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 ""
@@ -15810,7 +16676,28 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+#. 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:119
+#, c-format
+msgid "Error occurred while spawning %s: %s."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:143
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:145
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr ""
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:318
 #, fuzzy
 msgid "Convert message text to _Unicode"
 msgstr "Uložiť správu do textového súboru"
@@ -15832,21 +16719,27 @@ msgid "Bogofilter Options"
 msgstr "Spustiť akcie"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+#, fuzzy
+msgid "Bogofilter junk plugin"
+msgstr "Spustiť akcie"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr ""
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 #, fuzzy
 msgid "CalDAV"
 msgstr "Volať"
 
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:135
+#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:336
+#: ../plugins/caldav/caldav-source.c:271
+#: ../plugins/google-account-setup/google-source.c:618
+#: ../plugins/google-account-setup/google-contacts-source.c:301
 msgid "Use _SSL"
 msgstr ""
 
@@ -15869,19 +16762,20 @@ msgstr "Na�ítavam kalendár"
 msgid "Provides core functionality for local calendars."
 msgstr ""
 
-#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:360
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
 #, fuzzy
-msgid "_Refresh:"
+msgid "Re_fresh:"
 msgstr "Aktualizovať"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 #, fuzzy
 msgid "_Secure connection"
 msgstr "Použiť _bezpe�né pripojenie (SSL):"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 #, fuzzy
 msgid "Userna_me:"
 msgstr "Po_užívateľ:"
@@ -15984,14 +16878,28 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr ""
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:512
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
+#: ../plugins/default-source/default-source.c:82
+#, fuzzy
+msgid "Mark as _default address book"
+msgstr "Otváram štandardný prie�inok úloh"
+
+#: ../plugins/default-source/default-source.c:103
 #, fuzzy
-msgid "Mark as _default folder"
+msgid "Mark as _default calendar"
+msgstr "Otváram štandardný prie�inok úloh"
+
+#: ../plugins/default-source/default-source.c:104
+#, fuzzy
+msgid "Mark as _default task list"
+msgstr "Otváram štandardný prie�inok úloh"
+
+#: ../plugins/default-source/default-source.c:105
+#, fuzzy
+msgid "Mark as _default memo list"
 msgstr "Otváram štandardný prie�inok úloh"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
@@ -16001,10 +16909,59 @@ msgstr "Š_tandardné"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
 msgid ""
-"Provides functionality for marking a calendar or an addressbook as the "
+"Provides functionality for marking a calendar or an address book as the "
 "default one."
 msgstr ""
 
+#: ../plugins/email-custom-header/email-custom-header.c:560
+#, fuzzy
+msgid "_Custom Header"
+msgstr "Vlastná _správa"
+
+#: ../plugins/email-custom-header/email-custom-header.c:881
+#, fuzzy
+msgid "Key"
+msgstr "Keňa"
+
+#: ../plugins/email-custom-header/email-custom-header.c:892
+#: ../plugins/templates/templates.c:396
+msgid "Values"
+msgstr ""
+
+#. 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.glade.h:2
+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/org-gnome-email-custom-header.glade.h:1
+#, fuzzy
+msgid "Email Custom Header"
+msgstr "Vlastná _správa"
+
+#. 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."
+msgstr ""
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+#, fuzzy
+msgid "Custom Header"
+msgstr "Vlastná _správa"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+#, fuzzy
+msgid "List of Custom Headers"
+msgstr "Vlastná _správa"
+
+#: ../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/exchange-operations/e-foreign-folder-dialog.glade.h:1
 #, fuzzy
 msgid "Open Other User's Folder"
@@ -16048,11 +17005,11 @@ msgid ""
 "password authentication."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:263
 msgid "Out Of Office"
 msgstr "Mimo kancelárie"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../plugins/exchange-operations/exchange-account-setup.c:270
 #, fuzzy
 msgid ""
 "The message specified below will be automatically sent to \n"
@@ -16061,93 +17018,98 @@ msgstr ""
 "<small>Dole zadaná správa sa automaticky pošle každej osobe,\n"
 "ktorá vám pošle správu, v prípade, že ste mimo kanceláriu.</small>"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:282
+#: ../plugins/exchange-operations/exchange-account-setup.c:287
 msgid "I am out of the office"
 msgstr "Som mimo kanceláriu"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/exchange-operations/exchange-account-setup.c:286
 msgid "I am in the office"
 msgstr "Som v kancelárii"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:334
 #, fuzzy
 msgid "Change the password for Exchange account"
 msgstr "Zadajte vaše heslo pre %s"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:336
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Zmeniť heslo"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:341
 msgid "Manage the delegate settings for Exchange account"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
 #, fuzzy
 msgid "Delegation Assistant"
 msgstr "Evolution Asistent pre nastavenie"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:355
 #, fuzzy
 msgid "Miscelleneous"
 msgstr "<b>Rôzne</b>"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:365
 #, fuzzy
 msgid "View the size of all Exchange folders"
 msgstr "pre všetky lokálne prie�inky"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:367
 #, fuzzy
 msgid "Folders Size"
 msgstr "vPrie�inky"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:618
+#: ../plugins/exchange-operations/exchange-account-setup.c:696
 #, fuzzy
 msgid "_OWA URL:"
 msgstr "_OWA Url:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:644
+#: ../plugins/exchange-operations/exchange-account-setup.c:722
 #, fuzzy
 msgid "A_uthenticate"
 msgstr "Overenie zlyhalo"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:837
+#: ../plugins/exchange-operations/exchange-account-setup.c:743
 #, fuzzy
-msgid "Authentication Type"
+msgid "_Mailbox:"
+msgstr "_Pošta:"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:944
+#, fuzzy
+msgid "_Authentication Type"
 msgstr "Overenie totožnosti"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:851
+#: ../plugins/exchange-operations/exchange-account-setup.c:958
 #, fuzzy
 msgid "Ch_eck for Supported Types"
 msgstr "Kontrolovať _podporované typy"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:957
-#: ../plugins/exchange-operations/exchange-contacts.c:212
+#: ../plugins/exchange-operations/exchange-account-setup.c:1073
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 #, fuzzy, c-format
 msgid "%s KB"
 msgstr "%ld KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:959
-#: ../plugins/exchange-operations/exchange-contacts.c:214
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:1075
+#: ../plugins/exchange-operations/exchange-contacts.c:219
+#, fuzzy, c-format
 msgid "0 KB"
 msgstr "%ld KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#: ../plugins/exchange-operations/exchange-calendar.c:196
+#: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -16156,13 +17118,13 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:115
+#: ../plugins/exchange-operations/exchange-change-password.c:114
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr ""
 
@@ -16182,42 +17144,40 @@ msgstr "Nové heslo:"
 msgid "Your current password has expired. Please change your password now."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:660
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr ""
 
-#. Custom
-#: ../plugins/exchange-operations/exchange-delegates-user.c:159
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../plugins/exchange-operations/exchange-delegates-user.c:154
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 #, fuzzy
 msgid "Custom"
 msgstr "Vlastný pohľad"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:189
+#: ../plugins/exchange-operations/exchange-delegates-user.c:184
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
+#: ../plugins/exchange-operations/exchange-delegates-user.c:188
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Autor (�ítať, vytvoriť)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:197
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:247
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 #, fuzzy
 msgid "Delegate Permissions"
 msgstr "Delegované"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:258
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:253
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, fuzzy, c-format
 msgid "Permissions for %s"
 msgstr "Prístup zamietnutý"
@@ -16225,7 +17185,7 @@ msgstr "Prístup zamietnutý"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+#: ../plugins/exchange-operations/exchange-delegates-user.c:343
 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."
@@ -16233,14 +17193,14 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
 msgid "You have been given the following permissions on my folders:"
 msgstr ""
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:366
 #, fuzzy
 msgid "You are also permitted to see my private items."
 msgstr "Vytvorí novú úlohu"
@@ -16248,57 +17208,57 @@ msgstr "Vytvorí novú úlohu"
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:378
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
 msgid "However you are not permitted to see my private items."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:410
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 #, fuzzy
 msgid "Delegate To"
 msgstr "Delegovať na:"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 #, fuzzy
 msgid "Could not access Active Directory"
 msgstr ""
 "Nie je možné vytvoriť prie�inok %s:\n"
 "%s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:725
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, fuzzy, c-format
 msgid "Could not remove delegate %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 #, fuzzy
 msgid "Could not update list of delegates."
 msgstr "Nepodarilo sa aktualizovať objekt"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, fuzzy, c-format
 msgid "Could not add delegate %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 #, fuzzy
 msgid "Error reading delegates list."
 msgstr "Chyba pri pridávaní zoznamu"
@@ -16349,23 +17309,29 @@ msgstr "Delegované"
 msgid "_Tasks:"
 msgstr "Ú_lohy:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:61
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 #, fuzzy
 msgid "Permissions..."
 msgstr "Prístup zamietnutý"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 #, fuzzy
 msgid "Folder Name"
 msgstr "_Meno prie�inku:"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 #, fuzzy
 msgid "Folder Size"
 msgstr "vPrie�inky"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+#, fuzzy
+msgid "User"
+msgstr "Po_užívateľ:"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr ""
@@ -16375,21 +17341,21 @@ msgstr ""
 msgid "Exchange Folder Tree"
 msgstr "Poštové filtre"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:235
-#: ../plugins/exchange-operations/exchange-folder.c:245
+#: ../plugins/exchange-operations/exchange-folder.c:67
+#: ../plugins/exchange-operations/exchange-folder.c:236
+#: ../plugins/exchange-operations/exchange-folder.c:246
 #, fuzzy
 msgid "Unsubscribe Folder..."
 msgstr "_Prihlásiť prie�inky..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:466
+#: ../plugins/exchange-operations/exchange-folder.c:521
 #, fuzzy, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Odhlasujem sa z prie�inku \"%s\""
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:478
+#: ../plugins/exchange-operations/exchange-folder.c:533
 #, fuzzy, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Odhlasujem sa z prie�inku \"%s\""
@@ -16454,17 +17420,20 @@ msgstr ""
 msgid "_Change Password"
 msgstr "Zmeniť heslo"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 #, fuzzy
 msgid "(Permission denied.)"
 msgstr "Prístup zamietnutý"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 #, fuzzy
 msgid "Add User:"
 msgstr "Po_užívateľ:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-send-options.c:410
+#: ../plugins/groupwise-features/proxy.c:937
+#: ../plugins/groupwise-features/share-folder.c:716
 #, fuzzy
 msgid "Add User"
 msgstr "_Pridať"
@@ -16601,16 +17570,12 @@ msgstr "Rozlišovať veľkosť písmen"
 msgid "_User"
 msgstr "Po_užívateľ:"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr ""
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:136
 #, fuzzy
 msgid "Select User"
 msgstr "Vybrať prie�inok"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:174
 #, fuzzy
 msgid "Address Book..."
 msgstr "Adresár"
@@ -16626,7 +17591,7 @@ msgstr "Prie�inok pre _odoslané správy:"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
 msgid ""
-"A plugin that handles a collection of Exchange account specific operations "
+"A plugin that manages a collection of Exchange account specific operations "
 "and features."
 msgstr ""
 
@@ -16729,10 +17694,14 @@ msgid "Could not update out-of-office state"
 msgstr "Nepodarilo sa aktualizovať objekt"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
-msgid "Exchange Account is offline."
+msgid "Evolution requires a restart to load the subscribed user's mailbox"
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+msgid "Exchange Account is offline."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16748,115 +17717,115 @@ msgid ""
 "  "
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 #, fuzzy
 msgid "Failed to update delegates:"
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Certifikát už existuje"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 #, fuzzy
 msgid "Folder does not exist"
 msgstr "neexistuje"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 #, fuzzy
 msgid "Folder offline"
 msgstr "Vprie�inok na _odosielateľa"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1283
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1270
 msgid "Generic error"
 msgstr "Všeobecná chyba"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 #, fuzzy
 msgid "No such user {0}"
 msgstr "Taký zdroj neexistuje"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 #, fuzzy
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Nie je možné inicializovať shell Ximian Evolution."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 #, fuzzy
 msgid "Please select a user."
 msgstr "Prosím, vyberte server."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -16865,96 +17834,97 @@ msgid ""
 "Or you might have just typed your password wrong."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 #, fuzzy
 msgid "Unable to add user to access control list:"
 msgstr ""
 "Nepodarilo sa vytvoriť okno pre písanie správ:\n"
 "Nepodarilo sa aktivovať ovládací prvok pre výber adresy."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 #, fuzzy
 msgid "Unable to edit delegates."
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 #, fuzzy
 msgid "Unknown error looking up {0}"
 msgstr "Neznáma chyba"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/google-account-setup/google-source.c:543
 #, fuzzy
 msgid "Unknown error."
 msgstr "Neznáma chyba"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 #, fuzzy
 msgid "Unknown type"
 msgstr "Neznámy"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "Používateľ zrušil operáciu."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 #, fuzzy
 msgid "{0} is already a delegate"
 msgstr "%s konferencia"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 #, fuzzy
 msgid "{0} is already in the list"
 msgstr "%s konferencia"
@@ -16968,10 +17938,19 @@ msgstr ""
 msgid "Check folder permissions"
 msgstr "Delegované"
 
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+#, fuzzy
+msgid "Default External Editor"
+msgstr "Editor hľadania"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr ""
+
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid ""
 "A plugin for using an external editor as the composer. You can send only "
-"plain-text mails."
+"plain-text messages."
 msgstr ""
 
 #. the path to the shared library
@@ -16980,24 +17959,56 @@ msgstr ""
 msgid "External Editor"
 msgstr "Editor hľadania"
 
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#, fuzzy
+msgid "Cannot create Temporary File"
+msgstr "Nie je možné vytvoriť do�asný prie�inok: %s"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.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-errors.xml.h:4
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
 #, fuzzy
-msgid "Compose in External Editor"
+msgid "Compose in _External Editor"
 msgstr "Editor kontaktov"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
-msgid "Compose mails using an external editor"
+#, fuzzy
+msgid "Compose messages using an external editor"
+msgstr "Editor kontaktov"
+
+#: ../plugins/external-editor/external-editor.c:112
+msgid "Command to be executed to launch the editor: "
+msgstr ""
+
+#: ../plugins/external-editor/external-editor.c:113
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
 msgstr ""
 
-#: ../plugins/face/face.c:57
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr ""
 
-#: ../plugins/face/face.c:67
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr ""
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:126
 #, fuzzy
 msgid "_Face"
 msgstr "Francúzsko"
@@ -17009,12 +18020,7 @@ msgid ""
 "faces This will be used in messages that are sent further."
 msgstr ""
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-#, fuzzy
-msgid "Face"
-msgstr "Francúzsko"
-
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, fuzzy, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Odhlasujem sa z prie�inku \"%s\""
@@ -17032,14 +18038,50 @@ msgstr "_Prihlásiť prie�inky..."
 msgid "_Unsubscribe"
 msgstr "O_dhlásiť"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../plugins/google-account-setup/google-source.c:83
+#: ../plugins/google-account-setup/google-source.c:90
+#: ../plugins/google-account-setup/google-contacts-source.c:52
+#: ../plugins/google-account-setup/google-contacts-source.c:57
+#: ../plugins/google-account-setup/google-contacts-source.c:83
 #, fuzzy
 msgid "Google"
 msgstr "prepnúť"
 
+#: ../plugins/google-account-setup/google-source.c:439
+#, fuzzy
+msgid "Please enter user name first."
+msgstr "Prosím, vyberte server."
+
+#: ../plugins/google-account-setup/google-source.c:443
+#, fuzzy, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr "Pridať prie�inok do zoznamu prihlásených prie�inkov"
+
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+
+#: ../plugins/google-account-setup/google-source.c:693
+#, fuzzy
+msgid "Cal_endar:"
+msgstr "_Kalendár:"
+
+#: ../plugins/google-account-setup/google-source.c:728
+#, fuzzy
+msgid "Retrieve _list"
+msgstr "Získavam správu %s"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+#, fuzzy
+msgid "<b>Server</b>"
+msgstr "Ukážka"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
+msgid "A plugin to setup Google Calendar and Contacts."
 msgstr ""
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -17047,21 +18089,21 @@ msgstr ""
 msgid "Google sources"
 msgstr "Zdroje"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 #, fuzzy
 msgid "Checklist"
 msgstr "Hustý opar"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
+msgid "A plugin to setup GroupWise calendar and contacts sources."
 msgstr ""
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 #, fuzzy
-msgid "Groupwise Account Setup"
+msgid "GroupWise Account Setup"
 msgstr "Skupina"
 
-#: ../plugins/groupwise-features/install-shared.c:215
+#: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17076,27 +18118,27 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:225
 #, fuzzy
 msgid "Install the shared folder"
 msgstr "pre všetky aktívne vzdialené prie�inky"
 
-#: ../plugins/groupwise-features/install-shared.c:222
+#: ../plugins/groupwise-features/install-shared.c:227
 msgid "Shared Folder Installation"
 msgstr ""
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 #, fuzzy
 msgid "Junk Settings"
 msgstr "Nastavenie"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-mail-settings.c:93
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 #, fuzzy
 msgid "Junk Mail Settings"
 msgstr "Nastavenie"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 #, fuzzy
 msgid "Junk Mail Settings..."
 msgstr "Nastavenia zálohovania..."
@@ -17112,7 +18154,7 @@ msgid "Email:"
 msgstr "E-mail"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "_Zakázať"
 
@@ -17127,34 +18169,123 @@ msgid "_Junk List"
 msgstr "Jún"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
+#, fuzzy
+msgid "Message Retract"
+msgstr "Uložiť správu ako..."
+
+#: ../plugins/groupwise-features/mail-retract.c:58
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this ?"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
 msgstr ""
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 #, fuzzy
 msgid "Retract Mail"
 msgstr "Prijímam poštu"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to groupwise messages"
-msgstr ""
-
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
+msgid "Add Send Options to GroupWise messages"
 msgstr ""
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
+msgid "A plugin for the features in GroupWise accounts."
 msgstr ""
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 #, fuzzy
-msgid "Groupwise Features"
+msgid "GroupWise Features"
 msgstr "Skupina"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#, fuzzy
+msgid "Message retract failed"
+msgstr "Správa obsahuje"
+
+#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+#, fuzzy
+msgid "The server did not allow the selected message to be retracted."
+msgstr "Otvoriť aktuálnu správu v novom okne"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+#, fuzzy
+msgid "Invalid user"
+msgstr "Upraviť podpis"
+
+#. 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-errors.xml.h:3
+#, fuzzy
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr ""
+"Nie je možné uložiť do %s\n"
+"  %s"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+#, fuzzy
+msgid "Specify User"
+msgstr "Vybrať prie�inok"
+
+#. 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-errors.xml.h:6
+#, fuzzy
+msgid "You have already given proxy permissions to this user."
+msgstr "Naozaj chcete zrušiť a odstrániť túto položku denníka?"
+
+#. 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-errors.xml.h:8
+msgid "You have to specify a valid user name to give proxy rights."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
+#, fuzzy
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "Prie�inok \"%s\" už existuje. Prosím, zadajte iné meno."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+#, fuzzy
+msgid "Account Already Exists"
+msgstr "Certifikát už existuje"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+#, fuzzy
+msgid "This is a recurring meeting"
+msgstr "Nastaviť tento výskyt ako _presunuteľný"
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#, fuzzy
+msgid "Would you like to accept it?"
+msgstr "Chcete uložiť vaše zmeny?"
+
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+#, fuzzy
+msgid "Would you like to decline it?"
+msgstr "Chcete uložiť vaše zmeny?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+#, fuzzy
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "Nepodarilo sa uložiť súbor podpisu: %s"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+msgid "You have to specify a user name which you want to add to the list"
+msgstr ""
+
+#: ../plugins/groupwise-features/process-meeting.c:52
 #, fuzzy
 msgid "Accept Tentatively"
 msgstr "Predbežný"
@@ -17164,28 +18295,29 @@ msgstr "Predbežný"
 msgid "<b>Users:</b>"
 msgstr "<b>Používatelia :</b>"
 
+#: ../plugins/groupwise-features/properties.glade.h:2
+#, fuzzy
+msgid "C_ustomize notification message"
+msgstr "Nie je možné vytvoriť rúru: %s"
+
 #: ../plugins/groupwise-features/properties.glade.h:3
-#: ../widgets/table/e-table-click-to-add.c:517
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Kontakty"
+
+#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../widgets/table/e-table-click-to-add.c:516
 msgid "Message"
 msgstr "Správa"
 
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr ""
 
-#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr ""
 
-#: ../plugins/groupwise-features/properties.glade.h:10
-msgid "_Contacts..."
-msgstr "_Kontakty..."
-
-#: ../plugins/groupwise-features/properties.glade.h:11
-#, fuzzy
-msgid "_Customize notification message"
-msgstr "Nie je možné vytvoriť rúru: %s"
-
 #: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Not Shared"
 msgstr "_Nezdieľané"
@@ -17237,14 +18369,15 @@ msgid "Subscribe to my _notifications"
 msgstr ""
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Read"
-msgstr "_Pre�ítaná"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
 msgid "_Write"
 msgstr "_Zapísať"
 
+#. To Translators: strip the part in front of the | and the | itself
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+#, fuzzy
+msgid "permission to read|_Read"
+msgstr "Prístup zamietnutý"
+
 #: ../plugins/groupwise-features/proxy-listing.glade.h:1
 msgid "Proxy"
 msgstr "Proxy"
@@ -17257,10 +18390,10 @@ msgstr "<b>Názov ú�tu</b>"
 msgid "Proxy Login"
 msgstr "Prihlásenie k proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
-#: ../plugins/groupwise-features/send-options.c:83
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
+#: ../plugins/groupwise-features/proxy.c:491
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sZadajte heslo pre %s (používateľ %s)"
@@ -17268,107 +18401,119 @@ msgstr "%sZadajte heslo pre %s (používateľ %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:521
+#: ../plugins/groupwise-features/proxy-login.c:510
 msgid "_Proxy Login..."
 msgstr "_Prihlásenie k proxy..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#. 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:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 
-#: ../plugins/groupwise-features/proxy.c:706
+#. 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:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
-#: ../plugins/groupwise-features/share-folder.c:760
+#: ../plugins/groupwise-features/send-options.c:215
+#, fuzzy
+msgid "Advanced send options"
+msgstr "Používateľ zrušil operáciu."
+
+#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:751
 msgid "Users"
 msgstr "Používatelia"
 
-#: ../plugins/groupwise-features/share-folder-common.c:323
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder-common.c:342
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "Nový _zdieľaný prie�inok..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:450
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "Zdieľanie"
 
-#: ../plugins/groupwise-features/share-folder.c:765
+#: ../plugins/groupwise-features/share-folder.c:534
+#, fuzzy
+msgid "Custom Notification"
+msgstr "Zarovnanie"
+
+#: ../plugins/groupwise-features/share-folder.c:756
 #, fuzzy
 msgid "Add   "
 msgstr "_Pridať ->"
 
-#: ../plugins/groupwise-features/share-folder.c:771
+#: ../plugins/groupwise-features/share-folder.c:762
 #, fuzzy
 msgid "Modify"
 msgstr "Zmenené"
 
-#: ../plugins/groupwise-features/status-track.c:105
+#: ../plugins/groupwise-features/status-track.c:107
 #, fuzzy
 msgid "Message Status"
 msgstr "Uložiť správu ako..."
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:119
+#: ../plugins/groupwise-features/status-track.c:121
 #, fuzzy
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: ../plugins/groupwise-features/status-track.c:133
+#: ../plugins/groupwise-features/status-track.c:135
 #, fuzzy
 msgid "From:"
 msgstr "Od:"
 
-#: ../plugins/groupwise-features/status-track.c:148
+#: ../plugins/groupwise-features/status-track.c:150
 #, fuzzy
 msgid "Creation date:"
 msgstr "Dátum dokon�enia"
 
-#: ../plugins/groupwise-features/status-track.c:187
+#: ../plugins/groupwise-features/status-track.c:189
 #, fuzzy
 msgid "Recipient: "
 msgstr "Adresáti"
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:196
 #, fuzzy
 msgid "Delivered: "
 msgstr "_Doru�ené"
 
-#: ../plugins/groupwise-features/status-track.c:200
+#: ../plugins/groupwise-features/status-track.c:202
 #, fuzzy
 msgid "Opened: "
 msgstr "Otvoriť"
 
-#: ../plugins/groupwise-features/status-track.c:205
+#: ../plugins/groupwise-features/status-track.c:207
 #, fuzzy
 msgid "Accepted: "
 msgstr "Akceptované"
 
-#: ../plugins/groupwise-features/status-track.c:210
+#: ../plugins/groupwise-features/status-track.c:212
 #, fuzzy
 msgid "Deleted: "
 msgstr "Odstránené"
 
-#: ../plugins/groupwise-features/status-track.c:215
+#: ../plugins/groupwise-features/status-track.c:217
 #, fuzzy
 msgid "Declined: "
 msgstr "Odmietnuté"
 
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:222
 #, fuzzy
 msgid "Completed: "
 msgstr "Dokon�ený "
 
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:227
 #, fuzzy
 msgid "Undelivered: "
 msgstr "_Doru�ené"
 
-#: ../plugins/groupwise-features/status-track.c:249
+#: ../plugins/groupwise-features/status-track.c:251
 #, fuzzy
 msgid "Track Message Status..."
 msgstr "Uložiť správu ako..."
@@ -17382,12 +18527,12 @@ msgstr ""
 msgid "Hula Account Setup"
 msgstr "Skupina"
 
-#: ../plugins/imap-features/imap-headers.c:319
+#: ../plugins/imap-features/imap-headers.c:320
 #, fuzzy
 msgid "Custom Headers"
 msgstr "Vlastná _správa"
 
-#: ../plugins/imap-features/imap-headers.c:332
+#: ../plugins/imap-features/imap-headers.c:333
 #, fuzzy
 msgid "IMAP Headers"
 msgstr "Hlavi�ka"
@@ -17438,33 +18583,33 @@ msgstr ""
 msgid "IMAP Features"
 msgstr ""
 
-#: ../plugins/import-ics-attachments/icsimporter.c:83
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 #, fuzzy
 msgid "_Import to Calendar"
 msgstr "Kalendár mesiaca"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:88
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 #, fuzzy
 msgid "_Import to Tasks"
 msgstr "Kon_vertovať na úlohu"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:206
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 #, fuzzy
 msgid "Import ICS"
 msgstr "Importovať"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:233
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 #, fuzzy
 msgid "Select Task List"
 msgstr "Zoznam úloh"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:237
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 #, fuzzy
 msgid "Select Calendar"
 msgstr "Nová Kaledónia"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:267
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "_Importovať"
 
@@ -17479,33 +18624,34 @@ msgstr "Kalendár mesiaca"
 msgid "Imports ICS attachments to calendar."
 msgstr "Pridávaná príloha."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr ""
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
 msgstr ""
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
 msgid "Search for an iPod failed"
 msgstr ""
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
 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 ""
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
 msgid "iCalendar format (.ics)"
 msgstr "Formát iCalendar (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
 msgstr ""
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
@@ -17518,208 +18664,208 @@ msgstr "Voľby _synchronizácie..."
 msgid "iPod Synchronization"
 msgstr "Voľby _synchronizácie..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:429
-#: ../plugins/itip-formatter/itip-formatter.c:550
+#: ../plugins/itip-formatter/itip-formatter.c:481
+#: ../plugins/itip-formatter/itip-formatter.c:606
 #, fuzzy, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
-#: ../plugins/itip-formatter/itip-formatter.c:570
+#: ../plugins/itip-formatter/itip-formatter.c:626
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:596
+#: ../plugins/itip-formatter/itip-formatter.c:652
 #, fuzzy, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
-#: ../plugins/itip-formatter/itip-formatter.c:672
+#: ../plugins/itip-formatter/itip-formatter.c:738
 #, fuzzy
 msgid "Unable to find any calendars"
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
-#: ../plugins/itip-formatter/itip-formatter.c:679
+#: ../plugins/itip-formatter/itip-formatter.c:745
 #, fuzzy
 msgid "Unable to find this meeting in any calendar"
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
-#: ../plugins/itip-formatter/itip-formatter.c:683
+#: ../plugins/itip-formatter/itip-formatter.c:749
 #, fuzzy
 msgid "Unable to find this task in any task list"
 msgstr ""
 "Nepodarilo sa vytvoriť okno pre písanie správ:\n"
 "Nepodarilo sa aktivovať ovládací prvok pre výber adresy."
 
-#: ../plugins/itip-formatter/itip-formatter.c:687
+#: ../plugins/itip-formatter/itip-formatter.c:753
 msgid "Unable to find this memo in any memo list"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:760
+#: ../plugins/itip-formatter/itip-formatter.c:824
 msgid "Searching for an existing version of this appointment"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:923
+#: ../plugins/itip-formatter/itip-formatter.c:993
 #, fuzzy
 msgid "Unable to parse item"
 msgstr "Nie je možné získať správu z editora"
 
-#: ../plugins/itip-formatter/itip-formatter.c:981
+#: ../plugins/itip-formatter/itip-formatter.c:1051
 #, fuzzy, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
-#: ../plugins/itip-formatter/itip-formatter.c:993
+#: ../plugins/itip-formatter/itip-formatter.c:1063
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:997
+#: ../plugins/itip-formatter/itip-formatter.c:1067
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1002
+#: ../plugins/itip-formatter/itip-formatter.c:1072
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1007
+#: ../plugins/itip-formatter/itip-formatter.c:1077
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1101
+#: ../plugins/itip-formatter/itip-formatter.c:1171
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1108
+#: ../plugins/itip-formatter/itip-formatter.c:1178
 #, fuzzy
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Naozaj chcete zrušiť a odstrániť túto položku denníka?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1110
+#: ../plugins/itip-formatter/itip-formatter.c:1180
 #, fuzzy
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Naozaj chcete zrušiť a odstrániť túto položku denníka?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1195
+#: ../plugins/itip-formatter/itip-formatter.c:1266
 #, fuzzy
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Stav ú�astníka nie je možné aktualizovať, pretože jeho stav nie je platný!\n"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1222
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 #, fuzzy, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1226
+#: ../plugins/itip-formatter/itip-formatter.c:1297
 #, fuzzy
 msgid "Attendee status updated"
 msgstr "Stav ú�astníka bol aktualizovaný\n"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../plugins/itip-formatter/itip-formatter.c:1323
 #, fuzzy
 msgid "Meeting information sent"
 msgstr "Informácie o stretnutí"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../plugins/itip-formatter/itip-formatter.c:1326
 #, fuzzy
 msgid "Task information sent"
 msgstr "Informácie o úlohe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1257
+#: ../plugins/itip-formatter/itip-formatter.c:1329
 #, fuzzy
 msgid "Memo information sent"
 msgstr "Žiadna informácia"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1266
+#: ../plugins/itip-formatter/itip-formatter.c:1338
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1269
+#: ../plugins/itip-formatter/itip-formatter.c:1341
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1272
+#: ../plugins/itip-formatter/itip-formatter.c:1344
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1347
-#: ../plugins/itip-formatter/itip-formatter.c:1362
+#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1424
 #, fuzzy
 msgid "The calendar attached is not valid"
 msgstr "Uvedený typ prie�inku nie je platný"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1348
-#: ../plugins/itip-formatter/itip-formatter.c:1363
+#: ../plugins/itip-formatter/itip-formatter.c:1414
+#: ../plugins/itip-formatter/itip-formatter.c:1425
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1398
-#: ../plugins/itip-formatter/itip-formatter.c:1416
-#: ../plugins/itip-formatter/itip-formatter.c:1498
+#: ../plugins/itip-formatter/itip-formatter.c:1465
+#: ../plugins/itip-formatter/itip-formatter.c:1493
+#: ../plugins/itip-formatter/itip-formatter.c:1575
 #, fuzzy
 msgid "The item in the calendar is not valid"
 msgstr "Ukážka kalendára pred tla�ou"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1399
-#: ../plugins/itip-formatter/itip-formatter.c:1417
-#: ../plugins/itip-formatter/itip-formatter.c:1499
+#: ../plugins/itip-formatter/itip-formatter.c:1466
+#: ../plugins/itip-formatter/itip-formatter.c:1494
+#: ../plugins/itip-formatter/itip-formatter.c:1576
 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:1428
+#: ../plugins/itip-formatter/itip-formatter.c:1505
 msgid "The calendar attached contains multiple items"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1429
+#: ../plugins/itip-formatter/itip-formatter.c:1506
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2122
+#: ../plugins/itip-formatter/itip-formatter.c:2215
 #, fuzzy
 msgid "This meeting recurs"
 msgstr "_Upraviť schôdzku"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2125
+#: ../plugins/itip-formatter/itip-formatter.c:2218
 #, fuzzy
 msgid "This task recurs"
 msgstr "_Upraviť schôdzku"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2128
+#: ../plugins/itip-formatter/itip-formatter.c:2221
 #, fuzzy
 msgid "This memo recurs"
 msgstr "_Upraviť schôdzku"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2331
+#: ../plugins/itip-formatter/itip-formatter.c:2457
 msgid "_Delete message after acting"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2341
-#: ../plugins/itip-formatter/itip-formatter.c:2373
+#: ../plugins/itip-formatter/itip-formatter.c:2467
+#: ../plugins/itip-formatter/itip-formatter.c:2499
 #, fuzzy
 msgid "Conflict Search"
 msgstr "Konflikt v kontakte:"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2356
+#: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "Select the calendars to search for meeting conflicts"
 msgstr ""
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "Dnes"
 
@@ -18148,42 +19294,47 @@ msgid "_Update"
 msgstr "Aktualizovať"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1009
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "Čas za�iatku:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1018
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "ÄŒas konca:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1034
-#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "Komentár:"
 
-#: ../plugins/itip-formatter/itip-view.c:1070
+#: ../plugins/itip-formatter/itip-view.c:1073
 #, fuzzy
 msgid "Send _reply to sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: ../plugins/itip-formatter/itip-view.c:1098
+#: ../plugins/itip-formatter/itip-view.c:1101
 #, fuzzy
 msgid "Send _updates to attendees"
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
-#: ../plugins/itip-formatter/itip-view.c:1107
+#: ../plugins/itip-formatter/itip-view.c:1110
 #, fuzzy
 msgid "_Apply to all instances"
 msgstr "A_plikovať na všetky výskyty"
 
-#: ../plugins/itip-formatter/itip-view.c:1842
+#: ../plugins/itip-formatter/itip-view.c:1119
+#, fuzzy
+msgid "Show time as _free"
+msgstr "Zobraziť �as ako"
+
+#: ../plugins/itip-formatter/itip-view.c:1870
 #, fuzzy
 msgid "_Tasks :"
 msgstr "Ú_lohy:"
 
-#: ../plugins/itip-formatter/itip-view.c:1844
+#: ../plugins/itip-formatter/itip-view.c:1872
 msgid "Memos :"
 msgstr ""
 
@@ -18213,7 +19364,7 @@ msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "Táto odpove� nie je od ú�astníka. Chcete ho ako ú�astníka pridať?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr "Odh_lásenie od proxy"
 
@@ -18226,45 +19377,180 @@ msgid "Disable Account"
 msgstr "Deaktivovať ú�et"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
-msgid "Enable libnotify notifications of new mail"
-msgstr ""
+#, fuzzy
+msgid "Beep or play sound file."
+msgstr "Vybrať súbor"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Every time a new mail arrives, pop up a libnotify notification."
+msgid "Blink icon in notification area."
 msgstr ""
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
-msgid "Make the status icon blink"
+msgid "Enable D-Bus messages."
 msgstr ""
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "When the new-mail status icon is visible, make it blink."
+msgid "Enable icon in notification area."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#, fuzzy
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr "Vygeneruje správu D-BUS pri príchode novej pošty."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#, fuzzy
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr "_Zahrať zvuk pri príchode novej správy"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Notify new messages for Inbox only."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "_Zahrať zvuk pri príchode novej správy"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Popup message together with the icon."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#, fuzzy
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr "_Neuprozorňovať na príchod novej správy"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#, fuzzy
+msgid "Sound file name to be played."
+msgstr "Nezadané meno súboru."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#, fuzzy
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr "_Zahrať zvuk pri príchode novej správy"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#, fuzzy
+msgid "Whether play sound or beep when new messages arrive."
+msgstr "_Zahrať zvuk pri príchode novej správy"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#, fuzzy
+msgid "Whether show message over the icon when new messages arrive."
+msgstr "Vygeneruje správu D-BUS pri príchode novej pošty."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#, fuzzy
+msgid "Whether the icon should blink or not."
+msgstr "Či má byť viditeľná lišta nástrojov."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+msgid "Whether to notify new messages in Inbox folder only."
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:132
+#: ../plugins/mail-notification/mail-notification.c:255
+#, fuzzy
+msgid "Generate a _D-Bus message"
+msgstr "Generujem zoznam správ"
+
+#: ../plugins/mail-notification/mail-notification.c:378
+#, fuzzy
+msgid "Evolution's Mail Notification"
+msgstr "Upozornenie na novú poštu"
+
+#: ../plugins/mail-notification/mail-notification.c:399
+#, fuzzy
+msgid "Mail Notification Properties"
+msgstr "Upozornenie na novú poštu"
+
+#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
-msgid "You have received %d new message in %s."
-msgid_plural "You have received %d new messages in %s."
+msgid ""
+"You have received %d new message\n"
+"in %s."
+msgid_plural ""
+"You have received %d new messages\n"
+"in %s."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../plugins/mail-notification/mail-notification.c:463
+#, c-format
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../plugins/mail-notification/mail-notification.c:153
+#: ../plugins/mail-notification/mail-notification.c:480
+#: ../plugins/mail-notification/mail-notification.c:485
 #, fuzzy
 msgid "New email"
 msgstr "Nový Zéland"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+#: ../plugins/mail-notification/mail-notification.c:544
+msgid "Show icon in _notification area"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:547
 #, fuzzy
-msgid "Mail Notification"
-msgstr "Upozornenie na novú poštu"
+msgid "B_link icon in notification area"
+msgstr "Nie je možné vytvoriť rúru: %s"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#: ../plugins/mail-notification/mail-notification.c:549
+msgid "Popup _message together with the icon"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:730
+#, fuzzy
+msgid "_Play sound when new messages arrive"
+msgstr "_Zahrať zvuk pri príchode novej správy"
+
+#: ../plugins/mail-notification/mail-notification.c:736
+#, fuzzy
+msgid "_Beep"
+msgstr "Pípnuť"
+
+#: ../plugins/mail-notification/mail-notification.c:737
+#, fuzzy
+msgid "Play _sound file"
+msgstr "Vybrať súbor"
+
+#: ../plugins/mail-notification/mail-notification.c:748
+msgid "Specify _filename:"
+msgstr "Zadajte _meno súboru:"
+
+#: ../plugins/mail-notification/mail-notification.c:749
+#, fuzzy
+msgid "Select sound file"
+msgstr "Vybrať súbor"
+
+#: ../plugins/mail-notification/mail-notification.c:750
+#, fuzzy
+msgid "Pl_ay"
+msgstr "Palau"
+
+#: ../plugins/mail-notification/mail-notification.c:807
+msgid "Notify new messages for _Inbox only"
+msgstr ""
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid ""
-"Notifies the user with an icon in notification area and a notification "
-"message whenever a new message has arrived."
+"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 ""
 
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#, fuzzy
+msgid "Mail Notification"
+msgstr "Upozornenie na novú poštu"
+
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
 msgid ""
 "A plugin which allows the creation of meetings from the contents of a mail "
@@ -18280,6 +19566,17 @@ msgstr "Kon_vertovať na stretnutie"
 msgid "Mail to meeting"
 msgstr "Pošta na stretnutie"
 
+#: ../plugins/mail-to-task/mail-to-task.c:287
+#, fuzzy, c-format
+msgid "Cannot open calendar. %s"
+msgstr "Nie je možné otvoriť súbor"
+
+#: ../plugins/mail-to-task/mail-to-task.c:292
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
+msgstr ""
+
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid ""
 "A plugin which allows the creation of tasks from the contents of a mail "
@@ -18385,7 +19682,7 @@ msgstr "Poslať _správu zoznamu..."
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
 "The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -18472,6 +19769,28 @@ msgstr "_Prihlásiť sa do zoznamu"
 msgid "_Unsubscribe from List"
 msgstr "Odhlasujem sa z prie�inku \"%s\""
 
+#: ../plugins/mark-all-read/mark-all-read.c:39
+#, fuzzy
+msgid "Also mark messages in subfolders?"
+msgstr "Presúvam správy do %s"
+
+#: ../plugins/mark-all-read/mark-all-read.c:41
+#, fuzzy
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr "_Ozna�iť správy ako pre�ítané po"
+
+#: ../plugins/mark-all-read/mark-all-read.c:164
+#, fuzzy
+msgid "Current Folder and _Subfolders"
+msgstr "Vytvoriť nový prie�inok"
+
+#: ../plugins/mark-all-read/mark-all-read.c:176
+#, fuzzy
+msgid "Current _Folder Only"
+msgstr "Vytvoriť nový prie�inok"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 #, fuzzy
 msgid "Mark All Read"
@@ -18485,22 +19804,6 @@ msgstr "Ozna�iť _správy ako pre�ítané"
 msgid "Used for marking all the messages under a folder as read"
 msgstr ""
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "Ozna�iť kalendár off-line"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "Ozna�í vybraný kalendár pre off-line prezeranie."
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make this available offline"
-msgstr "_Nesprístupniť toto off-line"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Mark Calendar for offline use"
-msgstr "_Ozna�iť kalendár pre off-line použitie"
-
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
 msgstr ""
@@ -18510,15 +19813,6 @@ msgstr ""
 msgid "Mono Loader"
 msgstr "Presunúť do prie�inku"
 
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-#, fuzzy
-msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr "Vygeneruje správu D-BUS pri príchode novej pošty."
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-msgid "New Mail Notification"
-msgstr "Upozornenie na novú poštu"
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr ""
@@ -18526,7 +19820,7 @@ msgstr ""
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:231
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "Správca zásuvných modulov"
 
@@ -18539,26 +19833,26 @@ msgstr "Povoliť alebo zakázať zásuvné moduly"
 msgid "_Plugins"
 msgstr "Zásuvné moduly"
 
-#: ../plugins/plugin-manager/plugin-manager.c:55
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "Autor(i)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../widgets/table/e-table-config.glade.h:5
-msgid "Description"
-msgstr "Popis"
-
-#: ../plugins/plugin-manager/plugin-manager.c:234
+#: ../plugins/plugin-manager/plugin-manager.c:146
 #, fuzzy
-msgid "Con_figure"
-msgstr "Pokra�ovať"
+msgid "Configuration"
+msgstr "Nastavenie pošty"
 
-#: ../plugins/plugin-manager/plugin-manager.c:245
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Poznámka: Niektoré zmeny sa prejavia až po reštarte"
 
-#: ../plugins/plugin-manager/plugin-manager.c:298
-#: ../plugins/plugin-manager/plugin-manager.c:356
+#: ../plugins/plugin-manager/plugin-manager.c:291
+#, fuzzy
+msgid "Overview"
+msgstr "Revízia"
+
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "Zásuvný modul"
 
@@ -18579,42 +19873,23 @@ msgstr "Režim oby�ajného textu"
 msgid "Prefer plain-text"
 msgstr "Uprednostňovať oby�ajný text"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "Zobraziť HTML, ak je prítomné"
 
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "Uprednostňovať oby�ajný"
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:193
 msgid "Only ever show PLAIN"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:236
 #, fuzzy
 msgid "HTML _Mode"
 msgstr "HTML režim"
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print from the composer."
-msgstr ""
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "Tla�iť správu"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "U_kážka pred tla�ou"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "Vytla�í správu"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 #, fuzzy
 msgid "Evolution Profiler"
@@ -18643,15 +19918,9 @@ msgstr "Umiestnenie"
 msgid "_Publish Calendar Information"
 msgstr "Informácie o iCalendar"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "Zadajte heslo pre `%s'"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:596
 #, fuzzy
-msgid "Are you sure you want to remove this URL?"
+msgid "Are you sure you want to remove this location?"
 msgstr "Naozaj chcete odstrániť tento ú�et?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
@@ -18671,6 +19940,10 @@ msgid ""
 "Manual (via Actions menu)"
 msgstr ""
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "_Povoliť"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
 #, fuzzy
 msgid "P_ort:"
@@ -18688,7 +19961,7 @@ msgstr "Požiadavka na informácie o voľnom �ase"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
 msgid ""
-"SSH\n"
+"Secure FTP (SSH)\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -18734,16 +20007,82 @@ msgid ""
 "Free/Busy"
 msgstr "Voľno/zaneprázdnený URL:"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+#, fuzzy
+msgid "Hello Python"
+msgstr "Telefón domov"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr ""
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using Python."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+#, fuzzy
+msgid "Python Loader"
+msgstr "Presunúť do prie�inku"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 #, fuzzy
 msgid "SpamAssassin (built-in)"
 msgstr "Spamassassin (vstavaný)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
-msgid "This will make Spamassasin more reliable, but slower"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
+#, fuzzy, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "Spamassassin (vstavaný)"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
+#, fuzzy, c-format
+msgid "Failed to create pipe: %s"
 msgstr ""
+"Nepodarilo sa vytvoriť výstupný súbor: %s\n"
+" %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
+#, fuzzy, c-format
+msgid "Error after fork: %s"
+msgstr ""
+"Chyba pre %s:\n"
+"%s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
+#, c-format
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
+#, fuzzy, c-format
+msgid "SpamAssassin is not available."
+msgstr "Akcia nie je k dispozícii"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
+msgid "This will make SpamAssassin more reliable, but slower"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 #, fuzzy
 msgid "I_nclude remote tests"
 msgstr "Vložiť:"
@@ -18756,12 +20095,12 @@ msgstr ""
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 #, fuzzy
-msgid "SpamAssassin junk plugin"
+msgid "SpamAssassin Options"
 msgstr "Spamassassin (vstavaný)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
 #, fuzzy
-msgid "Spamassassin Options"
+msgid "SpamAssassin junk plugin"
 msgstr "Spamassassin (vstavaný)"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
@@ -18770,7 +20109,7 @@ msgstr ""
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:330
+#: ../plugins/save-attachments/save-attachments.c:315
 msgid "Save attachments"
 msgstr "Uložiť prílohy"
 
@@ -18783,17 +20122,16 @@ msgstr "Uložiť prílohy..."
 msgid "Save all attachments"
 msgstr "Uložiť všetky prílohy"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:321
 #, fuzzy
 msgid "Select save base name"
 msgstr "Vyberte �asovú zónu"
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:340
 msgid "MIME Type"
 msgstr "Typ MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
+#: ../plugins/save-attachments/save-attachments.c:348
 msgid "Save"
 msgstr "Uložiť"
 
@@ -18801,81 +20139,81 @@ msgstr "Uložiť"
 #. * 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:167
+#: ../plugins/save-calendar/csv-format.c:163
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "Zoznam popisov"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "Zoznam kategórií"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "Zoznam komentárov"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "Vytvorené"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "Zoznam kontaktov"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "Å tart"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "Koniec"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "percet dokon�ených"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:374
 #, fuzzy
 msgid "URL"
 msgstr "_URL:"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:375
 #, fuzzy
 msgid "Attendees List"
 msgstr "Ú�astník"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "Zmenené"
 
-#: ../plugins/save-calendar/csv-format.c:548
+#: ../plugins/save-calendar/csv-format.c:532
 msgid "Advanced options for the CSV format"
 msgstr "Rozšírené voľby pre formát CSV"
 
-#: ../plugins/save-calendar/csv-format.c:555
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Prepend a header"
 msgstr "Predradiť hlavi�ku"
 
-#: ../plugins/save-calendar/csv-format.c:564
+#: ../plugins/save-calendar/csv-format.c:548
 msgid "Value delimiter:"
 msgstr "Oddeľova� hodnôt:"
 
-#: ../plugins/save-calendar/csv-format.c:570
+#: ../plugins/save-calendar/csv-format.c:554
 msgid "Record delimiter:"
 msgstr "Oddeľova� záznamov:"
 
-#: ../plugins/save-calendar/csv-format.c:576
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "Encapsulate values with:"
 msgstr ""
 
-#: ../plugins/save-calendar/csv-format.c:598
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "Formát �iarkou oddelených hodnôt (.csv)"
 
@@ -18897,15 +20235,15 @@ msgstr "Uložiť na _disk"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:154
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:393
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF format (.rdf)"
 msgstr "RDF formát (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:163
+#: ../plugins/save-calendar/save-calendar.c:161
 msgid "Select destination file"
 msgstr "Vybrať cieľový súbor"
 
@@ -18924,26 +20262,32 @@ msgstr "_Zobraziť len tento kalendár"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
 #, fuzzy
+msgid "Show _only this Memo List"
+msgstr "_Zobraziť len tento zoznam úloh"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
+#, fuzzy
 msgid "Show _only this Task List"
 msgstr "_Zobraziť len tento zoznam úloh"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
+msgid "Guides you through your initial account setup."
 msgstr ""
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr ""
+#, fuzzy
+msgid "Setup Assistant"
+msgstr "Asistent"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Asistent pre nastavenie"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "Vitajte"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -18955,29 +20299,30 @@ msgstr ""
 "\n"
 "Stla�te \"Nasledujúci\" pre pokra�ovanie. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:135
 #, fuzzy
 msgid "Importing files"
 msgstr "Importovať _jeden súbor"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:137
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Prosím, vyberte informácie, ktoré chcete importovať:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:152
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:505
+#, c-format
 msgid "Importing data."
 msgstr "Import údajov."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:234
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Prosím, �akajte"
 
@@ -18994,13 +20339,38 @@ msgid "Thread messages by subject"
 msgstr "Vytvoriť vlákna správ podľa predmetu"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:56
 #, fuzzy
 msgid "F_all back to threading messages by subject"
 msgstr "Vytvoriť vlákna správ podľa predmetu"
 
+#: ../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 ""
+
+#: ../plugins/templates/templates.c:603
+#, fuzzy
+msgid "No title"
+msgstr "Činnosť/po_zícia:"
+
+#: ../plugins/templates/templates.c:711
+#, fuzzy
+msgid "Save as _Template"
+msgstr "Zadajte na koho delegovať"
+
+#: ../plugins/templates/templates.c:713
+#, fuzzy
+msgid "Save as Template"
+msgstr "Uložiť ako koncept"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr ""
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses ytnef to decode tnef attachments."
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
 msgstr ""
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
@@ -19008,6 +20378,30 @@ msgstr ""
 msgid "TNEF Attachment decoder"
 msgstr "Príloha"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr ""
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+#, fuzzy
+msgid "WebDAV contacts"
+msgstr "Bez kontaktov"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+msgid "WebDAV"
+msgstr ""
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+#, fuzzy
+msgid "URL:"
+msgstr "_URL:"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
+msgstr ""
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Shell Evolution"
@@ -19026,133 +20420,256 @@ msgid "Evolution Test component"
 msgstr "Testovací komponent Evolution"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings"
+msgid "Authenticate proxy server connections"
 msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
+#, fuzzy
+msgid "Automatic proxy configuration URL"
+msgstr "Pridať do kontaktov"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Verzia konfigurácie"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
 msgstr "Štandardná šírka postrannej lišty"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Štandardná výška okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 #, fuzzy
 msgid "Default window state"
 msgstr "Štandardná šírka okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Štandardná šírka okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "HTTP proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+#, fuzzy
+msgid "HTTP proxy password"
+msgstr "Zadajte heslo"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy username"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:14
+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 ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Posledná aktualizovaná verzia konfigurácie"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Non-proxy hosts"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+#, fuzzy
+msgid "Proxy configuration mode"
+msgstr "Nastavenie Pilota"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "SOCKS proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "SOCKS proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "Secure HTTP proxy host name"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Secure HTTP proxy port"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+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:25
 #, fuzzy
 msgid "Sidebar is visible"
 msgstr "Lišta nástrojov je viditeľná"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12 ../shell/main.c:458
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Spustiť v režime off-line"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 #, fuzzy
 msgid "Statusbar is visible"
 msgstr "Lišta nástrojov je viditeľná"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "Predvolená vý�ka hlavného okna v bodoch."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "Predvolená šírka hlavného okna v bodoch."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "Predvolená šírka bo�nej lišty v bodoch."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 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:19
+#: ../shell/apps_evolution_shell.schemas.in.h:34
+msgid "The machine name to proxy HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:35
+msgid "The machine name to proxy secure HTTP through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The machine name to proxy socks through."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+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:38
+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:39
+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:40
 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:20
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+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:42
 msgid "Toolbar is visible"
 msgstr "Lišta nástrojov je viditeľná"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+#, fuzzy
+msgid "URL that provides proxy configuration values."
+msgstr "Posledná aktualizovaná verzia konfigurácie"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "Use HTTP proxy"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 #, fuzzy
 msgid "Whether or not the window should be maximized."
 msgstr "Či majú byť viditeľné tla�idlá okna."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 #, fuzzy
 msgid "Whether the sidebar should be visible."
 msgstr "Či má byť viditeľná lišta nástrojov."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 #, fuzzy
 msgid "Whether the status bar should be visible."
 msgstr "Či má byť viditeľná lišta nástrojov."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Či má byť viditeľná lišta nástrojov."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Či majú byť viditeľné tla�idlá okna."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Tla�idlá okna sú viditeľné"
 
@@ -19168,17 +20685,15 @@ msgstr "Aktívne spojenia"
 msgid "Click OK to close these connections and go offline"
 msgstr "Stla�ením OK tieto spojenia zatvoríte a prejdete do módu off-line"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Vyberte typ importéra, ktorý chcete spustiť:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:134
+#, fuzzy
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+"of file it is from the list."
 msgstr ""
 "Vyberte súbor, ktorý chcete importovať do Evolution a jeho typ\n"
 "zo zoznamu.\n"
@@ -19186,11 +20701,11 @@ msgstr ""
 "Použite \"Automaticky\" ak typ nepoznáte a Evolution sa\n"
 "ho pokúsi ur�iť."
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "Vybrať cieľ pre tento import"
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:144
 #, fuzzy
 msgid ""
 "Evolution checked for settings to import from the following\n"
@@ -19203,23 +20718,23 @@ msgstr ""
 "ktoré by bolo možné importovať. Ak to chcete skúsiť znovu,\n"
 "stla�te \"Dozadu\".\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "Náz_ov súboru:"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "Vybrať súbor"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "_Typ súboru:"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "Importovať dáta a nastavenia zo _starších programov"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "Importovať _jeden súbor"
 
@@ -19228,112 +20743,109 @@ msgstr "Importovať _jeden súbor"
 msgid "Evolution Preferences"
 msgstr "Ovládací prvok nastavenia pošty Evolution"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "Nezadané meno prie�inku."
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "Meno prie�inku nesmie obsahovať znak Enter."
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "Meno prie�inku nesmie obsahovať znak \"/\"."
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "Meno prie�inku nesmie obsahovať znak \"#\"."
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' a '..' sú rezervované mená prie�inkov."
+#. To translators: This is the window title and %s is the
+#. component name. Most translators will want to keep it as is.
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
+#, fuzzy, c-format
+msgid "%s - Evolution"
+msgstr "Evolution"
 
-#: ../shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:75
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Vyzerá to, že nemáte nainštalované nástroje pre PalmPilota GNOME."
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "Chyba pri vykonávaní %s."
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "Priateľ v núdzi nie je nainštalovaný."
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "Nedá sa spustiť nástroj pre oznamovanie chýb."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:663
+#: ../shell/e-shell-window-commands.c:942
 msgid "translator-credits"
 msgstr "Marcel Telka <marcel@telka.sk>"
 
-#: ../shell/e-shell-window-commands.c:674
+#: ../shell/e-shell-window-commands.c:953
 #, fuzzy
 msgid "Evolution Website"
 msgstr "Test Evolution"
 
-#: ../shell/e-shell-window-commands.c:885
+#: ../shell/e-shell-window-commands.c:971
+#, fuzzy
+msgid "Error opening the FAQ webpage."
+msgstr "Chyba pri otváraní kalendára"
+
+#: ../shell/e-shell-window-commands.c:1174
 msgid "_Work Online"
 msgstr "Pracovať _on-line"
 
-#: ../shell/e-shell-window-commands.c:898 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1187 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Pracovať off-line"
 
-#: ../shell/e-shell-window-commands.c:911
+#: ../shell/e-shell-window-commands.c:1200
 msgid "Work Offline"
 msgstr "Pracovať off-line"
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:377
 #, fuzzy
-msgid "Evolution is currently online. Click on this button to work offline."
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
 msgstr ""
 "Evolution je momentálne on-line. Stla�ením tohto tla�idla prejdete do režimu "
 "off-line."
 
-#: ../shell/e-shell-window.c:392
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution prechádza do režimu off-line."
 
-#: ../shell/e-shell-window.c:399
+#: ../shell/e-shell-window.c:391
 #, fuzzy
-msgid "Evolution is currently offline. Click on this button to work online."
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
 msgstr ""
 "Evolution je momentálne off-line. Stla�ením tohto tla�idla prejdete do "
 "režimu on-line."
 
-#: ../shell/e-shell-window.c:825
+#: ../shell/e-shell-window.c:787
 #, c-format
 msgid "Switch to %s"
 msgstr "Prepnúť do %s"
 
-#: ../shell/e-shell.c:640
-msgid "Uknown system error."
+#: ../shell/e-shell.c:641
+#, fuzzy
+msgid "Unknown system error."
 msgstr "Neznáma systémová chyba."
 
-#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1275 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1262 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "Ok"
 
-#: ../shell/e-shell.c:1277
+#: ../shell/e-shell.c:1264
 msgid "Invalid arguments"
 msgstr "Neplatné argumenty"
 
-#: ../shell/e-shell.c:1279
+#: ../shell/e-shell.c:1266
 msgid "Cannot register on OAF"
 msgstr "Nie je možné zaregistrovať u OAF"
 
-#: ../shell/e-shell.c:1281
+#: ../shell/e-shell.c:1268
 msgid "Configuration Database not found"
 msgstr "Konfigura�ná databáza nenájdená"
 
@@ -19343,15 +20855,11 @@ msgstr "Konfigura�ná databáza nenájdená"
 msgid "New"
 msgstr "Nová"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Nový test"
 
-#: ../shell/test/evolution-test-component.c:108
-msgid "_Test"
-msgstr "_Test"
-
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "Vytvoriť novú testovaciu položku"
 
@@ -19376,8 +20884,9 @@ msgid "Importer Type"
 msgstr "Typ nástroja na import"
 
 #: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr "Vybrať nástroj na import"
+#, fuzzy
+msgid "Select Information to Import"
+msgstr "Vyberte nástroj pre import"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -19394,7 +20903,7 @@ msgstr ""
 "externé súbory do Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:219
+#: ../shell/main.c:217
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19429,7 +20938,7 @@ msgstr ""
 "Dúfame, že si užijete výsledky našej tvrdej práce a\n"
 "uvítame vaše príspevky.\n"
 
-#: ../shell/main.c:243
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19437,46 +20946,46 @@ msgstr ""
 "ÄŽakujeme\n"
 "Tím Evolution\n"
 
-#: ../shell/main.c:250
+#: ../shell/main.c:248
 #, fuzzy
 msgid "Do not tell me again"
 msgstr "Túto správu už nezobrazovať"
 
-#: ../shell/main.c:456
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Spustiť Evolution aktivovaním zadaného komponentu"
 
-#: ../shell/main.c:460
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Spustiť v režime on-line"
 
-#: ../shell/main.c:463
+#: ../shell/main.c:476
 #, fuzzy
 msgid "Forcibly shut down all Evolution components"
 msgstr "Vynútiť ukon�enie všetkých komponentov Evolution"
 
-#: ../shell/main.c:467
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: ../shell/main.c:470
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Poslať ladiaci výstup zo všetkých komponent od súboru."
 
-#: ../shell/main.c:472
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Zakázať na�ítavanie zásuvných modulov."
 
-#: ../shell/main.c:474
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr ""
 
-#: ../shell/main.c:503
+#: ../shell/main.c:572
 #, fuzzy
 msgid "- The Evolution PIM and Email Client"
 msgstr "Poštový komponent Evolution"
 
-#: ../shell/main.c:516
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19490,33 +20999,38 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Ste si istý, že chcete zabudnúť všetky zapamätané heslá?"
 
 #: ../shell/shell.error.xml.h:2
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Nie je možné inicializovať shell Ximian Evolution."
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Pokra�ovať"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "Odstrániť staré dáta z verzie {0}?"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "Evolution sa nemohol spustiť."
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:6
 #, fuzzy
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr "Zabudnúť uložené heslá, takže ich budete musieť znovu zadať"
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "Nie je dostatok miesta na disku pre aktualizáciu."
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "Naozaj odstrániť staré dáta?"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -19529,9 +21043,9 @@ msgid ""
 "without manual intervention.\n"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:15
+#: ../shell/shell.error.xml.h:16
 msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+"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 "
@@ -19539,11 +21053,11 @@ msgid ""
 "evolution&quot; at your convenience.\n"
 msgstr ""
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "Aktualizácia z predchádzajúcej verzie zlyhala: {0}"
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:21
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -19552,7 +21066,7 @@ msgid ""
 "can continue."
 msgstr ""
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -19563,7 +21077,7 @@ msgstr ""
 "\n"
 "Pre podrobnosti kliknite na pomocníka"
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -19578,19 +21092,19 @@ msgstr ""
 "\n"
 "Pre podrobnosti kliknite na pomocníka."
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "_Zabudnúť"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "_Zachovať dáta"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "P_ripomenúť neskôr"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
@@ -19598,7 +21112,7 @@ msgid ""
 "data.\n"
 msgstr ""
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19606,14 +21120,14 @@ msgid ""
 "Edit trust settings:"
 msgstr ""
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:151
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 msgstr ""
 
-#: ../smime/gui/cert-trust-dialog.c:158
+#: ../smime/gui/cert-trust-dialog.c:155
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -19650,7 +21164,7 @@ msgid "Purposes"
 msgstr "Ú�ely"
 
 #: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:570
+#: ../smime/lib/e-cert.c:553
 msgid "Serial Number"
 msgstr "Sériové �íslo"
 
@@ -19672,22 +21186,27 @@ msgstr "E-mailová adresa"
 msgid "All CA certificate files"
 msgstr "Podrobnosti certifikátu"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 
+#: ../smime/gui/component.c:46
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Zadajte heslo pre `%s'"
+
 #. we're setting the password initially
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:69
 msgid "Enter new password for certificate database"
 msgstr "Zadajte vaše heslo pre databázu certifikátov"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "Zadajte nové heslo"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19696,7 +21215,7 @@ msgstr ""
 "Vydané pre:\n"
 "  Predmet: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19705,7 +21224,7 @@ msgstr ""
 "Vydavateľ:\n"
 "  Predmet: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Vybrať certifikát"
 
@@ -19765,7 +21284,7 @@ msgstr ""
 "Pred dôverovaním tejto CA z akýchkoľvek dôvodov by ste si mali preštudovať "
 "ich certifikát a ich pravidlá a postupy (ak sú dostupné)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
 msgid "Certificate"
 msgstr "Certifikát"
 
@@ -19841,11 +21360,11 @@ msgstr "Organizá�ná jednotka (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Odtla�ok prsta SHA1"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
 msgstr "Certifikát SSL klienta"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "Certifikát SSL servera"
 
@@ -19891,182 +21410,182 @@ msgid "_Edit CA Trust"
 msgstr ""
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:679
+#: ../smime/lib/e-cert-db.c:656
 msgid "Certificate already exists"
 msgstr "Certifikát už existuje"
 
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:408
 msgid "Sign"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:409
 msgid "Encrypt"
 msgstr "Zašifrovať"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:514
 msgid "Version"
 msgstr "Verzia"
 
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:529
 msgid "Version 1"
 msgstr "Verzia 1"
 
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:532
 msgid "Version 2"
 msgstr "Verzia 2"
 
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:535
 msgid "Version 3"
 msgstr "Verzia 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:617
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:620
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:623
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:650
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:653
 msgid "Certificate Key Usage"
 msgstr "Použitie kľú�a certifikátu"
 
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:656
 msgid "Netscape Certificate Type"
 msgstr "Typ certifikátu Netscape"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:659
 msgid "Certificate Authority Key Identifier"
 msgstr "Identifikátor kľú�a certifika�nej autority"
 
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:671
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identifikátor objektu (%s)"
 
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "Identifikátor algoritmu"
 
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "Parametre algoritmu"
 
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr "Informácie o verejnom kľú�i predmetu"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritmus verejného kľú�a predmetu"
 
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr "Verejný kľú� predmetu"
 
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
 msgid "Error: Unable to process extension"
 msgstr "Chyba: Nie je možné spracovať rozšírenie"
 
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr "Signatár objektu"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "Certifika�ná autorita SSL"
 
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr "Certifika�ná autorita elektronickej pošty"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:850
 msgid "Signing"
 msgstr "Podpisovanie"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:854
 msgid "Non-repudiation"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:858
 msgid "Key Encipherment"
 msgstr "Zašifrovanie kľú�a"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:862
 msgid "Data Encipherment"
 msgstr "Zašifrovanie dát"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:866
 msgid "Key Agreement"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:870
 msgid "Certificate Signer"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:874
 msgid "CRL Signer"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:922
 msgid "Critical"
 msgstr "Critické"
 
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
 msgid "Not Critical"
 msgstr "Nie je kritické"
 
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:948
 msgid "Extensions"
 msgstr "Rozšírenia"
 
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1019
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmus podpisu certifikátu"
 
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1084
 msgid "Issuer"
 msgstr "Vydavateľ"
 
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1138
 msgid "Issuer Unique ID"
 msgstr "Jedine�né ID vydavateľa"
 
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1157
 msgid "Subject Unique ID"
 msgstr "Jedine�né ID predmetu"
 
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1200
 msgid "Certificate Signature Value"
 msgstr "Hodnota podpisu certifikátu"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "Heslo súboru PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:249
 msgid "Enter password for PKCS12 file:"
 msgstr "Zadajte heslo pre súbor PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:348
 msgid "Imported Certificate"
 msgstr "Importovaný certifikát"
 
@@ -20103,8 +21622,7 @@ msgstr "Kopírovať kontakty do"
 msgid "Contact _Preview"
 msgstr "Zoznam _kontaktov"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopírovať"
@@ -20129,11 +21647,10 @@ msgstr "Kopírovať do prie�inku..."
 
 #: ../ui/evolution-addressbook.xml.h:11
 #, fuzzy
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "Vytvoriť nový adresár"
 
-#: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Vystrihnúť"
@@ -20179,8 +21696,7 @@ msgstr "Presunúť vybraný prie�inok do iného prie�inka"
 msgid "Move to Folder..."
 msgstr "Presunúť do prie�inka..."
 
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Vložiť"
@@ -20207,6 +21723,10 @@ msgstr "<kliknutím vyberiete prie�inok>"
 msgid "S_ave Address Book As VCard"
 msgstr "Nový adresár"
 
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "Uložiť ako VCard..."
+
 #: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr "Uloží vybrané kontakty ako vKartu."
@@ -20216,13 +21736,11 @@ msgstr "Uloží vybrané kontakty ako vKartu."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Uloží vybrané kontakty ako vKartu."
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2715
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2724
 msgid "Select All"
 msgstr "Vybrať všetko"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Vybrať _všetko"
 
@@ -20363,7 +21881,7 @@ msgid "Month"
 msgstr "Mesiac"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:195
 msgid "Next"
 msgstr "Nasledujúca"
 
@@ -20372,7 +21890,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Ukážka kalendára pred tla�ou"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:171
 msgid "Previous"
 msgstr "Predchádzajúca"
 
@@ -20442,269 +21960,6 @@ msgstr "Pracovný týždeň"
 msgid "_Open Appointment"
 msgstr "Otvoriť s_chôdzku"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "Kopírovať vybraný text do schránky"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-#, fuzzy
-msgid "Copy selection to clipboard"
-msgstr "Kopírovať vybraný text do schránky"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "Vystrihnúť vybraný text do schránky"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-#, fuzzy
-msgid "Cut selection to clipboard"
-msgstr "Vystrihnúť vybraný text do schránky"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-#, fuzzy
-msgid "Paste from clipboard"
-msgstr "Vloží obsah schránky"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "Vloží text zo schránky"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "Vybrať celý text"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Priložiť"
-
-#: ../ui/evolution-editor.xml.h:2
-#, fuzzy
-msgid "Click here to attach a file"
-msgstr "<kliknutím vyberiete prie�inok>"
-
-#: ../ui/evolution-editor.xml.h:3
-#, fuzzy
-msgid "Click here to close the current window"
-msgstr "Zavrie aktuálny súbor"
-
-#: ../ui/evolution-editor.xml.h:4
-#, fuzzy
-msgid "Click here to save the current window"
-msgstr "Zavrie aktuálny súbor"
-
-#: ../ui/evolution-editor.xml.h:5
-#, fuzzy
-msgid "Click here to view help available"
-msgstr "<kliknutím vyberiete dátum>"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "Zavrieť"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-#, fuzzy
-msgid "I_nsert"
-msgstr "_Vložiť"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "_Príloha..."
-
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "_Zavrieť"
-
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:53
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:44
-msgid "_File"
-msgstr "_Súbor"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:46
-msgid "_Help"
-msgstr "_Pomocník"
-
-#: ../ui/evolution-editor.xml.h:21
-#, fuzzy
-msgid "_Options"
-msgstr "Nastavenie"
-
-#: ../ui/evolution-event-editor.xml.h:2
-#, fuzzy
-msgid "All Day Event"
-msgstr "Nová celodenná udalosť"
-
-#: ../ui/evolution-event-editor.xml.h:3
-#, fuzzy
-msgid "All _Day Event"
-msgstr "Nová celodenná udalosť"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-#, fuzzy
-msgid "Classify as Confidential"
-msgstr "Tajný"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:7
-#, fuzzy
-msgid "Click here to set or unset alarms for this event"
-msgstr "<kliknutím vyberiete prie�inok>"
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-#, fuzzy
-msgid "Insert advanced send options"
-msgstr "Používateľ zrušil operáciu."
-
-#: ../ui/evolution-event-editor.xml.h:10
-#, fuzzy
-msgid "Make this a recurring event"
-msgstr "Nastaviť tento výskyt ako _presunuteľný"
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-#, fuzzy
-msgid "Pu_blic"
-msgstr "Verejný"
-
-#: ../ui/evolution-event-editor.xml.h:12
-#, fuzzy
-msgid "Query free / busy information for the attendees"
-msgstr "Publikovať informácie o voľnom �ase pre tento kalendár"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-#, fuzzy
-msgid "R_ole Field"
-msgstr "Pole _To"
-
-#: ../ui/evolution-event-editor.xml.h:16
-#, fuzzy
-msgid "Send _Options"
-msgstr "Popis:"
-
-#: ../ui/evolution-event-editor.xml.h:17
-#, fuzzy
-msgid "Show time as _busy"
-msgstr "Zobraziť �as ako"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-#, fuzzy
-msgid "Time _Zone"
-msgstr "Časová _zóna:"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-#, fuzzy
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Prepne, �i má byť zobrazené pole To"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-#, fuzzy
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Prepne, �i má byť zobrazené pole CC"
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-#, fuzzy
-msgid "Toggles whether the Role field is displayed"
-msgstr "Prepne, �i má byť zobrazené pole To"
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-#, fuzzy
-msgid "Toggles whether the Status field is displayed"
-msgstr "Prepne, �i má byť zobrazené pole To"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-#, fuzzy
-msgid "Toggles whether the time zone is displayed"
-msgstr "Prepne, �i má byť zobrazené pole pre výber odosielateľa"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-#, fuzzy
-msgid "Toggles whether to display categories"
-msgstr "Prepne, �i má byť zobrazené pole To"
-
-#: ../ui/evolution-event-editor.xml.h:25
-#, fuzzy
-msgid "Toggles whether to have All Day Event"
-msgstr "Prepne, �i má byť zobrazené pole CC"
-
-#: ../ui/evolution-event-editor.xml.h:26
-#, fuzzy
-msgid "Toggles whether to show time as busy"
-msgstr "Prepne, �i má byť zobrazené pole To"
-
-#: ../ui/evolution-event-editor.xml.h:27
-#, fuzzy
-msgid "_Alarms"
-msgstr "Pripomenutia"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Kategórie"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-#, fuzzy
-msgid "_Classification"
-msgstr "K_lasifikácia"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-#, fuzzy
-msgid "_Confidential"
-msgstr "Tajný"
-
-#: ../ui/evolution-event-editor.xml.h:31
-#, fuzzy
-msgid "_Free/Busy"
-msgstr "_Voľno/Zaneprázdnený:"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-#, fuzzy
-msgid "_Private"
-msgstr "Súkromný"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-#, fuzzy
-msgid "_RSVP"
-msgstr "RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-#, fuzzy
-msgid "_Recurrence"
-msgstr "Opakovanie"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-#, fuzzy
-msgid "_Status Field"
-msgstr "_Stav:"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-#, fuzzy
-msgid "_Type Field"
-msgstr "Pole _To"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Zrušiť aktuálnu poštovú operáciu"
@@ -20718,107 +21973,109 @@ msgid "Create a new folder for storing mail"
 msgstr "Vytvoriť nový prie�inok pre ukladanie pošty"
 
 #: ../ui/evolution-mail-global.xml.h:5
-#, fuzzy
 msgid "Create or edit Search Folder definitions"
-msgstr "Vytvoriť alebo upraviť definície vPrie�inkov"
+msgstr "Vytvoriť alebo upraviť definície vyhľadávacích prie�inkov"
 
 #: ../ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
 msgstr "Vytvoriť alebo upraviť pravidlá pre filtrovanie novej pošty"
 
 #: ../ui/evolution-mail-global.xml.h:7
-msgid "Download messages for Offline"
-msgstr ""
-
-#: ../ui/evolution-mail-global.xml.h:8
-#, fuzzy
-msgid "Download messages for offline"
-msgstr "Vprie�inok na _odosielateľa"
-
-#: ../ui/evolution-mail-global.xml.h:9
 msgid "Download messages of accounts/folders marked for offline"
 msgstr ""
 
-#: ../ui/evolution-mail-global.xml.h:10
+#: ../ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "Vyprázdniť _Odpadky"
 
-#: ../ui/evolution-mail-global.xml.h:11 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
+#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
 msgid "F_older"
 msgstr "P_rie�inok"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Presunúť vybraný prie�inok do iného prie�inka"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trvalo odstrániť všetky zmazané správy zo všetkých prie�inkov"
 
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "Prehľadať pr_ie�inky"
 
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:14
 #, fuzzy
 msgid "Show Message _Preview"
 msgstr "_Náhľad správy"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 #, fuzzy
 msgid "Show message preview below the message list"
 msgstr "Zobraziť správu normálne"
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:16
 #, fuzzy
 msgid "Show message preview side-by-side with the message list"
 msgstr "Zobraziť správu normálne"
 
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview window"
 msgstr "Zobraziť okno s náhľadom správy"
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prihlásiť alebo odhlásiť prie�inky na vzdialených serveroch"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:20
 #, fuzzy
 msgid "_Classic View"
 msgstr "_Deň"
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Copy Folder To..."
 msgstr "_Kopírovať prie�inok do..."
 
+#: ../ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Debug Logs"
+msgstr "Adresa _WWW stránky:"
+
 #: ../ui/evolution-mail-global.xml.h:23
 #, fuzzy
+msgid "_Download Messages for Offline Usage"
+msgstr "Vprie�inok na _odosielateľa"
+
+#: ../ui/evolution-mail-global.xml.h:25
+#, fuzzy
 msgid "_Message Filters"
 msgstr "F_iltre správ"
 
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution-mail-global.xml.h:26
 msgid "_Move Folder To..."
 msgstr "Pre_sunúť prie�inok do..."
 
-#: ../ui/evolution-mail-global.xml.h:25
+#: ../ui/evolution-mail-global.xml.h:27
 msgid "_New..."
 msgstr "_Nový..."
 
-#: ../ui/evolution-mail-global.xml.h:26
-#, fuzzy
+#: ../ui/evolution-mail-global.xml.h:28
 msgid "_Preview"
-msgstr "Náhľad:"
+msgstr "_Náhľad"
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:30
+#: ../ui/evolution-mail-global.xml.h:32
 msgid "_Subscriptions"
 msgstr "_Prihlásenia"
 
-#: ../ui/evolution-mail-global.xml.h:31
+#: ../ui/evolution-mail-global.xml.h:33
 #, fuzzy
 msgid "_Vertical View"
 msgstr "Kresliť vertikálnu mriežku"
@@ -20832,14 +22089,12 @@ msgid "Change the properties of this folder"
 msgstr "Zmení vlastnosti tohto prie�inku"
 
 #: ../ui/evolution-mail-list.xml.h:3
-#, fuzzy
 msgid "Collapse All _Threads"
-msgstr "Zoskupiť podľa _vláken"
+msgstr "Zbaliť všetky _vlákna"
 
 #: ../ui/evolution-mail-list.xml.h:4
-#, fuzzy
 msgid "Collapse all message threads"
-msgstr "Ozna�í všetky viditeľné správy ako už pre�ítané"
+msgstr "Zbaliť všetky vlákna správ"
 
 #: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
@@ -20852,7 +22107,7 @@ msgstr "Vystrihnúť vybrané správy do schránky"
 
 #: ../ui/evolution-mail-list.xml.h:8
 msgid "E_xpand All Threads"
-msgstr ""
+msgstr "Roz_baliť všetky vlákna"
 
 #: ../ui/evolution-mail-list.xml.h:9
 #, fuzzy
@@ -20860,9 +22115,8 @@ msgid "E_xpunge"
 msgstr "_Vy�istiť"
 
 #: ../ui/evolution-mail-list.xml.h:10
-#, fuzzy
 msgid "Expand all message threads"
-msgstr "Ozna�í všetky viditeľné správy ako už pre�ítané"
+msgstr "Rozbaliť všetky vlákna správ"
 
 #: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
@@ -20882,80 +22136,91 @@ msgid ""
 msgstr "Skryje zmazané správy namiesto zobrazenia škrtnutím"
 
 #: ../ui/evolution-mail-list.xml.h:16
-#, fuzzy
 msgid "Mar_k All Messages as Read"
-msgstr "Ozna�iť _správy ako pre�ítané"
+msgstr "Ozna�iť všetky _správy ako pre�ítané"
 
 #: ../ui/evolution-mail-list.xml.h:17
+msgid "Mark all messages in the folder as read"
+msgstr "Ozna�iť všetky správy v prie�inku ako pre�ítané"
+
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Paste message(s) from the clipboard"
 msgstr "Vložiť správy zo schránky"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Trvalo odstrániť všetky zmazané správy z tohto prie�inku"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Permanently remove this folder"
 msgstr "Trvalo odstrániť tento prie�inok"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Re_fresh..."
 msgstr "Aktualizovať"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:22
 #, fuzzy
 msgid "Refresh the folder"
 msgstr "Aktualizujem prie�inok"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Select Message S_ubthread"
+msgstr "Všetky _hlavi�ky správy"
+
+#: ../ui/evolution-mail-list.xml.h:24
 #, fuzzy
 msgid "Select Message _Thread"
 msgstr "Všetky _hlavi�ky správy"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Select _All Messages"
 msgstr "Vybrať _všetky správy"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Vyberie všetky správy, ktoré momentálne nie sú vybrané"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:27
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Vyberie všetky správy v rovnakom vlákne ako je vybraná správa"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:28
+#, fuzzy
+msgid "Select all replies to the currently selected message"
+msgstr "Vyberie všetky správy v rovnakom vlákne ako je vybraná správa"
+
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Select all visible messages"
 msgstr "Vybrať všetky viditeľné správy"
 
-#: ../ui/evolution-mail-list.xml.h:27
-#, fuzzy
+#: ../ui/evolution-mail-list.xml.h:30
 msgid "Show Hidde_n Messages"
 msgstr "Z_obraziť skryté správy"
 
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:31
 msgid "Show messages that have been temporarily hidden"
 msgstr "Zobraziť správy, ktoré boli do�asne skryté"
 
-#: ../ui/evolution-mail-list.xml.h:29
+#: ../ui/evolution-mail-list.xml.h:32
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Do�asne skryť všetky správy, ktoré už boli pre�ítané"
 
-#: ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-mail-list.xml.h:33
 msgid "Temporarily hide the selected messages"
 msgstr "Do�asne skryť vybrané správy"
 
-#: ../ui/evolution-mail-list.xml.h:31
+#: ../ui/evolution-mail-list.xml.h:34
 msgid "Threaded Message list"
 msgstr "Zoznam vlákien"
 
-#: ../ui/evolution-mail-list.xml.h:33
-#, fuzzy
+#: ../ui/evolution-mail-list.xml.h:36
 msgid "_Group By Threads"
 msgstr "Zoskupiť podľa _vláken"
 
-#: ../ui/evolution-mail-list.xml.h:34 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Správa"
@@ -21020,9 +22285,8 @@ msgid "Create a Search Folder for these recipients"
 msgstr "Vytvoriť vPrie�inok pre týchto adresátov"
 
 #: ../ui/evolution-mail-message.xml.h:16
-#, fuzzy
 msgid "Create a Search Folder for this mailing list"
-msgstr "Vytvoriť vPrie�inok pre túto konferenciu"
+msgstr "Vytvoriť vyhľadávací prie�inok pre túto konferenciu"
 
 #: ../ui/evolution-mail-message.xml.h:17
 #, fuzzy
@@ -21089,9 +22353,8 @@ msgid "Display the previous unread message"
 msgstr "Prejsť na predchádzajúcu nepre�ítanú správu"
 
 #: ../ui/evolution-mail-message.xml.h:33
-#, fuzzy
 msgid "F_orward As..."
-msgstr "_Poslať kontakt �alej..."
+msgstr "_Poslať �alej ako..."
 
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
@@ -21152,9 +22415,8 @@ msgid "Mar_k as"
 msgstr "Oz_na�iť ako"
 
 #: ../ui/evolution-mail-message.xml.h:50
-#, fuzzy
 msgid "Mark the selected messages as having been read"
-msgstr "Ozna�í vybrané správy ako už pre�ítané"
+msgstr "Ozna�iť vybrané správy ako už pre�ítané"
 
 #: ../ui/evolution-mail-message.xml.h:51
 #, fuzzy
@@ -21264,40 +22526,35 @@ msgstr "_Presmerovať"
 
 #: ../ui/evolution-mail-message.xml.h:79
 msgid "Redirect (bounce) the selected message to someone"
-msgstr "Presmeruje (bounce) vybranú správu niekomu inému"
+msgstr "Presmerovať (bounce) vybranú správu niekomu inému"
 
 #: ../ui/evolution-mail-message.xml.h:84
 msgid "Reset the text to its original size"
-msgstr "Vráti text na jeho pôvodnú veľkosť"
+msgstr "Vrátiť text na jeho pôvodnú veľkosť"
 
 #: ../ui/evolution-mail-message.xml.h:85
-#, fuzzy
 msgid "Save the selected messages as a text file"
-msgstr "Uložiť správu do textového súboru"
+msgstr "Uložiť vybrané správy ako textový súbor"
 
 #: ../ui/evolution-mail-message.xml.h:86
-#, fuzzy
 msgid "Search Folder from Mailing _List..."
-msgstr "VPrie�inok na _poštový zoznam..."
+msgstr "Vyhľadávací prie�inok z _Konferencie..."
 
 #: ../ui/evolution-mail-message.xml.h:87
-#, fuzzy
 msgid "Search Folder from Recipien_ts..."
-msgstr "Vprie�inok na adresátov..."
+msgstr "Vyhľadávací prie�inok z Adresá_tov..."
 
 #: ../ui/evolution-mail-message.xml.h:88
-#, fuzzy
 msgid "Search Folder from S_ubject..."
-msgstr "Vprie�inok na _predmet..."
+msgstr "Vyhľadávací prie�inok z Predmet_u..."
 
 #: ../ui/evolution-mail-message.xml.h:89
-#, fuzzy
 msgid "Search Folder from Sen_der..."
-msgstr "Vprie�inok na _odosielateľa..."
+msgstr "Vyhľadávací prie�inok z O_dosielateľa..."
 
 #: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
-msgstr "Hľadá v texte zobrazenej správy"
+msgstr "Hľadať v texte zobrazenej správy"
 
 #: ../ui/evolution-mail-message.xml.h:91
 msgid "Select _All Text"
@@ -21307,7 +22564,7 @@ msgstr "Vybrať _celý text"
 msgid "Select all the text in a message"
 msgstr "Vybrať celý text správy"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "Nastaví stránku pre aktuálnu tla�iareň"
 
@@ -21316,109 +22573,104 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Zobraziť blikajúci kurzor v texte zobrazenej správy"
 
 #: ../ui/evolution-mail-message.xml.h:95
-#, fuzzy
-msgid "Show messages in the normal style"
-msgstr "Zobraziť správu normálne"
-
-#: ../ui/evolution-mail-message.xml.h:96
-#, fuzzy
 msgid "Show messages with all email headers"
-msgstr "Zobraziť správu so všetkými hlavi�kami"
+msgstr "Zobraziť správy so všetkými hlavi�kami elektronickej pošty"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Zobraziť zdrojový poštový formát v správe"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "Undelete the selected messages"
 msgstr "Obnoviť vybrané správy"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "Nedô_ležité"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "Zme_nšiť"
 
-#: ../ui/evolution-mail-message.xml.h:101
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
-msgstr "Priložiť"
+msgstr "_Priložené"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "_Clear Flag"
 msgstr "Vy�istiť _zna�ku"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "_Odstrániť správu"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "_Nájsť v správe..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 #, fuzzy
 msgid "_Flag Completed"
 msgstr "Ozna�iť ako _Dokon�ený"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_Prejsť na"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Dôležité"
 
-#: ../ui/evolution-mail-message.xml.h:113
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
-msgstr "v texte"
+msgstr "_V texte"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "_Na�ítať obrázky"
 
-#: ../ui/evolution-mail-message.xml.h:117
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
-msgstr "Zdroj správy"
+msgstr "_Zdroj správy"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "_Nasledujúca správa"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "_Normálna veľkosť"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "_Otvoriť v novom okne"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "_Predchádzajúca správa"
 
-#: ../ui/evolution-mail-message.xml.h:125
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
-msgstr "Citovať"
+msgstr "_Citované"
+
+#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
+#: ../ui/evolution-mail-message.xml.h:126
+msgid "_Read"
+msgstr "_Pre�ítaná"
 
 #: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
@@ -21441,11 +22693,11 @@ msgstr "_Zvä�šiť"
 msgid "_Zoom In"
 msgstr "_Zvä�šiť"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Zavrie toto okno"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "Zavrieť"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Hlavný panel nástrojov"
 
@@ -21489,313 +22741,13 @@ msgstr "Zobraziť vybranú úlohu"
 msgid "_Open Memo"
 msgstr "_Otvoriť správy"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Priložiť súbor"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "Zavrie aktuálny súbor"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "Odstrániť všetko okrem podpisu"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "Zašifrovať túto správu pomocou PGP"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "Zašifrovať túto správu vaším šifrovacím certifikátom S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "_Formát"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HT_ML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-#, fuzzy
-msgid "Insert Send options"
-msgstr "_Obrátiť výber"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "OtvorĂ­ súbor"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "Å ifrovanie PGP"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "Podpis PGP"
-
-#: ../ui/evolution-message-composer.xml.h:17
-#, fuzzy
-msgid "PGP _Encrypt"
-msgstr "Å ifrovanie PGP"
-
-#: ../ui/evolution-message-composer.xml.h:18
-#, fuzzy
-msgid "PGP _Sign"
-msgstr "Podpis PGP"
-
-#: ../ui/evolution-message-composer.xml.h:19
-#, fuzzy
-msgid "R_equest Read Receipt"
-msgstr "Správa o pre�ítaní"
-
-#: ../ui/evolution-message-composer.xml.h:20
-#, fuzzy
-msgid "S/MIME En_crypt"
-msgstr "Å ifrovanie S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "Å ifrovanie S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:22
-#, fuzzy
-msgid "S/MIME Sig_n"
-msgstr "Podpis S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "Podpis S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:24
-#, fuzzy
-msgid "S_end"
-msgstr "Poslať"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "Uložiť ako"
-
-#: ../ui/evolution-message-composer.xml.h:27
-#, fuzzy
-msgid "Save Draft"
-msgstr "Uložiť _koncept"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "Uložiť _ako..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "Uložiť _koncept"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "Uložiť ako koncept"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "Uložiť v prie�inku..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "Uložiť aktuálny súbor"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "Uloží aktuálny súbor pod iným menom"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "Uložiť správu do daného prie�inku"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "Poslať"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "Poslať správu vo formáte HTML"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "Poslať túto správu"
-
-#: ../ui/evolution-message-composer.xml.h:38
-#, fuzzy
-msgid "Set the message priority to high"
-msgstr "Uložiť správu do textového súboru"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "Podpísať túto správu kľú�om PGP"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Podpísať túto správu podpisovým certifikátor S/MIME"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "Prepne, �i má byť zobrazené pole BCC"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "Prepne, �i má byť zobrazené pole CC"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Prepne, �i má byť zobrazené pole pre výber odosielateľa"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Prepne, �i má byť zobrazené pole Post-To"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Prepne, �i má byť zobrazené pole Reply-To"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "Prepne, �i má byť zobrazené pole To"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "Pole _BCC"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "Pole _CC"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "_Odstrániť všetky"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "Pole _Od"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "_Otvoriť..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "Pole _Post-To"
-
-#: ../ui/evolution-message-composer.xml.h:57
-#, fuzzy
-msgid "_Prioritize Message"
-msgstr "Tla�iť správu"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "Pole _Reply-To"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "Za_bezpe�enie"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-#, fuzzy
-msgid "_Send Options"
-msgstr "Popis:"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "Pole _To"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Zavrieť"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "_HTML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "Uložiť a zavrieť"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "Uložiť a _zavrieť"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "Uložiť aktuálny súbor a zavrieť okno"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Pridať prie�inok do zoznamu prihlásených prie�inkov"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Obnoviť zoznam"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Obnoviť zoznam prie�inkov"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Odstrániť prie�inok zo zoznamu prihlásených prie�inkov"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Prihlásiť si"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Odhlásiť"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Obrátiť výber"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr ""
-
-#: ../ui/evolution-task-editor.xml.h:9
-#, fuzzy
-msgid "Status Details"
-msgstr "Stav: %s"
-
-#: ../ui/evolution-task-editor.xml.h:10
-#, fuzzy
-msgid "Time Zone"
-msgstr "Časová zóna "
-
-#: ../ui/evolution-task-editor.xml.h:24
-#, fuzzy
-msgid "_Status Details"
-msgstr "Stav: %s"
-
 #: ../ui/evolution-tasks.xml.h:3
-#, fuzzy
 msgid "Copy selected tasks"
-msgstr "Kopíruje vybranú úlohu"
+msgstr "Kopírovať vybrané úlohy"
 
 #: ../ui/evolution-tasks.xml.h:5
-#, fuzzy
 msgid "Cut selected tasks"
-msgstr "Vystihne vybranú úlohu"
+msgstr "Vystihnúť vybrané úlohy"
 
 #: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
@@ -21814,9 +22766,8 @@ msgid "Mark selected tasks as complete"
 msgstr "Ozna�iť vybrané úlohy ako dokon�ené"
 
 #: ../ui/evolution-tasks.xml.h:12
-#, fuzzy
 msgid "Paste tasks from the clipboard"
-msgstr "Vložiť úlohu zo schránky"
+msgstr "Vložiť úlohy zo schránky"
 
 #: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
@@ -21878,136 +22829,141 @@ msgid "Display window buttons with text only"
 msgstr "Zobraziť tla�idlá okna len s textom"
 
 #: ../ui/evolution.xml.h:10
+msgid "Evolution _FAQ"
+msgstr ""
+
+#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Ukon�iť program"
 
-#: ../ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Zabudnúť uložené heslá, takže ich budete musieť znovu zadať"
 
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:13
 msgid "Hide window buttons"
-msgstr "Skryť tla�idla okna"
+msgstr "Skryť tla�idlá okna"
 
-#: ../ui/evolution.xml.h:13
-#, fuzzy
+#: ../ui/evolution.xml.h:14
 msgid "I_mport..."
-msgstr "_Importovať..."
+msgstr "I_mportovať..."
 
-#: ../ui/evolution.xml.h:14
-msgid "Icons _and text"
+#: ../ui/evolution.xml.h:15
+msgid "Icons _and Text"
 msgstr "Ikony _a text"
 
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr "Importovať dáta z iných programov"
 
-#: ../ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:17
 msgid "Lay_out"
-msgstr ""
+msgstr "R_ozmiestnenie"
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:19
 msgid "New _Window"
 msgstr "Nové _okno"
 
-#: ../ui/evolution.xml.h:19
-#, fuzzy
+#: ../ui/evolution.xml.h:20
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "Otvoriť www stránku s �asto kladenými otázkami"
+
+#: ../ui/evolution.xml.h:21
 msgid "Page Set_up..."
-msgstr "Nastavenie stránky:"
+msgstr "Nast_avenie stránky..."
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
 msgstr "Pred_voľby"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
-msgstr "Príjem / odoslanie"
+msgstr "Odoslať / Prijať"
 
-#: ../ui/evolution.xml.h:22
-#, fuzzy
+#: ../ui/evolution.xml.h:24
 msgid "Send / _Receive"
-msgstr "Príjem / odoslanie"
+msgstr "Odoslať / P_rijať"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:25
 msgid "Send queued items and retrieve new items"
 msgstr "Poslať neodoslanú poštu a prijať novú poštu"
 
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:26
 msgid "Set up Pilot configuration"
 msgstr "Nastavenie Pilota"
 
-#: ../ui/evolution.xml.h:26
-#, fuzzy
+#: ../ui/evolution.xml.h:28
 msgid "Show Side _Bar"
-msgstr "Zobraziť jeden deň"
+msgstr "Zobraziť bo�nú _lištu"
 
-#: ../ui/evolution.xml.h:27
-#, fuzzy
+#: ../ui/evolution.xml.h:29
 msgid "Show _Status Bar"
-msgstr "So _stavom"
+msgstr "Zobraziť _stavovú lištu"
 
-#: ../ui/evolution.xml.h:28
-#, fuzzy
+#: ../ui/evolution.xml.h:30
 msgid "Show _Toolbar"
-msgstr "_Lišta nástrojov"
+msgstr "Zobraziť liš_ta nástrojov"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:31
 msgid "Show information about Evolution"
 msgstr "Zobraziť informácie o programe Evolution"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Poslať správu o chybe"
 
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "_Poslať správu o chybe"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 "Poslať správu o chybe pomocou nástroja pre oznamovanie chýb Priateľ v núdzi."
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:35
 msgid "Toggle whether we are working offline."
 msgstr "Prepne, �i pracujete on alebo off-line."
 
-#: ../ui/evolution.xml.h:38
-msgid "Tool_bar style"
+#: ../ui/evolution.xml.h:36
+msgid "Tool_bar Style"
 msgstr "Štýl _lišty nástrojov"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Side Bar"
-msgstr ""
+msgstr "Zobraziť/Skryť bo�nú lištu"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:38
 msgid "View/Hide the Status Bar"
-msgstr ""
+msgstr "Zobraziť/Skryť stavovú lištu"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:39
 #, fuzzy
+msgid "Work _Offline"
+msgstr "Pracovať off-line"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
-msgstr "_Názov ú�tu:"
+msgstr "_O programe"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Zatvoriť okno"
 
-#: ../ui/evolution.xml.h:45
-#, fuzzy
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "Zabudnúť _heslá"
 
+#: ../ui/evolution.xml.h:45
+msgid "_Frequently Asked Questions"
+msgstr "Čas_to kladené otázky"
+
 #: ../ui/evolution.xml.h:47
-msgid "_Hide buttons"
+msgid "_Hide Buttons"
 msgstr "_Skryť tla�idlá"
 
 #: ../ui/evolution.xml.h:48
-msgid "_Icons only"
+msgid "_Icons Only"
 msgstr "Len _ikony"
 
 #: ../ui/evolution.xml.h:50
@@ -22027,7 +22983,8 @@ msgid "_Synchronization Options..."
 msgstr "Voľby _synchronizácie..."
 
 #: ../ui/evolution.xml.h:54
-msgid "_Text only"
+#, fuzzy
+msgid "_Text Only"
 msgstr "Len _text"
 
 #: ../ui/evolution.xml.h:56
@@ -22109,12 +23066,12 @@ msgstr "S _termínom"
 msgid "With _Status"
 msgstr "So _stavom"
 
-#. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:213
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:408
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:410
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:759
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
 msgid "UTC"
 msgstr "UTC"
 
@@ -22131,9 +23088,8 @@ msgid "Select a Time Zone"
 msgstr "Vyberte �asovú zónu"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-#, fuzzy
-msgid "TimeZone Combobox"
-msgstr "Časová zóna "
+msgid "Timezone drop-down combination box"
+msgstr ""
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -22145,19 +23101,19 @@ msgstr ""
 "zónu.\n"
 "Pre zmenšenie použite pravé tla�idlo myši."
 
-#: ../widgets/menus/gal-define-views-dialog.c:78
-#: ../widgets/menus/gal-define-views-model.c:186
+#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr ""
 
-#: ../widgets/menus/gal-define-views-dialog.c:360
+#: ../widgets/menus/gal-define-views-dialog.c:358
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Definovať pohľady pre %s"
 
+#: ../widgets/menus/gal-define-views-dialog.c:366
 #: ../widgets/menus/gal-define-views-dialog.c:368
-#: ../widgets/menus/gal-define-views-dialog.c:370
 msgid "Define Views"
 msgstr "Definovať pohľady"
 
@@ -22168,16 +23124,16 @@ msgstr "Definovať pohľady pre \"%s\""
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
 #: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
-#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Tabuľka"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:179
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
 msgid "Instance"
 msgstr "Výskyt"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:229
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Uložiť aktuálny pohľad"
 
@@ -22191,53 +23147,49 @@ msgstr "_Nahradiť existujúci pohľad"
 
 #. bonobo displays this string so it must be in locale
 #: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:354
+#: ../widgets/menus/gal-view-menus.c:368
 msgid "Custom View"
 msgstr "Vlastný pohľad"
 
 #: ../widgets/menus/gal-view-instance.c:583
-#, fuzzy
 msgid "Save Custom View"
-msgstr "Uložiť vlastný pohľad..."
+msgstr "Uložiť vlastný pohľad"
 
 #: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:392
 msgid "Define Views..."
 msgstr "Definovať pohľady..."
 
-#: ../widgets/menus/gal-view-menus.c:291
-#, fuzzy
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
-msgstr "Aktuálny pohľad"
+msgstr "Akt_uálny pohľad"
 
-#: ../widgets/menus/gal-view-menus.c:315
-#, fuzzy, c-format
+#: ../widgets/menus/gal-view-menus.c:329
+#, c-format
 msgid "Select View: %s"
-msgstr "Pohľad na týždeň: %s. %s"
+msgstr "Vybrať pohľad: %s"
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:373
 msgid "Current view is a customized view"
 msgstr ""
 
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Save Custom View..."
 msgstr "Uložiť vlastný pohľad..."
 
-#: ../widgets/menus/gal-view-menus.c:369
-#, fuzzy
+#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
-msgstr "Uložiť aktuálny pohľad"
+msgstr "Uložiť aktuálny vlastný pohľad"
 
-#: ../widgets/menus/gal-view-menus.c:383
-#, fuzzy
+#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
-msgstr "_Vytvoriť novú úlohu"
+msgstr "Vytvoriť alebo upraviť pohľady"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Vytváracie rozhranie"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "Definovať nový pohľad"
 
@@ -22246,26 +23198,24 @@ msgid "Name of new view:"
 msgstr "Názov nového pohľadu:"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:2
-#, fuzzy
 msgid "Type of View"
-msgstr "Typ pohľadu:"
+msgstr "Typ pohľadu"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of view:"
 msgstr "Typ pohľadu:"
 
-#: ../widgets/misc/e-attachment-bar.c:1029
-#, fuzzy
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
-msgstr "Príloha"
+msgstr "Lišta príloh"
 
-#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:507 ../widgets/misc/e-attachment.c:524
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Nie je možné priložiť súbor %s: %s"
 
-#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:516
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Nie je možné priložiť súbor %s: nie je to normálny súbor"
@@ -22286,232 +23236,215 @@ msgstr "Typ MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Navrhnúť automatické zobrazovanie príloh"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "PUSÅ PSN"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1088
-#: ../widgets/misc/e-calendar-item.c:1742
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "Kalendár mesiaca"
 
-#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3635
-#: ../widgets/text/e-text.c:3636
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
+#: ../widgets/text/e-text.c:3645
 msgid "Fill color"
 msgstr "Farba výplne"
 
-#: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643 ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3651
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3651
+#: ../widgets/text/e-text.c:3652 ../widgets/text/e-text.c:3659
+#: ../widgets/text/e-text.c:3660
 msgid "GDK fill color"
 msgstr "Farba výplne GDK"
 
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666
+#: ../widgets/text/e-text.c:3667
 msgid "Fill stipple"
 msgstr "Bodkovanie výplne"
 
-#: ../widgets/misc/e-canvas-background.c:481
 #: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:488
 #: ../widgets/misc/e-canvas-background.c:489
+#: ../widgets/misc/e-canvas-background.c:490
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:495
 #: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:497
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:502
 #: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:504
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3014
+#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
+#: ../widgets/table/e-table-group-container.c:999
+#: ../widgets/table/e-table-group-leaf.c:644
+#: ../widgets/table/e-table-item.c:3070
 msgid "Minimum width"
 msgstr "Minimálna šírka"
 
-#: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3015
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
+#: ../widgets/table/e-table-group-container.c:1000
+#: ../widgets/table/e-table-group-leaf.c:645
+#: ../widgets/table/e-table-item.c:3071
 msgid "Minimum Width"
 msgstr "Minimálna šírka"
 
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
 #: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr ""
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "Teraz"
 
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:847
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Čas musí byť vo formáte: %s"
 
-#: ../widgets/misc/e-cell-percent.c:79
+#: ../widgets/misc/e-cell-percent.c:78
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Percentuálna hodnota musí byť medzi 0 až 100"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Pobaltská"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Stredoeurópska"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Čínska"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Azbuka"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Grécka"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "Hebrejská"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "Japonská"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "Kórejská"
 
-#: ../widgets/misc/e-charset-picker.c:74
-#, fuzzy
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
-msgstr "Å t"
+msgstr "Thajská"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Turecká"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "Západoeurópska"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "Západoeurópska, nová"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "Tradi�ná"
 
-#: ../widgets/misc/e-charset-picker.c:100
-#: ../widgets/misc/e-charset-picker.c:101
-#: ../widgets/misc/e-charset-picker.c:102
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
 msgid "Simplified"
 msgstr "Zjednodušená"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "Ukrajinská"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "Vizuálna"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Neznáma znaková sada: %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "Znaková sada"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "Zadajte znakovú sadu, ktorú chcete použiť"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "Iné..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:599
 #, fuzzy
 msgid "Ch_aracter Encoding"
 msgstr "Znaková sada"
 
-#: ../widgets/misc/e-dateedit.c:322
+#: ../widgets/misc/e-dateedit.c:303
 #, fuzzy
 msgid "Date and Time"
 msgstr "Vstup dátumu a �asu"
 
-#: ../widgets/misc/e-dateedit.c:343
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Text entry to input date"
 msgstr "Textový vstup na zadanie dátumu"
 
-#: ../widgets/misc/e-dateedit.c:365
+#: ../widgets/misc/e-dateedit.c:346
 msgid "Click this button to show a calendar"
 msgstr "Kliknutím na toto tla�idlo zobrazíte kalendár"
 
-#: ../widgets/misc/e-dateedit.c:407
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:388
+msgid "Drop-down combination box to select time"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:408
-#, fuzzy
-msgid "Time"
-msgstr "Časová zóna "
-
-#: ../widgets/misc/e-dateedit.c:482
-#, fuzzy
+#: ../widgets/misc/e-dateedit.c:464
 msgid "No_w"
-msgstr "Teraz"
+msgstr "Tera_z"
 
-#: ../widgets/misc/e-dateedit.c:488
-#, fuzzy
+#: ../widgets/misc/e-dateedit.c:470
 msgid "_Today"
-msgstr "Dnes"
+msgstr "_Dnes"
 
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1635
 #, fuzzy
 msgid "Invalid Date Value"
 msgstr "Upraviť podpis"
 
-#: ../widgets/misc/e-dateedit.c:1667
+#: ../widgets/misc/e-dateedit.c:1664
 #, fuzzy
 msgid "Invalid Time Value"
 msgstr "Upraviť podpis"
@@ -22550,11 +23483,11 @@ msgstr ""
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3354
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "Veľkosť expandera"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3355
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "Veľkosť šípok expandera"
 
@@ -22567,168 +23500,169 @@ msgid "Spacing around expander arrow"
 msgstr "Medzera okolo šípky expandera"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:182
-#: ../widgets/misc/e-filter-bar.c:310 ../widgets/misc/e-filter-bar.c:747
+#: ../widgets/misc/e-filter-bar.c:126 ../widgets/misc/e-filter-bar.c:179
+#: ../widgets/misc/e-filter-bar.c:307 ../widgets/misc/e-filter-bar.c:749
 msgid "Advanced Search"
 msgstr "Pokro�ilé hľadanie"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:233
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "Uložiť hľadanie"
 
-#: ../widgets/misc/e-filter-bar.c:270
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "_Hľadania"
 
-#: ../widgets/misc/e-filter-bar.c:272
-#, fuzzy
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
-msgstr "_Hľadania"
+msgstr "Hľadania"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
 msgid "_Save Search..."
 msgstr "_Uložiť hľadanie..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
 msgid "_Edit Saved Searches..."
 msgstr "_Upraviť uložené hľadania..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
 msgid "_Advanced Search..."
 msgstr "_Pokro�ilé hľadanie..."
 
-#: ../widgets/misc/e-filter-bar.h:103
-#, fuzzy
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
-msgstr "Poštové ú�ty"
+msgstr "Všetky ú�ty"
 
-#: ../widgets/misc/e-filter-bar.h:104
-#, fuzzy
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
-msgstr "Zdrojový ú�et"
+msgstr "Aktuálny ú�et"
 
-#: ../widgets/misc/e-filter-bar.h:105
-#, fuzzy
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
-msgstr "Vytvoriť nový prie�inok"
+msgstr "Aktuálny prie�inok"
 
-#: ../widgets/misc/e-filter-bar.h:106
-#, fuzzy
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
-msgstr "Tla�iť správu"
+msgstr "Aktuálna správa"
 
-#: ../widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "Vybrať obrázok"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Svetová mapa"
 
-#: ../widgets/misc/e-map.c:628
+#: ../widgets/misc/e-map.c:629
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+
+#: ../widgets/misc/e-online-button.c:106
+#, fuzzy
+msgid "Online"
+msgstr "v texte"
+
+#: ../widgets/misc/e-online-button.c:107
+msgid "The button state is online"
 msgstr ""
 
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "Synchronizovať s:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "Synchronizovať súkromné záznamy:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "Synchronizované kategórie:"
 
-#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
 msgid "Empty message"
 msgstr "Prázdna správa"
 
-#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
 #, fuzzy
 msgid "Reflow model"
 msgstr "Model výberu"
 
-#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
 msgid "Column width"
 msgstr "Šírka stĺpca"
 
-#: ../widgets/misc/e-search-bar.c:348 ../widgets/misc/e-search-bar.c:477
-#: ../widgets/misc/e-search-bar.c:479
-#, fuzzy
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Search"
-msgstr "_Nájsť"
+msgstr "Hľadať"
 
-#: ../widgets/misc/e-search-bar.c:348 ../widgets/misc/e-search-bar.c:477
-#: ../widgets/misc/e-search-bar.c:479
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 #, fuzzy
 msgid "Click here to change the search type"
 msgstr "Kliknutím pridáte ú�astníka"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Search"
 msgstr "_Nájsť"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:609
 msgid "_Find Now"
 msgstr "_Nájsť teraz"
 
-#: ../widgets/misc/e-search-bar.c:614
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Clear"
 msgstr "_Vy�istiť"
 
-#: ../widgets/misc/e-search-bar.c:869
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Item ID"
 msgstr "ID položky"
 
-#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3557
-#: ../widgets/text/e-text.c:3558
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
+#: ../widgets/text/e-text.c:3567
 msgid "Text"
 msgstr "Text"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1010
+#: ../widgets/misc/e-search-bar.c:1003
 msgid "Sho_w: "
-msgstr ""
+msgstr "Zobra_ziť: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1027
-#, fuzzy
+#: ../widgets/misc/e-search-bar.c:1020
 msgid "Sear_ch: "
-msgstr "_Nájsť"
+msgstr "_Hľadať: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1039
-#, fuzzy
+#: ../widgets/misc/e-search-bar.c:1032
 msgid " i_n "
-msgstr " a "
+msgstr " _v "
 
-#: ../widgets/misc/e-selection-model-array.c:543
-#: ../widgets/table/e-tree-selection-model.c:807
+#: ../widgets/misc/e-selection-model-array.c:594
+#: ../widgets/table/e-tree-selection-model.c:806
 msgid "Cursor Row"
 msgstr "Riadok kurzora"
 
-#: ../widgets/misc/e-selection-model-array.c:550
-#: ../widgets/table/e-tree-selection-model.c:814
+#: ../widgets/misc/e-selection-model-array.c:601
+#: ../widgets/table/e-tree-selection-model.c:813
 msgid "Cursor Column"
 msgstr "Stĺpec kurzora"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "Triedenie"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "Režim výberu"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "Režim kurzora"
 
@@ -22756,11 +23690,6 @@ msgstr "<b>Sledovanie stavu</b>"
 msgid "A_uto-delete sent item"
 msgstr "A_utomaticky odstrániť odoslanú položku"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-#, fuzzy
-msgid "Classification"
-msgstr "K_lasifikácia"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 #, fuzzy
 msgid "Creat_e a sent item to track information"
@@ -22837,47 +23766,47 @@ msgstr "_Po:"
 msgid "_All information"
 msgstr "_Všetky informácie"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#. To translators: This means Delay the message delivery for some time
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
 msgstr "_Oneskoriť doru�enie správy"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "_Doru�ené"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "_Nastaviť dátum vypršania platnosti"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "_Kým:"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "_Pri otvorení:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:213
+#: ../widgets/misc/e-task-widget.c:255
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:219
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hotových)"
 
-#: ../widgets/misc/e-url-entry.c:107
-#, fuzzy
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
-msgstr "kliknutím prejdete na url"
+msgstr "Kliknutím sem prejdete na URL"
 
 #: ../widgets/misc/gal-categories.glade.h:1
 msgid "Edit Master Category List..."
@@ -22895,7 +23824,7 @@ msgstr "_Dostupné kategórie:"
 msgid "categories"
 msgstr "kategórie"
 
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "prekryť zoznam"
 
@@ -22903,35 +23832,35 @@ msgstr "prekryť zoznam"
 msgid "%l:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/table/e-cell-pixbuf.c:383
+#: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "Vybraný stĺpec"
 
-#: ../widgets/table/e-cell-pixbuf.c:390
+#: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
 msgstr "Aktívny stĺpec"
 
-#: ../widgets/table/e-cell-pixbuf.c:397
+#: ../widgets/table/e-cell-pixbuf.c:374
 msgid "Unselected Column"
 msgstr "Neozna�ený stĺpec"
 
-#: ../widgets/table/e-cell-text.c:1804
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Strikeout Column"
 msgstr "Pre�iarknutý stĺpec"
 
-#: ../widgets/table/e-cell-text.c:1811
+#: ../widgets/table/e-cell-text.c:1814
 msgid "Underline Column"
 msgstr "Pod�iarknuť stĺpec"
 
-#: ../widgets/table/e-cell-text.c:1818
+#: ../widgets/table/e-cell-text.c:1821
 msgid "Bold Column"
 msgstr "Tu�ný stĺpec"
 
-#: ../widgets/table/e-cell-text.c:1825
+#: ../widgets/table/e-cell-text.c:1828
 msgid "Color Column"
 msgstr "Stĺpec farby"
 
-#: ../widgets/table/e-cell-text.c:1839
+#: ../widgets/table/e-cell-text.c:1842
 msgid "BG Color Column"
 msgstr "Stĺpec farby pozadia"
 
@@ -22956,14 +23885,13 @@ msgid "No grouping"
 msgstr "Bez zoskupovania"
 
 #: ../widgets/table/e-table-config.c:643
-#: ../widgets/table/e-table-config.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "Zobraziť polia"
 
 #: ../widgets/table/e-table-config.c:664
-#, fuzzy
 msgid "Available Fields"
-msgstr "Do_stupné polia:"
+msgstr "Dostupné polia"
 
 #: ../widgets/table/e-table-config.glade.h:1
 msgid "A_vailable Fields:"
@@ -22979,64 +23907,80 @@ msgid "Clear All"
 msgstr "Vy�istiť všetko"
 
 #: ../widgets/table/e-table-config.glade.h:4
+msgid "Clear _All"
+msgstr "Vy�istiť _všetko"
+
+#: ../widgets/table/e-table-config.glade.h:5
 #: ../widgets/table/e-table-header-item.c:1582
 msgid "Descending"
 msgstr "Zostupne"
 
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../widgets/table/e-table-config.glade.h:8
 msgid "Group Items By"
 msgstr "Zoskupiť položky podľa"
 
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Down"
 msgstr "Presunúť _dole"
 
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.glade.h:10
 msgid "Move _Up"
 msgstr "Presunúť _hore"
 
-#: ../widgets/table/e-table-config.glade.h:11
-msgid "Show field in View"
-msgstr "Zobraziť pole v pohľade"
-
 #: ../widgets/table/e-table-config.glade.h:12
+msgid "Show _field in View"
+msgstr "Zobraziť _pole v pohľade"
+
+#: ../widgets/table/e-table-config.glade.h:13
+msgid "Show field i_n View"
+msgstr "Zobraziť po_le v pohľade"
+
+#: ../widgets/table/e-table-config.glade.h:14
+msgid "Show field in _View"
+msgstr "Zobraziť pole _v pohľade"
+
+#: ../widgets/table/e-table-config.glade.h:15
 msgid "Sort"
 msgstr "Triediť"
 
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:16
 msgid "Sort Items By"
 msgstr "Triediť položky podľa"
 
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:17
 msgid "Then By"
 msgstr "Potom podľa"
 
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.glade.h:19
 msgid "_Fields Shown..."
 msgstr "Zo_brazené polia..."
 
-#: ../widgets/table/e-table-config.glade.h:17
+#: ../widgets/table/e-table-config.glade.h:20
 msgid "_Group By..."
 msgstr "_Zoskupiť podľa..."
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.glade.h:22
+msgid "_Show field in View"
+msgstr "_Zobraziť pole v pohľade"
+
+#: ../widgets/table/e-table-config.glade.h:23
 msgid "_Show these fields in order:"
 msgstr "_Zobraziť tieto polia v poradí:"
 
-#: ../widgets/table/e-table-config.glade.h:20
+#: ../widgets/table/e-table-config.glade.h:24
 msgid "_Sort..."
 msgstr "_Triediť..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:634
-#: ../widgets/table/e-table-field-chooser.c:67
+#: ../widgets/table/e-table-field-chooser-item.c:633
+#: ../widgets/table/e-table-field-chooser.c:66
 #: ../widgets/table/e-table-header-item.c:1886
 msgid "DnD code"
 msgstr "Kód DnD"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:641
-#: ../widgets/table/e-table-field-chooser.c:74
+#: ../widgets/table/e-table-field-chooser-item.c:640
+#: ../widgets/table/e-table-field-chooser.c:73
 #: ../widgets/table/e-table-header-item.c:1900
 msgid "Full Header"
 msgstr "Plná hlavi�ka"
@@ -23058,97 +24002,97 @@ msgstr ""
 "Aby ste pridali stĺpec do vašej tabuľky,\n"
 "premiestnite ho na miesto, kde ho chcete mať."
 
-#: ../widgets/table/e-table-group-container.c:345
-#, fuzzy, c-format
+#: ../widgets/table/e-table-group-container.c:344
+#, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d položka)"
+msgstr[0] "%s : %s (%d položiek)"
 msgstr[1] "%s : %s (%d položka)"
-msgstr[2] "%s : %s (%d položka)"
+msgstr[2] "%s : %s (%d položky)"
 
-#: ../widgets/table/e-table-group-container.c:351
-#, fuzzy, c-format
+#: ../widgets/table/e-table-group-container.c:350
+#, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d položka)"
+msgstr[0] "%s (%d položiek)"
 msgstr[1] "%s (%d položka)"
-msgstr[2] "%s (%d položka)"
+msgstr[2] "%s (%d položky)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:2972 ../widgets/table/e-table-item.c:2973
+#: ../widgets/table/e-table-group-container.c:922
+#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-leaf.c:581
+#: ../widgets/table/e-table-group-leaf.c:582
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 msgid "Alternating Row Colors"
 msgstr "Striedavé farby riadkov"
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:2979 ../widgets/table/e-table-item.c:2980
-#: ../widgets/table/e-tree.c:3307 ../widgets/table/e-tree.c:3308
+#: ../widgets/table/e-table-group-container.c:929
+#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-leaf.c:588
+#: ../widgets/table/e-table-group-leaf.c:589
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr "Kresliť horizontálnu mriežku"
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2986 ../widgets/table/e-table-item.c:2987
-#: ../widgets/table/e-tree.c:3313 ../widgets/table/e-tree.c:3314
+#: ../widgets/table/e-table-group-container.c:936
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-leaf.c:595
+#: ../widgets/table/e-table-group-leaf.c:596
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr "Kresliť vertikálnu mriežku"
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2993 ../widgets/table/e-table-item.c:2994
-#: ../widgets/table/e-tree.c:3319 ../widgets/table/e-tree.c:3320
+#: ../widgets/table/e-table-group-container.c:943
+#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-leaf.c:602
+#: ../widgets/table/e-table-group-leaf.c:603
+#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
+#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr "Kresliť fokus"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3000 ../widgets/table/e-table-item.c:3001
+#: ../widgets/table/e-table-group-container.c:950
+#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-leaf.c:609
+#: ../widgets/table/e-table-group-leaf.c:610
+#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
 msgid "Cursor mode"
 msgstr "Režim kurzoru"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2965 ../widgets/table/e-table-item.c:2966
+#: ../widgets/table/e-table-group-container.c:957
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-leaf.c:623
+#: ../widgets/table/e-table-group-leaf.c:624
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
 msgid "Selection model"
 msgstr "Model výberu"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3301
-#: ../widgets/table/e-tree.c:3302
+#: ../widgets/table/e-table-group-container.c:964
+#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-group-leaf.c:617
+#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
+#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-tree.c:3338
 msgid "Length Threshold"
 msgstr "Hranica dĺžky"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3333
-#: ../widgets/table/e-tree.c:3334
+#: ../widgets/table/e-table-group-container.c:971
+#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-group-leaf.c:658
+#: ../widgets/table/e-table-group-leaf.c:659
+#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
+#: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-tree.c:3370
 msgid "Uniform row height"
 msgstr "Rovnaká výška riadkov"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-container.c:978
+#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/table/e-table-group-leaf.c:651
+#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "Zamknutý"
 
@@ -23157,24 +24101,20 @@ msgid "Customize Current View"
 msgstr "Prispôsobiť aktuálny pohľad"
 
 #: ../widgets/table/e-table-header-item.c:1472
-#, fuzzy
 msgid "Sort _Ascending"
-msgstr "Utriediť vzostupne"
+msgstr "Utriediť _vzostupne"
 
 #: ../widgets/table/e-table-header-item.c:1473
-#, fuzzy
 msgid "Sort _Descending"
-msgstr "Utriediť zostupne"
+msgstr "Utriediť _zostupne"
 
 #: ../widgets/table/e-table-header-item.c:1474
-#, fuzzy
 msgid "_Unsort"
-msgstr "Netriedené"
+msgstr "_Netriediť"
 
 #: ../widgets/table/e-table-header-item.c:1476
-#, fuzzy
 msgid "Group By This _Field"
-msgstr "Zoskupiť podľa tohto poľa"
+msgstr "Zoskupiť podľa tohto _poľa"
 
 #: ../widgets/table/e-table-header-item.c:1477
 #, fuzzy
@@ -23182,19 +24122,16 @@ msgid "Group By _Box"
 msgstr "Zoskupiť podľa boxu"
 
 #: ../widgets/table/e-table-header-item.c:1479
-#, fuzzy
 msgid "Remove This _Column"
-msgstr "Odstráni tento stĺpec"
+msgstr "Odstrániť tento _stĺpec"
 
 #: ../widgets/table/e-table-header-item.c:1480
-#, fuzzy
 msgid "Add a C_olumn..."
-msgstr "Pridať stĺpec..."
+msgstr "Pridať s_tĺpec..."
 
 #: ../widgets/table/e-table-header-item.c:1482
-#, fuzzy
 msgid "A_lignment"
-msgstr "Zarovnanie"
+msgstr "Za_rovnanie"
 
 #: ../widgets/table/e-table-header-item.c:1483
 #, fuzzy
@@ -23212,17 +24149,20 @@ msgid "Custo_mize Current View..."
 msgstr "Prispôsobiť aktuálny pohľad..."
 
 #: ../widgets/table/e-table-header-item.c:1542
-#, fuzzy
-msgid "Sort By"
-msgstr "Triediť"
+msgid "_Sort By"
+msgstr "_Triediť podľa"
+
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1560
+msgid "_Custom"
+msgstr "_Vlastné"
 
 #: ../widgets/table/e-table-header-item.c:1893
-#, fuzzy
 msgid "Font Description"
-msgstr "Popis:"
+msgstr "Popis písma:"
 
 #: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:173
+#: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "Informácie o triedení"
 
@@ -23232,917 +24172,139 @@ msgstr "Informácie o triedení"
 msgid "Tree"
 msgstr "Strom"
 
-#: ../widgets/table/e-table-item.c:2951 ../widgets/table/e-table-item.c:2952
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
 msgid "Table header"
 msgstr "Hlavi�ka tabuľky"
 
-#: ../widgets/table/e-table-item.c:2958 ../widgets/table/e-table-item.c:2959
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
 msgid "Table model"
 msgstr "Model tabuľky"
 
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
 msgid "Cursor row"
 msgstr "Riadok kurzora"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3340
-#: ../widgets/table/e-tree.c:3341
+#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-tree.c:3377
 msgid "Always search"
 msgstr "Vždy hľadať"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3347
 msgid "Use click to add"
 msgstr "Pridať kliknutím"
 
-#: ../widgets/table/e-tree.c:3326 ../widgets/table/e-tree.c:3327
+#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
 msgid "ETree table adapter"
 msgstr "Tabuľkový adaptér ETree"
 
-#: ../widgets/table/e-tree.c:3347
+#: ../widgets/table/e-tree.c:3383
 msgid "Retro Look"
 msgstr "Retro vzhľad"
 
-#: ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-tree.c:3384
 msgid "Draw lines and +/- expanders."
 msgstr "Nakresliť �iary a +/- expandery."
 
-#: ../widgets/text/e-text.c:2727
+#: ../widgets/text/e-text.c:2736
 msgid "Input Methods"
 msgstr "Metódy vstupu"
 
-#: ../widgets/text/e-text.c:3550 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
 msgid "Event Processor"
 msgstr "Spracovanie udalostí"
 
-#: ../widgets/text/e-text.c:3564 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
 msgid "Bold"
 msgstr "Tu�né"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
 msgid "Strikeout"
 msgstr "Pre�iarknuté"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
 msgid "Anchor"
 msgstr "Kotva"
 
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
 msgid "Justification"
 msgstr "Zarovnanie"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
 msgid "Clip Width"
 msgstr "Šírka orezania"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
 msgid "Clip Height"
 msgstr "Výška orezania"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
 msgid "Clip"
 msgstr "Orezanie"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
 msgid "Fill clip rectangle"
 msgstr "Vyplniť obdĺžnik orezania"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
 msgid "X Offset"
 msgstr "Posun X"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638
 msgid "Y Offset"
 msgstr "Posun Y"
 
-#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
 msgid "Text width"
 msgstr "Šírka textu"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
 msgid "Text height"
 msgstr "Výška textu"
 
-#: ../widgets/text/e-text.c:3686 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Use ellipsis"
 msgstr "Použiť vypustenie"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Ellipsis"
 msgstr "Vypustenie"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Line wrap"
 msgstr "Zalamovanie riadkov"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Break characters"
 msgstr "Znaky konca riadkov"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Max lines"
 msgstr "Max. riadkov"
 
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
 msgid "Draw borders"
 msgstr "Kresliť okraje"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
 msgid "Allow newlines"
 msgstr "Povoliť nové riadky"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
 msgid "Draw background"
 msgstr "Kresliť pozadie"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
 msgid "Draw button"
 msgstr "Kresliť tla�idlo"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
 msgid "Cursor position"
 msgstr "Pozícia kurzora"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3780 ../widgets/text/e-text.c:3781
 msgid "IM Context"
 msgstr "Kontext IM"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3787 ../widgets/text/e-text.c:3788
 msgid "Handle Popup"
 msgstr "Spracovať vyskakovanie okno"
-
-#~ msgid "Addressbook"
-#~ msgstr "Adresár"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#, fuzzy
-#~ msgid ""
-#~ "Selecting this option means that Evolution will only try to use SSL/TLS "
-#~ "if you are in a insecure environment. For example, if you and your LDAP "
-#~ "server are behind a firewall at work, then Evolution doesn't need to use "
-#~ "SSL/TLS because your connection is already secure."
-#~ msgstr ""
-#~ "Zapnutie tejto voľby znamená, že Evolution sa bude pokúšať použiť\n"
-#~ "SSL/TLS iba v nezabezpe�enom prostredí. napríklad, ak je váš\n"
-#~ "server LDAP za firewallom, Evolution nemusí tieto protokoly používať,\n"
-#~ "pretože vaše spojenie už zabezpe�ené je."
-
-#~ msgid "E-_mail:"
-#~ msgstr "E_mail:"
-
-#~ msgid ""
-#~ "The changed email or name of this contact already\n"
-#~ "exists in this folder.  Would you like to add it anyway?"
-#~ msgstr ""
-#~ "Zmenený e-mail alebo meno pre tento kontakt už v tomto\n"
-#~ "prie�inku existuje. Chcete ho aj tak pridať?"
-
-#~ msgid "Advanced..."
-#~ msgstr "Pokro�ilé..."
-
-#~ msgid "Print cards"
-#~ msgstr "Tla�iť karty"
-
-#~ msgid "Organization"
-#~ msgstr "Organizácia"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid "Video Conferencing"
-#~ msgstr "Videokonferencia"
-
-#~ msgid "work"
-#~ msgstr "zamestnanie"
-
-#~ msgid "WWW"
-#~ msgstr "WWW"
-
-#~ msgid "personal"
-#~ msgstr "osobné"
-
-#~ msgid "Select target addressbook."
-#~ msgstr "Vybrať cieľový adresár."
-
-#~ msgid "(none)"
-#~ msgstr "(ni�)"
-
-#~ msgid "Primary Email"
-#~ msgstr "Primárny e-mail"
-
-#~ msgid "Select an Action"
-#~ msgstr "Vyberte akciu"
-
-#~ msgid "Create a new contact \"%s\""
-#~ msgstr "Vytvoriť nový kontakt \"%s\""
-
-#~ msgid "Add address to existing contact \"%s\""
-#~ msgstr "Pridať adresu do existujúceho kontaktu \"%s\""
-
-#~ msgid "Merge E-Mail Address"
-#~ msgstr "Zliať e-mailovú adresu"
-
-#~ msgid "GTK Tree View"
-#~ msgstr "Stromový pohľad GTK"
-
-#, fuzzy
-#~ msgid "Importing ..."
-#~ msgstr "Importujem..."
-
-#~ msgid "Print envelope"
-#~ msgstr "Tla�iť obálku"
-
-#~ msgid "Print contacts"
-#~ msgstr "Tla�iť kontakty"
-
-#~ msgid "Print contact"
-#~ msgstr "Tla�iť kontakt"
-
-#~ msgid "Error loading default addressbook."
-#~ msgstr "Chyba pri na�ítavaní štandardného adresára"
-
-#~ msgid "Input File"
-#~ msgstr "Vstupný súbor"
-
-#~ msgid "No filename provided."
-#~ msgstr "Nezadané meno súboru."
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete the journal entry '{0}'?"
-#~ msgstr "Naozaj chcete odstrániť položku denníka `%s'?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete these {0} journal entries?"
-#~ msgstr "Naozaj chcete odstrániť položku denníka `%s'?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete this journal entry?"
-#~ msgstr "Naozaj chcete odstrániť %d položiek denníka?"
-
-#, fuzzy
-#~ msgid "Discard Changes"
-#~ msgstr "_Zahodiť zmeny"
-
-#, fuzzy
-#~ msgid "description of appointment"
-#~ msgstr "za�iatok schôdzky"
-
-#~ msgid "%.0fK"
-#~ msgstr "%.0fK"
-
-#~ msgid "%.0fM"
-#~ msgstr "%.0fM"
-
-#~ msgid "%.0fG"
-#~ msgstr "%.0fG"
-
-#~ msgid "Remove"
-#~ msgstr "Odstrániť"
-
-#, fuzzy
-#~ msgid "Don't Remove"
-#~ msgstr "Neimportovať"
-
-#~ msgid "Enable"
-#~ msgstr "Povoliť"
-
-#~ msgid "05 minutes"
-#~ msgstr "05 minút"
-
-#~ msgid "10 minutes"
-#~ msgstr "10 minút"
-
-#~ msgid "15 minutes"
-#~ msgstr "15 minút"
-
-#~ msgid "30 minutes"
-#~ msgstr "30 minút"
-
-#~ msgid "60 minutes"
-#~ msgstr "60 minút"
-
-#, fuzzy
-#~ msgid "<b>Default Free/Busy Server</b>"
-#~ msgstr "Informácie o kalendári"
-
-#, fuzzy
-#~ msgid "<b>General</b>"
-#~ msgstr "Pripomenutia"
-
-#, fuzzy
-#~ msgid "<b>Publishing</b>"
-#~ msgstr "Požiadavka na informácie o voľnom �ase"
-
-#, fuzzy
-#~ msgid "<b>Task List</b>"
-#~ msgstr "Informácie o kalendári"
-
-#, fuzzy
-#~ msgid "<b>Time</b>"
-#~ msgstr "<b>Termín:</b> "
-
-#, fuzzy
-#~ msgid "<b>Work Week</b>"
-#~ msgstr "Pracovný týždeň"
-
-#~ msgid "Calendar and Tasks Settings"
-#~ msgstr "Nastavenie kalendára a úloh"
-
-#~ msgid "Color for overdue tasks"
-#~ msgstr "Farba pre nestihnuté úlohy"
-
-#~ msgid "Color for tasks due today"
-#~ msgstr "Farba pre úlohy do dnešného dňa"
-
-#~ msgid "Days"
-#~ msgstr "Dni"
-
-#~ msgid "Hours"
-#~ msgstr "Hodiny"
-
-#~ msgid "Minutes"
-#~ msgstr "Minúty"
-
-#, fuzzy
-#~ msgid "_Add URL"
-#~ msgstr "_Pridať"
-
-#, fuzzy
-#~ msgid "Add Calendar"
-#~ msgstr "Nová Kaledónia"
-
-#, fuzzy
-#~ msgid "Add Task List"
-#~ msgstr "Zoznam úloh"
-
-#, fuzzy
-#~ msgid "_Add Calendar"
-#~ msgstr "Nová Kaledónia"
-
-#, fuzzy
-#~ msgid "_Add Task List"
-#~ msgstr "Zoznam úloh"
-
-#~ msgid "This journal entry has been deleted."
-#~ msgstr "Táto položka denníka bola odstránená."
-
-#~ msgid "This journal entry has been changed."
-#~ msgstr "Táto položka denníka bola zmenená."
-
-#~ msgid "Journal entry - %s"
-#~ msgstr "Položka denníka - %s"
-
-#~ msgid "The journal entry could not be deleted due to a corba error"
-#~ msgstr "Položku žurnálu nie je možné odstrániť kvôli chybe systému CORBA"
-
-#~ msgid "The journal entry could not be deleted because permission was denied"
-#~ msgstr "Položku žurnálu nie je možné odstrániť kvôli nedostato�ným právam"
-
-#, fuzzy
-#~ msgid "The journal entry could not be deleted due to an error"
-#~ msgstr "Položku žurnálu nie je možné odstrániť kvôli chybe systému CORBA"
-
-#~ msgid "Scheduling"
-#~ msgstr "Plánovanie"
-
-#, fuzzy
-#~ msgid "Invitations"
-#~ msgstr "Informácia"
-
-#, fuzzy
-#~ msgid "<b>Basics</b>"
-#~ msgstr "Informácie o kalendári"
-
-#, fuzzy
-#~ msgid "<b>Date and Time</b>"
-#~ msgstr "Dátum a �as"
-
-#~ msgid "A_ll day event"
-#~ msgstr "_Celodenná udalosť"
-
-#, fuzzy
-#~ msgid "Cale_ndar:"
-#~ msgstr "Kalen_dár:"
-
-#, fuzzy
-#~ msgid "Classi_fication:"
-#~ msgstr "Klasifikácia"
-
-#, fuzzy
-#~ msgid "Locat_ion:"
-#~ msgstr "Umiestnenie:"
-
-#, fuzzy
-#~ msgid "<b>Dele_gatees</b>"
-#~ msgstr "<b>Stav:</b>"
-
-#, fuzzy
-#~ msgid "<b>From:</b>"
-#~ msgstr "<b>Domov</b>"
-
-#, fuzzy
-#~ msgid "Con_tacts..."
-#~ msgstr "Kontakty"
-
-#, fuzzy
-#~ msgid "<b>Calendar options</b>"
-#~ msgstr "Informácie o kalendári"
-
-#, fuzzy
-#~ msgid "Add New Calendar"
-#~ msgstr "Nová Kaledónia"
-
-#, fuzzy
-#~ msgid "Calendar Group"
-#~ msgstr "Chyba iCalendar"
-
-#, fuzzy
-#~ msgid "Calendar Location"
-#~ msgstr "Informácie o kalendári"
-
-#, fuzzy
-#~ msgid "Calendar Name"
-#~ msgstr "Kalendár"
-
-#, fuzzy
-#~ msgid "Add New Task List"
-#~ msgstr "Zoznam úloh"
-
-#, fuzzy
-#~ msgid "Task List Group"
-#~ msgstr "Zoznam úloh"
-
-#, fuzzy
-#~ msgid "Task List Name"
-#~ msgstr "Zoznam úloh"
-
-#~ msgid ""
-#~ "You are modifying a recurring journal entry, what would you like to "
-#~ "modify?"
-#~ msgstr "Upravujete opakujúcu sa položku žurnálu. Čo chcete zmeniť?"
-
-#~ msgid "Assignment"
-#~ msgstr "Priradenie"
-
-#, fuzzy
-#~ msgid "<b>Free/Busy C_alendars</b>"
-#~ msgstr "Informácie o kalendári"
-
-#, fuzzy
-#~ msgid "Free/Busy Publishing Settings"
-#~ msgstr "Požiadavka na informácie o voľnom �ase"
-
-#, fuzzy
-#~ msgid "_Daily"
-#~ msgstr "Deň"
-
-#, fuzzy
-#~ msgid "_Manual"
-#~ msgstr "Managua"
-
-#, fuzzy
-#~ msgid "_Weekly"
-#~ msgstr "Týždeň"
-
-#, fuzzy
-#~ msgid "Task Table"
-#~ msgstr "Aktualizácia úlohy"
-
-#~ msgid "Task sort"
-#~ msgstr "Triedenie úloh"
-
-#~ msgid "_Publish Free/Busy Information"
-#~ msgstr "_Publikovať informácie o voľnom �ase"
-
-#~ msgid "Removal Complete"
-#~ msgstr "Odstránenie dokon�ené"
-
-#~ msgid "%P %%"
-#~ msgstr "%P %%"
-
-#~ msgid "date-end"
-#~ msgstr "dátum konca"
-
-#~ msgid "date-start"
-#~ msgstr "dátum za�iatku"
-
-#, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "Zadajte vaše heslo pre %s"
-
-#, fuzzy
-#~ msgid "Timezone Button"
-#~ msgstr "Časová zóna "
-
-#~ msgid "Selected day (%a %b %d %Y)"
-#~ msgstr "Vybraný deň (%a %b %d %Y)"
-
-#~ msgid "%a %b %d"
-#~ msgstr "%a %b %d"
-
-#~ msgid "%a %b %d %Y"
-#~ msgstr "%a %b %d %Y"
-
-#~ msgid "Selected week (%s - %s)"
-#~ msgstr "Vybraný týždeň (%s - %s)"
-
-#~ msgid "Selected month (%b %Y)"
-#~ msgstr "Vybraný mesiac (%b - %Y)"
-
-#~ msgid "Selected year (%Y)"
-#~ msgstr "Vybraný rok (%Y)"
-
-#~ msgid "Print Preview"
-#~ msgstr "Ukážka pred tla�ou"
-
-#, fuzzy
-#~ msgid "The Evolution Groupware Suite"
-#~ msgstr "Sada groupvérových nástrojov Evolution"
-
-#~ msgid "      "
-#~ msgstr "      "
-
-#~ msgid "<b>Receiving Email</b>"
-#~ msgstr "<b>Príjem pošty</b>"
-
-#~ msgid "<b>Sending Email:</b>"
-#~ msgstr "<b>Posielanie pošty:</b>"
-
-#~ msgid ""
-#~ "<small>This page allows you to choose if you want to be notified via a "
-#~ "read receipt when a message you\n"
-#~ "sent is read, and to specify what Evolution should do when someone "
-#~ "requests a receipt from you.</small>"
-#~ msgstr ""
-#~ "<small>Tento dialóg umožňuje vybrať, �i chcete byť upozornený, že\n"
-#~ "si adresát pre�ítal vašu správu. Ďalej tu môžete nastaviť, ako sa\n"
-#~ "má Evolution chovať v prípade, že ste si správu pre�ítali vy.</small>"
-
-#, fuzzy
-#~ msgid "Always send back a read receipt"
-#~ msgstr "Vždy poslať späť správu o pre�ítaní"
-
-#~ msgid "Ask me if I want to send back a read receipt"
-#~ msgstr "Pýtať sa pred poslaním správy o pre�ítaní"
-
-#~ msgid "Never send back a read receipt"
-#~ msgstr "Nikdy neposielať správu o pre�ítaní"
-
-#~ msgid "Read Receipts"
-#~ msgstr "Správa o pre�ítaní"
-
-#~ msgid ""
-#~ "Unless the message is sent to a mailing list, and not to me personally"
-#~ msgstr "Nie v prípade, že sa posiela do konferencie alebo mne"
-
-#~ msgid ""
-#~ "When you receive an email with a read receipt request, what should "
-#~ "Evolution do?"
-#~ msgstr ""
-#~ "Čo má Evolution urobiť, ak dostanete správu s požiadavkou na potvrdenie "
-#~ "pre�ítania?"
-
-#~ msgid ""
-#~ "A file by that name already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "Súbor s týmto menom už existuje\n"
-#~ "Prepísať ho?"
-
-#~ msgid "%a %m/%d/%Y %I:%M %p"
-#~ msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#~ msgid "%a %m/%d/%Y %H:%M"
-#~ msgstr "%a %d/%m/%Y %H:%M:%S"
-
-#~ msgid "%a %m/%d/%Y %I %p"
-#~ msgstr "%a %d/%m/%Y %I %p"
-
-#~ msgid "%a %m/%d/%Y %H"
-#~ msgstr "%a %d/%m/%Y %H"
-
-#~ msgid "%m/%d/%Y %I:%M:%S %p"
-#~ msgstr "%d/%m/%Y %I:%M:%S %p"
-
-#~ msgid "%m/%d/%Y %H:%M:%S"
-#~ msgstr "%d/%m/%Y %H:%M:%S"
-
-#~ msgid "%m/%d/%Y %I:%M %p"
-#~ msgstr "%d/%m/%Y %I:%M %p"
-
-#~ msgid "%m/%d/%Y %H:%M"
-#~ msgstr "%d/%m/%Y %H:%M"
-
-#~ msgid "%m/%d/%Y %I %p"
-#~ msgstr "%d/%m/%Y %I %p"
-
-#~ msgid "%m/%d/%Y %H"
-#~ msgstr "%d/%m/%Y %H"
-
-#~ msgid "%I:%M:%S %p"
-#~ msgstr "%I:%M:%S %p"
-
-#~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
-
-#~ msgid "%I:%M %p"
-#~ msgstr "%I:%M %p"
-
-#~ msgid "%H:%M"
-#~ msgstr "%H:%M"
-
-#~ msgid "%I %p"
-#~ msgstr "%I %p"
-
-#, fuzzy
-#~ msgid "The orientation of the tray."
-#~ msgstr "Popis prílohy."
-
-#, fuzzy
-#~ msgid "_Rule name:"
-#~ msgstr "Meno pravidla: "
-
-#, fuzzy
-#~ msgid "If"
-#~ msgstr "I"
-
-#, fuzzy
-#~ msgid "Mail Accounts Table"
-#~ msgstr "Poštové ú�ty"
-
-#, fuzzy
-#~ msgid "<b>Then</b>"
-#~ msgstr "<b>Termín:</b> "
-
-#, fuzzy
-#~ msgid "Attachment Button"
-#~ msgstr "Príloha"
-
-#~ msgid "Filters"
-#~ msgstr "Filtre"
-
-#~ msgid "Priority Filter \"%s\""
-#~ msgstr "Filter priority \"%s\""
-
-#~ msgid ""
-#~ "Some of your Netscape email filters are based on\n"
-#~ "email priorities, which are not used in Evolution.\n"
-#~ "Instead, Evolution provides scores in the range of\n"
-#~ "-3 to 3 that can be assigned to emails and filtered\n"
-#~ "accordingly.\n"
-#~ "\n"
-#~ "As a workaround, a set of filters called \"Priority Filter\"\n"
-#~ "was added that converts Netscape's email priorities into\n"
-#~ "Evolution's scores, and the affected filters use scores instead\n"
-#~ "of priorities. Check the imported filters to make sure\n"
-#~ "everything still works as intended."
-#~ msgstr ""
-#~ "Niektoré poštové filtre Netscape sú založené na prioritách\n"
-#~ "správ, Evolution nepodporuje. Namiesto toho podporuje\n"
-#~ "skóre v rozsahu -3 až 3, ktoré je možné správam priradiť.\n"
-#~ "\n"
-#~ "Ako náhradu bola pridaná kategória filtrov \"Filter priority\",\n"
-#~ "ktorá prevádza priority Netscape na skóre Evolution.\n"
-#~ "Zodpovedajúce importované filtre budú používať skóre.\n"
-#~ "Overte naimportované filtre, že všetky funguje tak, ako má."
-
-#~ msgid ""
-#~ "Some of your Netscape email filters use\n"
-#~ "the \"Ignore Thread\" or \"Watch Thread\"\n"
-#~ "feature, which is not supported in Evolution.\n"
-#~ "These filters will be dropped."
-#~ msgstr ""
-#~ "Niektoré poštové filtre Netscape používajú funkciu\n"
-#~ "\"Ignorovať vlákno\" a \"Sledovať vlákno\", ktorú\n"
-#~ "Evolution nepodporuje. Tieto filtre budú zahodené."
-
-#~ msgid ""
-#~ "Some of your Netscape email filters test the\n"
-#~ "body of emails for (in)equality to a given string,\n"
-#~ "which is not supported in Evolution. Those filters\n"
-#~ "were modified to test whether that string is or is not\n"
-#~ "contained in the message body."
-#~ msgstr ""
-#~ "Niektoré poštové filtre Netscape testujú telo\n"
-#~ "správ, �i sú zhodné ako zadaný reťazec.\n"
-#~ "Táto možnosť nie je v Evolution podporovaná.\n"
-#~ "Tieto filtre boli upravené, aby testovali, �i\n"
-#~ "je reťazec je alebo nie je v tele správy."
-
-#~ msgid "Evolution is importing your old Netscape data"
-#~ msgstr "Evolution importuje vaše staré dáta Netscape"
-
-#, fuzzy
-#~ msgid "Importing Netscape data"
-#~ msgstr "Evolution importuje vaše staré dáta Netscape"
-
-#~ msgid "Settings"
-#~ msgstr "Nastavenie"
-
-#~ msgid "Mail Filters"
-#~ msgstr "Poštové filtre"
-
-#~ msgid ""
-#~ "Evolution has found Netscape mail files.\n"
-#~ "Would you like them to be imported into Evolution?"
-#~ msgstr ""
-#~ "Evolution našiel poštové súbory Netscape.\n"
-#~ "Chcete ich naimportovať do Evolution?"
-
-#~ msgid "Execute Command..."
-#~ msgstr "Vykonať príkaz..."
-
-#, fuzzy
-#~ msgid "HTML Mail"
-#~ msgstr "_HTML správy"
-
-#, fuzzy
-#~ msgid "T_erminal Font:"
-#~ msgstr "Písmo _terminálu:"
-
-#~ msgid "_Show animated images"
-#~ msgstr "Zobraziť _animované obrázky"
-
-#~ msgid "_Subscribe"
-#~ msgstr "_Prihlásiť si"
-
-#~ msgid "Filtering Folder"
-#~ msgstr "Filtrujem prie�inok"
-
-#~ msgid ""
-#~ "Unable to create output file: %s\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
-#~ " %s"
-
-#~ msgid "Server: %s, Type: %s"
-#~ msgstr "Server: %s, Typ: %s"
-
-#~ msgid "Path: %s, Type: %s"
-#~ msgstr "Cesta: %s, Typ: %s"
-
-#~ msgid "Type: %s"
-#~ msgstr "Typ: %s"
-
-#~ msgid "Original Location"
-#~ msgstr "Pôvodný umiestnenie:"
-
-#, fuzzy
-#~ msgid "<span weight=\"bold\">Automatic Contacts</span>"
-#~ msgstr "Zobrazené správy:"
-
-#, fuzzy
-#~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-#~ msgstr "Odoslané a koncepty"
-
-#~ msgid "dialog1"
-#~ msgstr "dialog1"
-
-#~ msgid "Meetings and Tasks"
-#~ msgstr "Stretnutia a úlohy"
-
-#, fuzzy
-#~ msgid "<span weight=\"bold\">Conflict Search</span>"
-#~ msgstr "Zobrazené správy:"
-
-#~ msgid "System error: %s"
-#~ msgstr "Systémová chyba: %s"
-
-#, fuzzy
-#~ msgid "Camel error: %s"
-#~ msgstr "Chyba validácie: %s"
-
-#~ msgid "Account cannot send e-mail"
-#~ msgstr "Ú�et nemôže odoslať elektronickú poštu"
-
-#, fuzzy
-#~ msgid "No store available"
-#~ msgstr "Popis nie je k dispozícii."
-
-#, fuzzy
-#~ msgid "Mail Remote"
-#~ msgstr "Poštové filtre"
-
-#~ msgid "New mail notify"
-#~ msgstr "Upozornenie na novú poštu"
-
-#~ msgid "Plugin manager"
-#~ msgstr "Správca zásuvných modulov"
-
-#~ msgid "Id"
-#~ msgstr "Id"
-
-#~ msgid "Path"
-#~ msgstr "Cesta"
-
-#~ msgid "Uid"
-#~ msgstr "Uid"
-
-#~ msgid "Url"
-#~ msgstr "Url"
-
-#~ msgid "Printer settings"
-#~ msgstr "Nastavenia tla�iarne"
-
-#~ msgid "(Untitled)"
-#~ msgstr "(Bez mena)"
-
-#~ msgid "Evolution Settings"
-#~ msgstr "Nastavenie Evolution"
-
-#~ msgid "E"
-#~ msgstr "V"
-
-#~ msgid "Content type of the attachment."
-#~ msgstr "Typ obsahu prílohy."
-
-#~ msgid "The filename to display in the mail."
-#~ msgstr "Meno súboru zobrazené v správe."
-
-#~ msgid "Description of the attachment."
-#~ msgstr "Popis prílohy."
-
-#~ msgid "Mark attachment to be shown inline by default."
-#~ msgstr "Ozna�iť prílohu, že má byť zobrazená štandardne v texte."
-
-#~ msgid "_Preview Pane"
-#~ msgstr "Panel _náhľadu"
-
-#~ msgid "_Select All"
-#~ msgstr "Vybrať _všetko"
-
-#~ msgid "Delete this Occurrence"
-#~ msgstr "Odstrániť tento výskyt"
-
-#~ msgid "Customize My Evolution"
-#~ msgstr "Prispôsobiť moje Evolution"
-
-#~ msgid "Move"
-#~ msgstr "Presunúť"
-
-#~ msgid "_About Evolution..."
-#~ msgstr "_O programe Evolution..."
-
-#~ msgid "_Send / Receive"
-#~ msgstr "_Poslať / Prijať"
-
-#~ msgid "_Phone List"
-#~ msgstr "_Telefónny zoznam"
-
-#~ msgid "_Edit..."
-#~ msgstr "_Upraviť..."
-
-#~ msgid "Previous Button"
-#~ msgstr "Predchádzajúce tla�idlo"
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "Text Date Entry"
-#~ msgstr "Textový vstup dátumu"
-
-#~ msgid "Date Button"
-#~ msgstr "Tla�idlo dátumu"
-
-#~ msgid "Search Text Entry"
-#~ msgstr "Vstupné pole vyhľadávania"
-
-#~ msgid "Search Type"
-#~ msgstr "Typ hľadania"
-
-#~ msgid "Subitem ID"
-#~ msgstr "ID podpoložky"
-
-#~ msgid "Find _Now"
-#~ msgstr "Nájsť _teraz"
-
-#~ msgid "<- _Remove"
-#~ msgstr "<- _Odstrániť"
-
-#~ msgid "Sh_ow these fields in order:"
-#~ msgstr "Z_obraziť tieto polia v poradí:"
-
-#~ msgid "%s : %s (%d items)"
-#~ msgstr "%s : %s (%d položiek)"
-
-#~ msgid "%s (%d items)"
-#~ msgstr "%s (%d položiek)"
-
-#~ msgid "Fontset"
-#~ msgstr "Sada písiem"
-
-#~ msgid "Always Search"
-#~ msgstr "Vždy hľadať"
-
-#~ msgid "Copyright (C) 2000, Helix Code, Inc."
-#~ msgstr "Autorské práva © 2000, Helix Code, Inc."
-
-#~ msgid "Font"
-#~ msgstr "Písmo"
-
-#~ msgid "GDKFont"
-#~ msgstr "GDKPísmo"
-
-#~ msgid "Emulate label resize"
-#~ msgstr "Emulovať zmenu veľkosti návestia"
diff --git a/po/sv.po b/po/sv.po
index 4c9c0108c2..39794a9f59 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-11 22:47+0000\n"
-"PO-Revision-Date: 2008-09-13 19:49+0100\n"
+"POT-Creation-Date: 2008-10-24 08:47+0200\n"
+"PO-Revision-Date: 2008-10-24 08:54+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -28,21 +28,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution address book"
 msgstr "evolution-adressbok"
 
-#: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "Ny kontaktlista"
 
-#: ../a11y/addressbook/ea-minicard-view.c:161
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -161,7 +161,7 @@ msgid "calendar view for one or more days"
 msgstr "kalendervy för en eller flera dagar"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:784
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -172,9 +172,9 @@ msgstr "%A %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:856
-#: ../calendar/gui/e-day-view.c:1566
+#: ../calendar/gui/calendar-component.c:787
+#: ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-day-view.c:1577
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -182,9 +182,9 @@ msgstr "%a %d %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:762
-#: ../calendar/gui/calendar-component.c:767
-#: ../calendar/gui/calendar-component.c:769
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -192,10 +192,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:788
-#: ../calendar/gui/calendar-component.c:794
-#: ../calendar/gui/calendar-component.c:796
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:815
+#: ../calendar/gui/calendar-component.c:821
+#: ../calendar/gui/calendar-component.c:823
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -205,16 +205,16 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:860
-#: ../calendar/gui/e-day-view.c:1582
+#: ../calendar/gui/calendar-component.c:813
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-day-view.c:1593
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:766
+#: ../calendar/importers/icalendar-importer.c:780
 msgid "Gnome Calendar"
 msgstr "Gnome-kalendern"
 
@@ -261,11 +261,11 @@ msgstr "popup"
 msgid "popup a child"
 msgstr "poppa upp ett barn"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
 msgid "edit"
 msgstr "redigera"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
 msgid "begin editing this cell"
 msgstr "påbörja redigering av denna cell"
 
@@ -278,19 +278,19 @@ msgstr "växla"
 msgid "toggle the cell"
 msgstr "växla cellen"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "fäll ut"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
 msgid "expands the row in the ETree containing this cell"
 msgstr "fäller ut raden i det ETree som innehåller denna cell"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr "fäll in"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
 msgid "collapses the row in the ETree containing this cell"
 msgstr "fäller in den rad i det ETree som innehåller denna cell"
 
@@ -418,6 +418,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP-servern svarade inte med giltig schemainformation."
 
 #: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:50
 msgid "Server Version"
 msgstr "Serverversion"
 
@@ -533,17 +534,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:299
+#: ../addressbook/conduit/address-conduit.c:300
 msgid "Default Sync Address:"
 msgstr "Standardsynkroniseringsadress:"
 
-#: ../addressbook/conduit/address-conduit.c:1320
 #: ../addressbook/conduit/address-conduit.c:1321
+#: ../addressbook/conduit/address-conduit.c:1322
 msgid "Could not load address book"
 msgstr "Kunde inte läsa in adressboken"
 
-#: ../addressbook/conduit/address-conduit.c:1398
-#: ../addressbook/conduit/address-conduit.c:1401
+#: ../addressbook/conduit/address-conduit.c:1399
+#: ../addressbook/conduit/address-conduit.c:1402
 msgid "Could not read pilot's Address application block"
 msgstr "Kunde inte läsa pilotens adressprogramblock"
 
@@ -565,10 +566,10 @@ msgstr "Konfigurera automatisk ifyllning här"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../addressbook/gui/component/addressbook-view.c:1325
 #: ../calendar/gui/calendar-component.c:299
 #: ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "Kontakter"
@@ -607,8 +608,8 @@ msgstr "Hantera dina S/MIME-certifikat här"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../addressbook/gui/component/addressbook-component.c:143
+#: ../addressbook/gui/component/addressbook-migrate.c:500
 #: ../calendar/gui/calendar-component.c:236
 #: ../calendar/gui/memos-component.c:199
 #: ../calendar/gui/migration.c:475
@@ -618,9 +619,9 @@ msgstr "Hantera dina S/MIME-certifikat här"
 #: ../mail/em-folder-tree-model.c:200
 #: ../mail/em-folder-tree-model.c:202
 #: ../mail/em-migrate.c:2906
-#: ../mail/mail-component.c:312
-#: ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1457
+#: ../mail/mail-component.c:311
+#: ../mail/mail-vfolder.c:223
+#: ../mail/message-list.c:1518
 msgid "On This Computer"
 msgstr "PÃ¥ denna dator"
 
@@ -629,9 +630,9 @@ msgstr "PÃ¥ denna dator"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/component/addressbook-component.c:151
+#: ../addressbook/gui/component/addressbook-migrate.c:508
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
 #: ../calendar/gui/calendar-component.c:247
 #: ../calendar/gui/caltypes.xml.h:29
@@ -647,129 +648,129 @@ msgid "Personal"
 msgstr "Personligt"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:163
-#: ../addressbook/gui/component/addressbook-migrate.c:517
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "PÃ¥ LDAP-servrar"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:231
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "Skapa en ny kontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt_lista"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "Skapa en ny kontaktlista"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-#: ../addressbook/gui/component/addressbook-config.c:1207
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "Ny adressbok"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Adress_bok"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "Skapa en ny adressbok"
 
-#: ../addressbook/gui/component/addressbook-component.c:410
+#: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Misslyckades med att uppgradera adressboksinställningar eller mappar."
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:332
 msgid "Base"
 msgstr "Bas"
 
-#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../addressbook/gui/component/addressbook-config.c:533
 #: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_Typ:"
 
-#: ../addressbook/gui/component/addressbook-config.c:619
+#: ../addressbook/gui/component/addressbook-config.c:635
 msgid "Copy _book content locally for offline operation"
 msgstr "Kopiera _bokinnehåll lokalt för frånkopplad användning"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/component/addressbook-config.c:998
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 #: ../mail/em-folder-properties.c:283
 #: ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2367
+#: ../plugins/itip-formatter/itip-formatter.c:2441
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Allmänt"
 
-#: ../addressbook/gui/component/addressbook-config.c:983
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
-#: ../mail/importers/pine-importer.c:385
+#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Adressbok"
 
-#: ../addressbook/gui/component/addressbook-config.c:987
+#: ../addressbook/gui/component/addressbook-config.c:1003
 msgid "Server Information"
 msgstr "Serverinformation"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:1005
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/addressbook-config.c:1008
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../addressbook/gui/component/addressbook-config.c:993
-#: ../mail/em-folder-browser.c:983
+#: ../addressbook/gui/component/addressbook-config.c:1009
+#: ../mail/em-folder-browser.c:985
 msgid "Searching"
 msgstr "Söker"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
+#: ../addressbook/gui/component/addressbook-config.c:1011
 msgid "Downloading"
 msgstr "Hämtning"
 
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-config.c:1221
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Egenskaper för adressboken"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../addressbook/gui/component/addressbook-migrate.c:74
 #: ../calendar/gui/migration.c:148
 #: ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Migrerar..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../addressbook/gui/component/addressbook-migrate.c:126
 #: ../calendar/gui/migration.c:195
 #: ../mail/em-migrate.c:1247
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Migrerar \"%s\":"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:645
+#: ../addressbook/gui/component/addressbook-migrate.c:646
 msgid "LDAP Servers"
 msgstr "LDAP-servrar"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:760
+#: ../addressbook/gui/component/addressbook-migrate.c:761
 msgid "Autocompletion Settings"
 msgstr "Inställningar för automatisk ifyllning"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
 "\n"
@@ -779,7 +780,7 @@ msgstr ""
 "\n"
 "Ha tålamod medan Evolution migrerar dina mappar..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
+#: ../addressbook/gui/component/addressbook-migrate.c:1151
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -789,7 +790,7 @@ msgstr ""
 "\n"
 "Ha tålamod medan Evolution migrerar dina mappar..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
+#: ../addressbook/gui/component/addressbook-migrate.c:1160
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -799,7 +800,7 @@ msgstr ""
 "\n"
 "Ha tålamod medan Evolution migrerar dina mappar..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
+#: ../addressbook/gui/component/addressbook-migrate.c:1170
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -809,38 +810,38 @@ msgstr ""
 "\n"
 "Ha tålamod medan Evolution migrerar dina Pilot Sync-data..."
 
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:501
+#: ../addressbook/gui/component/addressbook-view.c:424
+#: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Byt namn på mappen \"%s\" till:"
 
-#: ../addressbook/gui/component/addressbook-view.c:428
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:427
+#: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
 msgstr "Byt namn på mapp"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:509
+#: ../addressbook/gui/component/addressbook-view.c:432
+#: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
 msgstr "Mappnamn kan inte innehålla \"/\""
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:941
 msgid "_New Address Book"
 msgstr "_Ny adressbok"
 
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "Save As vCard..."
 msgstr "Spara som vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:946
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:619
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1693
-#: ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468
-#: ../calendar/gui/tasks-component.c:459
+#: ../addressbook/gui/component/addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/calendar-component.c:644
+#: ../calendar/gui/e-calendar-table.c:1598
+#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/memos-component.c:493
+#: ../calendar/gui/tasks-component.c:484
 #: ../mail/em-folder-tree.c:2111
 #: ../mail/em-folder-view.c:1340
 #: ../ui/evolution-addressbook.xml.h:49
@@ -851,19 +852,19 @@ msgstr "Spara som vCard..."
 msgid "_Delete"
 msgstr "_Ta bort"
 
-#: ../addressbook/gui/component/addressbook-view.c:949
-#: ../calendar/gui/calendar-component.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:2035
-#: ../calendar/gui/memos-component.c:471
-#: ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1044
+#: ../addressbook/gui/component/addressbook-view.c:948
+#: ../calendar/gui/calendar-component.c:649
+#: ../calendar/gui/dialogs/comp-editor.c:2043
+#: ../calendar/gui/memos-component.c:498
+#: ../calendar/gui/tasks-component.c:489
+#: ../composer/e-msg-composer.c:1041
 #: ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59
 #: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Egenskaper"
 
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1336
 msgid "Contact Source Selector"
 msgstr "Väljare för kontaktkälla"
 
@@ -885,7 +886,7 @@ msgstr "Ange lösenord för %s (användare %s)"
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
 #: ../plugins/google-account-setup/google-source.c:444
-#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../plugins/publish-calendar/publish-calendar.c:191
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Ange lösenord"
@@ -907,27 +908,35 @@ msgid "Position of the vertical pane, between the card and list views and the pr
 msgstr "Position för den vertikala panelen, mellan kort- och listvyerna och förhandsgranskningspanelen, i bildpunkter."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr "Visa automatiskt kompletterat namn med en adress"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "Visa förhandsgranskningspanelen"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
 msgstr "Antalet tecken som måste skrivas innan Evolution automatiskt kommer att försöka fylla i."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI för den mapp som senast användes i namnväljardialogen"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 msgid "URI for the folder last used in the select names dialog."
 msgstr "URI för den mapp som senast användes i namnväljardialogen."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
 msgstr "Vertikal panelposition"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
+msgid "Whether force showing the mail address with the name of the autocompleted contact in the entry."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
 msgid "Whether to show the preview pane."
 msgstr "Huruvida förhandsgranskningspanelen ska visas."
 
@@ -972,7 +981,7 @@ msgid "Add Address Book"
 msgstr "Lägg till adressbok"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:760
 msgid "Always"
 msgstr "Alltid"
 
@@ -1010,14 +1019,14 @@ msgid "Lo_gin:"
 msgstr "Inlo_ggning:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:759
 msgid "Never"
 msgstr "Aldrig"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:288
+#: ../mail/em-account-editor.c:287
 msgid "No encryption"
 msgstr "Ingen kryptering"
 
@@ -1029,7 +1038,7 @@ msgstr "En"
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:296
+#: ../mail/em-account-editor.c:295
 msgid "SSL encryption"
 msgstr "SSL-kryptering"
 
@@ -1078,7 +1087,7 @@ msgstr "Sökbaser som stöds"
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:292
+#: ../mail/em-account-editor.c:291
 msgid "TLS encryption"
 msgstr "TLS-kryptering"
 
@@ -1091,7 +1100,8 @@ msgid "The search scope defines how deep you would like the search to extend dow
 msgstr "Sökomfattningen anger hur djupt du vill att sökningen ska gå ner i katalogträdet. En sökomfattning som är \"sub\" kommer att inkludera alla poster under din sökbas. En sökomfattning som är \"one\" kommer endast att inkludera de poster som är en nivå under din sökbas."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
+#, fuzzy
+msgid "This is the full name of your LDAP server. For example, \"ldap.mycompany.com\"."
 msgstr "Detta är det fullständiga namnet på din ldap-server. Till exempel \"ldap.mittforetag.se\"."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:42
@@ -1099,7 +1109,8 @@ msgid "This is the maximum number of entries to download. Setting this number to
 msgstr "Detta är det största antalet poster att hämta. Att ställa in detta tal för högt kommer att slöa ned adressboken."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
-msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
+#, fuzzy
+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 "Detta är den metod som Evolution kommer att använda för att autentisera dig. Observera att ställa in detta till \"E-postadress\" kräver anonym åtkomst till din ldap-server."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:44
@@ -1140,7 +1151,7 @@ msgstr "_Inloggningsmetod:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:177
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1155,7 +1166,7 @@ msgid "_Search scope:"
 msgstr "_Sökomfattning:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:186
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Server:"
@@ -1221,7 +1232,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Jobb</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1233,16 +1244,16 @@ msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/widgets/e-minicard.c:199
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2421
 msgid "Contact Editor"
 msgstr "Kontaktredigerare"
 
@@ -1269,132 +1280,136 @@ msgstr "Sme_knamn:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+msgid "Novell GroupWise"
+msgstr "Novell GroupWise"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Personal Information"
 msgstr "Personlig information"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "Telefon"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
 #: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Jobb"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Adress:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "_Jubileum:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "_Assistent:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "_Födelsedag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:787
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../calendar/gui/dialogs/event-page.c:791
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1868
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_Ort:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Företag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_Land:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Avdelning:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_Arkivera under:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_Ledig/Upptagen:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "_Hemsida:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Manager:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Anteckningar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Kontor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_Postbox:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Yrke:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "_Partner:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "Del_stat/Län:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Videochatt:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_Vill få HTML-post"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Webblogg:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Var:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_Postnummer:"
 
@@ -1407,18 +1422,18 @@ msgstr "Adress"
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:292
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-label.c:165
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
 #: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../addressbook/gui/widgets/e-minicard.c:192
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1836
-#: ../widgets/text/e-text.c:3687
+#: ../widgets/table/e-cell-text.c:1835
 #: ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
 msgid "Editable"
 msgstr "Redigerbar"
 
@@ -2391,13 +2406,13 @@ msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
-#: ../mail/em-mailer-prefs.c:466
+#: ../mail/em-mailer-prefs.c:467
 #: ../plugins/exchange-operations/exchange-delegates.c:954
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
 #: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:350
+#: ../plugins/save-attachments/save-attachments.c:351
 #: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Namn"
@@ -2407,7 +2422,7 @@ msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
@@ -2421,7 +2436,7 @@ msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
@@ -2434,8 +2449,8 @@ msgstr "Tjänst"
 #: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:693
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/publish-calendar/publish-calendar.c:694
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Plats"
 
@@ -2444,77 +2459,77 @@ msgid "Username"
 msgstr "Användarnamn"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Hem"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Annat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Source Book"
 msgstr "Källbok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Target Book"
 msgstr "MÃ¥lbok"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
 msgid "Is New Contact"
 msgstr "Är ny kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Writable Fields"
 msgstr "Skrivbara fält"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Required Fields"
 msgstr "Obligatoriska fält"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Ändrad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2416
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigerare - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "Please select an image for this contact"
 msgstr "Välj en bild för denna kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "_No image"
 msgstr "_Ingen bild"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2522,47 +2537,47 @@ msgstr ""
 "Data för kontakten är ogiltiga:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3090
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "\"%s\" har ett ogiltigt format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s\"%s\" har ett ogiltigt format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s\"%s\" är tom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3138
 msgid "Invalid contact."
 msgstr "Ogiltig kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "Contact Quick-Add"
 msgstr "Snabbinläggning av kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
 msgid "_Edit Full"
 msgstr "_Redigera fullständigt namn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:402
 msgid "_Full name"
 msgstr "_Fullständigt namn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:413
 msgid "E_mail"
 msgstr "E-_post"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:424
 msgid "_Select Address Book"
 msgstr "_Välj adressbok"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2571,7 +2586,7 @@ msgstr ""
 "Är du säker på att du vill\n"
 "ta bort kontaktlistan (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:324
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2579,7 +2594,7 @@ msgstr ""
 "Är du säker på att du vill\n"
 "ta bort dessa kontaktlistor?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2588,7 +2603,7 @@ msgstr ""
 "Är du säker på att du vill\n"
 "ta bort kontakten (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:332
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2696,8 +2711,8 @@ msgstr "_Snabbmeddelandetjänst:"
 #: ../addressbook/gui/contact-editor/im.glade.h:4
 #: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:243
-#: ../plugins/exchange-operations/exchange-contacts.c:234
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
 msgid "_Location:"
 msgstr "_Plats:"
 
@@ -2736,9 +2751,9 @@ msgid "_Members"
 msgstr "_Medlemmar"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:298
+#: ../addressbook/gui/widgets/e-addressbook-model.c:311
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
 #: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
@@ -2796,14 +2811,14 @@ msgstr "Sammanfoga kontakt"
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
 #: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:415
-#: ../smime/lib/e-cert.c:827
+#: ../plugins/groupwise-features/junk-settings.c:416
+#: ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "E-post"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:80
 #: ../calendar/gui/caltypes.xml.h:3
 #: ../calendar/gui/memotypes.xml.h:3
 #: ../calendar/gui/tasktypes.xml.h:5
@@ -2811,7 +2826,7 @@ msgid "Any field contains"
 msgstr "Något fält innehåller"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "E-postadress börjar med"
 
@@ -2819,36 +2834,36 @@ msgstr "E-postadress börjar med"
 msgid "Name contains"
 msgstr "Namn innehåller"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "Inga kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-model.c:318
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
 #: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Fråga"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "Fel vid hämtande av bokvy"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
 #: ../widgets/table/e-table-click-to-add.c:509
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3353
-#: ../widgets/table/e-tree-selection-model.c:821
-#: ../widgets/text/e-text.c:3551
+#: ../widgets/table/e-table.c:3354
+#: ../widgets/table/e-tree-selection-model.c:820
 #: ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3553
 msgid "Model"
 msgstr "Modell"
 
@@ -2856,15 +2871,15 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Fel vid ändring av kort"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Name begins with"
 msgstr "Namn börjar med"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "Källkod"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-meeting-list-view.c:508
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
@@ -2872,77 +2887,77 @@ msgstr "Källkod"
 msgid "Type"
 msgstr "Typ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Spara som vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/e-calendar-table.c:1574
-#: ../calendar/gui/e-calendar-view.c:1671
-#: ../calendar/gui/e-memo-table.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:2041
+#: ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-view.c:1670
+#: ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Öppna"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "_Ny kontakt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "Ny kontakt_lista..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "_Spara som vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "_Vidarebefordra kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "_Vidarebefordra kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "Skicka _meddelande till kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "Skicka _meddelande till lista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "Skicka _meddelande till kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "Ko_piera till adressbok..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "Fly_tta till adressbok..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "Klipp _ut"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:480
-#: ../calendar/gui/e-calendar-table.c:1582
-#: ../calendar/gui/e-calendar-view.c:1678
-#: ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2055
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:484
+#: ../calendar/gui/e-calendar-table.c:1584
+#: ../calendar/gui/e-calendar-view.c:1677
+#: ../calendar/gui/e-memo-table.c:931
+#: ../composer/e-msg-composer.c:2052
 #: ../mail/em-folder-tree.c:1005
 #: ../mail/em-folder-view.c:1325
-#: ../mail/message-list.c:2044
+#: ../mail/message-list.c:2106
 #: ../ui/evolution-addressbook.xml.h:46
 #: ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-mail-message.xml.h:103
@@ -2951,15 +2966,15 @@ msgstr "Klipp _ut"
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "Klistra _in"
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1524
-#: ../calendar/gui/cal-search-bar.c:625
-#: ../calendar/gui/cal-search-bar.c:668
-#: ../calendar/gui/cal-search-bar.c:687
+#: ../calendar/gui/cal-search-bar.c:628
+#: ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Any Category"
 msgstr "Alla kategorier"
 
@@ -3133,63 +3148,63 @@ msgstr "Enhet"
 msgid "Web Site"
 msgstr "Webbplats"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../addressbook/gui/widgets/e-minicard-label.c:116
+#: ../addressbook/gui/widgets/e-minicard.c:155
 #: ../widgets/misc/e-canvas-vbox.c:85
 #: ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1433
-#: ../widgets/misc/e-reflow.c:1434
+#: ../widgets/misc/e-reflow.c:1424
+#: ../widgets/misc/e-reflow.c:1425
 #: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-col.c:99
-#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-field-chooser-item.c:654
 #: ../widgets/table/e-table-group-container.c:992
 #: ../widgets/table/e-table-group-container.c:993
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3081
-#: ../widgets/table/e-table-item.c:3082
-#: ../widgets/text/e-text.c:3729
+#: ../widgets/table/e-table-item.c:3077
+#: ../widgets/table/e-table-item.c:3078
 #: ../widgets/text/e-text.c:3730
+#: ../widgets/text/e-text.c:3731
 msgid "Width"
 msgstr "Bredd"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../addressbook/gui/widgets/e-minicard-label.c:123
+#: ../addressbook/gui/widgets/e-minicard.c:162
 #: ../widgets/misc/e-canvas-vbox.c:97
 #: ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1441
-#: ../widgets/misc/e-reflow.c:1442
+#: ../widgets/misc/e-reflow.c:1432
+#: ../widgets/misc/e-reflow.c:1433
 #: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../widgets/table/e-table-field-chooser-item.c:661
 #: ../widgets/table/e-table-group-container.c:985
 #: ../widgets/table/e-table-group-container.c:986
 #: ../widgets/table/e-table-group-leaf.c:630
 #: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3087
-#: ../widgets/table/e-table-item.c:3088
-#: ../widgets/text/e-text.c:3737
+#: ../widgets/table/e-table-item.c:3083
+#: ../widgets/table/e-table-item.c:3084
 #: ../widgets/text/e-text.c:3738
+#: ../widgets/text/e-text.c:3739
 msgid "Height"
 msgstr "Höjd"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
+#: ../addressbook/gui/widgets/e-minicard-label.c:130
+#: ../addressbook/gui/widgets/e-minicard.c:170
 msgid "Has Focus"
 msgstr "Har fokus"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:137
 msgid "Field"
 msgstr "Fält"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:144
 msgid "Field Name"
 msgstr "Fältnamn"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:151
 msgid "Text Model"
 msgstr "Textmodell"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:158
 msgid "Max field name length"
 msgstr "Maximal fältnamnslängd"
 
@@ -3259,24 +3274,24 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "E-post arbete"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "E-post hem"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:830
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:831
 msgid "Other Email"
 msgstr "Annan e-post"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
+#: ../addressbook/gui/widgets/e-minicard.c:178
 msgid "Selected"
 msgstr "Markerad"
 
-#: ../addressbook/gui/widgets/e-minicard.c:184
+#: ../addressbook/gui/widgets/e-minicard.c:185
 msgid "Has Cursor"
 msgstr "Har markör"
 
@@ -3286,7 +3301,7 @@ msgid "_Open Link in Browser"
 msgstr "_Öppna länk i webbläsare"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2795
+#: ../mail/em-folder-view.c:2792
 msgid "_Copy Link Location"
 msgstr "_Kopiera länkplats"
 
@@ -3337,10 +3352,10 @@ msgid "Video Chat"
 msgstr "Videochatt"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/calendar-commands.c:93
+#: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/gnome-cal.c:2451
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
@@ -3376,7 +3391,7 @@ msgstr "Webblogg"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
 #: ../calendar/gui/caltypes.xml.h:6
-#: ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/e-calendar-view.c:2342
 #: ../calendar/gui/memotypes.xml.h:5
 #: ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
@@ -3384,7 +3399,7 @@ msgstr "Födelsedag"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
 #: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/e-calendar-view.c:2343
 #: ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
@@ -3403,139 +3418,139 @@ msgid "Blog"
 msgstr "Webblogg"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "Lyckades"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "Bakänden upptagen"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "Lagret frånkopplat"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "Adressboken finns inte"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
 msgstr "Ingen självkontakt definierad"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Ã…tkomst nekas"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "Kontakten hittades inte"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "Kontakt-ID finns redan"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "Protokollet stöds inte"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:240
-#: ../calendar/gui/e-calendar-table.c:643
-#: ../calendar/gui/print.c:2555
+#: ../calendar/gui/e-cal-model-tasks.c:364
+#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-calendar-table.c:239
+#: ../calendar/gui/e-calendar-table.c:642
+#: ../calendar/gui/print.c:2557
 msgid "Canceled"
 msgstr "Avbruten"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "Kunde inte avbryta"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../calendar/gui/comp-editor-factory.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Failed"
 msgstr "Autentisering misslyckades"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Authentication Required"
 msgstr "Autentisering krävs"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "TLS är inte tillgängligt"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "Det finns ingen sådan källa"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
 msgstr "Inte tillgänglig i frånkopplat läge"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Other error"
 msgstr "Annat fel"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
 msgstr "Ogiltig serverversion"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 msgid "Unsupported authentication method"
 msgstr "Autentiseringsmetoden stöds inte"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:109
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid "We were unable to open this address book. 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 "Vi kunde inte öppna denna adressbok. Detta betyder antingen att denna bok inte är markerad för frånkopplad användning eller att den ännu inte är hämtad för frånkopplad användning. Läs in adressboken en gång i anslutet läge för att hämta dess innehåll"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:118
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
 msgid "We were unable to open this address book.  Please check that the path %s exists and that you have permission to access it."
 msgstr "Vi kunde inte öppna denna adressbok. Kontrollera att sökvägen %s finns och att du har behörighet att komma åt den."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:127
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid "We were unable to open this address book.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
 msgstr "Vi kunde inte öppna denna adressbok. Detta betyder antingen att du har angett en felaktig URI eller att LDAP-servern inte går att komma åt."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:133
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid "This version of Evolution does not have LDAP support compiled in to it.  If you want to use LDAP in Evolution, you must install an LDAP-enabled Evolution package."
 msgstr "Denna version av Evolution har inte LDAP-stöd inkompilerat. Om du vill använda LDAP i Evolution måste du installera ett Evolution-paket som har LDAP-stöd aktiverat."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:141
 msgid "We were unable to open this address book.  This either means you have entered an incorrect URI, or the server is unreachable."
 msgstr "Vi kunde inte öppna denna adressbok. Detta betyder antingen att du har angett en felaktig URI eller att servern inte går att komma åt."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
 msgid "Detailed error:"
 msgstr "Detaljerat fel:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3547,7 +3562,7 @@ msgstr ""
 "Gör din sökning mer specifik eller öka resultatgränsen i\n"
 "katalogserverinställningarna för denna adressbok."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this address book.  Please make your search\n"
@@ -3559,45 +3574,45 @@ msgstr ""
 "specifik eller öka resultatgränsen i katalogserverinställningarna\n"
 "för denna adressbok."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "The backend for this address book was unable to parse this query."
 msgstr "Bakänden för denna adressbok kunde inte tolka denna fråga."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
 msgid "The backend for this address book refused to perform this query."
 msgstr "Bakänden för denna adressbok vägrade att genomföra denna fråga."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:190
 msgid "This query did not complete successfully."
 msgstr "Denna fråga returnerade inte utan problem."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error adding list"
 msgstr "Fel vid tillägg av lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:688
 msgid "Error adding contact"
 msgstr "Fel vid tillägg av kontakt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying list"
 msgstr "Fel vid ändring av lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying contact"
 msgstr "Fel vid ändring av kontakt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
 msgid "Error removing list"
 msgstr "Fel vid borttagning av lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:638
 msgid "Error removing contact"
 msgstr "Fel vid borttagning av kontakt"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
+#: ../addressbook/gui/widgets/eab-gui-util.c:317
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3612,16 +3627,16 @@ msgstr[1] ""
 "Att öppna %d kontakter kommer även att öppna %d nya fönster.\n"
 "Vill du verkligen visa alla dessa kontakter?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "_Don't Display"
 msgstr "Visa _inte"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
+#: ../addressbook/gui/widgets/eab-gui-util.c:326
 msgid "Display _All Contacts"
 msgstr "Visa _alla kontakter"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
+#: ../addressbook/gui/widgets/eab-gui-util.c:352
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3630,65 +3645,65 @@ msgstr ""
 "%s finns redan\n"
 "Vill du skriva över den?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:356
 msgid "Overwrite"
 msgstr "Skriv över"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
+#: ../addressbook/gui/widgets/eab-gui-util.c:400
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontakt"
 msgstr[1] "kontakter"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Select Address Book"
 msgstr "Välj adressbok"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:597
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:749
 msgid "Move contact to"
 msgstr "Flytta kontakt till"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Copy contact to"
 msgstr "Kopiera kontakt till"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:754
 msgid "Move contacts to"
 msgstr "Flytta kontakter till"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Copy contacts to"
 msgstr "Kopiera kontakter till"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:900
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
 msgid "Multiple vCards"
 msgstr "Flera vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:907
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard för %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:919
-#: ../addressbook/gui/widgets/eab-gui-util.c:945
+#: ../addressbook/gui/widgets/eab-gui-util.c:921
+#: ../addressbook/gui/widgets/eab-gui-util.c:947
 #, c-format
 msgid "Contact information"
 msgstr "Kontaktinformation"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:947
+#: ../addressbook/gui/widgets/eab-gui-util.c:949
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktinformation för %s"
@@ -3697,23 +3712,23 @@ msgstr "Kontaktinformation för %s"
 msgid "Querying Address Book..."
 msgstr "Frågar adressboken..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Det finns en annan kontakt."
 msgstr[1] "Det finns %d andra kontakter."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Show Full vCard"
 msgstr "Visa fullständigt vCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 msgid "Show Compact vCard"
 msgstr "Spara kompakt vCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
 msgid "Save in address book"
 msgstr "Spara i adressbok"
 
@@ -3722,11 +3737,11 @@ msgid "Card View"
 msgstr "Kortvy"
 
 #: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:498
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:306
-#: ../calendar/importers/icalendar-importer.c:671
-#: ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../calendar/importers/icalendar-importer.c:308
+#: ../calendar/importers/icalendar-importer.c:685
+#: ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Importerar..."
 
@@ -3754,19 +3769,19 @@ msgstr "Evolution CSV eller Tab (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolutions CSV och Tab-importör"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:665
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:681
 msgid "Evolution LDIF importer"
 msgstr "Evolutions LDIF-importör"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:550
 msgid "Evolution vCard Importer"
 msgstr "Evolutions vCard-importör"
 
@@ -3811,12 +3826,12 @@ msgid "Format"
 msgstr "Format"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:432
+#: ../mail/em-mailer-prefs.c:433
 #: ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:648
-#: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-field-chooser-item.c:647
+#: ../widgets/table/e-table-field-chooser.c:80
+#: ../widgets/table/e-table-header-item.c:1907
 #: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Rubrik"
@@ -3919,9 +3934,9 @@ msgstr "Skuggning"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1069
-#: ../plugins/exchange-operations/exchange-calendar.c:232
-#: ../plugins/exchange-operations/exchange-contacts.c:217
+#: ../plugins/exchange-operations/exchange-account-setup.c:1080
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
 msgid "Size:"
 msgstr "Storlek:"
 
@@ -3971,8 +3986,8 @@ msgstr "Test av utskrift av kontakter"
 msgid "This should test the contact print code"
 msgstr "Detta bör testa koden för utskrift av kontakter"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "Kan inte öppna fil"
@@ -3985,55 +4000,55 @@ msgstr "Kunde inte hämta lista med adressböcker"
 msgid "failed to open book"
 msgstr "misslyckades med att öppna bok"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:48
 msgid "Specify the output file instead of standard output"
 msgstr "Ange utdatafilen istället för standard ut"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:50
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "OUTPUTFILE"
 msgstr "UTDATAFIL"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "List local address book folders"
 msgstr "Lista lokala adressboksmappar"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "Show cards as vcard or csv file"
 msgstr "Visa kort som vcard- eller csv-fil"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Export in asynchronous mode"
 msgstr "Exportera i asynkront läge"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "The number of cards in one output file in asynchronous mode, default size 100."
 msgstr "Antalet kort i en utdatafil i asynkront läge, standardstorlek är 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "NUMBER"
 msgstr "TAL"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:102
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "Fel i kommandoradsargument, använd flaggan --help för att se användningen."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "Stöd endast csv- eller vcard-format."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "Utdatan måste vara en fil i asynkront läge."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "Storleksflaggan behövs inte i normalt läge."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:164
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "Fel som inte hanteras"
 
@@ -4116,19 +4131,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Är du säker på att du vill ta bort detta möte?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:178
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Är du säker på att du vill ta bort detta sammanträde?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:184
+#: ../calendar/gui/dialogs/delete-comp.c:188
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Är du säker på att du vill ta bort detta memo?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:181
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Är du säker på att du vill ta bort denna uppgift?"
@@ -4220,206 +4235,218 @@ msgid "If you do not send a cancelation notice, the other participants may not k
 msgstr "Om du inte skickar ett avbokningsmeddelande kan det hända att de andra deltagarna inte vet om att uppgiften är borttagen."
 
 #: ../calendar/calendar.error.xml.h:45
+msgid "Save Appointment"
+msgstr "Spara möte"
+
+#: ../calendar/calendar.error.xml.h:46
+msgid "Save Memo"
+msgstr "Spara memo"
+
+#: ../calendar/calendar.error.xml.h:47
+msgid "Save Task"
+msgstr "Spara uppgift"
+
+#: ../calendar/calendar.error.xml.h:48
 msgid "Sending updated information allows other participants to keep their calendars up to date."
 msgstr "Att skicka uppdaterad information möjliggör för andra deltagare att hålla sina kalendrar uppdaterade."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Sending updated information allows other participants to keep their task lists up to date."
 msgstr "Att skicka uppdaterad information möjliggör för andra deltagare att hålla sina uppgiftslistor uppdaterade."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:51
 msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
 msgstr "Det finns några bilagor som hämtas. Att spara mötet kommer att göra att mötet sparas utan dessa kvarvarande bilagor."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:52
 msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
 msgstr "Det finns några bilagor som hämtas. Att spara uppgiften kommer att göra att uppgiften sparas utan dessa kvarvarande bilagor."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:53
 msgid "Some features may not work properly with your current server."
 msgstr "En del funktioner kanske inte fungerar korrekt med din nuvarande server."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution-kalendern har oväntat avslutats."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution-memot har oväntat avslutats."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution-uppgifterna har oväntat avslutats."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalendern är inte markerad för frånkopplad användning."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:58
 msgid "The memo list is not marked for offline usage."
 msgstr "Memolistan är inte markerad för frånkopplad användning."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:59
 msgid "The task list is not marked for offline usage."
 msgstr "Uppgiftslistan är inte markerad för frånkopplad användning."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:60
 msgid "This calendar will be removed permanently."
 msgstr "Denna kalender kommer att tas bort permanent."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:61
 msgid "This memo list will be removed permanently."
 msgstr "Denna memolista kommer att tas bort permanent."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:62
 msgid "This task list will be removed permanently."
 msgstr "Denna uppgiftslista kommer att tas bort permanent."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Vill du spara dina ändringar i detta möte?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "Vill du spara dina ändringar i detta memo?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "Vill du spara dina ändringar i denna uppgift?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Vill du skicka ett avbokningsmeddelande för detta memo?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Vill du skicka ett avbokningsmeddelande till alla deltagare?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Vill du skicka ut sammanträdesinbjudningar till deltagarna?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "Vill du skicka denna uppgift till deltagarna?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Vill du skicka uppdaterad sammanträdesinformation till deltagarna?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr "Vill du skicka uppdaterad uppgiftsinformation till deltagarna?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:72
 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 "Du ansluter till en GroupWise-server som inte stöds och kan råka ut för problem vid användningen av Evolution. För bästa resultat bör servern uppgraderas till en version som stöds."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Du har gjort ändringar i detta möte, men inte sparat dem än."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "Du har gjort ändringar i denna uppgift, men inte sparat dem än."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Du har gjort ändringar i detta memo, men inte sparat dem än."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Dina kalendrar kommer inte att vara tillgängliga förrän Evolution har startats om."
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Dina memon kommer inte att vara tillgängliga förrän Evolution har startats om."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Dina uppgifter kommer inte att vara tillgängliga förrän Evolution har startats om."
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:79
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
-msgstr "_Förkasta ändringar"
+msgstr "Förkasta _ändringar"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:80
 #: ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_Spara"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "_Spara ändringar"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:82
 #: ../composer/mail-composer.error.xml.h:34
 #: ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Skicka"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "_Skicka meddelande"
 
 # Vad är detta?
 # http://bugzilla.ximian.com/show_bug.cgi?id=61062
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:84
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:256
+#: ../calendar/conduits/calendar/calendar-conduit.c:258
 msgid "Split Multi-Day Events:"
 msgstr "Delade flerdagsevenemang:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1521
-#: ../calendar/conduits/calendar/calendar-conduit.c:1522
-#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/calendar/calendar-conduit.c:1523
+#: ../calendar/conduits/calendar/calendar-conduit.c:1524
 #: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/memo/memo-conduit.c:822
 #: ../calendar/conduits/todo/todo-conduit.c:1019
+#: ../calendar/conduits/todo/todo-conduit.c:1020
 msgid "Could not start evolution-data-server"
 msgstr "Kunde inte starta evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1629
-#: ../calendar/conduits/calendar/calendar-conduit.c:1632
+#: ../calendar/conduits/calendar/calendar-conduit.c:1631
+#: ../calendar/conduits/calendar/calendar-conduit.c:1634
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunde inte läsa pilotens kalenderprogramblock"
 
-#: ../calendar/conduits/memo/memo-conduit.c:914
-#: ../calendar/conduits/memo/memo-conduit.c:917
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "Kunde inte läsa pilotens memo-programblock"
 
-#: ../calendar/conduits/memo/memo-conduit.c:961
-#: ../calendar/conduits/memo/memo-conduit.c:964
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "Kunde inte skriva pilotens memo-programblock"
 
-#: ../calendar/conduits/todo/todo-conduit.c:240
+#: ../calendar/conduits/todo/todo-conduit.c:241
 msgid "Default Priority:"
 msgstr "Standardprioritet:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1102
-#: ../calendar/conduits/todo/todo-conduit.c:1105
+#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1106
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunde inte läsa pilotens att-göra-programblock"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1147
-#: ../calendar/conduits/todo/todo-conduit.c:1150
+#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1151
 msgid "Could not write pilot's ToDo application block"
 msgstr "Kunde inte skriva pilotens att-göra-programblock"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2432
 msgid "Calendar and Tasks"
 msgstr "Kalender och uppgifter"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:805
-#: ../calendar/gui/calendar-component.c:1402
+#: ../calendar/gui/calendar-component.c:832
+#: ../calendar/gui/calendar-component.c:1429
 msgid "Calendars"
 msgstr "Kalendrar"
 
@@ -4460,28 +4487,28 @@ msgid "Memo_s"
 msgstr "Mem_o"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280
+#: ../calendar/gui/e-memo-table.c:279
 #: ../calendar/gui/e-memos.c:1120
 #: ../calendar/gui/gnome-cal.c:1774
-#: ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101
+#: ../calendar/gui/memos-component.c:575
+#: ../calendar/gui/memos-component.c:1128
 #: ../calendar/gui/memos-control.c:354
 #: ../calendar/gui/memos-control.c:370
 msgid "Memos"
 msgstr "Memon"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:704
+#: ../calendar/gui/e-calendar-table.c:703
 #: ../calendar/gui/e-tasks.c:1429
 #: ../calendar/gui/gnome-cal.c:1642
-#: ../calendar/gui/print.c:1982
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090
+#: ../calendar/gui/print.c:1984
+#: ../calendar/gui/tasks-component.c:566
+#: ../calendar/gui/tasks-component.c:1117
 #: ../calendar/gui/tasks-control.c:492
 #: ../calendar/gui/tasks-control.c:508
-#: ../calendar/importers/icalendar-importer.c:74
-#: ../calendar/importers/icalendar-importer.c:735
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:588
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
@@ -4533,8 +4560,8 @@ msgstr "Möten"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1603
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1609
 #: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
@@ -4545,10 +4572,10 @@ msgid "Snooze _time:"
 msgstr "Slumringsti_d:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+#: ../calendar/gui/dialogs/comp-editor.c:1336
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:169
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51
@@ -4569,32 +4596,32 @@ msgstr "_Slumra"
 msgid "location of appointment"
 msgstr "platsen för mötet"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1461
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
 msgid "No summary available."
 msgstr "Ingen sammanfattning finns tillgänglig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
 msgid "No description available."
 msgstr "Ingen beskrivning finns tillgänglig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1480
 msgid "No location information available."
 msgstr "Ingen platsinformation finns tillgänglig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1525
 #, c-format
 msgid "You have %d alarms"
 msgstr "Du har %d alarm"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
+#: ../mail/mail-component.c:1596
 msgid "Warning"
 msgstr "Varning"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1691
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4606,7 +4633,7 @@ msgstr ""
 "konfigurerad att skicka e-post. Evolution kommer att\n"
 "visa en normal dialogruta istället."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1721
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
@@ -4622,15 +4649,15 @@ msgstr ""
 "\n"
 "Är du säker på att du vill köra detta program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
 msgid "Do not ask me about this program again."
 msgstr "Fråga mig inte om detta program igen."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:138
+#: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
 msgstr "Kunde inte initiera Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:154
 msgid "Could not create the alarm notify service factory, maybe it's already running..."
 msgstr "Kunde inte skapa fabriken för alarmnotifieringstjänsten, kanske är den redan igång..."
 
@@ -4640,7 +4667,7 @@ msgstr "ogiltig tid"
 
 #. 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:404
+#: ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -4650,7 +4677,7 @@ msgstr[1] "%d timmar"
 
 #. 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:410
+#: ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -4662,7 +4689,7 @@ msgstr[1] "%d minuter"
 #. 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:416
+#: ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -4930,7 +4957,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "Tid som senaste alarmet körde, i time_t."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:107
+#: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Tidszon"
 
@@ -5075,61 +5102,61 @@ msgstr "Minut som arbetsdagen börjar"
 msgid "daylight savings time"
 msgstr "sommartid"
 
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "Sammanfattningen innehåller"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "Beskrivningen innehåller"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "Kategori är"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "Kommentaren innehåller"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
 msgid "Location contains"
 msgstr "Platsen innehåller"
 
-#: ../calendar/gui/cal-search-bar.c:629
-#: ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
+#: ../calendar/gui/cal-search-bar.c:632
+#: ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
 msgid "Unmatched"
 msgstr "Omatchade"
 
-#: ../calendar/gui/cal-search-bar.c:637
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Next 7 Days' Tasks"
 msgstr "Uppgifter de närmsta 7 dagarna"
 
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Active Tasks"
 msgstr "Aktiva uppgifter"
 
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Overdue Tasks"
 msgstr "Uppgifter som skulle ha genomförts"
 
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Completed Tasks"
 msgstr "Färdiga uppgifter"
 
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:656
 msgid "Tasks with Attachments"
 msgstr "Uppgifter med bilagor"
 
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Active Appointments"
 msgstr "Aktiva möten"
 
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:706
 msgid "Next 7 Days' Appointments"
 msgstr "Möten de närmsta 7 dagarna"
 
-#: ../calendar/gui/calendar-commands.c:92
+#: ../calendar/gui/calendar-commands.c:93
 #: ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20
 #: ../ui/evolution-mail-message.xml.h:75
@@ -5138,15 +5165,15 @@ msgstr "Möten de närmsta 7 dagarna"
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../calendar/gui/calendar-commands.c:317
+#: ../calendar/gui/calendar-commands.c:318
 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 "Denna åtgärd kommer att permanent ta bort alla evenemang äldre än den valda mängden tid. Om du fortsätter kommer du inte att kunna återställa dessa evenemang."
 
-#: ../calendar/gui/calendar-commands.c:323
+#: ../calendar/gui/calendar-commands.c:324
 msgid "Purge events older than"
 msgstr "Töm evenemang äldre än"
 
-#: ../calendar/gui/calendar-commands.c:328
+#: ../calendar/gui/calendar-commands.c:329
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
 #: ../filter/filter.glade.h:14
 #: ../plugins/calendar-http/calendar-http.c:281
@@ -5181,83 +5208,95 @@ msgstr "Födelsedagar och jubileum"
 msgid "Weather"
 msgstr "Väder"
 
-#: ../calendar/gui/calendar-component.c:615
+#: ../calendar/gui/calendar-component.c:640
 msgid "_New Calendar"
 msgstr "_Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:616
-#: ../calendar/gui/memos-component.c:465
-#: ../calendar/gui/tasks-component.c:456
+#: ../calendar/gui/calendar-component.c:641
+#: ../calendar/gui/memos-component.c:490
+#: ../calendar/gui/tasks-component.c:481
 #: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Kopiera..."
 
-#: ../calendar/gui/calendar-component.c:949
+#: ../calendar/gui/calendar-component.c:645
+#: ../calendar/gui/memos-component.c:494
+#: ../calendar/gui/tasks-component.c:485
+msgid "_Make available for offline use"
+msgstr "_Gör tillgänglig för användning i frånkopplat läge"
+
+#: ../calendar/gui/calendar-component.c:646
+#: ../calendar/gui/memos-component.c:495
+#: ../calendar/gui/tasks-component.c:486
+msgid "_Do not make available for offline use"
+msgstr "Gör _inte tillgänglig i frånkopplat läge"
+
+#: ../calendar/gui/calendar-component.c:976
 msgid "Failed upgrading calendars."
 msgstr "Misslyckades med att uppgradera kalendrar."
 
-#: ../calendar/gui/calendar-component.c:1248
+#: ../calendar/gui/calendar-component.c:1275
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Kan inte öppna kalendern \"%s\" för skapande av evenemang och sammanträden"
 
-#: ../calendar/gui/calendar-component.c:1264
+#: ../calendar/gui/calendar-component.c:1291
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Det finns ingen kalender tillgänglig för skapande av evenemang och sammanträden"
 
-#: ../calendar/gui/calendar-component.c:1377
+#: ../calendar/gui/calendar-component.c:1404
 msgid "Calendar Source Selector"
 msgstr "Väljare för kalenderkälla"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1623
 msgid "New appointment"
 msgstr "Nytt möte"
 
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1624
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Möte"
 
-#: ../calendar/gui/calendar-component.c:1598
+#: ../calendar/gui/calendar-component.c:1625
 msgid "Create a new appointment"
 msgstr "Skapa ett nytt möte"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1631
 msgid "New meeting"
 msgstr "Nytt sammanträde"
 
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1632
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Sammanträde"
 
-#: ../calendar/gui/calendar-component.c:1606
+#: ../calendar/gui/calendar-component.c:1633
 msgid "Create a new meeting request"
 msgstr "Skapa en ny sammanträdesbegäran"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1639
 msgid "New all day appointment"
 msgstr "Nytt heldagsmöte"
 
-#: ../calendar/gui/calendar-component.c:1613
+#: ../calendar/gui/calendar-component.c:1640
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Hel_dagsmöte"
 
-#: ../calendar/gui/calendar-component.c:1614
+#: ../calendar/gui/calendar-component.c:1641
 msgid "Create a new all-day appointment"
 msgstr "Skapa ett nytt heldagsmöte"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1647
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:1621
+#: ../calendar/gui/calendar-component.c:1648
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: ../calendar/gui/calendar-component.c:1622
+#: ../calendar/gui/calendar-component.c:1649
 msgid "Create a new calendar"
 msgstr "Skapa en ny kalender"
 
@@ -5286,7 +5325,7 @@ msgstr "Alla fält"
 #: ../calendar/gui/caltypes.xml.h:4
 #: ../calendar/gui/memotypes.xml.h:4
 #: ../calendar/gui/tasktypes.xml.h:6
-#: ../mail/em-filter-i18n.h:5
+#: ../mail/em-filter-i18n.h:21
 msgid "Attachments"
 msgstr "Bilagor"
 
@@ -5323,7 +5362,7 @@ msgstr "Konkurrans"
 #: ../calendar/gui/caltypes.xml.h:11
 #: ../calendar/gui/e-cal-list-view.c:250
 #: ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:547
+#: ../calendar/gui/e-calendar-table.c:546
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Confidential"
 msgstr "Konfidentiellt"
@@ -5345,14 +5384,14 @@ msgstr "Beskrivningen innehåller"
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/memotypes.xml.h:13
 #: ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:38
 msgid "Do Not Exist"
 msgstr "finns inte"
 
 #: ../calendar/gui/caltypes.xml.h:15
 #: ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:17
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:41
 msgid "Exist"
 msgstr "finns"
 
@@ -5438,7 +5477,7 @@ msgstr "Telefonsamtal"
 #: ../calendar/gui/caltypes.xml.h:31
 #: ../calendar/gui/e-cal-list-view.c:249
 #: ../calendar/gui/e-cal-model.c:346
-#: ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/e-calendar-table.c:545
 #: ../calendar/gui/memotypes.xml.h:29
 msgid "Private"
 msgstr "Privat"
@@ -5447,7 +5486,7 @@ msgstr "Privat"
 #: ../calendar/gui/e-cal-list-view.c:248
 #: ../calendar/gui/e-cal-model.c:337
 #: ../calendar/gui/e-cal-model.c:344
-#: ../calendar/gui/e-calendar-table.c:545
+#: ../calendar/gui/e-calendar-table.c:544
 #: ../calendar/gui/memotypes.xml.h:30
 msgid "Public"
 msgstr "Publikt"
@@ -5463,7 +5502,7 @@ msgstr "Upprepning"
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/memotypes.xml.h:31
 #: ../calendar/gui/tasktypes.xml.h:38
-#: ../mail/em-filter-i18n.h:70
+#: ../mail/em-filter-i18n.h:86
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Status"
@@ -5480,7 +5519,7 @@ msgstr "Strategier"
 #: ../calendar/gui/e-memo-table.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:33
 #: ../calendar/gui/tasktypes.xml.h:40
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "Sammanfattning"
 
@@ -5517,45 +5556,45 @@ msgstr "Väntar"
 #: ../calendar/gui/caltypes.xml.h:42
 #: ../calendar/gui/memotypes.xml.h:39
 #: ../calendar/gui/tasktypes.xml.h:47
-#: ../mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:26
 msgid "contains"
 msgstr "innehåller"
 
 #: ../calendar/gui/caltypes.xml.h:43
 #: ../calendar/gui/memotypes.xml.h:40
 #: ../calendar/gui/tasktypes.xml.h:48
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:32
 msgid "does not contain"
 msgstr "innehåller inte"
 
 #: ../calendar/gui/caltypes.xml.h:44
 #: ../calendar/gui/memotypes.xml.h:41
 #: ../calendar/gui/tasktypes.xml.h:49
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:46
 msgid "is"
 msgstr "är"
 
 #: ../calendar/gui/caltypes.xml.h:45
 #: ../calendar/gui/memotypes.xml.h:42
 #: ../calendar/gui/tasktypes.xml.h:52
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:52
 msgid "is not"
 msgstr "är inte"
 
-#: ../calendar/gui/comp-editor-factory.c:405
+#: ../calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Fel vid öppnande av kalendern"
 
-#: ../calendar/gui/comp-editor-factory.c:411
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Method not supported when opening the calendar"
 msgstr "Metoden stöds inte vid öppnande av kalendern"
 
-#: ../calendar/gui/comp-editor-factory.c:417
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Permission denied to open the calendar"
 msgstr "Åtkomst nekas för öppnande av kalendern"
 
-#: ../calendar/gui/comp-editor-factory.c:429
-#: ../shell/e-shell.c:1308
+#: ../calendar/gui/comp-editor-factory.c:433
+#: ../shell/e-shell.c:1272
 msgid "Unknown error"
 msgstr "Okänt fel"
 
@@ -5592,17 +5631,17 @@ msgid "Mes_sage:"
 msgstr "Me_ddelande:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Spela ett ljud"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Visa en varning"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Kör ett program"
 
@@ -5615,7 +5654,7 @@ msgid "Send To:"
 msgstr "Skicka till:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Skicka e-post"
 
@@ -5693,7 +5732,7 @@ msgstr "_Föreslå automatisk visning av bilaga"
 msgid "Attach file(s)"
 msgstr "Bifoga fil(er)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:484
 msgid "Selected Calendars for Alarms"
 msgstr "Markerade kalendrar för alarm"
 
@@ -5758,7 +5797,7 @@ msgid "Display"
 msgstr "Visning"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "fredag"
@@ -5774,7 +5813,7 @@ msgstr ""
 "dagar"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "måndag"
@@ -5808,7 +5847,7 @@ msgid "S_un"
 msgstr "_sön"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "lördag"
@@ -5826,7 +5865,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Visa v_eckonummer i datumbläddraren"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "söndag"
@@ -5845,7 +5884,7 @@ msgid "Template:"
 msgstr "Mall:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "torsdag"
@@ -5860,13 +5899,13 @@ msgid "Time format:"
 msgstr "Tidsformat:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "tisdag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "onsdag"
@@ -5945,94 +5984,94 @@ msgstr "_ons"
 msgid "before every appointment"
 msgstr "före varje möte"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Kopie_ra kalenderinnehåll lokalt för frånkopplad användning"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Kopie_ra innehåll i uppgiftslista lokalt för frånkopplad användning"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:275
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Kopie_ra innehåll i memolista lokalt för frånkopplad användning"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:345
 msgid "Colo_r:"
 msgstr "F_ärg:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Task List"
 msgstr "Uppgiftslista"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 msgid "Memo List"
 msgstr "Memolista"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "Calendar Properties"
 msgstr "Egenskaper för kalendern"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "Task List Properties"
 msgstr "Egenskaper för uppgiftslistan"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "New Task List"
 msgstr "Ny uppgiftslista"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "Memo List Properties"
 msgstr "Egenskaper för uppgiftslista"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "New Memo List"
 msgstr "Ny memolista"
 
-#: ../calendar/gui/dialogs/changed-comp.c:56
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Detta evenemang har tagits bort."
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Denna uppgift har tagits bort."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This memo has been deleted."
 msgstr "Detta memo har tagits bort."
 
-#: ../calendar/gui/dialogs/changed-comp.c:73
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Du har gjort ändringar. Glöm dessa ändringar och stäng redigeraren?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Du har inte gjort några ändringar, stäng redigeraren?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Detta evenemang har ändrats."
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Denna uppgift har ändrats."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This memo has been changed."
 msgstr "Detta memo har ändrats."
 
-#: ../calendar/gui/dialogs/changed-comp.c:97
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Du har gjort ändringar. Glöm dessa ändringar och uppdatera redigeraren?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har inte gjort några ändringar, uppdatera redigeraren?"
@@ -6043,161 +6082,161 @@ msgid "Validation error: %s"
 msgstr "Valideringsfel: %s"
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:186
-#: ../calendar/gui/print.c:2356
+#: ../calendar/gui/print.c:2358
 msgid " to "
 msgstr " till "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:190
-#: ../calendar/gui/print.c:2360
+#: ../calendar/gui/print.c:2362
 msgid " (Completed "
 msgstr " (Färdigt "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:192
-#: ../calendar/gui/print.c:2362
+#: ../calendar/gui/print.c:2364
 msgid "Completed "
 msgstr "Färdigt "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:197
-#: ../calendar/gui/print.c:2367
+#: ../calendar/gui/print.c:2369
 msgid " (Due "
 msgstr " (Ska genomföras "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:199
-#: ../calendar/gui/print.c:2369
+#: ../calendar/gui/print.c:2371
 msgid "Due "
 msgstr "Ska genomföras "
 
-#: ../calendar/gui/dialogs/comp-editor.c:232
+#: ../calendar/gui/dialogs/comp-editor.c:236
 #, c-format
 msgid "Attached message - %s"
 msgstr "Bifogat meddelande - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410
-#: ../composer/e-msg-composer.c:1769
-#: ../composer/e-msg-composer.c:1988
+#: ../calendar/gui/dialogs/comp-editor.c:241
+#: ../calendar/gui/dialogs/comp-editor.c:414
+#: ../composer/e-msg-composer.c:1766
+#: ../composer/e-msg-composer.c:1985
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Bifogat meddelande"
 msgstr[1] "%d bifogade meddelanden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481
-#: ../composer/e-msg-composer.c:2056
+#: ../calendar/gui/dialogs/comp-editor.c:485
+#: ../composer/e-msg-composer.c:2053
 #: ../mail/em-folder-tree.c:1006
 #: ../mail/em-folder-utils.c:364
 #: ../mail/em-folder-view.c:1186
-#: ../mail/message-list.c:2045
+#: ../mail/message-list.c:2107
 msgid "_Move"
 msgstr "_Flytta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483
-#: ../composer/e-msg-composer.c:2058
+#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../composer/e-msg-composer.c:2055
 #: ../mail/em-folder-tree.c:1008
-#: ../mail/message-list.c:2047
+#: ../mail/message-list.c:2109
 msgid "Cancel _Drag"
 msgstr "Avbryt _dragning"
 
-#: ../calendar/gui/dialogs/comp-editor.c:616
-#: ../calendar/gui/dialogs/comp-editor.c:3249
-#: ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:3257
+#: ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "bilaga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:842
+#: ../calendar/gui/dialogs/comp-editor.c:846
 msgid "Could not update object"
 msgstr "Kunde inte uppdatera objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:934
 msgid "Edit Appointment"
 msgstr "Redigera möte"
 
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:941
 #, c-format
 msgid "Meeting - %s"
 msgstr "Sammanträde - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:943
 #, c-format
 msgid "Appointment - %s"
 msgstr "Möte - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:949
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tilldelad uppgift - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:956
 #, c-format
 msgid "Memo - %s"
 msgstr "Memo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:972
 msgid "No Summary"
 msgstr "Ingen sammanfattning"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1266
 msgid "Click here to close the current window"
 msgstr "Klicka här för att stänga aktuellt fönster"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
+#: ../calendar/gui/dialogs/comp-editor.c:1273
 msgid "Copy selected text to the clipboard"
 msgstr "Kopiera markerad text till urklipp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1280
 msgid "Cut selected text to the clipboard"
 msgstr "Klipp ut markerad text till urklipp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1287
 msgid "Click here to view help available"
 msgstr "Klicka här för att visa tillgänglig hjälp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1294
 msgid "Paste text from the clipboard"
 msgstr "Klistra in text från urklipp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1315
 msgid "Click here to save the current window"
 msgstr "Klicka här för att spara aktuellt fönster"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1322
 msgid "Select all text"
 msgstr "Markera all text"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1329
 msgid "_Classification"
 msgstr "_Klassifikation"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1343
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Arkiv"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../calendar/gui/dialogs/comp-editor.c:1350
 #: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1357
 msgid "_Insert"
 msgstr "_Infoga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1364
 msgid "_Options"
 msgstr "_Alternativ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367
+#: ../calendar/gui/dialogs/comp-editor.c:1371
 #: ../mail/em-folder-tree.c:2098
 #: ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-mail-global.xml.h:34
@@ -6207,212 +6246,212 @@ msgstr "_Alternativ"
 msgid "_View"
 msgstr "_Visa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../calendar/gui/dialogs/comp-editor.c:1381
 #: ../composer/e-composer-actions.c:471
 msgid "_Attachment..."
 msgstr "_Bilaga..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1383
 msgid "Click here to attach a file"
 msgstr "Klicka här för att bifoga en fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1391
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1393
 msgid "Toggles whether to display categories"
 msgstr "Växlar huruvida kategorier ska visas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1399
 msgid "Time _Zone"
 msgstr "Tids_zon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1401
 msgid "Toggles whether the time zone is displayed"
 msgstr "Växlar huruvida tidszonen ska visas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "Pu_blic"
 msgstr "Pu_blikt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1408
+#: ../calendar/gui/dialogs/comp-editor.c:1412
 msgid "Classify as public"
 msgstr "Klassificera som publik"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1413
+#: ../calendar/gui/dialogs/comp-editor.c:1417
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1415
+#: ../calendar/gui/dialogs/comp-editor.c:1419
 msgid "Classify as private"
 msgstr "Klassificera som privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1424
 msgid "_Confidential"
 msgstr "_Konfidentiellt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1426
 msgid "Classify as confidential"
 msgstr "Klassificera som konfidentiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1434
 msgid "R_ole Field"
 msgstr "_Rollfältet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1432
+#: ../calendar/gui/dialogs/comp-editor.c:1436
 msgid "Toggles whether the Role field is displayed"
 msgstr "Växlar huruvida rollfältet ska visas"
 
 # RSVP borde kanske förklaras med en kommentar?
 # http://bugzilla.ximian.com/show_bug.cgi?id=61071
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1442
 msgid "_RSVP"
 msgstr "_OSA"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1440
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Växlar huruvida OSA-fältet ska visas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1450
 msgid "_Status Field"
 msgstr "_Statusfält"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1448
+#: ../calendar/gui/dialogs/comp-editor.c:1452
 msgid "Toggles whether the Status field is displayed"
 msgstr "Växlar huruvida statusfältet ska visas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1458
 msgid "_Type Field"
 msgstr "_Typfält"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1460
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Växlar huruvida Deltagartyp ska visas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1766
-#: ../composer/e-composer-private.c:65
+#: ../calendar/gui/dialogs/comp-editor.c:1774
+#: ../composer/e-composer-private.c:66
 #: ../widgets/misc/e-attachment-bar.c:1381
 msgid "Recent _Documents"
 msgstr "Senaste _dokument"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../calendar/gui/dialogs/comp-editor.c:1793
 #: ../composer/e-composer-actions.c:699
 msgid "Attach"
 msgstr "Bifoga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1880
+#: ../calendar/gui/dialogs/comp-editor.c:1888
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> bilaga"
 msgstr[1] "<b>%d</b> bilagor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1912
+#: ../calendar/gui/dialogs/comp-editor.c:1920
 msgid "Hide Attachment _Bar"
 msgstr "Dölj _bilageraden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:1923
+#: ../calendar/gui/dialogs/comp-editor.c:2231
 msgid "Show Attachment _Bar"
 msgstr "Visa _bilageraden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/event-page.c:1871
-#: ../calendar/gui/dialogs/task-page.c:1193
-#: ../composer/e-msg-composer.c:1043
+#: ../calendar/gui/dialogs/comp-editor.c:2042
+#: ../calendar/gui/dialogs/event-page.c:1875
+#: ../calendar/gui/dialogs/task-page.c:1197
+#: ../composer/e-msg-composer.c:1040
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:2045
+#: ../composer/e-msg-composer.c:1043
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Lägg till bilaga..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../calendar/gui/dialogs/comp-editor.c:2253
 #: ../mail/em-format-html-display.c:2201
 msgid "Show Attachments"
 msgstr "Visa bilagor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:2254
 msgid "Press space key to toggle attachment bar"
 msgstr "Tryck på blankstegstangenten för att växla bilageraden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2390
-#: ../calendar/gui/dialogs/comp-editor.c:2437
-#: ../calendar/gui/dialogs/comp-editor.c:3282
+#: ../calendar/gui/dialogs/comp-editor.c:2398
+#: ../calendar/gui/dialogs/comp-editor.c:2445
+#: ../calendar/gui/dialogs/comp-editor.c:3290
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Ändringar som görs i detta objekt kan komma att kastas om en uppdatering kommer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3311
+#: ../calendar/gui/dialogs/comp-editor.c:3319
 msgid "Unable to use current version!"
 msgstr "Kan inte använda aktuell version!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:60
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 msgid "Could not open source"
 msgstr "Kunde inte uppdatera källa"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:68
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
 msgstr "Kunde inte öppna mål"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:77
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr "Målet är skrivskyddat"
 
-#: ../calendar/gui/dialogs/delete-comp.c:201
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Ta bort detta objekt från alla andra mottagares brevlådor?"
 
-#: ../calendar/gui/dialogs/delete-error.c:52
+#: ../calendar/gui/dialogs/delete-error.c:56
 msgid "The event could not be deleted due to a corba error"
 msgstr "Evenemanget kunde inte tas bort på grund av ett corba-fel"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:59
 msgid "The task could not be deleted due to a corba error"
 msgstr "Uppgiften kunde inte tas bort på grund av ett corba-fel"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
+#: ../calendar/gui/dialogs/delete-error.c:62
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Memot kunde inte tas bort på grund av ett corba-fel"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:65
 msgid "The item could not be deleted due to a corba error"
 msgstr "Objektet kunde inte tas bort på grund av ett corba-fel"
 
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:72
 msgid "The event could not be deleted because permission was denied"
 msgstr "Evenemanget kunde inte tas bort på grund av att åtkomst nekades"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The task could not be deleted because permission was denied"
 msgstr "Uppgiften kunde inte tas bort på grund av att åtkomst nekades"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Memot kunde inte tas bort på grund av åtkomst nekades"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The item could not be deleted because permission was denied"
 msgstr "Objektet kunde inte tas bort på grund av åtkomst nekades"
 
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:88
 msgid "The event could not be deleted due to an error"
 msgstr "Evenemanget kunde inte tas bort på grund av ett fel"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
+#: ../calendar/gui/dialogs/delete-error.c:91
 msgid "The task could not be deleted due to an error"
 msgstr "Uppgiften kunde inte tas bort på grund av ett fel"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
+#: ../calendar/gui/dialogs/delete-error.c:94
 msgid "The memo could not be deleted due to an error"
 msgstr "Memot kunde inte tas bort på grund av ett fel"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:97
 msgid "The item could not be deleted due to an error"
 msgstr "Objektet kunde inte tas bort på grund av ett fel"
 
@@ -6447,6 +6486,7 @@ msgstr "Gör detta till ett återkommande evenemang"
 
 #: ../calendar/gui/dialogs/event-editor.c:210
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "Alternativ för sändning"
@@ -6484,129 +6524,129 @@ msgstr "Fråga efter ledig-/upptageninformation för deltagarna"
 msgid "Appoint_ment"
 msgstr "_Möte"
 
-#: ../calendar/gui/dialogs/event-page.c:731
-#: ../calendar/gui/dialogs/event-page.c:2714
+#: ../calendar/gui/dialogs/event-page.c:735
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "Detta evenemang har alarm"
 
-#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.c:798
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisatör:"
 
-#: ../calendar/gui/dialogs/event-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:844
 msgid "_Delegatees"
 msgstr "_Delegater"
 
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:846
 msgid "Atte_ndees"
 msgstr "Delta_gare"
 
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no start date"
 msgstr "Evenemang utan startdatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1033
 msgid "Event with no end date"
 msgstr "Evenemang utan slutdatum"
 
-#: ../calendar/gui/dialogs/event-page.c:1198
-#: ../calendar/gui/dialogs/memo-page.c:636
-#: ../calendar/gui/dialogs/task-page.c:808
+#: ../calendar/gui/dialogs/event-page.c:1202
+#: ../calendar/gui/dialogs/memo-page.c:640
+#: ../calendar/gui/dialogs/task-page.c:812
 msgid "Start date is wrong"
 msgstr "Startdatumet är fel"
 
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1212
 msgid "End date is wrong"
 msgstr "Slutdatumet är fel"
 
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1235
 msgid "Start time is wrong"
 msgstr "Starttiden är fel"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1242
 msgid "End time is wrong"
 msgstr "Sluttiden är fel"
 
-#: ../calendar/gui/dialogs/event-page.c:1401
-#: ../calendar/gui/dialogs/memo-page.c:677
-#: ../calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/event-page.c:1405
+#: ../calendar/gui/dialogs/memo-page.c:681
+#: ../calendar/gui/dialogs/task-page.c:872
 msgid "The organizer selected no longer has an account."
 msgstr "Organisatören som valts har inte längre ett konto."
 
-#: ../calendar/gui/dialogs/event-page.c:1407
-#: ../calendar/gui/dialogs/memo-page.c:683
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1411
+#: ../calendar/gui/dialogs/memo-page.c:687
+#: ../calendar/gui/dialogs/task-page.c:878
 msgid "An organizer is required."
 msgstr "En organisatör krävs."
 
-#: ../calendar/gui/dialogs/event-page.c:1432
-#: ../calendar/gui/dialogs/task-page.c:898
+#: ../calendar/gui/dialogs/event-page.c:1436
+#: ../calendar/gui/dialogs/task-page.c:902
 msgid "At least one attendee is required."
 msgstr "Det måste finnas åtminstone en deltagare."
 
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1194
+#: ../calendar/gui/dialogs/event-page.c:1876
+#: ../calendar/gui/dialogs/task-page.c:1198
 msgid "_Add "
 msgstr "_Lägg till "
 
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2594
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kan inte öppna kalendern \"%s\"."
 
-#: ../calendar/gui/dialogs/event-page.c:2634
-#: ../calendar/gui/dialogs/memo-page.c:886
-#: ../calendar/gui/dialogs/task-page.c:1793
+#: ../calendar/gui/dialogs/event-page.c:2638
+#: ../calendar/gui/dialogs/memo-page.c:890
+#: ../calendar/gui/dialogs/task-page.c:1797
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Du arbetar på uppdrag av %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2918
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag före möte"
 msgstr[1] "%d dagar före möte"
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d timme före möte"
 msgstr[1] "%d timmar före möte"
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minut före möte"
 msgstr[1] "%d minuter före möte"
 
-#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/event-page.c:2943
 msgid "Customize"
 msgstr "Anpassa"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2944
+#: ../calendar/gui/dialogs/event-page.c:2948
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:669
+#: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-itip-control.c:1158
-#: ../filter/filter-rule.c:944
-#: ../mail/em-account-editor.c:685
-#: ../mail/em-account-editor.c:1409
+#: ../filter/filter-rule.c:945
+#: ../mail/em-account-editor.c:684
+#: ../mail/em-account-editor.c:1408
 #: ../mail/em-account-prefs.c:438
 #: ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
+#: ../plugins/exchange-operations/exchange-delegates-user.c:195
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
+#: ../plugins/itip-formatter/itip-formatter.c:2088
 #: ../widgets/misc/e-cell-date-edit.c:306
-#: ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1731
+#: ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
 #: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "Ingen"
@@ -6687,23 +6727,23 @@ msgid "Organizer:"
 msgstr "Organisatör:"
 
 #: ../calendar/gui/dialogs/memo-editor.c:141
-#: ../calendar/gui/print.c:2476
+#: ../calendar/gui/print.c:2478
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:851
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Kan inte öppna memon i \"%s\"."
 
-#: ../calendar/gui/dialogs/memo-page.c:1002
+#: ../calendar/gui/dialogs/memo-page.c:1006
 #: ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620
 #: ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:210
 #: ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77
-#: ../mail/message-list.etspec.h:19
+#: ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Till"
 
@@ -6717,58 +6757,58 @@ msgid "T_o:"
 msgstr "T_ill:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:360
+#: ../calendar/gui/dialogs/task-page.c:364
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupp:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:50
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Du ändrar ett återkommande evenemang. Vad vill du ändra?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Du delegerar ett återkommande evenemang. Vad vill du delegera?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Du ändrar en återkommande uppgift. Vad vill du ändra?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Du ändrar ett återkommande memo. Vad vill du ändra?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:85
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This Instance Only"
 msgstr "Endast denna instans"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:93
 msgid "This and Prior Instances"
 msgstr "Denna och tidigare instanser"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:99
 msgid "This and Future Instances"
 msgstr "Denna och framtida instanser"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:104
 msgid "All Instances"
 msgstr "Alla instanser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:562
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Detta möte har upprepningsregler som inte kan redigeras med Evolution."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "Upprepningsdatumet är ogiltigt"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:930
 msgid "on"
 msgstr "vid"
 
@@ -6776,7 +6816,7 @@ msgstr "vid"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:994
 msgid "first"
 msgstr "första"
 
@@ -6786,7 +6826,7 @@ msgstr "första"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1000
 msgid "second"
 msgstr "sekund"
 
@@ -6794,7 +6834,7 @@ msgstr "sekund"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:1005
 msgid "third"
 msgstr "tredje"
 
@@ -6802,7 +6842,7 @@ msgstr "tredje"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1008
+#: ../calendar/gui/dialogs/recurrence-page.c:1010
 msgid "fourth"
 msgstr "fjärde"
 
@@ -6810,13 +6850,13 @@ msgstr "fjärde"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 msgid "last"
 msgstr "sista"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "Other Date"
 msgstr "Annat datum"
 
@@ -6824,7 +6864,7 @@ msgstr "Annat datum"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 msgid "1st to 10th"
 msgstr "Första till tionde"
 
@@ -6832,7 +6872,7 @@ msgstr "Första till tionde"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1053
+#: ../calendar/gui/dialogs/recurrence-page.c:1055
 msgid "11th to 20th"
 msgstr "elfte till tjugonde"
 
@@ -6840,45 +6880,45 @@ msgstr "elfte till tjugonde"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1061
 msgid "21st to 31st"
 msgstr "tjugoförsta till trettiförsta"
 
 #. 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:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 msgid "day"
 msgstr "dag"
 
 #. 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:1208
+#: ../calendar/gui/dialogs/recurrence-page.c:1210
 msgid "on the"
 msgstr "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1384
+#: ../calendar/gui/dialogs/recurrence-page.c:1386
 msgid "occurrences"
 msgstr "förekomster"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2087
+#: ../calendar/gui/dialogs/recurrence-page.c:2089
 msgid "Add exception"
 msgstr "Lägg till undantag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2130
 msgid "Could not get a selection to modify."
 msgstr "Kunde inte få ett val att ändra."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2134
+#: ../calendar/gui/dialogs/recurrence-page.c:2136
 msgid "Modify exception"
 msgstr "Ändra undantag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2178
+#: ../calendar/gui/dialogs/recurrence-page.c:2180
 msgid "Could not get a selection to delete."
 msgstr "Kunde inte få ett val att ta bort."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2304
 msgid "Date/Time"
 msgstr "Datum/tid"
 
@@ -6950,62 +6990,62 @@ msgstr "<span weight=\"bold\">Status</span>"
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
 #: ../calendar/gui/e-cal-component-preview.c:253
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:642
+#: ../calendar/gui/e-cal-model-tasks.c:362
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:641
 #: ../calendar/gui/e-itip-control.c:946
 #: ../calendar/gui/e-meeting-store.c:181
 #: ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2552
+#: ../calendar/gui/print.c:2554
 #: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Färdigt"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/e-calendar-table.c:566
 #: ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "High"
 msgstr "Hög"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:356
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:641
-#: ../calendar/gui/print.c:2549
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-cal-model-tasks.c:754
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:640
+#: ../calendar/gui/print.c:2551
 msgid "In Progress"
 msgstr "Pågår"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:569
+#: ../calendar/gui/e-calendar-table.c:568
 #: ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1063
+#: ../mail/message-list.c:1064
 msgid "Low"
 msgstr "LÃ¥g"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:274
 #: ../calendar/gui/e-cal-model.c:985
-#: ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/e-calendar-table.c:567
 #: ../calendar/gui/tasktypes.xml.h:32
-#: ../mail/message-list.c:1064
+#: ../mail/message-list.c:1065
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
 #: ../calendar/gui/e-cal-component-preview.c:260
-#: ../calendar/gui/e-cal-model-tasks.c:354
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:640
-#: ../calendar/gui/print.c:2546
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:639
+#: ../calendar/gui/print.c:2548
 #: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Inte påbörjad"
@@ -7019,7 +7059,7 @@ msgid "Stat_us:"
 msgstr "Stat_us:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:570
+#: ../calendar/gui/e-calendar-table.c:569
 #: ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Odefinierad"
@@ -7059,16 +7099,16 @@ msgstr "_Uppgift"
 msgid "Task Details"
 msgstr "Uppgiftsdetaljer"
 
-#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.c:372
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organisa_tör:"
 
-#: ../calendar/gui/dialogs/task-page.c:781
+#: ../calendar/gui/dialogs/task-page.c:785
 msgid "Due date is wrong"
 msgstr "Förfallodatumet är fel"
 
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1754
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan inte öppna uppgifter i \"%s\"."
@@ -7090,7 +7130,7 @@ msgid "Time zone:"
 msgstr "Tidszon:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:392
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -7098,83 +7138,83 @@ msgstr[0] "%d dag"
 msgstr[1] "%d dagar"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:398
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d vecka"
 msgstr[1] "%d veckor"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Okänd åtgärd att genomföra"
 
 #. 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:474
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s innan mötet påbörjas"
 
 #. 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:479
+#: ../calendar/gui/e-alarm-list.c:481
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s efter att mötet påbörjas"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:486
+#: ../calendar/gui/e-alarm-list.c:488
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s när mötet påbörjas"
 
 #. 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:497
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s innan mötet avslutas"
 
 #. 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:502
+#: ../calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s efter mötet avslutats"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:509
+#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s när mötet avslutas"
 
 #. 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:533
+#: ../calendar/gui/e-alarm-list.c:535
 #, c-format
 msgid "%s at %s"
 msgstr "%s klockan %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:541
+#: ../calendar/gui/e-alarm-list.c:543
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s för en okänd utlösartyp"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:75
 #: ../calendar/gui/e-cal-component-preview.c:73
-#: ../mail/em-folder-view.c:3315
+#: ../mail/em-folder-view.c:3312
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicka för att öppna %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../calendar/gui/e-cal-component-preview.c:177
-#: ../filter/filter-rule.c:857
+#: ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "Namnlös"
 
@@ -7212,7 +7252,7 @@ msgstr "Förfallodatum:"
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:246
 #: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Status:"
@@ -7231,17 +7271,17 @@ msgid "Start Date"
 msgstr "Startdatum"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:618
 msgid "Free"
 msgstr "Ledig"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:620
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:396
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../calendar/gui/e-cal-model-tasks.c:623
+#: ../calendar/gui/e-cal-model-tasks.c:627
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7251,7 +7291,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025
+#: ../calendar/gui/e-cal-model-tasks.c:1029
 #: ../calendar/gui/e-cal-model.c:991
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:153
@@ -7261,7 +7301,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025
+#: ../calendar/gui/e-cal-model-tasks.c:1029
 #: ../calendar/gui/e-cal-model.c:991
 #: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:165
@@ -7271,9 +7311,9 @@ msgstr "Nej"
 
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:350
-#: ../calendar/gui/e-cal-popup.c:105
-#: ../calendar/gui/e-cal-popup.c:122
-#: ../calendar/gui/e-cal-popup.c:177
+#: ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-popup.c:123
+#: ../calendar/gui/e-cal-popup.c:178
 #: ../calendar/gui/e-itip-control.c:1203
 #: ../calendar/gui/e-itip-control.c:1343
 #: ../calendar/gui/e-meeting-list-view.c:167
@@ -7281,11 +7321,11 @@ msgstr "Nej"
 #: ../calendar/gui/e-meeting-store.c:111
 #: ../calendar/gui/e-meeting-store.c:146
 #: ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/print.c:985
-#: ../calendar/gui/print.c:1002
-#: ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:409
-#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../calendar/gui/print.c:987
+#: ../calendar/gui/print.c:1004
+#: ../mail/em-utils.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:447
+#: ../plugins/itip-formatter/itip-formatter.c:2113
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
@@ -7300,157 +7340,157 @@ msgstr "Ã…terkommande"
 msgid "Assigned"
 msgstr "Tilldelad"
 
-#: ../calendar/gui/e-cal-popup.c:183
+#: ../calendar/gui/e-cal-popup.c:184
 #: ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: ../calendar/gui/e-cal-popup.c:199
+#: ../calendar/gui/e-cal-popup.c:200
 #: ../mail/em-format-html-display.c:2035
 msgid "Select folder to save selected attachments..."
 msgstr "Välj mapp att spara markerade bilagor i..."
 
-#: ../calendar/gui/e-cal-popup.c:231
+#: ../calendar/gui/e-cal-popup.c:232
 #: ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "namnlös_bild.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285
-#: ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-memo-table.c:926
+#: ../calendar/gui/e-cal-popup.c:286
+#: ../calendar/gui/e-calendar-table.c:1578
+#: ../calendar/gui/e-calendar-view.c:1671
+#: ../calendar/gui/e-memo-table.c:925
 #: ../mail/em-folder-view.c:1336
 #: ../mail/em-popup.c:561
 #: ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "_Spara som..."
 
-#: ../calendar/gui/e-cal-popup.c:286
+#: ../calendar/gui/e-cal-popup.c:287
 #: ../mail/em-popup.c:562
 #: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "Spara som _bakgrund"
 
-#: ../calendar/gui/e-cal-popup.c:287
+#: ../calendar/gui/e-cal-popup.c:288
 msgid "_Save Selected"
 msgstr "_Spara markerade"
 
-#: ../calendar/gui/e-cal-popup.c:428
-#: ../mail/em-popup.c:831
+#: ../calendar/gui/e-cal-popup.c:430
+#: ../mail/em-popup.c:832
 #, c-format
 msgid "Open in %s..."
 msgstr "Öppna i %s..."
 
-#: ../calendar/gui/e-calendar-table.c:338
+#: ../calendar/gui/e-calendar-table.c:337
 msgid "* No Summary *"
 msgstr "* Ingen sammanfattning *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2215
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2214
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisatör: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:377
-#: ../calendar/gui/e-calendar-view.c:2219
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:2218
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisatör: %s"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "Start: "
 msgstr "Start: "
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "Due: "
 msgstr "Ska genomföras: "
 
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:588
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:592
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:593
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:594
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:595
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:596
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:597
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:598
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:665
-#: ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:878
+#: ../calendar/gui/e-calendar-view.c:664
+#: ../calendar/gui/e-memo-table.c:438
 msgid "Deleting selected objects"
 msgstr "Tar bort markerade objekt"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:795
-#: ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1162
+#: ../calendar/gui/e-calendar-view.c:794
+#: ../calendar/gui/e-memo-table.c:644
 msgid "Updating objects"
 msgstr "Uppdaterar objekt"
 
-#: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1221
-#: ../calendar/gui/e-memo-table.c:821
+#: ../calendar/gui/e-calendar-table.c:1350
+#: ../calendar/gui/e-calendar-view.c:1220
+#: ../calendar/gui/e-memo-table.c:820
 #: ../composer/e-composer-actions.c:277
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-table.c:1573
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Task"
 msgstr "Ny _uppgift"
 
-#: ../calendar/gui/e-calendar-table.c:1575
-#: ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-memo-table.c:924
 msgid "Open _Web Page"
 msgstr "Öppna _webbsida"
 
-#: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1657
-#: ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1579
+#: ../calendar/gui/e-calendar-view.c:1656
+#: ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "Skriv _ut..."
 
-#: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1677
-#: ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:2
 #: ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1
@@ -7458,10 +7498,10 @@ msgstr "Skriv _ut..."
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1679
-#: ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1585
+#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:57
 #: ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-memos.xml.h:19
@@ -7469,38 +7509,38 @@ msgstr "Klipp _ut"
 msgid "_Paste"
 msgstr "Klistra _in"
 
-#: ../calendar/gui/e-calendar-table.c:1587
+#: ../calendar/gui/e-calendar-table.c:1589
 #: ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Tilldela uppgift"
 
-#: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-memo-table.c:936
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Vidarebefordra som iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Complete"
 msgstr "_Markera som färdig"
 
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markera markerade uppgifter som färdiga"
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1593
 msgid "_Mark as Incomplete"
 msgstr "_Markera som ej färdig"
 
-#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-calendar-table.c:1594
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Markera markerade uppgifter som ej färdiga"
 
-#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-table.c:1599
 msgid "_Delete Selected Tasks"
 msgstr "_Ta bort markerade uppgifter"
 
-#: ../calendar/gui/e-calendar-table.c:1834
+#: ../calendar/gui/e-calendar-table.c:1836
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klicka för att lägga till en uppgift"
@@ -7524,7 +7564,7 @@ msgstr "Förfallodatum"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
 #: ../calendar/gui/tasktypes.xml.h:37
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -7532,68 +7572,68 @@ msgstr "Prioritet"
 msgid "Start date"
 msgstr "Startdatum"
 
-#: ../calendar/gui/e-calendar-view.c:1340
+#: ../calendar/gui/e-calendar-view.c:1339
 msgid "Moving items"
 msgstr "Flyttar objekt"
 
-#: ../calendar/gui/e-calendar-view.c:1342
+#: ../calendar/gui/e-calendar-view.c:1341
 msgid "Copying items"
 msgstr "Kopierar objekt"
 
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1650
 msgid "New _Appointment..."
 msgstr "Nytt _möte..."
 
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New All Day _Event"
 msgstr "Nytt _heldagsevenemang"
 
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New _Meeting"
 msgstr "Nytt sa_mmanträde"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1663
 msgid "_Current View"
 msgstr "_Aktuell vy"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1665
 msgid "Select T_oday"
 msgstr "Markera i_dag"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "_Select Date..."
 msgstr "_Markera datum..."
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1672
 msgid "Pri_nt..."
 msgstr "Skri_v ut..."
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Cop_y to Calendar..."
 msgstr "Kopi_era till kalender..."
 
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytta till kalender..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "_Delegate Meeting..."
 msgstr "_Delegera sammanträde..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Schedule Meeting..."
 msgstr "_Boka sammanträde..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Forward as iCalendar..."
 msgstr "_Vidarebefordra som iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Reply"
 msgstr "_Svara"
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1688
 #: ../mail/em-folder-view.c:1330
 #: ../mail/em-popup.c:566
 #: ../mail/em-popup.c:577
@@ -7601,28 +7641,28 @@ msgstr "_Svara"
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "Make this Occurrence _Movable"
 msgstr "Gör denna förekomst _flyttbar"
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1694
 #: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Ta bort denna f_örekomst"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "Delete _All Occurrences"
 msgstr "Ta bort _alla förekomster"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2235
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2234
+#: ../calendar/gui/print.c:2510
 #, c-format
 msgid "Location: %s"
 msgstr "Plats: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2268
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tid: %s %s"
@@ -7661,24 +7701,24 @@ msgstr "%02i minutdivisioner"
 #. 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:852
-#: ../calendar/gui/e-day-view.c:1549
+#: ../calendar/gui/e-day-view-top-item.c:851
+#: ../calendar/gui/e-day-view.c:1560
 #: ../calendar/gui/e-week-view-main-item.c:326
-#: ../calendar/gui/print.c:1672
+#: ../calendar/gui/print.c:1674
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:789
-#: ../calendar/gui/e-week-view.c:524
-#: ../calendar/gui/print.c:829
+#: ../calendar/gui/e-day-view.c:800
+#: ../calendar/gui/e-week-view.c:540
+#: ../calendar/gui/print.c:831
 msgid "am"
 msgstr "fm"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:792
-#: ../calendar/gui/e-week-view.c:527
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:803
+#: ../calendar/gui/e-week-view.c:543
+#: ../calendar/gui/print.c:833
 msgid "pm"
 msgstr "em"
 
@@ -7774,7 +7814,7 @@ msgid "Ends"
 msgstr "Slutar"
 
 #: ../calendar/gui/e-itip-control.c:961
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "Ska genomföras"
 
@@ -7811,13 +7851,13 @@ msgstr "<br> Granska följande information, och välj sedan en åtgärd från me
 #: ../calendar/gui/e-meeting-store.c:173
 #: ../calendar/gui/e-meeting-store.c:196
 #: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2034
+#: ../plugins/itip-formatter/itip-formatter.c:2101
 msgid "Accepted"
 msgstr "Accepterat"
 
 #: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../plugins/itip-formatter/itip-formatter.c:2104
 msgid "Tentatively Accepted"
 msgstr "Preliminärt accepterat"
 
@@ -7827,7 +7867,7 @@ msgstr "Preliminärt accepterat"
 #: ../calendar/gui/e-meeting-store.c:198
 #: ../calendar/gui/itip-utils.c:670
 #: ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2040
+#: ../plugins/itip-formatter/itip-formatter.c:2107
 msgid "Declined"
 msgstr "Avslaget"
 
@@ -8042,7 +8082,7 @@ msgid "Attendee status updated\n"
 msgstr "Deltagarstatus är uppdaterad\n"
 
 #: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../plugins/itip-formatter/itip-formatter.c:1301
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Deltagarstatusen kan inte uppdateras eftersom objektet inte längre finns"
 
@@ -8144,14 +8184,14 @@ msgstr "Deltagare"
 #: ../calendar/gui/e-meeting-store.c:86
 #: ../calendar/gui/e-meeting-store.c:103
 #: ../calendar/gui/e-meeting-store.c:740
-#: ../calendar/gui/print.c:981
+#: ../calendar/gui/print.c:983
 msgid "Individual"
 msgstr "Person"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
 #: ../calendar/gui/e-meeting-store.c:88
 #: ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/print.c:984
 #: ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grupp"
@@ -8159,21 +8199,21 @@ msgstr "Grupp"
 #: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:90
 #: ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/print.c:985
 msgid "Resource"
 msgstr "Resurs"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:92
 #: ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/print.c:986
 msgid "Room"
 msgstr "Rum"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:998
+#: ../calendar/gui/print.c:1000
 msgid "Chair"
 msgstr "Mötesordförande"
 
@@ -8181,21 +8221,21 @@ msgstr "Mötesordförande"
 #: ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/e-meeting-store.c:140
 #: ../calendar/gui/e-meeting-store.c:743
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/print.c:1001
 msgid "Required Participant"
 msgstr "Nödvändig deltagare"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/print.c:1002
 msgid "Optional Participant"
 msgstr "Valfri deltagare"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:127
 #: ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:1001
+#: ../calendar/gui/print.c:1003
 msgid "Non-Participant"
 msgstr "Icke-deltagare"
 
@@ -8209,7 +8249,7 @@ msgstr "Behöver åtgärd"
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:177
 #: ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-time-sel.c:397
+#: ../calendar/gui/e-meeting-time-sel.c:395
 msgid "Tentative"
 msgstr "Preliminärt"
 
@@ -8217,7 +8257,7 @@ msgstr "Preliminärt"
 #: ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:202
 #: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2043
+#: ../plugins/itip-formatter/itip-formatter.c:2110
 msgid "Delegated"
 msgstr "Delegerat"
 
@@ -8242,7 +8282,7 @@ msgstr "Pågår"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2122
+#: ../calendar/gui/e-meeting-time-sel.c:2120
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
@@ -8251,7 +8291,7 @@ msgstr "%A %d %B %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2153
+#: ../calendar/gui/e-meeting-time-sel.c:2151
 msgid "%a %m/%d/%Y"
 msgstr "%a %Y-%m-%d"
 
@@ -8261,67 +8301,67 @@ msgstr "%a %Y-%m-%d"
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Out of Office"
 msgstr "Inte inne"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "No Information"
 msgstr "Ingen information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "A_ttendees..."
 msgstr "Del_tagare..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:434
 msgid "O_ptions"
 msgstr "A_lternativ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:451
 msgid "Show _only working hours"
 msgstr "Visa _endast arbetstimmar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _zoomed out"
 msgstr "Visa ut_zoomade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:476
 msgid "_Update free/busy"
 msgstr "_Uppdatera ledig/upptagen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:509
 msgid "_Autopick"
 msgstr "_Autovälj"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:524
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:541
 msgid "_All people and resources"
 msgstr "_Allt folk och resurser"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "All _people and one resource"
 msgstr "Allt _folk och en resurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:559
 msgid "_Required people"
 msgstr "Folk som k_rävs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:568
 msgid "Required people and _one resource"
 msgstr "Folk som krävs _och en resurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:604
 msgid "_Start time:"
 msgstr "_Starttid:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:631
 msgid "_End time:"
 msgstr "Slutti_d:"
 
@@ -8349,11 +8389,11 @@ msgstr "Språk"
 msgid "Member"
 msgstr "Medlem"
 
-#: ../calendar/gui/e-memo-table.c:942
+#: ../calendar/gui/e-memo-table.c:941
 msgid "_Delete Selected Memos"
 msgstr "_Ta bort markerade memon"
 
-#: ../calendar/gui/e-memo-table.c:1093
+#: ../calendar/gui/e-memo-table.c:1092
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Klicka för att lägga till ett memo"
@@ -8400,7 +8440,7 @@ msgstr "Färdigställer uppgifter..."
 msgid "Expunging"
 msgstr "Tömmer"
 
-#: ../calendar/gui/e-timezone-entry.c:129
+#: ../calendar/gui/e-timezone-entry.c:128
 msgid "Select Timezone"
 msgstr "Välj tidszon"
 
@@ -8408,7 +8448,7 @@ msgstr "Välj tidszon"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../calendar/gui/e-week-view-main-item.c:343
-#: ../calendar/gui/print.c:1653
+#: ../calendar/gui/print.c:1655
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -8564,78 +8604,78 @@ msgstr "iCalendar-information"
 msgid "You must be an attendee of the event."
 msgstr "Du måste delta i evenemanget."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:489
 msgid "_New Memo List"
 msgstr "_Ny memolista"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:571
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d memo"
 msgstr[1] "%d memo"
 
-#: ../calendar/gui/memos-component.c:546
-#: ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:573
+#: ../calendar/gui/tasks-component.c:564
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d markerad"
 msgstr[1] ", %d markerade"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:620
 msgid "Failed upgrading memos."
 msgstr "Misslyckades med att uppgradera memon."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:980
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "Kan inte öppna memolistan \"%s\" för skapande av evenemang och sammanträden"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:993
 msgid "There is no calendar available for creating memos"
 msgstr "Det finns ingen kalender tillgänglig för skapande av memon"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1103
 msgid "Memo Source Selector"
 msgstr "Väljare för memokälla"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1287
 msgid "New memo"
 msgstr "Nytt memo"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1288
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Mem_o"
 
-#: ../calendar/gui/memos-component.c:1262
+#: ../calendar/gui/memos-component.c:1289
 msgid "Create a new memo"
 msgstr "Skapa ett nytt memo"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1295
 msgid "New shared memo"
 msgstr "Nytt delat memo"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1296
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Delat memo"
 
-#: ../calendar/gui/memos-component.c:1270
+#: ../calendar/gui/memos-component.c:1297
 msgid "Create a shared new memo"
 msgstr "Skapa ett nytt delat memo"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1303
 msgid "New memo list"
 msgstr "Ny memolista"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1304
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "Memoli_sta"
 
-#: ../calendar/gui/memos-component.c:1278
+#: ../calendar/gui/memos-component.c:1305
 msgid "Create a new memo list"
 msgstr "Skapa en ny memolista"
 
@@ -8694,269 +8734,269 @@ msgstr "Kan inte migrera uppgifterna \"%s\""
 msgid "Notes"
 msgstr "Anteckningar"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "1st"
 msgstr "1:a"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "2nd"
 msgstr "2:a"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "3rd"
 msgstr "3:e"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "4th"
 msgstr "4:e"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "5th"
 msgstr "5:e"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "6th"
 msgstr "6:e"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "7th"
 msgstr "7:e"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "8th"
 msgstr "8:e"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "9th"
 msgstr "9:e"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "10th"
 msgstr "10:e"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "11th"
 msgstr "11:e"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "12th"
 msgstr "12:e"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "13th"
 msgstr "13:e"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "14th"
 msgstr "14:e"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "15th"
 msgstr "15:e"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "16th"
 msgstr "16:e"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "17th"
 msgstr "17:e"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "18th"
 msgstr "18:e"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "19th"
 msgstr "19:e"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "20th"
 msgstr "20:e"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "21st"
 msgstr "21:a"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "22nd"
 msgstr "22:a"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "23rd"
 msgstr "23:e"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "24th"
 msgstr "24:e"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "25th"
 msgstr "25:e"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "26th"
 msgstr "26:e"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "27th"
 msgstr "27:e"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "28th"
 msgstr "28:e"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "29th"
 msgstr "29:e"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "30th"
 msgstr "30:e"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:523
 msgid "31st"
 msgstr "31:a"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Su"
 msgstr "Sö"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Mo"
 msgstr "MÃ¥"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Tu"
 msgstr "Ti"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "We"
 msgstr "On"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Th"
 msgstr "To"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Sa"
 msgstr "Lö"
 
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2474
 msgid "Appointment"
 msgstr "Möte"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2476
 msgid "Task"
 msgstr "Uppgift"
 
-#: ../calendar/gui/print.c:2499
+#: ../calendar/gui/print.c:2501
 #, c-format
 msgid "Summary: %s"
 msgstr "Sammanfattning: %s"
 
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2524
 msgid "Attendees: "
 msgstr "Deltagare:"
 
-#: ../calendar/gui/print.c:2562
+#: ../calendar/gui/print.c:2564
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2579
+#: ../calendar/gui/print.c:2581
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2593
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procent klar: %i"
 
-#: ../calendar/gui/print.c:2603
+#: ../calendar/gui/print.c:2605
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2616
+#: ../calendar/gui/print.c:2618
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:2629
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:480
 msgid "_New Task List"
 msgstr "_Ny uppgiftslista"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:562
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d uppgift"
 msgstr[1] "%d uppgifter"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:611
 msgid "Failed upgrading tasks."
 msgstr "Misslyckades med att uppgradera uppgifter."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:968
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Kan inte öppna uppgiftslistan \"%s\" för skapande av evenemang och sammanträden"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:981
 msgid "There is no calendar available for creating tasks"
 msgstr "Det finns ingen kalender tillgänglig för skapande av uppgifter"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1092
 msgid "Task Source Selector"
 msgstr "Väljare för uppgiftskälla"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1352
 msgid "New task"
 msgstr "Ny uppgift"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1353
 msgctxt "New"
 msgid "_Task"
 msgstr "_Uppgift"
 
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/tasks-component.c:1354
 msgid "Create a new task"
 msgstr "Skapa en ny uppgift"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1360
 msgid "New assigned task"
 msgstr "Ny tilldelad uppgift"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1361
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tilldela_d uppgift"
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1362
 msgid "Create a new assigned task"
 msgstr "Skapa en ny tilldelad uppgift"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1368
 msgid "New task list"
 msgstr "Ny uppgiftslista"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1369
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Uppgif_tslista"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1370
 msgid "Create a new task list"
 msgstr "Skapa en ny uppgiftslista"
 
@@ -8994,50 +9034,50 @@ msgid "In progress"
 msgstr "Pågår"
 
 #: ../calendar/gui/tasktypes.xml.h:50
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:50
 msgid "is greater than"
 msgstr "är större än"
 
 #: ../calendar/gui/tasktypes.xml.h:51
-#: ../mail/em-filter-i18n.h:35
+#: ../mail/em-filter-i18n.h:51
 msgid "is less than"
 msgstr "är mindre än"
 
-#: ../calendar/importers/icalendar-importer.c:73
+#: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
 msgstr "Möten och sammanträden"
 
-#: ../calendar/importers/icalendar-importer.c:331
-#: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1635
 msgid "Opening calendar"
 msgstr "Öppnar kalender"
 
-#: ../calendar/importers/icalendar-importer.c:438
+#: ../calendar/importers/icalendar-importer.c:440
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-filer (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:441
 msgid "Evolution iCalendar importer"
 msgstr "Evolutions iCalendar-importör"
 
-#: ../calendar/importers/icalendar-importer.c:515
+#: ../calendar/importers/icalendar-importer.c:529
 msgid "Reminder!"
 msgstr "PÃ¥minnelse!"
 
-#: ../calendar/importers/icalendar-importer.c:567
+#: ../calendar/importers/icalendar-importer.c:581
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-filer (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:568
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Evolution vCalendar importer"
 msgstr "Evolutions vCalendar-importör"
 
-#: ../calendar/importers/icalendar-importer.c:730
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "Kalenderevenemang"
 
-#: ../calendar/importers/icalendar-importer.c:767
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolutionkalenderns intelligenta importör"
 
@@ -10855,20 +10895,20 @@ msgstr "Välj mappar att posta meddelandet till."
 msgid "Click here to select folders to post to"
 msgstr "Klicka här för att välja mappar att posta till"
 
-#: ../composer/e-composer-private.c:180
-#: ../composer/e-msg-composer.c:1556
+#: ../composer/e-composer-private.c:181
+#: ../composer/e-msg-composer.c:1553
 msgid "Show _Attachment Bar"
 msgstr "Visa _bilageraden"
 
-#: ../composer/e-msg-composer.c:870
+#: ../composer/e-msg-composer.c:867
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "Kan inte signera utgående meddelande: Inget signeringscertifikat angivet för detta konto"
 
-#: ../composer/e-msg-composer.c:877
+#: ../composer/e-msg-composer.c:874
 msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
 msgstr "Kan inte kryptera utgående meddelande: Inget krypteringscertifikat angivet för detta konto"
 
-#: ../composer/e-msg-composer.c:1498
+#: ../composer/e-msg-composer.c:1495
 #: ../mail/em-format-html-display.c:1919
 #: ../mail/em-format-html-display.c:2411
 #: ../mail/mail-config.glade.h:45
@@ -10878,16 +10918,16 @@ msgid_plural "Attachments"
 msgstr[0] "Bilaga"
 msgstr[1] "Bilagor"
 
-#: ../composer/e-msg-composer.c:1554
+#: ../composer/e-msg-composer.c:1551
 msgid "Hide _Attachment Bar"
 msgstr "Dölj _bilageraden"
 
-#: ../composer/e-msg-composer.c:1571
-#: ../composer/e-msg-composer.c:2778
+#: ../composer/e-msg-composer.c:1568
+#: ../composer/e-msg-composer.c:2775
 msgid "Compose Message"
 msgstr "Skriv ett meddelande"
 
-#: ../composer/e-msg-composer.c:4053
+#: ../composer/e-msg-composer.c:4050
 msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
 msgstr "<b>(Redigeraren innehåller en meddelandetext som inte är text och som inte kan redigeras.)</b>"
 
@@ -10958,7 +10998,8 @@ msgid "Evolution quit unexpectedly while you were composing a new message. Recov
 msgstr "Evolution avslutades oväntat under tiden du höll på att skapa ett nytt meddelande. Att återställa meddelandet kommer att låta dig fortsätta där du slutade."
 
 #: ../composer/mail-composer.error.xml.h:17
-msgid "Send options available only for Novell Groupwise and Microsoft Exchange accounts."
+#, fuzzy
+msgid "Send options available only for Novell GroupWise and Microsoft Exchange accounts."
 msgstr "Sändalternativ tillgängliga endast för Novell Groupwise och Microsoft Exchange-konton."
 
 #: ../composer/mail-composer.error.xml.h:18
@@ -11024,7 +11065,7 @@ msgid "Evolution Mail and Calendar"
 msgstr "Evolutions e-post och kalender"
 
 #: ../data/evolution.desktop.in.in.h:2
-#: ../shell/e-shell-window-commands.c:738
+#: ../shell/e-shell-window-commands.c:951
 msgid "Groupware Suite"
 msgstr "Grupprogramvarusvit"
 
@@ -11040,46 +11081,46 @@ msgstr "adresskort"
 msgid "calendar information"
 msgstr "kalenderinformation"
 
-#: ../e-util/e-error.c:77
 #: ../e-util/e-error.c:78
-#: ../e-util/e-error.c:120
+#: ../e-util/e-error.c:79
+#: ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Evolution-fel"
 
-#: ../e-util/e-error.c:79
 #: ../e-util/e-error.c:80
-#: ../e-util/e-error.c:118
+#: ../e-util/e-error.c:81
+#: ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Evolution-varning"
 
-#: ../e-util/e-error.c:117
+#: ../e-util/e-error.c:118
 msgid "Evolution Information"
 msgstr "Evolution-information"
 
-#: ../e-util/e-error.c:119
+#: ../e-util/e-error.c:120
 msgid "Evolution Query"
 msgstr "Evolution-fråga"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:449
+#: ../e-util/e-error.c:450
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Internt fel, okänt fel \"%s\" begärt"
 
-#: ../e-util/e-logger.c:156
+#: ../e-util/e-logger.c:161
 msgid "Component"
 msgstr "Komponent"
 
-#: ../e-util/e-logger.c:157
+#: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
 msgstr "Namnet på komponenten som blir loggad"
 
 #: ../e-util/e-plugin.c:308
-#: ../filter/rule-editor.c:776
+#: ../filter/rule-editor.c:798
 #: ../mail/em-account-prefs.c:482
 #: ../mail/em-composer-prefs.c:988
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:689
+#: ../plugins/publish-calendar/publish-calendar.c:690
 msgid "Enabled"
 msgstr "Aktiverad"
 
@@ -11129,7 +11170,7 @@ msgstr "Skriv över fil?"
 msgid "_Overwrite"
 msgstr "Skriv _över"
 
-#: ../e-util/e-util.c:97
+#: ../e-util/e-util.c:96
 msgid "Could not display help for Evolution."
 msgstr "Kunde inte visa hjälp för Evolution."
 
@@ -11186,120 +11227,120 @@ msgstr "GConf-fel: %s"
 msgid "All further errors shown only on terminal."
 msgstr "Alla ytterligare fel visas endast i terminalen."
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekund sedan"
 msgstr[1] "%d sekunder sedan"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 sekund in i framtiden"
 msgstr[1] "%d sekunder in i framtiden"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minut sedan"
 msgstr[1] "%d minuter sedan"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 minut in i framtiden"
 msgstr[1] "%d minuter in i framtiden"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 timme sedan"
 msgstr[1] "%d timmar sedan"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 timme in i framtiden"
 msgstr[1] "%d timmar in i framtiden"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 dag sedan"
 msgstr[1] "%d dagar sedan"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 dag in i framtiden"
 msgstr[1] "%d dagar in i framtiden"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 vecka sedan"
 msgstr[1] "%d veckor sedan"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 vecka in i framtiden"
 msgstr[1] "%d veckor in i framtiden"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 månad sedan"
 msgstr[1] "%d månader sedan"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 månad in i framtiden"
 msgstr[1] "%d månader in i framtiden"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 år sedan"
 msgstr[1] "%d år sedan"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 år in i framtiden"
 msgstr[1] "%d år in i framtiden"
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<klicka här för att välja ett datum>"
 
-#: ../filter/filter-datespec.c:290
-#: ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:291
+#: ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "nu"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:298
 msgid "%d-%b-%Y"
 msgstr "%d %b %Y"
 
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:452
 msgid "Select a time to compare against"
 msgstr "Välj en tid att jämföra med"
 
@@ -11312,58 +11353,62 @@ msgstr "Välj en fil"
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:852
+#: ../filter/filter-rule.c:853
 msgid "R_ule name:"
 msgstr "Re_gelnamn:"
 
-#: ../filter/filter-rule.c:880
-msgid "Find items that meet the following criteria"
+#: ../filter/filter-rule.c:881
+#, fuzzy
+msgid "Find items that meet the following conditions"
 msgstr "Visa objekt som matchar följande villkor"
 
-#: ../filter/filter-rule.c:914
-msgid "A_dd Filter Criteria"
-msgstr "Lägg til_l filterkriteria"
+#: ../filter/filter-rule.c:915
+#, fuzzy
+msgid "A_dd Condition"
+msgstr "Lägg till åt_gärd"
 
-#: ../filter/filter-rule.c:920
-msgid "If all criteria are met"
+#: ../filter/filter-rule.c:921
+#, fuzzy
+msgid "If all conditions are met"
 msgstr "Om alla villkor uppfylls"
 
-#: ../filter/filter-rule.c:920
-msgid "If any criteria are met"
+#: ../filter/filter-rule.c:921
+#, fuzzy
+msgid "If any conditions are met"
 msgstr "Om några villkor uppfylls"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:923
 msgid "_Find items:"
 msgstr "_Sök objekt:"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "All related"
 msgstr "Alla relaterade"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies"
 msgstr "Svar"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies and parents"
 msgstr "Svar och föräldrar"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "No reply or parent"
 msgstr "Inget svar eller förälder"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/filter-rule.c:947
 msgid "I_nclude threads"
 msgstr "I_nkludera trådar"
 
-#: ../filter/filter-rule.c:1044
+#: ../filter/filter-rule.c:1045
 #: ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:308
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Inkommande"
 
-#: ../filter/filter-rule.c:1044
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1045
+#: ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Utgående"
 
@@ -11465,7 +11510,7 @@ msgid "months"
 msgstr "månader"
 
 #: ../filter/filter.glade.h:19
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:197
 msgid "seconds"
 msgstr "sekunder"
 
@@ -11489,15 +11534,15 @@ msgstr "veckor"
 msgid "years"
 msgstr "Ã¥r"
 
-#: ../filter/rule-editor.c:380
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr "Lägg till regel"
 
-#: ../filter/rule-editor.c:459
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr "Redigera regel"
 
-#: ../filter/rule-editor.c:786
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "Regelnamn"
 
@@ -11552,10 +11597,10 @@ msgstr "Evolutions nätverkskonfigurationskontroll"
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
 #: ../mail/em-folder-view.c:605
 #: ../mail/importers/elm-importer.c:327
-#: ../mail/importers/pine-importer.c:380
+#: ../mail/importers/pine-importer.c:378
+#: ../mail/mail-component.c:592
 #: ../mail/mail-component.c:593
-#: ../mail/mail-component.c:594
-#: ../mail/mail-component.c:763
+#: ../mail/mail-component.c:762
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "E-post"
@@ -11578,12 +11623,12 @@ msgstr "Nätverksinställningar"
 msgid "_Mail"
 msgstr "_E-post"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:386
 #, c-format
 msgid "%s License Agreement"
 msgstr "Licensavtal för %s"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:393
 #, c-format
 msgid ""
 "\n"
@@ -11595,75 +11640,75 @@ msgstr ""
 "Läs licensavtalet för %s nedan noggrant\n"
 "och kryssa för kryssrutan för att godkänna det\n"
 
-#: ../mail/em-account-editor.c:466
+#: ../mail/em-account-editor.c:465
 #: ../mail/em-filter-folder-element.c:239
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Välj mapp"
 
-#: ../mail/em-account-editor.c:590
-#: ../mail/em-account-editor.c:635
-#: ../mail/em-account-editor.c:702
+#: ../mail/em-account-editor.c:589
+#: ../mail/em-account-editor.c:634
+#: ../mail/em-account-editor.c:701
 #: ../widgets/misc/e-signature-combo-box.c:98
 msgid "Autogenerated"
 msgstr "Automatiskt genererad"
 
-#: ../mail/em-account-editor.c:762
+#: ../mail/em-account-editor.c:761
 msgid "Ask for each message"
 msgstr "Fråga för varje meddelande"
 
-#: ../mail/em-account-editor.c:1810
+#: ../mail/em-account-editor.c:1809
 #: ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../mail/em-account-editor.c:1859
+#: ../mail/em-account-editor.c:1858
 #: ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Mottagande av e-post"
 
-#: ../mail/em-account-editor.c:2131
+#: ../mail/em-account-editor.c:2130
 msgid "Check for _new messages every"
 msgstr "Leta efter _nya meddelanden var"
 
-#: ../mail/em-account-editor.c:2139
+#: ../mail/em-account-editor.c:2138
 msgid "minu_tes"
 msgstr "minu_ter"
 
-#: ../mail/em-account-editor.c:2327
-#: ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326
+#: ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "Sändning av e-post"
 
-#: ../mail/em-account-editor.c:2386
+#: ../mail/em-account-editor.c:2385
 #: ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Standardvärden"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2452
+#: ../mail/em-account-editor.c:2451
 #: ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../plugins/exchange-operations/exchange-account-setup.c:323
 msgid "Security"
 msgstr "Säkerhet"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2489
-#: ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2579
 msgid "Receiving Options"
 msgstr "Alternativ för mottagning"
 
-#: ../mail/em-account-editor.c:2490
-#: ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2580
 msgid "Checking for New Messages"
 msgstr "Letar efter nya meddelanden"
 
-#: ../mail/em-account-editor.c:2932
+#: ../mail/em-account-editor.c:2931
 #: ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontoredigerare"
 
-#: ../mail/em-account-editor.c:2932
+#: ../mail/em-account-editor.c:2931
 #: ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Evolutions kontoguide"
@@ -11724,49 +11769,65 @@ msgstr "-----Ursprungligt meddelande-----"
 msgid "_Filter Rules"
 msgstr "_Filterregler"
 
+#.
+#. * 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)
+#.
 #. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
+#: ../mail/em-filter-i18n.h:18
 msgid "Adjust Score"
 msgstr "Justera poäng"
 
-#: ../mail/em-filter-i18n.h:3
+#: ../mail/em-filter-i18n.h:19
 msgid "Assign Color"
 msgstr "Tilldela färg"
 
-#: ../mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:20
 msgid "Assign Score"
 msgstr "Tilldela poäng"
 
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:22
 msgid "BCC"
 msgstr "Blindkopia"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:23
 msgid "Beep"
 msgstr "Pip"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:24
 msgid "CC"
 msgstr "Kopia"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:25
 msgid "Completed On"
 msgstr "Färdigt den"
 
-#: ../mail/em-filter-i18n.h:11
+#: ../mail/em-filter-i18n.h:27
 msgid "Copy to Folder"
 msgstr "Kopiera till mapp"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:28
 msgid "Date received"
 msgstr "Ankomstdatum"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:29
 msgid "Date sent"
 msgstr "Avsändningsdatum"
 
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:767
+#: ../mail/em-filter-i18n.h:30
+#: ../plugins/groupwise-features/share-folder.c:768
 #: ../ui/evolution-addressbook.xml.h:15
 #: ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25
@@ -11775,222 +11836,222 @@ msgstr "Avsändningsdatum"
 msgid "Delete"
 msgstr "Ta bort"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:31
 msgid "Deleted"
 msgstr "Borttagen"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:33
 msgid "does not end with"
 msgstr "slutar inte med"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:34
 msgid "does not exist"
 msgstr "finns inte"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:35
 msgid "does not return"
 msgstr "returnerar inte"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:36
 msgid "does not sound like"
 msgstr "låter inte som"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:37
 msgid "does not start with"
 msgstr "börjar inte med"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:39
 msgid "Draft"
 msgstr "Utkast"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:40
 msgid "ends with"
 msgstr "slutar med"
 
-#: ../mail/em-filter-i18n.h:26
+#: ../mail/em-filter-i18n.h:42
 msgid "exists"
 msgstr "finns"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:43
 msgid "Expression"
 msgstr "Uttryck"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:44
 msgid "Follow Up"
 msgstr "Följ upp"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:45
 #: ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "viktigt"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:47
 msgid "is after"
 msgstr "är efter"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:48
 msgid "is before"
 msgstr "är innan"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:49
 msgid "is Flagged"
 msgstr "är flaggad"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:53
 msgid "is not Flagged"
 msgstr "är inte flaggad"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:54
 msgid "is not set"
 msgstr "är inte inställt"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:55
 msgid "is set"
 msgstr "är inställt"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:56
 #: ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Skräppost"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:57
 msgid "Junk Test"
 msgstr "Skräptest"
 
-#: ../mail/em-filter-i18n.h:42
-#: ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:58
+#: ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Etikett"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:59
 msgid "Mailing list"
 msgstr "Sändlista"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:60
 msgid "Match All"
 msgstr "Matcha alla"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:61
 msgid "Message Body"
 msgstr "Meddelandetext"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:62
 msgid "Message Header"
 msgstr "Meddelanderubrik"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:63
 msgid "Message is Junk"
 msgstr "Meddelandet är skräppost"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:64
 msgid "Message is not Junk"
 msgstr "Meddelandet är inte skräppost"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:65
 msgid "Move to Folder"
 msgstr "Flytta till mapp"
 
 # Osäker.
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:66
 msgid "Pipe to Program"
 msgstr "Skicka till program"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:67
 msgid "Play Sound"
 msgstr "Spela ljud"
 
 # [Status] [är] [Läst]
 #. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:69
 #: ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Läst"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:70
 #: ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Mottagare"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:71
 msgid "Regex Match"
 msgstr "Reguljärt uttryck matchar"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:72
 msgid "Replied to"
 msgstr "besvarad"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:73
 msgid "returns"
 msgstr "returnerar"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:74
 msgid "returns greater than"
 msgstr "returnerar större än"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:75
 msgid "returns less than"
 msgstr "returnerar mindre än"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:76
 msgid "Run Program"
 msgstr "Kör program"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:77
 #: ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Poäng"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:78
 #: ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Avsändare"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:79
 msgid "Set Label"
 msgstr "Ställ in etikett"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:80
 msgid "Set Status"
 msgstr "Ställ in status"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:81
 msgid "Size (kB)"
 msgstr "Storlek (kB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:82
 msgid "sounds like"
 msgstr "låter som"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:83
 msgid "Source Account"
 msgstr "Källkonto"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:84
 msgid "Specific header"
 msgstr "Specifik rubrik"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:85
 msgid "starts with"
 msgstr "börjar med"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:87
 msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
-#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-filter-i18n.h:88
 #: ../mail/em-format-quote.c:342
 #: ../mail/em-format.c:889
 #: ../mail/em-mailer-prefs.c:80
 #: ../mail/message-list.etspec.h:18
 #: ../mail/message-tag-followup.c:312
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1132
+#: ../smime/lib/e-cert.c:1115
 msgid "Subject"
 msgstr "Ämne"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:89
 msgid "Unset Status"
 msgstr "Töm status"
 
@@ -12003,51 +12064,51 @@ msgstr "Sedan"
 msgid "Add Ac_tion"
 msgstr "Lägg till åt_gärd"
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:192
 msgid "C_reate Search Folder From Search..."
 msgstr "S_kapa sökmapp från sökning..."
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:217
 msgid "All Messages"
 msgstr "Alla meddelanden"
 
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:218
 msgid "Unread Messages"
 msgstr "Olästa meddelanden"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:220
 msgid "No Label"
 msgstr "Ingen etikett"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:227
 msgid "Read Messages"
 msgstr "Lästa meddelanden"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:228
 msgid "Recent Messages"
 msgstr "Senaste meddelanden"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:229
 msgid "Last 5 Days' Messages"
 msgstr "Meddelanden de senaste 5 dagarna"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:230
 msgid "Messages with Attachments"
 msgstr "Meddelanden med bilagor"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:231
 msgid "Important Messages"
 msgstr "Viktiga meddelanden"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:232
 msgid "Messages Not Junk"
 msgstr "Meddelandet är inte skräppost"
 
-#: ../mail/em-folder-browser.c:1171
+#: ../mail/em-folder-browser.c:1173
 msgid "Account Search"
 msgstr "Kontosökning"
 
-#: ../mail/em-folder-browser.c:1224
+#: ../mail/em-folder-browser.c:1226
 msgid "All Account Search"
 msgstr "Sökning i alla konton"
 
@@ -12080,9 +12141,9 @@ msgstr "Kvotanvändning"
 #: ../mail/em-folder-properties.c:358
 #: ../mail/em-folder-tree-model.c:507
 #: ../mail/em-folder-tree.c:2556
-#: ../mail/mail-component.c:160
-#: ../mail/mail-component.c:581
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../mail/mail-component.c:159
+#: ../mail/mail-component.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "Inkorg"
@@ -12107,8 +12168,8 @@ msgstr "Mapp_namn:"
 #. load store to mail component
 #: ../mail/em-folder-tree-model.c:204
 #: ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:960
-#: ../mail/mail-vfolder.c:1027
+#: ../mail/mail-vfolder.c:975
+#: ../mail/mail-vfolder.c:1042
 msgid "Search Folders"
 msgstr "Sökmappar"
 
@@ -12119,17 +12180,17 @@ msgid "UNMATCHED"
 msgstr "OMATCHADE"
 
 #: ../mail/em-folder-tree-model.c:504
-#: ../mail/mail-component.c:161
+#: ../mail/mail-component.c:160
 msgid "Drafts"
 msgstr "Utkast"
 
 #: ../mail/em-folder-tree-model.c:510
-#: ../mail/mail-component.c:162
+#: ../mail/mail-component.c:161
 msgid "Outbox"
 msgstr "Utkorg"
 
 #: ../mail/em-folder-tree-model.c:512
-#: ../mail/mail-component.c:163
+#: ../mail/mail-component.c:162
 msgid "Sent"
 msgstr "Skickat"
 
@@ -12174,13 +12235,13 @@ msgid "Copying folder %s"
 msgstr "Kopierar mappen %s"
 
 #: ../mail/em-folder-tree.c:909
-#: ../mail/message-list.c:1953
+#: ../mail/message-list.c:2015
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flyttar meddelanden till mappen %s"
 
 #: ../mail/em-folder-tree.c:911
-#: ../mail/message-list.c:1955
+#: ../mail/message-list.c:2017
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierar meddelanden till mappen %s"
@@ -12200,7 +12261,7 @@ msgid "_Move to Folder"
 msgstr "_Flytta till mapp"
 
 #: ../mail/em-folder-tree.c:1718
-#: ../mail/mail-ops.c:1058
+#: ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Söker igenom mappar på \"%s\""
@@ -12244,7 +12305,7 @@ msgstr "Kopierar \"%s\" till \"%s\""
 #: ../mail/em-folder-utils.c:364
 #: ../mail/em-folder-view.c:1186
 #: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "Välj mapp"
 
@@ -12253,20 +12314,20 @@ msgstr "Välj mapp"
 msgid "C_opy"
 msgstr "_Kopiera"
 
-#: ../mail/em-folder-utils.c:585
+#: ../mail/em-folder-utils.c:532
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Skapar mappen \"%s\""
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Skapa mapp"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Ange var mappen ska skapas:"
@@ -12346,7 +12407,7 @@ msgstr "E_tikett"
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
 #: ../mail/em-folder-view.c:1355
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:478
 msgid "_None"
 msgstr "_Ingen"
 
@@ -12419,33 +12480,33 @@ msgstr "Kan inte hämta meddelande"
 msgid "Retrieving Message..."
 msgstr "Hämtar meddelande..."
 
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2791
 msgid "C_all To..."
 msgstr "R_ing till..."
 
-#: ../mail/em-folder-view.c:2797
+#: ../mail/em-folder-view.c:2794
 msgid "Create _Search Folder"
 msgstr "Skapa ny _sökmapp"
 
-#: ../mail/em-folder-view.c:2798
+#: ../mail/em-folder-view.c:2795
 msgid "_From this Address"
 msgstr "_Från denna adress"
 
-#: ../mail/em-folder-view.c:2799
+#: ../mail/em-folder-view.c:2796
 msgid "_To this Address"
 msgstr "_Till denna adress"
 
-#: ../mail/em-folder-view.c:3296
+#: ../mail/em-folder-view.c:3293
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicka för att skicka e-post till %s"
 
-#: ../mail/em-folder-view.c:3308
+#: ../mail/em-folder-view.c:3305
 #, c-format
 msgid "Click to call %s"
 msgstr "Klicka för att ringa till %s"
 
-#: ../mail/em-folder-view.c:3313
+#: ../mail/em-folder-view.c:3310
 msgid "Click to hide/unhide addresses"
 msgstr "Klicka för att dölja/visa adresser"
 
@@ -12713,7 +12774,7 @@ msgstr "Blindkopia"
 #. pseudo-header
 #: ../mail/em-format-html.c:1744
 #: ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1450
+#: ../mail/em-mailer-prefs.c:1451
 msgid "Mailer"
 msgstr "E-postprogram"
 
@@ -12752,8 +12813,8 @@ msgstr "Svara till"
 #: ../mail/em-format.c:890
 #: ../mail/em-mailer-prefs.c:81
 #: ../mail/message-list.etspec.h:2
-#: ../widgets/misc/e-dateedit.c:331
-#: ../widgets/misc/e-dateedit.c:353
+#: ../widgets/misc/e-dateedit.c:325
+#: ../widgets/misc/e-dateedit.c:347
 msgid "Date"
 msgstr "Datum"
 
@@ -12762,110 +12823,116 @@ msgstr "Datum"
 msgid "Newsgroups"
 msgstr "Diskussionsgrupper"
 
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:892
+#: ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "Ansikte"
+
+#: ../mail/em-format.c:1158
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1200
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunde inte tolka S/MIME-meddelande: Okänt fel"
 
-#: ../mail/em-format.c:1336
-#: ../mail/em-format.c:1492
+#: ../mail/em-format.c:1337
+#: ../mail/em-format.c:1493
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1345
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Krypteringstypen stöds inte för multipart/encrypted"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message"
 msgstr "Kunde inte tolka PGP/MIME-meddelande"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Kunde inte tolka PGP/MIME-meddelande: Okänt fel"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1512
 msgid "Unsupported signature format"
 msgstr "Signaturformatet stöds inte"
 
-#: ../mail/em-format.c:1519
-#: ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520
+#: ../mail/em-format.c:1591
 msgid "Error verifying signature"
 msgstr "Fel vid verifiering av signatur"
 
-#: ../mail/em-format.c:1519
-#: ../mail/em-format.c:1581
-#: ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520
+#: ../mail/em-format.c:1582
+#: ../mail/em-format.c:1591
 msgid "Unknown error verifying signature"
 msgstr "Okänt fel vid verifiering av signatur"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1663
 msgid "Could not parse PGP message"
 msgstr "Kunde inte tolka PGP-meddelande"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1663
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Kunde inte tolka PGP-meddelande: Okänt fel"
 
-#: ../mail/em-mailer-prefs.c:93
+#: ../mail/em-mailer-prefs.c:94
 msgid "Every time"
 msgstr "Varje gång"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per day"
 msgstr "En gång per dag"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per week"
 msgstr "En gång per vecka"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per month"
 msgstr "En gång per månad"
 
-#: ../mail/em-mailer-prefs.c:326
+#: ../mail/em-mailer-prefs.c:327
 msgid "Add Custom Junk Header"
 msgstr "Lägg till anpassad skräprubrik"
 
-#: ../mail/em-mailer-prefs.c:330
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Name:"
 msgstr "Rubriknamn:"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:332
 msgid "Header Value Contains:"
 msgstr "Rubrikvärde innehåller:"
 
-#: ../mail/em-mailer-prefs.c:436
+#: ../mail/em-mailer-prefs.c:437
 msgid "Contains Value"
 msgstr "Innehåller värde"
 
-#: ../mail/em-mailer-prefs.c:458
+#: ../mail/em-mailer-prefs.c:459
 msgid "Color"
 msgstr "Färg"
 
-#: ../mail/em-mailer-prefs.c:461
+#: ../mail/em-mailer-prefs.c:462
 msgid "Tag"
 msgstr "Tagg"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1078
-#: ../mail/em-mailer-prefs.c:1132
+#: ../mail/em-mailer-prefs.c:1079
+#: ../mail/em-mailer-prefs.c:1133
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Insticksmodulen %s är tillgänglig och binärfilen är installerad."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086
-#: ../mail/em-mailer-prefs.c:1141
+#: ../mail/em-mailer-prefs.c:1087
+#: ../mail/em-mailer-prefs.c:1142
 #, c-format
 msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "Insticksmodulen %s är inte tillgänglig. Kontrollera om paketet är installerat."
 
-#: ../mail/em-mailer-prefs.c:1107
+#: ../mail/em-mailer-prefs.c:1108
 msgid "No Junk plugin available"
 msgstr "Ingen insticksmodul för skräppost finns tillgänglig."
 
@@ -12926,8 +12993,9 @@ msgid "Failed to create local mail storage `%s': %s"
 msgstr "Misslyckades med att skapa lokalt e-postlager \"%s\": %s"
 
 #: ../mail/em-migrate.c:2898
+#, fuzzy
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to sqlite since Evolution 2.24.\n"
+"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 ""
@@ -12957,55 +13025,55 @@ msgstr "Svara till _lista"
 
 #. make it first item
 #: ../mail/em-popup.c:629
-#: ../mail/em-popup.c:852
+#: ../mail/em-popup.c:853
 msgid "_Add to Address Book"
 msgstr "_Lägg till i adressbok"
 
-#: ../mail/em-subscribe-editor.c:583
+#: ../mail/em-subscribe-editor.c:582
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Detta lager stöder inte prenumerationer, eller så är de inte aktiverade."
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:615
 msgid "Subscribed"
 msgstr "Prenumererar"
 
-#: ../mail/em-subscribe-editor.c:620
+#: ../mail/em-subscribe-editor.c:619
 msgid "Folder"
 msgstr "Mapp"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:822
+#: ../mail/em-subscribe-editor.c:821
 msgid "Please select a server."
 msgstr "Välj en server."
 
-#: ../mail/em-subscribe-editor.c:843
+#: ../mail/em-subscribe-editor.c:842
 msgid "No server has been selected"
 msgstr "Ingen server har valts"
 
 #. Check buttons
-#: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:127
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "Visa _inte detta meddelande igen."
 
-#: ../mail/em-utils.c:316
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "Meddelandefilter"
 
-#: ../mail/em-utils.c:369
+#: ../mail/em-utils.c:370
 msgid "message"
 msgstr "meddelande"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:654
 msgid "Save Message..."
 msgstr "Spara meddelande..."
 
-#: ../mail/em-utils.c:703
+#: ../mail/em-utils.c:704
 msgid "Add address"
 msgstr "Lägg till adress"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1224
+#: ../mail/em-utils.c:1225
 #, c-format
 msgid "Messages from %s"
 msgstr "Meddelanden från %s"
@@ -13031,7 +13099,8 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Fönsterbredd för \"Skicka och ta emot e-post\""
 
 #: ../mail/evolution-mail.schemas.in.h:4
-msgid "Allows evolution to display text part of limited size"
+#, fuzzy
+msgid "Allows Evolution to display text part of limited size"
 msgstr "Tillåter att Evolution visar textdelen av begränsad storlek"
 
 #: ../mail/evolution-mail.schemas.in.h:5
@@ -13259,7 +13328,8 @@ msgid "If the \"Preview\" pane is on, then show it side-by-side rather than vert
 msgstr "Om \"Förhandsgranskning\"-panelen är aktiv visas det sida vid sida istället för vertikalt."
 
 #: ../mail/evolution-mail.schemas.in.h:61
-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."
+#, fuzzy
+msgid "If there isn't a builtin viewer for a particular MIME type inside Evolution, any MIME types appearing in this list which map to a Bonobo component viewer in GNOME's MIME type database may be used for displaying content."
 msgstr "Om det inte finns en inbyggd visare för en viss mime-typ i Evolution kommer alla mime-typer som finns i denna lista och som mappas till en bonobo-komponentvisare i GNOME:s databas över mime-typer att kunna användas för att visa innehåll."
 
 #: ../mail/evolution-mail.schemas.in.h:62
@@ -13303,43 +13373,46 @@ msgid "List of Labels and their associated colors"
 msgstr "Lista med etiketter och deras associerade färger"
 
 #: ../mail/evolution-mail.schemas.in.h:72
+#, fuzzy
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr "Lista med mime-typer att kontrollera med avseende på bonobo-komponentvisare"
+
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accepted licenses"
 msgstr "Lista med accepterade licenser"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of accounts"
 msgstr "Lista med konton"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 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 med konton som är kända för Evolutions e-postkomponent. Listan innehåller strängar som namnger underkataloger relativa till /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista med anpassade rubriker och huruvida de är aktiverade."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Lista över ordboksspråkkoder som används för stavningskontroll."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 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 med etiketter som är kända för Evolutions e-postkomponent. Listan innehåller strängar som innehåller namn:färg där färg använder den hexadecimala kodningen i HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of mime types to check for bonobo component viewers"
-msgstr "Lista med mime-typer att kontrollera med avseende på bonobo-komponentvisare"
-
 #: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista med protokollnamn vars licens har accepterats."
 
 #: ../mail/evolution-mail.schemas.in.h:80
-msgid "Load images for HTML messages over http"
+#, fuzzy
+msgid "Load images for HTML messages over HTTP"
 msgstr "Läs in bilder för HTML-meddelanden över http"
 
 #: ../mail/evolution-mail.schemas.in.h:81
-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."
+#, fuzzy
+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 "Läs in bilder för HTML-meddelanden över http(s). Möjliga värden är: \"0\" - Läs aldrig in bilder från nätet, \"1\" - Läs in bilder i meddelanden från kontakter, \"2\" - Läs alltid in bilder från nätet."
 
 #: ../mail/evolution-mail.schemas.in.h:82
@@ -13572,7 +13645,8 @@ msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings
 msgstr "Denna kan ha tre möjliga värden. \"0\" för fel. \"1\" för varningar. \"2\" för felsökningsmeddelanden."
 
 #: ../mail/evolution-mail.schemas.in.h:141
-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 interms of KB."
+#, fuzzy
+msgid "This decides the max size of the text part that can be formatted under Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr "Det här bestämmer maximal storlek på textdelen som kan formateras under Evolution. Standard är 4 MB / 4096 KB och anges i KB."
 
 #: ../mail/evolution-mail.schemas.in.h:142
@@ -13743,46 +13817,46 @@ msgstr "Evolutions Elm-importör"
 msgid "Import mail from Elm."
 msgstr "Importera e-post från Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:80
+#: ../mail/importers/evolution-mbox-importer.c:79
 msgid "Destination folder:"
 msgstr "MÃ¥lmapp:"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder to import into"
 msgstr "Välj mapp att importera till"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley-brevlåda (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:221
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importera mappar i Berkeley-brevlådeformat"
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "Importerar brevlåda"
 
-#: ../mail/importers/mail-importer.c:232
+#: ../mail/importers/mail-importer.c:231
 #: ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importerar \"%s\""
 
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "Söker igenom %s"
 
-#: ../mail/importers/pine-importer.c:227
+#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr "Importerar Pine-data"
 
-#: ../mail/importers/pine-importer.c:426
+#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "Evolutions Pine-importör"
 
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
 msgstr "Importera e-post från Pine."
 
@@ -13811,154 +13885,151 @@ msgstr "Sändlistan %s"
 msgid "Add Filter Rule"
 msgstr "Lägg till filterregel"
 
-#: ../mail/mail-component.c:164
-#: ../plugins/templates/templates.c:521
-#: ../plugins/templates/templates.c:691
-#: ../plugins/templates/templates.c:726
+#: ../mail/mail-component.c:163
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "Mallar"
 
-#: ../mail/mail-component.c:546
+#: ../mail/mail-component.c:545
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d markerad, "
 msgstr[1] "%d markerade, "
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:549
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d borttaget"
 msgstr[1] "%d borttagna"
 
-#: ../mail/mail-component.c:557
+#: ../mail/mail-component.c:556
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d skräp"
 msgstr[1] "%d skräp"
 
-#: ../mail/mail-component.c:560
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d utkast"
 msgstr[1] "%d utkast"
 
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d skickat"
 msgstr[1] "%d skickade"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:563
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d oskickat"
 msgstr[1] "%d oskickade"
 
-#: ../mail/mail-component.c:570
+#: ../mail/mail-component.c:569
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d oläst, "
 msgstr[1] "%d olästa, "
 
-#: ../mail/mail-component.c:571
+#: ../mail/mail-component.c:570
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:922
 msgid "New Mail Message"
 msgstr "Nytt e-postmeddelande"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:923
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_E-postmeddelande"
 
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:924
 msgid "Compose a new mail message"
 msgstr "Skriv ett nytt e-postmeddelande"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:930
 msgid "New Mail Folder"
 msgstr "Ny e-postmapp"
 
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:931
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "E-post_mapp"
 
-#: ../mail/mail-component.c:933
+#: ../mail/mail-component.c:932
 msgid "Create a new mail folder"
 msgstr "Skapa en ny e-postmapp"
 
-#: ../mail/mail-component.c:1080
+#: ../mail/mail-component.c:1079
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Misslyckades med att uppgradera e-postinställningar eller e-postmappar."
 
-#: ../mail/mail-component.c:1596
+#: ../mail/mail-component.c:1595
 msgid "Error"
 msgstr "Fel"
 
-#: ../mail/mail-component.c:1596
+#: ../mail/mail-component.c:1595
 msgid "Errors"
 msgstr "Fel"
 
-#: ../mail/mail-component.c:1597
+#: ../mail/mail-component.c:1596
 msgid "Warnings and Errors"
 msgstr "Varningar och fel"
 
-#: ../mail/mail-component.c:1598
+#: ../mail/mail-component.c:1597
 msgid "Debug"
 msgstr "Felsök"
 
-#: ../mail/mail-component.c:1598
+#: ../mail/mail-component.c:1597
 msgid "Error, Warnings and Debug messages"
 msgstr "Meddelanden om fel, varningar och felsökning"
 
-#: ../mail/mail-component.c:1725
+#: ../mail/mail-component.c:1724
 msgid "Debug Logs"
 msgstr "Felsökningsloggar"
 
-#: ../mail/mail-component.c:1739
+#: ../mail/mail-component.c:1738
 msgid "Show _errors in the status bar for"
 msgstr "Visa _fel i statusraden för"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1755
+#: ../mail/mail-component.c:1754
 msgid "second(s)."
 msgstr "sekund(er)."
 
-#: ../mail/mail-component.c:1761
+#: ../mail/mail-component.c:1760
 msgid "Log Messages:"
 msgstr "Loggmeddelanden:"
 
-#: ../mail/mail-component.c:1802
+#: ../mail/mail-component.c:1801
 msgid "Log Level"
 msgstr "Loggnivå"
 
-#: ../mail/mail-component.c:1811
-#: ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1810
+#: ../widgets/misc/e-dateedit.c:389
 msgid "Time"
 msgstr "Tid"
 
-#: ../mail/mail-component.c:1821
-#: ../mail/message-list.c:2454
+#: ../mail/mail-component.c:1820
+#: ../mail/message-list.c:2519
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Meddelanden"
 
-#: ../mail/mail-component.c:1830
+#: ../mail/mail-component.c:1829
 #: ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
@@ -14422,70 +14493,78 @@ msgid "S_tandard Font:"
 msgstr "_Standardtypsnitt:"
 
 #: ../mail/mail-config.glade.h:132
+msgid "Select Drafts Folder"
+msgstr "Välj utkastmapp"
+
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font"
 msgstr "Välj HTML-typsnitt med fast breddsteg"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font for printing"
 msgstr "Välj HTML-typsnitt med fast breddsteg för utsnitt"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font"
 msgstr "Välj HTML-typsnitt med variabelt breddsteg"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font for printing"
 msgstr "Välj HTML-typsnitt med variabelt breddsteg för utskrift"
 
 #: ../mail/mail-config.glade.h:137
+msgid "Select Sent Folder"
+msgstr "Välj skickat-mapp"
+
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "Sändning av post"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "Mapp för skickade _meddelanden:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vern kräver autentisering"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:142
 msgid "Server _Type: "
 msgstr "Server_typ: "
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "Certifikat för sig_nering:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "Tabell med signaturer"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "Stavningskontroll"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "Börja s_kriva längst ner vid svar"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
 msgid "T_ype: "
 msgstr "T_yp:"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:150
 msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
 msgstr "Listan med språk här återspeglar endast de språk för vilka en ordbok är installerad."
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14495,7 +14574,7 @@ msgstr ""
 "din signatur. Namnet du anger kommer att endast\n"
 "användas för visning."
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:154
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14503,15 +14582,15 @@ msgstr ""
 "Skriv in namnet som du vill använda för att referera till detta konto.\n"
 "Till exempel: \"Jobb\" eller \"Personligt\"."
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:156
 msgid "Us_ername:"
 msgstr "Använ_darnamn:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:157
 msgid "Use Authe_ntication"
 msgstr "Använd aute_ntisering"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:158
 #: ../plugins/caldav/caldav-source.c:284
 #: ../plugins/google-account-setup/google-source.c:625
 #: ../plugins/google-account-setup/google-contacts-source.c:278
@@ -14519,11 +14598,11 @@ msgstr "Använd aute_ntisering"
 msgid "User_name:"
 msgstr "Användar_namn:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:159
 msgid "V_ariable-width:"
 msgstr "V_ariabelt breddsteg:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:160
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14533,124 +14612,124 @@ msgstr ""
 "\n"
 "Klicka på \"Framåt\" för att börja. "
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:163
 msgid "_Add Signature"
 msgstr "_Lägg till signatur"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:164
 msgid "_Always load images from the Internet"
 msgstr "Läs _alltid in bilder från nätet"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:165
 msgid "_Automatic proxy configuration URL:"
 msgstr "URL för _automatisk proxykonfiguration:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:166
 msgid "_Default junk plugin:"
 msgstr "S_tandardinsticksmodul för skräppost:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:167
 msgid "_Direct connection to the Internet"
 msgstr "_Direktanslutning till Internet"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:168
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Signera inte sammanträdesbegäran (för kompatibilitet med Outlook)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:170
 msgid "_Forward style:"
 msgstr "Stil för _vidarebefordran:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:171
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Behåll signaturen ovanför det ursprungliga meddelandet vid svar"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:172
 msgid "_Load images in messages from contacts"
 msgstr "_Läs in bilder i meddelanden från kontakter"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:173
 msgid "_Lookup in local address book only"
 msgstr "Sl_Ã¥ endast upp i lokal adressbok"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:174
 msgid "_Make this my default account"
 msgstr "_Gör detta till mitt standardkonto"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:175
 msgid "_Manual proxy configuration:"
 msgstr "_Manuell proxykonfiguration:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:176
 msgid "_Mark messages as read after"
 msgstr "_Markera meddelanden som lästa efter"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:178
 msgid "_Never load images from the Internet"
 msgstr "Läs al_drig in bilder från nätet"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:179
 msgid "_Path:"
 msgstr "_Sökväg:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:180
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "I_nformera när HTML-meddelanden skickas till kontakter som inte vill ha dem"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:181
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Fråga när meddelanden skickas med en _tom ämnesrad"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:182
 msgid "_Reply style:"
 msgstr "_Svarsstil:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:183
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:184
 msgid "_Secure HTTP Proxy:"
 msgstr "HTTP_S-proxy:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:185
 msgid "_Select..."
 msgstr "_Välj..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:188
 msgid "_Show image animations"
 msgstr "_Visa bildanimeringar"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:189
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Visa fotografiet på avsändaren i förhandsvisningen av meddelandet"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:190
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Minska rubriker för Till / Kopia / Blindkopia till "
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:191
 msgid "_Use Secure Connection:"
 msgstr "_Använd säker anslutning:"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:192
 msgid "_Use system defaults"
 msgstr "An_vänd systemets standard"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:193
 msgid "_Use the same fonts as other applications"
 msgstr "_Använd samma typsnitt som andra program"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "adresser"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "färg"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "beskrivning"
 
@@ -14751,27 +14830,27 @@ msgstr "_Flagga:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryssa för detta för att acceptera licensavtalet"
 
-#: ../mail/mail-folder-cache.c:832
+#: ../mail/mail-folder-cache.c:833
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingar %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:106
 msgid "Filtering Selected Messages"
 msgstr "Filtrera markerade meddelanden"
 
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Hämtar post"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
+#: ../mail/mail-ops.c:561
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Misslyckades med att tillämpa utgående filter: %s"
 
-#: ../mail/mail-ops.c:572
-#: ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:573
+#: ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14780,126 +14859,126 @@ msgstr ""
 "Misslyckades med att lägga till i %s: %s\n"
 "Lägger till i lokala \"Skickat\"-mappen istället."
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Misslyckades med att lägga till i lokala \"Skickat\"-mappen: %s"
 
-#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:725
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Skickar meddelande %d av %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Misslyckades med att skicka %d av %d meddelanden"
 
-#: ../mail/mail-ops.c:763
-#: ../mail/mail-send-recv.c:693
+#: ../mail/mail-ops.c:764
+#: ../mail/mail-send-recv.c:698
 msgid "Canceled."
 msgstr "Avbruten."
 
-#: ../mail/mail-ops.c:765
-#: ../mail/mail-send-recv.c:695
+#: ../mail/mail-ops.c:766
+#: ../mail/mail-send-recv.c:700
 msgid "Complete."
 msgstr "Färdig."
 
-#: ../mail/mail-ops.c:871
+#: ../mail/mail-ops.c:872
 msgid "Saving message to folder"
 msgstr "Sparar meddelande till mappen"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meddelanden till %s"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierar meddelanden till %s"
 
-#: ../mail/mail-ops.c:1166
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: ../mail/mail-ops.c:1207
+#: ../mail/mail-ops.c:1208
 #, c-format
 msgid "Opening folder %s"
 msgstr "Öppnar mappen %s"
 
-#: ../mail/mail-ops.c:1272
+#: ../mail/mail-ops.c:1273
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Hämtar kvotainformation för mappen %s"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Opening store %s"
 msgstr "Öppnar lagret %s"
 
-#: ../mail/mail-ops.c:1412
+#: ../mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Byter namn på mappen %s"
 
-#: ../mail/mail-ops.c:1501
+#: ../mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: ../mail/mail-ops.c:1564
+#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tömmer och lagrar kontot \"%s\""
 
-#: ../mail/mail-ops.c:1565
+#: ../mail/mail-ops.c:1595
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrar kontot \"%s\""
 
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1649
 msgid "Refreshing folder"
 msgstr "Uppdaterar mapp"
 
-#: ../mail/mail-ops.c:1659
-#: ../mail/mail-ops.c:1709
+#: ../mail/mail-ops.c:1689
+#: ../mail/mail-ops.c:1739
 msgid "Expunging folder"
 msgstr "Tömmer mapp"
 
-#: ../mail/mail-ops.c:1706
+#: ../mail/mail-ops.c:1736
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tömmer papperskorgen i \"%s\""
 
-#: ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1737
 msgid "Local Folders"
 msgstr "Lokala mappar"
 
-#: ../mail/mail-ops.c:1788
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hämtar meddelande %s"
 
-#: ../mail/mail-ops.c:1895
+#: ../mail/mail-ops.c:1925
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Hämtar %d meddelande"
 msgstr[1] "Hämtar %d meddelanden"
 
-#: ../mail/mail-ops.c:1980
+#: ../mail/mail-ops.c:2010
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Sparar %d meddelande"
 msgstr[1] "Sparar %d meddelanden"
 
-#: ../mail/mail-ops.c:2058
+#: ../mail/mail-ops.c:2088
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14908,12 +14987,12 @@ msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2130
+#: ../mail/mail-ops.c:2160
 msgid "Saving attachment"
 msgstr "Sparar bilaga"
 
-#: ../mail/mail-ops.c:2148
-#: ../mail/mail-ops.c:2156
+#: ../mail/mail-ops.c:2178
+#: ../mail/mail-ops.c:2186
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14922,27 +15001,27 @@ msgstr ""
 "Kan inte skapa utdatafil: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2171
+#: ../mail/mail-ops.c:2201
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kopplar från %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ansluter igen till %s"
 
-#: ../mail/mail-ops.c:2413
+#: ../mail/mail-ops.c:2443
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Förbereder kontot \"%s\" för frånkopplat"
 
-#: ../mail/mail-ops.c:2499
+#: ../mail/mail-ops.c:2529
 msgid "Checking Service"
 msgstr "Kontrollerar tjänst"
 
@@ -14958,40 +15037,40 @@ msgstr "Skicka och ta emot e-post"
 msgid "Cancel _All"
 msgstr "Avbryt a_llt"
 
-#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:502
 msgid "Updating..."
 msgstr "Uppdaterar..."
 
-#: ../mail/mail-send-recv.c:498
-#: ../mail/mail-send-recv.c:573
+#: ../mail/mail-send-recv.c:502
+#: ../mail/mail-send-recv.c:578
 msgid "Waiting..."
 msgstr "Väntar..."
 
-#: ../mail/mail-send-recv.c:799
+#: ../mail/mail-send-recv.c:804
 #, c-format
 msgid "Checking for new mail"
 msgstr "Kontrollerar ny e-post"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Ange lösenfras för %s"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:211
 msgid "Enter Passphrase"
 msgstr "Ange lösenfras"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 #: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ange lösenord för %s"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:216
 msgid "Enter Password"
 msgstr "Ange lösenord"
 
-#: ../mail/mail-session.c:256
+#: ../mail/mail-session.c:258
 msgid "User canceled operation."
 msgstr "Användaren avbröt åtgärden."
 
@@ -15036,21 +15115,21 @@ msgstr "Ogiltig mapp: \"%s\""
 msgid "Setting up Search Folder: %s"
 msgstr "Konfigurerar sökmapp: %s"
 
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Uppdaterar sökmappar för \"%s:%s\""
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Uppdaterar sökmappar för \"%s\""
 
-#: ../mail/mail-vfolder.c:1066
+#: ../mail/mail-vfolder.c:1081
 msgid "Edit Search Folder"
 msgstr "Redigera sökmapp"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1170
 msgid "New Search Folder"
 msgstr "Ny sökmapp"
 
@@ -15568,7 +15647,7 @@ msgstr "_Lägg till"
 
 #: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
-msgstr "_Förkasta ändringar"
+msgstr "Förkasta _ändringar"
 
 #: ../mail/mail.error.xml.h:137
 msgid "_Do not Synchronize"
@@ -15582,90 +15661,90 @@ msgstr "_Töm"
 msgid "_Open Messages"
 msgstr "_Öppna meddelanden"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Unseen"
 msgstr "Oläst"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Seen"
 msgstr "Läst"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Answered"
 msgstr "Besvarad"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Forwarded"
 msgstr "Vidarebefordrat"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1057
 msgid "Multiple Unseen Messages"
 msgstr "Flera olästa meddelanden"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1058
 msgid "Multiple Messages"
 msgstr "Flera meddelanden"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1062
 msgid "Lowest"
 msgstr "Lägsta"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1063
 msgid "Lower"
 msgstr "Lägre"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1067
 msgid "Higher"
 msgstr "Högre"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1068
 msgid "Highest"
 msgstr "Högsta"
 
-#: ../mail/message-list.c:1596
+#: ../mail/message-list.c:1657
 #: ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1603
+#: ../mail/message-list.c:1664
 #: ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Idag %H.%M"
 
-#: ../mail/message-list.c:1612
+#: ../mail/message-list.c:1673
 #: ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Igår %H.%M"
 
-#: ../mail/message-list.c:1624
+#: ../mail/message-list.c:1685
 #: ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1632
+#: ../mail/message-list.c:1693
 #: ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1634
+#: ../mail/message-list.c:1695
 #: ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3916
-#: ../mail/message-list.c:4376
+#: ../mail/message-list.c:3981
+#: ../mail/message-list.c:4452
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
-#: ../mail/message-list.c:4224
+#: ../mail/message-list.c:4291
 msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
 msgstr "Inga meddelanden matchar dina sökkriteria. Antingen töm sökningen med menyobjektet Sök->Töm eller ändra den."
 
-#: ../mail/message-list.c:4226
+#: ../mail/message-list.c:4293
 msgid "There are no messages in this folder."
 msgstr "Det finns inga meddelanden i denna mapp."
 
@@ -15698,6 +15777,11 @@ msgstr "Skickade meddelanden"
 msgid "Size"
 msgstr "Storlek"
 
+#: ../mail/message-list.etspec.h:19
+#, fuzzy
+msgid "Subject - Trimmed"
+msgstr "_Ämne-fältet"
+
 #: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Ring"
@@ -15781,8 +15865,8 @@ msgstr "Lista över ledtrådar för bilagepåminnaren att leta efter i en meddel
 msgid "List of clues for the attachment reminder plugin to look for in a message body."
 msgstr "Lista över ledtrådar för bilagepåminnaren att leta efter i meddelandetexten."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:474
-#: ../plugins/templates/templates.c:394
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/templates/templates.c:390
 msgid "Keywords"
 msgstr "Nyckelord"
 
@@ -15808,7 +15892,8 @@ msgid "_Edit Message"
 msgstr "_Redigera meddelande"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid "A formatter plugin which displays audio attachments inline and allows you to play them directly from evolution."
+#, fuzzy
+msgid "A formatter plugin which displays audio attachments inline and allows you to play them directly from Evolution."
 msgstr "En formateringsinsticksmodul som visar infogade ljudbilagor och låter dig spela dem direkt från Evolution."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
@@ -16009,36 +16094,36 @@ msgstr "Åters_täll inställningar..."
 msgid "_Backup Settings..."
 msgstr "Inst_ällningar för säkerhetskopiering..."
 
-#: ../plugins/bbdb/bbdb.c:543
-#: ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/bbdb.c:615
+#: ../plugins/bbdb/bbdb.c:624
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatiska kontakter"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:567
+#: ../plugins/bbdb/bbdb.c:639
 msgid "_Auto-create address book entries when replying to messages"
 msgstr "Skapa _automatiskt poster i adressboken när meddelanden besvaras"
 
-#: ../plugins/bbdb/bbdb.c:573
+#: ../plugins/bbdb/bbdb.c:645
 msgid "Select Address book for Automatic Contacts"
 msgstr "Välj adressbok för automatiska kontakter"
 
-#: ../plugins/bbdb/bbdb.c:588
+#: ../plugins/bbdb/bbdb.c:660
 msgid "Instant Messaging Contacts"
 msgstr "Kontakter för snabbmeddelanden"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:603
+#: ../plugins/bbdb/bbdb.c:675
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "Synkronisera kontaktinformation och bilder från Pidgins kompislista"
 
-#: ../plugins/bbdb/bbdb.c:609
+#: ../plugins/bbdb/bbdb.c:681
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Välj adressbok för Pidgins kompislista"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:620
+#: ../plugins/bbdb/bbdb.c:692
 msgid "Synchronize with _buddy list now"
 msgstr "Synkronisera med _kompislistan nu"
 
@@ -16052,27 +16137,27 @@ msgid "BBDB"
 msgstr "BBDB"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:119
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Fel inträffade vid start av %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:143
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter-barnprocessen svarar inte, dödar..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:145
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Väntan på Bogofilter-barnprocessen avbröts, terminerar..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Rör till Bogofilter misslyckades, felkod: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:318
 msgid "Convert message text to _Unicode"
 msgstr "Konvertera meddelandetext till _Unicode"
 
@@ -16261,16 +16346,16 @@ msgstr "Standardkällor"
 msgid "Provides functionality for marking a calendar or an address book as the default one."
 msgstr "Tillhandahåller funktionalitet för att markera en kalender eller adressbok som standard."
 
-#: ../plugins/email-custom-header/email-custom-header.c:558
+#: ../plugins/email-custom-header/email-custom-header.c:560
 msgid "_Custom Header"
 msgstr "_Anpassad rubrik"
 
-#: ../plugins/email-custom-header/email-custom-header.c:879
+#: ../plugins/email-custom-header/email-custom-header.c:881
 msgid "Key"
 msgstr "Nyckel"
 
-#: ../plugins/email-custom-header/email-custom-header.c:890
-#: ../plugins/templates/templates.c:400
+#: ../plugins/email-custom-header/email-custom-header.c:892
+#: ../plugins/templates/templates.c:396
 msgid "Values"
 msgstr "Värden"
 
@@ -16321,28 +16406,28 @@ msgid "_User:"
 msgstr "_Användare:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:61
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
 msgid "Secure Password"
 msgstr "Säkert lösenord"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:64
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
 msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
 msgstr "Detta alternativ kommer att ansluta till Exchange-servern genom att använda säker lösenordsautentisering (NTLM)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "Lösenord i klartext"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
 msgid "This option will connect to the Exchange server using standard plaintext password authentication."
 msgstr "Detta alternativ kommer att ansluta till Exchange-servern genom att använda autentisering med lösenord i klartext."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:263
 msgid "Out Of Office"
 msgstr "Inte på kontoret"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:270
 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."
@@ -16351,90 +16436,90 @@ msgstr ""
 "till varje person som skickar e-post till dig när du inte är\n"
 "på kontoret."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:282
+#: ../plugins/exchange-operations/exchange-account-setup.c:287
 msgid "I am out of the office"
 msgstr "Jag är inte på kontoret"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/exchange-operations/exchange-account-setup.c:286
 msgid "I am in the office"
 msgstr "Jag är på kontoret"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:334
 msgid "Change the password for Exchange account"
 msgstr "Byt lösenordet på Exchange-kontot"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:336
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Byt lösenord"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:341
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Hantera delegatinställningarna för Exchange-kontot"
 
 # Felstavat... borde buggrapporteras.
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
 msgid "Delegation Assistant"
 msgstr "Delegeringsassistent"
 
 # Felstavat... borde buggrapporteras.
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:355
 msgid "Miscelleneous"
 msgstr "Diverse"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:365
 msgid "View the size of all Exchange folders"
 msgstr "Visa storleken på alla Exchange-mappar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:367
 msgid "Folders Size"
 msgstr "Mappstorlek"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange-inställningar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
+#: ../plugins/exchange-operations/exchange-account-setup.c:696
 msgid "_OWA URL:"
 msgstr "_OWA-URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
+#: ../plugins/exchange-operations/exchange-account-setup.c:722
 msgid "A_uthenticate"
 msgstr "A_utentisera"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#: ../plugins/exchange-operations/exchange-account-setup.c:743
 msgid "_Mailbox:"
 msgstr "_Brevlåda:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:944
 msgid "_Authentication Type"
 msgstr "_Autentiseringstyp"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
+#: ../plugins/exchange-operations/exchange-account-setup.c:958
 msgid "Ch_eck for Supported Types"
 msgstr "_Kontrollera vilka typer som stöds"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1062
-#: ../plugins/exchange-operations/exchange-contacts.c:212
+#: ../plugins/exchange-operations/exchange-account-setup.c:1073
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1064
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-account-setup.c:1075
+#: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#: ../plugins/exchange-operations/exchange-calendar.c:196
+#: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -16474,32 +16559,32 @@ msgstr "Ditt nuvarande lösenord har gått ut. Byt ditt lösenord nu."
 msgid "Your password will expire in the next %d days"
 msgstr "Ditt lösenord går ut om %d dagar"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-delegates-user.c:154
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Anpassad"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates-user.c:184
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Redaktör (läs, skapa, redigera)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates-user.c:188
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Författare (läs, skapa)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Granskare (skrivskyddad)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Delegaträttigheter"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-delegates-user.c:253
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
@@ -16508,31 +16593,31 @@ msgstr "Rättigheter för %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:341
+#: ../plugins/exchange-operations/exchange-delegates-user.c:343
 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 "Det här meddelandet skickades automatiskt av Evolution för att informera dig om att du har utsetts som en delegat. Du kan nu skicka meddelanden i mitt namn."
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
 msgid "You have been given the following permissions on my folders:"
 msgstr "Du har tilldelats följande rättigheter på mina mappar:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:364
+#: ../plugins/exchange-operations/exchange-delegates-user.c:366
 msgid "You are also permitted to see my private items."
 msgstr "Du tillåts även att se mina privata objekt."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
 msgid "However you are not permitted to see my private items."
 msgstr "Dock har du inte tillåtelse att se mina privata objekt."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Du har utsetts till en delegat för %s"
@@ -16735,8 +16820,8 @@ msgstr "Lägg till användare:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:934
-#: ../plugins/groupwise-features/share-folder.c:715
+#: ../plugins/groupwise-features/proxy.c:937
+#: ../plugins/groupwise-features/share-folder.c:716
 msgid "Add User"
 msgstr "Lägg till användare"
 
@@ -16856,11 +16941,11 @@ msgstr "_Känslighet: "
 msgid "_User"
 msgstr "_Användare"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:138
+#: ../plugins/exchange-operations/exchange-user-dialog.c:136
 msgid "Select User"
 msgstr "Välj användare"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+#: ../plugins/exchange-operations/exchange-user-dialog.c:174
 msgid "Address Book..."
 msgstr "Adressbok..."
 
@@ -17013,7 +17098,7 @@ msgid "Folder offline"
 msgstr "Mapp frånkopplad"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1306
+#: ../shell/e-shell.c:1270
 msgid "Generic error"
 msgstr "Allmänt fel"
 
@@ -17265,10 +17350,6 @@ msgstr "A_nsikte"
 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 "Bifoga Face-rubrik i utgående meddelanden. Första gången behöver användaren ange en png-fil på 48x48 bildpunkter. Den är base64-kodad och lagras i ~/.evolution/faces. Den kommer att användas i meddelanden som skickas senare."
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "Ansikte"
-
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -17326,7 +17407,7 @@ msgid "<b>Server</b>"
 msgstr "<b>Server</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar and contacts."
+msgid "A plugin to setup Google Calendar and Contacts."
 msgstr "En insticksmodul för att konfigurera Google Kalender och Kontakter."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -17338,14 +17419,14 @@ msgid "Checklist"
 msgstr "Kontrollista"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
-msgstr "En insticksmodul för att konfigurera Groupwise-kalender och kontaktkällor."
+msgid "A plugin to setup GroupWise calendar and contacts sources."
+msgstr "En insticksmodul för att konfigurera GroupWise-kalender och kontaktkällor."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
-msgstr "Konfiguration av Groupwise-konto"
+msgid "GroupWise Account Setup"
+msgstr "Konfiguration av GroupWise-konto"
 
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17370,11 +17451,11 @@ msgstr ""
 "Klicka på \"Framåt\" för att installera den delade mappen\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:225
 msgid "Install the shared folder"
 msgstr "Installera den delade mappen"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:227
 msgid "Shared Folder Installation"
 msgstr "Installation av delad mapp"
 
@@ -17400,7 +17481,7 @@ msgid "Email:"
 msgstr "E-post:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "_Inaktivera"
 
@@ -17429,16 +17510,16 @@ msgid "Retract Mail"
 msgstr "Ã…terkalla e-post"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to groupwise messages"
-msgstr "Lägger till alternativ för sändning till groupwise-meddelanden"
+msgid "Add Send Options to GroupWise messages"
+msgstr "Lägg till alternativ för sändning till GroupWise-meddelanden"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
-msgstr "En insticksmodul för funktionerna i Groupwise-konton."
+msgid "A plugin for the features in GroupWise accounts."
+msgstr "En insticksmodul för funktionerna i GroupWise-konton."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
-msgstr "Groupwise-funktioner"
+msgid "GroupWise Features"
+msgstr "GroupWise-funktioner"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
 msgid "Message retract failed"
@@ -17454,20 +17535,23 @@ msgstr "Servern tillät inte att det valda meddelandet återkallades."
 msgid "Invalid user"
 msgstr "Ogiltig användare"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#. 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-errors.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "Åtkomst till proxyserver kan inte ges till användaren &quot;{0}&quot;"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
 msgid "Specify User"
 msgstr "Ange användare"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#. 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-errors.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "Du har redan tilldelat proxyrättigheter till denna användare."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+#. 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-errors.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr "Du måste ange ett giltigt användarnamn att ge proxyrättigheter."
 
@@ -17487,20 +17571,23 @@ msgstr "Proxyinloggning som &quot;{0}&quot; misslyckades. Kontrollera din e-post
 msgid "This is a recurring meeting"
 msgstr "Detta är ett återkommande sammanträde"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 msgid "Would you like to accept it?"
 msgstr "Vill du acceptera det?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "Would you like to decline it?"
 msgstr "Vill du avslå det?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
-msgstr "Du kan inte dela mapp med angivna användaren &quot;{0}&quot;"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "Du kan inte dela denna mapp med angivna användaren &quot;{0}&quot;"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
-msgid "You have to specify a user name whom you want to add to the list"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+#, fuzzy
+msgid "You have to specify a user name which you want to add to the list"
 msgstr "Du måste ange ett användarnamn vilket du vill lägga till i listan"
 
 #: ../plugins/groupwise-features/process-meeting.c:52
@@ -17601,10 +17688,10 @@ msgstr "<b>Kontonamn</b>"
 msgid "Proxy Login"
 msgstr "Proxyinloggning"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
 #: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:83
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sAnge lösenord för %s (användare %s)"
@@ -17612,20 +17699,27 @@ msgstr "%sAnge lösenord för %s (användare %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:509
+#: ../plugins/groupwise-features/proxy-login.c:510
 msgid "_Proxy Login..."
 msgstr "_Proxyinloggning..."
 
-#: ../plugins/groupwise-features/proxy.c:691
+#. 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:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Proxyfliken kommer endast att vara tillgänglig när kontot är i anslutet läge."
 
-#: ../plugins/groupwise-features/proxy.c:696
+#. 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:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Proxyfliken kommer endast att vara åtkomlig när kontot är aktiverat."
 
+#: ../plugins/groupwise-features/send-options.c:214
+#, fuzzy
+msgid "Advanced send options"
+msgstr "Infoga avancerade sändningsalternativ"
+
 #: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:750
+#: ../plugins/groupwise-features/share-folder.c:751
 msgid "Users"
 msgstr "Användare"
 
@@ -17641,68 +17735,68 @@ msgstr "Ny _delad mapp..."
 msgid "Sharing"
 msgstr "Delning"
 
-#: ../plugins/groupwise-features/share-folder.c:533
+#: ../plugins/groupwise-features/share-folder.c:534
 msgid "Custom Notification"
 msgstr "Anpassad notifiering"
 
-#: ../plugins/groupwise-features/share-folder.c:755
+#: ../plugins/groupwise-features/share-folder.c:756
 msgid "Add   "
 msgstr "Lägg till   "
 
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:762
 msgid "Modify"
 msgstr "Ändra"
 
-#: ../plugins/groupwise-features/status-track.c:105
+#: ../plugins/groupwise-features/status-track.c:107
 msgid "Message Status"
 msgstr "Meddelandestatus"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:119
+#: ../plugins/groupwise-features/status-track.c:121
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: ../plugins/groupwise-features/status-track.c:133
+#: ../plugins/groupwise-features/status-track.c:135
 msgid "From:"
 msgstr "Från:"
 
-#: ../plugins/groupwise-features/status-track.c:148
+#: ../plugins/groupwise-features/status-track.c:150
 msgid "Creation date:"
 msgstr "Skapat den:"
 
-#: ../plugins/groupwise-features/status-track.c:187
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Recipient: "
 msgstr "Mottagare: "
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:196
 msgid "Delivered: "
 msgstr "Levererat: "
 
-#: ../plugins/groupwise-features/status-track.c:200
+#: ../plugins/groupwise-features/status-track.c:202
 msgid "Opened: "
 msgstr "Öppnat: "
 
-#: ../plugins/groupwise-features/status-track.c:205
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Accepted: "
 msgstr "Accepterat: "
 
-#: ../plugins/groupwise-features/status-track.c:210
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Deleted: "
 msgstr "Borttaget: "
 
-#: ../plugins/groupwise-features/status-track.c:215
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Declined: "
 msgstr "Avslaget: "
 
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:222
 msgid "Completed: "
 msgstr "Färdigt: "
 
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:227
 msgid "Undelivered: "
 msgstr "Inte levererat: "
 
-#: ../plugins/groupwise-features/status-track.c:249
+#: ../plugins/groupwise-features/status-track.c:251
 msgid "Track Message Status..."
 msgstr "Spåra meddelandestatus..."
 
@@ -17804,24 +17898,24 @@ msgstr "Importera till kalender"
 msgid "Imports ICS attachments to calendar."
 msgstr "Importerar ICS-bilagor till kalender."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "Hardware Abstraction Layer inte inläst"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
 msgid "The \"hald\" service is required but not currently running. Please enable the service and rerun this program, or contact your system administrator."
 msgstr "Tjänsten \"hald\" krävs men är inte igång för tillfället. Aktivera tjänsten och starta om det här programmet, eller kontakta din systemadministratör."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
 msgid "Search for an iPod failed"
 msgstr "Sökning efter en iPod misslyckades"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
 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 kunde inte hitta en iPod att synkronisera med. Antingen är iPod inte ansluten till systemet eller så är den inte påslagen."
 
-#: ../plugins/ipod-sync/ical-format.c:118
-#: ../plugins/save-calendar/ical-format.c:163
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar-format (.ics)"
 
@@ -17837,176 +17931,176 @@ msgstr "Synkronisera till iPod"
 msgid "iPod Synchronization"
 msgstr "iPod-synkronisering"
 
-#: ../plugins/itip-formatter/itip-formatter.c:443
-#: ../plugins/itip-formatter/itip-formatter.c:568
+#: ../plugins/itip-formatter/itip-formatter.c:481
+#: ../plugins/itip-formatter/itip-formatter.c:606
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Misslyckades med att läsa in kalendern \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:588
+#: ../plugins/itip-formatter/itip-formatter.c:626
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Ett möte i kalendern \"%s\" är i konflikt med detta sammanträde"
 
-#: ../plugins/itip-formatter/itip-formatter.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:652
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Hittade mötet i kalendern \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:738
 msgid "Unable to find any calendars"
 msgstr "Kunde inte hitta några kalendrar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:745
 msgid "Unable to find this meeting in any calendar"
 msgstr "Kunde inte hitta detta sammanträde i någon kalender"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:749
 msgid "Unable to find this task in any task list"
 msgstr "Kunde inte hitta denna uppgift i någon uppgiftslista"
 
-#: ../plugins/itip-formatter/itip-formatter.c:705
+#: ../plugins/itip-formatter/itip-formatter.c:753
 msgid "Unable to find this memo in any memo list"
 msgstr "Kunde inte hitta detta memo i någon memolista"
 
-#: ../plugins/itip-formatter/itip-formatter.c:776
+#: ../plugins/itip-formatter/itip-formatter.c:824
 msgid "Searching for an existing version of this appointment"
 msgstr "Söker efter en befintlig version av detta möte"
 
-#: ../plugins/itip-formatter/itip-formatter.c:945
+#: ../plugins/itip-formatter/itip-formatter.c:993
 msgid "Unable to parse item"
 msgstr "Kan inte tolka objekt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1003
+#: ../plugins/itip-formatter/itip-formatter.c:1051
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kan inte skicka objekt till kalendern \"%s\". %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1015
+#: ../plugins/itip-formatter/itip-formatter.c:1063
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Skickade till kalendern \"%s\" som accepterat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1067
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Skickade till kalendern \"%s\" som preliminärt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1072
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Skickade till kalendern \"%s\" som avslaget"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1077
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Skickade till kalendern \"%s\" som avbrutet"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1171
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisatören har tagit bort delegaten %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1178
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Skickade ett avbokningsmeddelande till delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1180
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunde inte skicka en avbokningsnotering till delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1218
+#: ../plugins/itip-formatter/itip-formatter.c:1266
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Deltagarstatus kunde inte uppdateras eftersom statusen är ogiltig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1245
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan inte uppdatera deltagare. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1297
 msgid "Attendee status updated"
 msgstr "Deltagarstatusen är uppdaterad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1323
 msgid "Meeting information sent"
 msgstr "Sammanträdesinformation skickad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1326
 msgid "Task information sent"
 msgstr "Uppgiftsinformation skickad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1329
 msgid "Memo information sent"
 msgstr "Memoinformation skickad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1338
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kunde inte skicka sammanträdesinformation, sammanträdet finns inte"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1341
 msgid "Unable to send task information, the task does not exist"
 msgstr "Kunde inte skicka uppgiftsinformation, uppgiften finns inte"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1296
+#: ../plugins/itip-formatter/itip-formatter.c:1344
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Kunde inte skicka memoinformation, memot finns inte"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1365
-#: ../plugins/itip-formatter/itip-formatter.c:1376
+#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1424
 msgid "The calendar attached is not valid"
 msgstr "Den bifogade kalendern är inte giltig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1414
+#: ../plugins/itip-formatter/itip-formatter.c:1425
 msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
 msgstr "Meddelandet påstår sig innehålla en kalender, men kalendern är inte en giltig iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
-#: ../plugins/itip-formatter/itip-formatter.c:1435
-#: ../plugins/itip-formatter/itip-formatter.c:1517
+#: ../plugins/itip-formatter/itip-formatter.c:1465
+#: ../plugins/itip-formatter/itip-formatter.c:1493
+#: ../plugins/itip-formatter/itip-formatter.c:1575
 msgid "The item in the calendar is not valid"
 msgstr "Objektet i kalendern är inte giltigt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1418
-#: ../plugins/itip-formatter/itip-formatter.c:1436
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1466
+#: ../plugins/itip-formatter/itip-formatter.c:1494
+#: ../plugins/itip-formatter/itip-formatter.c:1576
 msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
 msgstr "Meddelandet innehåller en kalender, men kalendern innehåller inga evenemang, uppgifter eller ledig-/upptageninformation"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1447
+#: ../plugins/itip-formatter/itip-formatter.c:1505
 msgid "The calendar attached contains multiple items"
 msgstr "Den bifogade kalendern innehåller flera objekt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1506
 msgid "To process all of these items, the file should be saved and the calendar imported"
 msgstr "För att kunna behandla alla dessa objekt bör filen sparas och kalendern importeras"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2215
 msgid "This meeting recurs"
 msgstr "Detta möte upprepas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2218
 msgid "This task recurs"
 msgstr "Denna uppgift upprepas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2221
 msgid "This memo recurs"
 msgstr "Detta memo upprepas"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2457
 msgid "_Delete message after acting"
 msgstr "_Ta bort meddelande efter åtgärd"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2467
+#: ../plugins/itip-formatter/itip-formatter.c:2499
 msgid "Conflict Search"
 msgstr "Konfliktsökning"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Välj de kalendrar som ska genomsökas efter sammanträdeskonflikter"
 
@@ -18454,11 +18548,11 @@ msgstr "_Tillämpa på alla instanser"
 msgid "Show time as _free"
 msgstr "Visa tid som _ledig"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1870
 msgid "_Tasks :"
 msgstr "_Uppgifter :"
 
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1872
 msgid "Memos :"
 msgstr "Memon :"
 
@@ -18483,7 +18577,7 @@ msgstr "Detta sammanträde har delegerats"
 msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "Detta svar är inte från en nuvarande deltagare. Lägg till avsändaren som deltagare?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr "Proxy_utloggning"
 
@@ -18559,20 +18653,20 @@ msgstr "Huruvida ikonen ska vara blinka eller inte."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Huruvida notifiering av nya meddelanden endast ska göras för Inkorgen."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "Generera ett _D-Bus-meddelande"
 
-#: ../plugins/mail-notification/mail-notification.c:377
+#: ../plugins/mail-notification/mail-notification.c:378
 msgid "Evolution's Mail Notification"
 msgstr "Evolutions e-postnotifiering"
 
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:399
 msgid "Mail Notification Properties"
 msgstr "Egenskaper för e-postnotifiering"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18587,55 +18681,55 @@ msgstr[1] ""
 "Du har fått %d nya meddelanden\n"
 "i %s."
 
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../plugins/mail-notification/mail-notification.c:463
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Du har fått %d nytt meddelande."
 msgstr[1] "Du har fått %d nya meddelanden."
 
-#: ../plugins/mail-notification/mail-notification.c:479
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:480
+#: ../plugins/mail-notification/mail-notification.c:485
 msgid "New email"
 msgstr "Nya e-postmeddelanden"
 
-#: ../plugins/mail-notification/mail-notification.c:541
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "Show icon in _notification area"
 msgstr "Visa ikon i _notifieringsytan"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:547
 msgid "B_link icon in notification area"
 msgstr "B_linka med ikon i notifieringsytan"
 
-#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:549
 msgid "Popup _message together with the icon"
 msgstr "Visa popup_meddelande tillsammans med ikonen"
 
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:730
 msgid "_Play sound when new messages arrive"
 msgstr "Spela _upp ljud när nya meddelanden anländer"
 
-#: ../plugins/mail-notification/mail-notification.c:733
+#: ../plugins/mail-notification/mail-notification.c:736
 msgid "_Beep"
 msgstr "_Pip"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:737
 msgid "Play _sound file"
 msgstr "Spela upp _ljudfil"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Specify _filename:"
 msgstr "Ange _filnamn:"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:749
 msgid "Select sound file"
 msgstr "Välj ljudfil"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:750
 msgid "Pl_ay"
 msgstr "Spela u_pp"
 
-#: ../plugins/mail-notification/mail-notification.c:804
+#: ../plugins/mail-notification/mail-notification.c:807
 msgid "Notify new messages for _Inbox only"
 msgstr "Notifiera om nya meddelanden endast för _inkorgen"
 
@@ -18864,22 +18958,6 @@ msgstr "Markera meddelanden som _lästa"
 msgid "Used for marking all the messages under a folder as read"
 msgstr "Används för att markera alla meddelanden under en mapp som lästa"
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "Markera kalendern som frånkopplad"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "Markerar den valda kalendern för frånkopplad visning."
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make available for offline use"
-msgstr "Gör _inte tillgänglig i frånkopplat läge"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Make available for offline use"
-msgstr "_Gör tillgänglig för användning i frånkopplat läge"
-
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
 msgstr "En insticksmodul som implementerar mono-insticksmoduler."
@@ -18986,8 +19064,9 @@ msgstr "Platser"
 msgid "_Publish Calendar Information"
 msgstr "_Publicera kalendarinformation"
 
-#: ../plugins/publish-calendar/publish-calendar.c:595
-msgid "Are you sure you want to remove this URL?"
+#: ../plugins/publish-calendar/publish-calendar.c:596
+#, fuzzy
+msgid "Are you sure you want to remove this location?"
 msgstr "Är du säker på att du vill ta bort denna URL?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
@@ -19026,7 +19105,7 @@ msgstr "Publicerings_frekvens:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
 msgid ""
-"SSH\n"
+"Secure FTP (SSH)\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -19034,7 +19113,7 @@ msgid ""
 "Secure WebDAV (HTTPS)\n"
 "Custom Location"
 msgstr ""
-"SSH\n"
+"Säker FTP (SSH)\n"
 "Publik FTP\n"
 "FTP (med inloggning)\n"
 "Windows-utdelning\n"
@@ -19091,58 +19170,59 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Testinsticksmodul för Python EPlugin-inläsare."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using python."
+#, fuzzy
+msgid "A plugin which loads other plugins written using Python."
 msgstr "En insticksmodul som läser in andra insticksmoduler skrivna i python."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
 msgstr "Python-inläsare"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (inbyggd)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin hittades inte, kod: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Misslyckades med att skapa rör: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Fel efter processgrening: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassins barnprocess svarar inte, dödar..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
 #, c-format
-msgid "Wait for Spamassassin child process interrupted, terminating..."
-msgstr "Väntan på Spamassassin-barnprocess avbröts, terminerar..."
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
+msgstr "Väntan på SpamAssassin-barnprocess avbröts, terminerar..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Rör till SpamAssassin misslyckades, felkod: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "SpamAssassin är inte tillgänglig."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Detta kommer att göra SpamAssassin mer pålitligt, men långsammare"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 msgid "I_nclude remote tests"
 msgstr "_Inkludera fjärrtester"
 
@@ -19151,12 +19231,12 @@ msgid "Filters junk messages using SpamAssassin. This plugin requires SpamAssass
 msgstr "Filtrerar skräpmeddelanden med SpamAssassin. Denna insticksmodul kräver att SpamAssassin är installerad."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "Skräppostinsticksmodulen Spamassassin"
+msgid "SpamAssassin Options"
+msgstr "Alternativ för SpamAssassin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "Alternativ för Spamassassin"
+msgid "SpamAssassin junk plugin"
+msgstr "Skräppostinsticksmodulen Spamassassin"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -19164,7 +19244,7 @@ msgstr "En insticksmodul för att spara alla bilagor eller delar av ett meddelan
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:314
+#: ../plugins/save-attachments/save-attachments.c:315
 msgid "Save attachments"
 msgstr "Spara bilagor"
 
@@ -19176,15 +19256,15 @@ msgstr "Spara bilagor..."
 msgid "Save all attachments"
 msgstr "Spara alla bilagor"
 
-#: ../plugins/save-attachments/save-attachments.c:320
+#: ../plugins/save-attachments/save-attachments.c:321
 msgid "Select save base name"
 msgstr "Välj basnamn för sparande"
 
-#: ../plugins/save-attachments/save-attachments.c:339
+#: ../plugins/save-attachments/save-attachments.c:340
 msgid "MIME Type"
 msgstr "MIME-typ"
 
-#: ../plugins/save-attachments/save-attachments.c:347
+#: ../plugins/save-attachments/save-attachments.c:348
 msgid "Save"
 msgstr "Spara"
 
@@ -19192,79 +19272,79 @@ msgstr "Spara"
 #. * 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:162
+#: ../plugins/save-calendar/csv-format.c:163
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "Beskrivningslista"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "Kategorilista"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "Kommentarlista"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "Skapat"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "Kontaktlista"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "Start"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "Slut"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "procent klart"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "Deltagarlista"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "Ändrad"
 
-#: ../plugins/save-calendar/csv-format.c:531
+#: ../plugins/save-calendar/csv-format.c:532
 msgid "Advanced options for the CSV format"
 msgstr "Avancerade alternativ för CVS-formatet"
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Prepend a header"
 msgstr "Lägg till en rubrik före"
 
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:548
 msgid "Value delimiter:"
 msgstr "Värdeavskiljare:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:554
 msgid "Record delimiter:"
 msgstr "Postavskiljare:"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "Encapsulate values with:"
 msgstr "Kapsla in värden med:"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "Kommaseparerat värdeformat (.csv)"
 
@@ -19285,15 +19365,15 @@ msgstr "_Spara till disk"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:149
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:376
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF format (.rdf)"
 msgstr "RDF-format (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:160
+#: ../plugins/save-calendar/save-calendar.c:161
 msgid "Select destination file"
 msgstr "Välj målfil"
 
@@ -19325,15 +19405,15 @@ msgstr "Hjälper dig genom dina initiala kontoinställningar."
 msgid "Setup Assistant"
 msgstr "Konfigurationsguide"
 
-#: ../plugins/startup-wizard/startup-wizard.c:83
+#: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "Evolutions konfigurationsguide"
 
-#: ../plugins/startup-wizard/startup-wizard.c:86
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "Välkommen"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
 "\n"
@@ -19343,28 +19423,28 @@ msgstr ""
 "\n"
 "Klicka på knappen \"Framåt\" för att fortsätta. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:133
+#: ../plugins/startup-wizard/startup-wizard.c:135
 msgid "Importing files"
 msgstr "Importerar filer"
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:137
 #: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Välj den information som du vill importera:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../plugins/startup-wizard/startup-wizard.c:152
 #: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "Från %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:232
 #: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Importerar data."
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:234
 #: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Var god vänta"
@@ -19390,15 +19470,15 @@ msgstr "Fall tillbaka på trådning av meddelanden efter _ämne"
 msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
 msgstr "Lista över nyckelord/värdepar för insticksmodulen Mallar att ersätta i meddelandetexten."
 
-#: ../plugins/templates/templates.c:615
+#: ../plugins/templates/templates.c:603
 msgid "No title"
 msgstr "Ingen titel"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:711
 msgid "Save as _Template"
 msgstr "Spara som _mall"
 
-#: ../plugins/templates/templates.c:745
+#: ../plugins/templates/templates.c:713
 msgid "Save as Template"
 msgstr "Spara som mall"
 
@@ -19407,7 +19487,8 @@ msgid "Drafts based template plugin"
 msgstr "Utdragsbaserad mallinsticksmodul"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses ytnef to decode tnef attachments."
+#, fuzzy
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
 msgstr "En enkel insticksmodul som använder ytnef för att avkoda tnef-bilagor."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
@@ -19433,7 +19514,8 @@ msgid "URL:"
 msgstr "URL:"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
-msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+#, fuzzy
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Undvik IfMatch (behövs på Apache < 2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -19732,7 +19814,7 @@ msgstr "Inställningar för Evolution"
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
 #: ../shell/e-shell-view.c:47
-#: ../shell/e-shell-window.c:332
+#: ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -19757,7 +19839,7 @@ msgstr "Bug-buddy kunde inte köras."
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:729
+#: ../shell/e-shell-window-commands.c:942
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander\n"
@@ -19770,28 +19852,28 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "tp-sv@listor.tp-sv.se"
 
-#: ../shell/e-shell-window-commands.c:740
+#: ../shell/e-shell-window-commands.c:953
 msgid "Evolution Website"
 msgstr "Evolutions webbplats"
 
-#: ../shell/e-shell-window-commands.c:758
+#: ../shell/e-shell-window-commands.c:971
 msgid "Error opening the FAQ webpage."
 msgstr "Fel vid öppnande av webbplats för frågor och svar."
 
-#: ../shell/e-shell-window-commands.c:955
+#: ../shell/e-shell-window-commands.c:1174
 msgid "_Work Online"
 msgstr "A_rbeta ansluten"
 
-#: ../shell/e-shell-window-commands.c:968
+#: ../shell/e-shell-window-commands.c:1187
 #: ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "A_rbeta frånkopplad"
 
-#: ../shell/e-shell-window-commands.c:981
+#: ../shell/e-shell-window-commands.c:1200
 msgid "Work Offline"
 msgstr "Arbeta frånkopplad"
 
-#: ../shell/e-shell-window.c:381
+#: ../shell/e-shell-window.c:377
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -19799,11 +19881,11 @@ msgstr ""
 "Evolution är just nu i anslutet läge.\n"
 "Klicka på denna knapp för att arbeta frånkopplad."
 
-#: ../shell/e-shell-window.c:388
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution håller på att koppla från."
 
-#: ../shell/e-shell-window.c:395
+#: ../shell/e-shell-window.c:391
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -19811,7 +19893,7 @@ msgstr ""
 "Evolution är just nu i frånkopplat läge.\n"
 "Klicka på denna knapp för att arbeta ansluten."
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:787
 #, c-format
 msgid "Switch to %s"
 msgstr "Växla till %s"
@@ -19826,20 +19908,20 @@ msgstr "Okänt systemfel."
 msgid "%ld KB"
 msgstr "%ld kB"
 
-#: ../shell/e-shell.c:1298
+#: ../shell/e-shell.c:1262
 #: ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1300
+#: ../shell/e-shell.c:1264
 msgid "Invalid arguments"
 msgstr "Ogiltiga argument"
 
-#: ../shell/e-shell.c:1302
+#: ../shell/e-shell.c:1266
 msgid "Cannot register on OAF"
 msgstr "Kan inte registrera på OAF"
 
-#: ../shell/e-shell.c:1304
+#: ../shell/e-shell.c:1268
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabasen hittades inte"
 
@@ -19883,8 +19965,9 @@ msgid "Importer Type"
 msgstr "Importörstyp"
 
 #: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr "Välj importörer"
+#, fuzzy
+msgid "Select Information to Import"
+msgstr "Välj mapp att importera till"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -19996,30 +20079,35 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Är du säker på att du vill glömma alla ihågkomna lösenord?"
 
 #: ../shell/shell.error.xml.h:2
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Starta om Evolution"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Fortsätt"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "Ta bort gamla data från version {0}?"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "Evolution kan inte starta."
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:6
 msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
 msgstr "Att glömma dina lösenord kommer att tömma alla ihågkomna lösenord. Du kommer att frågas igen nästa gång de behövs."
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "Inte tillräckligt med diskutrymme för uppgradering."
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "Verkligen ta bort gamla data?"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be permanently removed.\n"
 "\n"
@@ -20033,9 +20121,10 @@ msgstr ""
 "\n"
 "När du väl har tagit bort katalogen kan du inte nedgradera till den föregående versionen av Evolution igen utan manuellt ingripande.\n"
 
-#: ../shell/shell.error.xml.h:15
+#: ../shell/shell.error.xml.h:16
+#, fuzzy
 msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+"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 ""
@@ -20043,11 +20132,11 @@ msgstr ""
 "\n"
 "Om du väljer att ta bort dessa data, kommer hela innehållet i &quot;evolution&quot;-katalogen att tas bort permanent. Om du väljer att behålla denna data, kan du manuellt ta bort innehållet i &quot;evolution&quot; när du känner för det.\n"
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "Uppgradering från tidigare version misslyckades: {0}"
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:21
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but you only have {1} available.\n"
 "\n"
@@ -20057,7 +20146,7 @@ msgstr ""
 "\n"
 "Du kommer att behöva frigöra mer utrymme i din hemkatalog innan du kan fortsätta."
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -20067,7 +20156,7 @@ msgstr ""
 "\n"
 "Klicka på hjälp för detaljer"
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -20081,19 +20170,19 @@ msgstr ""
 "\n"
 "Klicka på hjälp för detaljer."
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "_Glöm"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "_Behåll data"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "_PÃ¥minn mig senare"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
@@ -20151,7 +20240,7 @@ msgstr "Ändamål"
 
 #: ../smime/gui/certificate-manager.c:289
 #: ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:570
+#: ../smime/lib/e-cert.c:553
 msgid "Serial Number"
 msgstr "Serienummer"
 
@@ -20266,7 +20355,7 @@ msgid "Before trusting this CA for any purpose, you should examine its certifica
 msgstr "Innan du litar på denna certifikatutfärdare för något ändamål, bör du granska dess certifikat och dess policy och procedurer (om de är tillgängliga)."
 
 #: ../smime/gui/smime-ui.glade.h:14
-#: ../smime/lib/e-cert.c:1077
+#: ../smime/lib/e-cert.c:1060
 msgid "Certificate"
 msgstr "Certifikat"
 
@@ -20343,12 +20432,12 @@ msgid "SHA1 Fingerprint"
 msgstr "SHA1-fingeravtryck"
 
 #: ../smime/gui/smime-ui.glade.h:35
-#: ../smime/lib/e-cert.c:819
+#: ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
 msgstr "SSL-klientcertifikat"
 
 #: ../smime/gui/smime-ui.glade.h:36
-#: ../smime/lib/e-cert.c:823
+#: ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "SSL-servercertifikat"
 
@@ -20393,187 +20482,187 @@ msgid "_Edit CA Trust"
 msgstr "_Redigera pålitlighet för certifikatutfärdare"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:672
+#: ../smime/lib/e-cert-db.c:656
 msgid "Certificate already exists"
 msgstr "Certifikatet finns redan"
 
-#: ../smime/lib/e-cert.c:239
-#: ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:222
+#: ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%d-%m-%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:408
 msgid "Sign"
 msgstr "Signera"
 
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:409
 msgid "Encrypt"
 msgstr "Kryptera"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:514
 msgid "Version"
 msgstr "Version"
 
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:529
 msgid "Version 1"
 msgstr "Version 1"
 
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:532
 msgid "Version 2"
 msgstr "Version 2"
 
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:535
 msgid "Version 3"
 msgstr "Version 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:617
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS 1 MD2 med RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:620
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS 1 MD5 med RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:623
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS 1 SHA-1 med RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:650
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS 1 RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:653
 msgid "Certificate Key Usage"
 msgstr "Användning av certifikatnyckel"
 
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:656
 msgid "Netscape Certificate Type"
 msgstr "Netscape-certifikattyp"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:659
 msgid "Certificate Authority Key Identifier"
 msgstr "Nyckelidentifierare för certifikatutfärdare"
 
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:671
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objektidentifierare (%s)"
 
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "Algoritmidentifierare"
 
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "Algoritmparametrar"
 
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr "Information om publik nyckel för objektet"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritm för objektets publika nyckel"
 
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr "Objektets publika nyckel"
 
-#: ../smime/lib/e-cert.c:810
-#: ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:793
+#: ../smime/lib/e-cert.c:842
 msgid "Error: Unable to process extension"
 msgstr "Fel: Kan inte bearbeta utökning"
 
-#: ../smime/lib/e-cert.c:831
-#: ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:814
+#: ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr "Objektsignerare"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "SSL-certifikatutfärdare"
 
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr "E-postcertifikatutfärdare"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:850
 msgid "Signing"
 msgstr "Signerar"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:854
 msgid "Non-repudiation"
 msgstr "Ickeförkastande"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:858
 msgid "Key Encipherment"
 msgstr "Nyckelchiffrering"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:862
 msgid "Data Encipherment"
 msgstr "Datachiffrering"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:866
 msgid "Key Agreement"
 msgstr "Nyckelavtal"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:870
 msgid "Certificate Signer"
 msgstr "Certifikatsignerare"
 
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:874
 msgid "CRL Signer"
 msgstr "CRL-signerare"
 
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:922
 msgid "Critical"
 msgstr "Kritiskt"
 
-#: ../smime/lib/e-cert.c:941
-#: ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:924
+#: ../smime/lib/e-cert.c:927
 msgid "Not Critical"
 msgstr "Inte kritiskt"
 
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:948
 msgid "Extensions"
 msgstr "Utökningar"
 
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1019
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092
-#: ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1075
+#: ../smime/lib/e-cert.c:1195
 msgid "Certificate Signature Algorithm"
 msgstr "Certifikatsignaturalgoritm"
 
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1084
 msgid "Issuer"
 msgstr "Utfärdare"
 
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1138
 msgid "Issuer Unique ID"
 msgstr "Unikt id för utfärdare"
 
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1157
 msgid "Subject Unique ID"
 msgstr "Unikt id för objektet"
 
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1200
 msgid "Certificate Signature Value"
 msgstr "Certifikatsignaturvärde"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "PKCS12-fillösenord"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "Enter password for PKCS12 file:"
 msgstr "Ange lösenord för PKCS12-fil:"
 
-#: ../smime/lib/e-pkcs12.c:343
+#: ../smime/lib/e-pkcs12.c:348
 msgid "Imported Certificate"
 msgstr "Importerat certifikat"
 
@@ -20718,7 +20807,7 @@ msgid "Save the contacts of the selected folder as VCard"
 msgstr "Spara kontakterna i den markerade mappen som VCard"
 
 #: ../ui/evolution-addressbook.xml.h:34
-#: ../widgets/text/e-text.c:2723
+#: ../widgets/text/e-text.c:2724
 msgid "Select All"
 msgstr "Markera allt"
 
@@ -20855,7 +20944,7 @@ msgstr "MÃ¥nad"
 
 #: ../ui/evolution-calendar.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:196
+#: ../widgets/misc/e-calendar.c:195
 msgid "Next"
 msgstr "Nästa"
 
@@ -20865,7 +20954,7 @@ msgstr "Förhandsgranskar kalendern som ska skrivas ut"
 
 #: ../ui/evolution-calendar.xml.h:19
 #: ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:172
+#: ../widgets/misc/e-calendar.c:171
 msgid "Previous"
 msgstr "Föregående"
 
@@ -22048,17 +22137,17 @@ msgid "Define Views for \"%s\""
 msgstr "Definiera vyer för \"%s\""
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1922
+#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
-#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Tabell"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
 msgid "Instance"
 msgstr "Instans"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Spara aktuell vy"
 
@@ -22134,16 +22223,16 @@ msgstr "Typ av vy:"
 msgid "Attachment Bar"
 msgstr "Bilagerad"
 
-#: ../widgets/misc/e-attachment.c:291
-#: ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:591
-#: ../widgets/misc/e-attachment.c:608
+#: ../widgets/misc/e-attachment.c:290
+#: ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590
+#: ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Kan inte bifoga filen %s: %s"
 
-#: ../widgets/misc/e-attachment.c:299
-#: ../widgets/misc/e-attachment.c:600
+#: ../widgets/misc/e-attachment.c:298
+#: ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Kan inte bifoga filen %s: inte en vanlig fil"
@@ -22169,75 +22258,75 @@ msgstr "Föreslå automatisk visning av bilaga"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:221
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "MÃ¥nadskalender"
 
-#: ../widgets/misc/e-canvas-background.c:453
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:455
 #: ../widgets/text/e-text.c:3644
+#: ../widgets/text/e-text.c:3645
 msgid "Fill color"
 msgstr "Fyllningsfärg"
 
-#: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:462
 #: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/text/e-text.c:3650
+#: ../widgets/misc/e-canvas-background.c:469
 #: ../widgets/text/e-text.c:3651
-#: ../widgets/text/e-text.c:3658
+#: ../widgets/text/e-text.c:3652
 #: ../widgets/text/e-text.c:3659
+#: ../widgets/text/e-text.c:3660
 msgid "GDK fill color"
 msgstr "GDK-fyllningsfärg"
 
 # Osäker
-#: ../widgets/misc/e-canvas-background.c:474
 #: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:476
 #: ../widgets/text/e-text.c:3666
+#: ../widgets/text/e-text.c:3667
 msgid "Fill stipple"
 msgstr "Fyll stöppling"
 
-#: ../widgets/misc/e-canvas-background.c:481
 #: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:488
 #: ../widgets/misc/e-canvas-background.c:489
+#: ../widgets/misc/e-canvas-background.c:490
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:495
 #: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:497
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:502
 #: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:504
 msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:91
-#: ../widgets/misc/e-reflow.c:1426
+#: ../widgets/misc/e-reflow.c:1417
 #: ../widgets/table/e-table-group-container.c:999
 #: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3074
+#: ../widgets/table/e-table-item.c:3070
 msgid "Minimum width"
 msgstr "Minsta bredd"
 
 #: ../widgets/misc/e-canvas-vbox.c:92
-#: ../widgets/misc/e-reflow.c:1427
+#: ../widgets/misc/e-reflow.c:1418
 #: ../widgets/table/e-table-group-container.c:1000
 #: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3075
+#: ../widgets/table/e-table-item.c:3071
 msgid "Minimum Width"
 msgstr "Minsta bredd"
 
 #: ../widgets/misc/e-canvas-vbox.c:103
 #: ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:204
+#: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "Mellanrum"
 
@@ -22250,7 +22339,7 @@ msgstr "Nu"
 msgid "The time must be in the format: %s"
 msgstr "Tiden måste anges i formatet: %s"
 
-#: ../widgets/misc/e-cell-percent.c:79
+#: ../widgets/misc/e-cell-percent.c:78
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentvärdet måste vara mellan 0 och 100"
 
@@ -22352,85 +22441,85 @@ msgstr "Annan..."
 msgid "Ch_aracter Encoding"
 msgstr "Tecken_kodning"
 
-#: ../widgets/misc/e-dateedit.c:309
+#: ../widgets/misc/e-dateedit.c:303
 msgid "Date and Time"
 msgstr "Datum och tid"
 
-#: ../widgets/misc/e-dateedit.c:330
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Text entry to input date"
 msgstr "Textfält för att ange datum"
 
-#: ../widgets/misc/e-dateedit.c:352
+#: ../widgets/misc/e-dateedit.c:346
 msgid "Click this button to show a calendar"
 msgstr "Klicka på denna knapp för att visa en kalender"
 
-#: ../widgets/misc/e-dateedit.c:394
+#: ../widgets/misc/e-dateedit.c:388
 msgid "Drop-down combination box to select time"
 msgstr "Kombinationsruta för att välja tid"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:464
 msgid "No_w"
 msgstr "N_u"
 
-#: ../widgets/misc/e-dateedit.c:476
+#: ../widgets/misc/e-dateedit.c:470
 msgid "_Today"
 msgstr "_Idag"
 
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1635
 msgid "Invalid Date Value"
 msgstr "Ogiltigt datumvärde"
 
-#: ../widgets/misc/e-dateedit.c:1670
+#: ../widgets/misc/e-dateedit.c:1664
 msgid "Invalid Time Value"
 msgstr "Ogiltigt tidsvärde"
 
-#: ../widgets/misc/e-expander.c:180
+#: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "Expanderad"
 
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:183
 msgid "Whether or not the expander is expanded"
 msgstr "Huruvida expanderaren är expanderad eller inte"
 
-#: ../widgets/misc/e-expander.c:189
+#: ../widgets/misc/e-expander.c:191
 msgid "Text of the expander's label"
 msgstr "Text på expanderarens etikett"
 
-#: ../widgets/misc/e-expander.c:196
+#: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr "Använd understrykning"
 
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:199
 msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
 msgstr "Om detta är angivet kommer en understrykning i texten att ange att nästa tecken ska användas som snabbtangent"
 
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
 msgstr "Mellanrum att placera mellan etiketten och barnet"
 
-#: ../widgets/misc/e-expander.c:214
+#: ../widgets/misc/e-expander.c:216
 msgid "Label widget"
 msgstr "Etikettwidget"
 
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:217
 msgid "A widget to display in place of the usual expander label"
 msgstr "En widget att visa istället för den vanliga expanderaretiketten"
 
-#: ../widgets/misc/e-expander.c:221
-#: ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:223
+#: ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "Expanderarstorlek"
 
-#: ../widgets/misc/e-expander.c:222
-#: ../widgets/table/e-tree.c:3392
+#: ../widgets/misc/e-expander.c:224
+#: ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "Storlek på expanderarpilen"
 
-#: ../widgets/misc/e-expander.c:230
+#: ../widgets/misc/e-expander.c:232
 msgid "Indicator Spacing"
 msgstr "Indikatormellanrum"
 
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:233
 msgid "Spacing around expander arrow"
 msgstr "Mellanrum runt expanderarpilen"
 
@@ -22498,11 +22587,11 @@ msgstr "Världskarta"
 msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
 msgstr "Musbaserad interaktiv kartwidget för val av tidszon. Tangentbordsanvändare bör istället välja tidszon ur den nedanstående kombinationsrutan."
 
-#: ../widgets/misc/e-online-button.c:109
+#: ../widgets/misc/e-online-button.c:106
 msgid "Online"
 msgstr "Ansluten"
 
-#: ../widgets/misc/e-online-button.c:110
+#: ../widgets/misc/e-online-button.c:107
 msgid "The button state is online"
 msgstr "Knapptillståndet är ansluten"
 
@@ -22518,80 +22607,80 @@ msgstr "Synkronisera privata poster:"
 msgid "Sync Categories:"
 msgstr "Synkronisera kategorier:"
 
-#: ../widgets/misc/e-reflow.c:1448
-#: ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1439
+#: ../widgets/misc/e-reflow.c:1440
 msgid "Empty message"
 msgstr "Tomt meddelande"
 
-#: ../widgets/misc/e-reflow.c:1455
-#: ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1446
+#: ../widgets/misc/e-reflow.c:1447
 msgid "Reflow model"
 msgstr "Reflow-modell"
 
-#: ../widgets/misc/e-reflow.c:1462
-#: ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1453
+#: ../widgets/misc/e-reflow.c:1454
 msgid "Column width"
 msgstr "Kolumnbredd"
 
-#: ../widgets/misc/e-search-bar.c:340
-#: ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337
+#: ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Search"
 msgstr "Sök"
 
-#: ../widgets/misc/e-search-bar.c:340
-#: ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337
+#: ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Click here to change the search type"
 msgstr "Klicka här för att ändra söktypen"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Search"
 msgstr "_Sök"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:609
 msgid "_Find Now"
 msgstr "_Sök nu"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Clear"
 msgstr "_Töm"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Item ID"
 msgstr "Objekt-ID"
 
-#: ../widgets/misc/e-search-bar.c:875
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:872
 #: ../widgets/text/e-text.c:3566
+#: ../widgets/text/e-text.c:3567
 msgid "Text"
 msgstr "Text"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1006
+#: ../widgets/misc/e-search-bar.c:1003
 msgid "Sho_w: "
 msgstr "Vi_sa: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1023
+#: ../widgets/misc/e-search-bar.c:1020
 msgid "Sear_ch: "
 msgstr "Sö_k: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1032
 msgid " i_n "
 msgstr " _i "
 
 #: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:807
+#: ../widgets/table/e-tree-selection-model.c:806
 msgid "Cursor Row"
 msgstr "Markörrad"
 
 #: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:814
+#: ../widgets/table/e-tree-selection-model.c:813
 msgid "Cursor Column"
 msgstr "Markörkolumn"
 
@@ -22738,14 +22827,14 @@ msgid "_When opened:"
 msgstr "_När öppnat:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:255
+#: ../widgets/misc/e-task-widget.c:252
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:261
+#: ../widgets/misc/e-task-widget.c:258
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% färdigt)"
@@ -22790,23 +22879,23 @@ msgstr "Fokuserad kolumn"
 msgid "Unselected Column"
 msgstr "Omarkerad kolumn"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Strikeout Column"
 msgstr "Genomstryk kolumn"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1814
 msgid "Underline Column"
 msgstr "Understryk kolumn"
 
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1821
 msgid "Bold Column"
 msgstr "Gör kolumn fet"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1828
 msgid "Color Column"
 msgstr "Färglägg kolumn"
 
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1842
 msgid "BG Color Column"
 msgstr "Bakgrundsfärga kolumn"
 
@@ -22846,7 +22935,7 @@ msgid "A_vailable Fields:"
 msgstr "_Tillgängliga fält:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Ascending"
 msgstr "Stigande"
 
@@ -22859,7 +22948,7 @@ msgid "Clear _All"
 msgstr "Töm _alla"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Descending"
 msgstr "Fallande"
 
@@ -22920,16 +23009,16 @@ msgid "_Sort..."
 msgstr "_Sortera..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:634
-#: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1887
+#: ../widgets/table/e-table-field-chooser-item.c:633
+#: ../widgets/table/e-table-field-chooser.c:66
+#: ../widgets/table/e-table-header-item.c:1886
 msgid "DnD code"
 msgstr "Drag- och släppkod"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:641
-#: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1901
+#: ../widgets/table/e-table-field-chooser-item.c:640
+#: ../widgets/table/e-table-field-chooser.c:73
+#: ../widgets/table/e-table-header-item.c:1900
 msgid "Full Header"
 msgstr "Fullständiga rubriker"
 
@@ -22967,8 +23056,8 @@ msgstr[1] "%s (%d objekt)"
 #: ../widgets/table/e-table-group-container.c:923
 #: ../widgets/table/e-table-group-leaf.c:581
 #: ../widgets/table/e-table-group-leaf.c:582
-#: ../widgets/table/e-table-item.c:3032
-#: ../widgets/table/e-table-item.c:3033
+#: ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-table-item.c:3029
 msgid "Alternating Row Colors"
 msgstr "Färger för alternerande rader"
 
@@ -22976,10 +23065,10 @@ msgstr "Färger för alternerande rader"
 #: ../widgets/table/e-table-group-container.c:930
 #: ../widgets/table/e-table-group-leaf.c:588
 #: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3039
-#: ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-tree.c:3343
 #: ../widgets/table/e-tree.c:3344
-#: ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr "Rutnät för horisontell ritning"
 
@@ -22987,10 +23076,10 @@ msgstr "Rutnät för horisontell ritning"
 #: ../widgets/table/e-table-group-container.c:937
 #: ../widgets/table/e-table-group-leaf.c:595
 #: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3046
-#: ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-tree.c:3349
 #: ../widgets/table/e-tree.c:3350
-#: ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr "Rutnät för vertikal ritning"
 
@@ -22998,10 +23087,10 @@ msgstr "Rutnät för vertikal ritning"
 #: ../widgets/table/e-table-group-container.c:944
 #: ../widgets/table/e-table-group-leaf.c:602
 #: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3053
-#: ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-table-item.c:3049
+#: ../widgets/table/e-table-item.c:3050
+#: ../widgets/table/e-tree.c:3355
 #: ../widgets/table/e-tree.c:3356
-#: ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr "Rita fokus"
 
@@ -23009,8 +23098,8 @@ msgstr "Rita fokus"
 #: ../widgets/table/e-table-group-container.c:951
 #: ../widgets/table/e-table-group-leaf.c:609
 #: ../widgets/table/e-table-group-leaf.c:610
-#: ../widgets/table/e-table-item.c:3060
-#: ../widgets/table/e-table-item.c:3061
+#: ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table-item.c:3057
 msgid "Cursor mode"
 msgstr "Markörläge"
 
@@ -23018,8 +23107,8 @@ msgstr "Markörläge"
 #: ../widgets/table/e-table-group-container.c:958
 #: ../widgets/table/e-table-group-leaf.c:623
 #: ../widgets/table/e-table-group-leaf.c:624
-#: ../widgets/table/e-table-item.c:3025
-#: ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3021
+#: ../widgets/table/e-table-item.c:3022
 msgid "Selection model"
 msgstr "Markeringsmodell"
 
@@ -23027,11 +23116,11 @@ msgstr "Markeringsmodell"
 #: ../widgets/table/e-table-group-container.c:965
 #: ../widgets/table/e-table-group-leaf.c:616
 #: ../widgets/table/e-table-group-leaf.c:617
-#: ../widgets/table/e-table-item.c:3067
-#: ../widgets/table/e-table-item.c:3068
-#: ../widgets/table/e-table.c:3325
+#: ../widgets/table/e-table-item.c:3063
+#: ../widgets/table/e-table-item.c:3064
+#: ../widgets/table/e-table.c:3326
+#: ../widgets/table/e-tree.c:3337
 #: ../widgets/table/e-tree.c:3338
-#: ../widgets/table/e-tree.c:3339
 msgid "Length Threshold"
 msgstr "Längdtröskelvärde"
 
@@ -23039,11 +23128,11 @@ msgstr "Längdtröskelvärde"
 #: ../widgets/table/e-table-group-container.c:972
 #: ../widgets/table/e-table-group-leaf.c:658
 #: ../widgets/table/e-table-group-leaf.c:659
-#: ../widgets/table/e-table-item.c:3101
-#: ../widgets/table/e-table-item.c:3102
-#: ../widgets/table/e-table.c:3332
+#: ../widgets/table/e-table-item.c:3097
+#: ../widgets/table/e-table-item.c:3098
+#: ../widgets/table/e-table.c:3333
+#: ../widgets/table/e-tree.c:3369
 #: ../widgets/table/e-tree.c:3370
-#: ../widgets/table/e-tree.c:3371
 msgid "Uniform row height"
 msgstr "Identisk radhöjd"
 
@@ -23054,246 +23143,254 @@ msgstr "Identisk radhöjd"
 msgid "Frozen"
 msgstr "Fryst"
 
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
 msgid "Customize Current View"
 msgstr "Anpassa aktuell vy"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "Sort _Ascending"
 msgstr "Sortera _stigande"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Descending"
 msgstr "Sortera _fallande"
 
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "_Unsort"
 msgstr "_Osortera"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Group By This _Field"
 msgstr "Gruppera efter detta _fält"
 
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By _Box"
 msgstr "Gruppera efter _låda"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "Remove This _Column"
 msgstr "Ta bort denna _kolumn"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Add a C_olumn..."
 msgstr "Lägg till en _kolumn..."
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1482
 msgid "A_lignment"
 msgstr "J_ustering"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "B_est Fit"
 msgstr "Bästa _passning"
 
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Format Column_s..."
 msgstr "Formatera kolum_ner..."
 
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Custo_mize Current View..."
 msgstr "A_npassa aktuell vy..."
 
-#: ../widgets/table/e-table-header-item.c:1543
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "_Sort By"
 msgstr "_Sortera efter"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1561
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "_Custom"
 msgstr "A_npassad"
 
-#: ../widgets/table/e-table-header-item.c:1894
+#: ../widgets/table/e-table-header-item.c:1893
 msgid "Font Description"
 msgstr "Typsnittsbeskrivning"
 
-#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-header-item.c:1914
 #: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "Sorteringsinformation"
 
-#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-table-header-item.c:1928
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Träd"
 
-#: ../widgets/table/e-table-item.c:3011
-#: ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3007
+#: ../widgets/table/e-table-item.c:3008
 msgid "Table header"
 msgstr "Tabellhuvud"
 
-#: ../widgets/table/e-table-item.c:3018
-#: ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014
+#: ../widgets/table/e-table-item.c:3015
 msgid "Table model"
 msgstr "Tabellmodell"
 
-#: ../widgets/table/e-table-item.c:3094
-#: ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table-item.c:3091
 msgid "Cursor row"
 msgstr "Markörrad"
 
-#: ../widgets/table/e-table.c:3339
+#: ../widgets/table/e-table.c:3340
+#: ../widgets/table/e-tree.c:3376
 #: ../widgets/table/e-tree.c:3377
-#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "Sök alltid"
 
-#: ../widgets/table/e-table.c:3346
+#: ../widgets/table/e-table.c:3347
 msgid "Use click to add"
 msgstr "Använd klick för att lägga till"
 
+#: ../widgets/table/e-tree.c:3362
 #: ../widgets/table/e-tree.c:3363
-#: ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "ETree-tabelladapter"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3383
 msgid "Retro Look"
 msgstr "Retroutseende"
 
-#: ../widgets/table/e-tree.c:3385
+#: ../widgets/table/e-tree.c:3384
 msgid "Draw lines and +/- expanders."
 msgstr "Rita linjer och +/--expanderare."
 
-#: ../widgets/text/e-text.c:2735
+#: ../widgets/text/e-text.c:2736
 msgid "Input Methods"
 msgstr "Inmatningsmetoder"
 
-#: ../widgets/text/e-text.c:3558
 #: ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3560
 msgid "Event Processor"
 msgstr "Händelsebehandlare"
 
-#: ../widgets/text/e-text.c:3572
 #: ../widgets/text/e-text.c:3573
+#: ../widgets/text/e-text.c:3574
 msgid "Bold"
 msgstr "Fet"
 
-#: ../widgets/text/e-text.c:3579
 #: ../widgets/text/e-text.c:3580
+#: ../widgets/text/e-text.c:3581
 msgid "Strikeout"
 msgstr "Genomstruken"
 
-#: ../widgets/text/e-text.c:3586
 #: ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3588
 msgid "Anchor"
 msgstr "Ankare"
 
-#: ../widgets/text/e-text.c:3594
 #: ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3596
 msgid "Justification"
 msgstr "Justering"
 
-#: ../widgets/text/e-text.c:3601
 #: ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-text.c:3603
 msgid "Clip Width"
 msgstr "Klippbredd"
 
-#: ../widgets/text/e-text.c:3608
 #: ../widgets/text/e-text.c:3609
+#: ../widgets/text/e-text.c:3610
 msgid "Clip Height"
 msgstr "Klipphöjd"
 
-#: ../widgets/text/e-text.c:3615
 #: ../widgets/text/e-text.c:3616
+#: ../widgets/text/e-text.c:3617
 msgid "Clip"
 msgstr "Klipp"
 
-#: ../widgets/text/e-text.c:3622
 #: ../widgets/text/e-text.c:3623
+#: ../widgets/text/e-text.c:3624
 msgid "Fill clip rectangle"
 msgstr "Fyll klipprektangel"
 
-#: ../widgets/text/e-text.c:3629
 #: ../widgets/text/e-text.c:3630
+#: ../widgets/text/e-text.c:3631
 msgid "X Offset"
 msgstr "X-avstånd"
 
-#: ../widgets/text/e-text.c:3636
 #: ../widgets/text/e-text.c:3637
+#: ../widgets/text/e-text.c:3638
 msgid "Y Offset"
 msgstr "Y-avstånd"
 
-#: ../widgets/text/e-text.c:3672
 #: ../widgets/text/e-text.c:3673
+#: ../widgets/text/e-text.c:3674
 msgid "Text width"
 msgstr "Textbredd"
 
-#: ../widgets/text/e-text.c:3679
 #: ../widgets/text/e-text.c:3680
+#: ../widgets/text/e-text.c:3681
 msgid "Text height"
 msgstr "Texthöjd"
 
-#: ../widgets/text/e-text.c:3694
 #: ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3696
 msgid "Use ellipsis"
 msgstr "Använd ellips"
 
-#: ../widgets/text/e-text.c:3701
 #: ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3703
 msgid "Ellipsis"
 msgstr "Ellips"
 
-#: ../widgets/text/e-text.c:3708
 #: ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3710
 msgid "Line wrap"
 msgstr "Radbrytning"
 
-#: ../widgets/text/e-text.c:3715
 #: ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3717
 msgid "Break characters"
 msgstr "Brytningstecken"
 
-#: ../widgets/text/e-text.c:3722
 #: ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3724
 msgid "Max lines"
 msgstr "Max rader"
 
-#: ../widgets/text/e-text.c:3744
 #: ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3746
 msgid "Draw borders"
 msgstr "Rita ramar"
 
-#: ../widgets/text/e-text.c:3751
 #: ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3753
 msgid "Allow newlines"
 msgstr "Tillåt nyrader"
 
-#: ../widgets/text/e-text.c:3758
 #: ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3760
 msgid "Draw background"
 msgstr "Rita bakgrund"
 
-#: ../widgets/text/e-text.c:3765
 #: ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3767
 msgid "Draw button"
 msgstr "Rita knapp"
 
-#: ../widgets/text/e-text.c:3772
 #: ../widgets/text/e-text.c:3773
+#: ../widgets/text/e-text.c:3774
 msgid "Cursor position"
 msgstr "Markörposition"
 
-#: ../widgets/text/e-text.c:3779
 #: ../widgets/text/e-text.c:3780
+#: ../widgets/text/e-text.c:3781
 msgid "IM Context"
 msgstr "IM-sammanhang"
 
 # Skum. Kolla denna
-#: ../widgets/text/e-text.c:3786
 #: ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3788
 msgid "Handle Popup"
 msgstr "Hantera popupfönster"
 
+#~ msgid "A_dd Filter Criteria"
+#~ msgstr "Lägg til_l filterkriteria"
+#~ msgid "Mark calendar offline"
+#~ msgstr "Markera kalendern som frånkopplad"
+#~ msgid "Marks the selected calendar for offline viewing."
+#~ msgstr "Markerar den valda kalendern för frånkopplad visning."
+#~ msgid "Select Importers"
+#~ msgstr "Välj importörer"
 #~ msgid "Recent Docu_ments"
 #~ msgstr "Senaste doku_ment"
 #~ msgid "button-user"
@@ -23450,8 +23547,6 @@ msgstr "Hantera popupfönster"
 #~ msgstr "S/MIME-kryptera"
 #~ msgid "S/MIME Sign"
 #~ msgstr "S/MIME-signera"
-#~ msgid "Save As"
-#~ msgstr "Spara som"
 #~ msgid "Save in folder..."
 #~ msgstr "Spara i mapp..."
 #~ msgid "Save the message in a specified folder"
@@ -23504,10 +23599,6 @@ msgstr "Hantera popupfönster"
 #~ msgstr ""
 #~ "Adressboken {0} är skrivskyddad och du kan därför inte lägga till "
 #~ "kontakter där. Välj en annan adressbok."
-#~ msgid "Select Drafts Folder"
-#~ msgstr "Välj utkastmapp"
-#~ msgid "Select Sent Folder"
-#~ msgstr "Välj skickat-mapp"
 #~ msgid "Notify messages in Inbox only."
 #~ msgstr "Notifiera endast om meddelanden in Inkorgen."
 #~ msgid "_Categories..."
diff --git a/po/th.po b/po/th.po
index 2006de0c07..fe1e4a2726 100644
--- a/po/th.po
+++ b/po/th.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-05 10:14+0700\n"
-"PO-Revision-Date: 2008-09-10 11:49+0700\n"
+"POT-Creation-Date: 2008-10-19 00:13+0700\n"
+"PO-Revision-Date: 2008-10-19 09:38+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -25,21 +25,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution address book"
 msgstr "สมุดที่อยู่ evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "ที่อยู่ติดต่อใหม่"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "รายชื่อที่อยู่ติดต่อใหม่"
 
-#: ../a11y/addressbook/ea-minicard-view.c:161
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -156,7 +156,7 @@ msgid "calendar view for one or more days"
 msgstr "มุมมองป�ิทินสำหรับวันเดียวหรือหลายวัน"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:784
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Ey"
 
@@ -167,18 +167,18 @@ msgstr "%A %d %b %Ey"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1568
-#: ../calendar/gui/e-week-view-main-item.c:339
+#: ../calendar/gui/calendar-component.c:787
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1577
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:762
-#: ../calendar/gui/calendar-component.c:767
-#: ../calendar/gui/calendar-component.c:769
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Ey"
 
@@ -186,10 +186,10 @@ msgstr "%a %d %b %Ey"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:788
-#: ../calendar/gui/calendar-component.c:794
-#: ../calendar/gui/calendar-component.c:796
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:815
+#: ../calendar/gui/calendar-component.c:821
+#: ../calendar/gui/calendar-component.c:823
 msgid "%d %b %Y"
 msgstr "%d %b %Ey"
 
@@ -199,15 +199,15 @@ msgstr "%d %b %Ey"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1584
-#: ../calendar/gui/e-week-view-main-item.c:353
+#: ../calendar/gui/calendar-component.c:813
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:766
+#: ../calendar/importers/icalendar-importer.c:768
 msgid "Gnome Calendar"
 msgstr "ป�ิทิน Gnome"
 
@@ -254,11 +254,11 @@ msgstr "หน้าต่างผุดขึ้น"
 msgid "popup a child"
 msgstr "ผุดหน้าต่างลู�"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
 msgid "edit"
 msgstr "��้ไข"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
 msgid "begin editing this cell"
 msgstr "เริ่ม��้ไขช่องนี้"
 
@@ -271,19 +271,19 @@ msgstr "สลับค่า"
 msgid "toggle the cell"
 msgstr "สลับค่าในช่อง"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "ขยาย"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
 msgid "expands the row in the ETree containing this cell"
 msgstr "ขยาย�ถวใน ETree ที่ช่องนี้อยู่"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr "ยุบ"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
 msgid "collapses the row in the ETree containing this cell"
 msgstr "ยุบ�ถบใน ETree ที่ช่องนี้อยู่"
 
@@ -428,6 +428,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "เซิร์ฟเวอร์ LDAP ไม่ตอบสนอง�ับข้อมูล schema ที่ถู�ต้อง"
 
 #: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:50
 msgid "Server Version"
 msgstr "รุ่นเซิร์ฟเวอร์"
 
@@ -559,17 +560,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:299
+#: ../addressbook/conduit/address-conduit.c:300
 msgid "Default Sync Address:"
 msgstr "ที่อยู่สำหรับ sync ปริยาย:"
 
-#: ../addressbook/conduit/address-conduit.c:1320
 #: ../addressbook/conduit/address-conduit.c:1321
+#: ../addressbook/conduit/address-conduit.c:1322
 msgid "Could not load address book"
 msgstr "ไม่สามารถโหลดสมุดที่อยู่"
 
-#: ../addressbook/conduit/address-conduit.c:1398
-#: ../addressbook/conduit/address-conduit.c:1401
+#: ../addressbook/conduit/address-conduit.c:1399
+#: ../addressbook/conduit/address-conduit.c:1402
 msgid "Could not read pilot's Address application block"
 msgstr "ไม่สามารถอ่านบล็อคโปร��รมสมุดที่อยู่ของ pilot ได้"
 
@@ -591,9 +592,9 @@ msgstr "�ำหนดค่าเติมเต็มคำอัตโนม
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../addressbook/gui/component/addressbook-view.c:1325
 #: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "ที่อยู่ติดต่อ"
@@ -632,15 +633,15 @@ msgstr "จัดà¸�ารà¸�ารตรวจสอบ S/MIME ของคุà
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../addressbook/gui/component/addressbook-component.c:143
+#: ../addressbook/gui/component/addressbook-migrate.c:500
 #: ../calendar/gui/calendar-component.c:236
 #: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
 #: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
-#: ../mail/mail-component.c:312 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1457
+#: ../mail/mail-component.c:311 ../mail/mail-vfolder.c:223
+#: ../mail/message-list.c:1518
 msgid "On This Computer"
 msgstr "ในคอมพิวเตอร์นี้"
 
@@ -649,9 +650,9 @@ msgstr "ในคอมพิวเตอร์นี้"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/component/addressbook-component.c:151
+#: ../addressbook/gui/component/addressbook-migrate.c:508
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
 #: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
@@ -662,126 +663,126 @@ msgid "Personal"
 msgstr "ส่วนบุคคล"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:163
-#: ../addressbook/gui/component/addressbook-migrate.c:517
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "ในเซิร์ฟเวอร์ LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgctxt "New"
 msgid "_Contact"
 msgstr "ที่อยู่_ติดต่อ"
 
-#: ../addressbook/gui/component/addressbook-component.c:231
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "สร้างที่อยู่ติดต่อใหม่"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgctxt "New"
 msgid "Contact _List"
 msgstr "ราย_ชื่อที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "สร้างรายชื่อที่อยู่ติดต่อใหม่"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-#: ../addressbook/gui/component/addressbook-config.c:1207
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "สมุดที่อยู่ใหม่"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_สมุดที่อยู่"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "สร้างสมุดที่อยู่ใหม่"
 
-#: ../addressbook/gui/component/addressbook-component.c:410
+#: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "�ารปรับรุ่นค่าตั้งหรือโฟลเดอร์สมุดที่อยู่ล้มเหลว"
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:332
 msgid "Base"
 msgstr "จุดเริ่มต้น"
 
-#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../addressbook/gui/component/addressbook-config.c:533
 #: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "ประเ_ภท:"
 
-#: ../addressbook/gui/component/addressbook-config.c:619
+#: ../addressbook/gui/component/addressbook-config.c:635
 msgid "Copy _book content locally for offline operation"
 msgstr "คัดลอ�เนื้อหา_สมุดที่อยู่ไว้ที่เครื่องเพื่อ�ารทำงาน�บบออฟไลน์"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/component/addressbook-config.c:998
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 #: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2367
+#: ../plugins/itip-formatter/itip-formatter.c:2441
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "ทั่วไป"
 
-#: ../addressbook/gui/component/addressbook-config.c:983
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
-#: ../mail/importers/pine-importer.c:385
+#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "สมุดที่อยู่"
 
-#: ../addressbook/gui/component/addressbook-config.c:987
+#: ../addressbook/gui/component/addressbook-config.c:1003
 msgid "Server Information"
 msgstr "ข้อมูลเซิร์ฟเวอร์"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:1005
 msgid "Authentication"
 msgstr "�ารยืนยันตัวบุคคล"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/addressbook-config.c:1008
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "รายละเอียด"
 
-#: ../addressbook/gui/component/addressbook-config.c:993
-#: ../mail/em-folder-browser.c:983
+#: ../addressbook/gui/component/addressbook-config.c:1009
+#: ../mail/em-folder-browser.c:985
 msgid "Searching"
 msgstr "�ารค้นหา"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
+#: ../addressbook/gui/component/addressbook-config.c:1011
 msgid "Downloading"
 msgstr "�ารดาวน์โหลด"
 
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-config.c:1221
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "คุณสมบัติสมุดที่อยู่"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../addressbook/gui/component/addressbook-migrate.c:74
 #: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "�ำลังถ่ายโอน..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../addressbook/gui/component/addressbook-migrate.c:126
 #: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
 msgid "Migrating '%s':"
 msgstr "�ำลังถ่ายโอน '%s':"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:645
+#: ../addressbook/gui/component/addressbook-migrate.c:646
 msgid "LDAP Servers"
 msgstr "เซิร์ฟเวอร์ LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:760
+#: ../addressbook/gui/component/addressbook-migrate.c:761
 msgid "Autocompletion Settings"
 msgstr "�ารตั้งค่า�ารเติมเต็มคำอัตโนมัติ"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -792,7 +793,7 @@ msgstr ""
 "\n"
 "�รุณาอดใจรอ ขณะที่ Evolution ถ่ายโอนโฟลเดอร์ของคุณ..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
+#: ../addressbook/gui/component/addressbook-migrate.c:1151
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -802,7 +803,7 @@ msgstr ""
 "\n"
 "�รุณารอ ในขณะที่ Evolution ถ่ายโอนโฟลเดอร์ของคุณ..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
+#: ../addressbook/gui/component/addressbook-migrate.c:1160
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -812,7 +813,7 @@ msgstr ""
 "\n"
 "�รุณาอดใจรอ ขณะที่ Evolution ถ่ายโอนโฟลเดอร์ของคุณ..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
+#: ../addressbook/gui/component/addressbook-migrate.c:1170
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -822,36 +823,36 @@ msgstr ""
 "\n"
 "�รุณาอดใจรอ ขณะที่ Evolution ถ่ายโอนข้อมูล�าร sync pilot ของคุณ..."
 
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:501
+#: ../addressbook/gui/component/addressbook-view.c:424
+#: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "เปลี่ยนชื่อโฟลเดอร์ \"%s\" เป็น:"
 
-#: ../addressbook/gui/component/addressbook-view.c:428
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:427
+#: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
 msgstr "เปลี่ยนชื่อโฟลเดอร์"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:509
+#: ../addressbook/gui/component/addressbook-view.c:432
+#: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
 msgstr "ชื่อโฟลเดอร์มี '/' ไม่ได้"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:941
 msgid "_New Address Book"
 msgstr "สมุดที่อยู่ใ_หม่"
 
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "Save As vCard..."
 msgstr "บันทึ�เป็น vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:946
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:619
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
+#: ../addressbook/gui/component/addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/calendar-component.c:644
+#: ../calendar/gui/e-calendar-table.c:1598
+#: ../calendar/gui/e-calendar-view.c:1692 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/memos-component.c:493 ../calendar/gui/tasks-component.c:484
 #: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
@@ -859,16 +860,16 @@ msgstr "บันทึ�เป็น vCard..."
 msgid "_Delete"
 msgstr "_ลบ"
 
-#: ../addressbook/gui/component/addressbook-view.c:949
-#: ../calendar/gui/calendar-component.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:2035
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1046 ../mail/em-folder-tree.c:2120
+#: ../addressbook/gui/component/addressbook-view.c:948
+#: ../calendar/gui/calendar-component.c:649
+#: ../calendar/gui/dialogs/comp-editor.c:2039
+#: ../calendar/gui/memos-component.c:498 ../calendar/gui/tasks-component.c:489
+#: ../composer/e-msg-composer.c:1041 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "คุณ_สมบัติ"
 
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1336
 msgid "Contact Source Selector"
 msgstr "�ล่องเลือ��หล่งที่อยู่ติดต่อ"
 
@@ -890,7 +891,7 @@ msgstr "ป้อนรหัสผ่านสำหรับ %s (ผู้ใà
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
 #: ../plugins/google-account-setup/google-source.c:444
-#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../plugins/publish-calendar/publish-calendar.c:191
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "ป้อนรหัสผ่าน"
@@ -916,29 +917,39 @@ msgstr ""
 "ในหน่วยพิ�เซล"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr "�สดงชื่อที่เติมเต็มอัตโนมัติพร้อมที่อยู่"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "�สดงช่อง�สดงตัวอย่าง"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr "จำนวนอั�ขระที่จะต้องป้อน �่อนที่ Evolution จะพยายามเติมเต็มส่วนที่เหลือ"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI ของโฟลเดอร์ที่ใช้ล่าสุดใน�ล่องโต้ตอบเลือ�ชื่อ"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 msgid "URI for the folder last used in the select names dialog."
 msgstr "URI ของโฟลเดอร์ที่ใช้ล่าสุดใน�ล่องโต้ตอบเลือ�ชื่อ"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
 msgstr "ตำ�หน่งเส้น�ั้นช่อง�นวดิ่ง"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr "�ำหนดว่าจะบังคับให้�สดงที่อยู่อีเมลพร้อมชื่อของผู้ติดต่อที่เติมเต็มอัตโนมัติในช่องป้อนหรือไม่"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
 msgid "Whether to show the preview pane."
 msgstr "�ำหนดว่าจะ�สดงช่อง�สดงตัวอย่างหรือไม่"
 
@@ -983,7 +994,7 @@ msgid "Add Address Book"
 msgstr "เพิ่มสมุดที่อยู่"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:760
 msgid "Always"
 msgstr "ใช้เสมอ"
 
@@ -1022,14 +1033,14 @@ msgid "Lo_gin:"
 msgstr "เ_ข้าระบบ:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:759
 msgid "Never"
 msgstr "ไม่ใช้"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:288
+#: ../mail/em-account-editor.c:287
 msgid "No encryption"
 msgstr "ไม่มี�ารเข้ารหัสลับ"
 
@@ -1041,7 +1052,7 @@ msgstr "ระดับเดียว"
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:296
+#: ../mail/em-account-editor.c:295
 msgid "SSL encryption"
 msgstr "เข้ารหัสลับด้วย SSL"
 
@@ -1107,7 +1118,7 @@ msgstr "จุดตั้งต้นค้นหาที่รองรับ
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:292
+#: ../mail/em-account-editor.c:291
 msgid "TLS encryption"
 msgstr "เข้ารหัสลับด้วย TLS"
 
@@ -1134,9 +1145,9 @@ msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
-msgstr "นี้คือชื่อเต็มของเซิร์ฟเวอร์ ldap ของคุณ ตัวอย่างเช่น \"ldap.mycompany.com\""
+msgstr "นี้คือชื่อเต็มของเซิร์ฟเวอร์ LDAP ของคุณ ตัวอย่างเช่น \"ldap.mycompany.com\""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
@@ -1149,11 +1160,11 @@ msgstr ""
 #: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 msgstr ""
 "นี่คือวิธีที่ Evolution จะใช้ยืนยันตัวบุคคลของคุณ สังเ�ตว่า�ารตั้งค่าเป็น \"ที่อยู่อีเมล\" "
-"จะต้องเข้าถึงเซิร์ฟเวอร์ ldap ของคุณ�บบนิรนามได้ด้วย"
+"จะต้องเข้าถึงเซิร์ฟเวอร์ LDAP ของคุณ�บบนิรนามได้ด้วย"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
@@ -1202,7 +1213,7 @@ msgstr "_วิธี�ารเข้าระบบ:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:177
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1217,7 +1228,7 @@ msgid "_Search scope:"
 msgstr "_ขอบเขต�ารค้นหา:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:186
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "เ_ซิร์ฟเวอร์:"
@@ -1282,7 +1293,7 @@ msgid "<b>Work</b>"
 msgstr "<b>ที่ทำงาน</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1294,16 +1305,16 @@ msgid "Ca_tegories..."
 msgstr "ห_มวด..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/widgets/e-minicard.c:199
 msgid "Contact"
 msgstr "ที่อยู่ติดต่อ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2421
 msgid "Contact Editor"
 msgstr "เครื่องมือ��้ไขที่อยู่ติดต่อ"
 
@@ -1330,132 +1341,136 @@ msgstr "ชื่อเ_ล่น:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+msgid "Novell GroupWise"
+msgstr "Novell GroupWise"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Personal Information"
 msgstr "ข้อมูลส่วนบุคคล"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "โทรศัพท์"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
 #: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "งาน"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_ที่อยู่:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "วันครบ_รอบ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "_ผู้ช่วย:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "วันเ_�ิด:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:787
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../calendar/gui/dialogs/event-page.c:791
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1868
 msgid "_Calendar:"
 msgstr "_ป�ิทิน:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "เ_มือง:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_บริษัท:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_ประเทศ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "�_ผน�: "
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "เ_�็บด้วยชื่อ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_ว่าง/ไม่ว่าง:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "โ_ฮมเพจ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_ผู้จัด�าร:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_หมายเหตุ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_สำนั�งาน:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_ตู้ไปรษณีย์:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_อาชีพ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "_คู่สมรส:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_รั�/จังหวัด:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_คำนำหน้าชื่อ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "�ารสนทนา_ภาพ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_ต้อง�ารรับเมล HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "เว็_บล็อ�:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "�_หล่ง:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_รหัสไปรษณีย์:"
 
@@ -1468,17 +1483,17 @@ msgstr "ที่อยู่"
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:292
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
+#: ../addressbook/gui/widgets/e-minicard-label.c:165
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
 #: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../addressbook/gui/widgets/e-minicard.c:192
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
-#: ../widgets/text/e-text.c:3688
+#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
 msgid "Editable"
 msgstr "��้ไขได้"
 
@@ -2451,13 +2466,13 @@ msgid "Zimbabwe"
 msgstr "ซิมบับเว"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
-#: ../mail/em-mailer-prefs.c:466
+#: ../mail/em-mailer-prefs.c:467
 #: ../plugins/exchange-operations/exchange-delegates.c:954
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
 #: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:350
+#: ../plugins/save-attachments/save-attachments.c:351
 #: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "ชื่อ"
@@ -2467,7 +2482,7 @@ msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
@@ -2481,7 +2496,7 @@ msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
@@ -2493,8 +2508,8 @@ msgstr "บริ�าร"
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
 #: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:693
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/publish-calendar/publish-calendar.c:694
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "สถานที่"
 
@@ -2503,77 +2518,77 @@ msgid "Username"
 msgstr "ชื่อผู้ใช้"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "บ้าน"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "อื่นๆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Source Book"
 msgstr "สมุดต้นทาง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Target Book"
 msgstr "สมุดปลายทาง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
 msgid "Is New Contact"
 msgstr "เป็นที่อยู่ติดต่อใหม่"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Writable Fields"
 msgstr "เขตข้อมูลที่เขียนได้"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Required Fields"
 msgstr "เขตข้อมูลบังคับ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "มี�ารเปลี่ยน�ปลง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2416
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "เครื่องมือ��้ไขที่อยู่ติดต่อ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "Please select an image for this contact"
 msgstr "�รุณาเลือ�รูปสำหรับที่อยู่ติดต่อนี้"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "_No image"
 msgstr "ไ_ม่มีรูป"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2581,47 +2596,47 @@ msgstr ""
 "ข้อมูลที่อยู่ติดต่อผิดพลาด:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3090
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' มีรูป�บบที่ไม่ถู�ต้อง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' มีรูป�บบที่ไม่ถู�ต้อง"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ว่างเปล่า"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3138
 msgid "Invalid contact."
 msgstr "ที่อยู่ติดต่อผิดพลาด"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "Contact Quick-Add"
 msgstr "�ารเพิ่มที่อยู่ติดต่ออย่างเร็ว"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
 msgid "_Edit Full"
 msgstr "�_�้ไขเต็มรูป�บบ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:402
 msgid "_Full name"
 msgstr "_ชื่อเต็ม"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:413
 msgid "E_mail"
 msgstr "อีเ_มล"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:424
 msgid "_Select Address Book"
 msgstr "เ_ลือ�สมุดที่อยู่"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2630,7 +2645,7 @@ msgstr ""
 "คุณ�น่ใจหรือไม่ว่า\n"
 "จะลบรายชื่อที่อยู่ติดต่อ (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:324
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2638,7 +2653,7 @@ msgstr ""
 "คุณ�น่ใจหรือไม่ว่า\n"
 "จะลบรายชื่อที่อยู่ติดต่อเหล่านี้?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2647,7 +2662,7 @@ msgstr ""
 "คุณ�น่ใจหรือไม่ว่า\n"
 "จะลบที่อยู่ติดต่อ (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:332
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2755,8 +2770,8 @@ msgstr "_บริ�าร IM:"
 #: ../addressbook/gui/contact-editor/im.glade.h:4
 #: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:243
-#: ../plugins/exchange-operations/exchange-contacts.c:234
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
 msgid "_Location:"
 msgstr "สถาน_ที่:"
 
@@ -2795,9 +2810,9 @@ msgid "_Members"
 msgstr "_สมาชิ�"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:298
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
-#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-addressbook-model.c:311
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
 #: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
@@ -2858,19 +2873,19 @@ msgstr "ผสานที่อยู่ติดต่อ"
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
 #: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "อีเมล"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
-#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:3
 #: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "ข้อมูลใดๆ มีคำว่า"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "อีเมลขึ้นต้นด้วย"
 
@@ -2878,35 +2893,35 @@ msgstr "อีเมลขึ้นต้นด้วย"
 msgid "Name contains"
 msgstr "ชื่อมีคำว่า"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "ไม่มีที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "ที่อยู่ติดต่อ %d ราย�าร"
 msgstr[1] "ที่อยู่ติดต่อ %d ราย�าร"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
-#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-addressbook-model.c:318
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
 #: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "คำค้น"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "เ�ิดข้อผิดพลาดขณะสร้างช่อง�สดงสมุด"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:431
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
 #: ../widgets/table/e-table-click-to-add.c:509
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3353
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
-#: ../widgets/text/e-text.c:3552
+#: ../widgets/table/e-table.c:3354
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3553
 msgid "Model"
 msgstr "ข้อมูลโครงสร้าง"
 
@@ -2914,15 +2929,15 @@ msgstr "ข้อมูลโครงสร้าง"
 msgid "Error modifying card"
 msgstr "เ�ิดข้อผิดพลาดขณะเปลี่ยน�ปลงนามบัตร"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Name begins with"
 msgstr "ชื่อขึ้นต้นด้วย"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "�หล่ง"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-meeting-list-view.c:508
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
@@ -2930,87 +2945,87 @@ msgstr "�หล่ง"
 msgid "Type"
 msgstr "ชนิด"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "บันทึ�เป็น vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/e-calendar-table.c:1574
-#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-view.c:1670 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "เ_ปิด"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "ที่อยู่ติดต่อใ_หม่..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "_รายชื่อที่อยู่ติดต่อใหม่..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "_บันทึ�เป็น vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "_ส่งต่อที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "_ส่งต่อที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "ส่ง_ข้อความไปยังที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "ส่ง_ข้อความไปยังลิสต์"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "ส่ง_ข้อความไปยังที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "_พิมพ์"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "_คัดลอ�ไปยังสมุดที่อยู่..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "_ย้ายไปยังสมุดที่อยู่..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "_ตัด"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:480
-#: ../calendar/gui/e-calendar-table.c:1582
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2057 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:484
+#: ../calendar/gui/e-calendar-table.c:1584
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
+#: ../composer/e-msg-composer.c:2052 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2106
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_คัดลอ�"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "_�ปะ"
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1524
-#: ../calendar/gui/cal-search-bar.c:625 ../calendar/gui/cal-search-bar.c:668
-#: ../calendar/gui/cal-search-bar.c:687
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Any Category"
 msgstr "หมวดใด�็ได้"
 
@@ -3183,55 +3198,55 @@ msgstr "หน่วยงาน"
 msgid "Web Site"
 msgstr "เว็บไซต์"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../addressbook/gui/widgets/e-minicard-label.c:116
+#: ../addressbook/gui/widgets/e-minicard.c:155
 #: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
 #: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-col.c:99
-#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../widgets/table/e-table-col.c:98
+#: ../widgets/table/e-table-field-chooser-item.c:654
 #: ../widgets/table/e-table-group-container.c:992
 #: ../widgets/table/e-table-group-container.c:993
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
-#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
+#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Width"
 msgstr "�ว้าง"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../addressbook/gui/widgets/e-minicard-label.c:123
+#: ../addressbook/gui/widgets/e-minicard.c:162
 #: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
 #: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../widgets/table/e-table-field-chooser-item.c:661
 #: ../widgets/table/e-table-group-container.c:985
 #: ../widgets/table/e-table-group-container.c:986
 #: ../widgets/table/e-table-group-leaf.c:630
 #: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
-#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
+#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
 msgid "Height"
 msgstr "สูง"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
+#: ../addressbook/gui/widgets/e-minicard-label.c:130
+#: ../addressbook/gui/widgets/e-minicard.c:170
 msgid "Has Focus"
 msgstr "มีโฟ�ัส"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:137
 msgid "Field"
 msgstr "เขตข้อมูล"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:144
 msgid "Field Name"
 msgstr "ชื่อเขตข้อมูล"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:151
 msgid "Text Model"
 msgstr "ข้อมูลข้อความ"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:158
 msgid "Max field name length"
 msgstr "ความยาวสูงสุดของชื่อเขตข้อมูล"
 
@@ -3301,24 +3316,24 @@ msgstr ""
 msgid "Adapter"
 msgstr "ตัว�ปลง"
 
-#: ../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:830
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:831
 msgid "Other Email"
 msgstr "อีเมลอื่นๆ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
+#: ../addressbook/gui/widgets/e-minicard.c:178
 msgid "Selected"
 msgstr "เลือ�อยู่"
 
-#: ../addressbook/gui/widgets/e-minicard.c:184
+#: ../addressbook/gui/widgets/e-minicard.c:185
 msgid "Has Cursor"
 msgstr "มีเคอร์เซอร์"
 
@@ -3374,10 +3389,10 @@ msgid "Video Chat"
 msgstr "�ารสนทนาภาพ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/calendar-commands.c:93
+#: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/gnome-cal.c:2451
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
@@ -3412,13 +3427,13 @@ msgid "Web Log"
 msgstr "เว็บล็อ�"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2342
 #: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "วันเ�ิด"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2343
 #: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "วันครบรอบ"
@@ -3436,113 +3451,113 @@ msgid "Blog"
 msgstr "เว็บล็อ�"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "สำเร็จ"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "�บ็�เอนด์ไม่ว่าง"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "�หล่งเ�็บข้อมูลไม่ได้เชื่อมต่ออยู่"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "ไม่มีสมุดที่อยู่"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
 msgstr "ไม่ได้�ำหนดที่อยู่ติดต่อของตัวผู้ใช้เอง"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "ไม่ได้รับอนุ�าต"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "ไม่พบที่อยู่ติดต่อ"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "รหัสที่อยู่ติดต่อมีอยู่�ล้ว"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "โพรโทคอลที่ไม่รองรับ"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:240
-#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
+#: ../calendar/gui/e-cal-model-tasks.c:364
+#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-calendar-table.c:239
+#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/print.c:2557
 msgid "Canceled"
 msgstr "ย�เลิ�"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "ไม่สามารถย�เลิ�"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../calendar/gui/comp-editor-factory.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Failed"
 msgstr "�ารยืนยันตัวบุคคลล้มเหลว"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Authentication Required"
 msgstr "ต้องยืนยันตัวบุคคล"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "TLS ใช้งานไม่ได้"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "ไม่มี�หล่งดัง�ล่าว"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
 msgstr "ใช้ในโหมดออฟไลน์ไม่ได้"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Other error"
 msgstr "ข้อผิดพลาดอื่นๆ"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
 msgstr "รุ่นเซิร์ฟเวอร์ใช้ไม่ได้"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 msgid "Unsupported authentication method"
 msgstr "ไม่รองรับวิธียืนยันตัวบุคคลวิธีนี้"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "We were unable to open this address book. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3552,7 +3567,7 @@ msgstr ""
 "หรือยังไม่ได้ดาวน์โหลดสำหรับใช้ออฟไลน์ �รุณาเรีย�ใช้สมุดที่อยู่อี�ครั้ง�บบออนไลน์ "
 "เพื่อดาวน์โหลดมาใช้ใน�บบออฟไลน์"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
 msgid ""
 "We were unable to open this address book.  Please check that the path %s "
@@ -3560,7 +3575,7 @@ msgid ""
 msgstr ""
 "ไม่สามารถเปิดสมุดที่อยู่นี้ได้ �รุณาตรวจสอบว่ามีพาธ %s อยู่ หรือดูว่าคุณมีสิทธิ์ใน�ารเข้าถึงหรือไม่"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid ""
 "We were unable to open this address book.  This either means you have "
 "entered an incorrect URI, or the LDAP server is unreachable."
@@ -3568,7 +3583,7 @@ msgstr ""
 "ไม่สามารถเปิดสมุดที่อยู่นี้ได้ ซึ่งเป็นไปได้ว่าคุณอาจจะป้อน URI ที่ไม่ถู�ต้อง "
 "หรืออาจจะไม่สามารถเข้าไปยังเซิร์ฟเวอร์ LDAP ได้"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:130
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3577,7 +3592,7 @@ msgstr ""
 "Evolution รุ่นนี้ ไม่ได้มี�ารคอมไพล์เพื่อรองรับ LDAP ถ้าคุณต้อง�ารใช้ LDAP ใน Evolution "
 "คุณจะต้องติดตั้ง�พ็�เ�จของ Evolution ที่เปิดใช้งาน LDAP"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:141
 msgid ""
 "We were unable to open this address book.  This either means you have "
 "entered an incorrect URI, or the server is unreachable."
@@ -3585,11 +3600,11 @@ msgstr ""
 "ไม่สามารถเปิดสมุดที่อยู่นี้ได้ ซึ่งเป็นไปได้ว่าคุณอาจจะป้อน URI ที่ไม่ถู�ต้อง "
 "หรืออาจจะไม่สามารถเข้าไปยังเซิร์ฟเวอร์ได้"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:143
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
 msgid "Detailed error:"
 msgstr "รายละเอียดข้อผิดพลาด:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3600,7 +3615,7 @@ msgstr ""
 "Evolution �สดงผล �รุณาค้นหาดวยคำค้นที่เฉพาะเจาะจง�ว่านี้\n"
 "หรือเพิ่มขีดจำ�ัดในหน้าต่างปรับ�ต่งเซิร์ฟเวอร์สารบบสำหรับสมุดที่อยู่นี้"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this address book.  Please make your search\n"
@@ -3611,45 +3626,45 @@ msgstr ""
 "สำหรับสมุดที่อยู่นี้ �รุณาค้นหาดวยคำค้นที่เฉพาะเจาะจง�ว่านี้\n"
 "หรือเพิ่มค่าจำ�ัดเวลา ในหน้าต่างปรับ�ต่งเซิร์ฟเวอร์สารบบสำหรับสมุดที่อยู่นี้"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "The backend for this address book was unable to parse this query."
 msgstr "�บ็�เอนด์สำหรับสมุดที่อยู่นี้ไม่สามารถ�จงคำค้นนี้ได้"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:181
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
 msgid "The backend for this address book refused to perform this query."
 msgstr "�บ็�เอนด์สำหรับสมุดที่อยู่นี้ป�ิิเสธที่จะค้นคำค้นนี้"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:190
 msgid "This query did not complete successfully."
 msgstr "คำค้นนี้ไม่สำเร็จสมบูรณ์"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error adding list"
 msgstr "เ�ิดข้อผิดพลาดขณะเพิ่มรายชื่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:206
-#: ../addressbook/gui/widgets/eab-gui-util.c:682
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:688
 msgid "Error adding contact"
 msgstr "เ�ิดข้อผิดพลาดขณะเพิ่มที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying list"
 msgstr "เ�ิดข้อผิดพลาดขณะเปลี่ยน�ปลงรายชื่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying contact"
 msgstr "เ�ิดข้อผิดพลาดขณะเปลี่ยน�ปลงที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:229
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
 msgid "Error removing list"
 msgstr "เ�ิดข้อผิดพลาดขณะลบรายชื่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:229
-#: ../addressbook/gui/widgets/eab-gui-util.c:632
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:638
 msgid "Error removing contact"
 msgstr "เ�ิดข้อผิดพลาดขณะลบที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:311
+#: ../addressbook/gui/widgets/eab-gui-util.c:317
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3664,16 +3679,16 @@ msgstr[1] ""
 "ใน�ารเปิดที่อยู่ติดต่อ %d ราย�าร จะเปิดในหน้าต่างใหม่ %d หน้าต่าง\n"
 "คุณต้อง�ารให้�สดงที่อยู่ติดต่อทั้งหมดนี้จริงหรือไม่?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "_Don't Display"
 msgstr "ไ_ม่�สดง"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:320
+#: ../addressbook/gui/widgets/eab-gui-util.c:326
 msgid "Display _All Contacts"
 msgstr "�สดงที่อยู่ติดต่อ_ทั้งหมด"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:346
+#: ../addressbook/gui/widgets/eab-gui-util.c:352
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3682,90 +3697,90 @@ msgstr ""
 "%s มีอยู่�ล้ว\n"
 "คุณต้อง�ารเขียนทับหรือไม่?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:350
+#: ../addressbook/gui/widgets/eab-gui-util.c:356
 msgid "Overwrite"
 msgstr "เขียนทับ"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:391
-#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
+#: ../addressbook/gui/widgets/eab-gui-util.c:400
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "ที่อยู่ติดต่อ"
 msgstr[1] "ที่อยู่ติดต่อ"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:440
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:477
+#: ../addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Select Address Book"
 msgstr "เลือ�สมุดที่อยู่"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:591
+#: ../addressbook/gui/widgets/eab-gui-util.c:597
 msgid "list"
 msgstr "รายชื่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:743
+#: ../addressbook/gui/widgets/eab-gui-util.c:749
 msgid "Move contact to"
 msgstr "ย้ายที่อยู่ติดต่อไปยัง"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:745
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Copy contact to"
 msgstr "คัดลอ�ที่อยู่ติดต่อไปยัง"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:754
 msgid "Move contacts to"
 msgstr "ย้ายที่อยู่ติดต่อไปยัง"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Copy contacts to"
 msgstr "คัดลอ�ที่อยู่ติดต่อไปยัง"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:895
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
 msgid "Multiple vCards"
 msgstr "vCard หลายราย�าร"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard สำหรับ %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:914
-#: ../addressbook/gui/widgets/eab-gui-util.c:940
+#: ../addressbook/gui/widgets/eab-gui-util.c:921
+#: ../addressbook/gui/widgets/eab-gui-util.c:947
 #, c-format
 msgid "Contact information"
 msgstr "ข้อมูลที่อยู่ติดต่อ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:942
+#: ../addressbook/gui/widgets/eab-gui-util.c:949
 #, c-format
 msgid "Contact information for %s"
 msgstr "ข้อมูลที่อยู่ติดต่อของ %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:297
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr "�ำลังค้นสมุดที่อยู่..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "มีที่อยู่ติดต่ออื่นหนึ่งราย�าร"
 msgstr[1] "มีที่อยู่ติดต่ออื่น %d ราย�าร"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Show Full vCard"
 msgstr "�สดง vCard �บบเต็ม"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 msgid "Show Compact vCard"
 msgstr "�สดง vCard �บบ�ระชับ"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
 msgid "Save in address book"
 msgstr "บันทึ�ในสมุดที่อยู่"
 
@@ -3774,10 +3789,10 @@ msgid "Card View"
 msgstr "มุมมองนามบัตร"
 
 #: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:498
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:306
-#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../calendar/importers/icalendar-importer.c:308
+#: ../calendar/importers/icalendar-importer.c:673 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "�ำลังนำเข้า..."
 
@@ -3805,19 +3820,19 @@ msgstr "Evolution CSV หรือ�ท็บ (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "เครื่องมือนำเข้า CSV �ละ�ท็บของ Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:665
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:681
 msgid "Evolution LDIF importer"
 msgstr "เครื่องมือนำเข้า LDIF ของ Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:550
 msgid "Evolution vCard Importer"
 msgstr "เครื่องมือนำเข้า vCard ของ Evolution"
 
@@ -3862,11 +3877,11 @@ msgid "Format"
 msgstr "รูป�บบ"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:502
+#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:648
-#: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-field-chooser-item.c:647
+#: ../widgets/table/e-table-field-chooser.c:80
+#: ../widgets/table/e-table-header-item.c:1907
 #: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "หัว�ระดาษ"
@@ -3969,9 +3984,9 @@ msgstr "�าร�รเงา"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1069
-#: ../plugins/exchange-operations/exchange-calendar.c:232
-#: ../plugins/exchange-operations/exchange-contacts.c:217
+#: ../plugins/exchange-operations/exchange-account-setup.c:1080
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
 msgid "Size:"
 msgstr "ขนาด:"
 
@@ -4021,8 +4036,8 @@ msgstr "�ารทดสอบ�ารพิมพ์ที่อยู่ต
 msgid "This should test the contact print code"
 msgstr "ทดสอบ�ารพิมพ์ที่อยู่ติดต่อ"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "ไม่สามารถเปิด�ฟ้ม"
@@ -4035,58 +4050,58 @@ msgstr "ไม่สามารถอ่านรายชื่อของส
 msgid "failed to open book"
 msgstr "ไม่สามารถเปิดสมุดที่อยู่"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:48
 msgid "Specify the output file instead of standard output"
 msgstr "ระบุ�ฟ้มเอาต์พุต�ทน�าร�สดงผลมาตร�าน"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:50
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "List local address book folders"
 msgstr "รายชื่อของโฟลเดอร์สมุดที่อยู่ในเครื่อง"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "Show cards as vcard or csv file"
 msgstr "�สดงนามบัตรเป็น vcard หรือ�ฟ้ม csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Export in asynchronous mode"
 msgstr "ส่งออ�เป็นโหมด asynchronous"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr "จำนวนของนามบัตรต่อหนึ่ง�ฟ้มผลลัพธ์ในโหมด asychronous จำนวนปริยายคือ 100 "
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "NUMBER"
 msgstr "NUMBER"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:102
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "บรรทัดคำสั่งอาร์�ิวเมนต์เ�ิดข้อผิดพลาด �รุณาใช้ตัวเลือ� --help เพื่อดู�ารใช้"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "รองรับรูป�บบ csv หรือ vcard เท่านั้น"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "ในโหมด async �าร�สดงผลจะต้องเป็น�ฟ้ม"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "ในโหมดป�ติไม่จำเป็นต้องมีตัวเลือ�ขนาด"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:164
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "ข้อผิดพลาดที่ไม่ได้รองรับไว้"
 
@@ -4182,19 +4197,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารลบนัดหมายนี้?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:178
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารลบ�ารประชุมนี้?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:184
+#: ../calendar/gui/dialogs/delete-comp.c:188
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารลบบันทึ�ช่วยจำนี้?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:181
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารลบภาร�ิจนี้?"
@@ -4289,108 +4304,120 @@ msgid ""
 msgstr "ถ้าคุณไม่ส่งประ�าศ�จ้ง�ารย�เลิ� ผู้มีส่วนร่วมคนอื่นๆ จะไม่ทราบว่าได้มี�ารลบภาร�ิจ�ล้ว"
 
 #: ../calendar/calendar.error.xml.h:45
+msgid "Save Appointment"
+msgstr "บันทึ�นัดหมาย"
+
+#: ../calendar/calendar.error.xml.h:46
+msgid "Save Memo"
+msgstr "บันทึ�บันทึ�ช่วยจำ"
+
+#: ../calendar/calendar.error.xml.h:47
+msgid "Save Task"
+msgstr "บันทึ�ภาร�ิจ"
+
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "�ารส่งข้อมูลที่ปรับปรุงสามารถให้ผู้มีส่วนร่วมคนอื่นได้ปรับปรุงข้อมูลที่ป�ิทินด้วย"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "�ารส่งข้อมูลที่ปรับปรุงสามารถให้ผู้มีส่วนร่วมคนอื่นได้ปรับปรุงราย�ารภาร�ิจด้วย"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr ""
 "�ำลังอยู่ระหว่างดาวน์โหลดเอ�สาร�นบบางชิ้น ถ้าคุณบันทึ�นัดหมายตอนนี้ จะสู�เสียเอ�สาร�นบดัง�ล่าว"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr ""
 "�ำลังอยู่ระหว่างดาวน์โหลดเอ�สาร�นบบางชิ้น ถ้าคุณบันทึ�ภาร�ิจตอนนี้ จะสู�เสียเอ�สาร�นบดัง�ล่าว"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:53
 msgid "Some features may not work properly with your current server."
 msgstr "คุณลั�ษณะบางอย่างอาจทำงานไม่สมบูรณ์ในเซิร์ฟเวอร์ปัจจุบันของคุณ"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "ป�ิทิน Evolution หยุดทำงาน�ระทันหัน"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "บันทึ�ช่วยจำ Evolution หยุดทำงาน�ระทันหัน"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "ภาร�ิจ Evolution หยุดทำงาน�ระทันหัน"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 msgid "The calendar is not marked for offline usage."
 msgstr "ไม่ได้ทำเครื่องหมายที่ป�ิทินเพื่อ�ารใช้งาน�บบออฟไลน์"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:58
 msgid "The memo list is not marked for offline usage."
 msgstr "ไม่ได้ทำเครื่องหมายที่ราย�ารบันทึ�ช่วยจำเพื่อ�ารใช้งาน�บบออฟไลน์"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:59
 msgid "The task list is not marked for offline usage."
 msgstr "ไม่ได้ทำเครื่องหมายที่ราย�ารภาร�ิจเพื่อ�ารใช้งาน�บบออฟไลน์"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:60
 msgid "This calendar will be removed permanently."
 msgstr "ป�ิทินนี้จะถู�ลบออ�อย่างถาวร"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:61
 msgid "This memo list will be removed permanently."
 msgstr "ราย�ารบันทึ�ช่วยจำนี้จะถู�ลบออ�อย่างถาวร"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:62
 msgid "This task list will be removed permanently."
 msgstr "ราย�ารภาร�ิจนี้จะถู�ลบออ�อย่างถาวร"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this appointment?"
 msgstr "คุณต้อง�ารบันทึ��ารเปลี่ยน�ปลงนัดหมายนี้หรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "คุณต้อง�ารบันทึ��ารเปลี่ยน�ปลงของคุณในบันทึ�ช่วยจำนี้หรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "คุณต้อง�ารบันทึ��ารเปลี่ยน�ปลงของคุณในภาร�ิจนี้หรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "คุณต้อง�ารส่งประ�าศ�ารย�เลิ�สำหรับบันทึ�ช่วยจำนี้หรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "คุณต้อง�ารส่งประ�าศ�จ้ง�ารย�เลิ�ไปยังผู้มีส่วนร่วมทุ�คนหรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "คุณต้อง�ารส่ง�ารเชิ�ประชุมไปยังผู้มีส่วนร่วมหรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "คุณต้อง�ารส่งภาร�ิจนี้ไปยังผู้มีส่วนร่วมหรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "คุณต้อง�ารส่งข้อมูล�ารประชุมที่ปรับปรุงไปยังผู้มีส่วนร่วมหรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr "คุณต้อง�ารส่งข้อมูลที่ปรับปรุงของภาร�ิจไปยังผู้มีส่วนร่วมหรือไม่?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:72
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4399,107 +4426,107 @@ msgstr ""
 "คุณ�ำลังเชื่อมต่อ�ับเซิร์ฟเวอร์ GroupWise รุ่นที่ไม่ได้รองรับ อาจจะทำให้เ�ิดปั�หา�ารใช้ "
 "Evolution ทางที่ดีที่สุดคือควรปรับรุ่นเซิร์ฟเวอร์ให้เป็นรุ่นที่รองรับ"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "คุณได้เปลี่ยน�ปลงนัดหมายนี้ �ต่ยังไม่ได้บันทึ�"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "คุณได้เปลี่ยน�ปลงภาร�ิจนี้ �ต่ยังไม่ได้บันทึ�"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "คุณได้เปลี่ยน�ปลงบันทึี�ข้อความนี้ �ต่ยังไม่ได้บันทึ�"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "ป�ิทินของคุณจะใช้งานไม่ได้ จน�ว่าจะเริ่ม�ารทำงานของ Evolution ใหม่"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "บันทึ�ช่วยจำของคุณจะใช้งานไม่ได้ จน�ว่าจะเริ่ม�ารทำงานของ Evolution ใหม่"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "ข้อมูลภาร�ิจของคุณจะใช้งานไม่ได้ จน�ว่าจะเริ่ม�ารทำงานของ Evolution ใหม่"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:79
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "ไ_ม่สนใจ�ารเปลี่ยน�ปลง"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_บันทึ�"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "_บันทึ��ารเปลี่ยน�ปลง"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:82
 #: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_ส่ง"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "_ส่งประ�าศ"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:84
 msgid "{0}."
 msgstr "{0}"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:256
+#: ../calendar/conduits/calendar/calendar-conduit.c:258
 msgid "Split Multi-Day Events:"
 msgstr "�ย�เหตุ�ารณ์ที่�ินเวลาหลายวัน:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1521
-#: ../calendar/conduits/calendar/calendar-conduit.c:1522
-#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/calendar/calendar-conduit.c:1523
+#: ../calendar/conduits/calendar/calendar-conduit.c:1524
 #: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/memo/memo-conduit.c:822
 #: ../calendar/conduits/todo/todo-conduit.c:1019
+#: ../calendar/conduits/todo/todo-conduit.c:1020
 msgid "Could not start evolution-data-server"
 msgstr "ไม่สามารถเริ่มเซิร์ฟเวอร์ข้อมูล evolution"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1629
-#: ../calendar/conduits/calendar/calendar-conduit.c:1632
+#: ../calendar/conduits/calendar/calendar-conduit.c:1631
+#: ../calendar/conduits/calendar/calendar-conduit.c:1634
 msgid "Could not read pilot's Calendar application block"
 msgstr "ไม่สามารถอ่านบล็อคโปร��รมป�ิทินของ pilot ได้"
 
-#: ../calendar/conduits/memo/memo-conduit.c:914
-#: ../calendar/conduits/memo/memo-conduit.c:917
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "ไม่สามารถอ่านบล็อคโปร��รมบันทึ�ช่วยจำของ pilot ได้"
 
-#: ../calendar/conduits/memo/memo-conduit.c:961
-#: ../calendar/conduits/memo/memo-conduit.c:964
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "ไม่สามารถเขียนบล็อคโปร��รมบันทึ�ช่วยจำของ pilot ได้"
 
-#: ../calendar/conduits/todo/todo-conduit.c:240
+#: ../calendar/conduits/todo/todo-conduit.c:241
 msgid "Default Priority:"
 msgstr "ระดับความสำคั�โดยปริยาย:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1102
-#: ../calendar/conduits/todo/todo-conduit.c:1105
+#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1106
 msgid "Could not read pilot's ToDo application block"
 msgstr "ไม่สามารถอ่านบล็อคโปร��รม ToDo ของปาล์มได้"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1147
-#: ../calendar/conduits/todo/todo-conduit.c:1150
+#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1151
 msgid "Could not write pilot's ToDo application block"
 msgstr "ไม่สามารถเขียนบล็อคโปร��รม ToDo ของปาล์มได้"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2432
 msgid "Calendar and Tasks"
 msgstr "ป�ิทิน�ละภาร�ิจ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:805
-#: ../calendar/gui/calendar-component.c:1402
+#: ../calendar/gui/calendar-component.c:832
+#: ../calendar/gui/calendar-component.c:1429
 msgid "Calendars"
 msgstr "ป�ิทิน"
 
@@ -4540,22 +4567,22 @@ msgid "Memo_s"
 msgstr "บันทึ�_ช่วยจำ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:354
+#: ../calendar/gui/e-memo-table.c:279 ../calendar/gui/e-memos.c:1120
+#: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:575
+#: ../calendar/gui/memos-component.c:1128 ../calendar/gui/memos-control.c:354
 #: ../calendar/gui/memos-control.c:370
 msgid "Memos"
 msgstr "บันทึ�ช่วยจำ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1982
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/e-calendar-table.c:703 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1984
+#: ../calendar/gui/tasks-component.c:566
+#: ../calendar/gui/tasks-component.c:1117 ../calendar/gui/tasks-control.c:492
 #: ../calendar/gui/tasks-control.c:508
-#: ../calendar/importers/icalendar-importer.c:74
-#: ../calendar/importers/icalendar-importer.c:735
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:737
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:588
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
@@ -4606,8 +4633,8 @@ msgstr "นัดหมาย"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1603
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1609
 #: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
@@ -4618,9 +4645,9 @@ msgid "Snooze _time:"
 msgstr "ช่วงเ_วลาผัดผ่อน:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+#: ../calendar/gui/dialogs/comp-editor.c:1336
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:169
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
@@ -4638,32 +4665,32 @@ msgstr "_ผัดผ่อน"
 msgid "location of appointment"
 msgstr "สถานที่นัดหมาย"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1461
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
 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:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
 msgid "No description available."
 msgstr "ไม่มีคำอธิบายรายละเอียดอยู่"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1480
 msgid "No location information available."
 msgstr "ไม่มีข้อมูลสถานที่"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1525
 #, c-format
 msgid "You have %d alarms"
 msgstr "คุณมี�ารเตือน %d ราย�าร"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
+#: ../mail/mail-component.c:1596
 msgid "Warning"
 msgstr "คำเตือน"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1691
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4674,7 +4701,7 @@ msgstr ""
 "�ต่�ารเตือนความจำนี้ได้�ำหนดค่าให้ส่งอีเมล\n"
 "Evolution จะ�สดง�ล่องโต้ตอบเตือนความจำตามป�ติ�ทน"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1721
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4691,15 +4718,15 @@ msgstr ""
 "\n"
 "คุณ�น่ใจหรือไม่ ที่จะเรีย�โปร��รมนี้?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
 msgid "Do not ask me about this program again."
 msgstr "ไม่ต้องถามเ�ี่ยว�ับโปร��รมนี้อี�ครั้ง"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:138
+#: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
 msgstr "ไม่สามารถเริ่มใช้งาน Bonobo ได้"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:154
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4710,7 +4737,7 @@ 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:404
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -4719,7 +4746,7 @@ 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:410
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -4730,7 +4757,7 @@ 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:416
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -5023,7 +5050,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "เวลาของ�ารเตือนครั้ง�่อน เป็นชนิด time_t"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:107
+#: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "เขตเวลา"
 
@@ -5152,66 +5179,66 @@ msgstr "นาทีเริ่มต้นวันทำงาน"
 msgid "daylight savings time"
 msgstr "ปรับเวลาหน้าร้อน"
 
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "สรุปมีคำว่า"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "คำอธิบายมีคำว่า"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "อยู่ในหมวด"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "มีความคิดเห็น"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
 msgid "Location contains"
 msgstr "สถานที่มีคำว่า"
 
-#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
+#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
 msgid "Unmatched"
 msgstr "ไม่ตรง�ัน"
 
-#: ../calendar/gui/cal-search-bar.c:637
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Next 7 Days' Tasks"
 msgstr "ภาร�ิจของ 7 วันข้างหน้า"
 
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Active Tasks"
 msgstr "ภาร�ิจที่�ำลังทำอยู่"
 
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Overdue Tasks"
 msgstr "ภาร�ิจที่เลย�ำหนด"
 
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Completed Tasks"
 msgstr "ภาร�ิจที่เสร็จ�ล้ว "
 
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:656
 msgid "Tasks with Attachments"
 msgstr "ภาร�ิจที่มีเอ�สาร�นบ"
 
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Active Appointments"
 msgstr "นัดหมายที่มีผลอยู่"
 
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:706
 msgid "Next 7 Days' Appointments"
 msgstr "นัดหมายของ 7 วันข้างหน้า"
 
-#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:93 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "พิมพ์"
 
-#: ../calendar/gui/calendar-commands.c:317
+#: ../calendar/gui/calendar-commands.c:318
 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 "
@@ -5220,11 +5247,11 @@ msgstr ""
 "ป�ิบัติ�ารนี้จะลบเหตุ�ารณ์ทุ�อย่างที่เ�่า�ว่าเวลาที่�ำหนดไว้ หา�คุณดำเนิน�ารต่อไป "
 "จะไม่สามารถเรีย�ข้อมูลเหตุ�ารณ์เหล่านี้ได้�ลับคืนมาได้อี�"
 
-#: ../calendar/gui/calendar-commands.c:323
+#: ../calendar/gui/calendar-commands.c:324
 msgid "Purge events older than"
 msgstr "ลบเหตุ�ารณ์ที่เ�่า�ว่า"
 
-#: ../calendar/gui/calendar-commands.c:328
+#: ../calendar/gui/calendar-commands.c:329
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
 #: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
@@ -5255,82 +5282,92 @@ msgstr "วันเ�ิด & วันครบรอบปี"
 msgid "Weather"
 msgstr "รายงานอา�าศ"
 
-#: ../calendar/gui/calendar-component.c:615
+#: ../calendar/gui/calendar-component.c:640
 msgid "_New Calendar"
 msgstr "ป�ิทินใ_หม่"
 
-#: ../calendar/gui/calendar-component.c:616
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
+#: ../calendar/gui/calendar-component.c:641
+#: ../calendar/gui/memos-component.c:490 ../calendar/gui/tasks-component.c:481
 #: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_คัดลอ�..."
 
-#: ../calendar/gui/calendar-component.c:949
+#: ../calendar/gui/calendar-component.c:645
+#: ../calendar/gui/memos-component.c:494 ../calendar/gui/tasks-component.c:485
+msgid "_Make available for offline use"
+msgstr "เ_ตรียมเพื่อใช้งานออฟไลน์"
+
+#: ../calendar/gui/calendar-component.c:646
+#: ../calendar/gui/memos-component.c:495 ../calendar/gui/tasks-component.c:486
+msgid "_Do not make available for offline use"
+msgstr "ไ_ม่ต้องเ�็บไว้ใช้งานออฟไลน์"
+
+#: ../calendar/gui/calendar-component.c:976
 msgid "Failed upgrading calendars."
 msgstr "�ารปรับปรุงรุ่นป�ิทินล้มเหลว"
 
-#: ../calendar/gui/calendar-component.c:1248
+#: ../calendar/gui/calendar-component.c:1275
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "ไม่สามารถเปิดป�ิทิน '%s' เพื่อ�ารสร้างเหตุ�ารณ์�ละ�ารประชุม"
 
-#: ../calendar/gui/calendar-component.c:1264
+#: ../calendar/gui/calendar-component.c:1291
 msgid "There is no calendar available for creating events and meetings"
 msgstr "ไม่มีป�ิทินที่จะใช้ได้สำหรับ�ารสร้างเหตุ�ารณ์�ละ�ารประชุม"
 
-#: ../calendar/gui/calendar-component.c:1377
+#: ../calendar/gui/calendar-component.c:1404
 msgid "Calendar Source Selector"
 msgstr "ช่องเลือ��หล่งป�ิทิน"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1623
 msgid "New appointment"
 msgstr "นัดหมายใหม่"
 
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1624
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_นัดหมาย"
 
-#: ../calendar/gui/calendar-component.c:1598
+#: ../calendar/gui/calendar-component.c:1625
 msgid "Create a new appointment"
 msgstr "สร้างนัดหมายใหม่"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1631
 msgid "New meeting"
 msgstr "�ารประชุมใหม่"
 
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1632
 msgctxt "New"
 msgid "M_eeting"
 msgstr "�าร_ประชุม"
 
-#: ../calendar/gui/calendar-component.c:1606
+#: ../calendar/gui/calendar-component.c:1633
 msgid "Create a new meeting request"
 msgstr "สร้าง�ารขอ�ารประชุมใหม่"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1639
 msgid "New all day appointment"
 msgstr "นัดหมายตลอดทั้งวันใหม่"
 
-#: ../calendar/gui/calendar-component.c:1613
+#: ../calendar/gui/calendar-component.c:1640
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "นัดหมาย_ตลอดทั้งวัน"
 
-#: ../calendar/gui/calendar-component.c:1614
+#: ../calendar/gui/calendar-component.c:1641
 msgid "Create a new all-day appointment"
 msgstr "สร้าง�ารประชุมตลอดทั้งวันใหม่"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1647
 msgid "New calendar"
 msgstr "ป�ิทินใหม่"
 
-#: ../calendar/gui/calendar-component.c:1621
+#: ../calendar/gui/calendar-component.c:1648
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_ป�ิทิน"
 
-#: ../calendar/gui/calendar-component.c:1622
+#: ../calendar/gui/calendar-component.c:1649
 msgid "Create a new calendar"
 msgstr "สร้างป�ิทินใหม่"
 
@@ -5356,7 +5393,7 @@ msgid "Any Field"
 msgstr "เขตข้อมูลใดๆ"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:21
 msgid "Attachments"
 msgstr "เอ�สาร�นบ"
 
@@ -5386,8 +5423,8 @@ msgstr "ประเภท"
 msgid "Competition"
 msgstr "�าร�ข่งขัน"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-calendar-table.c:547
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:250
+#: ../calendar/gui/e-cal-model.c:348 ../calendar/gui/e-calendar-table.c:546
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Confidential"
 msgstr "เป็นความลับ"
@@ -5405,12 +5442,12 @@ msgid "Description Contains"
 msgstr "คำอธิบายมีคำว่า"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:38
 msgid "Do Not Exist"
 msgstr "ไม่มี"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:41
 msgid "Exist"
 msgstr "มี"
 
@@ -5479,15 +5516,15 @@ msgstr "ผู้ประสานงาน"
 msgid "Phone Calls"
 msgstr "ราย�ารเรีย�โทรศัพท์"
 
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:253
-#: ../calendar/gui/e-cal-model.c:335 ../calendar/gui/e-calendar-table.c:546
+#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:249
+#: ../calendar/gui/e-cal-model.c:346 ../calendar/gui/e-calendar-table.c:545
 #: ../calendar/gui/memotypes.xml.h:29
 msgid "Private"
 msgstr "ส่วนตัว"
 
-#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:252
-#: ../calendar/gui/e-cal-model.c:326 ../calendar/gui/e-cal-model.c:333
-#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-cal-model.c:344
+#: ../calendar/gui/e-calendar-table.c:544 ../calendar/gui/memotypes.xml.h:30
 msgid "Public"
 msgstr "เปิดเผย"
 
@@ -5501,7 +5538,7 @@ msgstr "�ารเวียนซ้ำ"
 #: ../calendar/gui/e-meeting-list-view.c:545
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
-#: ../mail/em-filter-i18n.h:69 ../mail/message-list.etspec.h:17
+#: ../mail/em-filter-i18n.h:86 ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "สถานะ"
 
@@ -5515,7 +5552,7 @@ msgstr "�ลยุทธ์"
 #: ../calendar/gui/e-calendar-table.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
 #: ../calendar/gui/tasktypes.xml.h:40
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "สรุป"
 
@@ -5545,38 +5582,38 @@ msgid "Waiting"
 msgstr "�ำลังรอ"
 
 #: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
-#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:26
 msgid "contains"
 msgstr "มีคำว่า"
 
 #: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
-#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:32
 msgid "does not contain"
 msgstr "ไม่มีคำว่า"
 
 #: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
-#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:46
 msgid "is"
 msgstr "คือ"
 
 #: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:52
 msgid "is not"
 msgstr "ไม่ใช่"
 
-#: ../calendar/gui/comp-editor-factory.c:405
+#: ../calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "เ�ิดข้อผิดพลาดขณะเปิดป�ิทิน"
 
-#: ../calendar/gui/comp-editor-factory.c:411
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Method not supported when opening the calendar"
 msgstr "เรีย�เมธอดที่ไม่รองรับขณะเปิดป�ิทิน"
 
-#: ../calendar/gui/comp-editor-factory.c:417
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Permission denied to open the calendar"
 msgstr "ไม่อนุ�าตให้เปิดป�ิทิน"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
+#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1272
 msgid "Unknown error"
 msgstr "ข้อผิดพลาดไม่ทราบสาเหตุ"
 
@@ -5613,17 +5650,17 @@ msgid "Mes_sage:"
 msgstr "_ข้อความ:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "เล่นเสียง"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "ผุดข้อความเตือน"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "เรีย�โปร��รม"
 
@@ -5636,7 +5673,7 @@ msgid "Send To:"
 msgstr "ส่งไปยัง:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "ส่งอีเมล"
 
@@ -5714,7 +5751,7 @@ msgstr "ให้à¹�_สดงเอà¸�สารà¹�นบนี้โดยอà¸
 msgid "Attach file(s)"
 msgstr "�นบ�ฟ้ม"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:484
 msgid "Selected Calendars for Alarms"
 msgstr "ป�ิทินที่เลือ�เพื่อใช้�จ้งเตือน"
 
@@ -5778,7 +5815,7 @@ msgid "Display"
 msgstr "�สดง"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "ศุ�ร์"
@@ -5794,7 +5831,7 @@ msgstr ""
 "วัน"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "จันทร์"
@@ -5828,7 +5865,7 @@ msgid "S_un"
 msgstr "อ_า."
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "เสาร์"
@@ -5846,7 +5883,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "�สดงสัป_ดาห์ที่ในป�ิทิน"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "อาทิตย์"
@@ -5865,7 +5902,7 @@ msgid "Template:"
 msgstr "รูป�บบข้อความ:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "พฤหัสบดี"
@@ -5880,13 +5917,13 @@ msgid "Time format:"
 msgstr "รูป�บบเวลา:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "อังคาร"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "พุธ"
@@ -5965,95 +6002,95 @@ msgstr "_พ."
 msgid "before every appointment"
 msgstr "�่อนนัดหมายทุ�ครั้ง"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "คัดลอ_�เนื้อหาป�ิทินไว้ที่เครื่องเพื่อ�ารทำงาน�บบออฟไลน์"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "คัดลอ_�เนื้อหาราย�ารภาร�ิจไว้ที่เครื่องเพื่อ�ารทำงาน�บบออฟไลน์"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:275
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "คัดลอ_�เนื้อหาราย�ารบันทึ�ช่วยจำไว้ที่เครื่องเพื่อ�ารทำงาน�บบออฟไลน์"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:345
 msgid "Colo_r:"
 msgstr "_สี:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Task List"
 msgstr "ราย�ารภาร�ิจ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 msgid "Memo List"
 msgstr "ราย�ารบันทึ�ช่วยจำ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "Calendar Properties"
 msgstr "คุณสมบัติป�ิทิน"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "New Calendar"
 msgstr "ป�ิทินใหม่"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "Task List Properties"
 msgstr "คุณสมบัติราย�ารภาร�ิจ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "New Task List"
 msgstr "ราย�ารภาร�ิจใ_หม่"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "Memo List Properties"
 msgstr "คุณสมบัติราย�ารบันที�ช่วยจำ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "New Memo List"
 msgstr "ราย�ารบันทึ�ช่วยจำใหม่"
 
-#: ../calendar/gui/dialogs/changed-comp.c:56
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "เหตุ�ารณ์นี้ถู�ลบไป�ล้ว"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "ภาร�ิจนี้ถู�ลบไป�ล้ว"
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This memo has been deleted."
 msgstr "บันทึ�ช่วยจำนี้ถู�ลบไป�ล้ว"
 
-#: ../calendar/gui/dialogs/changed-comp.c:73
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s คุณได้เปลี่ยน�ปลงข้อมูลบางอย่าง จะละเลย�ละปิดเครื่องมือ��้ไขหรือไม่?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s คุณไม่ได้��้ไขข้อมูลใดๆ จะปิดเครื่องมือ��้ไขหรือไม่?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "เหตุ�ารณ์นี้มี�ารเปลี่ยน�ปลง"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "ภาร�ิจนี้มี�ารเปลี่ยน�ปลง"
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This memo has been changed."
 msgstr "บันทึ�ช่วยจำนี้มี�ารเปลี่ยน�ปลง"
 
-#: ../calendar/gui/dialogs/changed-comp.c:97
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s คุณได้��้ไขข้อมูลบางอย่าง จะละเลย�ารเปลี่ยน�ปลงนี้ �ละปรับข้อมูลเครื่องมือ��้ไขหรือไม่?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  คุณไม่ได้��้ไขข้อมูลใดๆ จะปรับข้อมูลเครื่องมือ��้ไขหรือไม่?"
@@ -6063,356 +6100,356 @@ msgstr "%s  คุณไม่ได้à¹�à¸�้ไขข้อมูลใดà¹
 msgid "Validation error: %s"
 msgstr "พบข้อผิดพลาดของข้อมูล: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2358
 msgid " to "
 msgstr " ถึง "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2362
 msgid " (Completed "
 msgstr "(เสร็จ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2364
 msgid "Completed "
 msgstr "เสร็จ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2369
 msgid " (Due "
 msgstr " (�ำหนดเสร็จ "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2371
 msgid "Due "
 msgstr "�ำหนดเสร็จ "
 
-#: ../calendar/gui/dialogs/comp-editor.c:232
+#: ../calendar/gui/dialogs/comp-editor.c:236
 #, c-format
 msgid "Attached message - %s"
 msgstr "ข้อความที่�นบมา - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1771
-#: ../composer/e-msg-composer.c:1990
+#: ../calendar/gui/dialogs/comp-editor.c:241
+#: ../calendar/gui/dialogs/comp-editor.c:414 ../composer/e-msg-composer.c:1766
+#: ../composer/e-msg-composer.c:1985
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "ข้อความที่�นบมา"
 msgstr[1] "ข้อความที่�นบมา %d ข้อความ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
+#: ../calendar/gui/dialogs/comp-editor.c:485 ../composer/e-msg-composer.c:2053
 #: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2107
 msgid "_Move"
 msgstr "_ย้าย"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:487 ../composer/e-msg-composer.c:2055
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2109
 msgid "Cancel _Drag"
 msgstr "ย�เลิ��าร_ลา�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:616
-#: ../calendar/gui/dialogs/comp-editor.c:3249 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "เอ�สาร�นบ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:842
+#: ../calendar/gui/dialogs/comp-editor.c:846
 msgid "Could not update object"
 msgstr "ไม่สามารถปรับข้อมูลอ็อบเจ�ต์"
 
-#: ../calendar/gui/dialogs/comp-editor.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:934
 msgid "Edit Appointment"
 msgstr "��้ไขนัดหมาย"
 
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:941
 #, c-format
 msgid "Meeting - %s"
 msgstr "�ารประชุม - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:943
 #, c-format
 msgid "Appointment - %s"
 msgstr "นัดหมาย - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:949
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ภาร�ิจที่ได้รับมอบหมาย - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Task - %s"
 msgstr "ภาร�ิจ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:956
 #, c-format
 msgid "Memo - %s"
 msgstr "บันทึ�ช่วยจำ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:972
 msgid "No Summary"
 msgstr "ไม่มีสรุป"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1266
 msgid "Click here to close the current window"
 msgstr "คลิ�ที่นี่เพื่อปิดหน้าต่างปัจจุบัน"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
+#: ../calendar/gui/dialogs/comp-editor.c:1273
 msgid "Copy selected text to the clipboard"
 msgstr "คัดลอ�ข้อความที่เลือ�เข้าคลิปบอร์ด"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1280
 msgid "Cut selected text to the clipboard"
 msgstr "ตัดข้อความที่เลือ�เข้าคลิปบอร์ด"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1287
 msgid "Click here to view help available"
 msgstr "คลิ�ที่นี่เพื่อดูวิธีใช้"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1294
 msgid "Paste text from the clipboard"
 msgstr "�ปะข้อความจา�คลิปบอร์ด"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1315
 msgid "Click here to save the current window"
 msgstr "คลิ�ที่นี่เพื่อบันทึ�หน้าต่างปัจจุบัน"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1322
 msgid "Select all text"
 msgstr "เลือ�เนื้อความทั้งหมด"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1329
 msgid "_Classification"
 msgstr "ประเ_ภท"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1343
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "�_ฟ้ม"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../calendar/gui/dialogs/comp-editor.c:1350
 #: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_วิธีใช้"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1357
 msgid "_Insert"
 msgstr "�_ทร�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1364
 msgid "_Options"
 msgstr "_ตัวเลือ�"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367 ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1371 ../mail/em-folder-tree.c:2098
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "มุ_มมอง"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../calendar/gui/dialogs/comp-editor.c:1381
 #: ../composer/e-composer-actions.c:471
 msgid "_Attachment..."
 msgstr "�ฟ้ม�_นบ..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1383
 msgid "Click here to attach a file"
 msgstr "คลิ�ที่นี่เพื่อ�นบ�ฟ้ม"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1391
 msgid "_Categories"
 msgstr "_หมวด"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1393
 msgid "Toggles whether to display categories"
 msgstr "ซ่อน/�สดงช่องข้อมูลหมวดหมู่"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1399
 msgid "Time _Zone"
 msgstr "เ_ขตเวลา"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1401
 msgid "Toggles whether the time zone is displayed"
 msgstr "ซ่อน/�สดงช่องข้อมูลเขตเวลา"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "Pu_blic"
 msgstr "เ_ปิดเผย"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1408
+#: ../calendar/gui/dialogs/comp-editor.c:1412
 msgid "Classify as public"
 msgstr "�ำหนดเป็นประเภทเปิดเผย"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1413
+#: ../calendar/gui/dialogs/comp-editor.c:1417
 msgid "_Private"
 msgstr "ส่วน_ตัว"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1415
+#: ../calendar/gui/dialogs/comp-editor.c:1419
 msgid "Classify as private"
 msgstr "�ำหนดเป็นประเภทส่วนตัว"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1424
 msgid "_Confidential"
 msgstr "เป็นความ_ลับ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1426
 msgid "Classify as confidential"
 msgstr "�ำหนดเป็นประเภทความลับ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1434
 msgid "R_ole Field"
 msgstr "ช่องข้อมูล_บทบาท"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1432
+#: ../calendar/gui/dialogs/comp-editor.c:1436
 msgid "Toggles whether the Role field is displayed"
 msgstr "ซ่อน/�สดงช่องข้อมูลบทบาท"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1442
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1440
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "ซ่อน/�สดงช่องข้อมูล RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1450
 msgid "_Status Field"
 msgstr "ช่องข้อมูล_สถานะ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1448
+#: ../calendar/gui/dialogs/comp-editor.c:1452
 msgid "Toggles whether the Status field is displayed"
 msgstr "ซ่อน/�สดงช่องข้อมูลสถานะ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1458
 msgid "_Type Field"
 msgstr "ช่องข้อมูล_ชนิด"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1460
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "ซ่อน/�สดงชนิดผู้เข้าประชุม"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1766
-#: ../widgets/misc/e-attachment-bar.c:1381
-msgid "Recent Docu_ments"
+#: ../calendar/gui/dialogs/comp-editor.c:1770
+#: ../composer/e-composer-private.c:66 ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent _Documents"
 msgstr "เอ�สาร_ล่าสุด"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../calendar/gui/dialogs/comp-editor.c:1789
 #: ../composer/e-composer-actions.c:699
 msgid "Attach"
 msgstr "�นบ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1880
+#: ../calendar/gui/dialogs/comp-editor.c:1884
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "เอ�สาร�นบ <b>%d</b> ฉบับ"
 msgstr[1] "เอ�สาร�นบ <b>%d</b> ฉบับ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1912
+#: ../calendar/gui/dialogs/comp-editor.c:1916
 msgid "Hide Attachment _Bar"
 msgstr "ซ่อน�_ถบเอ�สาร�นบ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:1919
+#: ../calendar/gui/dialogs/comp-editor.c:2227
 msgid "Show Attachment _Bar"
 msgstr "�สดง�_ถบเอ�สาร�นบ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/event-page.c:1871
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1045
+#: ../calendar/gui/dialogs/comp-editor.c:2038
+#: ../calendar/gui/dialogs/event-page.c:1875
+#: ../calendar/gui/dialogs/task-page.c:1197 ../composer/e-msg-composer.c:1040
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_ลบ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1048
+#: ../calendar/gui/dialogs/comp-editor.c:2041
+#: ../composer/e-msg-composer.c:1043
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "เ_พิ่มเอ�สาร�นบ..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
-#: ../mail/em-format-html-display.c:2195
+#: ../calendar/gui/dialogs/comp-editor.c:2249
+#: ../mail/em-format-html-display.c:2201
 msgid "Show Attachments"
 msgstr "�สดงเอ�สาร�นบ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:2250
 msgid "Press space key to toggle attachment bar"
 msgstr "�ด�คร่เว้นวรรคเพื่อซ่อน/�สดง�ถบเอ�สาร�นบ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2390
-#: ../calendar/gui/dialogs/comp-editor.c:2437
-#: ../calendar/gui/dialogs/comp-editor.c:3282
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "ความเปลี่ยน�ปลงในราย�ารนี้อาจถู�ละเลยถ้ามี�ารปรับข้อมูลเข้ามา"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3311
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "ไม่สามารถใช้รุ่นปัจจุบัน"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:60
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 msgid "Could not open source"
 msgstr "ไม่สามารถเปิด�หล่งได้"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:68
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
 msgstr "ไม่สามารถเปิดที่ปลายทาง"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:77
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr "ที่ปลายทางใช้อ่านได้เท่านั้น"
 
-#: ../calendar/gui/dialogs/delete-comp.c:201
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_ลบราย�ารนี้ออ�จา��ล่องจดหมายของผู้รับอื่นทั้งหมดหรือไม่?"
 
-#: ../calendar/gui/dialogs/delete-error.c:52
+#: ../calendar/gui/dialogs/delete-error.c:56
 msgid "The event could not be deleted due to a corba error"
 msgstr "ไม่สามารถลบเหตุ�ารณ์ได้ เนื่องจา�เ�ิดข้อผิดพลาด corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:59
 msgid "The task could not be deleted due to a corba error"
 msgstr "ไม่สามารถลบภาร�ิจได้ เนื่องจา�เ�ิดข้อผิดพลาด corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
+#: ../calendar/gui/dialogs/delete-error.c:62
 msgid "The memo could not be deleted due to a corba error"
 msgstr "ไม่สามารถลบบันทึ�ช่วยจำได้ เนื่องจา�เ�ิดข้อผิดพลาด corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:65
 msgid "The item could not be deleted due to a corba error"
 msgstr "ไม่สามารถลบราย�ารได้ เนื่องจา�เ�ิดข้อผิดพลาด corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:72
 msgid "The event could not be deleted because permission was denied"
 msgstr "ไม่สามารถลบเหตุ�ารณ์ได้ เพราะไม่ได้รับอนุ�าต"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The task could not be deleted because permission was denied"
 msgstr "ไม่สามารถลบภาร�ิจได้ เพราะไม่ได้รับอนุ�าต"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The memo could not be deleted because permission was denied"
 msgstr "ไม่สามารถลบบันทึ�ช่วยจำได้ เพราะไม่ได้รับอนุ�าต"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The item could not be deleted because permission was denied"
 msgstr "ไม่สามารถลบราย�ารได้ เพราะไม่ได้รับอนุ�าต"
 
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:88
 msgid "The event could not be deleted due to an error"
 msgstr "ไม่สามารถลบเหตุ�ารณ์ได้ เพราะเ�ิดข้อผิดพลาดบางประ�าร"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
+#: ../calendar/gui/dialogs/delete-error.c:91
 msgid "The task could not be deleted due to an error"
 msgstr "ไม่สามารถลบภาร�ิจได้ เพราะเ�ิดข้อผิดพลาดบางประ�าร"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
+#: ../calendar/gui/dialogs/delete-error.c:94
 msgid "The memo could not be deleted due to an error"
 msgstr "ไม่สามารถลบบันทึ�ช่วยจำได้ เพราะเ�ิดข้อผิดพลาดบางประ�าร"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:97
 msgid "The item could not be deleted due to an error"
 msgstr "ไม่สามารถลบราย�ารได้ เพราะเ�ิดข้อผิดพลาดบางประ�าร"
 
@@ -6447,6 +6484,7 @@ msgstr "ทำให้เป็นเหตุ�ารณ์เวียนซ
 
 #: ../calendar/gui/dialogs/event-editor.c:210
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "ตัวเลือ�ของ�ารส่ง"
@@ -6484,125 +6522,125 @@ msgstr "สอบถามข้อมูลà¸�ารว่าง/ไม่วà¹
 msgid "Appoint_ment"
 msgstr "_นัดหมาย"
 
-#: ../calendar/gui/dialogs/event-page.c:731
-#: ../calendar/gui/dialogs/event-page.c:2714
+#: ../calendar/gui/dialogs/event-page.c:735
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "เหตุ�ารณ์นี้มี�าร�จ้งเตือน"
 
-#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.c:798
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "ผู้_ประสานงาน:"
 
-#: ../calendar/gui/dialogs/event-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:844
 msgid "_Delegatees"
 msgstr "ผู้_รับฉันทะ"
 
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:846
 msgid "Atte_ndees"
 msgstr "ผู้เ_ข้าประชุม"
 
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no start date"
 msgstr "เหตุ�ารณ์ที่ไม่บอ�วันเริ่มต้น"
 
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1033
 msgid "Event with no end date"
 msgstr "เหตุ�ารณ์ที่ไม่บอ�วันสิ้นสุด"
 
-#: ../calendar/gui/dialogs/event-page.c:1198
-#: ../calendar/gui/dialogs/memo-page.c:636
-#: ../calendar/gui/dialogs/task-page.c:808
+#: ../calendar/gui/dialogs/event-page.c:1202
+#: ../calendar/gui/dialogs/memo-page.c:640
+#: ../calendar/gui/dialogs/task-page.c:812
 msgid "Start date is wrong"
 msgstr "วันเริ่มต้นไม่ถู�ต้อง"
 
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1212
 msgid "End date is wrong"
 msgstr "วันสิ้นสุดไม่ถู�ต้อง"
 
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1235
 msgid "Start time is wrong"
 msgstr "เวลาเริ่มต้นไม่ถู�ต้อง"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1242
 msgid "End time is wrong"
 msgstr "เวลาสิ้นสุดไม่ถู�ต้อง"
 
-#: ../calendar/gui/dialogs/event-page.c:1401
-#: ../calendar/gui/dialogs/memo-page.c:677
-#: ../calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/event-page.c:1405
+#: ../calendar/gui/dialogs/memo-page.c:681
+#: ../calendar/gui/dialogs/task-page.c:872
 msgid "The organizer selected no longer has an account."
 msgstr "ผู้ประสานงานที่เลือ�ไม่มีบั�ชีผู้ใช้อี��ล้ว"
 
-#: ../calendar/gui/dialogs/event-page.c:1407
-#: ../calendar/gui/dialogs/memo-page.c:683
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1411
+#: ../calendar/gui/dialogs/memo-page.c:687
+#: ../calendar/gui/dialogs/task-page.c:878
 msgid "An organizer is required."
 msgstr "ต้องมีผู้ประสานงานด้วย"
 
-#: ../calendar/gui/dialogs/event-page.c:1432
-#: ../calendar/gui/dialogs/task-page.c:898
+#: ../calendar/gui/dialogs/event-page.c:1436
+#: ../calendar/gui/dialogs/task-page.c:902
 msgid "At least one attendee is required."
 msgstr "ต้อง�ารผู้เข้าประชุมอย่างน้อยหนึ่งคน"
 
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1194
+#: ../calendar/gui/dialogs/event-page.c:1876
+#: ../calendar/gui/dialogs/task-page.c:1198
 msgid "_Add "
 msgstr "เ_พิ่ม"
 
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2594
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "ไม่สามารถเปิดป�ิทิน '%s'"
 
-#: ../calendar/gui/dialogs/event-page.c:2634
-#: ../calendar/gui/dialogs/memo-page.c:886
-#: ../calendar/gui/dialogs/task-page.c:1793
+#: ../calendar/gui/dialogs/event-page.c:2638
+#: ../calendar/gui/dialogs/memo-page.c:890
+#: ../calendar/gui/dialogs/task-page.c:1797
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "คุณ�ำลังดำเนิน�ารในนามของ %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2918
 #, 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:2920
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, 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:2926
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, 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:2939
+#: ../calendar/gui/dialogs/event-page.c:2943
 msgid "Customize"
 msgstr "ปรับ�ต่ง"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2944
+#: ../calendar/gui/dialogs/event-page.c:2948
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
-#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:945
+#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
 #: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
+#: ../plugins/exchange-operations/exchange-delegates-user.c:195
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1731
+#: ../plugins/itip-formatter/itip-formatter.c:2088
+#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
 #: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "ไม่"
@@ -6682,19 +6720,19 @@ msgstr "ที่อยู่_ติดต่อ..."
 msgid "Organizer:"
 msgstr "ผู้ประสานงาน:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2478
 msgid "Memo"
 msgstr "บันทึ�ช่วยจำ"
 
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:851
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "ไม่สามารถเปิดบันทึ�ช่วยจำใน '%s'"
 
-#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../calendar/gui/dialogs/memo-page.c:1006 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "ถึง"
 
@@ -6708,58 +6746,58 @@ msgid "T_o:"
 msgstr "_ถึง:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:360
+#: ../calendar/gui/dialogs/task-page.c:364
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "�ลุ่_ม:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:50
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "คุณ�ำลังเปลี่ยน�ปลงเหตุ�ารณ์เวียนซ้ำ คุณต้อง�ารเปลี่ยน�ปลงสิ่งใด?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "คุณ�ำลังมอบฉันทะเหตุ�ารณ์เวียนซ้ำ คุณต้อง�ารมอบฉันทะสิ่งใด?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "คุณ�ำลังเปลี่ยน�ปลงภาร�ิจเวียนซ้ำ คุณต้อง�ารเปลี่ยน�ปลงสิ่งใด?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "คุณ�ำลังเปลี่ยน�ปลงบันทึ�ช่วยจำเวียนซ้ำ คุณต้อง�ารเปลี่ยน�ปลงสิ่งใด?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:85
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This Instance Only"
 msgstr "�รณีนี้โดยเฉพาะ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:93
 msgid "This and Prior Instances"
 msgstr "�รณีนี้�ละ�่อนหน้านี้"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:99
 msgid "This and Future Instances"
 msgstr "�รณีนี้�ละต่อไป"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:104
 msgid "All Instances"
 msgstr "ทุ��รณี"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:562
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "นัดหมายนี้มี�ารเวียนซ้ำที่ Evolution ไม่สามารถ��้ไขได้"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "วันที่ที่เวียนซ้ำไม่ใช่ค่าที่ใช้ได้"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:930
 msgid "on"
 msgstr "ใน"
 
@@ -6767,7 +6805,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:992
+#: ../calendar/gui/dialogs/recurrence-page.c:994
 msgid "first"
 msgstr "วัน�ร�"
 
@@ -6776,7 +6814,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:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1000
 msgid "second"
 msgstr "วันที่สอง"
 
@@ -6784,7 +6822,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:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:1005
 msgid "third"
 msgstr "วันที่สาม"
 
@@ -6792,7 +6830,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:1008
+#: ../calendar/gui/dialogs/recurrence-page.c:1010
 msgid "fourth"
 msgstr "วันที่สี่"
 
@@ -6800,13 +6838,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:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 msgid "last"
 msgstr "วันสุดท้าย"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "Other Date"
 msgstr "วันอื่น"
 
@@ -6814,7 +6852,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:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 msgid "1st to 10th"
 msgstr "วันที่ 1 ถึงวันที่ 10"
 
@@ -6822,7 +6860,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:1053
+#: ../calendar/gui/dialogs/recurrence-page.c:1055
 msgid "11th to 20th"
 msgstr "วันที่ 11 ถึงวันที่ 20"
 
@@ -6830,45 +6868,45 @@ 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:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1061
 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:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 msgid "day"
 msgstr "วัน"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1208
+#: ../calendar/gui/dialogs/recurrence-page.c:1210
 msgid "on the"
 msgstr "เมื่อ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1384
+#: ../calendar/gui/dialogs/recurrence-page.c:1386
 msgid "occurrences"
 msgstr "ครั้ง"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2087
+#: ../calendar/gui/dialogs/recurrence-page.c:2089
 msgid "Add exception"
 msgstr "เพิ่มข้อย�เว้น"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2130
 msgid "Could not get a selection to modify."
 msgstr "ไม่สามารถอ่านส่วนที่เลือ�เพื่อ��้ไขได้"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2134
+#: ../calendar/gui/dialogs/recurrence-page.c:2136
 msgid "Modify exception"
 msgstr "��้ไขข้อย�เว้น"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2178
+#: ../calendar/gui/dialogs/recurrence-page.c:2180
 msgid "Could not get a selection to delete."
 msgstr "ไม่สามารถอ่านส่วนที่เลือ�เพื่อลบได้"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2304
 msgid "Date/Time"
 msgstr "วัน/เวลา"
 
@@ -6940,53 +6978,53 @@ msgstr "<span weight=\"bold\">สถานภาพ</span>"
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
 #: ../calendar/gui/e-cal-component-preview.c:253
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
+#: ../calendar/gui/e-cal-model-tasks.c:362
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/e-itip-control.c:946
 #: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2552 ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/print.c:2554 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "เสร็จ�ล้ว"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1065
+#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1066
 msgid "High"
 msgstr "สูง"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:356
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-cal-model-tasks.c:754
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2551
 msgid "In Progress"
 msgstr "�ำลังดำเนิน�าร"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1063
+#: ../calendar/gui/e-calendar-table.c:568 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1064
 msgid "Low"
 msgstr "ต่ำ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:974 ../calendar/gui/e-calendar-table.c:568
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1065
 msgid "Normal"
 msgstr "ป�ติ"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
 #: ../calendar/gui/e-cal-component-preview.c:260
-#: ../calendar/gui/e-cal-model-tasks.c:354
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:639 ../calendar/gui/print.c:2548
 #: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "ยังไม่เริ่ม"
@@ -7000,7 +7038,7 @@ msgid "Stat_us:"
 msgstr "_สถานะ:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "ไม่ได้�ำหนด"
 
@@ -7038,16 +7076,16 @@ msgstr "_ภาร�ิจ"
 msgid "Task Details"
 msgstr "รายละเอียดภาร�ิจ"
 
-#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.c:372
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "ผู้ประ_สานงาน:"
 
-#: ../calendar/gui/dialogs/task-page.c:781
+#: ../calendar/gui/dialogs/task-page.c:785
 msgid "Due date is wrong"
 msgstr "วัน�ำหนดเสร็จงานไม่ถู�ต้อง"
 
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1754
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "ไม่สามารถเปิดภาร�ิจใน '%s'"
@@ -7069,7 +7107,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:392
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -7077,69 +7115,69 @@ 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:398
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d สัปดาห์"
 msgstr[1] "%d สัปดาห์"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
 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:474
+#: ../calendar/gui/e-alarm-list.c:476
 #, 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:479
+#: ../calendar/gui/e-alarm-list.c:481
 #, 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:486
+#: ../calendar/gui/e-alarm-list.c:488
 #, 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:497
+#: ../calendar/gui/e-alarm-list.c:499
 #, 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:502
+#: ../calendar/gui/e-alarm-list.c:504
 #, 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:509
+#: ../calendar/gui/e-alarm-list.c:511
 #, 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:533
+#: ../calendar/gui/e-alarm-list.c:535
 #, 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:541
+#: ../calendar/gui/e-alarm-list.c:543
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s สำหรับ�ารสะ�ิดที่ไม่ทราบชนิด"
@@ -7151,7 +7189,7 @@ msgid "Click to open %s"
 msgstr "คลิ�เพื่อเปิด %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "ไม่มีชื่อเรื่อง"
 
@@ -7188,7 +7226,7 @@ msgstr "วัน�ำหนดเสร็จ:"
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:246
 #: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "สถานะ:"
@@ -7207,17 +7245,17 @@ msgid "Start Date"
 msgstr "วันเริ่มต้น"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:618
 msgid "Free"
 msgstr "ว่าง"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:620
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:396
 msgid "Busy"
 msgstr "ไม่ว่าง"
 
-#: ../calendar/gui/e-cal-model-tasks.c:623
+#: ../calendar/gui/e-cal-model-tasks.c:627
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7227,7 +7265,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
 #: ../calendar/gui/e-meeting-store.c:746
@@ -7235,7 +7273,7 @@ msgstr ""
 msgid "Yes"
 msgstr "ต�ลง"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:980
+#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
 #: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:165
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -7243,209 +7281,209 @@ msgid "No"
 msgstr "ไม่ต�ลง"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:339 ../calendar/gui/e-cal-popup.c:105
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:106
+#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
 #: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
 #: ../calendar/gui/e-meeting-list-view.c:167
 #: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:985
-#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:409
-#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:987
+#: ../calendar/gui/print.c:1004 ../mail/em-utils.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:447
+#: ../plugins/itip-formatter/itip-formatter.c:2113
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "ไม่รู้จั�"
 
-#: ../calendar/gui/e-cal-model.c:976
+#: ../calendar/gui/e-cal-model.c:987
 msgid "Recurring"
 msgstr "เวียนซ้ำ"
 
-#: ../calendar/gui/e-cal-model.c:978
+#: ../calendar/gui/e-cal-model.c:989
 msgid "Assigned"
 msgstr "มอบหมาย"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "บันทึ�เป็น..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2035
 msgid "Select folder to save selected attachments..."
 msgstr "เลือ�โฟลเดอร์ที่จะบันทึ�เอ�สาร�นบที่เลือ�..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1672 ../calendar/gui/e-memo-table.c:926
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1578
+#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:925
 #: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "_บันทึ�เป็น..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:562
 #: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "ตั้งเป็น_พื้นหลัง"
 
-#: ../calendar/gui/e-cal-popup.c:287
+#: ../calendar/gui/e-cal-popup.c:288
 msgid "_Save Selected"
 msgstr "_บันทึ�สิ่งที่เลือ�"
 
-#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:832
 #, c-format
 msgid "Open in %s..."
 msgstr "เปิดใน %s..."
 
-#: ../calendar/gui/e-calendar-table.c:338
+#: ../calendar/gui/e-calendar-table.c:337
 msgid "* No Summary *"
 msgstr "* ไม่มีสรุป *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2215
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2214
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ผู้ประสานงาน: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:377
-#: ../calendar/gui/e-calendar-view.c:2219
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:2218
 #, c-format
 msgid "Organizer: %s"
 msgstr "ผู้ประสานงาน: %s"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "Start: "
 msgstr "เริ่ม: "
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "Due: "
 msgstr "�ำหนดเสร็จ: "
 
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:588
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:592
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:593
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:594
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:595
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:596
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:597
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:598
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:878
+#: ../calendar/gui/e-calendar-view.c:664 ../calendar/gui/e-memo-table.c:438
 msgid "Deleting selected objects"
 msgstr "�ำลังลบวัตถุที่เลือ�"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1162
+#: ../calendar/gui/e-calendar-view.c:794 ../calendar/gui/e-memo-table.c:644
 msgid "Updating objects"
 msgstr "�ำลังปรับข้อมูลออบเจ็�ต์ต่างๆ"
 
-#: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:821
+#: ../calendar/gui/e-calendar-table.c:1350
+#: ../calendar/gui/e-calendar-view.c:1220 ../calendar/gui/e-memo-table.c:820
 #: ../composer/e-composer-actions.c:277
 msgid "Save as..."
 msgstr "บันทึ�เป็น..."
 
-#: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-table.c:1573
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Task"
 msgstr "ภาร�ิจใ_หม่"
 
-#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1577 ../calendar/gui/e-memo-table.c:924
 msgid "Open _Web Page"
 msgstr "เปิด_เว็บเพจ"
 
-#: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1579
+#: ../calendar/gui/e-calendar-view.c:1656 ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "_พิมพ์..."
 
-#: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1676 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_ตัด"
 
-#: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1585
+#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "�_ปะ"
 
-#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1589 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_มอบหมายภาร�ิจ"
 
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1590 ../calendar/gui/e-memo-table.c:936
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "ส่ง_ต่อเป็น iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Complete"
 msgstr "_ทำเครื่องหมายว่าเสร็จ�ล้ว"
 
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_ทำเครื่องหมายภาร�ิจที่เลือ�ว่าเสร็จ�ล้ว"
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1593
 msgid "_Mark as Incomplete"
 msgstr "_ทำเครื่องหมายว่ายังไม่เสร็จ"
 
-#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-calendar-table.c:1594
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_ทำเครื่องหมายภาร�ิจที่เลือ�ว่ายังไม่เสร็จ"
 
-#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-table.c:1599
 msgid "_Delete Selected Tasks"
 msgstr "ลบ_ภาร�ิจที่เลือ�"
 
-#: ../calendar/gui/e-calendar-table.c:1834
+#: ../calendar/gui/e-calendar-table.c:1836
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "คลิ�เพื่อเพิ่มภาร�ิจ"
@@ -7469,7 +7507,7 @@ msgstr "วัน�ำหนดเสร็จ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
 #: ../calendar/gui/tasktypes.xml.h:37
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "ระดับความสำคั�"
 
@@ -7477,108 +7515,108 @@ msgstr "ระดับความสำคั�"
 msgid "Start date"
 msgstr "วันเริ่มต้น"
 
-#: ../calendar/gui/e-calendar-view.c:1340
+#: ../calendar/gui/e-calendar-view.c:1339
 msgid "Moving items"
 msgstr "�ำลังย้ายราย�าร"
 
-#: ../calendar/gui/e-calendar-view.c:1342
+#: ../calendar/gui/e-calendar-view.c:1341
 msgid "Copying items"
 msgstr "�ำลังคัดลอ�ราย�าร"
 
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1650
 msgid "New _Appointment..."
 msgstr "นัดหมายใ_หม่"
 
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New All Day _Event"
 msgstr "เ_หตุ�ารณ์ทั้งวันราย�ารใหม่"
 
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New _Meeting"
 msgstr "�ารประชุมใ_หม่"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1663
 msgid "_Current View"
 msgstr "_มุมมองปัจจุบัน"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1665
 msgid "Select T_oday"
 msgstr "เลือ�_วันนี้"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "_Select Date..."
 msgstr "เ_ลือ�วัน..."
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1672
 msgid "Pri_nt..."
 msgstr "พิ_มพ์..."
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Cop_y to Calendar..."
 msgstr "_คัดลอ�ไปยังป�ิทิน..."
 
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Mo_ve to Calendar..."
 msgstr "_ย้ายไปยังป�ิทิน..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "_Delegate Meeting..."
 msgstr "มอบหมายประชุม�_ทน..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Schedule Meeting..."
 msgstr "_จัดเวลาประชุม..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Forward as iCalendar..."
 msgstr "ส่ง_ต่อเป็น iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Reply"
 msgstr "_ตอบ�ลับ"
 
-#: ../calendar/gui/e-calendar-view.c:1689 ../mail/em-folder-view.c:1330
+#: ../calendar/gui/e-calendar-view.c:1688 ../mail/em-folder-view.c:1330
 #: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "ตอบ�ลับทั้งห_มด"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "Make this Occurrence _Movable"
 msgstr "ให้เหตุ�ารณ์นี้เ_คลื่อนย้ายได้"
 
-#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1694 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "_ลบเหตุ�ารณ์นี้"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "Delete _All Occurrences"
 msgstr "ลบ_ทุ�เหตุ�ารณ์"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2234 ../calendar/gui/print.c:2510
 #, c-format
 msgid "Location: %s"
 msgstr "สถานที่: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2268
 #, 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:115
+#: ../calendar/gui/e-cell-date-edit-text.c:111
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Ey %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:118
+#: ../calendar/gui/e-cell-date-edit-text.c:114
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Ey %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:126
+#: ../calendar/gui/e-cell-date-edit-text.c:122
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7591,7 +7629,7 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:587
+#: ../calendar/gui/e-day-view-time-item.c:583
 #, c-format
 msgid "%02i minute divisions"
 msgstr "ความละเอียด %02i นาที"
@@ -7602,20 +7640,20 @@ msgstr "ความละเอียด %02i นาที"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:330 ../calendar/gui/print.c:1672
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1560
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1674
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:791 ../calendar/gui/e-week-view.c:528
-#: ../calendar/gui/print.c:829
+#: ../calendar/gui/e-day-view.c:800 ../calendar/gui/e-week-view.c:540
+#: ../calendar/gui/print.c:831
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:803 ../calendar/gui/e-week-view.c:543
+#: ../calendar/gui/print.c:833
 msgid "pm"
 msgstr "pm"
 
@@ -7696,7 +7734,7 @@ msgid "Ends"
 msgstr "สิ้นสุด"
 
 #: ../calendar/gui/e-itip-control.c:961
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "ถึง�ำหนด"
 
@@ -7731,12 +7769,12 @@ msgstr "<br> à¸�รุณาดูข้อมูลข้างล่างนà
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
 #: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2034
+#: ../plugins/itip-formatter/itip-formatter.c:2101
 msgid "Accepted"
 msgstr "ตอบรับ�ล้ว"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../plugins/itip-formatter/itip-formatter.c:2104
 msgid "Tentatively Accepted"
 msgstr "อาจตอบรับ"
 
@@ -7744,7 +7782,7 @@ msgstr "อาจตอบรับ"
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
 #: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2040
+#: ../plugins/itip-formatter/itip-formatter.c:2107
 msgid "Declined"
 msgstr "ป�ิเสธ"
 
@@ -7961,7 +7999,7 @@ msgid "Attendee status updated\n"
 msgstr "ปรับข้อมูลผู้เข้าร่วมเรียบร้อย�ล้ว\n"
 
 #: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../plugins/itip-formatter/itip-formatter.c:1301
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "ไม่สามารถปรับข้อมูลสถานะผู้เข้าร่วมประชุมได้ เนื่องจา�ราย�ารหายไป�ล้ว"
 
@@ -8058,49 +8096,49 @@ msgstr "ผู้เข้าประชุม"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:981
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:983
 msgid "Individual"
 msgstr "ส่วนบุคคล"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
 #: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:982 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/print.c:984 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "�ลุ่ม"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/print.c:985
 msgid "Resource"
 msgstr "ทรัพยา�ร"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:984
+#: ../calendar/gui/print.c:986
 msgid "Room"
 msgstr "ห้อง"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:998
+#: ../calendar/gui/print.c:1000
 msgid "Chair"
 msgstr "ประธาน"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
 #: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:1001
 msgid "Required Participant"
 msgstr "ผู้ร่วมประชุมที่ต้องเข้า"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/print.c:1002
 msgid "Optional Participant"
 msgstr "ผู้ร่วมประชุมเสริม"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:1001
+#: ../calendar/gui/print.c:1003
 msgid "Non-Participant"
 msgstr "ไม่ใช่ผู้ร่วมประชุม"
 
@@ -8112,14 +8150,14 @@ msgstr "ต้องดำเนิน�าร"
 
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-time-sel.c:397
+#: ../calendar/gui/e-meeting-time-sel.c:395
 msgid "Tentative"
 msgstr "ไม่�น่"
 
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
 #: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2043
+#: ../plugins/itip-formatter/itip-formatter.c:2110
 msgid "Delegated"
 msgstr "ส่งผู้�ทนเข้าประชุม"
 
@@ -8140,8 +8178,8 @@ 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:472
-#: ../calendar/gui/e-meeting-time-sel.c:2122
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2120
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Ey"
 
@@ -8149,78 +8187,78 @@ msgstr "%A %d %B %Ey"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:476
-#: ../calendar/gui/e-meeting-time-sel.c:2153
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2151
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Ey"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:480
+#: ../calendar/gui/e-meeting-time-sel-item.c:475
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Ey"
 
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Out of Office"
 msgstr "ไม่อยู่ที่ทำงาน"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "No Information"
 msgstr "ไม่มีข้อมูล"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "A_ttendees..."
 msgstr "ผู้เ_ข้าประชุม..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:434
 msgid "O_ptions"
 msgstr "_ตัวเลือ�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:451
 msgid "Show _only working hours"
 msgstr "�สดง_ชั่วโมงทำ�ารเท่านั้น"
 
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _zoomed out"
 msgstr "�สดงภาพขยาย_ออ�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:476
 msgid "_Update free/busy"
 msgstr "_ปรับปรุงข้อมูล ว่าง/ไม่ว่าง "
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:509
 msgid "_Autopick"
 msgstr "เลือ�_อัตโนมัติ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:524
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:541
 msgid "_All people and resources"
 msgstr "_ทุ�คน ทุ�ทรัพยา�ร"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "All _people and one resource"
 msgstr "ทุ�_คน �ละทรัพยา�รชิ้นใดชิ้นหนึ่ง"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:559
 msgid "_Required people"
 msgstr "ผู้เข้าประชุมห_ลั�"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:568
 msgid "Required people and _one resource"
 msgstr "ผู้เข้าประชุมหลั� �ละ_ทรัพยา�รชิ้นใดชิ้นหนึ่ง"
 
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:604
 msgid "_Start time:"
 msgstr "เวลาเ_ริ่มต้น:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:631
 msgid "_End time:"
 msgstr "เวลา_สิ้นสุด:"
 
@@ -8248,11 +8286,11 @@ msgstr "ภาษา"
 msgid "Member"
 msgstr "สมาชิ�"
 
-#: ../calendar/gui/e-memo-table.c:942
+#: ../calendar/gui/e-memo-table.c:941
 msgid "_Delete Selected Memos"
 msgstr "ลบบันทึ�_ช่วยจำที่เลือ�"
 
-#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "คลิ�เพื่อเพิ่มบันทึ�ช่วยจำ"
 
@@ -8296,14 +8334,14 @@ msgstr "�ำลังจบภาร�ิจ..."
 msgid "Expunging"
 msgstr "�ำลังเ�็บ�วาด"
 
-#: ../calendar/gui/e-timezone-entry.c:129
+#: ../calendar/gui/e-timezone-entry.c:128
 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:347 ../calendar/gui/print.c:1653
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1655
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -8453,77 +8491,77 @@ msgstr "ข้อมูล iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "คุณต้องเป็นผู้เข้าร่วมในเหตุ�ารณ์"
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:489
 msgid "_New Memo List"
 msgstr "ราย�ารบันทึ�ช่วยจำให_ม่"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:571
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "บันทึ�ช่วยจำ %d ราย�าร"
 msgstr[1] "บันทึ�ช่วยจำ %d ราย�าร"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:573 ../calendar/gui/tasks-component.c:564
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] " เลือ�อยู่ %d ราย�าร"
 msgstr[1] " เลือ�อยู่ %d ราย�าร"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:620
 msgid "Failed upgrading memos."
 msgstr "�ารปรับปรุงรุ่นบันทึ�ช่วยจำล้มเหลว"
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:980
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "ไม่สามารถเปิดราย�ารบันทึ�ช่วยจำ '%s' สำหรับ�ารสร้างเหตุ�ารณ์�ละ�ารประชุม"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:993
 msgid "There is no calendar available for creating memos"
 msgstr "ไม่มีป�ิทินที่ใช้ได้สำหรับ�ารสร้างบันทึ�ช่วยจำ"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1103
 msgid "Memo Source Selector"
 msgstr "เครื่องมือเลือ��หล่งบันทึ�ช่วยจำ"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1287
 msgid "New memo"
 msgstr "บันทึ�ช่วยจำใหม่"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1288
 msgctxt "New"
 msgid "Mem_o"
 msgstr "บันทึ�_ช่วยจำ"
 
-#: ../calendar/gui/memos-component.c:1262
+#: ../calendar/gui/memos-component.c:1289
 msgid "Create a new memo"
 msgstr "สร้างบันทึ�ช่วยจำใหม่"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1295
 msgid "New shared memo"
 msgstr "บันทึ�ช่วยจำใช้ร่วมชิ้นใหม่"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1296
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "บันทึ�ช่วยจำใช้_ร่วม"
 
-#: ../calendar/gui/memos-component.c:1270
+#: ../calendar/gui/memos-component.c:1297
 msgid "Create a shared new memo"
 msgstr "สร้างบันทึ�ช่วยจำใช้ร่วมชิ้นใหม่"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1303
 msgid "New memo list"
 msgstr "ราย�ารบันทึ�ช่วยจำใหม่"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1304
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "_ราย�ารบันทึ�ช่วยจำ"
 
-#: ../calendar/gui/memos-component.c:1278
+#: ../calendar/gui/memos-component.c:1305
 msgid "Create a new memo list"
 msgstr "สร้างราย�ารบันทึ�ช่วยจำใหม่"
 
@@ -8582,269 +8620,269 @@ msgstr "ไม่สามารถถ่ายโอนภาร�ิจ `%s'"
 msgid "Notes"
 msgstr "บันทึ�ข้อความ"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "1st"
 msgstr "วันที่ 1"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "2nd"
 msgstr "วันที่ 2"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "3rd"
 msgstr "วันที่ 3"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "4th"
 msgstr "วันที่ 4"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "5th"
 msgstr "วันที่ 5"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "6th"
 msgstr "วันที่ 6"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "7th"
 msgstr "วันที่ 7"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "8th"
 msgstr "วันที่ 8"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "9th"
 msgstr "วันที่ 9"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "10th"
 msgstr "วันที่ 10"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "11th"
 msgstr "วันที่ 11"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "12th"
 msgstr "วันที่ 12"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "13th"
 msgstr "วันที่ 13"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "14th"
 msgstr "วันที่ 14"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "15th"
 msgstr "วันที่ 15"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "16th"
 msgstr "วันที่ 16"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "17th"
 msgstr "วันที่ 17"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "18th"
 msgstr "วันที่ 18"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "19th"
 msgstr "วันที่ 19"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "20th"
 msgstr "วันที่ 20"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "21st"
 msgstr "วันที่ 21"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "22nd"
 msgstr "วันที่ 22"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "23rd"
 msgstr "วันที่ 23"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "24th"
 msgstr "วันที่ 24"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "25th"
 msgstr "วันที่ 25"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "26th"
 msgstr "วันที่ 26"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "27th"
 msgstr "วันที่ 27"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "28th"
 msgstr "วันที่ 28"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "29th"
 msgstr "วันที่ 29"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "30th"
 msgstr "วันที่ 30"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:523
 msgid "31st"
 msgstr "วันที่ 31"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Su"
 msgstr "อา."
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Mo"
 msgstr "จ."
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Tu"
 msgstr "อ."
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "We"
 msgstr "พ."
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Th"
 msgstr "พฤ."
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Fr"
 msgstr "ศ."
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Sa"
 msgstr "ส."
 
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2474
 msgid "Appointment"
 msgstr "นัดหมาย"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2476
 msgid "Task"
 msgstr "ภาร�ิจ"
 
-#: ../calendar/gui/print.c:2499
+#: ../calendar/gui/print.c:2501
 #, c-format
 msgid "Summary: %s"
 msgstr "สรุป: %s"
 
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2524
 msgid "Attendees: "
 msgstr "ผู้เข้าประชุม: "
 
-#: ../calendar/gui/print.c:2562
+#: ../calendar/gui/print.c:2564
 #, c-format
 msgid "Status: %s"
 msgstr "สถานะ: %s"
 
-#: ../calendar/gui/print.c:2579
+#: ../calendar/gui/print.c:2581
 #, c-format
 msgid "Priority: %s"
 msgstr "ระดับความสำคั�: %s"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2593
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "เปอร์เซ็นต์ที่เสร็จ: %i"
 
-#: ../calendar/gui/print.c:2603
+#: ../calendar/gui/print.c:2605
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2616
+#: ../calendar/gui/print.c:2618
 #, c-format
 msgid "Categories: %s"
 msgstr "หมวด: %s"
 
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:2629
 msgid "Contacts: "
 msgstr "ที่อยู่ติดต่อ:"
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:480
 msgid "_New Task List"
 msgstr "ราย�ารภาร�ิจใ_หม่"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:562
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d ภาร�ิจ"
 msgstr[1] "%d ภาร�ิจ"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:611
 msgid "Failed upgrading tasks."
 msgstr "ปรับรุ่นข้อมูลภาร�ิจไม่สำเร็จ"
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:968
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "ไม่สามารถเปิดราย�ารภาร�ิจ '%s' สำหรับ�ารสร้างเหตุ�ารณ์�ละ�ารประชุม"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:981
 msgid "There is no calendar available for creating tasks"
 msgstr "ไม่มีป�ิทินที่ใช้ได้สำหรับ�ารสร้างภาร�ิจ"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1092
 msgid "Task Source Selector"
 msgstr "เครื่องมือเลือ��หล่งข้อมูลภาร�ิจ"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1352
 msgid "New task"
 msgstr "ภาร�ิจใหม่"
 
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/tasks-component.c:1353
 msgctxt "New"
 msgid "_Task"
 msgstr "_ภาร�ิจ"
 
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/tasks-component.c:1354
 msgid "Create a new task"
 msgstr "สร้างภาร�ิจใหม่"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1360
 msgid "New assigned task"
 msgstr "ภาร�ิจที่ได้รับมอบหมายใหม่"
 
-#: ../calendar/gui/tasks-component.c:1334
+#: ../calendar/gui/tasks-component.c:1361
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "ภาร�ิจที่ได้รับ_มอบหมาย"
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1362
 msgid "Create a new assigned task"
 msgstr "สร้างภาร�ิจที่ได้รับมอบหมายใหม่"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1368
 msgid "New task list"
 msgstr "ราย�ารภาร�ิจใหม่"
 
-#: ../calendar/gui/tasks-component.c:1342
+#: ../calendar/gui/tasks-component.c:1369
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "_ราย�ารภาร�ิจ"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1370
 msgid "Create a new task list"
 msgstr "สร้างราย�ารภาร�ิจใหม่"
 
@@ -8881,49 +8919,49 @@ msgstr "ย�เลิ�"
 msgid "In progress"
 msgstr "�ำลังดำเนิน�าร"
 
-#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:50
 msgid "is greater than"
 msgstr "มา��ว่า"
 
-#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:51
 msgid "is less than"
 msgstr "น้อย�ว่า"
 
-#: ../calendar/importers/icalendar-importer.c:73
+#: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
 msgstr "นัดหมาย�ละ�ารประชุม"
 
-#: ../calendar/importers/icalendar-importer.c:331
-#: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:616
+#: ../plugins/itip-formatter/itip-formatter.c:1635
 msgid "Opening calendar"
 msgstr "�ำลังเปิดป�ิทิน"
 
-#: ../calendar/importers/icalendar-importer.c:438
+#: ../calendar/importers/icalendar-importer.c:440
 msgid "iCalendar files (.ics)"
 msgstr "�ฟ้ม iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:441
 msgid "Evolution iCalendar importer"
 msgstr "เครื่องมือนำเข้า iCalendar ของ Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:515
+#: ../calendar/importers/icalendar-importer.c:517
 msgid "Reminder!"
 msgstr "เตือนความจำ!"
 
-#: ../calendar/importers/icalendar-importer.c:567
+#: ../calendar/importers/icalendar-importer.c:569
 msgid "vCalendar files (.vcf)"
 msgstr "�ฟ้ม vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:568
+#: ../calendar/importers/icalendar-importer.c:570
 msgid "Evolution vCalendar importer"
 msgstr "เครื่องมือนำเข้า vCalendar ของ Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:730
+#: ../calendar/importers/icalendar-importer.c:732
 msgid "Calendar Events"
 msgstr "เหตุ�ารณ์�บบป�ิทิน"
 
-#: ../calendar/importers/icalendar-importer.c:767
+#: ../calendar/importers/icalendar-importer.c:769
 msgid "Evolution Calendar intelligent importer"
 msgstr "เครื่องมือนำเข้าข้อมูลอัจฉริยะสำหรับป�ิทินของ Evolution"
 
@@ -10736,42 +10774,38 @@ msgstr "เลือ�โฟลเดอร์ที่จะ�ปะประ
 msgid "Click here to select folders to post to"
 msgstr "คลิ�ที่นี่เพื่อเลือ�โฟลเดอร์ที่จะประ�าศ"
 
-#: ../composer/e-composer-private.c:65
-msgid "Recent _Documents"
-msgstr "เอ�สาร_ล่าสุด"
-
-#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
+#: ../composer/e-composer-private.c:181 ../composer/e-msg-composer.c:1553
 msgid "Show _Attachment Bar"
 msgstr "�สดง�_ถบเอ�สาร�นบ"
 
-#: ../composer/e-msg-composer.c:872
+#: ../composer/e-msg-composer.c:867
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ไม่สามารถเซ็น�ำ�ับข้อความขาออ�: ไม่ได้�ำหนดใบรับรอง�ารเซ็น�ำ�ับสำหรับบั�ชีนี้"
 
-#: ../composer/e-msg-composer.c:879
+#: ../composer/e-msg-composer.c:874
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ไม่สามารถเข้ารหัสลับข้อความขาออ�: ไม่ได้�ำหนดใบรับรอง�ารเข้ารหัสลับสำหรับบั�ชีนี้"
 
-#: ../composer/e-msg-composer.c:1500 ../mail/em-format-html-display.c:1913
-#: ../mail/em-format-html-display.c:2405 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1495 ../mail/em-format-html-display.c:1919
+#: ../mail/em-format-html-display.c:2411 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "เอ�สาร�นบ"
 msgstr[1] "เอ�สาร�นบ"
 
-#: ../composer/e-msg-composer.c:1556
+#: ../composer/e-msg-composer.c:1551
 msgid "Hide _Attachment Bar"
 msgstr "ซ่อน�_ถบเอ�สาร�นบ"
 
-#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
+#: ../composer/e-msg-composer.c:1568 ../composer/e-msg-composer.c:2775
 msgid "Compose Message"
 msgstr "เขียนจดหมาย"
 
-#: ../composer/e-msg-composer.c:4055
+#: ../composer/e-msg-composer.c:4050
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10859,10 +10893,10 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
+"Send options available only for Novell GroupWise and Microsoft Exchange "
 "accounts."
 msgstr ""
-"มีตัวเลือ�ของ�ารส่งเฉพาะสำหรับบั�ชี Novell Groupwise �ละ Microsoft Exchange เท่านั้น"
+"มีตัวเลือ�ของ�ารส่งเฉพาะสำหรับบั�ชี Novell GroupWise �ละ Microsoft Exchange เท่านั้น"
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid "Send options not available."
@@ -10931,7 +10965,7 @@ msgstr "_บันทึ�ฉบับร่าง"
 msgid "Evolution Mail and Calendar"
 msgstr "เมล�ละป�ิทินของ Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
 msgid "Groupware Suite"
 msgstr "ชุด�รุ๊ป�วร์"
 
@@ -10947,40 +10981,40 @@ msgstr "นามบัตรที่อยู่"
 msgid "calendar information"
 msgstr "ข้อมูลป�ิทิน"
 
-#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "ข้อผิดพลาดใน Evolution"
 
-#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "คำเตือนของ Evolution"
 
-#: ../e-util/e-error.c:117
+#: ../e-util/e-error.c:118
 msgid "Evolution Information"
 msgstr "ข้อมูล Evolution"
 
-#: ../e-util/e-error.c:119
+#: ../e-util/e-error.c:120
 msgid "Evolution Query"
 msgstr "คำถามจา� Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:449
+#: ../e-util/e-error.c:450
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "ข้อผิดพลาดภายในไม่ทราบสาเหตุ ขณะมี�ารร้องขอ '%s'"
 
-#: ../e-util/e-logger.c:156
+#: ../e-util/e-logger.c:161
 msgid "Component"
 msgstr "องค์ประ�อบ"
 
-#: ../e-util/e-logger.c:157
+#: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
 msgstr "ชื่อขององค์ประ�อบที่�ำลังบันทึ�ปูม"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
 #: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:689
+#: ../plugins/publish-calendar/publish-calendar.c:690
 msgid "Enabled"
 msgstr "เปิดใช้งาน"
 
@@ -11029,7 +11063,7 @@ msgstr "เขียนทับ�ฟ้มหรือไม่?"
 msgid "_Overwrite"
 msgstr "เ_ขียนทับ"
 
-#: ../e-util/e-util.c:97
+#: ../e-util/e-util.c:96
 msgid "Could not display help for Evolution."
 msgstr "ไม่สามารถ�สดงวิธีใช้สำหรับ Evolution"
 
@@ -11088,119 +11122,119 @@ msgstr "ข้อผิดพลาดใน GConf: %s"
 msgid "All further errors shown only on terminal."
 msgstr "รายละเอียดข้อผิดพลาดอื่นๆ อยู่ในเทอร์มินัลเท่านั้น"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 วินาที�่อน"
 msgstr[1] "%d วินาที�่อน"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 วินาทีข้างหน้า"
 msgstr[1] "%d วินาทีข้างหน้า"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 นาที�่อน"
 msgstr[1] "%d นาที�่อน"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 นาทีข้างหน้า"
 msgstr[1] "%d นาทีข้างหน้า"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 ชั่วโมง�่อน"
 msgstr[1] "%d ชั่วโมง�่อน"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 ชั่วโมงข้างหน้า"
 msgstr[1] "%d ชั่วโมงข้างหน้า"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 วัน�่อน"
 msgstr[1] "%d วัน�่อน"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 วันข้างหน้า"
 msgstr[1] "%d วันข้างหน้า"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 สัปดาห์�่อน"
 msgstr[1] "%d สัปดาห์�่อน"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 สัปดาห์ข้างหน้า"
 msgstr[1] "%d สัปดาห์ข้างหน้า"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 เดือน�่อน"
 msgstr[1] "%d เดือน�่อน"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 เดือนข้างหน้า"
 msgstr[1] "%d เดือนข้างหน้า"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 ปี�่อน"
 msgstr[1] "%d ปี�่อน"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 ปีข้างหน้า"
 msgstr[1] "%d ปีข้างหน้า"
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<คลิ�ที่นี่เพื่อเลือ�วันที่>"
 
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "ขณะนี้"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:298
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Ey"
 
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:452
 msgid "Select a time to compare against"
 msgstr "เลือ�เวลาที่จะใช้เป็นค่าเปรียบเทียบ"
 
@@ -11213,56 +11247,56 @@ msgstr "เลือ��ฟ้ม"
 msgid "Test"
 msgstr "ทดสอบ"
 
-#: ../filter/filter-rule.c:852
+#: ../filter/filter-rule.c:853
 msgid "R_ule name:"
 msgstr "ชื่อ_�ฎ:"
 
-#: ../filter/filter-rule.c:880
-msgid "Find items that meet the following criteria"
+#: ../filter/filter-rule.c:881
+msgid "Find items that meet the following conditions"
 msgstr "หาราย�ารที่สอดคล้อง�ับเงื่อนไขต่อไปนี้"
 
-#: ../filter/filter-rule.c:914
-msgid "A_dd Filter Criteria"
-msgstr "เ_พิ่ม�ฎ�าร�รอง"
+#: ../filter/filter-rule.c:915
+msgid "A_dd Condition"
+msgstr "เพิ่มเ_งื่อนไข"
 
-#: ../filter/filter-rule.c:920
-msgid "If all criteria are met"
+#: ../filter/filter-rule.c:921
+msgid "If all conditions are met"
 msgstr "ถ้าตรงทุ�เงื่อนไข"
 
-#: ../filter/filter-rule.c:920
-msgid "If any criteria are met"
+#: ../filter/filter-rule.c:921
+msgid "If any conditions are met"
 msgstr "ถ้าตรงเงื่อนไขใดเงื่อนไขหนึ่ง"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:923
 msgid "_Find items:"
 msgstr "_หาราย�าร:"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "All related"
 msgstr "ทั้งหมดที่เ�ี่ยวข้อง"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies"
 msgstr "ตอบ"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies and parents"
 msgstr "ตอบ�ละต้นเรื่อง"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "No reply or parent"
 msgstr "ไม่มีข้อความตอบหรือต้นเรื่อง"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/filter-rule.c:947
 msgid "I_nclude threads"
 msgstr "_รวม�ระทู้ด้วย"
 
-#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "เข้า"
 
-#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "ออ�"
 
@@ -11362,7 +11396,7 @@ msgstr "ข้างหน้า"
 msgid "months"
 msgstr "เดือน"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:197
 msgid "seconds"
 msgstr "วินาที"
 
@@ -11385,15 +11419,15 @@ msgstr "สัปดาห์"
 msgid "years"
 msgstr "ปี"
 
-#: ../filter/rule-editor.c:380
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr "เพิ่ม�ฎ"
 
-#: ../filter/rule-editor.c:459
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr "��้ไข�ฎ"
 
-#: ../filter/rule-editor.c:786
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "ชื่อ�ฎ"
 
@@ -11447,9 +11481,9 @@ msgid "Evolution Network configuration control"
 msgstr "เครื่องมือควบคุมค่าตั้ง�ารเชื่อมต่อเครือข่าย Evolution"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
-#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
-#: ../mail/mail-component.c:767
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
+#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
+#: ../mail/mail-component.c:762
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "เมล"
@@ -11472,12 +11506,12 @@ msgstr "ปรับ�ต่งเครือข่าย"
 msgid "_Mail"
 msgstr "เ_มล"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:386
 #, c-format
 msgid "%s License Agreement"
 msgstr "ข้อต�ลง�ารใช้สิทธิ์ %s "
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:393
 #, c-format
 msgid ""
 "\n"
@@ -11490,64 +11524,64 @@ msgstr ""
 "สำหรับ %s ที่�สดงด้านล่างนี้\n"
 "�ละทำเครื่องหมายที่�ล่อง�าเครื่องหมายเพื่อ�สดง�ารยอมรับ\n"
 
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:239
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "เลือ�โฟลเดอร์"
 
-#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
-#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
+#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
+#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:98
 msgid "Autogenerated"
 msgstr "สร้างโดยอัตโนมัติ"
 
-#: ../mail/em-account-editor.c:762
+#: ../mail/em-account-editor.c:761
 msgid "Ask for each message"
 msgstr "ถามสำหรับ�ต่ละข้อความ"
 
-#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "ข้อมูลบุคคล"
 
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "�ารรับอีเมล"
 
-#: ../mail/em-account-editor.c:2131
+#: ../mail/em-account-editor.c:2130
 msgid "Check for _new messages every"
 msgstr "_ตรวจเมลใหม่ทุ� ๆ"
 
-#: ../mail/em-account-editor.c:2139
+#: ../mail/em-account-editor.c:2138
 msgid "minu_tes"
 msgstr "นา_ที"
 
-#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "�ารส่งอีเมล"
 
-#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "ค่าปริยาย"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:323
 msgid "Security"
 msgstr "�ารรั�ษาความปลอดภัย"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
 msgid "Receiving Options"
 msgstr "ตัวเลือ��ารรับเมล"
 
-#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Checking for New Messages"
 msgstr "�ารตรวจสอบข้อความใหม่"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "หน้าต่าง��้ไขบั�ชี"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "เครื่องมือช่วยตั้งค่าบั�ชี Evolution"
 
@@ -11608,258 +11642,275 @@ msgstr "-------- ข้อความเดิม --------"
 msgid "_Filter Rules"
 msgstr "_�ฎ�าร�รอง"
 
+#.
+#. * 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)
+#.
 #. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
+#: ../mail/em-filter-i18n.h:18
 msgid "Adjust Score"
 msgstr "ปรับคะ�นน"
 
-#: ../mail/em-filter-i18n.h:3
+#: ../mail/em-filter-i18n.h:19
 msgid "Assign Color"
 msgstr "�ต้มสี"
 
-#: ../mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:20
 msgid "Assign Score"
 msgstr "ให้คะ�นน"
 
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:22
 msgid "BCC"
 msgstr "BCC"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:23
 msgid "Beep"
 msgstr "เสียงบี๊ป"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:24
 msgid "CC"
 msgstr "CC"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:25
 msgid "Completed On"
 msgstr "เสร็จเมื่อ"
 
-#: ../mail/em-filter-i18n.h:11
+#: ../mail/em-filter-i18n.h:27
 msgid "Copy to Folder"
 msgstr "คัดลอ�ไปยังโฟลเดอร์"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:28
 msgid "Date received"
 msgstr "วันรับ"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:29
 msgid "Date sent"
 msgstr "วันส่ง"
 
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:767
+#: ../mail/em-filter-i18n.h:30
+#: ../plugins/groupwise-features/share-folder.c:768
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "ลบ"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:31
 msgid "Deleted"
 msgstr "ลบไป�ล้ว"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:33
 msgid "does not end with"
 msgstr "ไม่ได้ลงท้ายด้วย"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:34
 msgid "does not exist"
 msgstr "ไม่มีอยู่"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:35
 msgid "does not return"
 msgstr "ไม่ได้คืนค่า"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:36
 msgid "does not sound like"
 msgstr "ไม่ได้ออ�เสียงคล้าย�ับ"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:37
 msgid "does not start with"
 msgstr "ไม่ได้เริ่มด้วย"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:39
 msgid "Draft"
 msgstr "จดหมายร่าง"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:40
 msgid "ends with"
 msgstr "ลงท้ายด้วย"
 
-#: ../mail/em-filter-i18n.h:26
+#: ../mail/em-filter-i18n.h:42
 msgid "exists"
 msgstr "มีอยู่"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:43
 msgid "Expression"
 msgstr "นิพจน์"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:44
 msgid "Follow Up"
 msgstr "�ารตาม�ระทู้"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:45 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "สำคั�"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:47
 msgid "is after"
 msgstr "หลัง"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:48
 msgid "is before"
 msgstr "�่อน"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:49
 msgid "is Flagged"
 msgstr "ปั�ธงไว้"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:53
 msgid "is not Flagged"
 msgstr "ไม่ได้ปั�ธงไว้"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:54
 msgid "is not set"
 msgstr "ไม่ถู�เลือ�ไว้"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:55
 msgid "is set"
 msgstr "ถู�เลือ�ไว้"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
+#: ../mail/em-filter-i18n.h:56 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "เมลขยะ"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:57
 msgid "Junk Test"
 msgstr "ทดสอบเมลขยะ"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:58 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "ป้าย"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:59
 msgid "Mailing list"
 msgstr "เมลลิงลิสต์"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:60
 msgid "Match All"
 msgstr "ที่เหลือทั้งหมด"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:61
 msgid "Message Body"
 msgstr "ตัวข้อความ"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:62
 msgid "Message Header"
 msgstr "ส่วนหัวข้อความ"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:63
 msgid "Message is Junk"
 msgstr "ข้อความเป็นเมลขยะ"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:64
 msgid "Message is not Junk"
 msgstr "ข้อความไม่ใช่เมลขยะ"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:65
 msgid "Move to Folder"
 msgstr "ย้ายไปยังโฟลเดอร์"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:66
 msgid "Pipe to Program"
 msgstr "ส่งให้โปร��รม"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:67
 msgid "Play Sound"
 msgstr "เล่นเสียง"
 
+#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:69 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "อ่าน�ล้ว"
 
-#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "ผู้รับ"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:71
 msgid "Regex Match"
 msgstr "ค้นด้วย Regex"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:72
 msgid "Replied to"
 msgstr "ตอบไป�ล้ว"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:73
 msgid "returns"
 msgstr "คืนค่า"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:74
 msgid "returns greater than"
 msgstr "คืนค่ามา��ว่า"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:75
 msgid "returns less than"
 msgstr "คืนค่าน้อย�ว่า"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:76
 msgid "Run Program"
 msgstr "เรีย�โปร��รม"
 
-#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "คะ�นน"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:78 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "ผู้ส่ง"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:79
 msgid "Set Label"
 msgstr "�ำหนดป้ายชื่อ"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:80
 msgid "Set Status"
 msgstr "�ำหนดสถานะ"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:81
 msgid "Size (kB)"
 msgstr "ขนาด (kB)"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:82
 msgid "sounds like"
 msgstr "ออ�เสียงคล้าย�ับ"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:83
 msgid "Source Account"
 msgstr "บั�ชีต้นทาง"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:84
 msgid "Specific header"
 msgstr "ข้อมูลส่วนหัว"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:85
 msgid "starts with"
 msgstr "เริ่มด้วย"
 
-#: ../mail/em-filter-i18n.h:70
+#: ../mail/em-filter-i18n.h:87
 msgid "Stop Processing"
 msgstr "หยุดประมวลผลต่อ"
 
-#: ../mail/em-filter-i18n.h:71 ../mail/em-format-quote.c:342
+#: ../mail/em-filter-i18n.h:88 ../mail/em-format-quote.c:342
 #: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
 #: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1132
+#: ../smime/lib/e-cert.c:1115
 msgid "Subject"
 msgstr "เรื่อง"
 
-#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-filter-i18n.h:89
 msgid "Unset Status"
 msgstr "ย�เลิ�สถานะ"
 
@@ -11872,51 +11923,51 @@ msgstr "�ล้ว"
 msgid "Add Ac_tion"
 msgstr "เพิ่ม�าร_�ระทำ"
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:192
 msgid "C_reate Search Folder From Search..."
 msgstr "_สร้างโฟลเดอร์ค้นหาจา��ารค้นหา..."
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:217
 msgid "All Messages"
 msgstr "ทุ�ข้อความ"
 
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:218
 msgid "Unread Messages"
 msgstr "ข้อความที่ยังไม่ได้อ่าน"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:220
 msgid "No Label"
 msgstr "ไม่มีป้าย"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:227
 msgid "Read Messages"
 msgstr "ข้อความที่อ่าน�ล้ว"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:228
 msgid "Recent Messages"
 msgstr "ข้อความล่าสุด"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:229
 msgid "Last 5 Days' Messages"
 msgstr "ข้อความภายใน 5 วัน�่อน"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:230
 msgid "Messages with Attachments"
 msgstr "ข้อความที่มีเอ�สาร�นบ"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:231
 msgid "Important Messages"
 msgstr "ข้อความสำคั�"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:232
 msgid "Messages Not Junk"
 msgstr "ข้อความที่ไม่ใช่เมลขยะ"
 
-#: ../mail/em-folder-browser.c:1171
+#: ../mail/em-folder-browser.c:1173
 msgid "Account Search"
 msgstr "�ารค้นหาบั�ชี"
 
-#: ../mail/em-folder-browser.c:1224
+#: ../mail/em-folder-browser.c:1226
 msgid "All Account Search"
 msgstr "�ารค้นหาบั�ชีทั้งหมด"
 
@@ -11947,9 +11998,9 @@ msgstr "�ารใช้โควต้า"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-properties.c:358 ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
-#: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:159
+#: ../mail/mail-component.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "จดหมายเข้า"
@@ -11971,9 +12022,9 @@ msgstr "_สร้าง"
 msgid "Folder _name:"
 msgstr "ชื่อโ_ฟลเดอร์:"
 
-#. load store to mail component at the end, when everything is loaded
+#. load store to mail component
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
+#: ../mail/mail-vfolder.c:975 ../mail/mail-vfolder.c:1042
 msgid "Search Folders"
 msgstr "โฟลเดอร์ค้นหา"
 
@@ -11982,15 +12033,15 @@ msgstr "โฟลเดอร์ค้นหา"
 msgid "UNMATCHED"
 msgstr "ไม่ตรง"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:160
 msgid "Drafts"
 msgstr "จดหมายร่าง"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:161
 msgid "Outbox"
 msgstr "จดหมายออ�"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:162
 msgid "Sent"
 msgstr "ส่ง�ล้ว"
 
@@ -12033,12 +12084,12 @@ msgstr "�ำลังย้ายโฟลเดอร์ %s"
 msgid "Copying folder %s"
 msgstr "�ำลังคัดลอ�โฟลเดอร์ %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2015
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "�ำลังย้ายข้อความไปยังโฟลเดอร์ %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2017
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "�ำลังคัดลอ�ข้อความไปยังโฟลเดอร์ %s"
@@ -12055,7 +12106,7 @@ msgstr "_คัดลอ�ไปยังโฟลเดอร์"
 msgid "_Move to Folder"
 msgstr "_ย้ายไปยังโฟลเดอร์"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "�ำลังตรวจโฟลเดอร์ต่างๆ ใน \"%s\""
@@ -12096,7 +12147,7 @@ msgstr "�ำลังคัดลอ� `%s' ไปยัง `%s'"
 
 #: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1186
 #: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "เลือ�โฟลเดอร์"
 
@@ -12104,20 +12155,20 @@ msgstr "เลือ�โฟลเดอร์"
 msgid "C_opy"
 msgstr "_คัดลอ�"
 
-#: ../mail/em-folder-utils.c:585
+#: ../mail/em-folder-utils.c:532
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "�ำลังสร้างโฟลเดอร์ `%s'"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "สร้างโฟลเดอร์"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../mail/em-folder-utils.c:690
+#: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "ระบุที่ที่จะสร้างโฟลเดอร์"
@@ -12190,7 +12241,7 @@ msgstr "ติด_ป้าย"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:478
 msgid "_None"
 msgstr "ไ_ม่ทำอะไร"
 
@@ -12293,93 +12344,93 @@ msgid "Click to hide/unhide addresses"
 msgstr "คลิ�เพื่อ�สดง/ซ่อนที่อยู่ต่างๆ"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:470
+#: ../mail/em-format-html-display.c:471
 #, c-format
 msgid "Matches: %d"
 msgstr "หาพบ: %d"
 
-#: ../mail/em-format-html-display.c:614
+#: ../mail/em-format-html-display.c:615
 msgid "Fin_d:"
 msgstr "_หา:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:639
 msgid "_Previous"
 msgstr "_�่อนหน้า"
 
-#: ../mail/em-format-html-display.c:643
+#: ../mail/em-format-html-display.c:644
 msgid "_Next"
 msgstr "_ถัดไป"
 
-#: ../mail/em-format-html-display.c:648
+#: ../mail/em-format-html-display.c:649
 msgid "M_atch case"
 msgstr "ตัว_พิมพ์ให�่-เล็�ตรง�ัน"
 
-#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "ไม่มีลายเซ็น�ำ�ับ"
 
-#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "ข้อความนี้ไม่มีลายเซ็น�ำ�ับ ไม่มีอะไรประ�ันได้เลยว่าข้อความนี้เป็นมาจา�ผู้ส่งจริง"
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "ลายเซ็นถู�ต้อง"
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:949
 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:949 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "ลายเซ็นไม่ถู�ต้อง"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "ลายเซ็น�ำ�ับข้อความนี้ตรวจสอบ�ล้วไม่ผ่าน เป็นไปได้ว่าข้อความอาจถู���้ไขระหว่างทาง"
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "ลายเซ็นถู�ต้อง �ต่ไม่สามารถตรวจสอบผู้ส่ง"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:951
 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:951 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "มีลายเซ็น �ต่ไม่มี�ุ��จสาธารณะ"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "ข้อความนี้มีลายเซ็น�ำ�ับ �ต่ไม่มี�ุ��จสาธารณะที่จะใช้ตรวจสอบ"
 
-#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "ไม่ได้เข้ารหัส"
 
-#: ../mail/em-format-html-display.c:958
+#: ../mail/em-format-html-display.c:959
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "ข้อความนี้ไม่ได้เข้ารหัส เนื้อหาอาจถู�ดั�อ่านระหว่างทางในอินเทอร์เน็ตได้"
 
-#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "เข้ารหัส�บบอ่อน"
 
-#: ../mail/em-format-html-display.c:959
+#: ../mail/em-format-html-display.c:960
 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 "
@@ -12388,21 +12439,21 @@ msgstr ""
 "ข้อความนี้ถู�เข้ารหัส �ต่ใช้อัล�อริทึมเข้ารหัสที่อ่อน บุคคลอื่นอาจดั�อ่านได้ยา��็จริง "
 "�ต่�็ไม่ใช่เป็นไปไม่ได้ โดยใช้เวลาไม่มา�เ�ินไป"
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "เข้ารหัส"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:961
 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:961 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "เข้ารหัส�บบ�น่นหนา"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:962
 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 "
@@ -12410,87 +12461,87 @@ msgid ""
 msgstr ""
 "ข้อความนี้ถู�เข้ารหัสด้วยอัล�อริทึมเข้ารหัสที่�น่นหนา บุคคลอื่นดั�อ่านเนื้อหาได้ยา�มา� ด้วยเวลาป�ติ"
 
-#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1063 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_ดูใบรับรอง"
 
-#: ../mail/em-format-html-display.c:1077
+#: ../mail/em-format-html-display.c:1078
 msgid "This certificate is not viewable"
 msgstr "ใบรับรองนี้เปิดดูไม่ได้"
 
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1377
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "เสร็จเมื่อ %d %B %Ey %H:%M"
 
-#: ../mail/em-format-html-display.c:1379
+#: ../mail/em-format-html-display.c:1385
 msgid "Overdue:"
 msgstr "เลย�ำหนด:"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1388
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "ภายใน %d %B %Ey %H:%M"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1466
 msgid "_View Inline"
 msgstr "�_สดงในบรรทัด"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1467
 msgid "_Hide"
 msgstr "_ซ่อน"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1468
 msgid "_Fit to Width"
 msgstr "_พอดีความ�ว้าง"
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1469
 msgid "Show _Original Size"
 msgstr "�สดงขนาด_จริง"
 
-#: ../mail/em-format-html-display.c:1983
+#: ../mail/em-format-html-display.c:1989
 msgid "Save attachment as"
 msgstr "บันทึ�เอ�สาร�นบเป็น"
 
-#: ../mail/em-format-html-display.c:1987
+#: ../mail/em-format-html-display.c:1993
 msgid "Select folder to save all attachments"
 msgstr "เลือ�โฟลเดอร์ที่จะบันทึ�เอ�สาร�นบทั้งหมด"
 
-#: ../mail/em-format-html-display.c:2038
+#: ../mail/em-format-html-display.c:2044
 msgid "_Save Selected..."
 msgstr "_บันทึ�ราย�ารที่เลือ�..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2105
+#: ../mail/em-format-html-display.c:2111
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "เอ�สาร�_นบ %d ฉบับ"
 msgstr[1] "เอ�สาร�_นบ %d ฉบับ"
 
-#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
+#: ../mail/em-format-html-display.c:2118 ../mail/em-format-html-display.c:2207
 msgid "S_ave"
 msgstr "_บันทึ�"
 
-#: ../mail/em-format-html-display.c:2123
+#: ../mail/em-format-html-display.c:2129
 msgid "S_ave All"
 msgstr "บันทึ�ทั้งห_มด"
 
-#: ../mail/em-format-html-display.c:2197
+#: ../mail/em-format-html-display.c:2203
 msgid "No Attachment"
 msgstr "ไม่มีเอ�สาร�นบ"
 
-#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2344 ../mail/em-format-html-display.c:2383
 msgid "View _Unformatted"
 msgstr "�สดง�บบไ_ม่จัดรูป�บบ"
 
-#: ../mail/em-format-html-display.c:2340
+#: ../mail/em-format-html-display.c:2346
 msgid "Hide _Unformatted"
 msgstr "ซ่อน�าร�สดง�บบไ_ม่จัดรูป�บบ"
 
-#: ../mail/em-format-html-display.c:2397
+#: ../mail/em-format-html-display.c:2403
 msgid "O_pen With"
 msgstr "เ_ปิดด้วย"
 
-#: ../mail/em-format-html-display.c:2473
+#: ../mail/em-format-html-display.c:2479
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12563,7 +12614,7 @@ msgstr "สำเนาลับถึง"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1450
+#: ../mail/em-mailer-prefs.c:1451
 msgid "Mailer"
 msgstr "โปร��รมส่งเมล"
 
@@ -12597,8 +12648,8 @@ msgid "Reply-To"
 msgstr "ที่อยู่ตอบ�ลับ"
 
 #: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
-#: ../widgets/misc/e-dateedit.c:353
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
+#: ../widgets/misc/e-dateedit.c:347
 msgid "Date"
 msgstr "วันที่"
 
@@ -12606,105 +12657,110 @@ msgstr "วันที่"
 msgid "Newsgroups"
 msgstr "�ลุ่มข่าว"
 
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "รูปถ่าย"
+
+#: ../mail/em-format.c:1158
 #, c-format
 msgid "%s attachment"
 msgstr "เอ�สาร�นบ %s"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1200
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ไม่สามารถ�จงข้อความ S/MIME: ข้อผิดพลาดไม่ทราบสาเหตุ"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ไม่สามารถ�จงข้อความ MIME จะ�สดงข้อความต้นฉบับ"
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1345
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ชนิด�ารเข้ารหัสลับที่ไม่รองรับสำหรับ multipart/encrypted"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message"
 msgstr "ไม่สามารถ�จงข้อความ PGP/MIME"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ไม่สามารถ�จงข้อความ PGP/MIME: ข้อผิดพลาดไม่ทราบสาเหตุ"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1512
 msgid "Unsupported signature format"
 msgstr "รูป�บบลายเซ็นที่ไม่รองรับ"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
 msgid "Error verifying signature"
 msgstr "เ�ิดข้อผิดพลาดขณะตรวจสอบลายเซ็น"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
 msgid "Unknown error verifying signature"
 msgstr "เ�ิดข้อผิดพลาดไม่ทราบสาเหตุขณะตรวจสอบลายเซ็น"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1663
 msgid "Could not parse PGP message"
 msgstr "ไม่สามารถ�จงข้อความ PGP"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1663
 msgid "Could not parse PGP message: Unknown error"
 msgstr "ไม่สามารถ�จงข้อความ PGP: ข้อผิดพลาดไม่ทราบสาเหตุ"
 
-#: ../mail/em-mailer-prefs.c:93
+#: ../mail/em-mailer-prefs.c:94
 msgid "Every time"
 msgstr "ทุ�เวลา"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per day"
 msgstr "หนึ่งครั้งต่อวัน"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per week"
 msgstr "หนึ่งครั้งต่อสัปดาห์"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per month"
 msgstr "หนึ่งครั้งต่อเดือน"
 
-#: ../mail/em-mailer-prefs.c:326
+#: ../mail/em-mailer-prefs.c:327
 msgid "Add Custom Junk Header"
 msgstr "เพิ่มข้อมูลส่วนหัว�ำหนดเองของขยะ"
 
-#: ../mail/em-mailer-prefs.c:330
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Name:"
 msgstr "ชื่อข้อมูลส่วนหัว:"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:332
 msgid "Header Value Contains:"
 msgstr "ข้อมูลส่วนหัวมีคำว่า:"
 
-#: ../mail/em-mailer-prefs.c:436
+#: ../mail/em-mailer-prefs.c:437
 msgid "Contains Value"
 msgstr "มีคำว่า"
 
-#: ../mail/em-mailer-prefs.c:458
+#: ../mail/em-mailer-prefs.c:459
 msgid "Color"
 msgstr "สี"
 
-#: ../mail/em-mailer-prefs.c:461
+#: ../mail/em-mailer-prefs.c:462
 msgid "Tag"
 msgstr "ป้าย"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
+#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "มีปลั๊�อิน %s �ละได้ติดตั้งไบนารีไว้�ล้ว"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
+#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "ไม่มีปลั๊�อิน %s �รุณาตรวจสอบว่าได้ติดตั้ง�พ�เ�จหรือไม่"
 
-#: ../mail/em-mailer-prefs.c:1107
+#: ../mail/em-mailer-prefs.c:1108
 msgid "No Junk plugin available"
 msgstr "ไม่มีปลั๊�อินตรวจขยะ"
 
@@ -12766,12 +12822,12 @@ msgstr "ไม่สามารถสร้างที่เ�็บเมล
 
 #: ../mail/em-migrate.c:2898
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"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 ""
-"โครงสร้างสรุปของโฟลเดอร์�ล่องเมลของ Evolution เปลี่ยนไปใช้ sqlite ตั้ง�ต่ Evolution "
+"โครงสร้างสรุปของโฟลเดอร์�ล่องเมลของ Evolution เปลี่ยนไปใช้ SQLite ตั้ง�ต่ Evolution "
 "2.24\n"
 "\n"
 "�รุณาอดใจรอ ขณะที่ Evolution ถ่ายโอนโฟลเดอร์ของคุณ..."
@@ -12799,55 +12855,55 @@ msgid "Reply to _List"
 msgstr "ตอบ�ลับเข้า_ลิสต์"
 
 #. make it first item
-#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:853
 msgid "_Add to Address Book"
 msgstr "เ_พิ่มในสมุดที่อยู่"
 
-#: ../mail/em-subscribe-editor.c:583
+#: ../mail/em-subscribe-editor.c:582
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "�หล่งเ�็บนี้ไม่รองรับ�ารบอ�รับ หรือไม่ได้เปิดให้บอ�รับได้"
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:615
 msgid "Subscribed"
 msgstr "บอ�รับ�ล้ว"
 
-#: ../mail/em-subscribe-editor.c:620
+#: ../mail/em-subscribe-editor.c:619
 msgid "Folder"
 msgstr "โฟลเดอร์"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:822
+#: ../mail/em-subscribe-editor.c:821
 msgid "Please select a server."
 msgstr "�รุณาเลือ�เซิร์ฟเวอร์"
 
-#: ../mail/em-subscribe-editor.c:843
+#: ../mail/em-subscribe-editor.c:842
 msgid "No server has been selected"
 msgstr "ไม่ได้เลือ�เซิร์ฟเวอร์"
 
 #. Check buttons
-#: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:127
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "ไ_ม่ต้อง�สดงข้อความนี้อี�"
 
-#: ../mail/em-utils.c:316
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "ตัว�รองข้อความ"
 
-#: ../mail/em-utils.c:369
+#: ../mail/em-utils.c:370
 msgid "message"
 msgstr "ข้อความ"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:654
 msgid "Save Message..."
 msgstr "บันทึ�ข้อความ..."
 
-#: ../mail/em-utils.c:703
+#: ../mail/em-utils.c:704
 msgid "Add address"
 msgstr "เพิ่มที่อยู่"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1224
+#: ../mail/em-utils.c:1225
 #, c-format
 msgid "Messages from %s"
 msgstr "ข้อความจา� %s"
@@ -12873,8 +12929,8 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "ความ�ว้างของหน้าต่าง \"รับ�ละส่งเมล\""
 
 #: ../mail/evolution-mail.schemas.in.h:4
-msgid "Allows evolution to display text part of limited size"
-msgstr "ให้ evolution �สดงบางส่วนของข้อความในขนาดจำ�ัดได้"
+msgid "Allows Evolution to display text part of limited size"
+msgstr "ให้ Evolution �สดงบางส่วนของข้อความในขนาดจำ�ัดได้"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
@@ -13148,13 +13204,13 @@ msgstr "ถ้าช่อง \"ตัวอย่างข้อความ\"
 
 #: ../mail/evolution-mail.schemas.in.h:61
 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."
+"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 ""
-"ถ้าไม่มีองค์ประ�อบภายในของ Evolution สำหรับ�สดงข้อมูลชนิด mime ที่�ำหนด ชนิด mime "
-"ที่ปรา��ในรายชื่อนี้ จะถู�ค้นหาองค์ประ�อบ bonobo สำหรับ�สดง จา��านข้อมูลชนิด mime ของ "
-"GNOME"
+"ถ้าไม่มีองค์ประ�อบภายในของ Evolution สำหรับ�สดงข้อมูลชนิด MIME ที่�ำหนด "
+"จะค้นหาองค์ประ�อบ Bonobo สำหรับ�สดงชนิด MIME ที่ปรา��ในรายชื่อนี้จา��านข้อมูลชนิด MIME "
+"ของ GNOME"
 
 #: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
@@ -13218,14 +13274,18 @@ msgid "List of Labels and their associated colors"
 msgstr "รายชื่อป้าย�ละสีที่ใช้"
 
 #: ../mail/evolution-mail.schemas.in.h:72
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr "รายชื่อชนิด MIME ที่จะตรวจหาองค์ประ�อบ Bonobo สำหรับ�สดง"
+
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accepted licenses"
 msgstr "รายชื่อของสั��าอนุ�าตที่ยอมรับ"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of accounts"
 msgstr "รายชื่อบั�ชีเมล"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13233,15 +13293,15 @@ msgstr ""
 "รายชื่อบั�ชีที่องค์ประ�อบเมลของ Evolution รู้จั�  รายชื่อนี้เป็นสตริงเ�็บชื่อไดเร�ทอรีย่อยเทียบ�ับ /"
 "apps/evolution/mail/accounts"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of custom headers and whether they are enabled."
 msgstr "รายชื่อข้อมูลส่วนหัว�ำหนดเอง พร้อม�ำหนดว่าเปิดใช้หรือไม่"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of dictionary language codes used for spell checking."
 msgstr "รายชื่อรหัสภาษาของพจนานุ�รมที่จะใช้ตรวจตัวสะ�ด"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 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."
@@ -13249,25 +13309,21 @@ msgstr ""
 "รายชื่อของป้ายที่ใช้ในองค์ประ�อบเมลของ Evolution  รายชื่อนี้เป็นราย�ารของสตริงในรูป ชื่อ:สี "
 "โดย�ทนสีด้วยรูป�บบ�านสิบห��บบ HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of mime types to check for bonobo component viewers"
-msgstr "รายชื่อชนิด mime ที่จะตรวจหาองค์ประ�อบ bonobo สำหรับ�สดง"
-
 #: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "รายชื่อโพรโทคอลที่ใช้สั��าอนุ�าตที่ยอมรับ"
 
 #: ../mail/evolution-mail.schemas.in.h:80
-msgid "Load images for HTML messages over http"
-msgstr "โหลดรูปภาพในข้อความ HTML ผ่าน http"
+msgid "Load images for HTML messages over HTTP"
+msgstr "โหลดรูปภาพในข้อความ HTML ผ่าน HTTP"
 
 #: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
 "contacts. \"2\" - Always load images off the net."
 msgstr ""
-"โหลดรูปภาพในข้อความ HTML ผ่าน http(s) ค่าที่เป็นไปได้คือ: \"0\" = "
+"โหลดรูปภาพในข้อความ HTML ผ่าน HTTP(S) ค่าที่เป็นไปได้คือ: \"0\" = "
 "ไม่ต้องโหลดรูปภาพผ่านเครือข่าย, \"1\" = โหลดรูปภาพในเมลจา�ผู้ติดต่อ, \"2\" = "
 "โหลดรูปภาพผ่านเครือข่ายเสมอ"
 
@@ -13511,9 +13567,9 @@ msgstr ""
 #: ../mail/evolution-mail.schemas.in.h:141
 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 interms of KB."
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
-"ค่านี้�ำหนดขนาดสูงสุดของส่วนของข้อความที่จะสามารถจัดรูป�บบใน evolution ได้ ค่าปริยายคือ 4 "
+"ค่านี้�ำหนดขนาดสูงสุดของส่วนของข้อความที่จะสามารถจัดรูป�บบใน Evolution ได้ ค่าปริยายคือ 4 "
 "MB หรือ 4096 KB �ละ�ำหนดค่าในหน่วย KB"
 
 #: ../mail/evolution-mail.schemas.in.h:142
@@ -13721,216 +13777,215 @@ msgstr "เครื่องมือนำเข้าข้อมูล Elm à
 msgid "Import mail from Elm."
 msgstr "นำเข้าเมลจา� Elm"
 
-#: ../mail/importers/evolution-mbox-importer.c:80
+#: ../mail/importers/evolution-mbox-importer.c:79
 msgid "Destination folder:"
 msgstr "โฟลเดอร์ปลายทาง:"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder to import into"
 msgstr "เลือ�โฟลเดอร์ที่จะให้นำเข้า"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr "�ล่องเมลของเบิร์�ลีย์ (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:221
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "เครื่องมือนำเข้าโฟลเดอร์ในรูป�บบ mailbox ของ Berkeley"
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "�ำลังนำเข้า�ล่องจดหมาย"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
+#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "�ำลังนำเข้า `%s'"
 
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "�ำลังตรวจสอบ %s"
 
-#: ../mail/importers/pine-importer.c:227
+#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr "�ำลังนำเข้าข้อมูล Pine"
 
-#: ../mail/importers/pine-importer.c:426
+#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "เครื่องมือนำเข้าข้อมูล Pine"
 
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
 msgstr "นำเข้าเมลจา� Pine"
 
-#: ../mail/mail-autofilter.c:78
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "เมลไปยัง %s"
 
-#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
+#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:278
 #, c-format
 msgid "Mail from %s"
 msgstr "เมลจา� %s"
 
-#: ../mail/mail-autofilter.c:265
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "เรื่อง %s"
 
-#: ../mail/mail-autofilter.c:300
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "เมลลิงลิสต์ %s"
 
-#: ../mail/mail-autofilter.c:371
+#: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
 msgstr "เพิ่ม�ฎ�าร�รอง"
 
-#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
-#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../mail/mail-component.c:163
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "�ม่�บบ"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:545
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "เลือ�อยู่ %d ราย�าร, "
 msgstr[1] "เลือ�อยู่ %d ราย�าร, "
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:549
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "ลบข้อความไป %d ฉบับ"
 msgstr[1] "ลบข้อความไป %d ฉบับ"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:556
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "เมลขยะ %d ฉบับ"
 msgstr[1] "เมลขยะ %d ฉบับ"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "จดหมายร่าง %d ฉบับ"
 msgstr[1] "จดหมายร่าง %d ฉบับ"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "ส่ง�ล้ว %d ฉบับ"
 msgstr[1] "ส่ง�ล้ว %d ฉบับ"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:563
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "ยังไม่ส่ง %d ฉบับ"
 msgstr[1] "ยังไม่ส่ง %d ฉบับ"
 
-#: ../mail/mail-component.c:574
+#: ../mail/mail-component.c:569
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "ยังไม่อ่าน %d, "
 msgstr[1] "ยังไม่อ่าน %d, "
 
-#: ../mail/mail-component.c:575
+#: ../mail/mail-component.c:570
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "รวม %d"
 msgstr[1] "รวม %d"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:922
 msgid "New Mail Message"
 msgstr "ข้อความเมลใหม่"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:923
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "ข้อความเ_มล"
 
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:924
 msgid "Compose a new mail message"
 msgstr "เขียนเมลฉบับใหม่"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:930
 msgid "New Mail Folder"
 msgstr "โฟลเดอร์เมลใหม่"
 
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:931
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "โ_ฟลเดอร์เมล"
 
-#: ../mail/mail-component.c:933
+#: ../mail/mail-component.c:932
 msgid "Create a new mail folder"
 msgstr "สร้างโฟลเดอร์เมลใหม่"
 
-#: ../mail/mail-component.c:1080
+#: ../mail/mail-component.c:1079
 msgid "Failed upgrading Mail settings or folders."
 msgstr "ปรับรุ่นค่าตั้งหรือโฟลเดอร์เมลไม่สำเร็จ"
 
-#: ../mail/mail-component.c:1596
+#: ../mail/mail-component.c:1595
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: ../mail/mail-component.c:1596
+#: ../mail/mail-component.c:1595
 msgid "Errors"
 msgstr "ข้อผิดพลาด"
 
-#: ../mail/mail-component.c:1597
+#: ../mail/mail-component.c:1596
 msgid "Warnings and Errors"
 msgstr "คำเตือน�ละข้อผิดพลาด"
 
-#: ../mail/mail-component.c:1598
+#: ../mail/mail-component.c:1597
 msgid "Debug"
 msgstr "ข้อความดีบั๊�"
 
-#: ../mail/mail-component.c:1598
+#: ../mail/mail-component.c:1597
 msgid "Error, Warnings and Debug messages"
 msgstr "ข้อผิดพลาด คำเตือน �ละข้อความดีบั๊�"
 
-#: ../mail/mail-component.c:1725
+#: ../mail/mail-component.c:1724
 msgid "Debug Logs"
 msgstr "บันทึ�สำหรับ�ารดีบั๊�"
 
-#: ../mail/mail-component.c:1739
+#: ../mail/mail-component.c:1738
 msgid "Show _errors in the status bar for"
 msgstr "�สดง_ข้อผิดพลาดใน�ถบสถานะเป็นเวลา"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1755
+#: ../mail/mail-component.c:1754
 msgid "second(s)."
 msgstr "วินาที"
 
-#: ../mail/mail-component.c:1761
+#: ../mail/mail-component.c:1760
 msgid "Log Messages:"
 msgstr "ข้อความบันทึ�:"
 
-#: ../mail/mail-component.c:1802
+#: ../mail/mail-component.c:1801
 msgid "Log Level"
 msgstr "ระดับ�ารบันทึ�"
 
-#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1810 ../widgets/misc/e-dateedit.c:389
 msgid "Time"
 msgstr "เวลา"
 
-#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
+#: ../mail/mail-component.c:1820 ../mail/message-list.c:2516
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "ข้อความ"
 
-#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1829 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "ปิดหน้าต่างนี้"
@@ -14404,72 +14459,80 @@ msgid "S_tandard Font:"
 msgstr "�บบอั�ษร_มาตร�าน:"
 
 #: ../mail/mail-config.glade.h:132
+msgid "Select Drafts Folder"
+msgstr "เลือ�โฟลเดอร์เ�็บข้อความฉบับร่าง"
+
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font"
 msgstr "เลือ��บบอั�ษรความ�ว้างคงที่สำหรับ HTML"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font for printing"
 msgstr "เลือ��บบอั�ษรความ�ว้างคงที่สำหรับพิมพ์ HTML"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font"
 msgstr "เลือ��บบอั�ษรความ�ว้างไม่คงที่สำหรับ HTML"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font for printing"
 msgstr "เลือ��บบอั�ษรความ�ว้างไม่คงที่สำหรับพิมพ์ HTML"
 
 #: ../mail/mail-config.glade.h:137
+msgid "Select Sent Folder"
+msgstr "เลือ�โฟลเดอร์เ�็บข้อความออ�"
+
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "�ารส่งเมล"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "โ_ฟลเดอร์ข้อความออ�:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "เซิร์ฟเวอร์ต้อง�าร�าร_ยืนยันตัวบุคคล"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:142
 msgid "Server _Type: "
 msgstr "_ชนิดเซิร์ฟเวอร์:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "ใบ_รับรองลายเซ็น:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "_ลายเซ็น:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "ลายเซ็น"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "ตารางลายเซ็น"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "�ารตรวจตัวสะ�ด"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "เริ่มพิมพ์ตอบที่_ท้ายข้อความ"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
 msgid "T_ype: "
 msgstr "_ชนิด:"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "รายชื่อภาษาในที่นี้ จะมีเฉพาะภาษาที่คุณติดตั้งพจนานุ�รมไว้เท่านั้น"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14478,7 +14541,7 @@ msgstr ""
 "ผลลัพธ์ของสคริปต์นี้จะถู�ใช้เป็นลายเซ็นของคุณ\n"
 "ชื่อที่คุณ�ำหนด จะใช้เพื่อ�สดงเมื่ออ้างอิงถึงเท่านั้น"
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:154
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14486,26 +14549,26 @@ msgstr ""
 "�รุณาป้อนชื่อที่คุณต้อง�ารใช้เรีย�บั�ชีนี้\n"
 "ตัวอย่างเช่น: \"งาน\" หรือ \"ส่วนบุคคล\""
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:156
 msgid "Us_ername:"
 msgstr "_ชื่อผู้ใช้:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:157
 msgid "Use Authe_ntication"
 msgstr "ใช้�ารยืนยัน_ตัวบุคคล"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
+#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:284
 #: ../plugins/google-account-setup/google-source.c:625
 #: ../plugins/google-account-setup/google-contacts-source.c:278
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "_ชื่อผู้ใช้:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:159
 msgid "V_ariable-width:"
 msgstr "ความ�ว้างไ_ม่คงที่:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:160
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14515,128 +14578,128 @@ msgstr ""
 "\n"
 "คลิ� \"ถัดไป\" เพื่อเริ่ม "
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:163
 msgid "_Add Signature"
 msgstr "เ_พิ่มลายเซ็น"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:164
 msgid "_Always load images from the Internet"
 msgstr "โหลดรูปภาพจา�อินเทอร์เน็ตเ_สมอ"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:165
 msgid "_Automatic proxy configuration URL:"
 msgstr "URL สำหรับตั้งค่าพร็อ�ซี_อัตโนมัติ:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:166
 msgid "_Default junk plugin:"
 msgstr "_ปลั๊�อินตรวจขยะปริยาย:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:167
 msgid "_Direct connection to the Internet"
 msgstr "เชื่อมต่ออินเทอร์เน็ตโดย_ตรง"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:168
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ไ_ม่ต้องเซ็น�ำ�ับ�ารร้องขอเ�ี่ยว�ับ�ารประชุม (เพื่อความเข้า�ันได้�ับ Outlook)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:170
 msgid "_Forward style:"
 msgstr "รูป�บบ�ารส่งเมล_ต่อ:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:171
 msgid "_Keep Signature above the original message on replying"
 msgstr "ให้_ลายเซ็นอยู่เหนือข้อความเดิมใน�ารตอบ"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:172
 msgid "_Load images in messages from contacts"
 msgstr "โ_หลดรูปภาพเฉพาะในข้อความที่มาจา�ผู้ติดต่อ"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:173
 msgid "_Lookup in local address book only"
 msgstr "_เปิดหาที่อยู่จา�สมุดที่อยู่ในเครื่องเท่านั้น"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:174
 msgid "_Make this my default account"
 msgstr "_�ำหนดให้เป็นบั�ชีหลั�"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:175
 msgid "_Manual proxy configuration:"
 msgstr "ค่าพร็อ�ซี_�ำหนดเอง:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:176
 msgid "_Mark messages as read after"
 msgstr "ทำเครื่องหมายข้อความว่า_อ่าน�ล้วหลังจา�"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:178
 msgid "_Never load images from the Internet"
 msgstr "ไ_ม่โหลดรูปภาพจา�อินเทอร์เน็ต"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:179
 msgid "_Path:"
 msgstr "_พาธ:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:180
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_ถาม�่อนส่งข้อความ HTML ไปยังผู้ที่ไม่ต้อง�าร"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:181
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "ถาม�่อนส่งข้อความที่ไม่มี_หัวข้อเรื่อง"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:182
 msgid "_Reply style:"
 msgstr "รูป�บบ�ารตอ_บ:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:183
 msgid "_Script:"
 msgstr "_สคริปต์:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:184
 msgid "_Secure HTTP Proxy:"
 msgstr "พร็อ�ซี HTTP _นิรภัย:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:185
 msgid "_Select..."
 msgstr "เ_ลือ�..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:188
 msgid "_Show image animations"
 msgstr "�_สดงภาพเคลื่อนไหว"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:189
 msgid "_Show the photograph of sender in the message preview"
 msgstr "�_สดงรูปของผู้ส่งในช่อง�สดงตัวอย่างข้อความด้วย"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:190
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_จำ�ัดที่อยู่ส่วนหัว ถึง / สำเนาถึง / สำเนาลับถึง ไม่เ�ิน"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:191
 msgid "_Use Secure Connection:"
 msgstr "ใ_ช้�ารเชื่อมต่อ�บบนิรภัย:"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:192
 msgid "_Use system defaults"
 msgstr "ใช้ค่า_ปริยายของระบบ"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:193
 msgid "_Use the same fonts as other applications"
 msgstr "ใ_ช้�บบอั�ษรเหมือนโปร��รมอื่นๆ"
 
 # in "_Shrink To / Cc / Bcc headers to ... addresses"
 # -> "_จำ�ัดที่อยู่ส่วนหัว ถึง / สำเนาถึง / สำเนาลับถึง ไม่เ�ิน ... ราย�าร"
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "ราย�าร"
 
 # in "Highlight _quotations with ... color"
 # -> "เน้น�ารอ้าง_คำพูดด้วยสี ... "
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr " "
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "คำอธิบาย"
 
@@ -14736,26 +14799,26 @@ msgstr "_ธง:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_�าที่นี่เพื่อยอมรับข้อต�ลงในสั��าอนุ�าต"
 
-#: ../mail/mail-folder-cache.c:845
+#: ../mail/mail-folder-cache.c:833
 #, c-format
 msgid "Pinging %s"
 msgstr "�ำลัง ping %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:106
 msgid "Filtering Selected Messages"
 msgstr "�ำลัง�รองข้อความที่เลือ�"
 
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "�ำลังดึงเมล"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
+#: ../mail/mail-ops.c:561
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ไม่สามารถใช้ตัว�รอง�รองเมลออ�ได้: %s"
 
-#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14764,123 +14827,123 @@ msgstr ""
 "ไม่สามารถเพิ่มข้อมูลต่อท้าย %s ได้: %s\n"
 "จะเพิ่มต่อท้ายโฟลเดอร์ `ส่ง�ล้ว' ในเครื่อง�ทน"
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "ไม่สามารถเพิ่มข้อมูลต่อท้ายโฟลเดอร์ `ส่ง�ล้ว' ในเครื่องได้: %s"
 
-#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:725
 msgid "Sending message"
 msgstr "�ำลังส่งข้อความ"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "�ำลังส่ง %d ข้อความ จา� %d ข้อความ"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "ไม่สามารถส่ง %d ข้อความ จา� %d ข้อความ"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:698
 msgid "Canceled."
 msgstr "ย�เลิ�"
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:700
 msgid "Complete."
 msgstr "เสร็จ�ล้ว"
 
-#: ../mail/mail-ops.c:871
+#: ../mail/mail-ops.c:872
 msgid "Saving message to folder"
 msgstr "�ำลังบันทึ�ข้อความไปยังโฟลเดอร์"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Moving messages to %s"
 msgstr "�ำลังย้ายข้อความไปยัง %s"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Copying messages to %s"
 msgstr "�ำลังคัดลอ�ข้อความไปยัง %s"
 
-#: ../mail/mail-ops.c:1166
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "ข้อความส่งต่อ"
 
-#: ../mail/mail-ops.c:1207
+#: ../mail/mail-ops.c:1208
 #, c-format
 msgid "Opening folder %s"
 msgstr "�ำลังเปิดโฟลเดอร์ %s"
 
-#: ../mail/mail-ops.c:1272
+#: ../mail/mail-ops.c:1273
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "�ำลังดึงข้อมูลโควต้าสำหรับโฟลเดอร์ %s"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Opening store %s"
 msgstr "�ำลังเปิด�หล่งเ�็บ %s"
 
-#: ../mail/mail-ops.c:1412
+#: ../mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "�ำลังลบโฟลเดอร์ %s"
 
-#: ../mail/mail-ops.c:1501
+#: ../mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "�ำลังเ�็บข้อมูลของโฟลเดอร์ '%s'"
 
-#: ../mail/mail-ops.c:1564
+#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "�ำลังเ�็บ�วาด�ละเ�็บข้อมูลของบั�ชี '%s'"
 
-#: ../mail/mail-ops.c:1565
+#: ../mail/mail-ops.c:1595
 #, c-format
 msgid "Storing account '%s'"
 msgstr "�ำลังเ�็บข้อมูลของบั�ชี '%s'"
 
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1649
 msgid "Refreshing folder"
 msgstr "�ำลังโหลดโฟลเดอร์ใหม่"
 
-#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
+#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
 msgid "Expunging folder"
 msgstr "�ำลังเ�็บ�วาดโฟลเดอร์"
 
-#: ../mail/mail-ops.c:1706
+#: ../mail/mail-ops.c:1736
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "�ำลังเทขยะใน '%s' ทิ้ง"
 
-#: ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1737
 msgid "Local Folders"
 msgstr "โฟลเดอร์ในเครื่อง"
 
-#: ../mail/mail-ops.c:1788
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving message %s"
 msgstr "�ำลังดึงข้อความ %s"
 
-#: ../mail/mail-ops.c:1895
+#: ../mail/mail-ops.c:1925
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "�ำลังดึง %d ข้อความ"
 msgstr[1] "�ำลังดึง %d ข้อความ"
 
-#: ../mail/mail-ops.c:1980
+#: ../mail/mail-ops.c:2010
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "�ำลังบันทึ� %d ข้อความ"
 msgstr[1] "�ำลังบันทึ� %d ข้อความ"
 
-#: ../mail/mail-ops.c:2058
+#: ../mail/mail-ops.c:2088
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14889,11 +14952,11 @@ msgstr ""
 "เ�ิดข้อผิดพลาดขณะบันทึ�ข้อความไปยัง: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2130
+#: ../mail/mail-ops.c:2160
 msgid "Saving attachment"
 msgstr "�ำลังบันทึ�เอ�สาร�นบ"
 
-#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
+#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14902,27 +14965,27 @@ msgstr ""
 "ไม่สามารถสร้าง�ฟ้มผลลัพธ์: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2171
+#: ../mail/mail-ops.c:2201
 #, c-format
 msgid "Could not write data: %s"
 msgstr "ไม่สามารถเขียนข้อมูล: %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "�ำลังตัด�ารเชื่อมต่อจา� %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "�ำลังเชื่อมต่อใหม่ไปยัง %s"
 
-#: ../mail/mail-ops.c:2413
+#: ../mail/mail-ops.c:2443
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "�ำลังเตรียมออฟไลน์บั�ชี '%s'"
 
-#: ../mail/mail-ops.c:2499
+#: ../mail/mail-ops.c:2529
 msgid "Checking Service"
 msgstr "�ำลังตรวจสอบบริ�าร"
 
@@ -14938,39 +15001,39 @@ msgstr "รับ & ส่งเมล"
 msgid "Cancel _All"
 msgstr "ย�เ_ลิ�ทั้งหมด"
 
-#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:502
 msgid "Updating..."
 msgstr "�ำลังปรับข้อมูล..."
 
-#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
+#: ../mail/mail-send-recv.c:502 ../mail/mail-send-recv.c:578
 msgid "Waiting..."
 msgstr "�ำลังรอ..."
 
-#: ../mail/mail-send-recv.c:799
+#: ../mail/mail-send-recv.c:804
 #, c-format
 msgid "Checking for new mail"
 msgstr "�ำลังตรวจสอบเมลใหม่"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "ป้อนวลีรหัสผ่านสำหรับ %s"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:211
 msgid "Enter Passphrase"
 msgstr "ป้อนวลีรหัสผ่าน"
 
-#: ../mail/mail-session.c:212
-#: ../plugins/exchange-operations/exchange-config-listener.c:713
+#: ../mail/mail-session.c:214
+#: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "ป้อนรหัสผ่านสำหรับ %s"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:216
 msgid "Enter Password"
 msgstr "ป้อนรหัสผ่าน"
 
-#: ../mail/mail-session.c:256
+#: ../mail/mail-session.c:258
 msgid "User canceled operation."
 msgstr "ผู้ใช้ย�เลิ�ป�ิบัติ�าร"
 
@@ -15015,21 +15078,21 @@ msgstr "โฟลเดอร์ใช้ไม่ได้: `%s'"
 msgid "Setting up Search Folder: %s"
 msgstr "�ำลังตั้งค่าโฟลเดอร์ค้นหา: %s"
 
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "�ำลังปรับข้อมูลโฟลเดอร์ค้นหาสำหรับ '%s:%s'"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "�ำลังปรับข้อมูลโฟลเดอร์ค้นหาสำหรับ '%s'"
 
-#: ../mail/mail-vfolder.c:1066
+#: ../mail/mail-vfolder.c:1081
 msgid "Edit Search Folder"
 msgstr "��้ไขโฟลเดอร์ค้นหา"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1170
 msgid "New Search Folder"
 msgstr "สร้างโฟลเดอร์ค้นหาใหม่"
 
@@ -15621,79 +15684,79 @@ msgstr "เ_�็บ�วาด"
 msgid "_Open Messages"
 msgstr "เ_ปิดข้อความ"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Unseen"
 msgstr "ยังไม่อ่าน"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Seen"
 msgstr "อ่าน�ล้ว"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Answered"
 msgstr "ตอบ�ล้ว"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Forwarded"
 msgstr "ส่งต่อ�ล้ว"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1057
 msgid "Multiple Unseen Messages"
 msgstr "ข้อความยังไม่อ่านหลายฉบับ"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1058
 msgid "Multiple Messages"
 msgstr "ข้อความหลายฉบับ"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1062
 msgid "Lowest"
 msgstr "ต่ำที่สุด"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1063
 msgid "Lower"
 msgstr "ต่ำ�ว่า"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1067
 msgid "Higher"
 msgstr "สูง�ว่า"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1068
 msgid "Highest"
 msgstr "สูงที่สุด"
 
-#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1657 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1664 ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "วันนี้ %l:%M %p"
 
-#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1673 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "เมื่อวาน %l:%M %p"
 
-#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1685 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1695 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d %b %Ey"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3916 ../mail/message-list.c:4376
+#: ../mail/message-list.c:3978 ../mail/message-list.c:4438
 msgid "Generating message list"
 msgstr "�ำลังสร้างราย�ารข้อความ"
 
-#: ../mail/message-list.c:4224
+#: ../mail/message-list.c:4286
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15701,7 +15764,7 @@ msgstr ""
 "ไม่มีข้อความที่ตรง�ับเงื่อนไข�ารค้นหาของคุณ �รุณาล้าง�ารค้นหาด้วยเมนู ค้นหา->ล้าง "
 "หรือเปลี่ยนเงื่อนไข"
 
-#: ../mail/message-list.c:4226
+#: ../mail/message-list.c:4288
 msgid "There are no messages in this folder."
 msgstr "ไม่มีข้อความในโฟลเดอร์นี้"
 
@@ -15734,6 +15797,10 @@ msgstr "ข้อความที่ส่ง"
 msgid "Size"
 msgstr "ขนาด"
 
+#: ../mail/message-list.etspec.h:19
+msgid "Subject - Trimmed"
+msgstr "ชื่อเรื่อง - ตัดส่วนท้าย"
+
 #: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "เรีย�"
@@ -15818,8 +15885,8 @@ msgid ""
 "body."
 msgstr "ราย�ารเบาะ�สที่ปลั๊�อินเตือน�าร�นบเอ�สารจะค้นหาในเนื้อความ"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:474
-#: ../plugins/templates/templates.c:394
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/templates/templates.c:390
 msgid "Keywords"
 msgstr "คำหลั�"
 
@@ -15852,7 +15919,7 @@ msgstr "�_�้ไขข้อความ"
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
+"play them directly from Evolution."
 msgstr ""
 "ปลั๊�อินสำหรับ�ารจัดเรียงข้อความ ซึ่ง�สดงเอ�สาร�นบที่เป็นเสียงลงในบรรทัด �ละให้คุณเล่นเสียงจา� "
 "Evolution โดยตรงได้"
@@ -16075,35 +16142,35 @@ msgstr "_ฟื้นค่าตั้ง..."
 msgid "_Backup Settings..."
 msgstr "_สำรองค่าตั้ง..."
 
-#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "ติดต่ออัตโนมัติ"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:567
+#: ../plugins/bbdb/bbdb.c:639
 msgid "_Auto-create address book entries when replying to messages"
 msgstr "เพิ่มราย�ารในสมุดที่อยู่โดย_อัตโนมัติเมื่อตอบข้อความ"
 
-#: ../plugins/bbdb/bbdb.c:573
+#: ../plugins/bbdb/bbdb.c:645
 msgid "Select Address book for Automatic Contacts"
 msgstr "เลือ�สมุดที่อยู่สำหรับที่อยู่ติดต่ออัตโนมัติ"
 
-#: ../plugins/bbdb/bbdb.c:588
+#: ../plugins/bbdb/bbdb.c:660
 msgid "Instant Messaging Contacts"
 msgstr "ที่อยู่ติดต่อสำหรับข้อความทันใจ"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:603
+#: ../plugins/bbdb/bbdb.c:675
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "ปรับข้อมูลที่อยู่ติดต่อ�ละรูปภาพ�ับรายชื่อคู่สนทนาของ Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:609
+#: ../plugins/bbdb/bbdb.c:681
 msgid "Select Address book for Pidgin buddy list"
 msgstr "เลือ�สมุดที่อยู่สำหรับคู่สนทนาของ Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:620
+#: ../plugins/bbdb/bbdb.c:692
 msgid "Synchronize with _buddy list now"
 msgstr "ปรับข้อมูล�ับรายชื่อ_คู่สนทนาเดี๋ยวนี้"
 
@@ -16121,27 +16188,27 @@ msgid "BBDB"
 msgstr "BBDB"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:119
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "เ�ิดข้อผิดพลาดขณะสร้างโพรเซส %s: %s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:143
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "โพรเซสลู� Bogofilter ไม่ตอบสนอง จะฆ่าทิ้ง..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:145
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "�ารคอยโพรเซสลู� Bogofilter ถู�ขัดจังหวะ จะจบโปร��รม..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "สร้างไปป์ไปยัง Bogofilter ไม่สำเร็จ รหัสข้อผิดพลาด: %d"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:318
 msgid "Convert message text to _Unicode"
 msgstr "�ปลงอั�ขระในข้อความเป็น_ยูนิโค้ด"
 
@@ -16339,16 +16406,16 @@ msgid ""
 "default one."
 msgstr "องค์ประ�อบพื้น�านสำหรับเลือ��ำหนดป�ิทินหรือสมุดที่อยู่เป็นราย�ารปริยาย"
 
-#: ../plugins/email-custom-header/email-custom-header.c:558
+#: ../plugins/email-custom-header/email-custom-header.c:560
 msgid "_Custom Header"
 msgstr "ข้อมูลส่วนหัว_�ำหนดเอง"
 
-#: ../plugins/email-custom-header/email-custom-header.c:879
+#: ../plugins/email-custom-header/email-custom-header.c:881
 msgid "Key"
 msgstr "คีย์"
 
-#: ../plugins/email-custom-header/email-custom-header.c:890
-#: ../plugins/templates/templates.c:400
+#: ../plugins/email-custom-header/email-custom-header.c:892
+#: ../plugins/templates/templates.c:396
 msgid "Values"
 msgstr "ค่า"
 
@@ -16405,34 +16472,34 @@ msgid "_User:"
 msgstr "_ชื่อผู้ใช้:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:61
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
 msgid "Secure Password"
 msgstr "รหัสผ่านนิรภัย"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:64
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
 msgstr ""
 "ตัวเลือ�นี้จะเชื่อมต่อไปยังเซิร์ฟเวอร์ Exchange โดยใช้�ารยืนยันตัวตนด้วยรหัสผ่านนิรภัย (NTLM)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "รหัสผ่านข้อความเปล่า"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr ""
 "ตัวเลือ�นี้จะเชื่อมต่อไปยังเซิร์ฟเวอร์ Exchange โดยใช้�ารยืนยันตัวตนด้วยรหัสผ่านข้อความเปล่า"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:263
 msgid "Out Of Office"
 msgstr "ไม่อยู่ที่ทำงาน"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:270
 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."
@@ -16440,88 +16507,88 @@ msgstr ""
 "ข้อความที่ระบุด้านล่างนี้จะถู�ส่งอัตโนมัติ \n"
 "ไปยัง�ต่ละคนที่ส่งเมลถึงคุณ ในขณะที่คุณไม่อยู่ที่สำนั�งาน"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:282
+#: ../plugins/exchange-operations/exchange-account-setup.c:287
 msgid "I am out of the office"
 msgstr "ฉันไม่อยู่ที่สำนั�งาน"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/exchange-operations/exchange-account-setup.c:286
 msgid "I am in the office"
 msgstr "ฉันอยู่ที่สำนั�งาน"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:334
 msgid "Change the password for Exchange account"
 msgstr "เปลี่ยนรหัสผ่านสำหรับบั�ชี Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:336
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:341
 msgid "Manage the delegate settings for Exchange account"
 msgstr "จัด�ารค่าตั้งของ�ารมอบฉันทะสำหรับบั�ชี Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
 msgid "Delegation Assistant"
 msgstr "เครื่องมือช่วยมอบฉันทะ"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:355
 msgid "Miscelleneous"
 msgstr "เบ็ดเตล็ด"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:365
 msgid "View the size of all Exchange folders"
 msgstr "ดูขนาดของโฟลเดอร์"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:367
 msgid "Folders Size"
 msgstr "ขนาดของโฟลเดอร์"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "ค่าตั้ง Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
+#: ../plugins/exchange-operations/exchange-account-setup.c:696
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
+#: ../plugins/exchange-operations/exchange-account-setup.c:722
 msgid "A_uthenticate"
 msgstr "ยื_นยันตัวบุคคล"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#: ../plugins/exchange-operations/exchange-account-setup.c:743
 msgid "_Mailbox:"
 msgstr "�ล่องเ_มล:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:944
 msgid "_Authentication Type"
 msgstr "ชนิดของ�าร_ยืนยันตัวบุคคล"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
+#: ../plugins/exchange-operations/exchange-account-setup.c:958
 msgid "Ch_eck for Supported Types"
 msgstr "_ตรวจสอบชนิดที่รองรับ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1062
-#: ../plugins/exchange-operations/exchange-contacts.c:212
+#: ../plugins/exchange-operations/exchange-account-setup.c:1073
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1064
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-account-setup.c:1075
+#: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#: ../plugins/exchange-operations/exchange-calendar.c:196
+#: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -16558,37 +16625,37 @@ msgstr "รหัสผ่านใหม่:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "รหัสผ่านของคุณได้หมดอายุลง�ล้ว �รุณาเปลี่ยนรหัสผ่านทันที"
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:665
+#: ../plugins/exchange-operations/exchange-config-listener.c:660
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "รหัสผ่านของคุณจะหมดอายุลงในอี� %d วัน"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-delegates-user.c:154
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "�ำหนดเอง"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates-user.c:184
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "บรรณาธิ�าร (อ่าน, สร้าง, ��้ไข)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates-user.c:188
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "ผู้เขียน (อ่าน, สร้าง)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "ผู้ตรวจทาน (อ่านอย่างเดียว)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "สิทธิ์ของผู้รับมอบฉันทะ"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-delegates-user.c:253
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
@@ -16597,7 +16664,7 @@ msgstr "�าร�ำหนดสิทธิ์สำหรับ %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:341
+#: ../plugins/exchange-operations/exchange-delegates-user.c:343
 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."
@@ -16607,25 +16674,25 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
 msgid "You have been given the following permissions on my folders:"
 msgstr "คุณได้รับอนุ�าตให้�ระทำ�ารต่อไปนี้ในโฟลเดอร์ของข้าพเจ้า:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:364
+#: ../plugins/exchange-operations/exchange-delegates-user.c:366
 msgid "You are also permitted to see my private items."
 msgstr "คุณได้รับอนุ�าตให้ดูราย�ารส่วนตัวของข้าพเจ้าได้ด้วย"
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
 msgid "However you are not permitted to see my private items."
 msgstr "�ต่คุณไม่ได้รับอนุ�าตให้ดูราย�ารส่วนตัวของข้าพเจ้า"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "คุณได้รับ�ารมอบฉันทะให้เป็นตัว�ทนของ %s"
@@ -16828,8 +16895,8 @@ msgstr "เพิ่มผู้ใช้:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:934
-#: ../plugins/groupwise-features/share-folder.c:715
+#: ../plugins/groupwise-features/proxy.c:937
+#: ../plugins/groupwise-features/share-folder.c:716
 msgid "Add User"
 msgstr "เพิ่มผู้ใช้"
 
@@ -16947,11 +17014,11 @@ msgstr "ระดับความ_ป�ปิด:"
 msgid "_User"
 msgstr "ผู้ใ_ช้"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:138
+#: ../plugins/exchange-operations/exchange-user-dialog.c:136
 msgid "Select User"
 msgstr "เลือ�ผู้ใช้"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+#: ../plugins/exchange-operations/exchange-user-dialog.c:174
 msgid "Address Book..."
 msgstr "สมุดที่อยู่..."
 
@@ -17104,7 +17171,7 @@ msgid "Folder offline"
 msgstr "โฟลเดอร์ออฟไลน์อยู่"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1306
+#: ../shell/e-shell.c:1270
 msgid "Generic error"
 msgstr "ข้อผิดพลาดทั่วไป"
 
@@ -17383,10 +17450,6 @@ msgstr ""
 "จุดเสีย�่อน รูปนี้จะถู�เ�็บในรูป�บบ base64 ใน�ฟ้ม ~/.evolution/faces "
 "�ละจะถู�ใช้ในข้อความที่ส่งออ�ครั้งต่อๆ ไป"
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "รูปถ่าย"
-
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -17444,7 +17507,7 @@ msgid "<b>Server</b>"
 msgstr "<b>เซิร์ฟเวอร์</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar and contacts."
+msgid "A plugin to setup Google Calendar and Contacts."
 msgstr "ปลั๊�อินตั้งค่าป�ิทิน�ละที่อยู่ติดต่อ�ูเ�ิล"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -17456,14 +17519,14 @@ msgid "Checklist"
 msgstr "ราย�ารตรวจสอบ"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
-msgstr "ปลั๊�อินตั้งค่าป�ิทิน�ละ�หล่งที่อยู่ติดต่อของ Groupwise"
+msgid "A plugin to setup GroupWise calendar and contacts sources."
+msgstr "ปลั๊�อินตั้งค่าป�ิทิน�ละ�หล่งที่อยู่ติดต่อของ GroupWise"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
-msgstr "�ารตั้งค่าบั�ชี Groupwise"
+msgid "GroupWise Account Setup"
+msgstr "�ารตั้งค่าบั�ชี GroupWise"
 
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17488,11 +17551,11 @@ msgstr ""
 "คลิ� 'ถัดไป' เพื่อติดตั้งโฟลเดอร์ที่ใช้ร่วม\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:225
 msgid "Install the shared folder"
 msgstr "ติดตั้งโฟลเดอร์ใช้ร่วม"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:227
 msgid "Shared Folder Installation"
 msgstr "�ารติดตั้งโฟลเดอร์ใช้ร่วม"
 
@@ -17518,7 +17581,7 @@ msgid "Email:"
 msgstr "อีเมล:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "_ปิดใช้งาน"
 
@@ -17550,16 +17613,16 @@ msgid "Retract Mail"
 msgstr "ถอนเมล�ลับ"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to groupwise messages"
-msgstr "เพิ่มตัวเลือ��ารส่งในข้อความ groupwise"
+msgid "Add Send Options to GroupWise messages"
+msgstr "เพิ่มตัวเลือ��ารส่งในข้อความ GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
-msgstr "ปลั๊�อินสำหรับ�ารใช้งานบั�ชี Groupwise"
+msgid "A plugin for the features in GroupWise accounts."
+msgstr "ปลั๊�อินสำหรับ�ารใช้งานบั�ชี GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
-msgstr "�ารใช้งาน Groupwise"
+msgid "GroupWise Features"
+msgstr "�ารใช้งาน GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
 msgid "Message retract failed"
@@ -17575,22 +17638,25 @@ msgstr "เซิร์ฟเวอร์ไม่อนุ�าตให้ถ
 msgid "Invalid user"
 msgstr "ผู้ใช้ไม่ถู�ต้อง"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#. 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-errors.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "ไม่สามารถให้ผู้ใช้ &quot;{0}&quot; เข้าใช้พร็อ�ซีได้"
+msgstr "ไม่สามารถให้ผู้ใช้ &quot;{0}&quot; เข้าใช้งานใน�านะตัว�ทนได้"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
 msgid "Specify User"
 msgstr "ระบุผู้ใช้"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#. 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-errors.xml.h:6
 msgid "You have already given proxy permissions to this user."
-msgstr "คุณได้อนุ�าตให้ผู้ใช้นี้เข้าใช้พร็อ�ซีไป�ล้ว"
+msgstr "คุณได้อนุ�าตให้ผู้ใช้นี้เป็นตัว�ทนคุณไป�ล้ว"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+#. 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-errors.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
-msgstr "คุณต้องระบุชื่อผู้ใช้ที่ใช้ได้จริง เพื่อจะให้สิทธิ์ใช้พร็อ�ซี"
+msgstr "คุณต้องระบุชื่อผู้ใช้ที่ใช้ได้จริง เพื่อจะให้สิทธิ์�ารเป็นตัว�ทน"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
@@ -17610,20 +17676,22 @@ msgstr "ลงชื่อเข้าใช้พร็อ�ซีในนา
 msgid "This is a recurring meeting"
 msgstr "นี่เป็น�ารประชุมที่มี�ารเวียนซ้ำ"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 msgid "Would you like to accept it?"
 msgstr "คุณจะรับหรือไม่?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "Would you like to decline it?"
 msgstr "คุณจะป�ิเสธหรือไม่?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
-msgstr "ไม่สามารถเปิดโฟลเดอร์ให้ใช้ร่วมในนามผู้ใช้ &quot;{0}&quot;"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "คุณไม่สามารถเปิดโฟลเดอร์นี้ให้ผู้ใช้ &quot;{0}&quot; ใช้ร่วม"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
-msgid "You have to specify a user name whom you want to add to the list"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+msgid "You have to specify a user name which you want to add to the list"
 msgstr "คุณต้องระบุชื่อผู้ใช้ที่คุณต้อง�ารเพิ่มเข้าในรายชื่อ"
 
 #: ../plugins/groupwise-features/process-meeting.c:52
@@ -17724,10 +17792,10 @@ msgstr "<b>ชื่อบั�ชี</b>"
 msgid "Proxy Login"
 msgstr "ลงบันทึ�เข้าใช้ใน�านะตัว�ทน"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
 #: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:83
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sป้อนรหัสผ่านสำหรับ %s (ผู้ใช้ %s)"
@@ -17735,20 +17803,26 @@ msgstr "%sป้อนรหัสผ่านสำหรับ %s (ผู้à¹
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:509
+#: ../plugins/groupwise-features/proxy-login.c:510
 msgid "_Proxy Login..."
 msgstr "ลงบันทึ�เข้าใช้ใน�านะ_ตัว�ทน..."
 
-#: ../plugins/groupwise-features/proxy.c:691
+#. 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:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "�ท็บตัว�ทนจะใช้ได้�็ต่อเมื่อบั�ชีออนไลน์อยู่"
 
-#: ../plugins/groupwise-features/proxy.c:696
+#. 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:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "�ท็บตัว�ทนจะใช้ได้�็ต่อเมื่อบั�ชีเปิดใช้"
 
+#: ../plugins/groupwise-features/send-options.c:214
+msgid "Advanced send options"
+msgstr "ตัวเลือ�ขั้นสูงของ�ารส่ง"
+
 #: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:750
+#: ../plugins/groupwise-features/share-folder.c:751
 msgid "Users"
 msgstr "ผู้ใช้"
 
@@ -17764,68 +17838,68 @@ msgstr "โฟลเดอร์ใ_ช้ร่วมอันใหม่..."
 msgid "Sharing"
 msgstr "�ารใช้ร่วม"
 
-#: ../plugins/groupwise-features/share-folder.c:533
+#: ../plugins/groupwise-features/share-folder.c:534
 msgid "Custom Notification"
 msgstr "�าร�จ้งเหตุ�ำหนดเอง"
 
-#: ../plugins/groupwise-features/share-folder.c:755
+#: ../plugins/groupwise-features/share-folder.c:756
 msgid "Add   "
 msgstr "เพิ่ม   "
 
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:762
 msgid "Modify"
 msgstr "เปลี่ยน�ปลง"
 
-#: ../plugins/groupwise-features/status-track.c:105
+#: ../plugins/groupwise-features/status-track.c:107
 msgid "Message Status"
 msgstr "สถานะข้อความ"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:119
+#: ../plugins/groupwise-features/status-track.c:121
 msgid "Subject:"
 msgstr "เ_รื่อง:"
 
-#: ../plugins/groupwise-features/status-track.c:133
+#: ../plugins/groupwise-features/status-track.c:135
 msgid "From:"
 msgstr "_จา�:"
 
-#: ../plugins/groupwise-features/status-track.c:148
+#: ../plugins/groupwise-features/status-track.c:150
 msgid "Creation date:"
 msgstr "วันที่สร้าง:"
 
-#: ../plugins/groupwise-features/status-track.c:187
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Recipient: "
 msgstr "ผู้รับ: "
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:196
 msgid "Delivered: "
 msgstr "ถึงเมื่อ: "
 
-#: ../plugins/groupwise-features/status-track.c:200
+#: ../plugins/groupwise-features/status-track.c:202
 msgid "Opened: "
 msgstr "เปิดเมื่อ: "
 
-#: ../plugins/groupwise-features/status-track.c:205
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Accepted: "
 msgstr "ตอบรับเมื่อ: "
 
-#: ../plugins/groupwise-features/status-track.c:210
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Deleted: "
 msgstr "ลบเมื่อ: "
 
-#: ../plugins/groupwise-features/status-track.c:215
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Declined: "
 msgstr "ป�ิเสธเมื่อ: "
 
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:222
 msgid "Completed: "
 msgstr "เสร็จเมื่อ: "
 
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:227
 msgid "Undelivered: "
 msgstr "ส่งไม่ถึงเมื่อ: "
 
-#: ../plugins/groupwise-features/status-track.c:249
+#: ../plugins/groupwise-features/status-track.c:251
 msgid "Track Message Status..."
 msgstr "ติดตามสถานะข้อความ..."
 
@@ -17928,11 +18002,11 @@ msgstr "นำเข้าไปยังป�ิทิน"
 msgid "Imports ICS attachments to calendar."
 msgstr "นำเข้าเอ�สาร�นบ�บบ ICS ไปยังป�ิทิน"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "ไม่ได้โหลด Hardware Abstraction Layer ไว้"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -17940,19 +18014,19 @@ msgstr ""
 "ต้องใช้บริ�าร \"hald\" �ต่ไม่มีบริ�ารดัง�ล่าวทำงานอยู่ �รุณาเปิดบริ�ารดัง�ล่าว "
 "�ล้วเรีย�โปร��รมนี้ใหม่ หรือติดต่อผู้ดู�ลระบบของคุณ"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
 msgid "Search for an iPod failed"
 msgstr "ค้นหาไอพอดไม่พบ"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
 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 หาไอพอดที่จะ sync ด้วยไม่พบ อาจจะไม่ได้เชื่อมต่ออยู่ หรืออาจจะไม่ได้เปิดสวิตช์"
 
-#: ../plugins/ipod-sync/ical-format.c:118
-#: ../plugins/save-calendar/ical-format.c:163
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
 msgid "iCalendar format (.ics)"
 msgstr "รูป�บบ iCalendar (.ics)"
 
@@ -17969,182 +18043,182 @@ msgstr "ปรับข้อมูลให้ตรง�ับ iPod"
 msgid "iPod Synchronization"
 msgstr "�ารปรับข้อมูลให้ตรง�ับ iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:443
-#: ../plugins/itip-formatter/itip-formatter.c:568
+#: ../plugins/itip-formatter/itip-formatter.c:481
+#: ../plugins/itip-formatter/itip-formatter.c:606
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "ไม่สามารถเปิดป�ิทิน '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:588
+#: ../plugins/itip-formatter/itip-formatter.c:626
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "มีนัดหมายในป�ิทิน '%s' ชน�ับ�ารประชุมนี้"
 
-#: ../plugins/itip-formatter/itip-formatter.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:652
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "พบนัดหมายในป�ิทิน '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:738
 msgid "Unable to find any calendars"
 msgstr "ไม่พบป�ิทินใดเลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:745
 msgid "Unable to find this meeting in any calendar"
 msgstr "ไม่พบ�ารประชุมนี้ในป�ิทินใดเลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:749
 msgid "Unable to find this task in any task list"
 msgstr "ไม่พบภาร�ิจนี้ในราย�ารภาร�ิจใดเลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:705
+#: ../plugins/itip-formatter/itip-formatter.c:753
 msgid "Unable to find this memo in any memo list"
 msgstr "ไม่พบบันทึ�ช่วยจำนี้ในราย�ารบันทึ�ช่วยจำใดเลย"
 
-#: ../plugins/itip-formatter/itip-formatter.c:776
+#: ../plugins/itip-formatter/itip-formatter.c:824
 msgid "Searching for an existing version of this appointment"
 msgstr "�ำลังค้นหานัดหมายนี้ที่บันทึ�ไว้"
 
-#: ../plugins/itip-formatter/itip-formatter.c:945
+#: ../plugins/itip-formatter/itip-formatter.c:993
 msgid "Unable to parse item"
 msgstr "ไม่สามารถ�จงราย�ารได้"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1003
+#: ../plugins/itip-formatter/itip-formatter.c:1051
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "ไม่สามารถส่งราย�ารไปยังป�ิทิน '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1015
+#: ../plugins/itip-formatter/itip-formatter.c:1063
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ส่งไปยังป�ิทิน '%s' ว่าตอบรับ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1067
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "ส่งไปยังป�ิทิน '%s' ว่าอาจตอบรับ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1072
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "ส่งไปยังป�ิทิน '%s' ว่าป�ิเสธ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1077
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "ส่งไปยังป�ิทิน '%s' ว่าย�เลิ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1171
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ผู้ประสานงานได้ลบผู้รับมอบฉันทะ %s ออ�"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1178
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ส่งประ�าศ�ารย�เลิ�ไปยังผู้รับมอบฉันทะ�ล้ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1180
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ไม่สามารถส่งประ�าศ�ารย�เลิ�ไปยังผู้รับมอบฉันทะ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1218
+#: ../plugins/itip-formatter/itip-formatter.c:1266
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ไม่สามารถปรับข้อมูลสถานะผู้เข้าร่วมประชุมได้ เนื่องจา�สถานะเป็นค่าที่ใช้ไม่ได้"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1245
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ไม่สามารถปรับข้อมูลผู้เข้าร่วม %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1297
 msgid "Attendee status updated"
 msgstr "ปรับข้อมูลผู้เข้าร่วมเรียบร้อย�ล้ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1323
 msgid "Meeting information sent"
 msgstr "ส่งข้อมูล�ารประชุม�ล้ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1326
 msgid "Task information sent"
 msgstr "ส่งข้อมูลภาร�ิจ�ล้ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1329
 msgid "Memo information sent"
 msgstr "ส่งข้อมูลบันทึ�ช่วยจำ�ล้ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1338
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ไม่สามารถส่งข้อมูล�ารประชุมได้ เนื่องจา�ไม่มี�ารประชุมนี้อยู่"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1341
 msgid "Unable to send task information, the task does not exist"
 msgstr "ไม่สามารถส่งข้อมูลภาร�ิจได้ เนื่องจา�ไม่มีภาร�ิจนี้อยู่"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1296
+#: ../plugins/itip-formatter/itip-formatter.c:1344
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ไม่สามารถส่งข้อมูลบันทึ�ช่วยจำได้ เนื่องจา�ไม่มีบันทึ�ช่วยจำนี้อยู่"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1365
-#: ../plugins/itip-formatter/itip-formatter.c:1376
+#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1424
 msgid "The calendar attached is not valid"
 msgstr "ป�ิทินใช้�ารไม่ได้"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1414
+#: ../plugins/itip-formatter/itip-formatter.c:1425
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "ข้อความอ้างว่ามีป�ิทิน �ต่ตัวป�ิทินไม่ใช่ iCalendar ที่ใช้�ารได้"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
-#: ../plugins/itip-formatter/itip-formatter.c:1435
-#: ../plugins/itip-formatter/itip-formatter.c:1517
+#: ../plugins/itip-formatter/itip-formatter.c:1465
+#: ../plugins/itip-formatter/itip-formatter.c:1493
+#: ../plugins/itip-formatter/itip-formatter.c:1575
 msgid "The item in the calendar is not valid"
 msgstr "ราย�ารในป�ิทินไม่ถู�ต้อง"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1418
-#: ../plugins/itip-formatter/itip-formatter.c:1436
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1466
+#: ../plugins/itip-formatter/itip-formatter.c:1494
+#: ../plugins/itip-formatter/itip-formatter.c:1576
 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:1447
+#: ../plugins/itip-formatter/itip-formatter.c:1505
 msgid "The calendar attached contains multiple items"
 msgstr "ป�ิทินที่�นบมามีราย�ารหลายราย�าร"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1506
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "เพื่อจะดำเนินงานราย�ารทั้งหมด ควรบันทึ��ฟ้ม�ล้วนำเข้าป�ิทิน"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2215
 msgid "This meeting recurs"
 msgstr "�ารประชุมนี้เวียนซ้ำเป็นรอบๆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2218
 msgid "This task recurs"
 msgstr "ภาร�ิจนี้เวียนซ้ำเป็นรอบๆ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2221
 msgid "This memo recurs"
 msgstr "บันทึ�ช่วยจำนี้เวียนซ้ำเป็นรอบๆ"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2457
 msgid "_Delete message after acting"
 msgstr "_ลบข้อความหลังจา�ทำ�ล้ว"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2467
+#: ../plugins/itip-formatter/itip-formatter.c:2499
 msgid "Conflict Search"
 msgstr "�ารค้นหา�ารชน�ัน"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "เลือ�ป�ิทินที่จะค้นหา�ารประชุมที่ชน�ัน"
 
@@ -18600,11 +18674,11 @@ msgstr "ใช้�ับ_ทุ�รอบที่เวียนซ้ำ"
 msgid "Show time as _free"
 msgstr "�สดงเวลาว่า_ว่าง"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1870
 msgid "_Tasks :"
 msgstr "_ภาร�ิจ :"
 
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1872
 msgid "Memos :"
 msgstr "บันทึ�ช่วยจำ :"
 
@@ -18633,7 +18707,7 @@ msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "คำตอบนี้ไม่ได้มาจา�ผู้ร่วมประชุมปัจจุบัน  จะเพิ่มผู้ส่งเข้าเป็นผู้ร่วมประชุมหรือไม่?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr "_ออ�จา��ารเข้าระบบใน�านะตัว�ทน"
 
@@ -18711,20 +18785,20 @@ msgstr "�ำหนดว่าจะ�ะพริบไอคอนด้ว
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "�ำหนดว่าจะ�จ้งข้อความใหม่เฉพาะสำหรับ�ล่องจดหมายเข้าหรือไม่"
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "ส่งข้อความ _D-Bus"
 
-#: ../plugins/mail-notification/mail-notification.c:377
+#: ../plugins/mail-notification/mail-notification.c:378
 msgid "Evolution's Mail Notification"
 msgstr "�าร�จ้งเมลของ Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:399
 msgid "Mail Notification Properties"
 msgstr "คุณสมบัติ�าร�จ้งเมล"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18739,55 +18813,55 @@ msgstr[1] ""
 "คุณได้รับข้อความใหม่ %d ข้อความ\n"
 "ใน %s"
 
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../plugins/mail-notification/mail-notification.c:463
 #, 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:479
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:480
+#: ../plugins/mail-notification/mail-notification.c:485
 msgid "New email"
 msgstr "อีเมลใหม่"
 
-#: ../plugins/mail-notification/mail-notification.c:541
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "Show icon in _notification area"
 msgstr "�สดงไอคอนในพื้นที่�_จ้งเหตุ"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:547
 msgid "B_link icon in notification area"
 msgstr "_�ะพริบไอคอนในพื้นที่�จ้งเหตุ"
 
-#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:549
 msgid "Popup _message together with the icon"
 msgstr "ผุด_ข้อความขึ้นพร้อม�ับไอคอนด้วย"
 
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:730
 msgid "_Play sound when new messages arrive"
 msgstr "ส่งเ_สียงเมื่อมีข้อความเข้ามาใหม่"
 
-#: ../plugins/mail-notification/mail-notification.c:733
+#: ../plugins/mail-notification/mail-notification.c:736
 msgid "_Beep"
 msgstr "เสียง_บี๊ป"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:737
 msgid "Play _sound file"
 msgstr "เล่น�_ฟ้มเสียง"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Specify _filename:"
 msgstr "_ระบุชื่อ�ฟ้ม:"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:749
 msgid "Select sound file"
 msgstr "เลือ��ฟ้มเสียง"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:750
 msgid "Pl_ay"
 msgstr "เ_ล่น"
 
-#: ../plugins/mail-notification/mail-notification.c:804
+#: ../plugins/mail-notification/mail-notification.c:807
 msgid "Notify new messages for _Inbox only"
 msgstr "�จ้งข้อความใหม่เฉพาะสำหรับ�ล่องจดหมายเ_ข้าเท่านั้น"
 
@@ -19043,22 +19117,6 @@ msgstr "ทำเครื่องหมายทุà¸�_ข้อความà¸
 msgid "Used for marking all the messages under a folder as read"
 msgstr "ใช้ทำเครื่องหมายทุ�ข้อความใต้โฟลเดอร์ที่�ำหนดว่าอ่าน�ล้ว"
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "ทำเครื่องหมายป�ิทินว่าออฟไลน์"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "ทำเครื่องหมายป�ิทินที่เลือ�เพื่อไว้ดู�บบออฟไลน์"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make available for offline use"
-msgstr "ไ_ม่ต้องเ�็บไว้ใช้งานออฟไลน์"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Make available for offline use"
-msgstr "เ_ตรียมเพื่อใช้งานออฟไลน์"
-
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
 msgstr "ปลั๊�อินเชื่อมต่อปลั๊�อิน Mono"
@@ -19166,9 +19224,9 @@ msgstr "ตำ�หน่ง"
 msgid "_Publish Calendar Information"
 msgstr "ข้อมูล�าร�ปะ_ประ�าศป�ิทิน"
 
-#: ../plugins/publish-calendar/publish-calendar.c:595
-msgid "Are you sure you want to remove this URL?"
-msgstr "คุณ�น่ใจหรือไม่ว่า ต้อง�ารลบ URL นี้?"
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "Are you sure you want to remove this location?"
+msgstr "คุณ�น่ใจหรือไม่ว่า ต้อง�ารลบตำ�หน่งที่ตั้งนี้?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
@@ -19206,7 +19264,7 @@ msgstr "ความ_ถี่ของ�ารประ�าศ:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
 msgid ""
-"SSH\n"
+"Secure FTP (SSH)\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -19214,7 +19272,7 @@ msgid ""
 "Secure WebDAV (HTTPS)\n"
 "Custom Location"
 msgstr ""
-"SSH\n"
+"FTP นิรภัย (SSH)\n"
 "FTP สาธารณะ\n"
 "FTP (ล็อ�อิน)\n"
 "โฟลเดอร์ใช้ร่วมของวินโดวส์\n"
@@ -19271,58 +19329,58 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "ปลั๊�อินทดสอบสำหรับตัวโหลด EPlugin ไพธอน"
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using python."
+msgid "A plugin which loads other plugins written using Python."
 msgstr "ปลั๊�อินซึ่งโหลดปลั๊�อินอื่นที่เขียนด้วยภาษาไพธอน"
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
 msgstr "ตัวโหลดไพธอน"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (�ังในตัว)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "ไม่พบ SpamAssassin, รหัส: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "ไม่สามารถสร้างไปป์: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
 #, c-format
 msgid "Error after fork: %s"
 msgstr "เ�ิดข้อผิดพลาดหลัง fork: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "โพรเซสลู� SpamAssassin ไม่ตอบสนอง จะฆ่าทิ้ง..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
 #, c-format
-msgid "Wait for Spamassassin child process interrupted, terminating..."
-msgstr "�ารคอยโพรเซสลู� Spamassassin ถู�ขัดจังหวะ จะจบโปร��รม..."
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
+msgstr "�ารคอยโพรเซสลู� SpamAssassin ถู�ขัดจังหวะ จะจบโปร��รม..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "สร้างไปป์ไปยัง SpamAssassin ไม่สำเร็จ รหัสข้อผิดพลาด: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "ไม่มี SpamAssassin"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "�ารทดสอบนี้จะทำให้ SpamAssassin น่าเชื่อถือขึ้น �ต่ทำงานช้าลง"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 msgid "I_nclude remote tests"
 msgstr "_ทดสอบโฮสต์ระยะไ�ลด้วย"
 
@@ -19333,12 +19391,12 @@ msgid ""
 msgstr "�รองข้อความขยะด้วย SpamAssassin  �ารใช้ปลั๊�อินนี้ ต้องติดตั้ง SpamAssassin ด้วย"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "ปลั๊�อิน�รองขยะด้วย SpamAssassin"
+msgid "SpamAssassin Options"
+msgstr "ตัวเลือ�สำหรับ SpamAssassin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "ตัวเลือ�สำหรับ SpamAssassin"
+msgid "SpamAssassin junk plugin"
+msgstr "ปลั๊�อิน�รองขยะด้วย SpamAssassin"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -19346,7 +19404,7 @@ msgstr "ปลั๊�อินสำหรับบันทึ�เอ�ส
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:314
+#: ../plugins/save-attachments/save-attachments.c:315
 msgid "Save attachments"
 msgstr "บันทึ�เอ�สาร�นบ"
 
@@ -19358,15 +19416,15 @@ msgstr "บันทึ�เอ�สาร�นบ..."
 msgid "Save all attachments"
 msgstr "บันทึ�เอ�สาร�นบทั้งหมด"
 
-#: ../plugins/save-attachments/save-attachments.c:320
+#: ../plugins/save-attachments/save-attachments.c:321
 msgid "Select save base name"
 msgstr "เลือ�ชื่อต้นสำหรับ�ารบันทึ�"
 
-#: ../plugins/save-attachments/save-attachments.c:339
+#: ../plugins/save-attachments/save-attachments.c:340
 msgid "MIME Type"
 msgstr "ชนิด MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:347
+#: ../plugins/save-attachments/save-attachments.c:348
 msgid "Save"
 msgstr "บันทึ�"
 
@@ -19374,79 +19432,79 @@ msgstr "บันทึ�"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:162
+#: ../plugins/save-calendar/csv-format.c:163
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "ราย�ารคำบรรยาย"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "รายชื่อหมวด"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "ราย�ารหมายเหตุ"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "สร้าง"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "รายชื่อที่อยู่ติดต่อ"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "เริ่ม"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "สิ้นสุด"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "ร้อยละที่เสร็จ"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "รายชื่อผู้เข้าร่วมประชุม"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "เปลี่ยน�ปลง"
 
-#: ../plugins/save-calendar/csv-format.c:531
+#: ../plugins/save-calendar/csv-format.c:532
 msgid "Advanced options for the CSV format"
 msgstr "ตัวเลือ�ขั้นสูลสำหรับรูป�บบ CSV"
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Prepend a header"
 msgstr "เติมข้อมูลส่วนหัว"
 
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:548
 msgid "Value delimiter:"
 msgstr "เครื่องหมายคั่นระหว่างค่า:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:554
 msgid "Record delimiter:"
 msgstr "เครื่องหมายคั่นระเบียน:"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "Encapsulate values with:"
 msgstr "ครอบค่าด้วย:"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "รูป�บบคั่นด้วยจุลภาค (.csv)"
 
@@ -19467,15 +19525,15 @@ 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:149
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:376
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF format (.rdf)"
 msgstr "รูป�บบ RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:160
+#: ../plugins/save-calendar/save-calendar.c:161
 msgid "Select destination file"
 msgstr "เลือ��ฟ้มปลายทาง"
 
@@ -19507,15 +19565,15 @@ msgstr "นำคุณสู่�ารตั้งค่าบั�ชีเ
 msgid "Setup Assistant"
 msgstr "ผู้ช่วยตั้งค่า"
 
-#: ../plugins/startup-wizard/startup-wizard.c:83
+#: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "ผู้ช่วยตั้งค่า Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:86
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "ยินดีต้อนรับ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -19527,28 +19585,28 @@ msgstr ""
 "\n"
 "�รุณา�ดปุ่ม \"ถัดไป\" เพื่อทำงานต่อ"
 
-#: ../plugins/startup-wizard/startup-wizard.c:133
+#: ../plugins/startup-wizard/startup-wizard.c:135
 msgid "Importing files"
 msgstr "�ารนำเข้า�ฟ้ม"
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:137
 #: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "�รุณาเลือ�ข้อมูลที่คุณต้อง�ารนำเข้า:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../plugins/startup-wizard/startup-wizard.c:152
 #: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "จา� %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:232
 #: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "�ำลังนำเข้าข้อมูล"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:234
 #: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "�รุณารอสั�ครู่"
@@ -19576,15 +19634,15 @@ msgid ""
 "message body."
 msgstr "ราย�ารคู่ คำหลั�/ค่า สำหรับปลั๊�อิน \"�ม่�บบ\" ที่จะใช้�ทนที่ข้อความในตัวเนื้อความ"
 
-#: ../plugins/templates/templates.c:615
+#: ../plugins/templates/templates.c:603
 msgid "No title"
 msgstr "ไม่มีชื่อ"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:711
 msgid "Save as _Template"
 msgstr "บันทึ�เป็น�_ม่�บบ"
 
-#: ../plugins/templates/templates.c:745
+#: ../plugins/templates/templates.c:713
 msgid "Save as Template"
 msgstr "บันทึ�เป็น�ม่�บบ"
 
@@ -19593,8 +19651,8 @@ msgid "Drafts based template plugin"
 msgstr "ปลั๊�อิน�ม่�บบที่อาศัย�บบร่าง"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses ytnef to decode tnef attachments."
-msgstr "ปลั๊�อินอย่างง่ายที่ใช้ ytnef อ่านเอ�สาร�นบ tnef"
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
+msgstr "ปลั๊�อินอย่างง่ายที่ใช้ yTNEF อ่านเอ�สาร�นบ TNEF"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Attachment decoder"
@@ -19619,8 +19677,8 @@ msgid "URL:"
 msgstr "URL:"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
-msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
-msgstr "หลี�เ_ลี่ยง IfMatch (จำเป็นสำหรับ apache < 2.2.8)"
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
+msgstr "หลี�เ_ลี่ยง IfMatch (จำเป็นสำหรับ Apache < 2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
@@ -19964,7 +20022,7 @@ msgstr "ปรับ�ต่ง Evolution"
 
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -19989,7 +20047,7 @@ msgstr "เรีย�เครื่องมือรายงานบั๊
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:729
+#: ../shell/e-shell-window-commands.c:942
 msgid "translator-credits"
 msgstr ""
 "สุปราณี ธีระวัฒนสุข <supranee@opentle.org>\n"
@@ -19998,27 +20056,27 @@ msgstr ""
 "ถ้ามีเวลาโปรดมาช่วย�ัน�ปล :-)\n"
 "http://gnome-th.sf.net"
 
-#: ../shell/e-shell-window-commands.c:740
+#: ../shell/e-shell-window-commands.c:953
 msgid "Evolution Website"
 msgstr "เว็บไซต์ Evolution"
 
-#: ../shell/e-shell-window-commands.c:758
+#: ../shell/e-shell-window-commands.c:971
 msgid "Error opening the FAQ webpage."
 msgstr "เ�ิดข้อผิดพลาดขณะเปิดเว็บหน้าคำถามที่ถามบ่อย"
 
-#: ../shell/e-shell-window-commands.c:955
+#: ../shell/e-shell-window-commands.c:1174
 msgid "_Work Online"
 msgstr "ทำงานออ_นไลน์"
 
-#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1187 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "ทำงานออ_ฟไลน์"
 
-#: ../shell/e-shell-window-commands.c:981
+#: ../shell/e-shell-window-commands.c:1200
 msgid "Work Offline"
 msgstr "ทำงานออฟไลน์"
 
-#: ../shell/e-shell-window.c:381
+#: ../shell/e-shell-window.c:377
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20026,11 +20084,11 @@ msgstr ""
 "Evolution �ำลังออนไลน์อยู่\n"
 "�ดปุ่มนี้ถ้าต้อง�ารให้ออฟไลน์"
 
-#: ../shell/e-shell-window.c:388
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution �ำลังเปลี่ยน�ารทำงานเป็นออฟไลน์"
 
-#: ../shell/e-shell-window.c:395
+#: ../shell/e-shell-window.c:391
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20038,7 +20096,7 @@ msgstr ""
 "Evolution �ำลังออฟไลน์อยู่\n"
 "�ดปุ่มนี้ถ้าต้อง�ารให้ออนไลน์"
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:787
 #, c-format
 msgid "Switch to %s"
 msgstr "เปลี่ยนไปที่%s"
@@ -20052,19 +20110,19 @@ msgstr "ข้อผิดพลาดไม่ทราบสาเหตุข
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
+#: ../shell/e-shell.c:1262 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1300
+#: ../shell/e-shell.c:1264
 msgid "Invalid arguments"
 msgstr "อาร์�ิวเมนต์ผิดพลาด"
 
-#: ../shell/e-shell.c:1302
+#: ../shell/e-shell.c:1266
 msgid "Cannot register on OAF"
 msgstr "ไม่สามารถลงทะเบียน�ับ OAF"
 
-#: ../shell/e-shell.c:1304
+#: ../shell/e-shell.c:1268
 msgid "Configuration Database not found"
 msgstr "ไม่พบ�านข้อมูลค่าตั้ง"
 
@@ -20108,8 +20166,8 @@ msgid "Importer Type"
 msgstr "ชนิดของ�ารนำเข้า"
 
 #: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr "เลือ�เครื่องมือนำเข้า"
+msgid "Select Information to Import"
+msgstr "เลือ�ข้อมูลที่จะให้นำเข้า"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -20218,32 +20276,36 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารทิ้งรหัสผ่านที่เ�็บไว้ทั้งหมด?"
 
 #: ../shell/shell.error.xml.h:2
+msgid "Cannot start Evolution"
+msgstr "ไม่สามารถเริ่ม�ารทำงานของ Evolution"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "ต่อไป"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "ลบข้อมูลเ�่าจา�รุ่น {0} หรือไม่?"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "Evolution เริ่มทำงานไม่สำเร็จ"
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:6
 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
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "ที่ว่างในดิส�์ไม่เพียงพอสำหรับ�ารปรับเป็นรุ่นใหม่"
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "ลบข้อมูลเ�่าจริงหรือไม่?"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -20264,9 +20326,9 @@ msgstr ""
 "เมื่อลบ�ล้ว คุณจะไม่สามารถปรับรุ่นของ Evolution �ลับลงมาเป็นรุ่นเ�่าโดยอัตโนมัติ "
 "โดยไม่ต้อง�ปลงสิ่งต่างๆ ด้วยตัวเองได้อี�ต่อไป\n"
 
-#: ../shell/shell.error.xml.h:15
+#: ../shell/shell.error.xml.h:16
 msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+"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 "
@@ -20279,11 +20341,11 @@ msgstr ""
 "จะถู�ลบทิ้งอย่างถาวร ถ้าคุณเลือ�ที่จะเ�็บข้อมูลชุดนี้ไว้ คุณยังสามารถลบไดเร�ทอรี &quot;"
 "evolution&quot; ด้วยตัวเองในภายหลังได้ตามสะดว�\n"
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "�ารปรับรุ่นจา�รุ่น�่อนไม่สำเร็จ: {0}"
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:21
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -20295,7 +20357,7 @@ msgstr ""
 "\n"
 "คุณจำเป็นต้องหาเนื้อที่ว่างมา��ว่านี้ในไดเร�ทอรีบ้านของคุณ �่อนที่จะดำเนิน�ารต่อไป"
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -20305,7 +20367,7 @@ msgstr ""
 "\n"
 "คลิ�วิธีใช้เพื่อดูรายละเอียด"
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -20319,19 +20381,19 @@ msgstr ""
 "\n"
 "คลิ�วิธีใช้เพื่อดูรายละเอียด"
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "_ทิ้งรหัสผ่าน"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "เ_�็บข้อมูลไว้"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "เ_ตือนอี�คราวหน้า"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
@@ -20399,7 +20461,7 @@ msgid "Purposes"
 msgstr "จุดประสงค์"
 
 #: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:570
+#: ../smime/lib/e-cert.c:553
 msgid "Serial Number"
 msgstr "หมายเลขลำดับ"
 
@@ -20517,7 +20579,7 @@ msgstr ""
 "�่อนที่จะเชื่อถือ CA นี้เพื่อจุดประสงค์ใดๆ คุณควรตรวจสอบใบรับรองนี้ "
 "พร้อมทั้งนโยบาย�ละ�ระบวน�ารด้วย (ถ้ามี)"
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
 msgid "Certificate"
 msgstr "ใบรับรอง"
 
@@ -20593,11 +20655,11 @@ msgstr "หน่วยงานองค์�ร (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "ลายนิ้วมือ SHA1"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
 msgstr "ใบรับรองลู�ข่าย SSL"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "ใบรับรอง�ม่ข่าย SSL"
 
@@ -20643,182 +20705,182 @@ msgid "_Edit CA Trust"
 msgstr "�_�้ไขความเชื่อถือ CA"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:672
+#: ../smime/lib/e-cert-db.c:656
 msgid "Certificate already exists"
 msgstr "มีใบรับรองอยู่�ล้ว"
 
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Ey"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:408
 msgid "Sign"
 msgstr "เซ็น�ำ�ับ"
 
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:409
 msgid "Encrypt"
 msgstr "เข้ารหัสลับ"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:514
 msgid "Version"
 msgstr "รุ่น"
 
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:529
 msgid "Version 1"
 msgstr "รุ่นที่ 1"
 
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:532
 msgid "Version 2"
 msgstr "รุ่นที่ 2"
 
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:535
 msgid "Version 3"
 msgstr "รุ่นที่ 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:617
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "MD2 พร้อม�ารเข้ารหัสลับ RSA ตาม PKCS #1"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:620
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "MD5 พร้อม�ารเข้ารหัสลับ RSA ตาม PKCS #1"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:623
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "SHA-1 พร้อม�ารเข้ารหัสลับ RSA ตาม PKCS #1"
 
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:650
 msgid "PKCS #1 RSA Encryption"
 msgstr "�ารเข้ารหัสลับ RSA ตาม PKCS #1"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:653
 msgid "Certificate Key Usage"
 msgstr "�ารใช้�ุ��จใบรับรอง"
 
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:656
 msgid "Netscape Certificate Type"
 msgstr "ชนิดใบรับรองของเน็ตสเคป"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:659
 msgid "Certificate Authority Key Identifier"
 msgstr "ตัวระบุ�ุ��จองค์�รออ�ใบรับรอง"
 
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:671
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "ตัวระบุอ็อบเจ�ต์ (%s)"
 
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "ตัวระบุอัล�อริทึม"
 
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "พารามิเตอร์ของอัล�อริทึม"
 
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
 msgid "Error: Unable to process extension"
 msgstr "ข้อผิดพลาด: ไม่สามารถประมวลผลส่วนขยาย"
 
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr "ผู้เซ็น�ำ�ับอ็อบเจ�ต์"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "องค์�รออ�ใบรับรอง SSL"
 
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr "องค์�รออ�ใบรับรองอีเมล"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:850
 msgid "Signing"
 msgstr "�ารเซ็น�ำ�ับ"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:854
 msgid "Non-repudiation"
 msgstr "�ารรับรองความ�ท้"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:858
 msgid "Key Encipherment"
 msgstr "�ารเข้ารหัสลับ�ุ��จ"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:862
 msgid "Data Encipherment"
 msgstr "�ารเข้ารหัสลับข้อมูล"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:866
 msgid "Key Agreement"
 msgstr "�ารยอมรับ�ุ��จ"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:870
 msgid "Certificate Signer"
 msgstr "ใช้เซ็น�ำ�ับใบรับรอง"
 
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:874
 msgid "CRL Signer"
 msgstr "ใช้เซ็น�ำ�ับ CRL"
 
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:922
 msgid "Critical"
 msgstr "สำคั�มา�"
 
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
 msgid "Not Critical"
 msgstr "ไม่สำคั�มา�"
 
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:948
 msgid "Extensions"
 msgstr "ส่วนขยาย"
 
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1019
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
 msgid "Certificate Signature Algorithm"
 msgstr "อัล�อริทึมสำหรับลายเซ็นใบรับรอง"
 
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1084
 msgid "Issuer"
 msgstr "ออ�ให้โดย"
 
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1138
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1157
 msgid "Subject Unique ID"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1200
 msgid "Certificate Signature Value"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "รหัสผ่านสำหรับ�ฟ้ม PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:249
 msgid "Enter password for PKCS12 file:"
 msgstr "ป้อนรหัสผ่านสำหรับ�ฟ้ม PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:348
 msgid "Imported Certificate"
 msgstr "ใบรับรองที่นำเข้า"
 
@@ -20954,7 +21016,7 @@ msgstr "บันทึ�ที่อยู่ติดต่อที่เล
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "บันทึ�ที่อยู่ติดต่อของโฟลเดอร์ที่เลือ�ในรูป VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2724
 msgid "Select All"
 msgstr "เลือ�ทั้งหมด"
 
@@ -21088,7 +21150,7 @@ msgid "Month"
 msgstr "เดือน"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:196
+#: ../widgets/misc/e-calendar.c:195
 msgid "Next"
 msgstr "ถัดไป"
 
@@ -21097,7 +21159,7 @@ msgid "Previews the calendar to be printed"
 msgstr "�สดงตัวอย่างป�ิทิน�่อนพิมพ์"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:172
+#: ../widgets/misc/e-calendar.c:171
 msgid "Previous"
 msgstr "�่อนหน้า"
 
@@ -22274,17 +22336,17 @@ msgid "Define Views for \"%s\""
 msgstr "�ำหนดมุมมองสำหรับ \"%s\""
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1922
+#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
-#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "ตาราง"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
 msgid "Instance"
 msgstr ""
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "บันทึ�มุมมองปัจจุบัน"
 
@@ -22360,13 +22422,13 @@ msgstr "ชนิดของมุมมอง:"
 msgid "Attachment Bar"
 msgstr "�ถบเอ�สาร�นบ"
 
-#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "ไม่สามารถ�นบ�ฟ้ม %s: %s"
 
-#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "ไม่สามารถ�นบ�ฟ้ม %s: ไม่ใช่�ฟ้มป�ติ"
@@ -22388,71 +22450,71 @@ msgid "Suggest automatic display of attachment"
 msgstr "ให้�สดงเอ�สาร�นบนี้โดยอัตโนมัติ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1272
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%B %Ey"
 
-#: ../widgets/misc/e-calendar.c:221
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "ป�ิทินเดือน"
 
-#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
-#: ../widgets/text/e-text.c:3644
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
+#: ../widgets/text/e-text.c:3645
 msgid "Fill color"
 msgstr "สีเติม"
 
-#: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
-#: ../widgets/text/e-text.c:3659
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3651
+#: ../widgets/text/e-text.c:3652 ../widgets/text/e-text.c:3659
+#: ../widgets/text/e-text.c:3660
 msgid "GDK fill color"
 msgstr "สีเติมของ GDK"
 
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
-#: ../widgets/text/e-text.c:3666
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666
+#: ../widgets/text/e-text.c:3667
 msgid "Fill stipple"
 msgstr "ลายที่ระบาย"
 
-#: ../widgets/misc/e-canvas-background.c:481
 #: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:488
 #: ../widgets/misc/e-canvas-background.c:489
+#: ../widgets/misc/e-canvas-background.c:490
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:495
 #: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:497
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:502
 #: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:504
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
 #: ../widgets/table/e-table-group-container.c:999
 #: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3074
+#: ../widgets/table/e-table-item.c:3070
 msgid "Minimum width"
 msgstr "ความ�ว้างต่ำสุด"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
 #: ../widgets/table/e-table-group-container.c:1000
 #: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3075
+#: ../widgets/table/e-table-item.c:3071
 msgid "Minimum Width"
 msgstr "ความ�ว้างต่ำสุด"
 
 #: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:204
+#: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "�ารเว้นช่องว่าง"
 
@@ -22465,7 +22527,7 @@ msgstr "ขณะนี้"
 msgid "The time must be in the format: %s"
 msgstr "เวลาต้องอยู่ในรูป�บบ: %s"
 
-#: ../widgets/misc/e-cell-percent.c:79
+#: ../widgets/misc/e-cell-percent.c:78
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ค่าร้อยละจะต้องอยู่ในช่วงตั้ง�ต่ 0 ถึง 100"
 
@@ -22564,85 +22626,85 @@ msgstr "อื่นๆ ..."
 msgid "Ch_aracter Encoding"
 msgstr "_รหัสอั�ขระ"
 
-#: ../widgets/misc/e-dateedit.c:309
+#: ../widgets/misc/e-dateedit.c:303
 msgid "Date and Time"
 msgstr "วัน�ละเวลา"
 
-#: ../widgets/misc/e-dateedit.c:330
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Text entry to input date"
 msgstr "ราย�ารข้อความเพื่อป้อนข้อมูลวันที่"
 
-#: ../widgets/misc/e-dateedit.c:352
+#: ../widgets/misc/e-dateedit.c:346
 msgid "Click this button to show a calendar"
 msgstr "คลิ�ที่ปุ่มนี้เพื่อ�สดงป�ิทิน"
 
-#: ../widgets/misc/e-dateedit.c:394
+#: ../widgets/misc/e-dateedit.c:388
 msgid "Drop-down combination box to select time"
 msgstr "�ล่องดึงลง�บบผสมเพื่อเลือ�เวลา"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:464
 msgid "No_w"
 msgstr "_ขณะนี้"
 
-#: ../widgets/misc/e-dateedit.c:476
+#: ../widgets/misc/e-dateedit.c:470
 msgid "_Today"
 msgstr "_วันนี้"
 
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1635
 msgid "Invalid Date Value"
 msgstr "วันที่ไม่ถู�ต้อง"
 
-#: ../widgets/misc/e-dateedit.c:1670
+#: ../widgets/misc/e-dateedit.c:1664
 msgid "Invalid Time Value"
 msgstr "เวลาไม่ถู�ต้อง"
 
-#: ../widgets/misc/e-expander.c:180
+#: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "ขยายอยู่"
 
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:183
 msgid "Whether or not the expander is expanded"
 msgstr "ระบุว่าวิดเจ็ตยุบ-ขยายขยายอยู่หรือไม่"
 
-#: ../widgets/misc/e-expander.c:189
+#: ../widgets/misc/e-expander.c:191
 msgid "Text of the expander's label"
 msgstr "ข้อความที่ป้ายของวิดเจ็ตยุบ-ขยาย"
 
-#: ../widgets/misc/e-expander.c:196
+#: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr "ใช้ตัวขีดเส้นใต้"
 
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:199
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr "ถ้าเลือ� อั�ขระขีดเส้นใต้ในข้อความจะระบุว่าอั�ขระถัดไปจะใช้เป็นรหัสปุ่มลัด"
 
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
 msgstr "ช่องว่างระหว่างป้าย�ละวิดเจ็ต"
 
-#: ../widgets/misc/e-expander.c:214
+#: ../widgets/misc/e-expander.c:216
 msgid "Label widget"
 msgstr "วิดเจ็ตป้าย"
 
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:217
 msgid "A widget to display in place of the usual expander label"
 msgstr "วิดเจ็ตที่จะใช้�สดงผล�ทนป้ายป�ติของวิดเจ็ตยุบ-ขยาย"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "ขนาดที่ขยายขึ้น"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "ขนาดของลู�ศรยุบ-ขยาย"
 
-#: ../widgets/misc/e-expander.c:230
+#: ../widgets/misc/e-expander.c:232
 msgid "Indicator Spacing"
 msgstr "ช่องไฟรอบลู�ศรยุบ-ขยาย"
 
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:233
 msgid "Spacing around expander arrow"
 msgstr "ช่องไฟรอบลู�ศรยุบ-ขยาย"
 
@@ -22709,11 +22771,11 @@ msgstr ""
 "วิดเจ็ต�ผนที่�บบโต้ตอบผ่านเมาส์สำหรับเลือ�เขตเวลา ผู้ใช้ที่ใช้�ป้นพิมพ์ "
 "ควรเลือ�เขตเวลาจา��ล่องดึงลง�บบผสมด้านล่าง�ทน"
 
-#: ../widgets/misc/e-online-button.c:109
+#: ../widgets/misc/e-online-button.c:106
 msgid "Online"
 msgstr "ออนไลน์"
 
-#: ../widgets/misc/e-online-button.c:110
+#: ../widgets/misc/e-online-button.c:107
 msgid "The button state is online"
 msgstr "สถานะของปุ่มคือออนไลน์"
 
@@ -22729,74 +22791,74 @@ msgstr "Sync ระเบียนข้อมูลส่วนตัว:"
 msgid "Sync Categories:"
 msgstr "Sync หมวด:"
 
-#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
 msgid "Empty message"
 msgstr "ข้อความว่างเปล่า"
 
-#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
 msgid "Reflow model"
 msgstr "โมเดลข้อมูล�ารจัดเรียง�ระ�สข้อความ"
 
-#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
 msgid "Column width"
 msgstr "ความ�ว้างคอลัมน์"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Search"
 msgstr "ค้นหา"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Click here to change the search type"
 msgstr "คลิ�ที่นี่เพื่อเปลี่ยนชนิดของ�ารค้นหา"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Search"
 msgstr "_ค้นหา"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:609
 msgid "_Find Now"
 msgstr "_หาเดี๋ยวนี้"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Clear"
 msgstr "_ล้าง"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Item ID"
 msgstr "หมายเลขราย�าร"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
-#: ../widgets/text/e-text.c:3566
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
+#: ../widgets/text/e-text.c:3567
 msgid "Text"
 msgstr "ข้อความ"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1006
+#: ../widgets/misc/e-search-bar.c:1003
 msgid "Sho_w: "
 msgstr "�_สดง: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1023
+#: ../widgets/misc/e-search-bar.c:1020
 msgid "Sear_ch: "
 msgstr "_ค้นหา: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1035
+#: ../widgets/misc/e-search-bar.c:1032
 msgid " i_n "
 msgstr " ใ_น "
 
 #: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:807
+#: ../widgets/table/e-tree-selection-model.c:806
 msgid "Cursor Row"
 msgstr "�ถวเคอร์เซอร์"
 
 #: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:814
+#: ../widgets/table/e-tree-selection-model.c:813
 msgid "Cursor Column"
 msgstr "คอลัมน์เคอร์เซอร์"
 
@@ -22994,23 +23056,23 @@ msgstr "คอลัมน์ที่โฟ�ัส"
 msgid "Unselected Column"
 msgstr "คอลัมน์ที่ไม่ได้เลือ�"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Strikeout Column"
 msgstr "คอลัมน์ขีดฆ่า"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1814
 msgid "Underline Column"
 msgstr "คอลัมน์ขีดเส้นใต้"
 
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1821
 msgid "Bold Column"
 msgstr "คอลัมน์ตัวหนา"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1828
 msgid "Color Column"
 msgstr "คอลัมน์สี"
 
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1842
 msgid "BG Color Column"
 msgstr "คอลัมน์สีพื้น"
 
@@ -23048,7 +23110,7 @@ msgid "A_vailable Fields:"
 msgstr "เขตข้อมูลที่_มี:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Ascending"
 msgstr "หน้าไปหลัง"
 
@@ -23061,7 +23123,7 @@ msgid "Clear _All"
 msgstr "ล้างทั้งห_มด"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Descending"
 msgstr "หลังมาหน้า"
 
@@ -23122,16 +23184,16 @@ msgid "_Sort..."
 msgstr "เ_รียง..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:634
-#: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1887
+#: ../widgets/table/e-table-field-chooser-item.c:633
+#: ../widgets/table/e-table-field-chooser.c:66
+#: ../widgets/table/e-table-header-item.c:1886
 msgid "DnD code"
 msgstr "รหัส DnD"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:641
-#: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1901
+#: ../widgets/table/e-table-field-chooser-item.c:640
+#: ../widgets/table/e-table-field-chooser.c:73
+#: ../widgets/table/e-table-header-item.c:1900
 msgid "Full Header"
 msgstr "ข้อมูลส่วนหัวเต็ม"
 
@@ -23169,7 +23231,7 @@ msgstr[1] "%s (%d ราย�าร)"
 #: ../widgets/table/e-table-group-container.c:923
 #: ../widgets/table/e-table-group-leaf.c:581
 #: ../widgets/table/e-table-group-leaf.c:582
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 msgid "Alternating Row Colors"
 msgstr "สลับสีของ�ถว"
 
@@ -23177,8 +23239,8 @@ msgstr "สลับสีของ�ถว"
 #: ../widgets/table/e-table-group-container.c:930
 #: ../widgets/table/e-table-group-leaf.c:588
 #: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
-#: ../widgets/table/e-tree.c:3344 ../widgets/table/e-tree.c:3345
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr "ตีเส้นตาราง�นวนอน"
 
@@ -23186,8 +23248,8 @@ msgstr "ตีเส้นตาราง�นวนอน"
 #: ../widgets/table/e-table-group-container.c:937
 #: ../widgets/table/e-table-group-leaf.c:595
 #: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
-#: ../widgets/table/e-tree.c:3350 ../widgets/table/e-tree.c:3351
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr "ตีเส้นตาราง�นวตั้ง"
 
@@ -23195,8 +23257,8 @@ msgstr "ตีเส้นตาราง�นวตั้ง"
 #: ../widgets/table/e-table-group-container.c:944
 #: ../widgets/table/e-table-group-leaf.c:602
 #: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
-#: ../widgets/table/e-tree.c:3356 ../widgets/table/e-tree.c:3357
+#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
+#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr "วาดโฟ�ัส"
 
@@ -23204,7 +23266,7 @@ msgstr "วาดโฟ�ัส"
 #: ../widgets/table/e-table-group-container.c:951
 #: ../widgets/table/e-table-group-leaf.c:609
 #: ../widgets/table/e-table-group-leaf.c:610
-#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
+#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
 msgid "Cursor mode"
 msgstr "โหมดของเคอร์เซอร์"
 
@@ -23212,7 +23274,7 @@ msgstr "โหมดของเคอร์เซอร์"
 #: ../widgets/table/e-table-group-container.c:958
 #: ../widgets/table/e-table-group-leaf.c:623
 #: ../widgets/table/e-table-group-leaf.c:624
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
 msgid "Selection model"
 msgstr "วิธี�ารเลือ�"
 
@@ -23220,9 +23282,9 @@ msgstr "วิธี�ารเลือ�"
 #: ../widgets/table/e-table-group-container.c:965
 #: ../widgets/table/e-table-group-leaf.c:616
 #: ../widgets/table/e-table-group-leaf.c:617
-#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
-#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3338
-#: ../widgets/table/e-tree.c:3339
+#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
+#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-tree.c:3338
 msgid "Length Threshold"
 msgstr "ขีดเริ่มของความยาว"
 
@@ -23230,9 +23292,9 @@ msgstr "ขีดเริ่มของความยาว"
 #: ../widgets/table/e-table-group-container.c:972
 #: ../widgets/table/e-table-group-leaf.c:658
 #: ../widgets/table/e-table-group-leaf.c:659
-#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
-#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3370
-#: ../widgets/table/e-tree.c:3371
+#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
+#: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-tree.c:3370
 msgid "Uniform row height"
 msgstr "ความสูงเท่า�ันทุ��ถว"
 
@@ -23243,215 +23305,230 @@ msgstr "ความสูงเท่า�ันทุ��ถว"
 msgid "Frozen"
 msgstr "�ช่�ข็ง"
 
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
 msgid "Customize Current View"
 msgstr "ปรับ�ต่งมุมมองปัจจุบัน"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "Sort _Ascending"
 msgstr "เรียงจา�ห_น้าไปหลัง"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Descending"
 msgstr "เรียงจา�ห_ลังมาหน้า"
 
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "_Unsort"
 msgstr "ไ_ม่เรียง"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Group By This _Field"
 msgstr "จัด�ลุ่มตามเ_ขตข้อมูลนี้"
 
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By _Box"
 msgstr "จัด�ลุ่มตาม_�ล่อง"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "Remove This _Column"
 msgstr "ลบ_คอลัมน์นี้"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Add a C_olumn..."
 msgstr "เพิ่มค_อลัมน์..."
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1482
 msgid "A_lignment"
 msgstr "�าร_จัดชิดขอบ"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "B_est Fit"
 msgstr "ปรับความ�ว้าง_พอดี"
 
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Format Column_s..."
 msgstr "จัดรูป�บบคอ_ลัมน์..."
 
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Custo_mize Current View..."
 msgstr "ปรับ�_ต่งมุมมองปัจจุบัน..."
 
-#: ../widgets/table/e-table-header-item.c:1543
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "_Sort By"
 msgstr "เ_รียงตาม"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1561
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "_Custom"
 msgstr "_�ำหนดเอง"
 
-#: ../widgets/table/e-table-header-item.c:1894
+#: ../widgets/table/e-table-header-item.c:1893
 msgid "Font Description"
 msgstr "คำบรรยาย�บบอั�ษร"
 
-#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-header-item.c:1914
 #: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "ข้อมูลของ�ารเรียงลำดับ"
 
-#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-table-header-item.c:1928
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "ต้นไม้"
 
-#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
 msgid "Table header"
 msgstr "หัวตาราง"
 
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
 msgid "Table model"
 msgstr "�บบจำลองข้อมูลตาราง"
 
-#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
 msgid "Cursor row"
 msgstr "�ถวของเคอร์เซอร์"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
-#: ../widgets/table/e-tree.c:3378
+#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-tree.c:3377
 msgid "Always search"
 msgstr "ค้นหาเสมอ"
 
-#: ../widgets/table/e-table.c:3346
+#: ../widgets/table/e-table.c:3347
 msgid "Use click to add"
 msgstr "คลิ�เพื่อเพิ่ม"
 
-#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
+#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
 msgid "ETree table adapter"
 msgstr "ตัวปรับ�ารเชื่อมต่อตาราง ETree"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3383
 msgid "Retro Look"
 msgstr "หน้าตา�บบเ�่า"
 
-#: ../widgets/table/e-tree.c:3385
+#: ../widgets/table/e-tree.c:3384
 msgid "Draw lines and +/- expanders."
 msgstr "วาดเส้น�ละเครื่องหมาย +/- สำหรับยุบ-ขยาย"
 
-#: ../widgets/text/e-text.c:2735
+#: ../widgets/text/e-text.c:2736
 msgid "Input Methods"
 msgstr "วิธีป้อนข้อความ"
 
-#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
 msgid "Event Processor"
 msgstr "ตัวจัด�ารเหตุ�ารณ์"
 
-#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
+#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
 msgid "Bold"
 msgstr "หนา"
 
-#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
+#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
 msgid "Strikeout"
 msgstr "ขีดฆ่า"
 
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
 msgid "Anchor"
 msgstr "สมอยึด"
 
-#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
 msgid "Justification"
 msgstr "�ารจัดชิดขอบ"
 
-#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
 msgid "Clip Width"
 msgstr "ความ�ว้างของคลิป"
 
-#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
+#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
 msgid "Clip Height"
 msgstr "ความสูงของคลิป"
 
-#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
+#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
 msgid "Clip"
 msgstr "คลิป"
 
-#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
+#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
 msgid "Fill clip rectangle"
 msgstr "ระบายสีพื้นคลิป"
 
-#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
+#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
 msgid "X Offset"
 msgstr "ออฟเซ็ต X"
 
-#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
+#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638
 msgid "Y Offset"
 msgstr "ออฟเซ็ต Y"
 
-#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
+#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
 msgid "Text width"
 msgstr "ความ�ว้างข้อความ"
 
-#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
+#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
 msgid "Text height"
 msgstr "ความสูงข้อความ"
 
-#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Use ellipsis"
 msgstr "ใช้จุดไข่ปลา"
 
-#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Ellipsis"
 msgstr "จุดไข่ปลา"
 
-#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Line wrap"
 msgstr "ตัดบรรทัด"
 
-#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Break characters"
 msgstr "ตัดที่อั�ขระ"
 
-#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Max lines"
 msgstr "จำนวนบรรทัดสูงสุด"
 
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
 msgid "Draw borders"
 msgstr "วาดขอบ"
 
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
 msgid "Allow newlines"
 msgstr "�ทร�อั�ขระขึ้นบรรทัดใหม่ได้"
 
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
 msgid "Draw background"
 msgstr "วาดพื้นหลัง"
 
-#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
 msgid "Draw button"
 msgstr "วาดปุ่ม"
 
-#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
+#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
 msgid "Cursor position"
 msgstr "ตำ�หน่งเคอร์เซอร์"
 
-#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
+#: ../widgets/text/e-text.c:3780 ../widgets/text/e-text.c:3781
 msgid "IM Context"
 msgstr "IM Context"
 
-#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3787 ../widgets/text/e-text.c:3788
 msgid "Handle Popup"
 msgstr "จัด�ารหน้าต่างผุดขึ้น"
 
+#~ msgid "A_dd Filter Criteria"
+#~ msgstr "เ_พิ่ม�ฎ�าร�รอง"
+
+#~ msgid "Mark calendar offline"
+#~ msgstr "ทำเครื่องหมายป�ิทินว่าออฟไลน์"
+
+#~ msgid "Marks the selected calendar for offline viewing."
+#~ msgstr "ทำเครื่องหมายป�ิทินที่เลือ�เพื่อไว้ดู�บบออฟไลน์"
+
+#~ msgid "Select Importers"
+#~ msgstr "เลือ�เครื่องมือนำเข้า"
+
+#~ msgid "Recent Docu_ments"
+#~ msgstr "เอ�สาร_ล่าสุด"
+
 #~ msgid "Upcoming Appointments"
 #~ msgstr "นัดหมายที่จะถึง"
 
@@ -23653,9 +23730,6 @@ msgstr "จัด�ารหน้าต่างผุดขึ้น"
 #~ msgid "S/MIME Sign"
 #~ msgstr "เซ็น S/MIME"
 
-#~ msgid "Save As"
-#~ msgstr "บันทึ�เป็น"
-
 #~ msgid "Save in folder..."
 #~ msgstr "บันทึ�ในโฟลเดอร์..."
 
@@ -23779,12 +23853,6 @@ msgstr "จัด�ารหน้าต่างผุดขึ้น"
 #~ msgid "Se_lect..."
 #~ msgstr "เลื_อ�..."
 
-#~ msgid "Select Drafts Folder"
-#~ msgstr "เลือ�โฟลเดอร์เ�็บข้อความฉบับร่าง"
-
-#~ msgid "Select Sent Folder"
-#~ msgstr "เลือ�โฟลเดอร์เ�็บข้อความออ�"
-
 #~ msgid "_Beep when new mail arrives"
 #~ msgstr "ส่งเสียง_ปิ๊บเมื่อมีเมลมา"
 
diff --git a/shell/ChangeLog b/shell/ChangeLog
index ad724371c3..4ea93c997e 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,33 @@
+2008-10-17  Kandepu Prasad  <kaprasad@novell.com>
+
+	** Fix for bug #311479
+
+	* import.glade:
+	* importer/import.glade: rephrasing the heading in Evolution Import 
+	Assistant
+
+2008-10-17  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fix for bug #548469
+
+	* Makefile.am:
+	* e-shell-nm-glib.c:
+	* e-shell-nm.c (reinit_dbus), (e_shell_network_monitor),
+	(e_shell_dbus_initialise):
+	* e-shell-window-commands.c (command_work_offline),
+	(command_work_online):
+	* e-shell-window.c (offline_toggle_clicked_cb), (impl_dispose):
+	* e-shell.c (impl_Shell_setLineStatus), (e_shell_construct),
+	(e_shell_set_line_status):
+	* e-shell.h:
+	Drop support for deprecated libnm-glib. 
+
+2008-10-03  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-shell-window.c:
+
 2008-09-30  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c
index 930e80f124..c0cae505dc 100644
--- a/shell/e-shell-nm.c
+++ b/shell/e-shell-nm.c
@@ -51,13 +51,12 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED,
                          DBusMessage *message,
                          gpointer user_data)
 {
-	DBusError error;
+	DBusError error = DBUS_ERROR_INIT;
 	const gchar *object;
 	EShell *shell = user_data;
 	EShellLineStatus line_status;
 	gboolean device_active;
 
-	dbus_error_init (&error);
 	object = dbus_message_get_path (message);
 
 	if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected") &&
@@ -94,16 +93,16 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED,
 gboolean
 e_shell_dbus_initialize (EShell *shell)
 {
-	DBusError error;
+	DBusError error = DBUS_ERROR_INIT;
 
 	g_return_val_if_fail (E_IS_SHELL (shell), FALSE);
 
 	if (dbus_connection != NULL)
 		return TRUE;
 
-	dbus_error_init (&error);
-	if (!(dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error))) {
-		g_warning ("could not get system bus: %s\n", error.message);
+	dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
+	if (dbus_connection == NULL) {
+		g_warning ("%s", error.message);
 		dbus_error_free (&error);
 		return FALSE;
 	}
@@ -120,6 +119,7 @@ e_shell_dbus_initialize (EShell *shell)
 			    "sender='" NM_DBUS_SERVICE "',"
 			    "path='" NM_DBUS_PATH "'", &error);
 	if (dbus_error_is_set (&error)) {
+		g_warning ("%s", error.message);
 		dbus_error_free (&error);
 		goto exception;
 	}
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index de68d343e4..f278af0bf8 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -48,7 +48,6 @@ shell_window_new_view (EShellWindow *shell_window,
 	GtkNotebook *notebook;
 	GtkAction *action;
 	GtkWidget *widget;
-	gchar *action_name;
 	gint page_num;
 
 	/* Determine the page number for the new shell view. */
diff --git a/shell/import.glade b/shell/import.glade
index 813f2e90f1..389d2feee3 100644
--- a/shell/import.glade
+++ b/shell/import.glade
@@ -92,7 +92,7 @@ importing external files into Evolution.</property>
       <child>
 	<widget class="GnomeDruidPageStandard" id="page2-intelligent">
 	  <property name="visible">True</property>
-	  <property name="title" translatable="yes">Select Importers</property>
+	  <property name="title" translatable="yes">Select Information to Import</property>
 
 	  <child internal-child="vbox">
 	    <widget class="GtkVBox" id="druid-vbox3">
diff --git a/shell/importer/import.glade b/shell/importer/import.glade
index 813f2e90f1..389d2feee3 100644
--- a/shell/importer/import.glade
+++ b/shell/importer/import.glade
@@ -92,7 +92,7 @@ importing external files into Evolution.</property>
       <child>
 	<widget class="GnomeDruidPageStandard" id="page2-intelligent">
 	  <property name="visible">True</property>
-	  <property name="title" translatable="yes">Select Importers</property>
+	  <property name="title" translatable="yes">Select Information to Import</property>
 
 	  <child internal-child="vbox">
 	    <widget class="GtkVBox" id="druid-vbox3">
diff --git a/smime/ChangeLog b/smime/ChangeLog
index 87bb1d3091..249a44fb14 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,3 +1,13 @@
+2008-10-10  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* lib/e-asn1-object.c:
+	* lib/e-cert-db.c:
+	* lib/e-cert-trust.c:
+	* lib/e-cert.c:
+	* lib/e-pkcs12.c:
+
 2008-09-02  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/smime/lib/e-asn1-object.c b/smime/lib/e-asn1-object.c
index f8465e2212..b3cfe9e726 100644
--- a/smime/lib/e-asn1-object.c
+++ b/smime/lib/e-asn1-object.c
@@ -1,61 +1,44 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-cert.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- * Author: Chris Toshok (toshok@ximian.com)
- */
-
 /* The following is the mozilla license blurb, as the bodies some of
    these functions were derived from the mozilla source. */
-
 /*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
  *
- * The Original Code is the Netscape security libraries.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
  *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2000 Netscape Communications Corporation.  All
- * Rights Reserved.
+ * The Original Code is the Netscape security libraries.
  *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable
- * instead of those above.  If you wish to allow use of your
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1994-2000
+ * the Initial Developer. All Rights Reserved.
  *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
  */
 
-
+/*
+ * Author: Chris Toshok (toshok@ximian.com)
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index c00c3fe26b..b9703ebe29 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -1,61 +1,45 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* The following is the mozilla license blurb, as the bodies some of
+   these functions were derived from the mozilla source. */
 /* e-cert-db.c
  *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * The Original Code is the Netscape security libraries.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1994-2000
+ * the Initial Developer. All Rights Reserved.
  *
- * Author: Chris Toshok (toshok@ximian.com)
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
  */
 
-/* The following is the mozilla license blurb, as the bodies of most
-   of these functions were derived from the mozilla source. */
-
 /*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is the Netscape security libraries.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable
- * instead of those above.  If you wish to allow use of your
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
+ * Author: Chris Toshok (toshok@ximian.com)
  *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
-
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/smime/lib/e-cert-trust.c b/smime/lib/e-cert-trust.c
index 6432c14435..8509f3ffee 100644
--- a/smime/lib/e-cert-trust.c
+++ b/smime/lib/e-cert-trust.c
@@ -1,65 +1,44 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* The following is the mozilla license blurb, as the bodies some of
+   these functions were derived from the mozilla source. */
 /*
- *  Authors: Chris Toshok <toshok@ximian.com>
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * The Original Code is the Netscape security libraries.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1994-2000
+ * the Initial Developer. All Rights Reserved.
  *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
  */
 
-/* this code is pretty much cut&pasted and renamed from mozilla.
-   here's their copyright/blurb */
-
 /*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is the Netscape security libraries.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- *
- * Contributor(s):
- *  Ian McGreer <mcgreer@netscape.com>
- *  Javier Delgadillo <javi@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable
- * instead of those above.  If you wish to allow use of your
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
+ * Author: Chris Toshok (toshok@ximian.com)
  *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
-
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c
index 34a2b09bd2..cbede0a5fe 100644
--- a/smime/lib/e-cert.c
+++ b/smime/lib/e-cert.c
@@ -1,61 +1,44 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-cert.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- * Author: Chris Toshok (toshok@ximian.com)
- */
-
 /* The following is the mozilla license blurb, as the bodies some of
    these functions were derived from the mozilla source. */
-
 /*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
  *
- * The Original Code is the Netscape security libraries.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
  *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2000 Netscape Communications Corporation.  All
- * Rights Reserved.
+ * The Original Code is the Netscape security libraries.
  *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable
- * instead of those above.  If you wish to allow use of your
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1994-2000
+ * the Initial Developer. All Rights Reserved.
  *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
  */
 
-
+/*
+ * Author: Chris Toshok (toshok@ximian.com)
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index cd79b21a4b..98f16d6e75 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -1,39 +1,44 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* The following is the mozilla license blurb, as the bodies some of
    these functions were derived from the mozilla source. */
-
 /*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
  *
- * The Original Code is the Netscape security libraries.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
  *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2000 Netscape Communications Corporation.  All
- * Rights Reserved.
+ * The Original Code is the Netscape security libraries.
  *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable
- * instead of those above.  If you wish to allow use of your
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1994-2000
+ * the Initial Developer. All Rights Reserved.
  *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
  */
 
-
+/*
+ * Author: Chris Toshok (toshok@ximian.com)
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index 219ff52490..ef2cb7e355 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,16 @@
+2008-10-17  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* text/e-text.c:
+	* text/e-text.h:
+
+2008-10-03  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* text/e-text-test.c:
+
 2008-09-12  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 57e1d25b7a..85ec90411f 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,24 @@
+2008-10-21  Sankar P  <psankar@novell.com>
+
+	* e-spinner.c (e_spinner_stop),
+	(e_spinner_new_spinning_small_shown):
+	* e-spinner.h:
+	* e-task-widget.c (e_task_widget_construct):
+	Re-factor spinner usage.
+
+2008-10-17  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-dateedit.c:
+	* e-dateedit.h:
+
+2008-10-10  Sankar P  <psankar@novell.com>
+
+License Changes + code cleanup
+
+	* e-reflow.c (e_reflow_event), (e_reflow_init):
+
 2008-10-01  Milan Crha  <mcrha@redhat.com>
 
 	** Part of fix for bug #554418
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index f11ecbe029..272223025e 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -1,23 +1,21 @@
 /*
- * 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 library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU Library General Public
  * License along with the program; if not, see <http://www.gnu.org/licenses/>  
  *
- *
  * Authors:
  *		Damon Chaplin <damon@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
  */
 
 /*
diff --git a/widgets/misc/e-dateedit.h b/widgets/misc/e-dateedit.h
index 587120148d..5c1e20deac 100644
--- a/widgets/misc/e-dateedit.h
+++ b/widgets/misc/e-dateedit.h
@@ -9,11 +9,12 @@
  * Based on the GnomeDateEdit, part of the Gnome Library.
  * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index 6fd7021b54..f51a502a83 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -1,26 +1,24 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-reflow.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
+ * 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.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * 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/>  
  *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ *              Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
-
 #include <config.h>
 
 #include <math.h>
@@ -955,14 +953,12 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 				case 1:
 					{
 						GdkEventButton *button = (GdkEventButton *) event;
-						double n_x, max_x;
+						double n_x;
 						n_x = button->x;
 						n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
 						n_x = fmod(n_x,(reflow->column_width + E_REFLOW_FULL_GUTTER));
 
-						max_x = E_REFLOW_BORDER_WIDTH;
-						max_x += (reflow->column_width + E_REFLOW_FULL_GUTTER) * reflow->column_count;
-						if ( button->y >= E_REFLOW_BORDER_WIDTH && button->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER && max_x > button->x ) {
+						if ( button->y >= E_REFLOW_BORDER_WIDTH && button->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER ) {
 							/* don't allow to drag the first line*/
 							if (e_reflow_pick_line(reflow, button->x) == 0)
 								return TRUE;
@@ -1046,16 +1042,13 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 				return TRUE;
 			} else {
 				GdkEventMotion *motion = (GdkEventMotion *) event;
-				double n_x, max_x;
+				double n_x;
 
 				n_x = motion->x;
 				n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
 				n_x = fmod(n_x,(reflow->column_width + E_REFLOW_FULL_GUTTER));
 
-				max_x = E_REFLOW_BORDER_WIDTH;
-				max_x += (reflow->column_width + E_REFLOW_FULL_GUTTER) * reflow->column_count;
-
-				if ( motion->y >= E_REFLOW_BORDER_WIDTH && motion->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER && max_x > motion->x) {
+				if ( motion->y >= E_REFLOW_BORDER_WIDTH && motion->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER ) {
 					if ( reflow->default_cursor_shown ) {
 						gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, reflow->arrow_cursor);
 						reflow->default_cursor_shown = FALSE;
@@ -1071,14 +1064,12 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 		case GDK_ENTER_NOTIFY:
 			if (!reflow->column_drag) {
 				GdkEventCrossing *crossing = (GdkEventCrossing *) event;
-				double n_x, max_x;
+				double n_x;
 				n_x = crossing->x;
 				n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
 				n_x = fmod(n_x,(reflow->column_width + E_REFLOW_FULL_GUTTER));
 
-				max_x = E_REFLOW_BORDER_WIDTH;
-				max_x += (reflow->column_width + E_REFLOW_FULL_GUTTER) * reflow->column_count;
-				if ( crossing->y >= E_REFLOW_BORDER_WIDTH && crossing->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER && max_x > crossing->x) {
+				if ( crossing->y >= E_REFLOW_BORDER_WIDTH && crossing->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER ) {
 					if ( reflow->default_cursor_shown ) {
 						gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, reflow->arrow_cursor);
 						reflow->default_cursor_shown = FALSE;
@@ -1541,4 +1532,3 @@ e_reflow_init (EReflow *reflow)
 
 	e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(reflow), e_reflow_reflow);
 }
-
diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c
index 26a77e6126..56990d71a1 100644
--- a/widgets/misc/e-spinner.c
+++ b/widgets/misc/e-spinner.c
@@ -32,6 +32,30 @@
 
 #include "e-spinner.h"
 
+#define E_TYPE_SPINNER		(e_spinner_get_type ())
+#define E_SPINNER(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_SPINNER, ESpinner))
+#define E_SPINNER_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), E_TYPE_SPINNER, ESpinnerClass))
+#define E_IS_SPINNER(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_SPINNER))
+#define E_IS_SPINNER_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_SPINNER))
+#define E_SPINNER_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), E_TYPE_SPINNER, ESpinnerClass))
+
+typedef struct _ESpinner		ESpinner;
+typedef struct _ESpinnerClass	ESpinnerClass;
+typedef struct _ESpinnerDetails	ESpinnerDetails;
+
+struct _ESpinner
+{
+	GtkWidget parent;
+
+	/*< private >*/
+	ESpinnerDetails *details;
+};
+
+struct _ESpinnerClass
+{
+	GtkWidgetClass parent_class;
+};
+
 #define LOG(msg, args...)
 #define START_PROFILER(name)
 #define STOP_PROFILER(name)
@@ -518,7 +542,7 @@ static void e_spinner_init	    (ESpinner *spinner);
 
 static GObjectClass *parent_class;
 
-GType
+static GType
 e_spinner_get_type (void)
 {
 	static GType type = 0;
@@ -701,13 +725,7 @@ bump_spinner_frame_cb (ESpinner *spinner)
 	return TRUE;
 }
 
-/**
- * e_spinner_start:
- * @spinner: a #ESpinner
- *
- * Start the spinner animation.
- **/
-void
+static void
 e_spinner_start (ESpinner *spinner)
 {
 	ESpinnerDetails *details = spinner->details;
@@ -742,39 +760,7 @@ e_spinner_remove_update_callback (ESpinner *spinner)
 	}
 }
 
-/**
- * e_spinner_stop:
- * @spinner: a #ESpinner
- *
- * Stop the spinner animation.
- **/
-void
-e_spinner_stop (ESpinner *spinner)
-{
-	ESpinnerDetails *details = spinner->details;
-
-	details->spinning = FALSE;
-	details->current_image = 0;
-
-	if (details->timer_task != 0)
-	{
-		e_spinner_remove_update_callback (spinner);
-
-		if (GTK_WIDGET_MAPPED (GTK_WIDGET (spinner)))
-		{
-			gtk_widget_queue_draw (GTK_WIDGET (spinner));
-		}
-	}
-}
-
-/*
- * e_spinner_set_size:
- * @spinner: a #ESpinner
- * @size: the size of type %GtkIconSize
- *
- * Set the size of the spinner.
- **/
-void
+static void
 e_spinner_set_size (ESpinner *spinner,
 		       GtkIconSize size)
 {
@@ -794,6 +780,27 @@ e_spinner_set_size (ESpinner *spinner,
 }
 
 #if 0
+
+static void
+e_spinner_stop (ESpinner *spinner)
+{
+	ESpinnerDetails *details = spinner->details;
+
+	details->spinning = FALSE;
+	details->current_image = 0;
+
+	if (details->timer_task != 0)
+	{
+		e_spinner_remove_update_callback (spinner);
+
+		if (GTK_WIDGET_MAPPED (GTK_WIDGET (spinner)))
+		{
+			gtk_widget_queue_draw (GTK_WIDGET (spinner));
+		}
+	}
+}
+
+
 /*
  * e_spinner_set_timeout:
  * @spinner: a #ESpinner
@@ -958,17 +965,14 @@ e_spinner_class_init (ESpinnerClass *class)
 	g_type_class_add_private (object_class, sizeof (ESpinnerDetails));
 }
 
-/*
- * e_spinner_new:
- *
- * Create a new #ESpinner. The spinner is a widget
- * that gives the user feedback about network status with
- * an animated image.
- *
- * Return Value: the spinner #GtkWidget
- **/
-GtkWidget *
-e_spinner_new (void)
+GtkWidget *e_spinner_new_spinning_small_shown (void)
 {
-	return GTK_WIDGET (g_object_new (E_TYPE_SPINNER, NULL));
+  ESpinner *image;
+  image = E_SPINNER (g_object_new (E_TYPE_SPINNER, NULL));
+
+  e_spinner_set_size (image, GTK_ICON_SIZE_SMALL_TOOLBAR);
+  e_spinner_start (image);
+  gtk_widget_show (GTK_WIDGET(image));
+
+  return GTK_WIDGET (image);
 }
diff --git a/widgets/misc/e-spinner.h b/widgets/misc/e-spinner.h
index 5a1cd42c5e..0fb97d945e 100644
--- a/widgets/misc/e-spinner.h
+++ b/widgets/misc/e-spinner.h
@@ -32,40 +32,7 @@
 
 G_BEGIN_DECLS
 
-#define E_TYPE_SPINNER		(e_spinner_get_type ())
-#define E_SPINNER(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_SPINNER, ESpinner))
-#define E_SPINNER_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), E_TYPE_SPINNER, ESpinnerClass))
-#define E_IS_SPINNER(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_SPINNER))
-#define E_IS_SPINNER_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_SPINNER))
-#define E_SPINNER_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), E_TYPE_SPINNER, ESpinnerClass))
-
-typedef struct _ESpinner		ESpinner;
-typedef struct _ESpinnerClass	ESpinnerClass;
-typedef struct _ESpinnerDetails	ESpinnerDetails;
-
-struct _ESpinner
-{
-	GtkWidget parent;
-
-	/*< private >*/
-	ESpinnerDetails *details;
-};
-
-struct _ESpinnerClass
-{
-	GtkWidgetClass parent_class;
-};
-
-GType		e_spinner_get_type	(void);
-
-GtkWidget      *e_spinner_new	(void);
-
-void		e_spinner_start	(ESpinner *throbber);
-
-void		e_spinner_stop	(ESpinner *throbber);
-
-void		e_spinner_set_size	(ESpinner *spinner,
-					 GtkIconSize size);
+GtkWidget *e_spinner_new_spinning_small_shown (void);
 
 G_END_DECLS
 
diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog
index 5f7dad0428..320c4a9db2 100644
--- a/widgets/table/ChangeLog
+++ b/widgets/table/ChangeLog
@@ -1,3 +1,44 @@
+2008-10-17  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-cell-tree.c:
+	* e-cell-tree.h:
+
+2008-10-08  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-table-header-item.c:
+
+2008-10-06  Sankar P  <psankar@novell.com>
+
+	* e-cell-float.c:
+	* e-cell-float.h:
+	Remove obsolete files
+
+2008-10-03  Sankar P  <psankar@novell.com>
+
+License Changes And:
+
+	* e-table-item.c (eti_event): remove obsolete check for
+	buttons 4/5 in 2BUTTON_PRESS; cf. gdk_event_translate /
+	_gdk_event_button_generate that turn this into a scroll
+	event these days.
+
+2008-10-03  Sankar P  <psankar@novell.com>
+
+	* widgets/table/e-cell-progress.c:
+	* widgets/table/e-cell-progress.h:
+	Removed obsolete files
+
+2008-10-03  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* table-test.c:
+	* test-table.c:
+
 2008-09-30  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index 80a951d0c4..836a1dd570 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -23,11 +23,9 @@ libetable_la_SOURCES = 				\
 	e-cell-checkbox.c			\
 	e-cell-combo.c				\
 	e-cell-date.c				\
-	e-cell-float.c				\
 	e-cell-number.c				\
 	e-cell-pixbuf.c				\
 	e-cell-popup.c				\
-	e-cell-progress.c			\
 	e-cell-size.c				\
 	e-cell-text.c				\
 	e-cell-toggle.c				\
@@ -86,11 +84,9 @@ libetableinclude_HEADERS = 			\
 	e-cell-checkbox.h			\
 	e-cell-combo.h				\
 	e-cell-date.h				\
-	e-cell-float.h				\
 	e-cell-number.h				\
 	e-cell-pixbuf.h				\
 	e-cell-popup.h				\
-	e-cell-progress.h			\
 	e-cell-size.h				\
 	e-cell-text.h				\
 	e-cell-toggle.h				\
diff --git a/widgets/table/e-cell-float.c b/widgets/table/e-cell-float.c
deleted file mode 100644
index 8befd842f9..0000000000
--- a/widgets/table/e-cell-float.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * e-cell-float.c - Float item for e-table.
- *
- * 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/>  
- *
- *
- * Authors:
- *		Mikael Hallendal <micke@imendio.com>
- *
- * Derived from e-cell-number by Chris Lahey <clahey@ximian.com>
- * ECellFloat - Float item for e-table.
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#include <config.h>
-
-#include <sys/time.h>
-#include <unistd.h>
-
-#include <glib/gi18n.h>
-#include "e-util/e-util.h"
-
-#include "e-cell-float.h"
-
-G_DEFINE_TYPE (ECellFloat, e_cell_float, E_CELL_TEXT_TYPE)
-
-static char *
-ecf_get_text(ECellText *cell, ETableModel *model, int col, int row)
-{
-	gfloat   *fvalue;
-
-	fvalue = e_table_model_value_at (model, col, row);
-
-	return e_format_number_float (*fvalue);
-}
-
-static void
-ecf_free_text(ECellText *cell, char *text)
-{
-	g_free(text);
-}
-
-static void
-e_cell_float_class_init (ECellFloatClass *klass)
-{
-	ECellTextClass *ectc = E_CELL_TEXT_CLASS (klass);
-
-	ectc->get_text  = ecf_get_text;
-	ectc->free_text = ecf_free_text;
-}
-
-static void
-e_cell_float_init (ECellFloat *cell_float)
-{
-}
-
-/**
- * e_cell_float_new:
- * @fontname: font to be used to render on the screen
- * @justify: Justification of the string in the cell.
- *
- * Creates a new ECell renderer that can be used to render floats that
- * that come from the model.  The value returned from the model is
- * interpreted as being an int.
- *
- * See ECellText for other features.
- *
- * Returns: an ECell object that can be used to render floats.
- */
-ECell *
-e_cell_float_new (const char *fontname, GtkJustification justify)
-{
-	ECellFloat *ecn = g_object_new (E_CELL_FLOAT_TYPE, NULL);
-
-	e_cell_text_construct(E_CELL_TEXT(ecn), fontname, justify);
-
-	return (ECell *) ecn;
-}
-
diff --git a/widgets/table/e-cell-float.h b/widgets/table/e-cell-float.h
deleted file mode 100644
index 52898a0922..0000000000
--- a/widgets/table/e-cell-float.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * e-cell-float.h - Float item for e-table.
- *
- * 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/>  
- *
- *
- * Authors:
- *		Mikael Hallendal <micke@imendio.com>
- *
- * Derived from e-cell-number by Chris Lahey <clahey@ximian.com>
- * ECellFloat - Float item for e-table.
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef _E_CELL_FLOAT_H_
-#define _E_CELL_FLOAT_H_
-
-#include <table/e-cell-text.h>
-
-G_BEGIN_DECLS
-
-#define E_CELL_FLOAT_TYPE        (e_cell_float_get_type ())
-#define E_CELL_FLOAT(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_FLOAT_TYPE, ECellFloat))
-#define E_CELL_FLOAT_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_CELL_FLOAT_TYPE, ECellFloatClass))
-#define E_IS_CELL_FLOAT(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_FLOAT_TYPE))
-#define E_IS_CELL_FLOAT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_FLOAT_TYPE))
-
-typedef struct {
-	ECellText base;
-} ECellFloat;
-
-typedef struct {
-	ECellTextClass parent_class;
-} ECellFloatClass;
-
-GType      e_cell_float_get_type (void);
-ECell     *e_cell_float_new      (const char *fontname, GtkJustification justify);
-
-G_END_DECLS
-
-#endif /* _E_CELL_FLOAT_H_ */
diff --git a/widgets/table/e-cell-progress.c b/widgets/table/e-cell-progress.c
deleted file mode 100644
index 5b0e20bdb7..0000000000
--- a/widgets/table/e-cell-progress.c
+++ /dev/null
@@ -1,451 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-cell-progress.c - Progress display cell object.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright 2001, 2002, Krisztian Pifko <monsta@users.sourceforge.net>
- *
- * Authors:
- *   Krisztian Pifko <monsta@users.sourceforge.net>
- *
- * A cell type for displaying progress bars.
- *
- * Derived from ECellToggle of Miguel de Icaza <miguel@ximian.com>.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <string.h>
-
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-#include <libgnomecanvas/gnome-canvas.h>
-
-#include "e-util/e-util.h"
-
-#include "e-cell-progress.h"
-#include "e-table-item.h"
-
-G_DEFINE_TYPE (ECellProgress, e_cell_progress, E_CELL_TYPE)
-
-typedef struct {
-	ECellView    cell_view;
-	GdkGC       *gc;
-	GnomeCanvas *canvas;
-} ECellProgressView;
-
-static void
-eprog_queue_redraw (ECellProgressView *text_view, int view_col, int view_row)
-{
-	e_table_item_redraw_range (
-		text_view->cell_view.e_table_item_view,
-		view_col, view_row, view_col, view_row);
-}
-
-/*
- * ECell::realize method
- */
-static ECellView *
-eprog_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view)
-{
-	ECellProgressView *progress_view = g_new0 (ECellProgressView, 1);
-	ETableItem *eti = E_TABLE_ITEM (e_table_item_view);
-	GnomeCanvas *canvas = GNOME_CANVAS_ITEM (eti)->canvas;
-
-	progress_view->cell_view.ecell = ecell;
-	progress_view->cell_view.e_table_model = table_model;
-	progress_view->cell_view.e_table_item_view = e_table_item_view;
-        progress_view->cell_view.kill_view_cb = NULL;
-        progress_view->cell_view.kill_view_cb_data = NULL;
-	progress_view->canvas = canvas;
-
-	return (ECellView *) progress_view;
-}
-
-static void
-eprog_kill_view (ECellView *ecell_view)
-{
-        ECellProgressView *progress_view = (ECellProgressView*) ecell_view;
-
-        if (progress_view->cell_view.kill_view_cb)
-            (progress_view->cell_view.kill_view_cb)(ecell_view, progress_view->cell_view.kill_view_cb_data);
-
-        if (progress_view->cell_view.kill_view_cb_data)
-            g_list_free(progress_view->cell_view.kill_view_cb_data);
-
-	g_free (ecell_view);
-}
-
-static void
-eprog_realize (ECellView *ecell_view)
-{
-	ECellProgressView *progress_view = (ECellProgressView *) ecell_view;
-
-	progress_view->gc = gdk_gc_new (GTK_WIDGET (progress_view->canvas)->window);
-}
-
-/*
- * ECell::unrealize method
- */
-static void
-eprog_unrealize (ECellView *ecv)
-{
-	ECellProgressView *progress_view = (ECellProgressView *) ecv;
-
-	g_object_unref (progress_view->gc);
-	progress_view->gc = NULL;
-}
-
-static void
-eprog_clear (ECellProgress *progress)
-{
-  memset(progress->buffer,0x00,progress->width*progress->height*4);
-}
-
-static void
-eprog_draw_border (ECellProgress *progress, guchar red, guchar green, guchar blue)
-{
-  gint i, j, w4, p4, pw4, wpb4;
-
-/*
- * some speedup
- */
-  w4=progress->width*4;
-  p4=progress->padding*4;
-  pw4=w4*progress->padding;
-  wpb4=(progress->width-progress->padding-progress->border)*4;
-
-  for (i=progress->padding*4;i<(progress->width-progress->padding)*4;i+=4){
-    for (j=0;j<progress->border;j++){
-      progress->buffer[pw4+j*w4+i]=red;
-      progress->buffer[pw4+j*w4+i+1]=green;
-      progress->buffer[pw4+j*w4+i+2]=blue;
-      progress->buffer[pw4+j*w4+i+3]=255;
-      progress->buffer[(progress->height-1-progress->padding)*w4-j*w4+i]=red;
-      progress->buffer[(progress->height-1-progress->padding)*w4-j*w4+i+1]=green;
-      progress->buffer[(progress->height-1-progress->padding)*w4-j*w4+i+2]=blue;
-      progress->buffer[(progress->height-1-progress->padding)*w4-j*w4+i+3]=255;
-    }
-  }
-  for (i=progress->padding+progress->border;i<progress->height-progress->padding-progress->border;i++){
-    for (j=0;j<4*progress->border;j+=4){
-      progress->buffer[p4+i*w4+j]=red;
-      progress->buffer[p4+i*w4+j+1]=green;
-      progress->buffer[p4+i*w4+j+2]=blue;
-      progress->buffer[p4+i*w4+j+3]=255;
-      progress->buffer[i*w4+wpb4+j]=red;
-      progress->buffer[i*w4+wpb4+j+1]=green;
-      progress->buffer[i*w4+wpb4+j+2]=blue;
-      progress->buffer[i*w4+wpb4+j+3]=255;
-    }
-  }
-}
-
-static void
-eprog_draw_bar (ECellProgress *progress, guchar red, guchar green, guchar blue, gint value)
-{
-  gint i, j, w;
-
-  w=value*(progress->width-2*(progress->padding+progress->border+1))/progress->max;
-  for (i=(progress->padding+progress->border+1)*4;i<(progress->padding+progress->border+1+w)*4;i+=4){
-    for (j=0;j<progress->height-2*(progress->padding+progress->border+1);j++){
-      progress->buffer[(progress->width*(progress->padding+progress->border+1)*4)+j*progress->width*4+i]=red;
-      progress->buffer[(progress->width*(progress->padding+progress->border+1)*4)+j*progress->width*4+i+1]=green;
-      progress->buffer[(progress->width*(progress->padding+progress->border+1)*4)+j*progress->width*4+i+2]=blue;
-      progress->buffer[(progress->width*(progress->padding+progress->border+1)*4)+j*progress->width*4+i+3]=255;
-    }
-  }
-}
-
-/*
- * ECell::draw method
- */
-static void
-eprog_draw (ECellView *ecell_view, GdkDrawable *drawable,
-	  int model_col, int view_col, int row, ECellFlags flags,
-	  int x1, int y1, int x2, int y2)
-{
-	ECellProgress *progress = E_CELL_PROGRESS (ecell_view->ecell);
-	int x, y;
-
-	const int value = GPOINTER_TO_INT (
-		 e_table_model_value_at (ecell_view->e_table_model, model_col, row));
-
-	if ((value > progress->max)||(value < progress->min)){
-		g_warning ("Value from the table model is %d, the states we support are [%d..%d]\n",
-			   value, progress->min, progress->max);
-		return;
-	}
-
-	if ((x2 - x1) < progress->width){
-		x = x1;
-	} else {
-		x = x1 + ((x2 - x1) - progress->width) / 2;
-	}
-
-	if ((y2 - y1) < progress->height){
-		y = y1;
-	} else {
-		y = y1 + ((y2 - y1) - progress->height) / 2;
-	}
-
-	eprog_clear(progress);
-
-	eprog_draw_border(progress, progress->red, progress->green, progress->blue);
-
-	eprog_draw_bar(progress, progress->red, progress->green, progress->blue, value);
-
-	gdk_draw_pixbuf (drawable,
-			 NULL,
-			 progress->image,
-			 0, 0,
-			 x, y,
-			 progress->width, progress->height,
-			 GDK_RGB_DITHER_NORMAL,
-			 x, y);
-}
-
-static void
-eprog_set_value (ECellProgressView *progress_view, int model_col, int view_col, int row, int value)
-{
-	ECell *ecell = progress_view->cell_view.ecell;
-	ECellProgress *progress = E_CELL_PROGRESS (ecell);
-
-	if (value > progress->max){
-	  value = progress->max;
-	}else if (value < progress->min){
-	  value = progress->min;
-	}
-	e_table_model_set_value_at (progress_view->cell_view.e_table_model,
-				    model_col, row, GINT_TO_POINTER (value));
-	eprog_queue_redraw (progress_view, view_col, row);
-}
-
-/*
- * ECell::event method
- */
-static gint
-eprog_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row, ECellFlags flags, ECellActions *actions)
-{
-	ECellProgressView *progress_view = (ECellProgressView *) ecell_view;
-	void *_value = e_table_model_value_at (ecell_view->e_table_model, model_col, row);
-	const int value = GPOINTER_TO_INT (_value);
-
-#if 0
-	if (!(flags & E_CELL_EDITING))
-		return FALSE;
-#endif
-
-	switch (event->type){
-	case GDK_KEY_PRESS:
-		if (event->key.keyval != GDK_space)
-			return FALSE;
-		/* Fall through */
-	case GDK_BUTTON_PRESS:
-		if (!e_table_model_is_cell_editable(ecell_view->e_table_model, model_col, row))
-			return FALSE;
-
-		eprog_set_value (progress_view, model_col, view_col, row, value + 1);
-		return TRUE;
-
-	default:
-		return FALSE;
-	}
-}
-
-/*
- * ECell::height method
- */
-static int
-eprog_height (ECellView *ecell_view, int model_col, int view_col, int row)
-{
-	ECellProgress *progress = E_CELL_PROGRESS (ecell_view->ecell);
-
-	return progress->height;
-}
-
-/*
- * ECell::max_width method
- */
-static int
-eprog_max_width (ECellView *ecell_view, int model_col, int view_col)
-{
-	ECellProgress *progress = E_CELL_PROGRESS (ecell_view->ecell);
-
-	return progress->width;
-}
-
-static void
-eprog_dispose (GObject *object)
-{
-	ECellProgress *eprog = E_CELL_PROGRESS (object);
-
-	g_object_unref (eprog->image);
-	g_free (eprog->image);
-	g_free (eprog->buffer);
-
-	G_OBJECT_CLASS (e_cell_progress_parent_class)->dispose (object);
-}
-
-static void
-e_cell_progress_class_init (ECellProgressClass *klass)
-{
-	ECellClass *ecc = E_CELL_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->dispose = eprog_dispose;
-
-	ecc->new_view   = eprog_new_view;
-	ecc->kill_view  = eprog_kill_view;
-	ecc->realize    = eprog_realize;
-	ecc->unrealize  = eprog_unrealize;
-	ecc->draw       = eprog_draw;
-	ecc->event      = eprog_event;
-	ecc->height     = eprog_height;
-	ecc->max_width  = eprog_max_width;
-}
-
-static void
-e_cell_progress_init (ECellProgress *eprog)
-{
-	/* nothing to do */
-}
-
-/**
- * e_cell_progress_construct:
- * @eprog: a fresh ECellProgress object
- * @padding: number of pixels used as a padding
- * @border: number of pixels used as a border
- * @min: the minimum value
- * @max: the maximum value
- * @width: the width of the progress bar in pixels
- * @height: the height of the progress bar in pixels
- * @red: the red component of the progress bars rgb color
- * @green: the green component of the progress bars rgb color
- * @blue: the blue component of the progress bars rgb color
- *
- * Constructs the @eprog object with the arguments
- */
-void
-e_cell_progress_construct (ECellProgress *eprog, int padding, int border, int min, int max, int width, int height, guchar red, guchar green, guchar blue)
-{
-	eprog->padding = padding;
-	eprog->border = border;
-	eprog->min = min;
-	eprog->max = max;
-	eprog->red = red;
-	eprog->green = green;
-	eprog->blue = blue;
-
-	eprog->width = (width<((padding+border)*2+5)) ? ((padding+border)*2+5) : width;
-	eprog->height = (height<((padding+border)*2+5)) ? ((padding+border)*2+5) : height;
-
-	eprog->buffer=g_new(guchar, eprog->width*eprog->height*4);
-
-	eprog_clear(eprog);
-	eprog_draw_border(eprog, red, green, blue);
-
-	eprog->image = gdk_pixbuf_new_from_data (eprog->buffer,GDK_COLORSPACE_RGB, TRUE, 8, eprog->width, eprog->height, eprog->width*4, NULL, NULL);
-}
-
-/**
- * e_cell_progress_new:
- * @min: the minimum value
- * @max: the maximum value
- * @width: the width of the progress bar in pixels
- * @height: the height of the progress bar in pixels
- *
- * Creates a new ECell renderer that can be used to render progress
- * bars displaying the percentage of the current value between min
- * and max.
- *
- * Returns: an ECell object that can be used to render progress cells.
- */
-ECell *
-e_cell_progress_new (int min, int max, int width, int height)
-{
-	ECellProgress *eprog = g_object_new (E_CELL_PROGRESS_TYPE, NULL);
-
-	e_cell_progress_construct (eprog, 1, 1, min, max, (width<9) ? 9 : width, (height<9) ? 9 : height, 0x00, 0x00, 0x00);
-
-	return (ECell *) eprog;
-}
-
-/**
- * e_cell_progress_set_padding:
- * @eprog: an ECellProgress object
- * @padding: number of pixels used as a padding
- *
- * Sets the padding around the progress bar in the cell.
- */
-void
-e_cell_progress_set_padding (ECellProgress *eprog, int padding)
-{
-	eprog->padding = padding;
-
-	eprog->width = (eprog->width<((padding+eprog->border)*2+5)) ? ((padding+eprog->border)*2+5) : eprog->width;
-	eprog->height = (eprog->height<((padding+eprog->border)*2+5)) ? ((padding+eprog->border)*2+5) : eprog->height;
-
-	g_free (eprog->buffer);
-	eprog->buffer=g_new (guchar, eprog->width*eprog->height*4);
-
-	eprog_clear (eprog);
-	eprog_draw_border (eprog, eprog->red, eprog->green, eprog->blue);
-
-	eprog->image = gdk_pixbuf_new_from_data (eprog->buffer,GDK_COLORSPACE_RGB, TRUE, 8, eprog->width, eprog->height, eprog->width*4, NULL, NULL);
-}
-
-/**
- * e_cell_progress_set_border:
- * @eprog: an ECellProgress object
- * @border: number of pixels used as a border
- *
- * Sets the border around the progress bar in the cell.
- */
-void
-e_cell_progress_set_border (ECellProgress *eprog, int border)
-{
-	eprog->border = border;
-
-	eprog->width = (eprog->width<((eprog->padding+border)*2+5)) ? ((eprog->padding+border)*2+5) : eprog->width;
-	eprog->height = (eprog->height<((eprog->padding+border)*2+5)) ? ((eprog->padding+border)*2+5) : eprog->height;
-
-	g_free (eprog->buffer);
-	eprog->buffer=g_new (guchar, eprog->width*eprog->height*4);
-
-	eprog_clear (eprog);
-	eprog_draw_border (eprog, eprog->red, eprog->green, eprog->blue);
-
-	eprog->image = gdk_pixbuf_new_from_data (eprog->buffer,GDK_COLORSPACE_RGB, TRUE, 8, eprog->width, eprog->height, eprog->width*4, NULL, NULL);
-}
-
-/**
- * e_cell_progress_set_color:
- * @eprog: a fresh ECellProgress object
- * @red: the red component of the progress bars rgb color
- * @green: the green component of the progress bars rgb color
- * @blue: the blue component of the progress bars rgb color
- */
-void
-e_cell_progress_set_color (ECellProgress *eprog, guchar red, guchar green, guchar blue)
-{
-	eprog->red = red;
-	eprog->green = green;
-	eprog->blue = blue;
-
-	eprog_clear (eprog);
-	eprog_draw_border (eprog, red, green, blue);
-}
diff --git a/widgets/table/e-cell-progress.h b/widgets/table/e-cell-progress.h
deleted file mode 100644
index 986a59d3cd..0000000000
--- a/widgets/table/e-cell-progress.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-cell-progress.h - Progress display cell object.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright 2001, 2002, Krisztian Pifko <monsta@users.sourceforge.net>
- *
- * Authors:
- *   Krisztian Pifko <monsta@users.sourceforge.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef _E_CELL_PROGRESS_H_
-#define _E_CELL_PROGRESS_H_
-
-#include <libgnomecanvas/gnome-canvas.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <table/e-cell.h>
-
-G_BEGIN_DECLS
-
-#define E_CELL_PROGRESS_TYPE        (e_cell_progress_get_type ())
-#define E_CELL_PROGRESS(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_PROGRESS_TYPE, ECellProgress))
-#define E_CELL_PROGRESS_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_CELL_PROGRESS_TYPE, ECellProgressClass))
-#define E_IS_CELL_PROGRESS(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_PROGRESS_TYPE))
-#define E_IS_CELL_PROGRESS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_PROGRESS_TYPE))
-
-typedef struct {
-	ECell parent;
-
-	int        padding;
-	int        border;
-	int        min;
-	int        max;
-	guchar 	   red;
-	guchar 	   green;
-	guchar 	   blue;
-
-	guchar *buffer;
-	GdkPixbuf *image;
-
-	int        width;
-	int        height;
-} ECellProgress;
-
-typedef struct {
-	ECellClass parent_class;
-} ECellProgressClass;
-
-GType      e_cell_progress_get_type  (void);
-ECell     *e_cell_progress_new       (int min, int max, int width, int height);
-void       e_cell_progress_construct (ECellProgress *eprog, int padding, int border,
-				      int min, int max, int width, int height, guchar red, guchar green, guchar blue);
-void	   e_cell_progress_set_padding (ECellProgress *eprog, int padding);
-void	   e_cell_progress_set_border (ECellProgress *eprog, int border);
-void	   e_cell_progress_set_color (ECellProgress *eprog, guchar red, guchar green, guchar blue);
-
-G_END_DECLS
-
-#endif /* _E_CELL_PROGRESS_H_ */
-
-
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index dbedaece6c..eb7e428fb9 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -13,8 +13,9 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/widgets/table/e-cell-tree.h b/widgets/table/e-cell-tree.h
index 9bacbbf01f..36d4a85541 100644
--- a/widgets/table/e-cell-tree.h
+++ b/widgets/table/e-cell-tree.h
@@ -13,8 +13,9 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 441f665987..7ffb1776ae 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-header-item.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   Miguel de Icaza (miguel@gnu.org)
+ * 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.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * 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/>  
  *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ *		Chris Lahey <clahey@ximian.com>
+ *		Miguel de Icaza <miguel@gnu.org>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index c8409fb720..58d6c65f03 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -1,27 +1,27 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * e-table-item.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   Miguel de Icaza <miguel@gnu.org>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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 library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		Chris Lahey <clahey@ximian.com>
+ *		Miguel de Icaza <miguel@gnu.org>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
-
 /*
  * TODO:
  *   Add a border to the thing, so that focusing works properly.
@@ -2547,10 +2547,6 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 
 		d(g_print("%s: GDK_2BUTTON_PRESS received, button %d\n", __FUNCTION__, e->button.button));
 
-		if (e->button.button == 5 ||
-		    e->button.button == 4)
-			return FALSE;
-
 		/*
 		 * click_count is so that if you click on two
 		 * different rows we don't send a double click signal.
diff --git a/widgets/table/table-test.c b/widgets/table/table-test.c
index 4585f1de92..3f42c86743 100644
--- a/widgets/table/table-test.c
+++ b/widgets/table/table-test.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * table-test.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- * Authors:
- *   Miguel de Icaza (miguel@gnu.org)
+ * 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.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * 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/>  
  *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ *		Miguel de Icaza <miguel@gnu.org>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/widgets/table/test-table.c b/widgets/table/test-table.c
index 32add17ffc..5d6c99e1d3 100644
--- a/widgets/table/test-table.c
+++ b/widgets/table/test-table.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * test-table.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- * Authors:
- *   Miguel de Icaza (miguel@gnu.org)
+ * 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.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * 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/>  
  *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * Authors:
+ *		Miguel de Icaza <miguel@gnu.org>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/widgets/text/e-text-test.c b/widgets/text/e-text-test.c
index 01bcdc641e..adba386ad1 100644
--- a/widgets/text/e-text-test.c
+++ b/widgets/text/e-text-test.c
@@ -1,24 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * e-text-test.c - E-Text item test program
- * Copyright 2000: Iain Holmes <ih@csd.abdn.ac.uk>
- *
- * Authors:
- *   Iain Holmes <ih@csd.abdn.ac.uk>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * This 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 library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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
- * Library General Public License for more details.
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		Iain Holmes <ih@csd.abdn.ac.uk>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright 2000: Iain Holmes <ih@csd.abdn.ac.uk>
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
  */
 
 #include <gnome.h>
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 32910b05f9..d608f7e96a 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -20,8 +20,9 @@
  * Author: Federico Mena <federico@nuclecu.unam.mx>
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h
index e3deda4826..a426b2c64f 100644
--- a/widgets/text/e-text.h
+++ b/widgets/text/e-text.h
@@ -2,9 +2,9 @@
  * e-text.h - Text item for evolution.
  *
  * 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.
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of